Repository: incubator-juneau-website Updated Branches: refs/heads/asf-site 954b343e8 -> 9b48e2125
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/9b48e212/content/site/apidocs/src-html/org/apache/juneau/svl/MapVar.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/svl/MapVar.html b/content/site/apidocs/src-html/org/apache/juneau/svl/MapVar.html index 42a3fe2..accaf34 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/svl/MapVar.html +++ b/content/site/apidocs/src-html/org/apache/juneau/svl/MapVar.html @@ -24,35 +24,36 @@ <span class="sourceLineNo">016</span><a name="line.16"></a> <span class="sourceLineNo">017</span>import java.util.*;<a name="line.17"></a> <span class="sourceLineNo">018</span><a name="line.18"></a> -<span class="sourceLineNo">019</span>/**<a name="line.19"></a> -<span class="sourceLineNo">020</span> * A subclass of {@link DefaultingVar} that simply pulls values from a {@link Map}.<a name="line.20"></a> -<span class="sourceLineNo">021</span> *<a name="line.21"></a> -<span class="sourceLineNo">022</span> * @see org.apache.juneau.svl<a name="line.22"></a> -<span class="sourceLineNo">023</span> */<a name="line.23"></a> -<span class="sourceLineNo">024</span>@SuppressWarnings("rawtypes")<a name="line.24"></a> -<span class="sourceLineNo">025</span>public abstract class MapVar extends DefaultingVar {<a name="line.25"></a> -<span class="sourceLineNo">026</span><a name="line.26"></a> -<span class="sourceLineNo">027</span> private final Map m;<a name="line.27"></a> +<span class="sourceLineNo">019</span>import org.apache.juneau.internal.*;<a name="line.19"></a> +<span class="sourceLineNo">020</span><a name="line.20"></a> +<span class="sourceLineNo">021</span>/**<a name="line.21"></a> +<span class="sourceLineNo">022</span> * A subclass of {@link DefaultingVar} that simply pulls values from a {@link Map}.<a name="line.22"></a> +<span class="sourceLineNo">023</span> *<a name="line.23"></a> +<span class="sourceLineNo">024</span> * @see org.apache.juneau.svl<a name="line.24"></a> +<span class="sourceLineNo">025</span> */<a name="line.25"></a> +<span class="sourceLineNo">026</span>@SuppressWarnings("rawtypes")<a name="line.26"></a> +<span class="sourceLineNo">027</span>public abstract class MapVar extends DefaultingVar {<a name="line.27"></a> <span class="sourceLineNo">028</span><a name="line.28"></a> -<span class="sourceLineNo">029</span> /**<a name="line.29"></a> -<span class="sourceLineNo">030</span> * Constructor.<a name="line.30"></a> -<span class="sourceLineNo">031</span> *<a name="line.31"></a> -<span class="sourceLineNo">032</span> * @param name The name of this variable.<a name="line.32"></a> -<span class="sourceLineNo">033</span> * @param m The map to pull values from.<a name="line.33"></a> -<span class="sourceLineNo">034</span> */<a name="line.34"></a> -<span class="sourceLineNo">035</span> public MapVar(String name, Map m) {<a name="line.35"></a> -<span class="sourceLineNo">036</span> super(name);<a name="line.36"></a> -<span class="sourceLineNo">037</span> if (m == null)<a name="line.37"></a> -<span class="sourceLineNo">038</span> illegalArg("''m'' parameter cannot be null.");<a name="line.38"></a> -<span class="sourceLineNo">039</span> this.m = m;<a name="line.39"></a> -<span class="sourceLineNo">040</span> }<a name="line.40"></a> -<span class="sourceLineNo">041</span><a name="line.41"></a> -<span class="sourceLineNo">042</span> @Override /* Var */<a name="line.42"></a> -<span class="sourceLineNo">043</span> public String resolve(VarResolverSession session, String varVal) {<a name="line.43"></a> -<span class="sourceLineNo">044</span> Object o = m.get(varVal);<a name="line.44"></a> -<span class="sourceLineNo">045</span> return (o == null ? null : o.toString());<a name="line.45"></a> -<span class="sourceLineNo">046</span> }<a name="line.46"></a> -<span class="sourceLineNo">047</span>}<a name="line.47"></a> +<span class="sourceLineNo">029</span> private final Map m;<a name="line.29"></a> +<span class="sourceLineNo">030</span><a name="line.30"></a> +<span class="sourceLineNo">031</span> /**<a name="line.31"></a> +<span class="sourceLineNo">032</span> * Constructor.<a name="line.32"></a> +<span class="sourceLineNo">033</span> *<a name="line.33"></a> +<span class="sourceLineNo">034</span> * @param name The name of this variable.<a name="line.34"></a> +<span class="sourceLineNo">035</span> * @param m The map to pull values from.<a name="line.35"></a> +<span class="sourceLineNo">036</span> */<a name="line.36"></a> +<span class="sourceLineNo">037</span> public MapVar(String name, Map m) {<a name="line.37"></a> +<span class="sourceLineNo">038</span> super(name);<a name="line.38"></a> +<span class="sourceLineNo">039</span> if (m == null)<a name="line.39"></a> +<span class="sourceLineNo">040</span> illegalArg("''m'' parameter cannot be null.");<a name="line.40"></a> +<span class="sourceLineNo">041</span> this.m = m;<a name="line.41"></a> +<span class="sourceLineNo">042</span> }<a name="line.42"></a> +<span class="sourceLineNo">043</span><a name="line.43"></a> +<span class="sourceLineNo">044</span> @Override /* Var */<a name="line.44"></a> +<span class="sourceLineNo">045</span> public String resolve(VarResolverSession session, String varVal) {<a name="line.45"></a> +<span class="sourceLineNo">046</span> return StringUtils.toString(m.get(varVal));<a name="line.46"></a> +<span class="sourceLineNo">047</span> }<a name="line.47"></a> +<span class="sourceLineNo">048</span>}<a name="line.48"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/9b48e212/content/site/apidocs/src-html/org/apache/juneau/svl/SimpleVar.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/svl/SimpleVar.html b/content/site/apidocs/src-html/org/apache/juneau/svl/SimpleVar.html index 77c3a04..1ba0bd3 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/svl/SimpleVar.html +++ b/content/site/apidocs/src-html/org/apache/juneau/svl/SimpleVar.html @@ -24,12 +24,12 @@ <span class="sourceLineNo">016</span><a name="line.16"></a> <span class="sourceLineNo">017</span>/**<a name="line.17"></a> <span class="sourceLineNo">018</span> * Abstract superclass of all Simple Var Language variables that resolve to simple returned string values.<a name="line.18"></a> -<span class="sourceLineNo">019</span> * <a name="line.19"></a> +<span class="sourceLineNo">019</span> *<a name="line.19"></a> <span class="sourceLineNo">020</span> * <p><a name="line.20"></a> <span class="sourceLineNo">021</span> * Note the difference between this class and {@link StreamedVar} that streams values to writers.<a name="line.21"></a> <span class="sourceLineNo">022</span> * Unlike the {@link StreamedVar} class, the returned value from this class can contain nested variables that will be<a name="line.22"></a> <span class="sourceLineNo">023</span> * recursively resolved by {@link VarResolver}.<a name="line.23"></a> -<span class="sourceLineNo">024</span> * <a name="line.24"></a> +<span class="sourceLineNo">024</span> *<a name="line.24"></a> <span class="sourceLineNo">025</span> * <p><a name="line.25"></a> <span class="sourceLineNo">026</span> * Subclasses must implement the {@link #resolve(VarResolverSession, String)} method.<a name="line.26"></a> <span class="sourceLineNo">027</span> *<a name="line.27"></a> @@ -47,7 +47,7 @@ <span class="sourceLineNo">039</span> }<a name="line.39"></a> <span class="sourceLineNo">040</span><a name="line.40"></a> <span class="sourceLineNo">041</span> @Override /* Var */<a name="line.41"></a> -<span class="sourceLineNo">042</span> public void resolveTo(VarResolverSession session, Writer w, String arg) {<a name="line.42"></a> +<span class="sourceLineNo">042</span> public void resolveTo(VarResolverSession session, Writer w, String arg) throws Exception {<a name="line.42"></a> <span class="sourceLineNo">043</span> throw new UnsupportedOperationException("Cannot call streamTo() on SimpleVar class");<a name="line.43"></a> <span class="sourceLineNo">044</span> }<a name="line.44"></a> <span class="sourceLineNo">045</span>}<a name="line.45"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/9b48e212/content/site/apidocs/src-html/org/apache/juneau/svl/StreamedVar.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/svl/StreamedVar.html b/content/site/apidocs/src-html/org/apache/juneau/svl/StreamedVar.html index 74e4934..f7e0f4e 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/svl/StreamedVar.html +++ b/content/site/apidocs/src-html/org/apache/juneau/svl/StreamedVar.html @@ -46,7 +46,7 @@ <span class="sourceLineNo">038</span> }<a name="line.38"></a> <span class="sourceLineNo">039</span><a name="line.39"></a> <span class="sourceLineNo">040</span> @Override /* Var */<a name="line.40"></a> -<span class="sourceLineNo">041</span> public String resolve(VarResolverSession session, String arg) {<a name="line.41"></a> +<span class="sourceLineNo">041</span> public String resolve(VarResolverSession session, String arg) throws Exception {<a name="line.41"></a> <span class="sourceLineNo">042</span> throw new UnsupportedOperationException("Cannot call resolve() on StreamedVar class");<a name="line.42"></a> <span class="sourceLineNo">043</span> }<a name="line.43"></a> <span class="sourceLineNo">044</span>}<a name="line.44"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/9b48e212/content/site/apidocs/src-html/org/apache/juneau/svl/Var.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/svl/Var.html b/content/site/apidocs/src-html/org/apache/juneau/svl/Var.html index 926bc65..d06fe2d 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/svl/Var.html +++ b/content/site/apidocs/src-html/org/apache/juneau/svl/Var.html @@ -103,29 +103,32 @@ <span class="sourceLineNo">095</span> * @param session The session object used for a single instance of a string resolution.<a name="line.95"></a> <span class="sourceLineNo">096</span> * @param arg The inside argument of the variable.<a name="line.96"></a> <span class="sourceLineNo">097</span> * @return The resolved value.<a name="line.97"></a> -<span class="sourceLineNo">098</span> */<a name="line.98"></a> -<span class="sourceLineNo">099</span> protected String doResolve(VarResolverSession session, String arg) {<a name="line.99"></a> -<span class="sourceLineNo">100</span> return resolve(session, arg);<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> /**<a name="line.103"></a> -<span class="sourceLineNo">104</span> * The interface that needs to be implemented for subclasses of {@link SimpleVar}.<a name="line.104"></a> -<span class="sourceLineNo">105</span> *<a name="line.105"></a> -<span class="sourceLineNo">106</span> * @param session The session object used for a single instance of a var resolution.<a name="line.106"></a> -<span class="sourceLineNo">107</span> * @param arg The inside argument of the variable.<a name="line.107"></a> -<span class="sourceLineNo">108</span> * @return The resolved value.<a name="line.108"></a> -<span class="sourceLineNo">109</span> */<a name="line.109"></a> -<span class="sourceLineNo">110</span> public abstract String resolve(VarResolverSession session, String arg);<a name="line.110"></a> -<span class="sourceLineNo">111</span><a name="line.111"></a> -<span class="sourceLineNo">112</span> /**<a name="line.112"></a> -<span class="sourceLineNo">113</span> * The interface that needs to be implemented for subclasses of {@link StreamedVar}.<a name="line.113"></a> -<span class="sourceLineNo">114</span> *<a name="line.114"></a> -<span class="sourceLineNo">115</span> * @param session The session object used for a single instance of a var resolution.<a name="line.115"></a> -<span class="sourceLineNo">116</span> * @param w The writer to send the resolved value to.<a name="line.116"></a> -<span class="sourceLineNo">117</span> * @param arg The inside argument of the variable.<a name="line.117"></a> -<span class="sourceLineNo">118</span> */<a name="line.118"></a> -<span class="sourceLineNo">119</span> public abstract void resolveTo(VarResolverSession session, Writer w, String arg);<a name="line.119"></a> -<span class="sourceLineNo">120</span>}<a name="line.120"></a> +<span class="sourceLineNo">098</span> * @throws Exception Any thrown exception will be serialized as <js>"{exceptionMessage}"</js><a name="line.98"></a> +<span class="sourceLineNo">099</span> */<a name="line.99"></a> +<span class="sourceLineNo">100</span> protected String doResolve(VarResolverSession session, String arg) throws Exception {<a name="line.100"></a> +<span class="sourceLineNo">101</span> return resolve(session, arg);<a name="line.101"></a> +<span class="sourceLineNo">102</span> }<a name="line.102"></a> +<span class="sourceLineNo">103</span><a name="line.103"></a> +<span class="sourceLineNo">104</span> /**<a name="line.104"></a> +<span class="sourceLineNo">105</span> * The interface that needs to be implemented for subclasses of {@link SimpleVar}.<a name="line.105"></a> +<span class="sourceLineNo">106</span> *<a name="line.106"></a> +<span class="sourceLineNo">107</span> * @param session The session object used for a single instance of a var resolution.<a name="line.107"></a> +<span class="sourceLineNo">108</span> * @param arg The inside argument of the variable.<a name="line.108"></a> +<span class="sourceLineNo">109</span> * @return The resolved value.<a name="line.109"></a> +<span class="sourceLineNo">110</span> * @throws Exception Any thrown exception will be serialized as <js>"{exceptionMessage}"</js><a name="line.110"></a> +<span class="sourceLineNo">111</span> */<a name="line.111"></a> +<span class="sourceLineNo">112</span> public abstract String resolve(VarResolverSession session, String arg) throws Exception;<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> * The interface that needs to be implemented for subclasses of {@link StreamedVar}.<a name="line.115"></a> +<span class="sourceLineNo">116</span> *<a name="line.116"></a> +<span class="sourceLineNo">117</span> * @param session The session object used for a single instance of a var resolution.<a name="line.117"></a> +<span class="sourceLineNo">118</span> * @param w The writer to send the resolved value to.<a name="line.118"></a> +<span class="sourceLineNo">119</span> * @param arg The inside argument of the variable.<a name="line.119"></a> +<span class="sourceLineNo">120</span> * @throws Exception Any thrown exception will be serialized as <js>"{exceptionMessage}"</js><a name="line.120"></a> +<span class="sourceLineNo">121</span> */<a name="line.121"></a> +<span class="sourceLineNo">122</span> public abstract void resolveTo(VarResolverSession session, Writer w, String arg) throws Exception;<a name="line.122"></a> +<span class="sourceLineNo">123</span>}<a name="line.123"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/9b48e212/content/site/apidocs/src-html/org/apache/juneau/svl/VarResolver.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/svl/VarResolver.html b/content/site/apidocs/src-html/org/apache/juneau/svl/VarResolver.html index 3e45304..e8b422e 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/svl/VarResolver.html +++ b/content/site/apidocs/src-html/org/apache/juneau/svl/VarResolver.html @@ -116,7 +116,7 @@ <span class="sourceLineNo">108</span> * <li><code>$S{key}</code>,<code>$S{key,default}</code> - System properties.<a name="line.108"></a> <span class="sourceLineNo">109</span> * <li><code>$E{key}</code>,<code>$E{key,default}</code> - Environment variables.<a name="line.109"></a> <span class="sourceLineNo">110</span> * <li><code>$IF{booleanValue,thenValue[,elseValue]}</code> - If-else patterns.<a name="line.110"></a> -<span class="sourceLineNo">111</span> * <li><code>$SWITCH{test,matchPattern,thenValue[,matchPattern,thenValue][,elseValue]}</code> - Switch patterns.<a name="line.111"></a> +<span class="sourceLineNo">111</span> * <li><code>$SW{test,matchPattern,thenValue[,matchPattern,thenValue][,elseValue]}</code> - Switch patterns.<a name="line.111"></a> <span class="sourceLineNo">112</span> * </ul><a name="line.112"></a> <span class="sourceLineNo">113</span> *<a name="line.113"></a> <span class="sourceLineNo">114</span> * @see SystemPropertiesVar<a name="line.114"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/9b48e212/content/site/apidocs/src-html/org/apache/juneau/svl/VarResolverSession.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/svl/VarResolverSession.html b/content/site/apidocs/src-html/org/apache/juneau/svl/VarResolverSession.html index d591576..974b9bf 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/svl/VarResolverSession.html +++ b/content/site/apidocs/src-html/org/apache/juneau/svl/VarResolverSession.html @@ -98,221 +98,229 @@ <span class="sourceLineNo">090</span> String val = s.substring(s.indexOf('{')+1, s.length()-1);<a name="line.90"></a> <span class="sourceLineNo">091</span> Var v = getVar(var);<a name="line.91"></a> <span class="sourceLineNo">092</span> if (v != null) {<a name="line.92"></a> -<span class="sourceLineNo">093</span> if (v.streamed) {<a name="line.93"></a> -<span class="sourceLineNo">094</span> StringWriter sw = new StringWriter();<a name="line.94"></a> -<span class="sourceLineNo">095</span> v.resolveTo(this, sw, val);<a name="line.95"></a> -<span class="sourceLineNo">096</span> return sw.toString();<a name="line.96"></a> -<span class="sourceLineNo">097</span> }<a name="line.97"></a> -<span class="sourceLineNo">098</span> s = v.doResolve(this, val);<a name="line.98"></a> -<span class="sourceLineNo">099</span> if (s == null)<a name="line.99"></a> -<span class="sourceLineNo">100</span> s = "";<a name="line.100"></a> -<span class="sourceLineNo">101</span> return resolve(s);<a name="line.101"></a> -<span class="sourceLineNo">102</span> }<a name="line.102"></a> -<span class="sourceLineNo">103</span> return s;<a name="line.103"></a> -<span class="sourceLineNo">104</span> }<a name="line.104"></a> -<span class="sourceLineNo">105</span><a name="line.105"></a> -<span class="sourceLineNo">106</span> try {<a name="line.106"></a> -<span class="sourceLineNo">107</span> return resolveTo(s, new StringWriter()).toString();<a name="line.107"></a> -<span class="sourceLineNo">108</span> } catch (IOException e) {<a name="line.108"></a> -<span class="sourceLineNo">109</span> throw new RuntimeException(e); // Never happens.<a name="line.109"></a> -<span class="sourceLineNo">110</span> }<a name="line.110"></a> -<span class="sourceLineNo">111</span> }<a name="line.111"></a> -<span class="sourceLineNo">112</span><a name="line.112"></a> -<span class="sourceLineNo">113</span> /*<a name="line.113"></a> -<span class="sourceLineNo">114</span> * Checks to see if string is of the simple form "$X{...}" with no embedded variables.<a name="line.114"></a> -<span class="sourceLineNo">115</span> * This is a common case, and we can avoid using StringWriters.<a name="line.115"></a> -<span class="sourceLineNo">116</span> */<a name="line.116"></a> -<span class="sourceLineNo">117</span> private static boolean isSimpleVar(String s) {<a name="line.117"></a> -<span class="sourceLineNo">118</span> int S1 = 1; // Not in variable, looking for $<a name="line.118"></a> -<span class="sourceLineNo">119</span> int S2 = 2; // Found $, Looking for {<a name="line.119"></a> -<span class="sourceLineNo">120</span> int S3 = 3; // Found {, Looking for }<a name="line.120"></a> -<span class="sourceLineNo">121</span> int S4 = 4; // Found }<a name="line.121"></a> -<span class="sourceLineNo">122</span><a name="line.122"></a> -<span class="sourceLineNo">123</span> int length = s.length();<a name="line.123"></a> -<span class="sourceLineNo">124</span> int state = S1;<a name="line.124"></a> -<span class="sourceLineNo">125</span> for (int i = 0; i < length; i++) {<a name="line.125"></a> -<span class="sourceLineNo">126</span> char c = s.charAt(i);<a name="line.126"></a> -<span class="sourceLineNo">127</span> if (state == S1) {<a name="line.127"></a> -<span class="sourceLineNo">128</span> if (c == '$') {<a name="line.128"></a> -<span class="sourceLineNo">129</span> state = S2;<a name="line.129"></a> -<span class="sourceLineNo">130</span> } else {<a name="line.130"></a> -<span class="sourceLineNo">131</span> return false;<a name="line.131"></a> -<span class="sourceLineNo">132</span> }<a name="line.132"></a> -<span class="sourceLineNo">133</span> } else if (state == S2) {<a name="line.133"></a> -<span class="sourceLineNo">134</span> if (c == '{') {<a name="line.134"></a> -<span class="sourceLineNo">135</span> state = S3;<a name="line.135"></a> -<span class="sourceLineNo">136</span> } else if (c < 'A' || c > 'z' || (c > 'Z' && c < 'a')) { // False trigger "$X "<a name="line.136"></a> -<span class="sourceLineNo">137</span> return false;<a name="line.137"></a> -<span class="sourceLineNo">138</span> }<a name="line.138"></a> -<span class="sourceLineNo">139</span> } else if (state == S3) {<a name="line.139"></a> -<span class="sourceLineNo">140</span> if (c == '}')<a name="line.140"></a> -<span class="sourceLineNo">141</span> state = S4;<a name="line.141"></a> -<span class="sourceLineNo">142</span> else if (c == '{' || c == '$')<a name="line.142"></a> -<span class="sourceLineNo">143</span> return false;<a name="line.143"></a> -<span class="sourceLineNo">144</span> } else if (state == S4) {<a name="line.144"></a> -<span class="sourceLineNo">145</span> return false;<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> return state == S4;<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> /**<a name="line.151"></a> -<span class="sourceLineNo">152</span> * Resolves variables in the specified string and sends the output to the specified writer.<a name="line.152"></a> -<span class="sourceLineNo">153</span> *<a name="line.153"></a> -<span class="sourceLineNo">154</span> * <p><a name="line.154"></a> -<span class="sourceLineNo">155</span> * More efficient than first parsing to a string and then serializing to the writer since this method doesn't need<a name="line.155"></a> -<span class="sourceLineNo">156</span> * to construct a large string.<a name="line.156"></a> +<span class="sourceLineNo">093</span> try {<a name="line.93"></a> +<span class="sourceLineNo">094</span> if (v.streamed) {<a name="line.94"></a> +<span class="sourceLineNo">095</span> StringWriter sw = new StringWriter();<a name="line.95"></a> +<span class="sourceLineNo">096</span> v.resolveTo(this, sw, val);<a name="line.96"></a> +<span class="sourceLineNo">097</span> return sw.toString();<a name="line.97"></a> +<span class="sourceLineNo">098</span> }<a name="line.98"></a> +<span class="sourceLineNo">099</span> s = v.doResolve(this, val);<a name="line.99"></a> +<span class="sourceLineNo">100</span> if (s == null)<a name="line.100"></a> +<span class="sourceLineNo">101</span> s = "";<a name="line.101"></a> +<span class="sourceLineNo">102</span> return resolve(s);<a name="line.102"></a> +<span class="sourceLineNo">103</span> } catch (Exception e) {<a name="line.103"></a> +<span class="sourceLineNo">104</span> return '{' + e.getLocalizedMessage() + '}';<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> return s;<a name="line.107"></a> +<span class="sourceLineNo">108</span> }<a name="line.108"></a> +<span class="sourceLineNo">109</span><a name="line.109"></a> +<span class="sourceLineNo">110</span> try {<a name="line.110"></a> +<span class="sourceLineNo">111</span> return resolveTo(s, new StringWriter()).toString();<a name="line.111"></a> +<span class="sourceLineNo">112</span> } catch (IOException e) {<a name="line.112"></a> +<span class="sourceLineNo">113</span> throw new RuntimeException(e); // Never happens.<a name="line.113"></a> +<span class="sourceLineNo">114</span> }<a name="line.114"></a> +<span class="sourceLineNo">115</span> }<a name="line.115"></a> +<span class="sourceLineNo">116</span><a name="line.116"></a> +<span class="sourceLineNo">117</span> /*<a name="line.117"></a> +<span class="sourceLineNo">118</span> * Checks to see if string is of the simple form "$X{...}" with no embedded variables.<a name="line.118"></a> +<span class="sourceLineNo">119</span> * This is a common case, and we can avoid using StringWriters.<a name="line.119"></a> +<span class="sourceLineNo">120</span> */<a name="line.120"></a> +<span class="sourceLineNo">121</span> private static boolean isSimpleVar(String s) {<a name="line.121"></a> +<span class="sourceLineNo">122</span> int S1 = 1; // Not in variable, looking for $<a name="line.122"></a> +<span class="sourceLineNo">123</span> int S2 = 2; // Found $, Looking for {<a name="line.123"></a> +<span class="sourceLineNo">124</span> int S3 = 3; // Found {, Looking for }<a name="line.124"></a> +<span class="sourceLineNo">125</span> int S4 = 4; // Found }<a name="line.125"></a> +<span class="sourceLineNo">126</span><a name="line.126"></a> +<span class="sourceLineNo">127</span> int length = s.length();<a name="line.127"></a> +<span class="sourceLineNo">128</span> int state = S1;<a name="line.128"></a> +<span class="sourceLineNo">129</span> for (int i = 0; i < length; i++) {<a name="line.129"></a> +<span class="sourceLineNo">130</span> char c = s.charAt(i);<a name="line.130"></a> +<span class="sourceLineNo">131</span> if (state == S1) {<a name="line.131"></a> +<span class="sourceLineNo">132</span> if (c == '$') {<a name="line.132"></a> +<span class="sourceLineNo">133</span> state = S2;<a name="line.133"></a> +<span class="sourceLineNo">134</span> } else {<a name="line.134"></a> +<span class="sourceLineNo">135</span> return false;<a name="line.135"></a> +<span class="sourceLineNo">136</span> }<a name="line.136"></a> +<span class="sourceLineNo">137</span> } else if (state == S2) {<a name="line.137"></a> +<span class="sourceLineNo">138</span> if (c == '{') {<a name="line.138"></a> +<span class="sourceLineNo">139</span> state = S3;<a name="line.139"></a> +<span class="sourceLineNo">140</span> } else if (c < 'A' || c > 'z' || (c > 'Z' && c < 'a')) { // False trigger "$X "<a name="line.140"></a> +<span class="sourceLineNo">141</span> return false;<a name="line.141"></a> +<span class="sourceLineNo">142</span> }<a name="line.142"></a> +<span class="sourceLineNo">143</span> } else if (state == S3) {<a name="line.143"></a> +<span class="sourceLineNo">144</span> if (c == '}')<a name="line.144"></a> +<span class="sourceLineNo">145</span> state = S4;<a name="line.145"></a> +<span class="sourceLineNo">146</span> else if (c == '{' || c == '$')<a name="line.146"></a> +<span class="sourceLineNo">147</span> return false;<a name="line.147"></a> +<span class="sourceLineNo">148</span> } else if (state == S4) {<a name="line.148"></a> +<span class="sourceLineNo">149</span> return false;<a name="line.149"></a> +<span class="sourceLineNo">150</span> }<a name="line.150"></a> +<span class="sourceLineNo">151</span> }<a name="line.151"></a> +<span class="sourceLineNo">152</span> return state == S4;<a name="line.152"></a> +<span class="sourceLineNo">153</span> }<a name="line.153"></a> +<span class="sourceLineNo">154</span><a name="line.154"></a> +<span class="sourceLineNo">155</span> /**<a name="line.155"></a> +<span class="sourceLineNo">156</span> * Resolves variables in the specified string and sends the output to the specified writer.<a name="line.156"></a> <span class="sourceLineNo">157</span> *<a name="line.157"></a> -<span class="sourceLineNo">158</span> * @param s The string to resolve variables in.<a name="line.158"></a> -<span class="sourceLineNo">159</span> * @param out The writer to write to.<a name="line.159"></a> -<span class="sourceLineNo">160</span> * @return The same writer.<a name="line.160"></a> -<span class="sourceLineNo">161</span> * @throws IOException<a name="line.161"></a> -<span class="sourceLineNo">162</span> */<a name="line.162"></a> -<span class="sourceLineNo">163</span> public Writer resolveTo(String s, Writer out) throws IOException {<a name="line.163"></a> -<span class="sourceLineNo">164</span><a name="line.164"></a> -<span class="sourceLineNo">165</span> int S1 = 1; // Not in variable, looking for $<a name="line.165"></a> -<span class="sourceLineNo">166</span> int S2 = 2; // Found $, Looking for {<a name="line.166"></a> -<span class="sourceLineNo">167</span> int S3 = 3; // Found {, Looking for }<a name="line.167"></a> +<span class="sourceLineNo">158</span> * <p><a name="line.158"></a> +<span class="sourceLineNo">159</span> * More efficient than first parsing to a string and then serializing to the writer since this method doesn't need<a name="line.159"></a> +<span class="sourceLineNo">160</span> * to construct a large string.<a name="line.160"></a> +<span class="sourceLineNo">161</span> *<a name="line.161"></a> +<span class="sourceLineNo">162</span> * @param s The string to resolve variables in.<a name="line.162"></a> +<span class="sourceLineNo">163</span> * @param out The writer to write to.<a name="line.163"></a> +<span class="sourceLineNo">164</span> * @return The same writer.<a name="line.164"></a> +<span class="sourceLineNo">165</span> * @throws IOException<a name="line.165"></a> +<span class="sourceLineNo">166</span> */<a name="line.166"></a> +<span class="sourceLineNo">167</span> public Writer resolveTo(String s, Writer out) throws IOException {<a name="line.167"></a> <span class="sourceLineNo">168</span><a name="line.168"></a> -<span class="sourceLineNo">169</span> int state = S1;<a name="line.169"></a> -<span class="sourceLineNo">170</span> boolean isInEscape = false;<a name="line.170"></a> -<span class="sourceLineNo">171</span> boolean hasInternalVar = false;<a name="line.171"></a> -<span class="sourceLineNo">172</span> boolean hasInnerEscapes = false;<a name="line.172"></a> -<span class="sourceLineNo">173</span> String varType = null;<a name="line.173"></a> -<span class="sourceLineNo">174</span> String varVal = null;<a name="line.174"></a> -<span class="sourceLineNo">175</span> int x = 0, x2 = 0;<a name="line.175"></a> -<span class="sourceLineNo">176</span> int depth = 0;<a name="line.176"></a> -<span class="sourceLineNo">177</span> int length = s.length();<a name="line.177"></a> -<span class="sourceLineNo">178</span> for (int i = 0; i < length; i++) {<a name="line.178"></a> -<span class="sourceLineNo">179</span> char c = s.charAt(i);<a name="line.179"></a> -<span class="sourceLineNo">180</span> if (state == S1) {<a name="line.180"></a> -<span class="sourceLineNo">181</span> if (isInEscape) {<a name="line.181"></a> -<span class="sourceLineNo">182</span> if (c == '\\' || c == '$') {<a name="line.182"></a> -<span class="sourceLineNo">183</span> out.append(c);<a name="line.183"></a> -<span class="sourceLineNo">184</span> } else {<a name="line.184"></a> -<span class="sourceLineNo">185</span> out.append('\\').append(c);<a name="line.185"></a> -<span class="sourceLineNo">186</span> }<a name="line.186"></a> -<span class="sourceLineNo">187</span> isInEscape = false;<a name="line.187"></a> -<span class="sourceLineNo">188</span> } else if (c == '\\') {<a name="line.188"></a> -<span class="sourceLineNo">189</span> isInEscape = true;<a name="line.189"></a> -<span class="sourceLineNo">190</span> } else if (c == '$') {<a name="line.190"></a> -<span class="sourceLineNo">191</span> x = i;<a name="line.191"></a> -<span class="sourceLineNo">192</span> x2 = i;<a name="line.192"></a> -<span class="sourceLineNo">193</span> state = S2;<a name="line.193"></a> -<span class="sourceLineNo">194</span> } else {<a name="line.194"></a> -<span class="sourceLineNo">195</span> out.append(c);<a name="line.195"></a> -<span class="sourceLineNo">196</span> }<a name="line.196"></a> -<span class="sourceLineNo">197</span> } else if (state == S2) {<a name="line.197"></a> -<span class="sourceLineNo">198</span> if (isInEscape) {<a name="line.198"></a> -<span class="sourceLineNo">199</span> isInEscape = false;<a name="line.199"></a> -<span class="sourceLineNo">200</span> } else if (c == '\\') {<a name="line.200"></a> -<span class="sourceLineNo">201</span> hasInnerEscapes = true;<a name="line.201"></a> -<span class="sourceLineNo">202</span> isInEscape = true;<a name="line.202"></a> -<span class="sourceLineNo">203</span> } else if (c == '{') {<a name="line.203"></a> -<span class="sourceLineNo">204</span> varType = s.substring(x+1, i);<a name="line.204"></a> -<span class="sourceLineNo">205</span> x = i;<a name="line.205"></a> -<span class="sourceLineNo">206</span> state = S3;<a name="line.206"></a> -<span class="sourceLineNo">207</span> } else if (c < 'A' || c > 'z' || (c > 'Z' && c < 'a')) { // False trigger "$X "<a name="line.207"></a> -<span class="sourceLineNo">208</span> if (hasInnerEscapes)<a name="line.208"></a> -<span class="sourceLineNo">209</span> out.append(unEscapeChars(s.substring(x, i+1), new char[]{'\\','{'}));<a name="line.209"></a> -<span class="sourceLineNo">210</span> else<a name="line.210"></a> -<span class="sourceLineNo">211</span> out.append(s, x, i+1);<a name="line.211"></a> -<span class="sourceLineNo">212</span> x = i + 1;<a name="line.212"></a> -<span class="sourceLineNo">213</span> state = S1;<a name="line.213"></a> -<span class="sourceLineNo">214</span> hasInnerEscapes = false;<a name="line.214"></a> -<span class="sourceLineNo">215</span> }<a name="line.215"></a> -<span class="sourceLineNo">216</span> } else if (state == S3) {<a name="line.216"></a> -<span class="sourceLineNo">217</span> if (isInEscape) {<a name="line.217"></a> -<span class="sourceLineNo">218</span> isInEscape = false;<a name="line.218"></a> -<span class="sourceLineNo">219</span> } else if (c == '\\') {<a name="line.219"></a> -<span class="sourceLineNo">220</span> isInEscape = true;<a name="line.220"></a> -<span class="sourceLineNo">221</span> hasInnerEscapes = true;<a name="line.221"></a> -<span class="sourceLineNo">222</span> } else if (c == '{') {<a name="line.222"></a> -<span class="sourceLineNo">223</span> depth++;<a name="line.223"></a> -<span class="sourceLineNo">224</span> hasInternalVar = true;<a name="line.224"></a> -<span class="sourceLineNo">225</span> } else if (c == '}') {<a name="line.225"></a> -<span class="sourceLineNo">226</span> if (depth > 0) {<a name="line.226"></a> -<span class="sourceLineNo">227</span> depth--;<a name="line.227"></a> -<span class="sourceLineNo">228</span> } else {<a name="line.228"></a> -<span class="sourceLineNo">229</span> varVal = s.substring(x+1, i);<a name="line.229"></a> -<span class="sourceLineNo">230</span> varVal = (hasInternalVar ? resolve(varVal) : varVal);<a name="line.230"></a> -<span class="sourceLineNo">231</span> Var r = getVar(varType);<a name="line.231"></a> -<span class="sourceLineNo">232</span> if (r == null) {<a name="line.232"></a> -<span class="sourceLineNo">233</span> if (hasInnerEscapes)<a name="line.233"></a> -<span class="sourceLineNo">234</span> out.append(unEscapeChars(s.substring(x2, i+1), new char[]{'\\','$','{','}'}));<a name="line.234"></a> -<span class="sourceLineNo">235</span> else<a name="line.235"></a> -<span class="sourceLineNo">236</span> out.append(s, x2, i+1);<a name="line.236"></a> -<span class="sourceLineNo">237</span> x = i+1;<a name="line.237"></a> -<span class="sourceLineNo">238</span> } else {<a name="line.238"></a> -<span class="sourceLineNo">239</span> if (r.streamed)<a name="line.239"></a> -<span class="sourceLineNo">240</span> r.resolveTo(this, out, varVal);<a name="line.240"></a> -<span class="sourceLineNo">241</span> else {<a name="line.241"></a> -<span class="sourceLineNo">242</span> String replacement = r.doResolve(this, varVal);<a name="line.242"></a> -<span class="sourceLineNo">243</span> if (replacement == null)<a name="line.243"></a> -<span class="sourceLineNo">244</span> replacement = "";<a name="line.244"></a> -<span class="sourceLineNo">245</span> // If the replacement also contains variables, replace them now.<a name="line.245"></a> -<span class="sourceLineNo">246</span> if (replacement.indexOf('$') != -1)<a name="line.246"></a> -<span class="sourceLineNo">247</span> replacement = resolve(replacement);<a name="line.247"></a> -<span class="sourceLineNo">248</span> out.append(replacement);<a name="line.248"></a> -<span class="sourceLineNo">249</span> }<a name="line.249"></a> -<span class="sourceLineNo">250</span> x = i+1;<a name="line.250"></a> -<span class="sourceLineNo">251</span> }<a name="line.251"></a> -<span class="sourceLineNo">252</span> state = 1;<a name="line.252"></a> -<span class="sourceLineNo">253</span> hasInnerEscapes = false;<a name="line.253"></a> -<span class="sourceLineNo">254</span> }<a name="line.254"></a> -<span class="sourceLineNo">255</span> }<a name="line.255"></a> -<span class="sourceLineNo">256</span> }<a name="line.256"></a> -<span class="sourceLineNo">257</span> }<a name="line.257"></a> -<span class="sourceLineNo">258</span> if (isInEscape)<a name="line.258"></a> -<span class="sourceLineNo">259</span> out.append('\\');<a name="line.259"></a> -<span class="sourceLineNo">260</span> else if (state == S2)<a name="line.260"></a> -<span class="sourceLineNo">261</span> out.append('$').append(unEscapeChars(s.substring(x+1), new char[]{'{', '\\'}));<a name="line.261"></a> -<span class="sourceLineNo">262</span> else if (state == S3)<a name="line.262"></a> -<span class="sourceLineNo">263</span> out.append('$').append(varType).append('{').append(unEscapeChars(s.substring(x+1), new char[]{'\\','$','{','}'}));<a name="line.263"></a> -<span class="sourceLineNo">264</span> return out;<a name="line.264"></a> -<span class="sourceLineNo">265</span> }<a name="line.265"></a> -<span class="sourceLineNo">266</span><a name="line.266"></a> -<span class="sourceLineNo">267</span><a name="line.267"></a> -<span class="sourceLineNo">268</span> /**<a name="line.268"></a> -<span class="sourceLineNo">269</span> * Returns the session object with the specified name.<a name="line.269"></a> -<span class="sourceLineNo">270</span> *<a name="line.270"></a> -<span class="sourceLineNo">271</span> * <p><a name="line.271"></a> -<span class="sourceLineNo">272</span> * Casts it to the specified class type for you.<a name="line.272"></a> -<span class="sourceLineNo">273</span> *<a name="line.273"></a> -<span class="sourceLineNo">274</span> * @param c The class type to cast to.<a name="line.274"></a> -<span class="sourceLineNo">275</span> * @param name The name of the session object.<a name="line.275"></a> -<span class="sourceLineNo">276</span> * @return The session object. Never <jk>null</jk>.<a name="line.276"></a> -<span class="sourceLineNo">277</span> * @throws RuntimeException If session object with specified name does not exist.<a name="line.277"></a> -<span class="sourceLineNo">278</span> */<a name="line.278"></a> -<span class="sourceLineNo">279</span> @SuppressWarnings("unchecked")<a name="line.279"></a> -<span class="sourceLineNo">280</span> public <T> T getSessionObject(Class<T> c, String name) {<a name="line.280"></a> -<span class="sourceLineNo">281</span> T t = null;<a name="line.281"></a> -<span class="sourceLineNo">282</span> try {<a name="line.282"></a> -<span class="sourceLineNo">283</span> t = (T)sessionObjects.get(name);<a name="line.283"></a> -<span class="sourceLineNo">284</span> if (t == null) {<a name="line.284"></a> -<span class="sourceLineNo">285</span> sessionObjects.put(name, this.context.getContextObject(name));<a name="line.285"></a> -<span class="sourceLineNo">286</span> t = (T)sessionObjects.get(name);<a name="line.286"></a> -<span class="sourceLineNo">287</span> }<a name="line.287"></a> -<span class="sourceLineNo">288</span> } catch (Exception e) {<a name="line.288"></a> -<span class="sourceLineNo">289</span> throw new FormattedRuntimeException(e,<a name="line.289"></a> -<span class="sourceLineNo">290</span> "Session object ''{0}'' or context object ''SvlContext.{0}'' could not be converted to type ''{1}''.", name, c);<a name="line.290"></a> -<span class="sourceLineNo">291</span> }<a name="line.291"></a> -<span class="sourceLineNo">292</span> if (t == null)<a name="line.292"></a> -<span class="sourceLineNo">293</span> throw new FormattedRuntimeException(<a name="line.293"></a> -<span class="sourceLineNo">294</span> "Session object ''{0}'' or context object ''SvlContext.{0}'' not found.", name);<a name="line.294"></a> -<span class="sourceLineNo">295</span> return t;<a name="line.295"></a> -<span class="sourceLineNo">296</span> }<a name="line.296"></a> -<span class="sourceLineNo">297</span><a name="line.297"></a> -<span class="sourceLineNo">298</span> /**<a name="line.298"></a> -<span class="sourceLineNo">299</span> * Returns the {@link Var} with the specified name.<a name="line.299"></a> -<span class="sourceLineNo">300</span> *<a name="line.300"></a> -<span class="sourceLineNo">301</span> * @param name The var name (e.g. <js>"S"</js>).<a name="line.301"></a> -<span class="sourceLineNo">302</span> * @return The {@link Var} instance, or <jk>null</jk> if no <code>Var</code> is associated with the specified name.<a name="line.302"></a> -<span class="sourceLineNo">303</span> */<a name="line.303"></a> -<span class="sourceLineNo">304</span> protected Var getVar(String name) {<a name="line.304"></a> -<span class="sourceLineNo">305</span> return this.context.getVarMap().get(name);<a name="line.305"></a> -<span class="sourceLineNo">306</span> }<a name="line.306"></a> -<span class="sourceLineNo">307</span>}<a name="line.307"></a> +<span class="sourceLineNo">169</span> int S1 = 1; // Not in variable, looking for $<a name="line.169"></a> +<span class="sourceLineNo">170</span> int S2 = 2; // Found $, Looking for {<a name="line.170"></a> +<span class="sourceLineNo">171</span> int S3 = 3; // Found {, Looking for }<a name="line.171"></a> +<span class="sourceLineNo">172</span><a name="line.172"></a> +<span class="sourceLineNo">173</span> int state = S1;<a name="line.173"></a> +<span class="sourceLineNo">174</span> boolean isInEscape = false;<a name="line.174"></a> +<span class="sourceLineNo">175</span> boolean hasInternalVar = false;<a name="line.175"></a> +<span class="sourceLineNo">176</span> boolean hasInnerEscapes = false;<a name="line.176"></a> +<span class="sourceLineNo">177</span> String varType = null;<a name="line.177"></a> +<span class="sourceLineNo">178</span> String varVal = null;<a name="line.178"></a> +<span class="sourceLineNo">179</span> int x = 0, x2 = 0;<a name="line.179"></a> +<span class="sourceLineNo">180</span> int depth = 0;<a name="line.180"></a> +<span class="sourceLineNo">181</span> int length = s.length();<a name="line.181"></a> +<span class="sourceLineNo">182</span> for (int i = 0; i < length; i++) {<a name="line.182"></a> +<span class="sourceLineNo">183</span> char c = s.charAt(i);<a name="line.183"></a> +<span class="sourceLineNo">184</span> if (state == S1) {<a name="line.184"></a> +<span class="sourceLineNo">185</span> if (isInEscape) {<a name="line.185"></a> +<span class="sourceLineNo">186</span> if (c == '\\' || c == '$') {<a name="line.186"></a> +<span class="sourceLineNo">187</span> out.append(c);<a name="line.187"></a> +<span class="sourceLineNo">188</span> } else {<a name="line.188"></a> +<span class="sourceLineNo">189</span> out.append('\\').append(c);<a name="line.189"></a> +<span class="sourceLineNo">190</span> }<a name="line.190"></a> +<span class="sourceLineNo">191</span> isInEscape = false;<a name="line.191"></a> +<span class="sourceLineNo">192</span> } else if (c == '\\') {<a name="line.192"></a> +<span class="sourceLineNo">193</span> isInEscape = true;<a name="line.193"></a> +<span class="sourceLineNo">194</span> } else if (c == '$') {<a name="line.194"></a> +<span class="sourceLineNo">195</span> x = i;<a name="line.195"></a> +<span class="sourceLineNo">196</span> x2 = i;<a name="line.196"></a> +<span class="sourceLineNo">197</span> state = S2;<a name="line.197"></a> +<span class="sourceLineNo">198</span> } else {<a name="line.198"></a> +<span class="sourceLineNo">199</span> out.append(c);<a name="line.199"></a> +<span class="sourceLineNo">200</span> }<a name="line.200"></a> +<span class="sourceLineNo">201</span> } else if (state == S2) {<a name="line.201"></a> +<span class="sourceLineNo">202</span> if (isInEscape) {<a name="line.202"></a> +<span class="sourceLineNo">203</span> isInEscape = false;<a name="line.203"></a> +<span class="sourceLineNo">204</span> } else if (c == '\\') {<a name="line.204"></a> +<span class="sourceLineNo">205</span> hasInnerEscapes = true;<a name="line.205"></a> +<span class="sourceLineNo">206</span> isInEscape = true;<a name="line.206"></a> +<span class="sourceLineNo">207</span> } else if (c == '{') {<a name="line.207"></a> +<span class="sourceLineNo">208</span> varType = s.substring(x+1, i);<a name="line.208"></a> +<span class="sourceLineNo">209</span> x = i;<a name="line.209"></a> +<span class="sourceLineNo">210</span> state = S3;<a name="line.210"></a> +<span class="sourceLineNo">211</span> } else if (c < 'A' || c > 'z' || (c > 'Z' && c < 'a')) { // False trigger "$X "<a name="line.211"></a> +<span class="sourceLineNo">212</span> if (hasInnerEscapes)<a name="line.212"></a> +<span class="sourceLineNo">213</span> out.append(unEscapeChars(s.substring(x, i+1), new char[]{'\\','{'}));<a name="line.213"></a> +<span class="sourceLineNo">214</span> else<a name="line.214"></a> +<span class="sourceLineNo">215</span> out.append(s, x, i+1);<a name="line.215"></a> +<span class="sourceLineNo">216</span> x = i + 1;<a name="line.216"></a> +<span class="sourceLineNo">217</span> state = S1;<a name="line.217"></a> +<span class="sourceLineNo">218</span> hasInnerEscapes = false;<a name="line.218"></a> +<span class="sourceLineNo">219</span> }<a name="line.219"></a> +<span class="sourceLineNo">220</span> } else if (state == S3) {<a name="line.220"></a> +<span class="sourceLineNo">221</span> if (isInEscape) {<a name="line.221"></a> +<span class="sourceLineNo">222</span> isInEscape = false;<a name="line.222"></a> +<span class="sourceLineNo">223</span> } else if (c == '\\') {<a name="line.223"></a> +<span class="sourceLineNo">224</span> isInEscape = true;<a name="line.224"></a> +<span class="sourceLineNo">225</span> hasInnerEscapes = true;<a name="line.225"></a> +<span class="sourceLineNo">226</span> } else if (c == '{') {<a name="line.226"></a> +<span class="sourceLineNo">227</span> depth++;<a name="line.227"></a> +<span class="sourceLineNo">228</span> hasInternalVar = true;<a name="line.228"></a> +<span class="sourceLineNo">229</span> } else if (c == '}') {<a name="line.229"></a> +<span class="sourceLineNo">230</span> if (depth > 0) {<a name="line.230"></a> +<span class="sourceLineNo">231</span> depth--;<a name="line.231"></a> +<span class="sourceLineNo">232</span> } else {<a name="line.232"></a> +<span class="sourceLineNo">233</span> varVal = s.substring(x+1, i);<a name="line.233"></a> +<span class="sourceLineNo">234</span> varVal = (hasInternalVar ? resolve(varVal) : varVal);<a name="line.234"></a> +<span class="sourceLineNo">235</span> Var r = getVar(varType);<a name="line.235"></a> +<span class="sourceLineNo">236</span> if (r == null) {<a name="line.236"></a> +<span class="sourceLineNo">237</span> if (hasInnerEscapes)<a name="line.237"></a> +<span class="sourceLineNo">238</span> out.append(unEscapeChars(s.substring(x2, i+1), new char[]{'\\','$','{','}'}));<a name="line.238"></a> +<span class="sourceLineNo">239</span> else<a name="line.239"></a> +<span class="sourceLineNo">240</span> out.append(s, x2, i+1);<a name="line.240"></a> +<span class="sourceLineNo">241</span> x = i+1;<a name="line.241"></a> +<span class="sourceLineNo">242</span> } else {<a name="line.242"></a> +<span class="sourceLineNo">243</span> try {<a name="line.243"></a> +<span class="sourceLineNo">244</span> if (r.streamed)<a name="line.244"></a> +<span class="sourceLineNo">245</span> r.resolveTo(this, out, varVal);<a name="line.245"></a> +<span class="sourceLineNo">246</span> else {<a name="line.246"></a> +<span class="sourceLineNo">247</span> String replacement = r.doResolve(this, varVal);<a name="line.247"></a> +<span class="sourceLineNo">248</span> if (replacement == null)<a name="line.248"></a> +<span class="sourceLineNo">249</span> replacement = "";<a name="line.249"></a> +<span class="sourceLineNo">250</span> // If the replacement also contains variables, replace them now.<a name="line.250"></a> +<span class="sourceLineNo">251</span> if (replacement.indexOf('$') != -1)<a name="line.251"></a> +<span class="sourceLineNo">252</span> replacement = resolve(replacement);<a name="line.252"></a> +<span class="sourceLineNo">253</span> out.append(replacement);<a name="line.253"></a> +<span class="sourceLineNo">254</span> }<a name="line.254"></a> +<span class="sourceLineNo">255</span> } catch (Exception e) {<a name="line.255"></a> +<span class="sourceLineNo">256</span> out.append('{').append(e.getLocalizedMessage()).append('}');<a name="line.256"></a> +<span class="sourceLineNo">257</span> }<a name="line.257"></a> +<span class="sourceLineNo">258</span> x = i+1;<a name="line.258"></a> +<span class="sourceLineNo">259</span> }<a name="line.259"></a> +<span class="sourceLineNo">260</span> state = 1;<a name="line.260"></a> +<span class="sourceLineNo">261</span> hasInnerEscapes = false;<a name="line.261"></a> +<span class="sourceLineNo">262</span> }<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> }<a name="line.265"></a> +<span class="sourceLineNo">266</span> if (isInEscape)<a name="line.266"></a> +<span class="sourceLineNo">267</span> out.append('\\');<a name="line.267"></a> +<span class="sourceLineNo">268</span> else if (state == S2)<a name="line.268"></a> +<span class="sourceLineNo">269</span> out.append('$').append(unEscapeChars(s.substring(x+1), new char[]{'{', '\\'}));<a name="line.269"></a> +<span class="sourceLineNo">270</span> else if (state == S3)<a name="line.270"></a> +<span class="sourceLineNo">271</span> out.append('$').append(varType).append('{').append(unEscapeChars(s.substring(x+1), new char[]{'\\','$','{','}'}));<a name="line.271"></a> +<span class="sourceLineNo">272</span> return out;<a name="line.272"></a> +<span class="sourceLineNo">273</span> }<a name="line.273"></a> +<span class="sourceLineNo">274</span><a name="line.274"></a> +<span class="sourceLineNo">275</span><a name="line.275"></a> +<span class="sourceLineNo">276</span> /**<a name="line.276"></a> +<span class="sourceLineNo">277</span> * Returns the session object with the specified name.<a name="line.277"></a> +<span class="sourceLineNo">278</span> *<a name="line.278"></a> +<span class="sourceLineNo">279</span> * <p><a name="line.279"></a> +<span class="sourceLineNo">280</span> * Casts it to the specified class type for you.<a name="line.280"></a> +<span class="sourceLineNo">281</span> *<a name="line.281"></a> +<span class="sourceLineNo">282</span> * @param c The class type to cast to.<a name="line.282"></a> +<span class="sourceLineNo">283</span> * @param name The name of the session object.<a name="line.283"></a> +<span class="sourceLineNo">284</span> * @return The session object. Never <jk>null</jk>.<a name="line.284"></a> +<span class="sourceLineNo">285</span> * @throws RuntimeException If session object with specified name does not exist.<a name="line.285"></a> +<span class="sourceLineNo">286</span> */<a name="line.286"></a> +<span class="sourceLineNo">287</span> @SuppressWarnings("unchecked")<a name="line.287"></a> +<span class="sourceLineNo">288</span> public <T> T getSessionObject(Class<T> c, String name) {<a name="line.288"></a> +<span class="sourceLineNo">289</span> T t = null;<a name="line.289"></a> +<span class="sourceLineNo">290</span> try {<a name="line.290"></a> +<span class="sourceLineNo">291</span> t = (T)sessionObjects.get(name);<a name="line.291"></a> +<span class="sourceLineNo">292</span> if (t == null) {<a name="line.292"></a> +<span class="sourceLineNo">293</span> sessionObjects.put(name, this.context.getContextObject(name));<a name="line.293"></a> +<span class="sourceLineNo">294</span> t = (T)sessionObjects.get(name);<a name="line.294"></a> +<span class="sourceLineNo">295</span> }<a name="line.295"></a> +<span class="sourceLineNo">296</span> } catch (Exception e) {<a name="line.296"></a> +<span class="sourceLineNo">297</span> throw new FormattedRuntimeException(e,<a name="line.297"></a> +<span class="sourceLineNo">298</span> "Session object ''{0}'' or context object ''SvlContext.{0}'' could not be converted to type ''{1}''.", name, c);<a name="line.298"></a> +<span class="sourceLineNo">299</span> }<a name="line.299"></a> +<span class="sourceLineNo">300</span> if (t == null)<a name="line.300"></a> +<span class="sourceLineNo">301</span> throw new FormattedRuntimeException(<a name="line.301"></a> +<span class="sourceLineNo">302</span> "Session object ''{0}'' or context object ''SvlContext.{0}'' not found.", name);<a name="line.302"></a> +<span class="sourceLineNo">303</span> return t;<a name="line.303"></a> +<span class="sourceLineNo">304</span> }<a name="line.304"></a> +<span class="sourceLineNo">305</span><a name="line.305"></a> +<span class="sourceLineNo">306</span> /**<a name="line.306"></a> +<span class="sourceLineNo">307</span> * Returns the {@link Var} with the specified name.<a name="line.307"></a> +<span class="sourceLineNo">308</span> *<a name="line.308"></a> +<span class="sourceLineNo">309</span> * @param name The var name (e.g. <js>"S"</js>).<a name="line.309"></a> +<span class="sourceLineNo">310</span> * @return The {@link Var} instance, or <jk>null</jk> if no <code>Var</code> is associated with the specified name.<a name="line.310"></a> +<span class="sourceLineNo">311</span> */<a name="line.311"></a> +<span class="sourceLineNo">312</span> protected Var getVar(String name) {<a name="line.312"></a> +<span class="sourceLineNo">313</span> return this.context.getVarMap().get(name);<a name="line.313"></a> +<span class="sourceLineNo">314</span> }<a name="line.314"></a> +<span class="sourceLineNo">315</span>}<a name="line.315"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/9b48e212/content/site/apidocs/src-html/org/apache/juneau/svl/vars/ConfigFileVar.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/svl/vars/ConfigFileVar.html b/content/site/apidocs/src-html/org/apache/juneau/svl/vars/ConfigFileVar.html index 54583c6..9c24f7a 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/svl/vars/ConfigFileVar.html +++ b/content/site/apidocs/src-html/org/apache/juneau/svl/vars/ConfigFileVar.html @@ -27,7 +27,7 @@ <span class="sourceLineNo">019</span> * Config file variable resolver.<a name="line.19"></a> <span class="sourceLineNo">020</span> *<a name="line.20"></a> <span class="sourceLineNo">021</span> * <p><a name="line.21"></a> -<span class="sourceLineNo">022</span> * The format for this var is <js>"$C{key}"</js> or <js>"$C{key,defaultValue}"</js>.<a name="line.22"></a> +<span class="sourceLineNo">022</span> * The format for this var is <js>"$C{key[,defaultValue]}"</js>.<a name="line.22"></a> <span class="sourceLineNo">023</span> * See {@link ConfigFile#getString(String)} for the format of the key.<a name="line.23"></a> <span class="sourceLineNo">024</span> *<a name="line.24"></a> <span class="sourceLineNo">025</span> * <p><a name="line.25"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/9b48e212/content/site/apidocs/src-html/org/apache/juneau/svl/vars/EnvVariablesVar.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/svl/vars/EnvVariablesVar.html b/content/site/apidocs/src-html/org/apache/juneau/svl/vars/EnvVariablesVar.html index 133bdcb..18b9289 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/svl/vars/EnvVariablesVar.html +++ b/content/site/apidocs/src-html/org/apache/juneau/svl/vars/EnvVariablesVar.html @@ -26,7 +26,7 @@ <span class="sourceLineNo">018</span> * Environment variable variable resolver.<a name="line.18"></a> <span class="sourceLineNo">019</span> *<a name="line.19"></a> <span class="sourceLineNo">020</span> * <p><a name="line.20"></a> -<span class="sourceLineNo">021</span> * The format for this var is <js>"$E{envVar}"</js> or <js>"$E{envVar,defaultValue}"</js><a name="line.21"></a> +<span class="sourceLineNo">021</span> * The format for this var is <js>"$E{envVar[,defaultValue]}"</js>.<a name="line.21"></a> <span class="sourceLineNo">022</span> *<a name="line.22"></a> <span class="sourceLineNo">023</span> * <h5 class='section'>Example:</h5><a name="line.23"></a> <span class="sourceLineNo">024</span> * <p class='bcode'><a name="line.24"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/9b48e212/content/site/apidocs/src-html/org/apache/juneau/svl/vars/SwitchVar.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/svl/vars/SwitchVar.html b/content/site/apidocs/src-html/org/apache/juneau/svl/vars/SwitchVar.html index 6fca28c..e9c7007 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/svl/vars/SwitchVar.html +++ b/content/site/apidocs/src-html/org/apache/juneau/svl/vars/SwitchVar.html @@ -32,10 +32,10 @@ <span class="sourceLineNo">024</span> * <p><a name="line.24"></a> <span class="sourceLineNo">025</span> * The format for this var is one of the following:<a name="line.25"></a> <span class="sourceLineNo">026</span> * <ul><a name="line.26"></a> -<span class="sourceLineNo">027</span> * <li><js>"$SWITCH{stringArg,pattern,thenValue}"</js><a name="line.27"></a> -<span class="sourceLineNo">028</span> * <li><js>"$SWITCH{stringArg,pattern,thenValue,elseValue}"</js><a name="line.28"></a> -<span class="sourceLineNo">029</span> * <li><js>"$SWITCH{stringArg,pattern,thenValue,pattern,thenValue}"</js><a name="line.29"></a> -<span class="sourceLineNo">030</span> * <li><js>"$SWITCH{stringArg,pattern,thenValue,pattern,thenValue,elsePattern}"</js><a name="line.30"></a> +<span class="sourceLineNo">027</span> * <li><js>"$SW{stringArg,pattern,thenValue}"</js><a name="line.27"></a> +<span class="sourceLineNo">028</span> * <li><js>"$SW{stringArg,pattern,thenValue,elseValue}"</js><a name="line.28"></a> +<span class="sourceLineNo">029</span> * <li><js>"$SW{stringArg,pattern,thenValue,pattern,thenValue}"</js><a name="line.29"></a> +<span class="sourceLineNo">030</span> * <li><js>"$SW{stringArg,pattern,thenValue,pattern,thenValue,elsePattern}"</js><a name="line.30"></a> <span class="sourceLineNo">031</span> * <li>...<a name="line.31"></a> <span class="sourceLineNo">032</span> * </ul><a name="line.32"></a> <span class="sourceLineNo">033</span> *<a name="line.33"></a> @@ -45,11 +45,11 @@ <span class="sourceLineNo">037</span> *<a name="line.37"></a> <span class="sourceLineNo">038</span> * <h5 class='section'>Example:</h5><a name="line.38"></a> <span class="sourceLineNo">039</span> * <p class='bcode'><a name="line.39"></a> -<span class="sourceLineNo">040</span> * <jc>// Create a variable resolver that resolves system properties and $SWITCH vars.</jc><a name="line.40"></a> +<span class="sourceLineNo">040</span> * <jc>// Create a variable resolver that resolves system properties and $SW vars.</jc><a name="line.40"></a> <span class="sourceLineNo">041</span> * VarResolver r = <jk>new</jk> VarResolver().addVars(SwitchVar.<jk>class</jk>, SystemPropertiesVar.<jk>class</jk>);<a name="line.41"></a> <span class="sourceLineNo">042</span> *<a name="line.42"></a> <span class="sourceLineNo">043</span> * <jc>// Use it!</jc><a name="line.43"></a> -<span class="sourceLineNo">044</span> * System.<jsf>out</jsf>.println(r.resolve(<js>"We are running on $SWITCH{$P{os.name},*win*,Windows,Something else}!"</js>));<a name="line.44"></a> +<span class="sourceLineNo">044</span> * System.<jsf>out</jsf>.println(r.resolve(<js>"We are running on $SW{$P{os.name},*win*,Windows,Something else}!"</js>));<a name="line.44"></a> <span class="sourceLineNo">045</span> * </p><a name="line.45"></a> <span class="sourceLineNo">046</span> *<a name="line.46"></a> <span class="sourceLineNo">047</span> * <p><a name="line.47"></a> @@ -59,7 +59,7 @@ <span class="sourceLineNo">051</span>public class SwitchVar extends MultipartVar {<a name="line.51"></a> <span class="sourceLineNo">052</span><a name="line.52"></a> <span class="sourceLineNo">053</span> /** The name of this variable. */<a name="line.53"></a> -<span class="sourceLineNo">054</span> public static final String NAME = "SWITCH";<a name="line.54"></a> +<span class="sourceLineNo">054</span> public static final String NAME = "SW";<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> * Constructor.<a name="line.57"></a> @@ -71,7 +71,7 @@ <span class="sourceLineNo">063</span> @Override /* MultipartVar */<a name="line.63"></a> <span class="sourceLineNo">064</span> public String resolve(VarResolverSession session, String[] args) {<a name="line.64"></a> <span class="sourceLineNo">065</span> if (args.length < 3)<a name="line.65"></a> -<span class="sourceLineNo">066</span> illegalArg("Invalid number of arguments passed to $SWITCH var. Must have 3 or more arguments.");<a name="line.66"></a> +<span class="sourceLineNo">066</span> illegalArg("Invalid number of arguments passed to $SW var. Must have 3 or more arguments.");<a name="line.66"></a> <span class="sourceLineNo">067</span><a name="line.67"></a> <span class="sourceLineNo">068</span> String stringArg = args[0];<a name="line.68"></a> <span class="sourceLineNo">069</span> for (int i = 1; i < args.length;) {<a name="line.69"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/9b48e212/content/site/apidocs/src-html/org/apache/juneau/svl/vars/SystemPropertiesVar.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/svl/vars/SystemPropertiesVar.html b/content/site/apidocs/src-html/org/apache/juneau/svl/vars/SystemPropertiesVar.html index fce0020..cc662ed 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/svl/vars/SystemPropertiesVar.html +++ b/content/site/apidocs/src-html/org/apache/juneau/svl/vars/SystemPropertiesVar.html @@ -26,7 +26,7 @@ <span class="sourceLineNo">018</span> * System property variable resolver.<a name="line.18"></a> <span class="sourceLineNo">019</span> *<a name="line.19"></a> <span class="sourceLineNo">020</span> * <p><a name="line.20"></a> -<span class="sourceLineNo">021</span> * The format for this var is <js>"$S{systemProperty}"</js> or <js>"$S{systemProperty,defaultValue}"</js><a name="line.21"></a> +<span class="sourceLineNo">021</span> * The format for this var is <js>"$S{systemProperty[,defaultValue]}"</js></js><a name="line.21"></a> <span class="sourceLineNo">022</span> *<a name="line.22"></a> <span class="sourceLineNo">023</span> * <h5 class='section'>Example:</h5><a name="line.23"></a> <span class="sourceLineNo">024</span> * <p class='bcode'><a name="line.24"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/9b48e212/content/site/apidocs/src-html/org/apache/juneau/utils/ExtendedMimetypesFileTypeMap.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/utils/ExtendedMimetypesFileTypeMap.html b/content/site/apidocs/src-html/org/apache/juneau/utils/ExtendedMimetypesFileTypeMap.html new file mode 100644 index 0000000..a265535 --- /dev/null +++ b/content/site/apidocs/src-html/org/apache/juneau/utils/ExtendedMimetypesFileTypeMap.html @@ -0,0 +1,160 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";> +<html lang="en"> +<head> +<title>Source code</title> +<link rel="stylesheet" type="text/css" href="../../../../../javadoc.css" title="Style"> +</head> +<body> +<div class="sourceContainer"> +<pre><span class="sourceLineNo">001</span>// ***************************************************************************************************************************<a name="line.1"></a> +<span class="sourceLineNo">002</span>// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *<a name="line.2"></a> +<span class="sourceLineNo">003</span>// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *<a name="line.3"></a> +<span class="sourceLineNo">004</span>// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *<a name="line.4"></a> +<span class="sourceLineNo">005</span>// * with the License. You may obtain a copy of the License at *<a name="line.5"></a> +<span class="sourceLineNo">006</span>// * *<a name="line.6"></a> +<span class="sourceLineNo">007</span>// * http://www.apache.org/licenses/LICENSE-2.0 *<a name="line.7"></a> +<span class="sourceLineNo">008</span>// * *<a name="line.8"></a> +<span class="sourceLineNo">009</span>// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an *<a name="line.9"></a> +<span class="sourceLineNo">010</span>// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the *<a name="line.10"></a> +<span class="sourceLineNo">011</span>// * specific language governing permissions and limitations under the License. *<a name="line.11"></a> +<span class="sourceLineNo">012</span>// ***************************************************************************************************************************<a name="line.12"></a> +<span class="sourceLineNo">013</span>package org.apache.juneau.utils;<a name="line.13"></a> +<span class="sourceLineNo">014</span><a name="line.14"></a> +<span class="sourceLineNo">015</span>import javax.activation.*;<a name="line.15"></a> +<span class="sourceLineNo">016</span><a name="line.16"></a> +<span class="sourceLineNo">017</span>/**<a name="line.17"></a> +<span class="sourceLineNo">018</span> * An extension of {@link javax.activation.MimetypesFileTypeMap} that includes many more media types.<a name="line.18"></a> +<span class="sourceLineNo">019</span> */<a name="line.19"></a> +<span class="sourceLineNo">020</span>public class ExtendedMimetypesFileTypeMap extends MimetypesFileTypeMap {<a name="line.20"></a> +<span class="sourceLineNo">021</span><a name="line.21"></a> +<span class="sourceLineNo">022</span> /**<a name="line.22"></a> +<span class="sourceLineNo">023</span> * Reusable map since this object is somewhat expensive to create.<a name="line.23"></a> +<span class="sourceLineNo">024</span> */<a name="line.24"></a> +<span class="sourceLineNo">025</span> public static final ExtendedMimetypesFileTypeMap DEFAULT = new ExtendedMimetypesFileTypeMap();<a name="line.25"></a> +<span class="sourceLineNo">026</span><a name="line.26"></a> +<span class="sourceLineNo">027</span> /**<a name="line.27"></a> +<span class="sourceLineNo">028</span> * Constructor.<a name="line.28"></a> +<span class="sourceLineNo">029</span> */<a name="line.29"></a> +<span class="sourceLineNo">030</span> public ExtendedMimetypesFileTypeMap() {<a name="line.30"></a> +<span class="sourceLineNo">031</span> super();<a name="line.31"></a> +<span class="sourceLineNo">032</span> addMimeTypes("application/epub+zip epub");<a name="line.32"></a> +<span class="sourceLineNo">033</span> addMimeTypes("application/java-archive jar");<a name="line.33"></a> +<span class="sourceLineNo">034</span> addMimeTypes("application/javascript js");<a name="line.34"></a> +<span class="sourceLineNo">035</span> addMimeTypes("application/json json");<a name="line.35"></a> +<span class="sourceLineNo">036</span> addMimeTypes("application/msword doc");<a name="line.36"></a> +<span class="sourceLineNo">037</span> addMimeTypes("application/ogg ogx");<a name="line.37"></a> +<span class="sourceLineNo">038</span> addMimeTypes("application/pdf pdf");<a name="line.38"></a> +<span class="sourceLineNo">039</span> addMimeTypes("application/rtf rtf");<a name="line.39"></a> +<span class="sourceLineNo">040</span> addMimeTypes("application/vnd.amazon.ebook azw");<a name="line.40"></a> +<span class="sourceLineNo">041</span> addMimeTypes("application/vnd.apple.installer+xml mpkg");<a name="line.41"></a> +<span class="sourceLineNo">042</span> addMimeTypes("application/vnd.mozilla.xul+xml xul");<a name="line.42"></a> +<span class="sourceLineNo">043</span> addMimeTypes("application/vnd.ms-excel xls");<a name="line.43"></a> +<span class="sourceLineNo">044</span> addMimeTypes("application/vnd.ms-powerpoint ppt");<a name="line.44"></a> +<span class="sourceLineNo">045</span> addMimeTypes("application/vnd.oasis.opendocument.presentation odp");<a name="line.45"></a> +<span class="sourceLineNo">046</span> addMimeTypes("application/vnd.oasis.opendocument.spreadsheet ods");<a name="line.46"></a> +<span class="sourceLineNo">047</span> addMimeTypes("application/vnd.oasis.opendocument.text odt");<a name="line.47"></a> +<span class="sourceLineNo">048</span> addMimeTypes("application/vnd.visio vsd");<a name="line.48"></a> +<span class="sourceLineNo">049</span> addMimeTypes("application/x-7z-compressed 7z");<a name="line.49"></a> +<span class="sourceLineNo">050</span> addMimeTypes("application/x-abiword abw");<a name="line.50"></a> +<span class="sourceLineNo">051</span> addMimeTypes("application/x-bzip bz");<a name="line.51"></a> +<span class="sourceLineNo">052</span> addMimeTypes("application/x-bzip2 bz2");<a name="line.52"></a> +<span class="sourceLineNo">053</span> addMimeTypes("application/x-csh csh");<a name="line.53"></a> +<span class="sourceLineNo">054</span> addMimeTypes("application/x-rar-compressed rar");<a name="line.54"></a> +<span class="sourceLineNo">055</span> addMimeTypes("application/x-sh sh");<a name="line.55"></a> +<span class="sourceLineNo">056</span> addMimeTypes("application/x-shockwave-flash swf");<a name="line.56"></a> +<span class="sourceLineNo">057</span> addMimeTypes("application/x-tar tar");<a name="line.57"></a> +<span class="sourceLineNo">058</span> addMimeTypes("application/xhtml+xml xhtml");<a name="line.58"></a> +<span class="sourceLineNo">059</span> addMimeTypes("application/xml xml");<a name="line.59"></a> +<span class="sourceLineNo">060</span> addMimeTypes("application/zip zip");<a name="line.60"></a> +<span class="sourceLineNo">061</span> addMimeTypes("audio/aac aac");<a name="line.61"></a> +<span class="sourceLineNo">062</span> addMimeTypes("audio/midi mid midi");<a name="line.62"></a> +<span class="sourceLineNo">063</span> addMimeTypes("audio/ogg oga");<a name="line.63"></a> +<span class="sourceLineNo">064</span> addMimeTypes("audio/webm weba");<a name="line.64"></a> +<span class="sourceLineNo">065</span> addMimeTypes("audio/x-wav wav");<a name="line.65"></a> +<span class="sourceLineNo">066</span> addMimeTypes("font/ttf ttf");<a name="line.66"></a> +<span class="sourceLineNo">067</span> addMimeTypes("font/woff woff");<a name="line.67"></a> +<span class="sourceLineNo">068</span> addMimeTypes("font/woff2 woff2");<a name="line.68"></a> +<span class="sourceLineNo">069</span> addMimeTypes("image/gif gif");<a name="line.69"></a> +<span class="sourceLineNo">070</span> addMimeTypes("image/jpeg jpeg jpg");<a name="line.70"></a> +<span class="sourceLineNo">071</span> addMimeTypes("image/png png");<a name="line.71"></a> +<span class="sourceLineNo">072</span> addMimeTypes("image/svg+xml svg");<a name="line.72"></a> +<span class="sourceLineNo">073</span> addMimeTypes("image/tiff tif tiff");<a name="line.73"></a> +<span class="sourceLineNo">074</span> addMimeTypes("image/webp webp");<a name="line.74"></a> +<span class="sourceLineNo">075</span> addMimeTypes("image/x-icon ico");<a name="line.75"></a> +<span class="sourceLineNo">076</span> addMimeTypes("text/calendar ics");<a name="line.76"></a> +<span class="sourceLineNo">077</span> addMimeTypes("text/css css");<a name="line.77"></a> +<span class="sourceLineNo">078</span> addMimeTypes("text/csv csv");<a name="line.78"></a> +<span class="sourceLineNo">079</span> addMimeTypes("text/html htm html");<a name="line.79"></a> +<span class="sourceLineNo">080</span> addMimeTypes("text/plain txt");<a name="line.80"></a> +<span class="sourceLineNo">081</span> addMimeTypes("video/3gpp 3gp");<a name="line.81"></a> +<span class="sourceLineNo">082</span> addMimeTypes("video/3gpp2 3g2");<a name="line.82"></a> +<span class="sourceLineNo">083</span> addMimeTypes("video/mpeg mpeg");<a name="line.83"></a> +<span class="sourceLineNo">084</span> addMimeTypes("video/ogg ogv");<a name="line.84"></a> +<span class="sourceLineNo">085</span> addMimeTypes("video/webm webm");<a name="line.85"></a> +<span class="sourceLineNo">086</span> addMimeTypes("video/x-msvideo avi");<a name="line.86"></a> +<span class="sourceLineNo">087</span> }<a name="line.87"></a> +<span class="sourceLineNo">088</span>}<a name="line.88"></a> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +</pre> +</div> +</body> +</html> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/9b48e212/content/site/apidocs/src-html/org/apache/juneau/utils/ResourceFinder.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/utils/ResourceFinder.html b/content/site/apidocs/src-html/org/apache/juneau/utils/ResourceFinder.html index 422d54b..c07004b 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/utils/ResourceFinder.html +++ b/content/site/apidocs/src-html/org/apache/juneau/utils/ResourceFinder.html @@ -34,7 +34,7 @@ <span class="sourceLineNo">026</span> * Utility class for finding resources for a class.<a name="line.26"></a> <span class="sourceLineNo">027</span> *<a name="line.27"></a> <span class="sourceLineNo">028</span> * <p><a name="line.28"></a> -<span class="sourceLineNo">029</span> * Same as {@link Class#getResourceAsStream(String)} except if it doesn't find the resource on this class, searches<a name="line.29"></a> +<span class="sourceLineNo">029</span> * Same as {@link Class#getResourceAsStream(String)} except if it doesn't find the resource on this class, it searches<a name="line.29"></a> <span class="sourceLineNo">030</span> * up the parent hierarchy chain.<a name="line.30"></a> <span class="sourceLineNo">031</span> *<a name="line.31"></a> <span class="sourceLineNo">032</span> * <p><a name="line.32"></a> @@ -208,7 +208,7 @@ <span class="sourceLineNo">200</span> if (url != null) {<a name="line.200"></a> <span class="sourceLineNo">201</span> Resource r = cacheByUrl.get(url);<a name="line.201"></a> <span class="sourceLineNo">202</span> if (r == null) {<a name="line.202"></a> -<span class="sourceLineNo">203</span> r = new Resource(IOUtils.readBytes(c2.getResourceAsStream(key.name), 1024));<a name="line.203"></a> +<span class="sourceLineNo">203</span> r = new Resource(IOUtils.readBytes(c2.getResourceAsStream(n), 1024));<a name="line.203"></a> <span class="sourceLineNo">204</span> cacheByUrl.putIfAbsent(url, r);<a name="line.204"></a> <span class="sourceLineNo">205</span> r = cacheByUrl.get(url);<a name="line.205"></a> <span class="sourceLineNo">206</span> }<a name="line.206"></a>
