juneau-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamesbog...@apache.org
Subject [17/30] incubator-juneau-website git commit: Update javadocs
Date Tue, 11 Jul 2017 01:33:41 GMT
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/9b48e212/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 4bbbc49..04cb376 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
@@ -42,7 +42,7 @@
 <span class="sourceLineNo">034</span> */<a name="line.34"></a>
 <span class="sourceLineNo">035</span>public final class HtmlDocSerializerSession extends HtmlSerializerSession {<a name="line.35"></a>
 <span class="sourceLineNo">036</span><a name="line.36"></a>
-<span class="sourceLineNo">037</span>   private final String title, description, branding, header, nav, aside, footer, noResultsMessage;<a name="line.37"></a>
+<span class="sourceLineNo">037</span>   private final String header, nav, aside, footer, noResultsMessage;<a name="line.37"></a>
 <span class="sourceLineNo">038</span>   private final String[] style, stylesheet, script, links;<a name="line.38"></a>
 <span class="sourceLineNo">039</span>   private final boolean nowrap;<a name="line.39"></a>
 <span class="sourceLineNo">040</span>   private final HtmlDocTemplate template;<a name="line.40"></a>
@@ -75,209 +75,168 @@
 <span class="sourceLineNo">067</span>         Locale locale, TimeZone timeZone, MediaType mediaType, UriContext uriContext) {<a name="line.67"></a>
 <span class="sourceLineNo">068</span>      super(ctx, op, output, javaMethod, locale, timeZone, mediaType, uriContext);<a name="line.68"></a>
 <span class="sourceLineNo">069</span>      if (op == null || op.isEmpty()) {<a name="line.69"></a>
-<span class="sourceLineNo">070</span>         title = ctx.title;<a name="line.70"></a>
-<span class="sourceLineNo">071</span>         description = ctx.description;<a name="line.71"></a>
-<span class="sourceLineNo">072</span>         branding = ctx.branding;<a name="line.72"></a>
-<span class="sourceLineNo">073</span>         header = ctx.header;<a name="line.73"></a>
-<span class="sourceLineNo">074</span>         nav = ctx.nav;<a name="line.74"></a>
-<span class="sourceLineNo">075</span>         aside = ctx.aside;<a name="line.75"></a>
-<span class="sourceLineNo">076</span>         footer = ctx.footer;<a name="line.76"></a>
-<span class="sourceLineNo">077</span>         links = ctx.links;<a name="line.77"></a>
-<span class="sourceLineNo">078</span>         style = ctx.style;<a name="line.78"></a>
-<span class="sourceLineNo">079</span>         stylesheet = ctx.stylesheet;<a name="line.79"></a>
-<span class="sourceLineNo">080</span>         script = ctx.script;<a name="line.80"></a>
-<span class="sourceLineNo">081</span>         nowrap = ctx.nowrap;<a name="line.81"></a>
-<span class="sourceLineNo">082</span>         noResultsMessage = ctx.noResultsMessage;<a name="line.82"></a>
-<span class="sourceLineNo">083</span>         template = ClassUtils.newInstance(HtmlDocTemplate.class, ctx.template);<a name="line.83"></a>
-<span class="sourceLineNo">084</span>      } else {<a name="line.84"></a>
-<span class="sourceLineNo">085</span>         title = op.getString(HTMLDOC_title, ctx.title);<a name="line.85"></a>
-<span class="sourceLineNo">086</span>         description = op.getString(HTMLDOC_description, ctx.description);<a name="line.86"></a>
-<span class="sourceLineNo">087</span>         branding = op.getString(HTMLDOC_branding, ctx.branding);<a name="line.87"></a>
-<span class="sourceLineNo">088</span>         header = op.getString(HTMLDOC_header, ctx.nav);<a name="line.88"></a>
-<span class="sourceLineNo">089</span>         nav = op.getString(HTMLDOC_nav, ctx.nav);<a name="line.89"></a>
-<span class="sourceLineNo">090</span>         aside = op.getString(HTMLDOC_aside, ctx.aside);<a name="line.90"></a>
-<span class="sourceLineNo">091</span>         footer = op.getString(HTMLDOC_footer, ctx.footer);<a name="line.91"></a>
-<span class="sourceLineNo">092</span>         links = op.getStringArray(HTMLDOC_links, ctx.links);<a name="line.92"></a>
-<span class="sourceLineNo">093</span>         style = op.getStringArray(HTMLDOC_style, ctx.style);<a name="line.93"></a>
-<span class="sourceLineNo">094</span>         stylesheet = op.getStringArray(HTMLDOC_stylesheet, ctx.stylesheet);<a name="line.94"></a>
-<span class="sourceLineNo">095</span>         script = op.getStringArray(HTMLDOC_script, ctx.script);<a name="line.95"></a>
-<span class="sourceLineNo">096</span>         nowrap = op.getBoolean(HTMLDOC_nowrap, ctx.nowrap);<a name="line.96"></a>
-<span class="sourceLineNo">097</span>         noResultsMessage = op.getString(HTMLDOC_noResultsMessage, ctx.noResultsMessage);<a name="line.97"></a>
-<span class="sourceLineNo">098</span>         template = ClassUtils.newInstance(HtmlDocTemplate.class, op.get(HTMLDOC_template, ctx.template));<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><a name="line.101"></a>
-<span class="sourceLineNo">102</span>   /**<a name="line.102"></a>
-<span class="sourceLineNo">103</span>    * Returns the {@link HtmlDocSerializerContext#HTMLDOC_style} setting value in this context.<a name="line.103"></a>
-<span class="sourceLineNo">104</span>    *<a name="line.104"></a>
-<span class="sourceLineNo">105</span>    * @return<a name="line.105"></a>
-<span class="sourceLineNo">106</span>    *    The {@link HtmlDocSerializerContext#HTMLDOC_style} setting value in this context.<a name="line.106"></a>
-<span class="sourceLineNo">107</span>    *    An empty array if not specified.<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    *    Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.108"></a>
-<span class="sourceLineNo">109</span>    */<a name="line.109"></a>
-<span class="sourceLineNo">110</span>   public final String[] getStyle() {<a name="line.110"></a>
-<span class="sourceLineNo">111</span>      return style;<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>   /**<a name="line.114"></a>
-<span class="sourceLineNo">115</span>    * Returns the {@link HtmlDocSerializerContext#HTMLDOC_stylesheet} setting value in this context.<a name="line.115"></a>
-<span class="sourceLineNo">116</span>    *<a name="line.116"></a>
-<span class="sourceLineNo">117</span>    * @return<a name="line.117"></a>
-<span class="sourceLineNo">118</span>    *    The {@link HtmlDocSerializerContext#HTMLDOC_stylesheet} setting value in this context.<a name="line.118"></a>
-<span class="sourceLineNo">119</span>    *    An empty array if not specified.<a name="line.119"></a>
-<span class="sourceLineNo">120</span>    *    Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    */<a name="line.121"></a>
-<span class="sourceLineNo">122</span>   public final String[] getStylesheet() {<a name="line.122"></a>
-<span class="sourceLineNo">123</span>      return stylesheet;<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>   /**<a name="line.126"></a>
-<span class="sourceLineNo">127</span>    * Returns the {@link HtmlDocSerializerContext#HTMLDOC_script} setting value in this context.<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    *<a name="line.128"></a>
-<span class="sourceLineNo">129</span>    * @return<a name="line.129"></a>
-<span class="sourceLineNo">130</span>    *    The {@link HtmlDocSerializerContext#HTMLDOC_script} setting value in this context.<a name="line.130"></a>
-<span class="sourceLineNo">131</span>    *    An empty array if not specified.<a name="line.131"></a>
-<span class="sourceLineNo">132</span>    *    Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.132"></a>
-<span class="sourceLineNo">133</span>    */<a name="line.133"></a>
-<span class="sourceLineNo">134</span>   public final String[] getScript() {<a name="line.134"></a>
-<span class="sourceLineNo">135</span>      return script;<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">138</span>   /**<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    * Returns the {@link HtmlDocSerializerContext#HTMLDOC_nowrap} setting value in this context.<a name="line.139"></a>
-<span class="sourceLineNo">140</span>    *<a name="line.140"></a>
-<span class="sourceLineNo">141</span>    * @return The {@link HtmlDocSerializerContext#HTMLDOC_nowrap} setting value in this context.<a name="line.141"></a>
-<span class="sourceLineNo">142</span>    */<a name="line.142"></a>
-<span class="sourceLineNo">143</span>   public final boolean isNoWrap() {<a name="line.143"></a>
-<span class="sourceLineNo">144</span>      return nowrap;<a name="line.144"></a>
-<span class="sourceLineNo">145</span>   }<a name="line.145"></a>
-<span class="sourceLineNo">146</span><a name="line.146"></a>
-<span class="sourceLineNo">147</span>   /**<a name="line.147"></a>
-<span class="sourceLineNo">148</span>    * Returns the {@link HtmlDocSerializerContext#HTMLDOC_title} setting value in this context.<a name="line.148"></a>
-<span class="sourceLineNo">149</span>    *<a name="line.149"></a>
-<span class="sourceLineNo">150</span>    * @return<a name="line.150"></a>
-<span class="sourceLineNo">151</span>    *    The {@link HtmlDocSerializerContext#HTMLDOC_title} setting value in this context.<a name="line.151"></a>
-<span class="sourceLineNo">152</span>    *    &lt;jk&gt;null&lt;/jk&gt; if not specified.  Never an empty string.<a name="line.152"></a>
-<span class="sourceLineNo">153</span>    */<a name="line.153"></a>
-<span class="sourceLineNo">154</span>   public final String getTitle() {<a name="line.154"></a>
-<span class="sourceLineNo">155</span>      return title;<a name="line.155"></a>
-<span class="sourceLineNo">156</span>   }<a name="line.156"></a>
-<span class="sourceLineNo">157</span><a name="line.157"></a>
-<span class="sourceLineNo">158</span>   /**<a name="line.158"></a>
-<span class="sourceLineNo">159</span>    * Returns the {@link HtmlDocSerializerContext#HTMLDOC_description} setting value in this context.<a name="line.159"></a>
-<span class="sourceLineNo">160</span>    *<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    * @return<a name="line.161"></a>
-<span class="sourceLineNo">162</span>    *    The {@link HtmlDocSerializerContext#HTMLDOC_description} setting value in this context.<a name="line.162"></a>
-<span class="sourceLineNo">163</span>    *    &lt;jk&gt;null&lt;/jk&gt; if not specified.<a name="line.163"></a>
-<span class="sourceLineNo">164</span>    *    Never an empty string.<a name="line.164"></a>
-<span class="sourceLineNo">165</span>    */<a name="line.165"></a>
-<span class="sourceLineNo">166</span>   public final String getDescription() {<a name="line.166"></a>
-<span class="sourceLineNo">167</span>      return description;<a name="line.167"></a>
-<span class="sourceLineNo">168</span>   }<a name="line.168"></a>
-<span class="sourceLineNo">169</span><a name="line.169"></a>
-<span class="sourceLineNo">170</span>   /**<a name="line.170"></a>
-<span class="sourceLineNo">171</span>    * Returns the {@link HtmlDocSerializerContext#HTMLDOC_branding} setting value in this context.<a name="line.171"></a>
-<span class="sourceLineNo">172</span>    *<a name="line.172"></a>
-<span class="sourceLineNo">173</span>    * @return<a name="line.173"></a>
-<span class="sourceLineNo">174</span>    *    The {@link HtmlDocSerializerContext#HTMLDOC_branding} setting value in this context.<a name="line.174"></a>
-<span class="sourceLineNo">175</span>    *    &lt;jk&gt;null&lt;/jk&gt; if not specified.<a name="line.175"></a>
-<span class="sourceLineNo">176</span>    *    Never an empty string.<a name="line.176"></a>
-<span class="sourceLineNo">177</span>    */<a name="line.177"></a>
-<span class="sourceLineNo">178</span>   public final String getBranding() {<a name="line.178"></a>
-<span class="sourceLineNo">179</span>      return branding;<a name="line.179"></a>
-<span class="sourceLineNo">180</span>   }<a name="line.180"></a>
-<span class="sourceLineNo">181</span><a name="line.181"></a>
-<span class="sourceLineNo">182</span>   /**<a name="line.182"></a>
-<span class="sourceLineNo">183</span>    * Returns the {@link HtmlDocSerializerContext#HTMLDOC_header} setting value in this context.<a name="line.183"></a>
-<span class="sourceLineNo">184</span>    *<a name="line.184"></a>
-<span class="sourceLineNo">185</span>    * @return<a name="line.185"></a>
-<span class="sourceLineNo">186</span>    *    The {@link HtmlDocSerializerContext#HTMLDOC_header} setting value in this context.<a name="line.186"></a>
-<span class="sourceLineNo">187</span>    *    &lt;jk&gt;null&lt;/jk&gt; if not specified.<a name="line.187"></a>
-<span class="sourceLineNo">188</span>    *     Never an empty string.<a name="line.188"></a>
-<span class="sourceLineNo">189</span>    */<a name="line.189"></a>
-<span class="sourceLineNo">190</span>   public final String getHeader() {<a name="line.190"></a>
-<span class="sourceLineNo">191</span>      return header;<a name="line.191"></a>
-<span class="sourceLineNo">192</span>   }<a name="line.192"></a>
-<span class="sourceLineNo">193</span><a name="line.193"></a>
-<span class="sourceLineNo">194</span>   /**<a name="line.194"></a>
-<span class="sourceLineNo">195</span>    * Returns the {@link HtmlDocSerializerContext#HTMLDOC_links} setting value in this context.<a name="line.195"></a>
-<span class="sourceLineNo">196</span>    *<a name="line.196"></a>
-<span class="sourceLineNo">197</span>    * @return<a name="line.197"></a>
-<span class="sourceLineNo">198</span>    *    The {@link HtmlDocSerializerContext#HTMLDOC_links} setting value in this context.<a name="line.198"></a>
-<span class="sourceLineNo">199</span>    *    &lt;jk&gt;null&lt;/jk&gt; if not specified.<a name="line.199"></a>
-<span class="sourceLineNo">200</span>    *    Never an empty map.<a name="line.200"></a>
-<span class="sourceLineNo">201</span>    */<a name="line.201"></a>
-<span class="sourceLineNo">202</span>   public final String[] getLinks() {<a name="line.202"></a>
-<span class="sourceLineNo">203</span>      return links;<a name="line.203"></a>
-<span class="sourceLineNo">204</span>   }<a name="line.204"></a>
-<span class="sourceLineNo">205</span><a name="line.205"></a>
-<span class="sourceLineNo">206</span>   /**<a name="line.206"></a>
-<span class="sourceLineNo">207</span>    * Returns the template to use for generating the HTML page.<a name="line.207"></a>
-<span class="sourceLineNo">208</span>    *<a name="line.208"></a>
-<span class="sourceLineNo">209</span>    * @return<a name="line.209"></a>
-<span class="sourceLineNo">210</span>    *    The HTML page generator.<a name="line.210"></a>
-<span class="sourceLineNo">211</span>    *    Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.211"></a>
-<span class="sourceLineNo">212</span>    */<a name="line.212"></a>
-<span class="sourceLineNo">213</span>   public final HtmlDocTemplate getTemplate() {<a name="line.213"></a>
-<span class="sourceLineNo">214</span>      return template;<a name="line.214"></a>
-<span class="sourceLineNo">215</span>   }<a name="line.215"></a>
-<span class="sourceLineNo">216</span><a name="line.216"></a>
-<span class="sourceLineNo">217</span>   /**<a name="line.217"></a>
-<span class="sourceLineNo">218</span>    * Returns the {@link HtmlDocSerializerContext#HTMLDOC_nav} setting value in this context.<a name="line.218"></a>
-<span class="sourceLineNo">219</span>    *<a name="line.219"></a>
-<span class="sourceLineNo">220</span>    * @return<a name="line.220"></a>
-<span class="sourceLineNo">221</span>    *    The {@link HtmlDocSerializerContext#HTMLDOC_nav} setting value in this context.<a name="line.221"></a>
-<span class="sourceLineNo">222</span>    *    &lt;jk&gt;null&lt;/jk&gt; if not specified.<a name="line.222"></a>
-<span class="sourceLineNo">223</span>    *    Never an empty string.<a name="line.223"></a>
-<span class="sourceLineNo">224</span>    */<a name="line.224"></a>
-<span class="sourceLineNo">225</span>   public final String getNav() {<a name="line.225"></a>
-<span class="sourceLineNo">226</span>      return nav;<a name="line.226"></a>
-<span class="sourceLineNo">227</span>   }<a name="line.227"></a>
-<span class="sourceLineNo">228</span><a name="line.228"></a>
-<span class="sourceLineNo">229</span>   /**<a name="line.229"></a>
-<span class="sourceLineNo">230</span>    * Returns the {@link HtmlDocSerializerContext#HTMLDOC_aside} setting value in this context.<a name="line.230"></a>
-<span class="sourceLineNo">231</span>    *<a name="line.231"></a>
-<span class="sourceLineNo">232</span>    * @return<a name="line.232"></a>
-<span class="sourceLineNo">233</span>    *    The {@link HtmlDocSerializerContext#HTMLDOC_aside} setting value in this context.<a name="line.233"></a>
-<span class="sourceLineNo">234</span>    *    &lt;jk&gt;null&lt;/jk&gt; if not specified.<a name="line.234"></a>
-<span class="sourceLineNo">235</span>    *    Never an empty string.<a name="line.235"></a>
-<span class="sourceLineNo">236</span>    */<a name="line.236"></a>
-<span class="sourceLineNo">237</span>   public final String getAside() {<a name="line.237"></a>
-<span class="sourceLineNo">238</span>      return aside;<a name="line.238"></a>
-<span class="sourceLineNo">239</span>   }<a name="line.239"></a>
-<span class="sourceLineNo">240</span><a name="line.240"></a>
-<span class="sourceLineNo">241</span>   /**<a name="line.241"></a>
-<span class="sourceLineNo">242</span>    * Returns the {@link HtmlDocSerializerContext#HTMLDOC_footer} setting value in this context.<a name="line.242"></a>
-<span class="sourceLineNo">243</span>    *<a name="line.243"></a>
-<span class="sourceLineNo">244</span>    * @return<a name="line.244"></a>
-<span class="sourceLineNo">245</span>    *    The {@link HtmlDocSerializerContext#HTMLDOC_footer} setting value in this context.<a name="line.245"></a>
-<span class="sourceLineNo">246</span>    *    &lt;jk&gt;null&lt;/jk&gt; if not specified.<a name="line.246"></a>
-<span class="sourceLineNo">247</span>    *    Never an empty string.<a name="line.247"></a>
-<span class="sourceLineNo">248</span>    */<a name="line.248"></a>
-<span class="sourceLineNo">249</span>   public final String getFooter() {<a name="line.249"></a>
-<span class="sourceLineNo">250</span>      return footer;<a name="line.250"></a>
-<span class="sourceLineNo">251</span>   }<a name="line.251"></a>
-<span class="sourceLineNo">252</span><a name="line.252"></a>
-<span class="sourceLineNo">253</span>   /**<a name="line.253"></a>
-<span class="sourceLineNo">254</span>    * Returns the {@link HtmlDocSerializerContext#HTMLDOC_noResultsMessage} setting value in this context.<a name="line.254"></a>
-<span class="sourceLineNo">255</span>    *<a name="line.255"></a>
-<span class="sourceLineNo">256</span>    * @return<a name="line.256"></a>
-<span class="sourceLineNo">257</span>    *    The {@link HtmlDocSerializerContext#HTMLDOC_noResultsMessage} setting value in this context.<a name="line.257"></a>
-<span class="sourceLineNo">258</span>    *    &lt;jk&gt;null&lt;/jk&gt; if not specified.<a name="line.258"></a>
-<span class="sourceLineNo">259</span>    *    Never an empty string.<a name="line.259"></a>
-<span class="sourceLineNo">260</span>    */<a name="line.260"></a>
-<span class="sourceLineNo">261</span>   public final String getNoResultsMessage() {<a name="line.261"></a>
-<span class="sourceLineNo">262</span>      return noResultsMessage;<a name="line.262"></a>
-<span class="sourceLineNo">263</span>   }<a name="line.263"></a>
-<span class="sourceLineNo">264</span><a name="line.264"></a>
-<span class="sourceLineNo">265</span>   @Override /* XmlSerializerSession */<a name="line.265"></a>
-<span class="sourceLineNo">266</span>   public HtmlWriter getWriter() throws Exception {<a name="line.266"></a>
-<span class="sourceLineNo">267</span>      Object output = getOutput();<a name="line.267"></a>
-<span class="sourceLineNo">268</span>      if (output instanceof HtmlWriter)<a name="line.268"></a>
-<span class="sourceLineNo">269</span>         return (HtmlWriter)output;<a name="line.269"></a>
-<span class="sourceLineNo">270</span>      return new HtmlWriter(super.getWriter(), isUseWhitespace(), getMaxIndent(), isTrimStrings(), getQuoteChar(), getUriResolver());<a name="line.270"></a>
-<span class="sourceLineNo">271</span>   }<a name="line.271"></a>
-<span class="sourceLineNo">272</span>}<a name="line.272"></a>
+<span class="sourceLineNo">070</span>         header = ctx.header;<a name="line.70"></a>
+<span class="sourceLineNo">071</span>         nav = ctx.nav;<a name="line.71"></a>
+<span class="sourceLineNo">072</span>         aside = ctx.aside;<a name="line.72"></a>
+<span class="sourceLineNo">073</span>         footer = ctx.footer;<a name="line.73"></a>
+<span class="sourceLineNo">074</span>         links = ctx.links;<a name="line.74"></a>
+<span class="sourceLineNo">075</span>         style = ctx.style;<a name="line.75"></a>
+<span class="sourceLineNo">076</span>         stylesheet = ctx.stylesheet;<a name="line.76"></a>
+<span class="sourceLineNo">077</span>         script = ctx.script;<a name="line.77"></a>
+<span class="sourceLineNo">078</span>         nowrap = ctx.nowrap;<a name="line.78"></a>
+<span class="sourceLineNo">079</span>         noResultsMessage = ctx.noResultsMessage;<a name="line.79"></a>
+<span class="sourceLineNo">080</span>         template = ClassUtils.newInstance(HtmlDocTemplate.class, ctx.template);<a name="line.80"></a>
+<span class="sourceLineNo">081</span>      } else {<a name="line.81"></a>
+<span class="sourceLineNo">082</span>         header = op.getString(HTMLDOC_header, ctx.nav);<a name="line.82"></a>
+<span class="sourceLineNo">083</span>         nav = op.getString(HTMLDOC_nav, ctx.nav);<a name="line.83"></a>
+<span class="sourceLineNo">084</span>         aside = op.getString(HTMLDOC_aside, ctx.aside);<a name="line.84"></a>
+<span class="sourceLineNo">085</span>         footer = op.getString(HTMLDOC_footer, ctx.footer);<a name="line.85"></a>
+<span class="sourceLineNo">086</span>         links = op.getStringArray(HTMLDOC_links, ctx.links);<a name="line.86"></a>
+<span class="sourceLineNo">087</span>         style = op.getStringArray(HTMLDOC_style, ctx.style);<a name="line.87"></a>
+<span class="sourceLineNo">088</span>         stylesheet = op.getStringArray(HTMLDOC_stylesheet, ctx.stylesheet);<a name="line.88"></a>
+<span class="sourceLineNo">089</span>         script = op.getStringArray(HTMLDOC_script, ctx.script);<a name="line.89"></a>
+<span class="sourceLineNo">090</span>         nowrap = op.getBoolean(HTMLDOC_nowrap, ctx.nowrap);<a name="line.90"></a>
+<span class="sourceLineNo">091</span>         noResultsMessage = op.getString(HTMLDOC_noResultsMessage, ctx.noResultsMessage);<a name="line.91"></a>
+<span class="sourceLineNo">092</span>         template = ClassUtils.newInstance(HtmlDocTemplate.class, op.get(HTMLDOC_template, ctx.template));<a name="line.92"></a>
+<span class="sourceLineNo">093</span>      }<a name="line.93"></a>
+<span class="sourceLineNo">094</span>   }<a name="line.94"></a>
+<span class="sourceLineNo">095</span><a name="line.95"></a>
+<span class="sourceLineNo">096</span>   /**<a name="line.96"></a>
+<span class="sourceLineNo">097</span>    * Returns the {@link HtmlDocSerializerContext#HTMLDOC_style} setting value in this context.<a name="line.97"></a>
+<span class="sourceLineNo">098</span>    *<a name="line.98"></a>
+<span class="sourceLineNo">099</span>    * @return<a name="line.99"></a>
+<span class="sourceLineNo">100</span>    *    The {@link HtmlDocSerializerContext#HTMLDOC_style} setting value in this context.<a name="line.100"></a>
+<span class="sourceLineNo">101</span>    *    An empty array if not specified.<a name="line.101"></a>
+<span class="sourceLineNo">102</span>    *    Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.102"></a>
+<span class="sourceLineNo">103</span>    */<a name="line.103"></a>
+<span class="sourceLineNo">104</span>   public final String[] getStyle() {<a name="line.104"></a>
+<span class="sourceLineNo">105</span>      return style;<a name="line.105"></a>
+<span class="sourceLineNo">106</span>   }<a name="line.106"></a>
+<span class="sourceLineNo">107</span><a name="line.107"></a>
+<span class="sourceLineNo">108</span>   /**<a name="line.108"></a>
+<span class="sourceLineNo">109</span>    * Returns the {@link HtmlDocSerializerContext#HTMLDOC_stylesheet} setting value in this context.<a name="line.109"></a>
+<span class="sourceLineNo">110</span>    *<a name="line.110"></a>
+<span class="sourceLineNo">111</span>    * @return<a name="line.111"></a>
+<span class="sourceLineNo">112</span>    *    The {@link HtmlDocSerializerContext#HTMLDOC_stylesheet} setting value in this context.<a name="line.112"></a>
+<span class="sourceLineNo">113</span>    *    An empty array if not specified.<a name="line.113"></a>
+<span class="sourceLineNo">114</span>    *    Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.114"></a>
+<span class="sourceLineNo">115</span>    */<a name="line.115"></a>
+<span class="sourceLineNo">116</span>   public final String[] getStylesheet() {<a name="line.116"></a>
+<span class="sourceLineNo">117</span>      return stylesheet;<a name="line.117"></a>
+<span class="sourceLineNo">118</span>   }<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>    * Returns the {@link HtmlDocSerializerContext#HTMLDOC_script} setting value in this context.<a name="line.121"></a>
+<span class="sourceLineNo">122</span>    *<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    * @return<a name="line.123"></a>
+<span class="sourceLineNo">124</span>    *    The {@link HtmlDocSerializerContext#HTMLDOC_script} setting value in this context.<a name="line.124"></a>
+<span class="sourceLineNo">125</span>    *    An empty array if not specified.<a name="line.125"></a>
+<span class="sourceLineNo">126</span>    *    Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.126"></a>
+<span class="sourceLineNo">127</span>    */<a name="line.127"></a>
+<span class="sourceLineNo">128</span>   public final String[] getScript() {<a name="line.128"></a>
+<span class="sourceLineNo">129</span>      return script;<a name="line.129"></a>
+<span class="sourceLineNo">130</span>   }<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>    * Returns the {@link HtmlDocSerializerContext#HTMLDOC_nowrap} setting value in this context.<a name="line.133"></a>
+<span class="sourceLineNo">134</span>    *<a name="line.134"></a>
+<span class="sourceLineNo">135</span>    * @return The {@link HtmlDocSerializerContext#HTMLDOC_nowrap} setting value in this context.<a name="line.135"></a>
+<span class="sourceLineNo">136</span>    */<a name="line.136"></a>
+<span class="sourceLineNo">137</span>   public final boolean isNoWrap() {<a name="line.137"></a>
+<span class="sourceLineNo">138</span>      return nowrap;<a name="line.138"></a>
+<span class="sourceLineNo">139</span>   }<a name="line.139"></a>
+<span class="sourceLineNo">140</span><a name="line.140"></a>
+<span class="sourceLineNo">141</span>   /**<a name="line.141"></a>
+<span class="sourceLineNo">142</span>    * Returns the {@link HtmlDocSerializerContext#HTMLDOC_header} setting value in this context.<a name="line.142"></a>
+<span class="sourceLineNo">143</span>    *<a name="line.143"></a>
+<span class="sourceLineNo">144</span>    * @return<a name="line.144"></a>
+<span class="sourceLineNo">145</span>    *    The {@link HtmlDocSerializerContext#HTMLDOC_header} setting value in this context.<a name="line.145"></a>
+<span class="sourceLineNo">146</span>    *    &lt;jk&gt;null&lt;/jk&gt; if not specified.<a name="line.146"></a>
+<span class="sourceLineNo">147</span>    *     Never an empty string.<a name="line.147"></a>
+<span class="sourceLineNo">148</span>    */<a name="line.148"></a>
+<span class="sourceLineNo">149</span>   public final String getHeader() {<a name="line.149"></a>
+<span class="sourceLineNo">150</span>      return header;<a name="line.150"></a>
+<span class="sourceLineNo">151</span>   }<a name="line.151"></a>
+<span class="sourceLineNo">152</span><a name="line.152"></a>
+<span class="sourceLineNo">153</span>   /**<a name="line.153"></a>
+<span class="sourceLineNo">154</span>    * Returns the {@link HtmlDocSerializerContext#HTMLDOC_links} setting value in this context.<a name="line.154"></a>
+<span class="sourceLineNo">155</span>    *<a name="line.155"></a>
+<span class="sourceLineNo">156</span>    * @return<a name="line.156"></a>
+<span class="sourceLineNo">157</span>    *    The {@link HtmlDocSerializerContext#HTMLDOC_links} setting value in this context.<a name="line.157"></a>
+<span class="sourceLineNo">158</span>    *    &lt;jk&gt;null&lt;/jk&gt; if not specified.<a name="line.158"></a>
+<span class="sourceLineNo">159</span>    *    Never an empty map.<a name="line.159"></a>
+<span class="sourceLineNo">160</span>    */<a name="line.160"></a>
+<span class="sourceLineNo">161</span>   public final String[] getLinks() {<a name="line.161"></a>
+<span class="sourceLineNo">162</span>      return links;<a name="line.162"></a>
+<span class="sourceLineNo">163</span>   }<a name="line.163"></a>
+<span class="sourceLineNo">164</span><a name="line.164"></a>
+<span class="sourceLineNo">165</span>   /**<a name="line.165"></a>
+<span class="sourceLineNo">166</span>    * Returns the template to use for generating the HTML page.<a name="line.166"></a>
+<span class="sourceLineNo">167</span>    *<a name="line.167"></a>
+<span class="sourceLineNo">168</span>    * @return<a name="line.168"></a>
+<span class="sourceLineNo">169</span>    *    The HTML page generator.<a name="line.169"></a>
+<span class="sourceLineNo">170</span>    *    Never &lt;jk&gt;null&lt;/jk&gt;.<a name="line.170"></a>
+<span class="sourceLineNo">171</span>    */<a name="line.171"></a>
+<span class="sourceLineNo">172</span>   public final HtmlDocTemplate getTemplate() {<a name="line.172"></a>
+<span class="sourceLineNo">173</span>      return template;<a name="line.173"></a>
+<span class="sourceLineNo">174</span>   }<a name="line.174"></a>
+<span class="sourceLineNo">175</span><a name="line.175"></a>
+<span class="sourceLineNo">176</span>   /**<a name="line.176"></a>
+<span class="sourceLineNo">177</span>    * Returns the {@link HtmlDocSerializerContext#HTMLDOC_nav} setting value in this context.<a name="line.177"></a>
+<span class="sourceLineNo">178</span>    *<a name="line.178"></a>
+<span class="sourceLineNo">179</span>    * @return<a name="line.179"></a>
+<span class="sourceLineNo">180</span>    *    The {@link HtmlDocSerializerContext#HTMLDOC_nav} setting value in this context.<a name="line.180"></a>
+<span class="sourceLineNo">181</span>    *    &lt;jk&gt;null&lt;/jk&gt; if not specified.<a name="line.181"></a>
+<span class="sourceLineNo">182</span>    *    Never an empty string.<a name="line.182"></a>
+<span class="sourceLineNo">183</span>    */<a name="line.183"></a>
+<span class="sourceLineNo">184</span>   public final String getNav() {<a name="line.184"></a>
+<span class="sourceLineNo">185</span>      return nav;<a name="line.185"></a>
+<span class="sourceLineNo">186</span>   }<a name="line.186"></a>
+<span class="sourceLineNo">187</span><a name="line.187"></a>
+<span class="sourceLineNo">188</span>   /**<a name="line.188"></a>
+<span class="sourceLineNo">189</span>    * Returns the {@link HtmlDocSerializerContext#HTMLDOC_aside} setting value in this context.<a name="line.189"></a>
+<span class="sourceLineNo">190</span>    *<a name="line.190"></a>
+<span class="sourceLineNo">191</span>    * @return<a name="line.191"></a>
+<span class="sourceLineNo">192</span>    *    The {@link HtmlDocSerializerContext#HTMLDOC_aside} setting value in this context.<a name="line.192"></a>
+<span class="sourceLineNo">193</span>    *    &lt;jk&gt;null&lt;/jk&gt; if not specified.<a name="line.193"></a>
+<span class="sourceLineNo">194</span>    *    Never an empty string.<a name="line.194"></a>
+<span class="sourceLineNo">195</span>    */<a name="line.195"></a>
+<span class="sourceLineNo">196</span>   public final String getAside() {<a name="line.196"></a>
+<span class="sourceLineNo">197</span>      return aside;<a name="line.197"></a>
+<span class="sourceLineNo">198</span>   }<a name="line.198"></a>
+<span class="sourceLineNo">199</span><a name="line.199"></a>
+<span class="sourceLineNo">200</span>   /**<a name="line.200"></a>
+<span class="sourceLineNo">201</span>    * Returns the {@link HtmlDocSerializerContext#HTMLDOC_footer} setting value in this context.<a name="line.201"></a>
+<span class="sourceLineNo">202</span>    *<a name="line.202"></a>
+<span class="sourceLineNo">203</span>    * @return<a name="line.203"></a>
+<span class="sourceLineNo">204</span>    *    The {@link HtmlDocSerializerContext#HTMLDOC_footer} setting value in this context.<a name="line.204"></a>
+<span class="sourceLineNo">205</span>    *    &lt;jk&gt;null&lt;/jk&gt; if not specified.<a name="line.205"></a>
+<span class="sourceLineNo">206</span>    *    Never an empty string.<a name="line.206"></a>
+<span class="sourceLineNo">207</span>    */<a name="line.207"></a>
+<span class="sourceLineNo">208</span>   public final String getFooter() {<a name="line.208"></a>
+<span class="sourceLineNo">209</span>      return footer;<a name="line.209"></a>
+<span class="sourceLineNo">210</span>   }<a name="line.210"></a>
+<span class="sourceLineNo">211</span><a name="line.211"></a>
+<span class="sourceLineNo">212</span>   /**<a name="line.212"></a>
+<span class="sourceLineNo">213</span>    * Returns the {@link HtmlDocSerializerContext#HTMLDOC_noResultsMessage} setting value in this context.<a name="line.213"></a>
+<span class="sourceLineNo">214</span>    *<a name="line.214"></a>
+<span class="sourceLineNo">215</span>    * @return<a name="line.215"></a>
+<span class="sourceLineNo">216</span>    *    The {@link HtmlDocSerializerContext#HTMLDOC_noResultsMessage} setting value in this context.<a name="line.216"></a>
+<span class="sourceLineNo">217</span>    *    &lt;jk&gt;null&lt;/jk&gt; if not specified.<a name="line.217"></a>
+<span class="sourceLineNo">218</span>    *    Never an empty string.<a name="line.218"></a>
+<span class="sourceLineNo">219</span>    */<a name="line.219"></a>
+<span class="sourceLineNo">220</span>   public final String getNoResultsMessage() {<a name="line.220"></a>
+<span class="sourceLineNo">221</span>      return noResultsMessage;<a name="line.221"></a>
+<span class="sourceLineNo">222</span>   }<a name="line.222"></a>
+<span class="sourceLineNo">223</span><a name="line.223"></a>
+<span class="sourceLineNo">224</span>   @Override /* XmlSerializerSession */<a name="line.224"></a>
+<span class="sourceLineNo">225</span>   public HtmlWriter getWriter() throws Exception {<a name="line.225"></a>
+<span class="sourceLineNo">226</span>      Object output = getOutput();<a name="line.226"></a>
+<span class="sourceLineNo">227</span>      if (output instanceof HtmlWriter)<a name="line.227"></a>
+<span class="sourceLineNo">228</span>         return (HtmlWriter)output;<a name="line.228"></a>
+<span class="sourceLineNo">229</span>      return new HtmlWriter(super.getWriter(), isUseWhitespace(), getMaxIndent(), isTrimStrings(), getQuoteChar(), getUriResolver());<a name="line.229"></a>
+<span class="sourceLineNo">230</span>   }<a name="line.230"></a>
+<span class="sourceLineNo">231</span>}<a name="line.231"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/9b48e212/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 0cfbf83..b978191 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
@@ -108,124 +108,112 @@
 <span class="sourceLineNo">100</span>   public void header(HtmlDocSerializerSession session, HtmlWriter w, HtmlDocSerializer s, Object o) throws Exception {<a name="line.100"></a>
 <span class="sourceLineNo">101</span>      // Write the title of the page.<a name="line.101"></a>
 <span class="sourceLineNo">102</span>      String header = session.getHeader();<a name="line.102"></a>
-<span class="sourceLineNo">103</span>      if (header != null) {<a name="line.103"></a>
-<span class="sourceLineNo">104</span>         if (exists(header))<a name="line.104"></a>
-<span class="sourceLineNo">105</span>            w.append(3, header).nl(3);<a name="line.105"></a>
-<span class="sourceLineNo">106</span>      } else {<a name="line.106"></a>
-<span class="sourceLineNo">107</span>         String title = session.getTitle();<a name="line.107"></a>
-<span class="sourceLineNo">108</span>         String description = session.getDescription();<a name="line.108"></a>
-<span class="sourceLineNo">109</span>         String branding = session.getBranding();<a name="line.109"></a>
-<span class="sourceLineNo">110</span>         if (exists(title))<a name="line.110"></a>
-<span class="sourceLineNo">111</span>            w.oTag(3, "h1").append('&gt;').append(title).eTag("h1").nl(3);<a name="line.111"></a>
-<span class="sourceLineNo">112</span>         if (exists(description))<a name="line.112"></a>
-<span class="sourceLineNo">113</span>            w.oTag(3, "h2").append('&gt;').append(description).eTag("h2").nl(3);<a name="line.113"></a>
-<span class="sourceLineNo">114</span>         if (exists(branding))<a name="line.114"></a>
-<span class="sourceLineNo">115</span>            w.append(3, branding).nl(3);<a name="line.115"></a>
-<span class="sourceLineNo">116</span>      }<a name="line.116"></a>
-<span class="sourceLineNo">117</span>   }<a name="line.117"></a>
-<span class="sourceLineNo">118</span><a name="line.118"></a>
-<span class="sourceLineNo">119</span><a name="line.119"></a>
-<span class="sourceLineNo">120</span>   @Override /* HtmlDocTemplate */<a name="line.120"></a>
-<span class="sourceLineNo">121</span>   public void nav(HtmlDocSerializerSession session, HtmlWriter w, HtmlDocSerializer s, Object o) throws Exception {<a name="line.121"></a>
-<span class="sourceLineNo">122</span>      String nav = session.getNav();<a name="line.122"></a>
-<span class="sourceLineNo">123</span>      if (nav != null) {<a name="line.123"></a>
-<span class="sourceLineNo">124</span>         if (exists(nav))<a name="line.124"></a>
-<span class="sourceLineNo">125</span>            w.append(3, nav).nl(3);<a name="line.125"></a>
-<span class="sourceLineNo">126</span>      } else {<a name="line.126"></a>
-<span class="sourceLineNo">127</span>         String[] links = session.getLinks();<a name="line.127"></a>
-<span class="sourceLineNo">128</span>         if (links.length &gt; 0) {<a name="line.128"></a>
-<span class="sourceLineNo">129</span>            w.sTag(3, "ol").nl(3);<a name="line.129"></a>
-<span class="sourceLineNo">130</span>            for (String l : links) {<a name="line.130"></a>
-<span class="sourceLineNo">131</span>               w.sTag(4, "li");<a name="line.131"></a>
-<span class="sourceLineNo">132</span>               if (l.matches("(?s)\\S+\\:.*")) {<a name="line.132"></a>
-<span class="sourceLineNo">133</span>                  int i = l.indexOf(':');<a name="line.133"></a>
-<span class="sourceLineNo">134</span>                  String key = l.substring(0, i);<a name="line.134"></a>
-<span class="sourceLineNo">135</span>                  String val = l.substring(i+1).trim();<a name="line.135"></a>
-<span class="sourceLineNo">136</span>                  if (val.startsWith("&lt;"))<a name="line.136"></a>
-<span class="sourceLineNo">137</span>                     w.nl(4).appendln(5, val);<a name="line.137"></a>
-<span class="sourceLineNo">138</span>                  else<a name="line.138"></a>
-<span class="sourceLineNo">139</span>                     w.oTag("a").attr("href", session.resolveUri(val), true).cTag().text(key, true).eTag("a");<a name="line.139"></a>
-<span class="sourceLineNo">140</span>                  w.eTag("li").nl(4);<a name="line.140"></a>
-<span class="sourceLineNo">141</span>               } else {<a name="line.141"></a>
-<span class="sourceLineNo">142</span>                  w.nl(4).appendln(5, l);<a name="line.142"></a>
-<span class="sourceLineNo">143</span>                  w.eTag(4, "li").nl(4);<a name="line.143"></a>
-<span class="sourceLineNo">144</span>               }<a name="line.144"></a>
-<span class="sourceLineNo">145</span>            }<a name="line.145"></a>
-<span class="sourceLineNo">146</span>            w.eTag(3, "ol").nl(3);<a name="line.146"></a>
-<span class="sourceLineNo">147</span>         }<a name="line.147"></a>
-<span class="sourceLineNo">148</span>      }<a name="line.148"></a>
-<span class="sourceLineNo">149</span>   }<a name="line.149"></a>
-<span class="sourceLineNo">150</span><a name="line.150"></a>
-<span class="sourceLineNo">151</span>   @Override /* HtmlDocTemplate */<a name="line.151"></a>
-<span class="sourceLineNo">152</span>   public void aside(HtmlDocSerializerSession session, HtmlWriter w, HtmlDocSerializer s, Object o) throws Exception {<a name="line.152"></a>
-<span class="sourceLineNo">153</span>      String aside = session.getAside();<a name="line.153"></a>
-<span class="sourceLineNo">154</span>      if (exists(aside))<a name="line.154"></a>
-<span class="sourceLineNo">155</span>         w.append(4, aside);<a name="line.155"></a>
-<span class="sourceLineNo">156</span>   }<a name="line.156"></a>
-<span class="sourceLineNo">157</span><a name="line.157"></a>
-<span class="sourceLineNo">158</span>   @Override /* HtmlDocTemplate */<a name="line.158"></a>
-<span class="sourceLineNo">159</span>   public void article(HtmlDocSerializerSession session, HtmlWriter w, HtmlDocSerializer s, Object o) throws Exception {<a name="line.159"></a>
-<span class="sourceLineNo">160</span>      // To allow for page formatting using CSS, we encapsulate the data inside two div tags:<a name="line.160"></a>
-<span class="sourceLineNo">161</span>      // &lt;div class='outerdata'&gt;&lt;div class='data' id='data'&gt;...&lt;/div&gt;&lt;/div&gt;<a name="line.161"></a>
-<span class="sourceLineNo">162</span>      w.oTag(4, "div").attr("class","outerdata").append('&gt;').nl(4);<a name="line.162"></a>
-<span class="sourceLineNo">163</span>      w.oTag(5, "div").attr("class","data").attr("id", "data").append('&gt;').nl(5);<a name="line.163"></a>
-<span class="sourceLineNo">164</span><a name="line.164"></a>
-<span class="sourceLineNo">165</span>      if (o == null) {<a name="line.165"></a>
-<span class="sourceLineNo">166</span>         w.append(6, "&lt;null/&gt;").nl(6);<a name="line.166"></a>
-<span class="sourceLineNo">167</span>      } else if (ObjectUtils.isEmpty(o)){<a name="line.167"></a>
-<span class="sourceLineNo">168</span>         String m = session.getNoResultsMessage();<a name="line.168"></a>
-<span class="sourceLineNo">169</span>         if (exists(m))<a name="line.169"></a>
-<span class="sourceLineNo">170</span>            w.append(6, m).nl(6);<a name="line.170"></a>
-<span class="sourceLineNo">171</span>      } else {<a name="line.171"></a>
-<span class="sourceLineNo">172</span>         session.indent = 6;<a name="line.172"></a>
-<span class="sourceLineNo">173</span>         s.parentSerialize(session, o);<a name="line.173"></a>
-<span class="sourceLineNo">174</span>      }<a name="line.174"></a>
-<span class="sourceLineNo">175</span><a name="line.175"></a>
-<span class="sourceLineNo">176</span>      w.ie(5).eTag("div").nl(5);<a name="line.176"></a>
-<span class="sourceLineNo">177</span>      w.ie(4).eTag("div").nl(4);<a name="line.177"></a>
+<span class="sourceLineNo">103</span>      if (exists(header))<a name="line.103"></a>
+<span class="sourceLineNo">104</span>         w.append(3, header).nl(3);<a name="line.104"></a>
+<span class="sourceLineNo">105</span>   }<a name="line.105"></a>
+<span class="sourceLineNo">106</span><a name="line.106"></a>
+<span class="sourceLineNo">107</span><a name="line.107"></a>
+<span class="sourceLineNo">108</span>   @Override /* HtmlDocTemplate */<a name="line.108"></a>
+<span class="sourceLineNo">109</span>   public void nav(HtmlDocSerializerSession session, HtmlWriter w, HtmlDocSerializer s, Object o) throws Exception {<a name="line.109"></a>
+<span class="sourceLineNo">110</span>      String nav = session.getNav();<a name="line.110"></a>
+<span class="sourceLineNo">111</span>      if (nav != null) {<a name="line.111"></a>
+<span class="sourceLineNo">112</span>         if (exists(nav))<a name="line.112"></a>
+<span class="sourceLineNo">113</span>            w.append(3, nav).nl(3);<a name="line.113"></a>
+<span class="sourceLineNo">114</span>      } else {<a name="line.114"></a>
+<span class="sourceLineNo">115</span>         String[] links = session.getLinks();<a name="line.115"></a>
+<span class="sourceLineNo">116</span>         if (links.length &gt; 0) {<a name="line.116"></a>
+<span class="sourceLineNo">117</span>            w.sTag(3, "ol").nl(3);<a name="line.117"></a>
+<span class="sourceLineNo">118</span>            for (String l : links) {<a name="line.118"></a>
+<span class="sourceLineNo">119</span>               w.sTag(4, "li");<a name="line.119"></a>
+<span class="sourceLineNo">120</span>               if (l.matches("(?s)\\S+\\:.*")) {<a name="line.120"></a>
+<span class="sourceLineNo">121</span>                  int i = l.indexOf(':');<a name="line.121"></a>
+<span class="sourceLineNo">122</span>                  String key = l.substring(0, i);<a name="line.122"></a>
+<span class="sourceLineNo">123</span>                  String val = l.substring(i+1).trim();<a name="line.123"></a>
+<span class="sourceLineNo">124</span>                  if (val.startsWith("&lt;"))<a name="line.124"></a>
+<span class="sourceLineNo">125</span>                     w.nl(4).appendln(5, val);<a name="line.125"></a>
+<span class="sourceLineNo">126</span>                  else<a name="line.126"></a>
+<span class="sourceLineNo">127</span>                     w.oTag("a").attr("href", session.resolveUri(val), true).cTag().text(key, true).eTag("a");<a name="line.127"></a>
+<span class="sourceLineNo">128</span>                  w.eTag("li").nl(4);<a name="line.128"></a>
+<span class="sourceLineNo">129</span>               } else {<a name="line.129"></a>
+<span class="sourceLineNo">130</span>                  w.nl(4).appendln(5, l);<a name="line.130"></a>
+<span class="sourceLineNo">131</span>                  w.eTag(4, "li").nl(4);<a name="line.131"></a>
+<span class="sourceLineNo">132</span>               }<a name="line.132"></a>
+<span class="sourceLineNo">133</span>            }<a name="line.133"></a>
+<span class="sourceLineNo">134</span>            w.eTag(3, "ol").nl(3);<a name="line.134"></a>
+<span class="sourceLineNo">135</span>         }<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">138</span><a name="line.138"></a>
+<span class="sourceLineNo">139</span>   @Override /* HtmlDocTemplate */<a name="line.139"></a>
+<span class="sourceLineNo">140</span>   public void aside(HtmlDocSerializerSession session, HtmlWriter w, HtmlDocSerializer s, Object o) throws Exception {<a name="line.140"></a>
+<span class="sourceLineNo">141</span>      String aside = session.getAside();<a name="line.141"></a>
+<span class="sourceLineNo">142</span>      if (exists(aside))<a name="line.142"></a>
+<span class="sourceLineNo">143</span>         w.append(4, aside);<a name="line.143"></a>
+<span class="sourceLineNo">144</span>   }<a name="line.144"></a>
+<span class="sourceLineNo">145</span><a name="line.145"></a>
+<span class="sourceLineNo">146</span>   @Override /* HtmlDocTemplate */<a name="line.146"></a>
+<span class="sourceLineNo">147</span>   public void article(HtmlDocSerializerSession session, HtmlWriter w, HtmlDocSerializer s, Object o) throws Exception {<a name="line.147"></a>
+<span class="sourceLineNo">148</span>      // To allow for page formatting using CSS, we encapsulate the data inside two div tags:<a name="line.148"></a>
+<span class="sourceLineNo">149</span>      // &lt;div class='outerdata'&gt;&lt;div class='data' id='data'&gt;...&lt;/div&gt;&lt;/div&gt;<a name="line.149"></a>
+<span class="sourceLineNo">150</span>      w.oTag(4, "div").attr("class","outerdata").append('&gt;').nl(4);<a name="line.150"></a>
+<span class="sourceLineNo">151</span>      w.oTag(5, "div").attr("class","data").attr("id", "data").append('&gt;').nl(5);<a name="line.151"></a>
+<span class="sourceLineNo">152</span><a name="line.152"></a>
+<span class="sourceLineNo">153</span>      if (o == null) {<a name="line.153"></a>
+<span class="sourceLineNo">154</span>         w.append(6, "&lt;null/&gt;").nl(6);<a name="line.154"></a>
+<span class="sourceLineNo">155</span>      } else if (ObjectUtils.isEmpty(o)){<a name="line.155"></a>
+<span class="sourceLineNo">156</span>         String m = session.getNoResultsMessage();<a name="line.156"></a>
+<span class="sourceLineNo">157</span>         if (exists(m))<a name="line.157"></a>
+<span class="sourceLineNo">158</span>            w.append(6, m).nl(6);<a name="line.158"></a>
+<span class="sourceLineNo">159</span>      } else {<a name="line.159"></a>
+<span class="sourceLineNo">160</span>         session.indent = 6;<a name="line.160"></a>
+<span class="sourceLineNo">161</span>         s.parentSerialize(session, o);<a name="line.161"></a>
+<span class="sourceLineNo">162</span>      }<a name="line.162"></a>
+<span class="sourceLineNo">163</span><a name="line.163"></a>
+<span class="sourceLineNo">164</span>      w.ie(5).eTag("div").nl(5);<a name="line.164"></a>
+<span class="sourceLineNo">165</span>      w.ie(4).eTag("div").nl(4);<a name="line.165"></a>
+<span class="sourceLineNo">166</span>   }<a name="line.166"></a>
+<span class="sourceLineNo">167</span><a name="line.167"></a>
+<span class="sourceLineNo">168</span>   @Override /* HtmlDocTemplate */<a name="line.168"></a>
+<span class="sourceLineNo">169</span>   public void footer(HtmlDocSerializerSession session, HtmlWriter w, HtmlDocSerializer s, Object o) throws Exception {<a name="line.169"></a>
+<span class="sourceLineNo">170</span>      String footer = session.getFooter();<a name="line.170"></a>
+<span class="sourceLineNo">171</span>      if (exists(footer))<a name="line.171"></a>
+<span class="sourceLineNo">172</span>         w.append(3, footer).nl(3);<a name="line.172"></a>
+<span class="sourceLineNo">173</span>   }<a name="line.173"></a>
+<span class="sourceLineNo">174</span><a name="line.174"></a>
+<span class="sourceLineNo">175</span>   @Override /* HtmlDocTemplate */<a name="line.175"></a>
+<span class="sourceLineNo">176</span>   public boolean hasStyle(HtmlDocSerializerSession session) {<a name="line.176"></a>
+<span class="sourceLineNo">177</span>      return true;<a name="line.177"></a>
 <span class="sourceLineNo">178</span>   }<a name="line.178"></a>
 <span class="sourceLineNo">179</span><a name="line.179"></a>
 <span class="sourceLineNo">180</span>   @Override /* HtmlDocTemplate */<a name="line.180"></a>
-<span class="sourceLineNo">181</span>   public void footer(HtmlDocSerializerSession session, HtmlWriter w, HtmlDocSerializer s, Object o) throws Exception {<a name="line.181"></a>
-<span class="sourceLineNo">182</span>      String footer = session.getFooter();<a name="line.182"></a>
-<span class="sourceLineNo">183</span>      if (exists(footer))<a name="line.183"></a>
-<span class="sourceLineNo">184</span>         w.append(3, footer).nl(3);<a name="line.184"></a>
-<span class="sourceLineNo">185</span>   }<a name="line.185"></a>
-<span class="sourceLineNo">186</span><a name="line.186"></a>
-<span class="sourceLineNo">187</span>   @Override /* HtmlDocTemplate */<a name="line.187"></a>
-<span class="sourceLineNo">188</span>   public boolean hasStyle(HtmlDocSerializerSession session) {<a name="line.188"></a>
-<span class="sourceLineNo">189</span>      return true;<a name="line.189"></a>
-<span class="sourceLineNo">190</span>   }<a name="line.190"></a>
-<span class="sourceLineNo">191</span><a name="line.191"></a>
-<span class="sourceLineNo">192</span>   @Override /* HtmlDocTemplate */<a name="line.192"></a>
-<span class="sourceLineNo">193</span>   public boolean hasScript(HtmlDocSerializerSession session) {<a name="line.193"></a>
-<span class="sourceLineNo">194</span>      return true;<a name="line.194"></a>
-<span class="sourceLineNo">195</span>   }<a name="line.195"></a>
-<span class="sourceLineNo">196</span><a name="line.196"></a>
-<span class="sourceLineNo">197</span>   @Override /* HtmlDocTemplate */<a name="line.197"></a>
-<span class="sourceLineNo">198</span>   public boolean hasHeader(HtmlDocSerializerSession session) {<a name="line.198"></a>
-<span class="sourceLineNo">199</span>      return exists(session.getHeader()) || exists(session.getTitle()) || exists(session.getDescription());<a name="line.199"></a>
-<span class="sourceLineNo">200</span>   }<a name="line.200"></a>
-<span class="sourceLineNo">201</span><a name="line.201"></a>
-<span class="sourceLineNo">202</span>   @Override /* HtmlDocTemplate */<a name="line.202"></a>
-<span class="sourceLineNo">203</span>   public boolean hasNav(HtmlDocSerializerSession session) {<a name="line.203"></a>
-<span class="sourceLineNo">204</span>      return exists(session.getNav()) || session.getLinks().length &gt; 0;<a name="line.204"></a>
-<span class="sourceLineNo">205</span>   }<a name="line.205"></a>
-<span class="sourceLineNo">206</span><a name="line.206"></a>
-<span class="sourceLineNo">207</span>   @Override /* HtmlDocTemplate */<a name="line.207"></a>
-<span class="sourceLineNo">208</span>   public boolean hasAside(HtmlDocSerializerSession session) {<a name="line.208"></a>
-<span class="sourceLineNo">209</span>      return exists(session.getAside());<a name="line.209"></a>
-<span class="sourceLineNo">210</span>   }<a name="line.210"></a>
-<span class="sourceLineNo">211</span><a name="line.211"></a>
-<span class="sourceLineNo">212</span>   @Override /* HtmlDocTemplate */<a name="line.212"></a>
-<span class="sourceLineNo">213</span>   public boolean hasFooter(HtmlDocSerializerSession session) {<a name="line.213"></a>
-<span class="sourceLineNo">214</span>      return exists(session.getFooter());<a name="line.214"></a>
-<span class="sourceLineNo">215</span>   }<a name="line.215"></a>
-<span class="sourceLineNo">216</span><a name="line.216"></a>
-<span class="sourceLineNo">217</span>   private static boolean exists(String s) {<a name="line.217"></a>
-<span class="sourceLineNo">218</span>      return s != null &amp;&amp; ! "NONE".equals(s);<a name="line.218"></a>
-<span class="sourceLineNo">219</span>   }<a name="line.219"></a>
-<span class="sourceLineNo">220</span>}<a name="line.220"></a>
+<span class="sourceLineNo">181</span>   public boolean hasScript(HtmlDocSerializerSession session) {<a name="line.181"></a>
+<span class="sourceLineNo">182</span>      return true;<a name="line.182"></a>
+<span class="sourceLineNo">183</span>   }<a name="line.183"></a>
+<span class="sourceLineNo">184</span><a name="line.184"></a>
+<span class="sourceLineNo">185</span>   @Override /* HtmlDocTemplate */<a name="line.185"></a>
+<span class="sourceLineNo">186</span>   public boolean hasHeader(HtmlDocSerializerSession session) {<a name="line.186"></a>
+<span class="sourceLineNo">187</span>      return exists(session.getHeader());<a name="line.187"></a>
+<span class="sourceLineNo">188</span>   }<a name="line.188"></a>
+<span class="sourceLineNo">189</span><a name="line.189"></a>
+<span class="sourceLineNo">190</span>   @Override /* HtmlDocTemplate */<a name="line.190"></a>
+<span class="sourceLineNo">191</span>   public boolean hasNav(HtmlDocSerializerSession session) {<a name="line.191"></a>
+<span class="sourceLineNo">192</span>      return exists(session.getNav()) || session.getLinks().length &gt; 0;<a name="line.192"></a>
+<span class="sourceLineNo">193</span>   }<a name="line.193"></a>
+<span class="sourceLineNo">194</span><a name="line.194"></a>
+<span class="sourceLineNo">195</span>   @Override /* HtmlDocTemplate */<a name="line.195"></a>
+<span class="sourceLineNo">196</span>   public boolean hasAside(HtmlDocSerializerSession session) {<a name="line.196"></a>
+<span class="sourceLineNo">197</span>      return exists(session.getAside());<a name="line.197"></a>
+<span class="sourceLineNo">198</span>   }<a name="line.198"></a>
+<span class="sourceLineNo">199</span><a name="line.199"></a>
+<span class="sourceLineNo">200</span>   @Override /* HtmlDocTemplate */<a name="line.200"></a>
+<span class="sourceLineNo">201</span>   public boolean hasFooter(HtmlDocSerializerSession session) {<a name="line.201"></a>
+<span class="sourceLineNo">202</span>      return exists(session.getFooter());<a name="line.202"></a>
+<span class="sourceLineNo">203</span>   }<a name="line.203"></a>
+<span class="sourceLineNo">204</span><a name="line.204"></a>
+<span class="sourceLineNo">205</span>   private static boolean exists(String s) {<a name="line.205"></a>
+<span class="sourceLineNo">206</span>      return s != null &amp;&amp; ! "NONE".equals(s);<a name="line.206"></a>
+<span class="sourceLineNo">207</span>   }<a name="line.207"></a>
+<span class="sourceLineNo">208</span>}<a name="line.208"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/9b48e212/content/site/apidocs/src-html/org/apache/juneau/microservice/Microservice.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/microservice/Microservice.html b/content/site/apidocs/src-html/org/apache/juneau/microservice/Microservice.html
index 36975b6..1b12b9b 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/microservice/Microservice.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/microservice/Microservice.html
@@ -242,8 +242,8 @@
 <span class="sourceLineNo">234</span>    *    &lt;li&gt;&lt;code&gt;$MF{key}&lt;/code&gt;, &lt;code&gt;$MF{key,default}&lt;/code&gt; - Manifest file entries.<a name="line.234"></a>
 <span class="sourceLineNo">235</span>    *    &lt;li&gt;&lt;code&gt;$ARG{key}&lt;/code&gt;, &lt;code&gt;$ARG{key,default}&lt;/code&gt; - Command-line arguments.<a name="line.235"></a>
 <span class="sourceLineNo">236</span>    *    &lt;li&gt;&lt;code&gt;$IF{boolArg,thenValue}&lt;/code&gt;, &lt;code&gt;$IF{boolArg,thenValue,elseValue}&lt;/code&gt; - If-block logic.<a name="line.236"></a>
-<span class="sourceLineNo">237</span>    *    &lt;li&gt;&lt;code&gt;$SWITCH{stringArg,pattern,thenVal...}&lt;/code&gt;, <a name="line.237"></a>
-<span class="sourceLineNo">238</span>    *       &lt;code&gt;$SWITCH{stringArg,pattern,thenVal,elseVal...}&lt;/code&gt;  - Switch-block logic.<a name="line.238"></a>
+<span class="sourceLineNo">237</span>    *    &lt;li&gt;&lt;code&gt;$SW{stringArg,pattern,thenVal...}&lt;/code&gt;, <a name="line.237"></a>
+<span class="sourceLineNo">238</span>    *       &lt;code&gt;$SW{stringArg,pattern,thenVal,elseVal...}&lt;/code&gt;  - Switch-block logic.<a name="line.238"></a>
 <span class="sourceLineNo">239</span>    * &lt;/ul&gt;<a name="line.239"></a>
 <span class="sourceLineNo">240</span>    * <a name="line.240"></a>
 <span class="sourceLineNo">241</span>    * &lt;p&gt;<a name="line.241"></a>


Mime
View raw message