Repository: incubator-juneau-website Updated Branches: refs/heads/asf-site 3483f6511 -> 01ede9e87
Update javadocs. Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/commit/01ede9e8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/tree/01ede9e8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/diff/01ede9e8 Branch: refs/heads/asf-site Commit: 01ede9e874448e7b09d828965ba94658f95845e4 Parents: 3483f65 Author: JamesBognar <[email protected]> Authored: Mon Jul 3 13:03:45 2017 -0400 Committer: JamesBognar <[email protected]> Committed: Mon Jul 3 13:03:45 2017 -0400 ---------------------------------------------------------------------- content/about.html | 2 +- content/site/apidocs/index-all.html | 15 ++++ .../juneau/rest/widget/ContentTypeMenuItem.html | 2 +- .../juneau/rest/widget/MenuItemWidget.html | 2 +- .../rest/widget/PoweredByApacheWidget.html | 2 +- .../rest/widget/PoweredByJuneauWidget.html | 2 +- .../juneau/rest/widget/QueryMenuItem.html | 2 +- .../org/apache/juneau/rest/widget/Widget.html | 94 +++++++++++++++++++- content/site/apidocs/overview-summary.html | 2 +- .../juneau/html/HtmlDocTemplateBasic.html | 10 +-- .../juneau/rest/widget/MenuItemWidget.html | 4 +- .../juneau/rest/widget/QueryMenuItem.html | 4 +- .../org/apache/juneau/rest/widget/Widget.html | 56 +++++++++++- 13 files changed, 178 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/01ede9e8/content/about.html ---------------------------------------------------------------------- diff --git a/content/about.html b/content/about.html index 639497e..868d250 100644 --- a/content/about.html +++ b/content/about.html @@ -745,7 +745,7 @@ ) <jk>public</jk> Redirect formPagePost(<ja>@FormData</ja>(<js>"name"</js>) String name, <ja>@FormData</ja>(<js>"value"</js>) String value) { System.<jsm>setProperty</jsm>(name, value); - <jk>return new</jk> Redirect(); <jc>// Redirect to the servlet top page.</jc> + <jk>return new</jk> Redirect(<js>"servlet:/"</js>); <jc>// Redirect to the servlet top page.</jc> } </p> <img class='bordered' src='images/SystemPropertiesForm.png'> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/01ede9e8/content/site/apidocs/index-all.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/index-all.html b/content/site/apidocs/index-all.html index 1960337..b06b042 100644 --- a/content/site/apidocs/index-all.html +++ b/content/site/apidocs/index-all.html @@ -15914,6 +15914,11 @@ <dd> </dd> <dt><span class="memberNameLink"><a href="org/apache/juneau/ini/ConfigFileWrapped.html#load-java.io.Reader-">load(Reader)</a></span> - Method in class org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigFileWrapped.html" title="class in org.apache.juneau.ini">ConfigFileWrapped</a></dt> <dd> </dd> +<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/widget/Widget.html#loadHtml-java.lang.String-">loadHtml(String)</a></span> - Method in class org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/Widget.html" title="class in org.apache.juneau.rest.widget">Widget</a></dt> +<dd> +<div class="block">Convenience method for calling <a href="org/apache/juneau/rest/widget/Widget.html#getResourceAsString-java.lang.String-"><code>Widget.getResourceAsString(String)</code></a> except also strips HTML comments from the + file.</div> +</dd> <dt><span class="memberNameLink"><a href="org/apache/juneau/ini/ConfigFile.html#loadIfModified--">loadIfModified()</a></span> - Method in class org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigFile.html" title="class in org.apache.juneau.ini">ConfigFile</a></dt> <dd> <div class="block">Reloads this config file object from the persisted file contents if the modified timestamp on the file has changed.</div> @@ -15922,6 +15927,16 @@ <dd> </dd> <dt><span class="memberNameLink"><a href="org/apache/juneau/ini/ConfigFileWrapped.html#loadIfModified--">loadIfModified()</a></span> - Method in class org.apache.juneau.ini.<a href="org/apache/juneau/ini/ConfigFileWrapped.html" title="class in org.apache.juneau.ini">ConfigFileWrapped</a></dt> <dd> </dd> +<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/widget/Widget.html#loadScript-java.lang.String-">loadScript(String)</a></span> - Method in class org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/Widget.html" title="class in org.apache.juneau.rest.widget">Widget</a></dt> +<dd> +<div class="block">Convenience method for calling <a href="org/apache/juneau/rest/widget/Widget.html#getResourceAsString-java.lang.String-"><code>Widget.getResourceAsString(String)</code></a> except also strips Javascript comments from + the file.</div> +</dd> +<dt><span class="memberNameLink"><a href="org/apache/juneau/rest/widget/Widget.html#loadStyle-java.lang.String-">loadStyle(String)</a></span> - Method in class org.apache.juneau.rest.widget.<a href="org/apache/juneau/rest/widget/Widget.html" title="class in org.apache.juneau.rest.widget">Widget</a></dt> +<dd> +<div class="block">Convenience method for calling <a href="org/apache/juneau/rest/widget/Widget.html#getResourceAsString-java.lang.String-"><code>Widget.getResourceAsString(String)</code></a> except also strips CSS comments from + the file.</div> +</dd> <dt><span class="memberNameLink"><a href="org/apache/juneau/CoreObjectBuilder.html#locale-java.util.Locale-">locale(Locale)</a></span> - Method in class org.apache.juneau.<a href="org/apache/juneau/CoreObjectBuilder.html" title="class in org.apache.juneau">CoreObjectBuilder</a></dt> <dd> <div class="block"><b>Configuration property:</b> Locale.</div> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/01ede9e8/content/site/apidocs/org/apache/juneau/rest/widget/ContentTypeMenuItem.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/org/apache/juneau/rest/widget/ContentTypeMenuItem.html b/content/site/apidocs/org/apache/juneau/rest/widget/ContentTypeMenuItem.html index 9057116..6eff689 100644 --- a/content/site/apidocs/org/apache/juneau/rest/widget/ContentTypeMenuItem.html +++ b/content/site/apidocs/org/apache/juneau/rest/widget/ContentTypeMenuItem.html @@ -206,7 +206,7 @@ extends <a href="../../../../../org/apache/juneau/rest/widget/MenuItemWidget.htm <!-- --> </a> <h3>Methods inherited from class org.apache.juneau.rest.widget.<a href="../../../../../org/apache/juneau/rest/widget/Widget.html" title="class in org.apache.juneau.rest.widget">Widget</a></h3> -<code><a href="../../../../../org/apache/juneau/rest/widget/Widget.html#getResourceAsString-java.lang.String-">getResourceAsString</a>, <a href="../../../../../org/apache/juneau/rest/widget/Widget.html#getResourceAsString-java.lang.String-java.util.Locale-">getResourceAsString</a></code></li> +<code><a href="../../../../../org/apache/juneau/rest/widget/Widget.html#getResourceAsString-java.lang.String-">getResourceAsString</a>, <a href="../../../../../org/apache/juneau/rest/widget/Widget.html#getResourceAsString-java.lang.String-java.util.Locale-">getResourceAsString</a>, <a href="../../../../../org/apache/juneau/rest/widget/Widget.html#loadHtml-java.lang.String-">loadHtml</a>, <a href="../../../../../org/apache/juneau/rest/widget/Widget.html#loadScript-java.lang.String-">loadScript</a>, <a href="../../../../../org/apache/juneau/rest/widget/Widget.html#loadStyle-java.lang.String-">loadStyle</a></code></li> </ul> <ul class="blockList"> <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object"> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/01ede9e8/content/site/apidocs/org/apache/juneau/rest/widget/MenuItemWidget.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/org/apache/juneau/rest/widget/MenuItemWidget.html b/content/site/apidocs/org/apache/juneau/rest/widget/MenuItemWidget.html index b9f05b6..c554344 100644 --- a/content/site/apidocs/org/apache/juneau/rest/widget/MenuItemWidget.html +++ b/content/site/apidocs/org/apache/juneau/rest/widget/MenuItemWidget.html @@ -208,7 +208,7 @@ extends <a href="../../../../../org/apache/juneau/rest/widget/Widget.html" title <!-- --> </a> <h3>Methods inherited from class org.apache.juneau.rest.widget.<a href="../../../../../org/apache/juneau/rest/widget/Widget.html" title="class in org.apache.juneau.rest.widget">Widget</a></h3> -<code><a href="../../../../../org/apache/juneau/rest/widget/Widget.html#getHtml-org.apache.juneau.rest.RestRequest-">getHtml</a>, <a href="../../../../../org/apache/juneau/rest/widget/Widget.html#getName--">getName</a>, <a href="../../../../../org/apache/juneau/rest/widget/Widget.html#getResourceAsString-java.lang.String-">getResourceAsString</a>, <a href="../../../../../org/apache/juneau/rest/widget/Widget.html#getResourceAsString-java.lang.String-java.util.Locale-">getResourceAsString</a></code></li> +<code><a href="../../../../../org/apache/juneau/rest/widget/Widget.html#getHtml-org.apache.juneau.rest.RestRequest-">getHtml</a>, <a href="../../../../../org/apache/juneau/rest/widget/Widget.html#getName--">getName</a>, <a href="../../../../../org/apache/juneau/rest/widget/Widget.html#getResourceAsString-java.lang.String-">getResourceAsString</a>, <a href="../../../../../org/apache/juneau/rest/widget/Widget.html#getResourceAsString-java.lang.String-java.util.Locale-">getResourceAsString</a>, <a href="../../../../../org/apache/juneau/rest/widget/Widget.html#loadHtml-java.lang.String-">loadHtml</a>, <a href="../../../../../org/apache/juneau/rest/widget/Widget.html#loadScript-java.lang.String-">loadScript</a>, <a href="../../../../../org/apache/juneau/rest/widget/Widget.html#loadStyle-java.lang.String-">loadStyle</a></code></li> </ul> <ul class="blockList"> <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object"> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/01ede9e8/content/site/apidocs/org/apache/juneau/rest/widget/PoweredByApacheWidget.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/org/apache/juneau/rest/widget/PoweredByApacheWidget.html b/content/site/apidocs/org/apache/juneau/rest/widget/PoweredByApacheWidget.html index 225e6ef..d9cc77c 100644 --- a/content/site/apidocs/org/apache/juneau/rest/widget/PoweredByApacheWidget.html +++ b/content/site/apidocs/org/apache/juneau/rest/widget/PoweredByApacheWidget.html @@ -193,7 +193,7 @@ extends <a href="../../../../../org/apache/juneau/rest/widget/Widget.html" title <!-- --> </a> <h3>Methods inherited from class org.apache.juneau.rest.widget.<a href="../../../../../org/apache/juneau/rest/widget/Widget.html" title="class in org.apache.juneau.rest.widget">Widget</a></h3> -<code><a href="../../../../../org/apache/juneau/rest/widget/Widget.html#getResourceAsString-java.lang.String-">getResourceAsString</a>, <a href="../../../../../org/apache/juneau/rest/widget/Widget.html#getResourceAsString-java.lang.String-java.util.Locale-">getResourceAsString</a>, <a href="../../../../../org/apache/juneau/rest/widget/Widget.html#getScript-org.apache.juneau.rest.RestRequest-">getScript</a>, <a href="../../../../../org/apache/juneau/rest/widget/Widget.html#getStyle-org.apache.juneau.rest.RestRequest-">getStyle</a></code></li> +<code><a href="../../../../../org/apache/juneau/rest/widget/Widget.html#getResourceAsString-java.lang.String-">getResourceAsString</a>, <a href="../../../../../org/apache/juneau/rest/widget/Widget.html#getResourceAsString-java.lang.String-java.util.Locale-">getResourceAsString</a>, <a href="../../../../../org/apache/juneau/rest/widget/Widget.html#getScript-org.apache.juneau.rest.RestRequest-">getScript</a>, <a href="../../../../../org/apache/juneau/rest/widget/Widget.html#getStyle-org.apache.juneau.rest.RestRequest-">getStyle</a>, <a href="../../../../../org/apache/juneau/rest/widget/Widget.html#loadHtml-java.lang.String-">loadHtml</a>, <a href="../../../../../org/apache/juneau/rest/widget/Widget.html#loadScript-java.lang.String-">loadScript</a>, <a href="../../../../../org/apache/juneau/rest/widget/Widget.html#loadStyle-java.lang.String-">loadStyle</a></code></li> </ul> <ul class="blockList"> <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object"> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/01ede9e8/content/site/apidocs/org/apache/juneau/rest/widget/PoweredByJuneauWidget.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/org/apache/juneau/rest/widget/PoweredByJuneauWidget.html b/content/site/apidocs/org/apache/juneau/rest/widget/PoweredByJuneauWidget.html index eef1d82..a9c2b95 100644 --- a/content/site/apidocs/org/apache/juneau/rest/widget/PoweredByJuneauWidget.html +++ b/content/site/apidocs/org/apache/juneau/rest/widget/PoweredByJuneauWidget.html @@ -191,7 +191,7 @@ extends <a href="../../../../../org/apache/juneau/rest/widget/Widget.html" title <!-- --> </a> <h3>Methods inherited from class org.apache.juneau.rest.widget.<a href="../../../../../org/apache/juneau/rest/widget/Widget.html" title="class in org.apache.juneau.rest.widget">Widget</a></h3> -<code><a href="../../../../../org/apache/juneau/rest/widget/Widget.html#getResourceAsString-java.lang.String-">getResourceAsString</a>, <a href="../../../../../org/apache/juneau/rest/widget/Widget.html#getResourceAsString-java.lang.String-java.util.Locale-">getResourceAsString</a>, <a href="../../../../../org/apache/juneau/rest/widget/Widget.html#getScript-org.apache.juneau.rest.RestRequest-">getScript</a>, <a href="../../../../../org/apache/juneau/rest/widget/Widget.html#getStyle-org.apache.juneau.rest.RestRequest-">getStyle</a></code></li> +<code><a href="../../../../../org/apache/juneau/rest/widget/Widget.html#getResourceAsString-java.lang.String-">getResourceAsString</a>, <a href="../../../../../org/apache/juneau/rest/widget/Widget.html#getResourceAsString-java.lang.String-java.util.Locale-">getResourceAsString</a>, <a href="../../../../../org/apache/juneau/rest/widget/Widget.html#getScript-org.apache.juneau.rest.RestRequest-">getScript</a>, <a href="../../../../../org/apache/juneau/rest/widget/Widget.html#getStyle-org.apache.juneau.rest.RestRequest-">getStyle</a>, <a href="../../../../../org/apache/juneau/rest/widget/Widget.html#loadHtml-java.lang.String-">loadHtml</a>, <a href="../../../../../org/apache/juneau/rest/widget/Widget.html#loadScript-java.lang.String-">loadScript</a>, <a href="../../../../../org/apache/juneau/rest/widget/Widget.html#loadStyle-java.lang.String-">loadStyle</a></code></li> </ul> <ul class="blockList"> <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object"> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/01ede9e8/content/site/apidocs/org/apache/juneau/rest/widget/QueryMenuItem.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/org/apache/juneau/rest/widget/QueryMenuItem.html b/content/site/apidocs/org/apache/juneau/rest/widget/QueryMenuItem.html index 6d5b5da..d0e2381 100644 --- a/content/site/apidocs/org/apache/juneau/rest/widget/QueryMenuItem.html +++ b/content/site/apidocs/org/apache/juneau/rest/widget/QueryMenuItem.html @@ -226,7 +226,7 @@ extends <a href="../../../../../org/apache/juneau/rest/widget/MenuItemWidget.htm <!-- --> </a> <h3>Methods inherited from class org.apache.juneau.rest.widget.<a href="../../../../../org/apache/juneau/rest/widget/Widget.html" title="class in org.apache.juneau.rest.widget">Widget</a></h3> -<code><a href="../../../../../org/apache/juneau/rest/widget/Widget.html#getResourceAsString-java.lang.String-">getResourceAsString</a>, <a href="../../../../../org/apache/juneau/rest/widget/Widget.html#getResourceAsString-java.lang.String-java.util.Locale-">getResourceAsString</a></code></li> +<code><a href="../../../../../org/apache/juneau/rest/widget/Widget.html#getResourceAsString-java.lang.String-">getResourceAsString</a>, <a href="../../../../../org/apache/juneau/rest/widget/Widget.html#getResourceAsString-java.lang.String-java.util.Locale-">getResourceAsString</a>, <a href="../../../../../org/apache/juneau/rest/widget/Widget.html#loadHtml-java.lang.String-">loadHtml</a>, <a href="../../../../../org/apache/juneau/rest/widget/Widget.html#loadScript-java.lang.String-">loadScript</a>, <a href="../../../../../org/apache/juneau/rest/widget/Widget.html#loadStyle-java.lang.String-">loadStyle</a></code></li> </ul> <ul class="blockList"> <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object"> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/01ede9e8/content/site/apidocs/org/apache/juneau/rest/widget/Widget.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/org/apache/juneau/rest/widget/Widget.html b/content/site/apidocs/org/apache/juneau/rest/widget/Widget.html index 36810d4..97f20d5 100644 --- a/content/site/apidocs/org/apache/juneau/rest/widget/Widget.html +++ b/content/site/apidocs/org/apache/juneau/rest/widget/Widget.html @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":6,"i2":10,"i3":10,"i4":10,"i5":10}; +var methods = {"i0":10,"i1":6,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10}; var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -278,6 +278,27 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html? <div class="block">Resolves any CSS styles that should be added to the <xt><head>/<style></xt> element.</div> </td> </tr> +<tr id="i6" class="altColor"> +<td class="colFirst"><code>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true"; title="class or interface in java.lang">String</a></code></td> +<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/widget/Widget.html#loadHtml-java.lang.String-">loadHtml</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true"; title="class or interface in java.lang">String</a> name)</code> +<div class="block">Convenience method for calling <a href="../../../../../org/apache/juneau/rest/widget/Widget.html#getResourceAsString-java.lang.String-"><code>getResourceAsString(String)</code></a> except also strips HTML comments from the + file.</div> +</td> +</tr> +<tr id="i7" class="rowColor"> +<td class="colFirst"><code>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true"; title="class or interface in java.lang">String</a></code></td> +<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/widget/Widget.html#loadScript-java.lang.String-">loadScript</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true"; title="class or interface in java.lang">String</a> name)</code> +<div class="block">Convenience method for calling <a href="../../../../../org/apache/juneau/rest/widget/Widget.html#getResourceAsString-java.lang.String-"><code>getResourceAsString(String)</code></a> except also strips Javascript comments from + the file.</div> +</td> +</tr> +<tr id="i8" class="altColor"> +<td class="colFirst"><code>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true"; title="class or interface in java.lang">String</a></code></td> +<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/juneau/rest/widget/Widget.html#loadStyle-java.lang.String-">loadStyle</a></span>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true"; title="class or interface in java.lang">String</a> name)</code> +<div class="block">Convenience method for calling <a href="../../../../../org/apache/juneau/rest/widget/Widget.html#getResourceAsString-java.lang.String-"><code>getResourceAsString(String)</code></a> except also strips CSS comments from + the file.</div> +</td> +</tr> </table> <ul class="blockList"> <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object"> @@ -433,7 +454,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html? <a name="getResourceAsString-java.lang.String-java.util.Locale-"> <!-- --> </a> -<ul class="blockListLast"> +<ul class="blockList"> <li class="blockList"> <h4>getResourceAsString</h4> <pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true"; title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/rest/widget/Widget.html#line.213">getResourceAsString</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true"; title="class or interface in java.lang">String</a> name, @@ -461,6 +482,75 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html? </dl> </li> </ul> +<a name="loadScript-java.lang.String-"> +<!-- --> +</a> +<ul class="blockList"> +<li class="blockList"> +<h4>loadScript</h4> +<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true"; title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/rest/widget/Widget.html#line.228">loadScript</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true"; title="class or interface in java.lang">String</a> name) + throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true"; title="class or interface in java.io">IOException</a></pre> +<div class="block">Convenience method for calling <a href="../../../../../org/apache/juneau/rest/widget/Widget.html#getResourceAsString-java.lang.String-"><code>getResourceAsString(String)</code></a> except also strips Javascript comments from + the file. + + <p> + Comments are assumed to be Java-style block comments: <js>"/*"</js>.</div> +<dl> +<dt><span class="paramLabel">Parameters:</span></dt> +<dd><code>name</code> - Name of the desired resource.</dd> +<dt><span class="returnLabel">Returns:</span></dt> +<dd>The resource converted to a string, or <jk>null</jk> if the resource could not be found.</dd> +<dt><span class="throwsLabel">Throws:</span></dt> +<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true"; title="class or interface in java.io">IOException</a></code></dd> +</dl> +</li> +</ul> +<a name="loadStyle-java.lang.String-"> +<!-- --> +</a> +<ul class="blockList"> +<li class="blockList"> +<h4>loadStyle</h4> +<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true"; title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/rest/widget/Widget.html#line.246">loadStyle</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true"; title="class or interface in java.lang">String</a> name) + throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true"; title="class or interface in java.io">IOException</a></pre> +<div class="block">Convenience method for calling <a href="../../../../../org/apache/juneau/rest/widget/Widget.html#getResourceAsString-java.lang.String-"><code>getResourceAsString(String)</code></a> except also strips CSS comments from + the file. + + <p> + Comments are assumed to be Java-style block comments: <js>"/*"</js>.</div> +<dl> +<dt><span class="paramLabel">Parameters:</span></dt> +<dd><code>name</code> - Name of the desired resource.</dd> +<dt><span class="returnLabel">Returns:</span></dt> +<dd>The resource converted to a string, or <jk>null</jk> if the resource could not be found.</dd> +<dt><span class="throwsLabel">Throws:</span></dt> +<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true"; title="class or interface in java.io">IOException</a></code></dd> +</dl> +</li> +</ul> +<a name="loadHtml-java.lang.String-"> +<!-- --> +</a> +<ul class="blockListLast"> +<li class="blockList"> +<h4>loadHtml</h4> +<pre>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true"; title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/juneau/rest/widget/Widget.html#line.264">loadHtml</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true"; title="class or interface in java.lang">String</a> name) + throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true"; title="class or interface in java.io">IOException</a></pre> +<div class="block">Convenience method for calling <a href="../../../../../org/apache/juneau/rest/widget/Widget.html#getResourceAsString-java.lang.String-"><code>getResourceAsString(String)</code></a> except also strips HTML comments from the + file. + + <p> + Comment are assumed to be <js>"<!-- -->"</js> code blocks.</div> +<dl> +<dt><span class="paramLabel">Parameters:</span></dt> +<dd><code>name</code> - Name of the desired resource.</dd> +<dt><span class="returnLabel">Returns:</span></dt> +<dd>The resource converted to a string, or <jk>null</jk> if the resource could not be found.</dd> +<dt><span class="throwsLabel">Throws:</span></dt> +<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true"; title="class or interface in java.io">IOException</a></code></dd> +</dl> +</li> +</ul> </li> </ul> </li> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/01ede9e8/content/site/apidocs/overview-summary.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/overview-summary.html b/content/site/apidocs/overview-summary.html index 40d42d1..05af654 100644 --- a/content/site/apidocs/overview-summary.html +++ b/content/site/apidocs/overview-summary.html @@ -7278,7 +7278,7 @@ <!-- ======================================================================================================== --> <a id="6.3.0"></a> - <h3 class='topic' onclick='toggle(this)'>6.3.0 (TBD)</h3> + <h3 class='topic' onclick='toggle(this)'>6.3.0 (Jun 30, 2017)</h3> <div class='topic'> <p> Juneau 6.3.0 is a major update with significant new functionality for defining proxy interfaces against http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/01ede9e8/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 2d4a524..5755b18 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,16 +50,16 @@ <span class="sourceLineNo">042</span> public void style(HtmlDocSerializerSession session, HtmlWriter w, HtmlDocSerializer s, Object o) throws Exception {<a name="line.42"></a> <span class="sourceLineNo">043</span><a name="line.43"></a> <span class="sourceLineNo">044</span> String[] styleImport = session.getStyleImport();<a name="line.44"></a> -<span class="sourceLineNo">045</span> if (! ArrayUtils.contains("NONE", styleImport)) <a name="line.45"></a> +<span class="sourceLineNo">045</span> if (! ArrayUtils.contains("NONE", styleImport))<a name="line.45"></a> <span class="sourceLineNo">046</span> for (String si : styleImport)<a name="line.46"></a> -<span class="sourceLineNo">047</span> w.append(2, "@import ").q().append(session.resolveUri(si)).q().appendln(";");<a name="line.47"></a> +<span class="sourceLineNo">047</span> w.append(2, "@import ").q().append(session.resolveUri(si)).q().appendln("; ");<a name="line.47"></a> <span class="sourceLineNo">048</span><a name="line.48"></a> <span class="sourceLineNo">049</span> if (session.isNoWrap())<a name="line.49"></a> -<span class="sourceLineNo">050</span> w.appendln("\ndiv.data * {white-space:nowrap;}");<a name="line.50"></a> +<span class="sourceLineNo">050</span> w.appendln("div.data * {white-space:nowrap;} ");<a name="line.50"></a> <span class="sourceLineNo">051</span><a name="line.51"></a> <span class="sourceLineNo">052</span> if (session.getStyle() != null)<a name="line.52"></a> <span class="sourceLineNo">053</span> for (String style : session.getStyle())<a name="line.53"></a> -<span class="sourceLineNo">054</span> w.appendln(style);<a name="line.54"></a> +<span class="sourceLineNo">054</span> w.append(style).appendln(" ");<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> @Override /* HtmlDocTemplate */<a name="line.57"></a> @@ -67,7 +67,7 @@ <span class="sourceLineNo">059</span><a name="line.59"></a> <span class="sourceLineNo">060</span> if (session.getScript() != null)<a name="line.60"></a> <span class="sourceLineNo">061</span> for (String script : session.getScript())<a name="line.61"></a> -<span class="sourceLineNo">062</span> w.appendln(script);<a name="line.62"></a> +<span class="sourceLineNo">062</span> w.append(script);<a name="line.62"></a> <span class="sourceLineNo">063</span> }<a name="line.63"></a> <span class="sourceLineNo">064</span><a name="line.64"></a> <span class="sourceLineNo">065</span> @Override /* HtmlDocTemplate */<a name="line.65"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/01ede9e8/content/site/apidocs/src-html/org/apache/juneau/rest/widget/MenuItemWidget.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/widget/MenuItemWidget.html b/content/site/apidocs/src-html/org/apache/juneau/rest/widget/MenuItemWidget.html index 769be50..1a8aa0c 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/rest/widget/MenuItemWidget.html +++ b/content/site/apidocs/src-html/org/apache/juneau/rest/widget/MenuItemWidget.html @@ -66,7 +66,7 @@ <span class="sourceLineNo">058</span> */<a name="line.58"></a> <span class="sourceLineNo">059</span> @Override<a name="line.59"></a> <span class="sourceLineNo">060</span> public String getScript(RestRequest req) throws Exception {<a name="line.60"></a> -<span class="sourceLineNo">061</span> return getResourceAsString("MenuItemWidget.js").replaceAll("(?s)\\/\\*{2}(.*?)\\/\\*\\s*", "");<a name="line.61"></a> +<span class="sourceLineNo">061</span> return loadScript("MenuItemWidget.js");<a name="line.61"></a> <span class="sourceLineNo">062</span> }<a name="line.62"></a> <span class="sourceLineNo">063</span><a name="line.63"></a> <span class="sourceLineNo">064</span> /**<a name="line.64"></a> @@ -75,7 +75,7 @@ <span class="sourceLineNo">067</span> */<a name="line.67"></a> <span class="sourceLineNo">068</span> @Override<a name="line.68"></a> <span class="sourceLineNo">069</span> public String getStyle(RestRequest req) throws Exception {<a name="line.69"></a> -<span class="sourceLineNo">070</span> return getResourceAsString("MenuItemWidget.css").replaceAll("(?s)\\/\\*{2}(.*?)\\/\\*\\s*", "");<a name="line.70"></a> +<span class="sourceLineNo">070</span> return loadStyle("MenuItemWidget.css");<a name="line.70"></a> <span class="sourceLineNo">071</span> }<a name="line.71"></a> <span class="sourceLineNo">072</span>}<a name="line.72"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/01ede9e8/content/site/apidocs/src-html/org/apache/juneau/rest/widget/QueryMenuItem.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/widget/QueryMenuItem.html b/content/site/apidocs/src-html/org/apache/juneau/rest/widget/QueryMenuItem.html index a740a6b..99cc4f1 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/rest/widget/QueryMenuItem.html +++ b/content/site/apidocs/src-html/org/apache/juneau/rest/widget/QueryMenuItem.html @@ -82,7 +82,7 @@ <span class="sourceLineNo">074</span> public String getStyle(RestRequest req) throws Exception {<a name="line.74"></a> <span class="sourceLineNo">075</span> return super.getStyle(req)<a name="line.75"></a> <span class="sourceLineNo">076</span> + "\n"<a name="line.76"></a> -<span class="sourceLineNo">077</span> + getResourceAsString("QueryMenuItem.css").replaceFirst("(?s)\\/\\*{2}(.*?)\\/\\*\\s*", "");<a name="line.77"></a> +<span class="sourceLineNo">077</span> + loadStyle("QueryMenuItem.css");<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> /**<a name="line.80"></a> @@ -90,7 +90,7 @@ <span class="sourceLineNo">082</span> */<a name="line.82"></a> <span class="sourceLineNo">083</span> @Override /* Widget */<a name="line.83"></a> <span class="sourceLineNo">084</span> public String getHtml(RestRequest req) throws Exception {<a name="line.84"></a> -<span class="sourceLineNo">085</span> return getResourceAsString("QueryMenuItem.html").replaceFirst("(?s)<!--(.*?)-->\\s*", "");<a name="line.85"></a> +<span class="sourceLineNo">085</span> return getResourceAsString("QueryMenuItem.html");<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> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/01ede9e8/content/site/apidocs/src-html/org/apache/juneau/rest/widget/Widget.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/rest/widget/Widget.html b/content/site/apidocs/src-html/org/apache/juneau/rest/widget/Widget.html index c56cdb5..7497d8c 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/rest/widget/Widget.html +++ b/content/site/apidocs/src-html/org/apache/juneau/rest/widget/Widget.html @@ -221,7 +221,61 @@ <span class="sourceLineNo">213</span> protected String getResourceAsString(String name, Locale locale) throws IOException {<a name="line.213"></a> <span class="sourceLineNo">214</span> return resourceFinder.getResourceAsString(name, locale);<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">216</span><a name="line.216"></a> +<span class="sourceLineNo">217</span> /**<a name="line.217"></a> +<span class="sourceLineNo">218</span> * Convenience method for calling {@link #getResourceAsString(String)} except also strips Javascript comments from<a name="line.218"></a> +<span class="sourceLineNo">219</span> * the file.<a name="line.219"></a> +<span class="sourceLineNo">220</span> *<a name="line.220"></a> +<span class="sourceLineNo">221</span> * <p><a name="line.221"></a> +<span class="sourceLineNo">222</span> * Comments are assumed to be Java-style block comments: <js>"/*"</js>.<a name="line.222"></a> +<span class="sourceLineNo">223</span> *<a name="line.223"></a> +<span class="sourceLineNo">224</span> * @param name Name of the desired resource.<a name="line.224"></a> +<span class="sourceLineNo">225</span> * @return The resource converted to a string, or <jk>null</jk> if the resource could not be found.<a name="line.225"></a> +<span class="sourceLineNo">226</span> * @throws IOException<a name="line.226"></a> +<span class="sourceLineNo">227</span> */<a name="line.227"></a> +<span class="sourceLineNo">228</span> protected String loadScript(String name) throws IOException {<a name="line.228"></a> +<span class="sourceLineNo">229</span> String s = getResourceAsString(name);<a name="line.229"></a> +<span class="sourceLineNo">230</span> if (s != null)<a name="line.230"></a> +<span class="sourceLineNo">231</span> s = s.replaceAll("(?s)\\/\\*(.*?)\\*\\/\\s*", "");<a name="line.231"></a> +<span class="sourceLineNo">232</span> return s;<a name="line.232"></a> +<span class="sourceLineNo">233</span> }<a name="line.233"></a> +<span class="sourceLineNo">234</span><a name="line.234"></a> +<span class="sourceLineNo">235</span> /**<a name="line.235"></a> +<span class="sourceLineNo">236</span> * Convenience method for calling {@link #getResourceAsString(String)} except also strips CSS comments from<a name="line.236"></a> +<span class="sourceLineNo">237</span> * the file.<a name="line.237"></a> +<span class="sourceLineNo">238</span> *<a name="line.238"></a> +<span class="sourceLineNo">239</span> * <p><a name="line.239"></a> +<span class="sourceLineNo">240</span> * Comments are assumed to be Java-style block comments: <js>"/*"</js>.<a name="line.240"></a> +<span class="sourceLineNo">241</span> *<a name="line.241"></a> +<span class="sourceLineNo">242</span> * @param name Name of the desired resource.<a name="line.242"></a> +<span class="sourceLineNo">243</span> * @return The resource converted to a string, or <jk>null</jk> if the resource could not be found.<a name="line.243"></a> +<span class="sourceLineNo">244</span> * @throws IOException<a name="line.244"></a> +<span class="sourceLineNo">245</span> */<a name="line.245"></a> +<span class="sourceLineNo">246</span> protected String loadStyle(String name) throws IOException {<a name="line.246"></a> +<span class="sourceLineNo">247</span> String s = getResourceAsString(name);<a name="line.247"></a> +<span class="sourceLineNo">248</span> if (s != null)<a name="line.248"></a> +<span class="sourceLineNo">249</span> s = s.replaceAll("(?s)\\/\\*(.*?)\\*\\/\\s*", "");<a name="line.249"></a> +<span class="sourceLineNo">250</span> return s;<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> * Convenience method for calling {@link #getResourceAsString(String)} except also strips HTML comments from the<a name="line.254"></a> +<span class="sourceLineNo">255</span> * file.<a name="line.255"></a> +<span class="sourceLineNo">256</span> *<a name="line.256"></a> +<span class="sourceLineNo">257</span> * <p><a name="line.257"></a> +<span class="sourceLineNo">258</span> * Comment are assumed to be <js>"<!-- -->"</js> code blocks.<a name="line.258"></a> +<span class="sourceLineNo">259</span> *<a name="line.259"></a> +<span class="sourceLineNo">260</span> * @param name Name of the desired resource.<a name="line.260"></a> +<span class="sourceLineNo">261</span> * @return The resource converted to a string, or <jk>null</jk> if the resource could not be found.<a name="line.261"></a> +<span class="sourceLineNo">262</span> * @throws IOException<a name="line.262"></a> +<span class="sourceLineNo">263</span> */<a name="line.263"></a> +<span class="sourceLineNo">264</span> protected String loadHtml(String name) throws IOException {<a name="line.264"></a> +<span class="sourceLineNo">265</span> String s = getResourceAsString(name);<a name="line.265"></a> +<span class="sourceLineNo">266</span> if (s != null)<a name="line.266"></a> +<span class="sourceLineNo">267</span> s = s.replaceAll("(?s)<!--(.*?)-->\\s*", "");<a name="line.267"></a> +<span class="sourceLineNo">268</span> return s;<a name="line.268"></a> +<span class="sourceLineNo">269</span> }<a name="line.269"></a> +<span class="sourceLineNo">270</span>}<a name="line.270"></a>
