http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5f11cb85/content/site/apidocs/src-html/org/apache/juneau/dto/Link.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/dto/Link.html 
b/content/site/apidocs/src-html/org/apache/juneau/dto/Link.html
index 0d11cab..c159017 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/dto/Link.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/dto/Link.html
@@ -20,129 +20,131 @@
 <span class="sourceLineNo">012</span>// 
***************************************************************************************************************************<a
 name="line.12"></a>
 <span class="sourceLineNo">013</span>package org.apache.juneau.dto;<a 
name="line.13"></a>
 <span class="sourceLineNo">014</span><a name="line.14"></a>
-<span class="sourceLineNo">015</span>import java.text.*;<a name="line.15"></a>
+<span class="sourceLineNo">015</span>import static 
org.apache.juneau.internal.StringUtils.*;<a name="line.15"></a>
 <span class="sourceLineNo">016</span><a name="line.16"></a>
-<span class="sourceLineNo">017</span>import org.apache.juneau.*;<a 
name="line.17"></a>
-<span class="sourceLineNo">018</span>import org.apache.juneau.html.*;<a 
name="line.18"></a>
-<span class="sourceLineNo">019</span>import org.apache.juneau.urlencoding.*;<a 
name="line.19"></a>
-<span class="sourceLineNo">020</span>import org.apache.juneau.utils.*;<a 
name="line.20"></a>
-<span class="sourceLineNo">021</span><a name="line.21"></a>
-<span class="sourceLineNo">022</span>/**<a name="line.22"></a>
-<span class="sourceLineNo">023</span> * Simple bean that implements a 
hyperlink for the HTML serializer.<a name="line.23"></a>
-<span class="sourceLineNo">024</span> * &lt;p&gt;<a name="line.24"></a>
-<span class="sourceLineNo">025</span> * The name and url properties correspond 
to the following parts of a hyperlink in an HTML document...<a 
name="line.25"></a>
-<span class="sourceLineNo">026</span> * &lt;p class='bcode'&gt;<a 
name="line.26"></a>
-<span class="sourceLineNo">027</span> *    &lt;xt&gt;&amp;lt;a&lt;/xt&gt; 
&lt;xa&gt;href&lt;/xa&gt;=&lt;xs&gt;'href'&lt;/xs&gt;&lt;xt&gt;&amp;gt;&lt;/xt&gt;name&lt;xt&gt;&amp;lt;/a&amp;gt;&lt;/xt&gt;<a
 name="line.27"></a>
-<span class="sourceLineNo">028</span> * &lt;p&gt;<a name="line.28"></a>
-<span class="sourceLineNo">029</span> * When encountered by the {@link 
HtmlSerializer} class, this object gets converted to a hyperlink.&lt;br&gt;<a 
name="line.29"></a>
-<span class="sourceLineNo">030</span> * All other serializers simply convert 
it to a simple bean.<a name="line.30"></a>
-<span class="sourceLineNo">031</span> */<a name="line.31"></a>
-<span class="sourceLineNo">032</span>@HtmlLink(nameProperty = "name", 
hrefProperty = "href")<a name="line.32"></a>
-<span class="sourceLineNo">033</span>public class Link implements 
Comparable&lt;Link&gt; {<a name="line.33"></a>
-<span class="sourceLineNo">034</span>   private String name, href;<a 
name="line.34"></a>
-<span class="sourceLineNo">035</span><a name="line.35"></a>
-<span class="sourceLineNo">036</span>   /** No-arg constructor. */<a 
name="line.36"></a>
-<span class="sourceLineNo">037</span>   public Link() {}<a name="line.37"></a>
-<span class="sourceLineNo">038</span><a name="line.38"></a>
-<span class="sourceLineNo">039</span>   /**<a name="line.39"></a>
-<span class="sourceLineNo">040</span>    * Constructor.<a name="line.40"></a>
-<span class="sourceLineNo">041</span>    *<a name="line.41"></a>
-<span class="sourceLineNo">042</span>    * @param name Corresponds to the text 
inside of the &lt;xt&gt;&amp;lt;A&amp;gt;&lt;/xt&gt; element.<a 
name="line.42"></a>
-<span class="sourceLineNo">043</span>    * @param href Corresponds to the 
value of the &lt;xa&gt;href&lt;/xa&gt; attribute of the 
&lt;xt&gt;&amp;lt;A&amp;gt;&lt;/xt&gt; element.<a name="line.43"></a>
-<span class="sourceLineNo">044</span>    * @param hrefArgs Optional arguments 
for {@link MessageFormat} style arguments in the href.<a name="line.44"></a>
-<span class="sourceLineNo">045</span>    */<a name="line.45"></a>
-<span class="sourceLineNo">046</span>   public Link(String name, String href, 
Object...hrefArgs) {<a name="line.46"></a>
-<span class="sourceLineNo">047</span>      setName(name);<a name="line.47"></a>
-<span class="sourceLineNo">048</span>      setHref(href, hrefArgs);<a 
name="line.48"></a>
-<span class="sourceLineNo">049</span>   }<a name="line.49"></a>
-<span class="sourceLineNo">050</span><a name="line.50"></a>
-<span class="sourceLineNo">051</span><a name="line.51"></a>
-<span class="sourceLineNo">052</span>   
//--------------------------------------------------------------------------------<a
 name="line.52"></a>
-<span class="sourceLineNo">053</span>   // Bean properties<a 
name="line.53"></a>
+<span class="sourceLineNo">017</span>import java.text.*;<a name="line.17"></a>
+<span class="sourceLineNo">018</span><a name="line.18"></a>
+<span class="sourceLineNo">019</span>import org.apache.juneau.*;<a 
name="line.19"></a>
+<span class="sourceLineNo">020</span>import org.apache.juneau.html.*;<a 
name="line.20"></a>
+<span class="sourceLineNo">021</span>import org.apache.juneau.urlencoding.*;<a 
name="line.21"></a>
+<span class="sourceLineNo">022</span>import org.apache.juneau.utils.*;<a 
name="line.22"></a>
+<span class="sourceLineNo">023</span><a name="line.23"></a>
+<span class="sourceLineNo">024</span>/**<a name="line.24"></a>
+<span class="sourceLineNo">025</span> * Simple bean that implements a 
hyperlink for the HTML serializer.<a name="line.25"></a>
+<span class="sourceLineNo">026</span> * &lt;p&gt;<a name="line.26"></a>
+<span class="sourceLineNo">027</span> * The name and url properties correspond 
to the following parts of a hyperlink in an HTML document...<a 
name="line.27"></a>
+<span class="sourceLineNo">028</span> * &lt;p class='bcode'&gt;<a 
name="line.28"></a>
+<span class="sourceLineNo">029</span> *    &lt;xt&gt;&amp;lt;a&lt;/xt&gt; 
&lt;xa&gt;href&lt;/xa&gt;=&lt;xs&gt;'href'&lt;/xs&gt;&lt;xt&gt;&amp;gt;&lt;/xt&gt;name&lt;xt&gt;&amp;lt;/a&amp;gt;&lt;/xt&gt;<a
 name="line.29"></a>
+<span class="sourceLineNo">030</span> * &lt;p&gt;<a name="line.30"></a>
+<span class="sourceLineNo">031</span> * When encountered by the {@link 
HtmlSerializer} class, this object gets converted to a hyperlink.&lt;br&gt;<a 
name="line.31"></a>
+<span class="sourceLineNo">032</span> * All other serializers simply convert 
it to a simple bean.<a name="line.32"></a>
+<span class="sourceLineNo">033</span> */<a name="line.33"></a>
+<span class="sourceLineNo">034</span>@HtmlLink(nameProperty = "name", 
hrefProperty = "href")<a name="line.34"></a>
+<span class="sourceLineNo">035</span>public class Link implements 
Comparable&lt;Link&gt; {<a name="line.35"></a>
+<span class="sourceLineNo">036</span>   private String name, href;<a 
name="line.36"></a>
+<span class="sourceLineNo">037</span><a name="line.37"></a>
+<span class="sourceLineNo">038</span>   /** No-arg constructor. */<a 
name="line.38"></a>
+<span class="sourceLineNo">039</span>   public Link() {}<a name="line.39"></a>
+<span class="sourceLineNo">040</span><a name="line.40"></a>
+<span class="sourceLineNo">041</span>   /**<a name="line.41"></a>
+<span class="sourceLineNo">042</span>    * Constructor.<a name="line.42"></a>
+<span class="sourceLineNo">043</span>    *<a name="line.43"></a>
+<span class="sourceLineNo">044</span>    * @param name Corresponds to the text 
inside of the &lt;xt&gt;&amp;lt;A&amp;gt;&lt;/xt&gt; element.<a 
name="line.44"></a>
+<span class="sourceLineNo">045</span>    * @param href Corresponds to the 
value of the &lt;xa&gt;href&lt;/xa&gt; attribute of the 
&lt;xt&gt;&amp;lt;A&amp;gt;&lt;/xt&gt; element.<a name="line.45"></a>
+<span class="sourceLineNo">046</span>    * @param hrefArgs Optional arguments 
for {@link MessageFormat} style arguments in the href.<a name="line.46"></a>
+<span class="sourceLineNo">047</span>    */<a name="line.47"></a>
+<span class="sourceLineNo">048</span>   public Link(String name, String href, 
Object...hrefArgs) {<a name="line.48"></a>
+<span class="sourceLineNo">049</span>      setName(name);<a name="line.49"></a>
+<span class="sourceLineNo">050</span>      setHref(href, hrefArgs);<a 
name="line.50"></a>
+<span class="sourceLineNo">051</span>   }<a name="line.51"></a>
+<span class="sourceLineNo">052</span><a name="line.52"></a>
+<span class="sourceLineNo">053</span><a name="line.53"></a>
 <span class="sourceLineNo">054</span>   
//--------------------------------------------------------------------------------<a
 name="line.54"></a>
-<span class="sourceLineNo">055</span><a name="line.55"></a>
-<span class="sourceLineNo">056</span>   /**<a name="line.56"></a>
-<span class="sourceLineNo">057</span>    * Bean property getter:  
&lt;property&gt;name&lt;/property&gt;.<a name="line.57"></a>
-<span class="sourceLineNo">058</span>    * Corresponds to the text inside of 
the &lt;xt&gt;&amp;lt;A&amp;gt;&lt;/xt&gt; element.<a name="line.58"></a>
-<span class="sourceLineNo">059</span>    *<a name="line.59"></a>
-<span class="sourceLineNo">060</span>    * @return The value of the 
&lt;property&gt;name&lt;/property&gt; property on this bean, or 
&lt;jk&gt;null&lt;/jk&gt; if it is not set.<a name="line.60"></a>
-<span class="sourceLineNo">061</span>    */<a name="line.61"></a>
-<span class="sourceLineNo">062</span>   public String getName() {<a 
name="line.62"></a>
-<span class="sourceLineNo">063</span>      return name;<a name="line.63"></a>
-<span class="sourceLineNo">064</span>   }<a name="line.64"></a>
-<span class="sourceLineNo">065</span><a name="line.65"></a>
-<span class="sourceLineNo">066</span>   /**<a name="line.66"></a>
-<span class="sourceLineNo">067</span>    * Bean property setter:  
&lt;property&gt;name&lt;/property&gt;.<a name="line.67"></a>
-<span class="sourceLineNo">068</span>    *<a name="line.68"></a>
-<span class="sourceLineNo">069</span>    * @param name The new value for the 
&lt;property&gt;name&lt;/property&gt; property on this bean.<a 
name="line.69"></a>
-<span class="sourceLineNo">070</span>    * @return This object (for method 
chaining).<a name="line.70"></a>
-<span class="sourceLineNo">071</span>    */<a name="line.71"></a>
-<span class="sourceLineNo">072</span>   public Link setName(String name) {<a 
name="line.72"></a>
-<span class="sourceLineNo">073</span>      this.name = name;<a 
name="line.73"></a>
-<span class="sourceLineNo">074</span>      return this;<a name="line.74"></a>
-<span class="sourceLineNo">075</span>   }<a name="line.75"></a>
-<span class="sourceLineNo">076</span><a name="line.76"></a>
-<span class="sourceLineNo">077</span>   /**<a name="line.77"></a>
-<span class="sourceLineNo">078</span>    * Bean property getter:  
&lt;property&gt;href&lt;/property&gt;.<a name="line.78"></a>
-<span class="sourceLineNo">079</span>    * Corresponds to the value of the 
&lt;xa&gt;href&lt;/xa&gt; attribute of the 
&lt;xt&gt;&amp;lt;A&amp;gt;&lt;/xt&gt; element.<a name="line.79"></a>
-<span class="sourceLineNo">080</span>    *<a name="line.80"></a>
-<span class="sourceLineNo">081</span>    * @return The value of the 
&lt;property&gt;href&lt;/property&gt; property on this bean, or 
&lt;jk&gt;null&lt;/jk&gt; if it is not set.<a name="line.81"></a>
-<span class="sourceLineNo">082</span>    */<a name="line.82"></a>
-<span class="sourceLineNo">083</span>   public String getHref() {<a 
name="line.83"></a>
-<span class="sourceLineNo">084</span>      return href;<a name="line.84"></a>
-<span class="sourceLineNo">085</span>   }<a name="line.85"></a>
-<span class="sourceLineNo">086</span><a name="line.86"></a>
-<span class="sourceLineNo">087</span>   /**<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    * Bean property setter:  
&lt;property&gt;href&lt;/property&gt;.<a name="line.88"></a>
-<span class="sourceLineNo">089</span>    *<a name="line.89"></a>
-<span class="sourceLineNo">090</span>    * @param href The new value for the 
&lt;property&gt;href&lt;/property&gt; property on this bean.<a 
name="line.90"></a>
-<span class="sourceLineNo">091</span>    * @return This object (for method 
chaining).<a name="line.91"></a>
-<span class="sourceLineNo">092</span>    */<a name="line.92"></a>
-<span class="sourceLineNo">093</span>   public Link setHref(String href) {<a 
name="line.93"></a>
-<span class="sourceLineNo">094</span>      setHref(href, new Object[0]);<a 
name="line.94"></a>
-<span class="sourceLineNo">095</span>      return this;<a name="line.95"></a>
-<span class="sourceLineNo">096</span>   }<a name="line.96"></a>
-<span class="sourceLineNo">097</span><a name="line.97"></a>
-<span class="sourceLineNo">098</span>   /**<a name="line.98"></a>
-<span class="sourceLineNo">099</span>    * Bean property setter:  
&lt;property&gt;href&lt;/property&gt;.<a name="line.99"></a>
-<span class="sourceLineNo">100</span>    * Same as {@link #setHref(String)} 
except allows for {@link MessageFormat} style arguments.<a name="line.100"></a>
-<span class="sourceLineNo">101</span>    *<a name="line.101"></a>
-<span class="sourceLineNo">102</span>    * @param href The new href.<a 
name="line.102"></a>
-<span class="sourceLineNo">103</span>    * @param args Optional {@link 
MessageFormat}-style arguments.<a name="line.103"></a>
-<span class="sourceLineNo">104</span>    * @return This object (for method 
chaining).<a name="line.104"></a>
-<span class="sourceLineNo">105</span>    */<a name="line.105"></a>
-<span class="sourceLineNo">106</span>   public Link setHref(String href, 
Object...args) {<a name="line.106"></a>
-<span class="sourceLineNo">107</span>      for (int i = 0; i &lt; args.length; 
i++)<a name="line.107"></a>
-<span class="sourceLineNo">108</span>         args[i] = 
UrlEncodingSerializer.DEFAULT.serialize(PartType.PATH, args[i]);<a 
name="line.108"></a>
-<span class="sourceLineNo">109</span>      this.href = (args.length &gt; 0 ? 
MessageFormat.format(href, args) : href);<a name="line.109"></a>
-<span class="sourceLineNo">110</span>      return this;<a name="line.110"></a>
-<span class="sourceLineNo">111</span>   }<a name="line.111"></a>
-<span class="sourceLineNo">112</span><a name="line.112"></a>
-<span class="sourceLineNo">113</span>   /**<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    * Returns the name so that the {@link 
PojoQuery} class can search against it.<a name="line.114"></a>
-<span class="sourceLineNo">115</span>    */<a name="line.115"></a>
-<span class="sourceLineNo">116</span>   @Override /* Object */<a 
name="line.116"></a>
-<span class="sourceLineNo">117</span>   public String toString() {<a 
name="line.117"></a>
-<span class="sourceLineNo">118</span>      return name;<a name="line.118"></a>
-<span class="sourceLineNo">119</span>   }<a name="line.119"></a>
-<span class="sourceLineNo">120</span><a name="line.120"></a>
-<span class="sourceLineNo">121</span>   @Override /* Comparable */<a 
name="line.121"></a>
-<span class="sourceLineNo">122</span>   public int compareTo(Link o) {<a 
name="line.122"></a>
-<span class="sourceLineNo">123</span>      return name.compareTo(o.name);<a 
name="line.123"></a>
-<span class="sourceLineNo">124</span>   }<a name="line.124"></a>
-<span class="sourceLineNo">125</span><a name="line.125"></a>
-<span class="sourceLineNo">126</span>   @Override /* Object */<a 
name="line.126"></a>
-<span class="sourceLineNo">127</span>   public boolean equals(Object o) {<a 
name="line.127"></a>
-<span class="sourceLineNo">128</span>      if (! (o instanceof Link))<a 
name="line.128"></a>
-<span class="sourceLineNo">129</span>         return false;<a 
name="line.129"></a>
-<span class="sourceLineNo">130</span>      return (compareTo((Link)o) == 0);<a 
name="line.130"></a>
-<span class="sourceLineNo">131</span>   }<a name="line.131"></a>
-<span class="sourceLineNo">132</span><a name="line.132"></a>
-<span class="sourceLineNo">133</span>   @Override /* Object */<a 
name="line.133"></a>
-<span class="sourceLineNo">134</span>   public int hashCode() {<a 
name="line.134"></a>
-<span class="sourceLineNo">135</span>      return super.hashCode();<a 
name="line.135"></a>
-<span class="sourceLineNo">136</span>   }<a name="line.136"></a>
-<span class="sourceLineNo">137</span>}<a name="line.137"></a>
+<span class="sourceLineNo">055</span>   // Bean properties<a 
name="line.55"></a>
+<span class="sourceLineNo">056</span>   
//--------------------------------------------------------------------------------<a
 name="line.56"></a>
+<span class="sourceLineNo">057</span><a name="line.57"></a>
+<span class="sourceLineNo">058</span>   /**<a name="line.58"></a>
+<span class="sourceLineNo">059</span>    * Bean property getter:  
&lt;property&gt;name&lt;/property&gt;.<a name="line.59"></a>
+<span class="sourceLineNo">060</span>    * Corresponds to the text inside of 
the &lt;xt&gt;&amp;lt;A&amp;gt;&lt;/xt&gt; element.<a name="line.60"></a>
+<span class="sourceLineNo">061</span>    *<a name="line.61"></a>
+<span class="sourceLineNo">062</span>    * @return The value of the 
&lt;property&gt;name&lt;/property&gt; property on this bean, or 
&lt;jk&gt;null&lt;/jk&gt; if it is not set.<a name="line.62"></a>
+<span class="sourceLineNo">063</span>    */<a name="line.63"></a>
+<span class="sourceLineNo">064</span>   public String getName() {<a 
name="line.64"></a>
+<span class="sourceLineNo">065</span>      return name;<a name="line.65"></a>
+<span class="sourceLineNo">066</span>   }<a name="line.66"></a>
+<span class="sourceLineNo">067</span><a name="line.67"></a>
+<span class="sourceLineNo">068</span>   /**<a name="line.68"></a>
+<span class="sourceLineNo">069</span>    * Bean property setter:  
&lt;property&gt;name&lt;/property&gt;.<a name="line.69"></a>
+<span class="sourceLineNo">070</span>    *<a name="line.70"></a>
+<span class="sourceLineNo">071</span>    * @param name The new value for the 
&lt;property&gt;name&lt;/property&gt; property on this bean.<a 
name="line.71"></a>
+<span class="sourceLineNo">072</span>    * @return This object (for method 
chaining).<a name="line.72"></a>
+<span class="sourceLineNo">073</span>    */<a name="line.73"></a>
+<span class="sourceLineNo">074</span>   public Link setName(String name) {<a 
name="line.74"></a>
+<span class="sourceLineNo">075</span>      this.name = name;<a 
name="line.75"></a>
+<span class="sourceLineNo">076</span>      return this;<a name="line.76"></a>
+<span class="sourceLineNo">077</span>   }<a name="line.77"></a>
+<span class="sourceLineNo">078</span><a name="line.78"></a>
+<span class="sourceLineNo">079</span>   /**<a name="line.79"></a>
+<span class="sourceLineNo">080</span>    * Bean property getter:  
&lt;property&gt;href&lt;/property&gt;.<a name="line.80"></a>
+<span class="sourceLineNo">081</span>    * Corresponds to the value of the 
&lt;xa&gt;href&lt;/xa&gt; attribute of the 
&lt;xt&gt;&amp;lt;A&amp;gt;&lt;/xt&gt; element.<a name="line.81"></a>
+<span class="sourceLineNo">082</span>    *<a name="line.82"></a>
+<span class="sourceLineNo">083</span>    * @return The value of the 
&lt;property&gt;href&lt;/property&gt; property on this bean, or 
&lt;jk&gt;null&lt;/jk&gt; if it is not set.<a name="line.83"></a>
+<span class="sourceLineNo">084</span>    */<a name="line.84"></a>
+<span class="sourceLineNo">085</span>   public String getHref() {<a 
name="line.85"></a>
+<span class="sourceLineNo">086</span>      return href;<a name="line.86"></a>
+<span class="sourceLineNo">087</span>   }<a name="line.87"></a>
+<span class="sourceLineNo">088</span><a name="line.88"></a>
+<span class="sourceLineNo">089</span>   /**<a name="line.89"></a>
+<span class="sourceLineNo">090</span>    * Bean property setter:  
&lt;property&gt;href&lt;/property&gt;.<a name="line.90"></a>
+<span class="sourceLineNo">091</span>    *<a name="line.91"></a>
+<span class="sourceLineNo">092</span>    * @param href The new value for the 
&lt;property&gt;href&lt;/property&gt; property on this bean.<a 
name="line.92"></a>
+<span class="sourceLineNo">093</span>    * @return This object (for method 
chaining).<a name="line.93"></a>
+<span class="sourceLineNo">094</span>    */<a name="line.94"></a>
+<span class="sourceLineNo">095</span>   public Link setHref(String href) {<a 
name="line.95"></a>
+<span class="sourceLineNo">096</span>      setHref(href, new Object[0]);<a 
name="line.96"></a>
+<span class="sourceLineNo">097</span>      return this;<a name="line.97"></a>
+<span class="sourceLineNo">098</span>   }<a name="line.98"></a>
+<span class="sourceLineNo">099</span><a name="line.99"></a>
+<span class="sourceLineNo">100</span>   /**<a name="line.100"></a>
+<span class="sourceLineNo">101</span>    * Bean property setter:  
&lt;property&gt;href&lt;/property&gt;.<a name="line.101"></a>
+<span class="sourceLineNo">102</span>    * Same as {@link #setHref(String)} 
except allows for {@link MessageFormat} style arguments.<a name="line.102"></a>
+<span class="sourceLineNo">103</span>    *<a name="line.103"></a>
+<span class="sourceLineNo">104</span>    * @param href The new href.<a 
name="line.104"></a>
+<span class="sourceLineNo">105</span>    * @param args Optional {@link 
MessageFormat}-style arguments.<a name="line.105"></a>
+<span class="sourceLineNo">106</span>    * @return This object (for method 
chaining).<a name="line.106"></a>
+<span class="sourceLineNo">107</span>    */<a name="line.107"></a>
+<span class="sourceLineNo">108</span>   public Link setHref(String href, 
Object...args) {<a name="line.108"></a>
+<span class="sourceLineNo">109</span>      for (int i = 0; i &lt; args.length; 
i++)<a name="line.109"></a>
+<span class="sourceLineNo">110</span>         args[i] = 
UrlEncodingSerializer.DEFAULT.serialize(PartType.PATH, args[i]);<a 
name="line.110"></a>
+<span class="sourceLineNo">111</span>      this.href = format(href, args);<a 
name="line.111"></a>
+<span class="sourceLineNo">112</span>      return this;<a name="line.112"></a>
+<span class="sourceLineNo">113</span>   }<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>    * Returns the name so that the {@link 
PojoQuery} class can search against it.<a name="line.116"></a>
+<span class="sourceLineNo">117</span>    */<a name="line.117"></a>
+<span class="sourceLineNo">118</span>   @Override /* Object */<a 
name="line.118"></a>
+<span class="sourceLineNo">119</span>   public String toString() {<a 
name="line.119"></a>
+<span class="sourceLineNo">120</span>      return name;<a name="line.120"></a>
+<span class="sourceLineNo">121</span>   }<a name="line.121"></a>
+<span class="sourceLineNo">122</span><a name="line.122"></a>
+<span class="sourceLineNo">123</span>   @Override /* Comparable */<a 
name="line.123"></a>
+<span class="sourceLineNo">124</span>   public int compareTo(Link o) {<a 
name="line.124"></a>
+<span class="sourceLineNo">125</span>      return name.compareTo(o.name);<a 
name="line.125"></a>
+<span class="sourceLineNo">126</span>   }<a name="line.126"></a>
+<span class="sourceLineNo">127</span><a name="line.127"></a>
+<span class="sourceLineNo">128</span>   @Override /* Object */<a 
name="line.128"></a>
+<span class="sourceLineNo">129</span>   public boolean equals(Object o) {<a 
name="line.129"></a>
+<span class="sourceLineNo">130</span>      if (! (o instanceof Link))<a 
name="line.130"></a>
+<span class="sourceLineNo">131</span>         return false;<a 
name="line.131"></a>
+<span class="sourceLineNo">132</span>      return (compareTo((Link)o) == 0);<a 
name="line.132"></a>
+<span class="sourceLineNo">133</span>   }<a name="line.133"></a>
+<span class="sourceLineNo">134</span><a name="line.134"></a>
+<span class="sourceLineNo">135</span>   @Override /* Object */<a 
name="line.135"></a>
+<span class="sourceLineNo">136</span>   public int hashCode() {<a 
name="line.136"></a>
+<span class="sourceLineNo">137</span>      return super.hashCode();<a 
name="line.137"></a>
+<span class="sourceLineNo">138</span>   }<a name="line.138"></a>
+<span class="sourceLineNo">139</span>}<a name="line.139"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5f11cb85/content/site/apidocs/src-html/org/apache/juneau/html/HtmlDocSerializerContext.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlDocSerializerContext.html
 
b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlDocSerializerContext.html
index f4b3ea9..1a2abf3 100644
--- 
a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlDocSerializerContext.html
+++ 
b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlDocSerializerContext.html
@@ -286,7 +286,7 @@
 <span class="sourceLineNo">278</span>    *    &lt;jk&gt;public 
class&lt;/jk&gt; AddressBookResource &lt;jk&gt;extends&lt;/jk&gt; 
RestServletJenaDefault {<a name="line.278"></a>
 <span class="sourceLineNo">279</span>    * &lt;/p&gt;<a name="line.279"></a>
 <span class="sourceLineNo">280</span>    * &lt;p&gt;<a name="line.280"></a>
-<span class="sourceLineNo">281</span>    * Values that start with 
&lt;js&gt;'&amp;lt;'&lt;/js&gt; are assumed to be HTML and rendered as-is. <a 
name="line.281"></a>
+<span class="sourceLineNo">281</span>    * Values that start with 
&lt;js&gt;'&amp;lt;'&lt;/js&gt; are assumed to be HTML and rendered as-is.<a 
name="line.281"></a>
 <span class="sourceLineNo">282</span>    */<a name="line.282"></a>
 <span class="sourceLineNo">283</span>   public static final String 
HTMLDOC_links = "HtmlDocSerializer.links.map";<a name="line.283"></a>
 <span class="sourceLineNo">284</span><a name="line.284"></a>
@@ -399,7 +399,7 @@
 <span class="sourceLineNo">391</span>    * &lt;p class='bcode'&gt;<a 
name="line.391"></a>
 <span class="sourceLineNo">392</span>    *    
&lt;ja&gt;@RestResource&lt;/ja&gt;(<a name="line.392"></a>
 <span class="sourceLineNo">393</span>    *       
htmldoc=&lt;ja&gt;@HtmlDoc&lt;/ja&gt;(<a name="line.393"></a>
-<span class="sourceLineNo">394</span>    *          
=&lt;js&gt;"&amp;lt;b&amp;gt;This interface is 
great!&amp;lt;/b&amp;gt;"&lt;/js&gt;<a name="line.394"></a>
+<span class="sourceLineNo">394</span>    *          
noResultsMessage=&lt;js&gt;"&amp;lt;b&amp;gt;This interface is 
great!&amp;lt;/b&amp;gt;"&lt;/js&gt;<a name="line.394"></a>
 <span class="sourceLineNo">395</span>    *       )<a name="line.395"></a>
 <span class="sourceLineNo">396</span>    *    )<a name="line.396"></a>
 <span class="sourceLineNo">397</span>    * &lt;/p&gt;<a name="line.397"></a>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5f11cb85/content/site/apidocs/src-html/org/apache/juneau/html/HtmlDocSerializerSession.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlDocSerializerSession.html
 
b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlDocSerializerSession.html
index 7b0bb8d..28bd65d 100644
--- 
a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlDocSerializerSession.html
+++ 
b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlDocSerializerSession.html
@@ -92,8 +92,8 @@
 <span class="sourceLineNo">084</span>         Map m = op.getMap(HTMLDOC_links, 
ctx.links);<a name="line.84"></a>
 <span class="sourceLineNo">085</span>         links = ObjectUtils.isEmpty(m) ? 
null : new LinkedHashMap(m);<a name="line.85"></a>
 <span class="sourceLineNo">086</span>         cssUrl = 
op.getString(HTMLDOC_cssUrl, ctx.cssUrl);<a name="line.86"></a>
-<span class="sourceLineNo">087</span>         css = 
split(op.getString(HTMLDOC_css, null), ',');<a name="line.87"></a>
-<span class="sourceLineNo">088</span>         nowrap = 
op.getBoolean(HTMLDOC_cssUrl, ctx.nowrap);<a name="line.88"></a>
+<span class="sourceLineNo">087</span>         css = 
split(op.getString(HTMLDOC_css, null));<a name="line.87"></a>
+<span class="sourceLineNo">088</span>         nowrap = 
op.getBoolean(HTMLDOC_nowrap, ctx.nowrap);<a name="line.88"></a>
 <span class="sourceLineNo">089</span>         noResultsMessage = 
op.getString(HTMLDOC_noResultsMessage, ctx.noResultsMessage);<a 
name="line.89"></a>
 <span class="sourceLineNo">090</span>         template = 
ClassUtils.newInstance(HtmlDocTemplate.class, op.get(HTMLDOC_template, 
ctx.template));<a name="line.90"></a>
 <span class="sourceLineNo">091</span>      }<a name="line.91"></a>

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/5f11cb85/content/site/apidocs/src-html/org/apache/juneau/html/HtmlDocTemplateBasic.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlDocTemplateBasic.html
 
b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlDocTemplateBasic.html
index 494bb98..b48f6e5 100644
--- 
a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlDocTemplateBasic.html
+++ 
b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlDocTemplateBasic.html
@@ -50,7 +50,7 @@
 <span class="sourceLineNo">042</span><a name="line.42"></a>
 <span class="sourceLineNo">043</span>      w.append(2, "@import 
").q().append(cssUrl).q().appendln(";");<a name="line.43"></a>
 <span class="sourceLineNo">044</span>      if (session.isNoWrap())<a 
name="line.44"></a>
-<span class="sourceLineNo">045</span>         w.appendln("\n* 
{white-space:nowrap;}");<a name="line.45"></a>
+<span class="sourceLineNo">045</span>         w.appendln("\ndiv.data * 
{white-space:nowrap;}");<a name="line.45"></a>
 <span class="sourceLineNo">046</span>      if (session.getCss() != null)<a 
name="line.46"></a>
 <span class="sourceLineNo">047</span>         for (String css : 
session.getCss())<a name="line.47"></a>
 <span class="sourceLineNo">048</span>            w.appendln(css);<a 
name="line.48"></a>
@@ -104,9 +104,9 @@
 <span class="sourceLineNo">096</span>         String description = 
session.getDescription();<a name="line.96"></a>
 <span class="sourceLineNo">097</span>         String branding = 
session.getBranding();<a name="line.97"></a>
 <span class="sourceLineNo">098</span>         if (exists(title))<a 
name="line.98"></a>
-<span class="sourceLineNo">099</span>            w.oTag(3, "h3").attr("class", 
"title").append('&gt;').text(title).eTag("h3").nl(3);<a name="line.99"></a>
+<span class="sourceLineNo">099</span>            w.oTag(3, "h3").attr("class", 
"title").append('&gt;').append(title).eTag("h3").nl(3);<a name="line.99"></a>
 <span class="sourceLineNo">100</span>         if (exists(description))<a 
name="line.100"></a>
-<span class="sourceLineNo">101</span>            w.oTag(3, "h5").attr("class", 
"description").append('&gt;').text(description).eTag("h5").nl(3);<a 
name="line.101"></a>
+<span class="sourceLineNo">101</span>            w.oTag(3, "h5").attr("class", 
"description").append('&gt;').append(description).eTag("h5").nl(3);<a 
name="line.101"></a>
 <span class="sourceLineNo">102</span>         if (exists(branding))<a 
name="line.102"></a>
 <span class="sourceLineNo">103</span>            w.append(3, 
branding).nl(3);<a name="line.103"></a>
 <span class="sourceLineNo">104</span>      }<a name="line.104"></a>

Reply via email to