http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/236aea45/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSerializer.Sq.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSerializer.Sq.html b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSerializer.Sq.html index 667dec9..3aa18df 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSerializer.Sq.html +++ b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSerializer.Sq.html @@ -487,13 +487,13 @@ <span class="sourceLineNo">479</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 handle this.<a name="line.479"></a> <span class="sourceLineNo">480</span> // If it's a map or bean, then we'll create a table.<a name="line.480"></a> <span class="sourceLineNo">481</span> // Otherwise, we'll create a list.<a name="line.481"></a> -<span class="sourceLineNo">482</span> String[] th = getTableHeaders(session, c, hbpMeta);<a name="line.482"></a> +<span class="sourceLineNo">482</span> Object[] th = getTableHeaders(session, c, hbpMeta);<a name="line.482"></a> <span class="sourceLineNo">483</span><a name="line.483"></a> <span class="sourceLineNo">484</span> if (th != null) {<a name="line.484"></a> <span class="sourceLineNo">485</span><a name="line.485"></a> <span class="sourceLineNo">486</span> out.oTag(i, "table").attr(btpn, type2).append('>').nl();<a name="line.486"></a> <span class="sourceLineNo">487</span> out.sTag(i+1, "tr").nl();<a name="line.487"></a> -<span class="sourceLineNo">488</span> for (String key : th)<a name="line.488"></a> +<span class="sourceLineNo">488</span> for (Object key : th)<a name="line.488"></a> <span class="sourceLineNo">489</span> out.sTag(i+2, "th").append(key).eTag("th").nl();<a name="line.489"></a> <span class="sourceLineNo">490</span> out.eTag(i+1, "tr").nl();<a name="line.490"></a> <span class="sourceLineNo">491</span><a name="line.491"></a> @@ -518,9 +518,9 @@ <span class="sourceLineNo">510</span> } else if (cm.isMap() && ! (cm.isBeanMap())) {<a name="line.510"></a> <span class="sourceLineNo">511</span> Map m2 = session.sort((Map)o);<a name="line.511"></a> <span class="sourceLineNo">512</span><a name="line.512"></a> -<span class="sourceLineNo">513</span> for (String k : th) {<a name="line.513"></a> +<span class="sourceLineNo">513</span> for (Object k : th) {<a name="line.513"></a> <span class="sourceLineNo">514</span> out.sTag(i+2, "td");<a name="line.514"></a> -<span class="sourceLineNo">515</span> ContentResult cr = serializeAnything(session, out, m2.get(k), seType, k, 2, null, false);<a name="line.515"></a> +<span class="sourceLineNo">515</span> ContentResult cr = serializeAnything(session, out, m2.get(k), seType, session.toString(k), 2, null, false);<a name="line.515"></a> <span class="sourceLineNo">516</span> if (cr == CR_NORMAL)<a name="line.516"></a> <span class="sourceLineNo">517</span> out.i(i+2);<a name="line.517"></a> <span class="sourceLineNo">518</span> out.eTag("td").nl();<a name="line.518"></a> @@ -532,8 +532,8 @@ <span class="sourceLineNo">524</span> else<a name="line.524"></a> <span class="sourceLineNo">525</span> m2 = session.toBeanMap(o);<a name="line.525"></a> <span class="sourceLineNo">526</span><a name="line.526"></a> -<span class="sourceLineNo">527</span> for (String k : th) {<a name="line.527"></a> -<span class="sourceLineNo">528</span> BeanMapEntry p = m2.getProperty(k);<a name="line.528"></a> +<span class="sourceLineNo">527</span> for (Object k : th) {<a name="line.527"></a> +<span class="sourceLineNo">528</span> BeanMapEntry p = m2.getProperty(session.toString(k));<a name="line.528"></a> <span class="sourceLineNo">529</span> BeanPropertyMeta pMeta = p.getMeta();<a name="line.529"></a> <span class="sourceLineNo">530</span> out.sTag(i+2, "td");<a name="line.530"></a> <span class="sourceLineNo">531</span> ContentResult cr = serializeAnything(session, out, p.getValue(), pMeta.getClassMeta(), p.getKey().toString(), 2, pMeta, false);<a name="line.531"></a> @@ -568,12 +568,12 @@ <span class="sourceLineNo">560</span> * 2-dimensional tables are used for collections of objects that all have the same set of property names.<a name="line.560"></a> <span class="sourceLineNo">561</span> */<a name="line.561"></a> <span class="sourceLineNo">562</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.562"></a> -<span class="sourceLineNo">563</span> private static String[] getTableHeaders(SerializerSession session, Collection c, HtmlBeanPropertyMeta hbpMeta) throws Exception {<a name="line.563"></a> +<span class="sourceLineNo">563</span> private static Object[] getTableHeaders(SerializerSession session, Collection c, HtmlBeanPropertyMeta hbpMeta) throws Exception {<a name="line.563"></a> <span class="sourceLineNo">564</span> if (c.size() == 0)<a name="line.564"></a> <span class="sourceLineNo">565</span> return null;<a name="line.565"></a> <span class="sourceLineNo">566</span> c = session.sort(c);<a name="line.566"></a> -<span class="sourceLineNo">567</span> String[] th;<a name="line.567"></a> -<span class="sourceLineNo">568</span> Set<String> s = new TreeSet<String>();<a name="line.568"></a> +<span class="sourceLineNo">567</span> Object[] th;<a name="line.567"></a> +<span class="sourceLineNo">568</span> Set<Object> s = new TreeSet<Object>();<a name="line.568"></a> <span class="sourceLineNo">569</span> Set<ClassMeta> prevC = new HashSet<ClassMeta>();<a name="line.569"></a> <span class="sourceLineNo">570</span> Object o1 = null;<a name="line.570"></a> <span class="sourceLineNo">571</span> for (Object o : c)<a name="line.571"></a> @@ -597,11 +597,11 @@ <span class="sourceLineNo">589</span> if (h.isNoTables() || (hbpMeta != null && hbpMeta.isNoTables()))<a name="line.589"></a> <span class="sourceLineNo">590</span> return null;<a name="line.590"></a> <span class="sourceLineNo">591</span> if (h.isNoTableHeaders() || (hbpMeta != null && hbpMeta.isNoTableHeaders()))<a name="line.591"></a> -<span class="sourceLineNo">592</span> return new String[0];<a name="line.592"></a> +<span class="sourceLineNo">592</span> return new Object[0];<a name="line.592"></a> <span class="sourceLineNo">593</span> if (session.canIgnoreValue(cm, null, o1))<a name="line.593"></a> <span class="sourceLineNo">594</span> return null;<a name="line.594"></a> <span class="sourceLineNo">595</span> if (cm.isMap() && ! cm.isBeanMap()) {<a name="line.595"></a> -<span class="sourceLineNo">596</span> Set<String> set = new LinkedHashSet<String>();<a name="line.596"></a> +<span class="sourceLineNo">596</span> Set<Object> set = new LinkedHashSet<Object>();<a name="line.596"></a> <span class="sourceLineNo">597</span> for (Object o : c) {<a name="line.597"></a> <span class="sourceLineNo">598</span> if (! session.canIgnoreValue(cm, null, o)) {<a name="line.598"></a> <span class="sourceLineNo">599</span> if (! cm.isInstance(o))<a name="line.599"></a> @@ -609,13 +609,13 @@ <span class="sourceLineNo">601</span> Map m = session.sort((Map)o);<a name="line.601"></a> <span class="sourceLineNo">602</span> for (Map.Entry e : (Set<Map.Entry>)m.entrySet()) {<a name="line.602"></a> <span class="sourceLineNo">603</span> if (e.getValue() != null)<a name="line.603"></a> -<span class="sourceLineNo">604</span> set.add(e.getKey() == null ? null : e.getKey().toString());<a name="line.604"></a> +<span class="sourceLineNo">604</span> set.add(e.getKey() == null ? null : e.getKey());<a name="line.604"></a> <span class="sourceLineNo">605</span> }<a name="line.605"></a> <span class="sourceLineNo">606</span> }<a name="line.606"></a> <span class="sourceLineNo">607</span> }<a name="line.607"></a> -<span class="sourceLineNo">608</span> th = set.toArray(new String[set.size()]);<a name="line.608"></a> +<span class="sourceLineNo">608</span> th = set.toArray(new Object[set.size()]);<a name="line.608"></a> <span class="sourceLineNo">609</span> } else {<a name="line.609"></a> -<span class="sourceLineNo">610</span> Set<String> set = new LinkedHashSet<String>();<a name="line.610"></a> +<span class="sourceLineNo">610</span> Set<Object> set = new LinkedHashSet<Object>();<a name="line.610"></a> <span class="sourceLineNo">611</span> for (Object o : c) {<a name="line.611"></a> <span class="sourceLineNo">612</span> if (! session.canIgnoreValue(cm, null, o)) {<a name="line.612"></a> <span class="sourceLineNo">613</span> if (! cm.isInstance(o))<a name="line.613"></a> @@ -627,7 +627,7 @@ <span class="sourceLineNo">619</span> }<a name="line.619"></a> <span class="sourceLineNo">620</span> }<a name="line.620"></a> <span class="sourceLineNo">621</span> }<a name="line.621"></a> -<span class="sourceLineNo">622</span> th = set.toArray(new String[set.size()]);<a name="line.622"></a> +<span class="sourceLineNo">622</span> th = set.toArray(new Object[set.size()]);<a name="line.622"></a> <span class="sourceLineNo">623</span> }<a name="line.623"></a> <span class="sourceLineNo">624</span> prevC.add(cm);<a name="line.624"></a> <span class="sourceLineNo">625</span> s.addAll(Arrays.asList(th));<a name="line.625"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/236aea45/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSerializer.SqReadable.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSerializer.SqReadable.html b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSerializer.SqReadable.html index 667dec9..3aa18df 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSerializer.SqReadable.html +++ b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSerializer.SqReadable.html @@ -487,13 +487,13 @@ <span class="sourceLineNo">479</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 handle this.<a name="line.479"></a> <span class="sourceLineNo">480</span> // If it's a map or bean, then we'll create a table.<a name="line.480"></a> <span class="sourceLineNo">481</span> // Otherwise, we'll create a list.<a name="line.481"></a> -<span class="sourceLineNo">482</span> String[] th = getTableHeaders(session, c, hbpMeta);<a name="line.482"></a> +<span class="sourceLineNo">482</span> Object[] th = getTableHeaders(session, c, hbpMeta);<a name="line.482"></a> <span class="sourceLineNo">483</span><a name="line.483"></a> <span class="sourceLineNo">484</span> if (th != null) {<a name="line.484"></a> <span class="sourceLineNo">485</span><a name="line.485"></a> <span class="sourceLineNo">486</span> out.oTag(i, "table").attr(btpn, type2).append('>').nl();<a name="line.486"></a> <span class="sourceLineNo">487</span> out.sTag(i+1, "tr").nl();<a name="line.487"></a> -<span class="sourceLineNo">488</span> for (String key : th)<a name="line.488"></a> +<span class="sourceLineNo">488</span> for (Object key : th)<a name="line.488"></a> <span class="sourceLineNo">489</span> out.sTag(i+2, "th").append(key).eTag("th").nl();<a name="line.489"></a> <span class="sourceLineNo">490</span> out.eTag(i+1, "tr").nl();<a name="line.490"></a> <span class="sourceLineNo">491</span><a name="line.491"></a> @@ -518,9 +518,9 @@ <span class="sourceLineNo">510</span> } else if (cm.isMap() && ! (cm.isBeanMap())) {<a name="line.510"></a> <span class="sourceLineNo">511</span> Map m2 = session.sort((Map)o);<a name="line.511"></a> <span class="sourceLineNo">512</span><a name="line.512"></a> -<span class="sourceLineNo">513</span> for (String k : th) {<a name="line.513"></a> +<span class="sourceLineNo">513</span> for (Object k : th) {<a name="line.513"></a> <span class="sourceLineNo">514</span> out.sTag(i+2, "td");<a name="line.514"></a> -<span class="sourceLineNo">515</span> ContentResult cr = serializeAnything(session, out, m2.get(k), seType, k, 2, null, false);<a name="line.515"></a> +<span class="sourceLineNo">515</span> ContentResult cr = serializeAnything(session, out, m2.get(k), seType, session.toString(k), 2, null, false);<a name="line.515"></a> <span class="sourceLineNo">516</span> if (cr == CR_NORMAL)<a name="line.516"></a> <span class="sourceLineNo">517</span> out.i(i+2);<a name="line.517"></a> <span class="sourceLineNo">518</span> out.eTag("td").nl();<a name="line.518"></a> @@ -532,8 +532,8 @@ <span class="sourceLineNo">524</span> else<a name="line.524"></a> <span class="sourceLineNo">525</span> m2 = session.toBeanMap(o);<a name="line.525"></a> <span class="sourceLineNo">526</span><a name="line.526"></a> -<span class="sourceLineNo">527</span> for (String k : th) {<a name="line.527"></a> -<span class="sourceLineNo">528</span> BeanMapEntry p = m2.getProperty(k);<a name="line.528"></a> +<span class="sourceLineNo">527</span> for (Object k : th) {<a name="line.527"></a> +<span class="sourceLineNo">528</span> BeanMapEntry p = m2.getProperty(session.toString(k));<a name="line.528"></a> <span class="sourceLineNo">529</span> BeanPropertyMeta pMeta = p.getMeta();<a name="line.529"></a> <span class="sourceLineNo">530</span> out.sTag(i+2, "td");<a name="line.530"></a> <span class="sourceLineNo">531</span> ContentResult cr = serializeAnything(session, out, p.getValue(), pMeta.getClassMeta(), p.getKey().toString(), 2, pMeta, false);<a name="line.531"></a> @@ -568,12 +568,12 @@ <span class="sourceLineNo">560</span> * 2-dimensional tables are used for collections of objects that all have the same set of property names.<a name="line.560"></a> <span class="sourceLineNo">561</span> */<a name="line.561"></a> <span class="sourceLineNo">562</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.562"></a> -<span class="sourceLineNo">563</span> private static String[] getTableHeaders(SerializerSession session, Collection c, HtmlBeanPropertyMeta hbpMeta) throws Exception {<a name="line.563"></a> +<span class="sourceLineNo">563</span> private static Object[] getTableHeaders(SerializerSession session, Collection c, HtmlBeanPropertyMeta hbpMeta) throws Exception {<a name="line.563"></a> <span class="sourceLineNo">564</span> if (c.size() == 0)<a name="line.564"></a> <span class="sourceLineNo">565</span> return null;<a name="line.565"></a> <span class="sourceLineNo">566</span> c = session.sort(c);<a name="line.566"></a> -<span class="sourceLineNo">567</span> String[] th;<a name="line.567"></a> -<span class="sourceLineNo">568</span> Set<String> s = new TreeSet<String>();<a name="line.568"></a> +<span class="sourceLineNo">567</span> Object[] th;<a name="line.567"></a> +<span class="sourceLineNo">568</span> Set<Object> s = new TreeSet<Object>();<a name="line.568"></a> <span class="sourceLineNo">569</span> Set<ClassMeta> prevC = new HashSet<ClassMeta>();<a name="line.569"></a> <span class="sourceLineNo">570</span> Object o1 = null;<a name="line.570"></a> <span class="sourceLineNo">571</span> for (Object o : c)<a name="line.571"></a> @@ -597,11 +597,11 @@ <span class="sourceLineNo">589</span> if (h.isNoTables() || (hbpMeta != null && hbpMeta.isNoTables()))<a name="line.589"></a> <span class="sourceLineNo">590</span> return null;<a name="line.590"></a> <span class="sourceLineNo">591</span> if (h.isNoTableHeaders() || (hbpMeta != null && hbpMeta.isNoTableHeaders()))<a name="line.591"></a> -<span class="sourceLineNo">592</span> return new String[0];<a name="line.592"></a> +<span class="sourceLineNo">592</span> return new Object[0];<a name="line.592"></a> <span class="sourceLineNo">593</span> if (session.canIgnoreValue(cm, null, o1))<a name="line.593"></a> <span class="sourceLineNo">594</span> return null;<a name="line.594"></a> <span class="sourceLineNo">595</span> if (cm.isMap() && ! cm.isBeanMap()) {<a name="line.595"></a> -<span class="sourceLineNo">596</span> Set<String> set = new LinkedHashSet<String>();<a name="line.596"></a> +<span class="sourceLineNo">596</span> Set<Object> set = new LinkedHashSet<Object>();<a name="line.596"></a> <span class="sourceLineNo">597</span> for (Object o : c) {<a name="line.597"></a> <span class="sourceLineNo">598</span> if (! session.canIgnoreValue(cm, null, o)) {<a name="line.598"></a> <span class="sourceLineNo">599</span> if (! cm.isInstance(o))<a name="line.599"></a> @@ -609,13 +609,13 @@ <span class="sourceLineNo">601</span> Map m = session.sort((Map)o);<a name="line.601"></a> <span class="sourceLineNo">602</span> for (Map.Entry e : (Set<Map.Entry>)m.entrySet()) {<a name="line.602"></a> <span class="sourceLineNo">603</span> if (e.getValue() != null)<a name="line.603"></a> -<span class="sourceLineNo">604</span> set.add(e.getKey() == null ? null : e.getKey().toString());<a name="line.604"></a> +<span class="sourceLineNo">604</span> set.add(e.getKey() == null ? null : e.getKey());<a name="line.604"></a> <span class="sourceLineNo">605</span> }<a name="line.605"></a> <span class="sourceLineNo">606</span> }<a name="line.606"></a> <span class="sourceLineNo">607</span> }<a name="line.607"></a> -<span class="sourceLineNo">608</span> th = set.toArray(new String[set.size()]);<a name="line.608"></a> +<span class="sourceLineNo">608</span> th = set.toArray(new Object[set.size()]);<a name="line.608"></a> <span class="sourceLineNo">609</span> } else {<a name="line.609"></a> -<span class="sourceLineNo">610</span> Set<String> set = new LinkedHashSet<String>();<a name="line.610"></a> +<span class="sourceLineNo">610</span> Set<Object> set = new LinkedHashSet<Object>();<a name="line.610"></a> <span class="sourceLineNo">611</span> for (Object o : c) {<a name="line.611"></a> <span class="sourceLineNo">612</span> if (! session.canIgnoreValue(cm, null, o)) {<a name="line.612"></a> <span class="sourceLineNo">613</span> if (! cm.isInstance(o))<a name="line.613"></a> @@ -627,7 +627,7 @@ <span class="sourceLineNo">619</span> }<a name="line.619"></a> <span class="sourceLineNo">620</span> }<a name="line.620"></a> <span class="sourceLineNo">621</span> }<a name="line.621"></a> -<span class="sourceLineNo">622</span> th = set.toArray(new String[set.size()]);<a name="line.622"></a> +<span class="sourceLineNo">622</span> th = set.toArray(new Object[set.size()]);<a name="line.622"></a> <span class="sourceLineNo">623</span> }<a name="line.623"></a> <span class="sourceLineNo">624</span> prevC.add(cm);<a name="line.624"></a> <span class="sourceLineNo">625</span> s.addAll(Arrays.asList(th));<a name="line.625"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/236aea45/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSerializer.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSerializer.html b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSerializer.html index 667dec9..3aa18df 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSerializer.html +++ b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSerializer.html @@ -487,13 +487,13 @@ <span class="sourceLineNo">479</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 handle this.<a name="line.479"></a> <span class="sourceLineNo">480</span> // If it's a map or bean, then we'll create a table.<a name="line.480"></a> <span class="sourceLineNo">481</span> // Otherwise, we'll create a list.<a name="line.481"></a> -<span class="sourceLineNo">482</span> String[] th = getTableHeaders(session, c, hbpMeta);<a name="line.482"></a> +<span class="sourceLineNo">482</span> Object[] th = getTableHeaders(session, c, hbpMeta);<a name="line.482"></a> <span class="sourceLineNo">483</span><a name="line.483"></a> <span class="sourceLineNo">484</span> if (th != null) {<a name="line.484"></a> <span class="sourceLineNo">485</span><a name="line.485"></a> <span class="sourceLineNo">486</span> out.oTag(i, "table").attr(btpn, type2).append('>').nl();<a name="line.486"></a> <span class="sourceLineNo">487</span> out.sTag(i+1, "tr").nl();<a name="line.487"></a> -<span class="sourceLineNo">488</span> for (String key : th)<a name="line.488"></a> +<span class="sourceLineNo">488</span> for (Object key : th)<a name="line.488"></a> <span class="sourceLineNo">489</span> out.sTag(i+2, "th").append(key).eTag("th").nl();<a name="line.489"></a> <span class="sourceLineNo">490</span> out.eTag(i+1, "tr").nl();<a name="line.490"></a> <span class="sourceLineNo">491</span><a name="line.491"></a> @@ -518,9 +518,9 @@ <span class="sourceLineNo">510</span> } else if (cm.isMap() && ! (cm.isBeanMap())) {<a name="line.510"></a> <span class="sourceLineNo">511</span> Map m2 = session.sort((Map)o);<a name="line.511"></a> <span class="sourceLineNo">512</span><a name="line.512"></a> -<span class="sourceLineNo">513</span> for (String k : th) {<a name="line.513"></a> +<span class="sourceLineNo">513</span> for (Object k : th) {<a name="line.513"></a> <span class="sourceLineNo">514</span> out.sTag(i+2, "td");<a name="line.514"></a> -<span class="sourceLineNo">515</span> ContentResult cr = serializeAnything(session, out, m2.get(k), seType, k, 2, null, false);<a name="line.515"></a> +<span class="sourceLineNo">515</span> ContentResult cr = serializeAnything(session, out, m2.get(k), seType, session.toString(k), 2, null, false);<a name="line.515"></a> <span class="sourceLineNo">516</span> if (cr == CR_NORMAL)<a name="line.516"></a> <span class="sourceLineNo">517</span> out.i(i+2);<a name="line.517"></a> <span class="sourceLineNo">518</span> out.eTag("td").nl();<a name="line.518"></a> @@ -532,8 +532,8 @@ <span class="sourceLineNo">524</span> else<a name="line.524"></a> <span class="sourceLineNo">525</span> m2 = session.toBeanMap(o);<a name="line.525"></a> <span class="sourceLineNo">526</span><a name="line.526"></a> -<span class="sourceLineNo">527</span> for (String k : th) {<a name="line.527"></a> -<span class="sourceLineNo">528</span> BeanMapEntry p = m2.getProperty(k);<a name="line.528"></a> +<span class="sourceLineNo">527</span> for (Object k : th) {<a name="line.527"></a> +<span class="sourceLineNo">528</span> BeanMapEntry p = m2.getProperty(session.toString(k));<a name="line.528"></a> <span class="sourceLineNo">529</span> BeanPropertyMeta pMeta = p.getMeta();<a name="line.529"></a> <span class="sourceLineNo">530</span> out.sTag(i+2, "td");<a name="line.530"></a> <span class="sourceLineNo">531</span> ContentResult cr = serializeAnything(session, out, p.getValue(), pMeta.getClassMeta(), p.getKey().toString(), 2, pMeta, false);<a name="line.531"></a> @@ -568,12 +568,12 @@ <span class="sourceLineNo">560</span> * 2-dimensional tables are used for collections of objects that all have the same set of property names.<a name="line.560"></a> <span class="sourceLineNo">561</span> */<a name="line.561"></a> <span class="sourceLineNo">562</span> @SuppressWarnings({ "rawtypes", "unchecked" })<a name="line.562"></a> -<span class="sourceLineNo">563</span> private static String[] getTableHeaders(SerializerSession session, Collection c, HtmlBeanPropertyMeta hbpMeta) throws Exception {<a name="line.563"></a> +<span class="sourceLineNo">563</span> private static Object[] getTableHeaders(SerializerSession session, Collection c, HtmlBeanPropertyMeta hbpMeta) throws Exception {<a name="line.563"></a> <span class="sourceLineNo">564</span> if (c.size() == 0)<a name="line.564"></a> <span class="sourceLineNo">565</span> return null;<a name="line.565"></a> <span class="sourceLineNo">566</span> c = session.sort(c);<a name="line.566"></a> -<span class="sourceLineNo">567</span> String[] th;<a name="line.567"></a> -<span class="sourceLineNo">568</span> Set<String> s = new TreeSet<String>();<a name="line.568"></a> +<span class="sourceLineNo">567</span> Object[] th;<a name="line.567"></a> +<span class="sourceLineNo">568</span> Set<Object> s = new TreeSet<Object>();<a name="line.568"></a> <span class="sourceLineNo">569</span> Set<ClassMeta> prevC = new HashSet<ClassMeta>();<a name="line.569"></a> <span class="sourceLineNo">570</span> Object o1 = null;<a name="line.570"></a> <span class="sourceLineNo">571</span> for (Object o : c)<a name="line.571"></a> @@ -597,11 +597,11 @@ <span class="sourceLineNo">589</span> if (h.isNoTables() || (hbpMeta != null && hbpMeta.isNoTables()))<a name="line.589"></a> <span class="sourceLineNo">590</span> return null;<a name="line.590"></a> <span class="sourceLineNo">591</span> if (h.isNoTableHeaders() || (hbpMeta != null && hbpMeta.isNoTableHeaders()))<a name="line.591"></a> -<span class="sourceLineNo">592</span> return new String[0];<a name="line.592"></a> +<span class="sourceLineNo">592</span> return new Object[0];<a name="line.592"></a> <span class="sourceLineNo">593</span> if (session.canIgnoreValue(cm, null, o1))<a name="line.593"></a> <span class="sourceLineNo">594</span> return null;<a name="line.594"></a> <span class="sourceLineNo">595</span> if (cm.isMap() && ! cm.isBeanMap()) {<a name="line.595"></a> -<span class="sourceLineNo">596</span> Set<String> set = new LinkedHashSet<String>();<a name="line.596"></a> +<span class="sourceLineNo">596</span> Set<Object> set = new LinkedHashSet<Object>();<a name="line.596"></a> <span class="sourceLineNo">597</span> for (Object o : c) {<a name="line.597"></a> <span class="sourceLineNo">598</span> if (! session.canIgnoreValue(cm, null, o)) {<a name="line.598"></a> <span class="sourceLineNo">599</span> if (! cm.isInstance(o))<a name="line.599"></a> @@ -609,13 +609,13 @@ <span class="sourceLineNo">601</span> Map m = session.sort((Map)o);<a name="line.601"></a> <span class="sourceLineNo">602</span> for (Map.Entry e : (Set<Map.Entry>)m.entrySet()) {<a name="line.602"></a> <span class="sourceLineNo">603</span> if (e.getValue() != null)<a name="line.603"></a> -<span class="sourceLineNo">604</span> set.add(e.getKey() == null ? null : e.getKey().toString());<a name="line.604"></a> +<span class="sourceLineNo">604</span> set.add(e.getKey() == null ? null : e.getKey());<a name="line.604"></a> <span class="sourceLineNo">605</span> }<a name="line.605"></a> <span class="sourceLineNo">606</span> }<a name="line.606"></a> <span class="sourceLineNo">607</span> }<a name="line.607"></a> -<span class="sourceLineNo">608</span> th = set.toArray(new String[set.size()]);<a name="line.608"></a> +<span class="sourceLineNo">608</span> th = set.toArray(new Object[set.size()]);<a name="line.608"></a> <span class="sourceLineNo">609</span> } else {<a name="line.609"></a> -<span class="sourceLineNo">610</span> Set<String> set = new LinkedHashSet<String>();<a name="line.610"></a> +<span class="sourceLineNo">610</span> Set<Object> set = new LinkedHashSet<Object>();<a name="line.610"></a> <span class="sourceLineNo">611</span> for (Object o : c) {<a name="line.611"></a> <span class="sourceLineNo">612</span> if (! session.canIgnoreValue(cm, null, o)) {<a name="line.612"></a> <span class="sourceLineNo">613</span> if (! cm.isInstance(o))<a name="line.613"></a> @@ -627,7 +627,7 @@ <span class="sourceLineNo">619</span> }<a name="line.619"></a> <span class="sourceLineNo">620</span> }<a name="line.620"></a> <span class="sourceLineNo">621</span> }<a name="line.621"></a> -<span class="sourceLineNo">622</span> th = set.toArray(new String[set.size()]);<a name="line.622"></a> +<span class="sourceLineNo">622</span> th = set.toArray(new Object[set.size()]);<a name="line.622"></a> <span class="sourceLineNo">623</span> }<a name="line.623"></a> <span class="sourceLineNo">624</span> prevC.add(cm);<a name="line.624"></a> <span class="sourceLineNo">625</span> s.addAll(Arrays.asList(th));<a name="line.625"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/236aea45/content/site/apidocs/src-html/org/apache/juneau/internal/ClassUtils.ClassComparator.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/internal/ClassUtils.ClassComparator.html b/content/site/apidocs/src-html/org/apache/juneau/internal/ClassUtils.ClassComparator.html index 347241b..8380ab1 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/internal/ClassUtils.ClassComparator.html +++ b/content/site/apidocs/src-html/org/apache/juneau/internal/ClassUtils.ClassComparator.html @@ -632,7 +632,48 @@ <span class="sourceLineNo">624</span>// private Class<?> findClass(String name) throws ClassNotFoundException {<a name="line.624"></a> <span class="sourceLineNo">625</span>// return classLoader == null ? Class.forName(name) : Class.forName(name, true, classLoader);<a name="line.625"></a> <span class="sourceLineNo">626</span>// }<a name="line.626"></a> -<span class="sourceLineNo">627</span>}<a name="line.627"></a> +<span class="sourceLineNo">627</span><a name="line.627"></a> +<span class="sourceLineNo">628</span> /**<a name="line.628"></a> +<span class="sourceLineNo">629</span> * Returns a {@link MethodInfo} bean that describes the specified method.<a name="line.629"></a> +<span class="sourceLineNo">630</span> * @param m The method to describe.<a name="line.630"></a> +<span class="sourceLineNo">631</span> * @return The bean with information about the method.<a name="line.631"></a> +<span class="sourceLineNo">632</span> */<a name="line.632"></a> +<span class="sourceLineNo">633</span> public static MethodInfo getMethodInfo(Method m) {<a name="line.633"></a> +<span class="sourceLineNo">634</span> return new MethodInfo(m);<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> /**<a name="line.637"></a> +<span class="sourceLineNo">638</span> * Returns {@link MethodInfo} beans that describe the specified methods.<a name="line.638"></a> +<span class="sourceLineNo">639</span> * @param m The methods to describe.<a name="line.639"></a> +<span class="sourceLineNo">640</span> * @return The beans with information about the methods.<a name="line.640"></a> +<span class="sourceLineNo">641</span> */<a name="line.641"></a> +<span class="sourceLineNo">642</span> public static MethodInfo[] getMethodInfo(Collection<Method> m) {<a name="line.642"></a> +<span class="sourceLineNo">643</span> MethodInfo[] mi = new MethodInfo[m.size()];<a name="line.643"></a> +<span class="sourceLineNo">644</span> int i = 0;<a name="line.644"></a> +<span class="sourceLineNo">645</span> for (Method mm : m)<a name="line.645"></a> +<span class="sourceLineNo">646</span> mi[i++] = getMethodInfo(mm);<a name="line.646"></a> +<span class="sourceLineNo">647</span> return mi;<a name="line.647"></a> +<span class="sourceLineNo">648</span> }<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> * Simple bean that shows the name, parameter types, and return type of a method.<a name="line.651"></a> +<span class="sourceLineNo">652</span> */<a name="line.652"></a> +<span class="sourceLineNo">653</span> @SuppressWarnings("javadoc")<a name="line.653"></a> +<span class="sourceLineNo">654</span> public static class MethodInfo {<a name="line.654"></a> +<span class="sourceLineNo">655</span> public final String methodName;<a name="line.655"></a> +<span class="sourceLineNo">656</span> public final String[] parameterTypes;<a name="line.656"></a> +<span class="sourceLineNo">657</span> public final String returnType;<a name="line.657"></a> +<span class="sourceLineNo">658</span><a name="line.658"></a> +<span class="sourceLineNo">659</span> MethodInfo(Method m) {<a name="line.659"></a> +<span class="sourceLineNo">660</span> methodName = m.getName();<a name="line.660"></a> +<span class="sourceLineNo">661</span> Type[] pt = m.getGenericParameterTypes();<a name="line.661"></a> +<span class="sourceLineNo">662</span> parameterTypes = new String[pt.length];<a name="line.662"></a> +<span class="sourceLineNo">663</span> for (int i = 0; i < pt.length; i++)<a name="line.663"></a> +<span class="sourceLineNo">664</span> parameterTypes[i] = BeanContext.DEFAULT.getClassMeta(pt[i]).toString();<a name="line.664"></a> +<span class="sourceLineNo">665</span> returnType = BeanContext.DEFAULT.getClassMeta(m.getGenericReturnType()).toString();<a name="line.665"></a> +<span class="sourceLineNo">666</span> }<a name="line.666"></a> +<span class="sourceLineNo">667</span> }<a name="line.667"></a> +<span class="sourceLineNo">668</span>}<a name="line.668"></a>
