Modified: 
websites/production/turbine/content/fulcrum/fulcrum-localization/apidocs/src-html/org/apache/fulcrum/localization/DefaultLocalizationService.html
==============================================================================
--- 
websites/production/turbine/content/fulcrum/fulcrum-localization/apidocs/src-html/org/apache/fulcrum/localization/DefaultLocalizationService.html
 (original)
+++ 
websites/production/turbine/content/fulcrum/fulcrum-localization/apidocs/src-html/org/apache/fulcrum/localization/DefaultLocalizationService.html
 Tue May 21 03:35:35 2019
@@ -1,152 +1,167 @@
-<HTML>
-<BODY BGCOLOR="white">
-<PRE>
-<FONT color="green">001</FONT>    package org.apache.fulcrum.localization;<a 
name="line.1"></a>
-<FONT color="green">002</FONT>    <a name="line.2"></a>
-<FONT color="green">003</FONT>    /*<a name="line.3"></a>
-<FONT color="green">004</FONT>     * Licensed to the Apache Software 
Foundation (ASF) under one<a name="line.4"></a>
-<FONT color="green">005</FONT>     * or more contributor license agreements.  
See the NOTICE file<a name="line.5"></a>
-<FONT color="green">006</FONT>     * distributed with this work for additional 
information<a name="line.6"></a>
-<FONT color="green">007</FONT>     * regarding copyright ownership.  The ASF 
licenses this file<a name="line.7"></a>
-<FONT color="green">008</FONT>     * to you under the Apache License, Version 
2.0 (the<a name="line.8"></a>
-<FONT color="green">009</FONT>     * "License"); you may not use this file 
except in compliance<a name="line.9"></a>
-<FONT color="green">010</FONT>     * with the License.  You may obtain a copy 
of the License at<a name="line.10"></a>
-<FONT color="green">011</FONT>     *<a name="line.11"></a>
-<FONT color="green">012</FONT>     *   
http://www.apache.org/licenses/LICENSE-2.0<a name="line.12"></a>
-<FONT color="green">013</FONT>     *<a name="line.13"></a>
-<FONT color="green">014</FONT>     * Unless required by applicable law or 
agreed to in writing,<a name="line.14"></a>
-<FONT color="green">015</FONT>     * software distributed under the License is 
distributed on an<a name="line.15"></a>
-<FONT color="green">016</FONT>     * "AS IS" BASIS, WITHOUT WARRANTIES OR 
CONDITIONS OF ANY<a name="line.16"></a>
-<FONT color="green">017</FONT>     * KIND, either express or implied.  See the 
License for the<a name="line.17"></a>
-<FONT color="green">018</FONT>     * specific language governing permissions 
and limitations<a name="line.18"></a>
-<FONT color="green">019</FONT>     * under the License.<a name="line.19"></a>
-<FONT color="green">020</FONT>     */<a name="line.20"></a>
-<FONT color="green">021</FONT>    <a name="line.21"></a>
-<FONT color="green">022</FONT>    import java.util.Locale;<a 
name="line.22"></a>
-<FONT color="green">023</FONT>    import java.util.ResourceBundle;<a 
name="line.23"></a>
-<FONT color="green">024</FONT>    <a name="line.24"></a>
-<FONT color="green">025</FONT>    import 
javax.servlet.http.HttpServletRequest;<a name="line.25"></a>
-<FONT color="green">026</FONT>    <a name="line.26"></a>
-<FONT color="green">027</FONT>    import 
org.apache.commons.lang.StringUtils;<a name="line.27"></a>
-<FONT color="green">028</FONT>    <a name="line.28"></a>
-<FONT color="green">029</FONT>    /**<a name="line.29"></a>
-<FONT color="green">030</FONT>     * &lt;p&gt;This class is the single point 
of access to all localization<a name="line.30"></a>
-<FONT color="green">031</FONT>     * resources.  It caches different 
ResourceBundles for different<a name="line.31"></a>
-<FONT color="green">032</FONT>     * Locales.&lt;/p&gt;<a name="line.32"></a>
-<FONT color="green">033</FONT>     *<a name="line.33"></a>
-<FONT color="green">034</FONT>     * &lt;p&gt;Usage example:&lt;/p&gt;<a 
name="line.34"></a>
-<FONT color="green">035</FONT>     *<a name="line.35"></a>
-<FONT color="green">036</FONT>     * 
&lt;blockquote&gt;&lt;code&gt;&lt;pre&gt;<a name="line.36"></a>
-<FONT color="green">037</FONT>     * LocalizationService ls = 
(LocalizationService) TurbineServices<a name="line.37"></a>
-<FONT color="green">038</FONT>     *     
.getInstance().getService(LocalizationService.SERVICE_NAME);<a 
name="line.38"></a>
-<FONT color="green">039</FONT>     * 
&lt;/pre&gt;&lt;/code&gt;&lt;/blockquote&gt;<a name="line.39"></a>
-<FONT color="green">040</FONT>     *<a name="line.40"></a>
-<FONT color="green">041</FONT>     * &lt;p&gt;Then call {@link 
#getString(String, Locale, String)}, or one of<a name="line.41"></a>
-<FONT color="green">042</FONT>     * four methods to retrieve a 
ResourceBundle:<a name="line.42"></a>
-<FONT color="green">043</FONT>     *<a name="line.43"></a>
-<FONT color="green">044</FONT>     * &lt;ul&gt;<a name="line.44"></a>
-<FONT color="green">045</FONT>     * 
&lt;li&gt;getBundle("MyBundleName")&lt;/li&gt;<a name="line.45"></a>
-<FONT color="green">046</FONT>     * &lt;li&gt;getBundle("MyBundleName", 
httpAcceptLanguageHeader)&lt;/li&gt;<a name="line.46"></a>
-<FONT color="green">047</FONT>     * &lt;li&gt;etBundle("MyBundleName", 
HttpServletRequest)&lt;/li&gt;<a name="line.47"></a>
-<FONT color="green">048</FONT>     * &lt;li&gt;getBundle("MyBundleName", 
Locale)&lt;/li&gt;<a name="line.48"></a>
-<FONT color="green">049</FONT>     * &lt;li&gt;etc.&lt;/li&gt;<a 
name="line.49"></a>
-<FONT color="green">050</FONT>     * &lt;/ul&gt;&lt;/p&gt;<a 
name="line.50"></a>
-<FONT color="green">051</FONT>     *<a name="line.51"></a>
-<FONT color="green">052</FONT>     * @author &lt;a 
href="mailto:[email protected]"&gt;Jonas Maurus&lt;/a&gt;<a name="line.52"></a>
-<FONT color="green">053</FONT>     * @author &lt;a 
href="mailto:[email protected]"&gt;Jon S. Stevens&lt;/a&gt;<a 
name="line.53"></a>
-<FONT color="green">054</FONT>     * @author &lt;a 
href="mailto:[email protected]"&gt;Frank Y. Kim&lt;/a&gt;<a 
name="line.54"></a>
-<FONT color="green">055</FONT>     * @author &lt;a 
href="mailto:[email protected]"&gt;Daniel Rall&lt;/a&gt;<a 
name="line.55"></a>
-<FONT color="green">056</FONT>     * @author &lt;a 
href="mailto:[email protected]"&gt;Leonard Richardson&lt;/a&gt;<a 
name="line.56"></a>
-<FONT color="green">057</FONT>     * @author &lt;a 
href="mailto:[email protected]"&gt;Stephen McConnell&lt;/a&gt;<a 
name="line.57"></a>
-<FONT color="green">058</FONT>     * @author &lt;a 
href="mailto:[email protected]"&gt;Thomas Vandahl&lt;/a&gt;<a name="line.58"></a>
-<FONT color="green">059</FONT>     * @version $Id: 
DefaultLocalizationService.java 645885 2008-04-08 12:50:57Z tv $<a 
name="line.59"></a>
-<FONT color="green">060</FONT>     * @avalon.component name="localization" 
lifestyle="singleton"<a name="line.60"></a>
-<FONT color="green">061</FONT>     * @avalon.service 
type="org.apache.fulcrum.localization.LocalizationService"<a name="line.61"></a>
-<FONT color="green">062</FONT>     */<a name="line.62"></a>
-<FONT color="green">063</FONT>    public class DefaultLocalizationService<a 
name="line.63"></a>
-<FONT color="green">064</FONT>        extends SimpleLocalizationServiceImpl<a 
name="line.64"></a>
-<FONT color="green">065</FONT>        implements LocalizationService<a 
name="line.65"></a>
-<FONT color="green">066</FONT>    {<a name="line.66"></a>
-<FONT color="green">067</FONT>        /**<a name="line.67"></a>
-<FONT color="green">068</FONT>         * Creates a new instance.<a 
name="line.68"></a>
-<FONT color="green">069</FONT>         */<a name="line.69"></a>
-<FONT color="green">070</FONT>        public DefaultLocalizationService()<a 
name="line.70"></a>
-<FONT color="green">071</FONT>        {<a name="line.71"></a>
-<FONT color="green">072</FONT>            super();<a name="line.72"></a>
-<FONT color="green">073</FONT>        }<a name="line.73"></a>
-<FONT color="green">074</FONT>    <a name="line.74"></a>
-<FONT color="green">075</FONT>        /**<a name="line.75"></a>
-<FONT color="green">076</FONT>         * This method returns a ResourceBundle 
given the bundle name and<a name="line.76"></a>
-<FONT color="green">077</FONT>         * the Locale information supplied in 
the HTTP "Accept-Language"<a name="line.77"></a>
-<FONT color="green">078</FONT>         * header.<a name="line.78"></a>
-<FONT color="green">079</FONT>         *<a name="line.79"></a>
-<FONT color="green">080</FONT>         * @param bundleName Name of bundle.<a 
name="line.80"></a>
-<FONT color="green">081</FONT>         * @param languageHeader A String with 
the language header.<a name="line.81"></a>
-<FONT color="green">082</FONT>         * @return A localized ResourceBundle.<a 
name="line.82"></a>
-<FONT color="green">083</FONT>         */<a name="line.83"></a>
-<FONT color="green">084</FONT>        public ResourceBundle getBundle(String 
bundleName, String languageHeader)<a name="line.84"></a>
-<FONT color="green">085</FONT>        {<a name="line.85"></a>
-<FONT color="green">086</FONT>            return getBundle(bundleName, 
getLocale(languageHeader));<a name="line.86"></a>
-<FONT color="green">087</FONT>        }<a name="line.87"></a>
-<FONT color="green">088</FONT>    <a name="line.88"></a>
-<FONT color="green">089</FONT>        /**<a name="line.89"></a>
-<FONT color="green">090</FONT>         * This method returns a ResourceBundle 
given the Locale<a name="line.90"></a>
-<FONT color="green">091</FONT>         * information supplied in the HTTP 
"Accept-Language" header which<a name="line.91"></a>
-<FONT color="green">092</FONT>         * is stored in HttpServletRequest.<a 
name="line.92"></a>
-<FONT color="green">093</FONT>         *<a name="line.93"></a>
-<FONT color="green">094</FONT>         * @param req HttpServletRequest.<a 
name="line.94"></a>
-<FONT color="green">095</FONT>         * @return A localized ResourceBundle.<a 
name="line.95"></a>
-<FONT color="green">096</FONT>         */<a name="line.96"></a>
-<FONT color="green">097</FONT>        public ResourceBundle 
getBundle(HttpServletRequest req)<a name="line.97"></a>
-<FONT color="green">098</FONT>        {<a name="line.98"></a>
-<FONT color="green">099</FONT>            return 
getBundle(getDefaultBundleName(), getLocale(req));<a name="line.99"></a>
-<FONT color="green">100</FONT>        }<a name="line.100"></a>
-<FONT color="green">101</FONT>    <a name="line.101"></a>
-<FONT color="green">102</FONT>        /**<a name="line.102"></a>
-<FONT color="green">103</FONT>         * This method returns a ResourceBundle 
given the bundle name and<a name="line.103"></a>
-<FONT color="green">104</FONT>         * the Locale information supplied in 
the HTTP "Accept-Language"<a name="line.104"></a>
-<FONT color="green">105</FONT>         * header which is stored in 
HttpServletRequest.<a name="line.105"></a>
-<FONT color="green">106</FONT>         *<a name="line.106"></a>
-<FONT color="green">107</FONT>         * @param bundleName Name of the bundle 
to use if the request's<a name="line.107"></a>
-<FONT color="green">108</FONT>         * locale cannot be resolved.<a 
name="line.108"></a>
-<FONT color="green">109</FONT>         * @param req HttpServletRequest.<a 
name="line.109"></a>
-<FONT color="green">110</FONT>         * @return A localized ResourceBundle.<a 
name="line.110"></a>
-<FONT color="green">111</FONT>         */<a name="line.111"></a>
-<FONT color="green">112</FONT>        public ResourceBundle getBundle(String 
bundleName, HttpServletRequest req)<a name="line.112"></a>
-<FONT color="green">113</FONT>        {<a name="line.113"></a>
-<FONT color="green">114</FONT>            return getBundle(bundleName, 
getLocale(req));<a name="line.114"></a>
-<FONT color="green">115</FONT>        }<a name="line.115"></a>
-<FONT color="green">116</FONT>    <a name="line.116"></a>
-<FONT color="green">117</FONT>        /**<a name="line.117"></a>
-<FONT color="green">118</FONT>         * @see 
org.apache.fulcrum.localization.LocalizationService#getLocale(HttpServletRequest)<a
 name="line.118"></a>
-<FONT color="green">119</FONT>         */<a name="line.119"></a>
-<FONT color="green">120</FONT>        public Locale 
getLocale(HttpServletRequest req)<a name="line.120"></a>
-<FONT color="green">121</FONT>        {<a name="line.121"></a>
-<FONT color="green">122</FONT>            return 
getLocale(req.getHeader(ACCEPT_LANGUAGE));<a name="line.122"></a>
-<FONT color="green">123</FONT>            // (JSS) Backed out this change 
because Tomcat seems to be returning<a name="line.123"></a>
-<FONT color="green">124</FONT>            //       the wrong result and things 
just are not working.<a name="line.124"></a>
-<FONT color="green">125</FONT>            //        Locale l = 
req.getLocale();<a name="line.125"></a>
-<FONT color="green">126</FONT>            //        return (l != null ? l : 
getLocale(req.getHeader(ACCEPT_LANGUAGE)));<a name="line.126"></a>
-<FONT color="green">127</FONT>        }<a name="line.127"></a>
-<FONT color="green">128</FONT>    <a name="line.128"></a>
-<FONT color="green">129</FONT>        /**<a name="line.129"></a>
-<FONT color="green">130</FONT>         * @see 
org.apache.fulcrum.localization.LocalizationService#getLocale(String)<a 
name="line.130"></a>
-<FONT color="green">131</FONT>         */<a name="line.131"></a>
-<FONT color="green">132</FONT>        public Locale getLocale(String header)<a 
name="line.132"></a>
-<FONT color="green">133</FONT>        {<a name="line.133"></a>
-<FONT color="green">134</FONT>            if (!StringUtils.isEmpty(header))<a 
name="line.134"></a>
-<FONT color="green">135</FONT>            {<a name="line.135"></a>
-<FONT color="green">136</FONT>                LocaleTokenizer tok = new 
LocaleTokenizer(header);<a name="line.136"></a>
-<FONT color="green">137</FONT>                if (tok.hasNext())<a 
name="line.137"></a>
-<FONT color="green">138</FONT>                {<a name="line.138"></a>
-<FONT color="green">139</FONT>                    return (Locale) 
tok.next();<a name="line.139"></a>
-<FONT color="green">140</FONT>                }<a name="line.140"></a>
-<FONT color="green">141</FONT>            }<a name="line.141"></a>
-<FONT color="green">142</FONT>            <a name="line.142"></a>
-<FONT color="green">143</FONT>            // Couldn't parse locale.<a 
name="line.143"></a>
-<FONT color="green">144</FONT>            return getDefaultLocale();<a 
name="line.144"></a>
-<FONT color="green">145</FONT>        }<a name="line.145"></a>
-<FONT color="green">146</FONT>    }<a name="line.146"></a>
+<!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="../../../../../stylesheet.css" 
title="Style">
+</head>
+<body>
+<div class="sourceContainer">
+<pre><span class="sourceLineNo">001</span>package 
org.apache.fulcrum.localization;<a name="line.1"></a>
+<span class="sourceLineNo">002</span><a name="line.2"></a>
+<span class="sourceLineNo">003</span>/*<a name="line.3"></a>
+<span class="sourceLineNo">004</span> * Licensed to the Apache Software 
Foundation (ASF) under one<a name="line.4"></a>
+<span class="sourceLineNo">005</span> * or more contributor license 
agreements.  See the NOTICE file<a name="line.5"></a>
+<span class="sourceLineNo">006</span> * distributed with this work for 
additional information<a name="line.6"></a>
+<span class="sourceLineNo">007</span> * regarding copyright ownership.  The 
ASF licenses this file<a name="line.7"></a>
+<span class="sourceLineNo">008</span> * to you under the Apache License, 
Version 2.0 (the<a name="line.8"></a>
+<span class="sourceLineNo">009</span> * "License"); you may not use this file 
except in compliance<a name="line.9"></a>
+<span class="sourceLineNo">010</span> * with the License.  You may obtain a 
copy of the License at<a name="line.10"></a>
+<span class="sourceLineNo">011</span> *<a name="line.11"></a>
+<span class="sourceLineNo">012</span> *   
http://www.apache.org/licenses/LICENSE-2.0<a name="line.12"></a>
+<span class="sourceLineNo">013</span> *<a name="line.13"></a>
+<span class="sourceLineNo">014</span> * Unless required by applicable law or 
agreed to in writing,<a name="line.14"></a>
+<span class="sourceLineNo">015</span> * software distributed under the License 
is distributed on an<a name="line.15"></a>
+<span class="sourceLineNo">016</span> * "AS IS" BASIS, WITHOUT WARRANTIES OR 
CONDITIONS OF ANY<a name="line.16"></a>
+<span class="sourceLineNo">017</span> * KIND, either express or implied.  See 
the License for the<a name="line.17"></a>
+<span class="sourceLineNo">018</span> * specific language governing 
permissions and limitations<a name="line.18"></a>
+<span class="sourceLineNo">019</span> * under the License.<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>import java.util.Locale;<a 
name="line.22"></a>
+<span class="sourceLineNo">023</span>import java.util.ResourceBundle;<a 
name="line.23"></a>
+<span class="sourceLineNo">024</span><a name="line.24"></a>
+<span class="sourceLineNo">025</span>import 
javax.servlet.http.HttpServletRequest;<a name="line.25"></a>
+<span class="sourceLineNo">026</span><a name="line.26"></a>
+<span class="sourceLineNo">027</span>import 
org.apache.commons.lang3.StringUtils;<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> * &lt;p&gt;<a name="line.30"></a>
+<span class="sourceLineNo">031</span> * This class is the single point of 
access to all localization<a name="line.31"></a>
+<span class="sourceLineNo">032</span> * resources.  It caches different 
ResourceBundles for different<a name="line.32"></a>
+<span class="sourceLineNo">033</span> * Locales.<a name="line.33"></a>
+<span class="sourceLineNo">034</span> * &lt;/p&gt;<a name="line.34"></a>
+<span class="sourceLineNo">035</span> *<a name="line.35"></a>
+<span class="sourceLineNo">036</span> * &lt;p&gt;Usage example:&lt;/p&gt;<a 
name="line.36"></a>
+<span class="sourceLineNo">037</span> *<a name="line.37"></a>
+<span class="sourceLineNo">038</span> * &lt;pre&gt;<a name="line.38"></a>
+<span class="sourceLineNo">039</span> * &lt;code&gt;<a name="line.39"></a>
+<span class="sourceLineNo">040</span> * LocalizationService ls = 
(LocalizationService) TurbineServices<a name="line.40"></a>
+<span class="sourceLineNo">041</span> *     
.getInstance().getService(LocalizationService.SERVICE_NAME);<a 
name="line.41"></a>
+<span class="sourceLineNo">042</span> * &lt;/code&gt;<a name="line.42"></a>
+<span class="sourceLineNo">043</span> * &lt;/pre&gt;<a name="line.43"></a>
+<span class="sourceLineNo">044</span> *<a name="line.44"></a>
+<span class="sourceLineNo">045</span> * &lt;p&gt;<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * Then call {@link #getString(String, 
Locale, String)}, or one of<a name="line.46"></a>
+<span class="sourceLineNo">047</span> * four methods to retrieve a 
ResourceBundle:<a name="line.47"></a>
+<span class="sourceLineNo">048</span> * &lt;/p&gt;<a name="line.48"></a>
+<span class="sourceLineNo">049</span> *<a name="line.49"></a>
+<span class="sourceLineNo">050</span> * &lt;ul&gt;<a name="line.50"></a>
+<span class="sourceLineNo">051</span> * 
&lt;li&gt;getBundle("MyBundleName")&lt;/li&gt;<a name="line.51"></a>
+<span class="sourceLineNo">052</span> * &lt;li&gt;getBundle("MyBundleName", 
httpAcceptLanguageHeader)&lt;/li&gt;<a name="line.52"></a>
+<span class="sourceLineNo">053</span> * &lt;li&gt;etBundle("MyBundleName", 
HttpServletRequest)&lt;/li&gt;<a name="line.53"></a>
+<span class="sourceLineNo">054</span> * &lt;li&gt;getBundle("MyBundleName", 
Locale)&lt;/li&gt;<a name="line.54"></a>
+<span class="sourceLineNo">055</span> * &lt;li&gt;etc.&lt;/li&gt;<a 
name="line.55"></a>
+<span class="sourceLineNo">056</span> * &lt;/ul&gt;<a name="line.56"></a>
+<span class="sourceLineNo">057</span> *<a name="line.57"></a>
+<span class="sourceLineNo">058</span> * @author &lt;a 
href="mailto:[email protected]"&gt;Jonas Maurus&lt;/a&gt;<a name="line.58"></a>
+<span class="sourceLineNo">059</span> * @author &lt;a 
href="mailto:[email protected]"&gt;Jon S. Stevens&lt;/a&gt;<a 
name="line.59"></a>
+<span class="sourceLineNo">060</span> * @author &lt;a 
href="mailto:[email protected]"&gt;Frank Y. Kim&lt;/a&gt;<a 
name="line.60"></a>
+<span class="sourceLineNo">061</span> * @author &lt;a 
href="mailto:[email protected]"&gt;Daniel Rall&lt;/a&gt;<a 
name="line.61"></a>
+<span class="sourceLineNo">062</span> * @author &lt;a 
href="mailto:[email protected]"&gt;Leonard Richardson&lt;/a&gt;<a 
name="line.62"></a>
+<span class="sourceLineNo">063</span> * @author &lt;a 
href="mailto:[email protected]"&gt;Stephen McConnell&lt;/a&gt;<a 
name="line.63"></a>
+<span class="sourceLineNo">064</span> * @author &lt;a 
href="mailto:[email protected]"&gt;Thomas Vandahl&lt;/a&gt;<a name="line.64"></a>
+<span class="sourceLineNo">065</span> * @version $Id: 
DefaultLocalizationService.java 1851909 2019-01-23 13:16:31Z painter $<a 
name="line.65"></a>
+<span class="sourceLineNo">066</span> * avalon.component name="localization" 
lifestyle="singleton"<a name="line.66"></a>
+<span class="sourceLineNo">067</span> * avalon.service 
type="org.apache.fulcrum.localization.LocalizationService"<a name="line.67"></a>
+<span class="sourceLineNo">068</span> */<a name="line.68"></a>
+<span class="sourceLineNo">069</span>public class DefaultLocalizationService<a 
name="line.69"></a>
+<span class="sourceLineNo">070</span>    extends 
SimpleLocalizationServiceImpl<a name="line.70"></a>
+<span class="sourceLineNo">071</span>    implements LocalizationService<a 
name="line.71"></a>
+<span class="sourceLineNo">072</span>{<a name="line.72"></a>
+<span class="sourceLineNo">073</span>    /**<a name="line.73"></a>
+<span class="sourceLineNo">074</span>     * Creates a new instance.<a 
name="line.74"></a>
+<span class="sourceLineNo">075</span>     */<a name="line.75"></a>
+<span class="sourceLineNo">076</span>    public DefaultLocalizationService()<a 
name="line.76"></a>
+<span class="sourceLineNo">077</span>    {<a name="line.77"></a>
+<span class="sourceLineNo">078</span>        super();<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>
+<span class="sourceLineNo">081</span>    /**<a name="line.81"></a>
+<span class="sourceLineNo">082</span>     * This method returns a 
ResourceBundle given the bundle name and<a name="line.82"></a>
+<span class="sourceLineNo">083</span>     * the Locale information supplied in 
the HTTP "Accept-Language"<a name="line.83"></a>
+<span class="sourceLineNo">084</span>     * header.<a name="line.84"></a>
+<span class="sourceLineNo">085</span>     * <a name="line.85"></a>
+<span class="sourceLineNo">086</span>     * @see 
org.apache.fulcrum.localization.LocalizationService#getBundle(java.lang.String, 
java.lang.String)<a name="line.86"></a>
+<span class="sourceLineNo">087</span>     *<a name="line.87"></a>
+<span class="sourceLineNo">088</span>     * @param bundleName Name of 
bundle.<a name="line.88"></a>
+<span class="sourceLineNo">089</span>     * @param languageHeader A String 
with the language header.<a name="line.89"></a>
+<span class="sourceLineNo">090</span>     * @return A localized 
ResourceBundle.<a name="line.90"></a>
+<span class="sourceLineNo">091</span>     */<a name="line.91"></a>
+<span class="sourceLineNo">092</span>    public ResourceBundle 
getBundle(String bundleName, String languageHeader)<a name="line.92"></a>
+<span class="sourceLineNo">093</span>    {<a name="line.93"></a>
+<span class="sourceLineNo">094</span>        return getBundle(bundleName, 
getLocale(languageHeader));<a name="line.94"></a>
+<span class="sourceLineNo">095</span>    }<a name="line.95"></a>
+<span class="sourceLineNo">096</span><a name="line.96"></a>
+<span class="sourceLineNo">097</span>    /**<a name="line.97"></a>
+<span class="sourceLineNo">098</span>     * This method returns a 
ResourceBundle given the Locale<a name="line.98"></a>
+<span class="sourceLineNo">099</span>     * information supplied in the HTTP 
"Accept-Language" header which<a name="line.99"></a>
+<span class="sourceLineNo">100</span>     * is stored in HttpServletRequest.<a 
name="line.100"></a>
+<span class="sourceLineNo">101</span>     *<a name="line.101"></a>
+<span class="sourceLineNo">102</span>     * @param req HttpServletRequest.<a 
name="line.102"></a>
+<span class="sourceLineNo">103</span>     * @return A localized 
ResourceBundle.<a name="line.103"></a>
+<span class="sourceLineNo">104</span>     */<a name="line.104"></a>
+<span class="sourceLineNo">105</span>    public ResourceBundle 
getBundle(HttpServletRequest req)<a name="line.105"></a>
+<span class="sourceLineNo">106</span>    {<a name="line.106"></a>
+<span class="sourceLineNo">107</span>        return 
getBundle(getDefaultBundleName(), getLocale(req));<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>    /**<a name="line.110"></a>
+<span class="sourceLineNo">111</span>     * @see 
org.apache.fulcrum.localization.LocalizationService#getBundle(java.lang.String, 
javax.servlet.http.HttpServletRequest)<a name="line.111"></a>
+<span class="sourceLineNo">112</span>     * <a name="line.112"></a>
+<span class="sourceLineNo">113</span>     * This method returns a 
ResourceBundle given the bundle name and<a name="line.113"></a>
+<span class="sourceLineNo">114</span>     * the Locale information supplied in 
the HTTP "Accept-Language"<a name="line.114"></a>
+<span class="sourceLineNo">115</span>     * header which is stored in 
HttpServletRequest.<a name="line.115"></a>
+<span class="sourceLineNo">116</span>     *<a name="line.116"></a>
+<span class="sourceLineNo">117</span>     * @param bundleName Name of the 
bundle to use if the request's<a name="line.117"></a>
+<span class="sourceLineNo">118</span>     * locale cannot be resolved.<a 
name="line.118"></a>
+<span class="sourceLineNo">119</span>     * @param req HttpServletRequest.<a 
name="line.119"></a>
+<span class="sourceLineNo">120</span>     * @return A localized 
ResourceBundle.<a name="line.120"></a>
+<span class="sourceLineNo">121</span>     */<a name="line.121"></a>
+<span class="sourceLineNo">122</span>    public ResourceBundle 
getBundle(String bundleName, HttpServletRequest req)<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    {<a name="line.123"></a>
+<span class="sourceLineNo">124</span>        return getBundle(bundleName, 
getLocale(req));<a name="line.124"></a>
+<span class="sourceLineNo">125</span>    }<a name="line.125"></a>
+<span class="sourceLineNo">126</span><a name="line.126"></a>
+<span class="sourceLineNo">127</span>    /* (non-Javadoc)<a 
name="line.127"></a>
+<span class="sourceLineNo">128</span>     * @see 
org.apache.fulcrum.localization.LocalizationService#getLocale(javax.servlet.http.HttpServletRequest)<a
 name="line.128"></a>
+<span class="sourceLineNo">129</span>     */<a name="line.129"></a>
+<span class="sourceLineNo">130</span>    public Locale 
getLocale(HttpServletRequest req)<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    {<a name="line.131"></a>
+<span class="sourceLineNo">132</span>        return 
getLocale(req.getHeader(ACCEPT_LANGUAGE));<a name="line.132"></a>
+<span class="sourceLineNo">133</span>        // (JSS) Backed out this change 
because Tomcat seems to be returning<a name="line.133"></a>
+<span class="sourceLineNo">134</span>        //       the wrong result and 
things just are not working.<a name="line.134"></a>
+<span class="sourceLineNo">135</span>        //        Locale l = 
req.getLocale();<a name="line.135"></a>
+<span class="sourceLineNo">136</span>        //        return (l != null ? l : 
getLocale(req.getHeader(ACCEPT_LANGUAGE)));<a name="line.136"></a>
+<span class="sourceLineNo">137</span>    }<a name="line.137"></a>
+<span class="sourceLineNo">138</span><a name="line.138"></a>
+<span class="sourceLineNo">139</span>    /* (non-Javadoc)<a 
name="line.139"></a>
+<span class="sourceLineNo">140</span>     * @see 
org.apache.fulcrum.localization.LocalizationService#getLocale(java.lang.String)<a
 name="line.140"></a>
+<span class="sourceLineNo">141</span>     */<a name="line.141"></a>
+<span class="sourceLineNo">142</span>    public Locale getLocale(String 
header)<a name="line.142"></a>
+<span class="sourceLineNo">143</span>    {<a name="line.143"></a>
+<span class="sourceLineNo">144</span>        if 
(StringUtils.isNotEmpty(header))<a name="line.144"></a>
+<span class="sourceLineNo">145</span>        {<a name="line.145"></a>
+<span class="sourceLineNo">146</span>            LocaleTokenizer tok = new 
LocaleTokenizer(header);<a name="line.146"></a>
+<span class="sourceLineNo">147</span>            if (tok.hasNext())<a 
name="line.147"></a>
+<span class="sourceLineNo">148</span>            {<a name="line.148"></a>
+<span class="sourceLineNo">149</span>                return (Locale) 
tok.next();<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>        <a name="line.152"></a>
+<span class="sourceLineNo">153</span>        // Couldn't parse locale.<a 
name="line.153"></a>
+<span class="sourceLineNo">154</span>        return getDefaultLocale();<a 
name="line.154"></a>
+<span class="sourceLineNo">155</span>    }<a name="line.155"></a>
+<span class="sourceLineNo">156</span>}<a name="line.156"></a>
 
 
 
@@ -207,6 +222,7 @@
 
 
 
-</PRE>
-</BODY>
-</HTML>
+</pre>
+</div>
+</body>
+</html>
\ No newline at end of file

Modified: 
websites/production/turbine/content/fulcrum/fulcrum-localization/apidocs/src-html/org/apache/fulcrum/localization/LocaleTokenizer.AcceptLanguage.html
==============================================================================
--- 
websites/production/turbine/content/fulcrum/fulcrum-localization/apidocs/src-html/org/apache/fulcrum/localization/LocaleTokenizer.AcceptLanguage.html
 (original)
+++ 
websites/production/turbine/content/fulcrum/fulcrum-localization/apidocs/src-html/org/apache/fulcrum/localization/LocaleTokenizer.AcceptLanguage.html
 Tue May 21 03:35:35 2019
@@ -1,181 +1,196 @@
-<HTML>
-<BODY BGCOLOR="white">
-<PRE>
-<FONT color="green">001</FONT>    package org.apache.fulcrum.localization;<a 
name="line.1"></a>
-<FONT color="green">002</FONT>    <a name="line.2"></a>
-<FONT color="green">003</FONT>    <a name="line.3"></a>
-<FONT color="green">004</FONT>    /*<a name="line.4"></a>
-<FONT color="green">005</FONT>     * Licensed to the Apache Software 
Foundation (ASF) under one<a name="line.5"></a>
-<FONT color="green">006</FONT>     * or more contributor license agreements.  
See the NOTICE file<a name="line.6"></a>
-<FONT color="green">007</FONT>     * distributed with this work for additional 
information<a name="line.7"></a>
-<FONT color="green">008</FONT>     * regarding copyright ownership.  The ASF 
licenses this file<a name="line.8"></a>
-<FONT color="green">009</FONT>     * to you under the Apache License, Version 
2.0 (the<a name="line.9"></a>
-<FONT color="green">010</FONT>     * "License"); you may not use this file 
except in compliance<a name="line.10"></a>
-<FONT color="green">011</FONT>     * with the License.  You may obtain a copy 
of the License at<a name="line.11"></a>
-<FONT color="green">012</FONT>     *<a name="line.12"></a>
-<FONT color="green">013</FONT>     *   
http://www.apache.org/licenses/LICENSE-2.0<a name="line.13"></a>
-<FONT color="green">014</FONT>     *<a name="line.14"></a>
-<FONT color="green">015</FONT>     * Unless required by applicable law or 
agreed to in writing,<a name="line.15"></a>
-<FONT color="green">016</FONT>     * software distributed under the License is 
distributed on an<a name="line.16"></a>
-<FONT color="green">017</FONT>     * "AS IS" BASIS, WITHOUT WARRANTIES OR 
CONDITIONS OF ANY<a name="line.17"></a>
-<FONT color="green">018</FONT>     * KIND, either express or implied.  See the 
License for the<a name="line.18"></a>
-<FONT color="green">019</FONT>     * specific language governing permissions 
and limitations<a name="line.19"></a>
-<FONT color="green">020</FONT>     * under the License.<a name="line.20"></a>
-<FONT color="green">021</FONT>     */<a name="line.21"></a>
-<FONT color="green">022</FONT>    <a name="line.22"></a>
-<FONT color="green">023</FONT>    <a name="line.23"></a>
-<FONT color="green">024</FONT>    import java.util.ArrayList;<a 
name="line.24"></a>
-<FONT color="green">025</FONT>    import java.util.Collections;<a 
name="line.25"></a>
-<FONT color="green">026</FONT>    import java.util.Iterator;<a 
name="line.26"></a>
-<FONT color="green">027</FONT>    import java.util.Locale;<a 
name="line.27"></a>
-<FONT color="green">028</FONT>    import java.util.NoSuchElementException;<a 
name="line.28"></a>
-<FONT color="green">029</FONT>    import java.util.StringTokenizer;<a 
name="line.29"></a>
-<FONT color="green">030</FONT>    <a name="line.30"></a>
-<FONT color="green">031</FONT>    /**<a name="line.31"></a>
-<FONT color="green">032</FONT>     * Parses the HTTP 
&lt;code&gt;Accept-Language&lt;/code&gt; header as per section<a 
name="line.32"></a>
-<FONT color="green">033</FONT>     * 14.4 of RFC 2068 (HTTP 1.1 header field 
definitions).<a name="line.33"></a>
-<FONT color="green">034</FONT>     *<a name="line.34"></a>
-<FONT color="green">035</FONT>     * @author &lt;a 
href="mailto:[email protected]"&gt;Daniel Rall&lt;/a&gt;<a name="line.35"></a>
-<FONT color="green">036</FONT>     * @version $Id: LocaleTokenizer.java 670330 
2008-06-22 09:37:21Z tv $<a name="line.36"></a>
-<FONT color="green">037</FONT>     */<a name="line.37"></a>
-<FONT color="green">038</FONT>    public class LocaleTokenizer<a 
name="line.38"></a>
-<FONT color="green">039</FONT>        implements Iterator<a name="line.39"></a>
-<FONT color="green">040</FONT>    {<a name="line.40"></a>
-<FONT color="green">041</FONT>        /**<a name="line.41"></a>
-<FONT color="green">042</FONT>         * Separates elements of the 
&lt;code&gt;Accept-Language&lt;/code&gt; HTTP<a name="line.42"></a>
-<FONT color="green">043</FONT>         * header.<a name="line.43"></a>
-<FONT color="green">044</FONT>         */<a name="line.44"></a>
-<FONT color="green">045</FONT>        private static final String 
LOCALE_SEPARATOR = ",";<a name="line.45"></a>
-<FONT color="green">046</FONT>    <a name="line.46"></a>
-<FONT color="green">047</FONT>        /**<a name="line.47"></a>
-<FONT color="green">048</FONT>         * Separates locale from quality within 
elements.<a name="line.48"></a>
-<FONT color="green">049</FONT>         */<a name="line.49"></a>
-<FONT color="green">050</FONT>        private static final char 
QUALITY_SEPARATOR = ';';<a name="line.50"></a>
-<FONT color="green">051</FONT>    <a name="line.51"></a>
-<FONT color="green">052</FONT>        /**<a name="line.52"></a>
-<FONT color="green">053</FONT>         * The default quality value for an 
&lt;code&gt;AcceptLanguage&lt;/code&gt;<a name="line.53"></a>
-<FONT color="green">054</FONT>         * object.<a name="line.54"></a>
-<FONT color="green">055</FONT>         */<a name="line.55"></a>
-<FONT color="green">056</FONT>        protected static final Float 
DEFAULT_QUALITY = new Float(1.0f);<a name="line.56"></a>
-<FONT color="green">057</FONT>    <a name="line.57"></a>
-<FONT color="green">058</FONT>        /**<a name="line.58"></a>
-<FONT color="green">059</FONT>         * The parsed locales.<a 
name="line.59"></a>
-<FONT color="green">060</FONT>         */<a name="line.60"></a>
-<FONT color="green">061</FONT>        private ArrayList locales = new 
ArrayList(3);<a name="line.61"></a>
-<FONT color="green">062</FONT>    <a name="line.62"></a>
-<FONT color="green">063</FONT>        /**<a name="line.63"></a>
-<FONT color="green">064</FONT>         * Parses the 
&lt;code&gt;Accept-Language&lt;/code&gt; header.<a name="line.64"></a>
-<FONT color="green">065</FONT>         *<a name="line.65"></a>
-<FONT color="green">066</FONT>         * @param header The 
&lt;code&gt;Accept-Language&lt;/code&gt; header<a name="line.66"></a>
-<FONT color="green">067</FONT>         * (i.e. &lt;code&gt;en, es;q=0.8, 
zh-TW;q=0.1&lt;/code&gt;).<a name="line.67"></a>
-<FONT color="green">068</FONT>         */<a name="line.68"></a>
-<FONT color="green">069</FONT>        public LocaleTokenizer(String header)<a 
name="line.69"></a>
-<FONT color="green">070</FONT>        {<a name="line.70"></a>
-<FONT color="green">071</FONT>            StringTokenizer tok = new 
StringTokenizer(header, LOCALE_SEPARATOR);<a name="line.71"></a>
-<FONT color="green">072</FONT>            while (tok.hasMoreTokens())<a 
name="line.72"></a>
-<FONT color="green">073</FONT>            {<a name="line.73"></a>
-<FONT color="green">074</FONT>                AcceptLanguage acceptLang = new 
AcceptLanguage();<a name="line.74"></a>
-<FONT color="green">075</FONT>                String element = 
tok.nextToken().trim();<a name="line.75"></a>
-<FONT color="green">076</FONT>                int index;<a name="line.76"></a>
-<FONT color="green">077</FONT>    <a name="line.77"></a>
-<FONT color="green">078</FONT>                // Record and cut off any 
quality value that comes after a<a name="line.78"></a>
-<FONT color="green">079</FONT>                // semi-colon.<a 
name="line.79"></a>
-<FONT color="green">080</FONT>                if ( (index = 
element.indexOf(QUALITY_SEPARATOR)) != -1 )<a name="line.80"></a>
-<FONT color="green">081</FONT>                {<a name="line.81"></a>
-<FONT color="green">082</FONT>                    String q = 
element.substring(index);<a name="line.82"></a>
-<FONT color="green">083</FONT>                    element = 
element.substring(0, index);<a name="line.83"></a>
-<FONT color="green">084</FONT>                    if ( (index = 
q.indexOf('=')) != -1 )<a name="line.84"></a>
-<FONT color="green">085</FONT>                    {<a name="line.85"></a>
-<FONT color="green">086</FONT>                        try<a name="line.86"></a>
-<FONT color="green">087</FONT>                        {<a name="line.87"></a>
-<FONT color="green">088</FONT>                            acceptLang.quality 
=<a name="line.88"></a>
-<FONT color="green">089</FONT>                                
Float.valueOf(q.substring(index + 1));<a name="line.89"></a>
-<FONT color="green">090</FONT>                        }<a name="line.90"></a>
-<FONT color="green">091</FONT>                        catch 
(NumberFormatException useDefault)<a name="line.91"></a>
-<FONT color="green">092</FONT>                        {<a name="line.92"></a>
-<FONT color="green">093</FONT>                            // ignore<a 
name="line.93"></a>
-<FONT color="green">094</FONT>                        }<a name="line.94"></a>
-<FONT color="green">095</FONT>                    }<a name="line.95"></a>
-<FONT color="green">096</FONT>                }<a name="line.96"></a>
-<FONT color="green">097</FONT>    <a name="line.97"></a>
-<FONT color="green">098</FONT>                element = element.trim();<a 
name="line.98"></a>
-<FONT color="green">099</FONT>    <a name="line.99"></a>
-<FONT color="green">100</FONT>                // Create a Locale from the 
language.  A dash may separate the<a name="line.100"></a>
-<FONT color="green">101</FONT>                // language from the country.<a 
name="line.101"></a>
-<FONT color="green">102</FONT>                if ( (index = 
element.indexOf('-')) == -1 )<a name="line.102"></a>
-<FONT color="green">103</FONT>                {<a name="line.103"></a>
-<FONT color="green">104</FONT>                    // No dash means no 
country.<a name="line.104"></a>
-<FONT color="green">105</FONT>                    acceptLang.locale = new 
Locale(element, "");<a name="line.105"></a>
-<FONT color="green">106</FONT>                }<a name="line.106"></a>
-<FONT color="green">107</FONT>                else<a name="line.107"></a>
-<FONT color="green">108</FONT>                {<a name="line.108"></a>
-<FONT color="green">109</FONT>                    acceptLang.locale = new 
Locale(element.substring(0, index),<a name="line.109"></a>
-<FONT color="green">110</FONT>                                                 
  element.substring(index + 1));<a name="line.110"></a>
-<FONT color="green">111</FONT>                }<a name="line.111"></a>
-<FONT color="green">112</FONT>    <a name="line.112"></a>
-<FONT color="green">113</FONT>                locales.add(acceptLang);<a 
name="line.113"></a>
-<FONT color="green">114</FONT>            }<a name="line.114"></a>
-<FONT color="green">115</FONT>    <a name="line.115"></a>
-<FONT color="green">116</FONT>            // Sort by quality in descending 
order.<a name="line.116"></a>
-<FONT color="green">117</FONT>            Collections.sort(locales, 
Collections.reverseOrder());<a name="line.117"></a>
-<FONT color="green">118</FONT>        }<a name="line.118"></a>
-<FONT color="green">119</FONT>    <a name="line.119"></a>
-<FONT color="green">120</FONT>        /**<a name="line.120"></a>
-<FONT color="green">121</FONT>         * @return Whether there are more 
locales.<a name="line.121"></a>
-<FONT color="green">122</FONT>         */<a name="line.122"></a>
-<FONT color="green">123</FONT>        public boolean hasNext()<a 
name="line.123"></a>
-<FONT color="green">124</FONT>        {<a name="line.124"></a>
-<FONT color="green">125</FONT>            return !locales.isEmpty();<a 
name="line.125"></a>
-<FONT color="green">126</FONT>        }<a name="line.126"></a>
-<FONT color="green">127</FONT>    <a name="line.127"></a>
-<FONT color="green">128</FONT>        /**<a name="line.128"></a>
-<FONT color="green">129</FONT>         * Creates a 
&lt;code&gt;Locale&lt;/code&gt; from the next element of the<a 
name="line.129"></a>
-<FONT color="green">130</FONT>         * 
&lt;code&gt;Accept-Language&lt;/code&gt; header.<a name="line.130"></a>
-<FONT color="green">131</FONT>         *<a name="line.131"></a>
-<FONT color="green">132</FONT>         * @return The next highest-rated 
&lt;code&gt;Locale&lt;/code&gt;.<a name="line.132"></a>
-<FONT color="green">133</FONT>         * @throws NoSuchElementException No 
more locales.<a name="line.133"></a>
-<FONT color="green">134</FONT>         */<a name="line.134"></a>
-<FONT color="green">135</FONT>        public Object next()<a 
name="line.135"></a>
-<FONT color="green">136</FONT>        {<a name="line.136"></a>
-<FONT color="green">137</FONT>            if (locales.isEmpty())<a 
name="line.137"></a>
-<FONT color="green">138</FONT>            {<a name="line.138"></a>
-<FONT color="green">139</FONT>                throw new 
NoSuchElementException();<a name="line.139"></a>
-<FONT color="green">140</FONT>            }<a name="line.140"></a>
-<FONT color="green">141</FONT>            return ((AcceptLanguage) 
locales.remove(0)).locale;<a name="line.141"></a>
-<FONT color="green">142</FONT>        }<a name="line.142"></a>
-<FONT color="green">143</FONT>    <a name="line.143"></a>
-<FONT color="green">144</FONT>        /**<a name="line.144"></a>
-<FONT color="green">145</FONT>         * Not implemented.<a 
name="line.145"></a>
-<FONT color="green">146</FONT>         */<a name="line.146"></a>
-<FONT color="green">147</FONT>        public final void remove()<a 
name="line.147"></a>
-<FONT color="green">148</FONT>        {<a name="line.148"></a>
-<FONT color="green">149</FONT>            throw new 
UnsupportedOperationException(getClass().getName() +<a name="line.149"></a>
-<FONT color="green">150</FONT>                                                 
   " does not support remove()");<a name="line.150"></a>
-<FONT color="green">151</FONT>        }<a name="line.151"></a>
-<FONT color="green">152</FONT>    <a name="line.152"></a>
-<FONT color="green">153</FONT>        /**<a name="line.153"></a>
-<FONT color="green">154</FONT>         * Struct representing an element of the 
HTTP<a name="line.154"></a>
-<FONT color="green">155</FONT>         * 
&lt;code&gt;Accept-Language&lt;/code&gt; header.<a name="line.155"></a>
-<FONT color="green">156</FONT>         */<a name="line.156"></a>
-<FONT color="green">157</FONT>        protected static class AcceptLanguage 
implements Comparable<a name="line.157"></a>
-<FONT color="green">158</FONT>        {<a name="line.158"></a>
-<FONT color="green">159</FONT>            /**<a name="line.159"></a>
-<FONT color="green">160</FONT>             * The language and country.<a 
name="line.160"></a>
-<FONT color="green">161</FONT>             */<a name="line.161"></a>
-<FONT color="green">162</FONT>            Locale locale;<a name="line.162"></a>
-<FONT color="green">163</FONT>    <a name="line.163"></a>
-<FONT color="green">164</FONT>            /**<a name="line.164"></a>
-<FONT color="green">165</FONT>             * The quality of our locale (as 
values approach<a name="line.165"></a>
-<FONT color="green">166</FONT>             * &lt;code&gt;1.0&lt;/code&gt;, 
they indicate increased user preference).<a name="line.166"></a>
-<FONT color="green">167</FONT>             */<a name="line.167"></a>
-<FONT color="green">168</FONT>            Float quality = DEFAULT_QUALITY;<a 
name="line.168"></a>
-<FONT color="green">169</FONT>    <a name="line.169"></a>
-<FONT color="green">170</FONT>            public final int compareTo(Object 
acceptLang)<a name="line.170"></a>
-<FONT color="green">171</FONT>            {<a name="line.171"></a>
-<FONT color="green">172</FONT>                return quality.compareTo( 
((AcceptLanguage) acceptLang).quality );<a name="line.172"></a>
-<FONT color="green">173</FONT>            }<a name="line.173"></a>
-<FONT color="green">174</FONT>        }<a name="line.174"></a>
-<FONT color="green">175</FONT>    }<a name="line.175"></a>
+<!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="../../../../../stylesheet.css" 
title="Style">
+</head>
+<body>
+<div class="sourceContainer">
+<pre><span class="sourceLineNo">001</span>package 
org.apache.fulcrum.localization;<a name="line.1"></a>
+<span class="sourceLineNo">002</span><a name="line.2"></a>
+<span class="sourceLineNo">003</span>/*<a name="line.3"></a>
+<span class="sourceLineNo">004</span> * Licensed to the Apache Software 
Foundation (ASF) under one<a name="line.4"></a>
+<span class="sourceLineNo">005</span> * or more contributor license 
agreements.  See the NOTICE file<a name="line.5"></a>
+<span class="sourceLineNo">006</span> * distributed with this work for 
additional information<a name="line.6"></a>
+<span class="sourceLineNo">007</span> * regarding copyright ownership.  The 
ASF licenses this file<a name="line.7"></a>
+<span class="sourceLineNo">008</span> * to you under the Apache License, 
Version 2.0 (the<a name="line.8"></a>
+<span class="sourceLineNo">009</span> * "License"); you may not use this file 
except in compliance<a name="line.9"></a>
+<span class="sourceLineNo">010</span> * with the License.  You may obtain a 
copy of the License at<a name="line.10"></a>
+<span class="sourceLineNo">011</span> *<a name="line.11"></a>
+<span class="sourceLineNo">012</span> *   
http://www.apache.org/licenses/LICENSE-2.0<a name="line.12"></a>
+<span class="sourceLineNo">013</span> *<a name="line.13"></a>
+<span class="sourceLineNo">014</span> * Unless required by applicable law or 
agreed to in writing,<a name="line.14"></a>
+<span class="sourceLineNo">015</span> * software distributed under the License 
is distributed on an<a name="line.15"></a>
+<span class="sourceLineNo">016</span> * "AS IS" BASIS, WITHOUT WARRANTIES OR 
CONDITIONS OF ANY<a name="line.16"></a>
+<span class="sourceLineNo">017</span> * KIND, either express or implied.  See 
the License for the<a name="line.17"></a>
+<span class="sourceLineNo">018</span> * specific language governing 
permissions and limitations<a name="line.18"></a>
+<span class="sourceLineNo">019</span> * under the License.<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 name="line.22"></a>
+<span class="sourceLineNo">023</span>import java.util.ArrayList;<a 
name="line.23"></a>
+<span class="sourceLineNo">024</span>import java.util.Collections;<a 
name="line.24"></a>
+<span class="sourceLineNo">025</span>import java.util.Iterator;<a 
name="line.25"></a>
+<span class="sourceLineNo">026</span>import java.util.Locale;<a 
name="line.26"></a>
+<span class="sourceLineNo">027</span>import 
java.util.NoSuchElementException;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import java.util.StringTokenizer;<a 
name="line.28"></a>
+<span class="sourceLineNo">029</span><a name="line.29"></a>
+<span class="sourceLineNo">030</span>/**<a name="line.30"></a>
+<span class="sourceLineNo">031</span> * Parses the HTTP 
&lt;code&gt;Accept-Language&lt;/code&gt; header as per section<a 
name="line.31"></a>
+<span class="sourceLineNo">032</span> * 14.4 of RFC 2068 (HTTP 1.1 header 
field definitions).<a name="line.32"></a>
+<span class="sourceLineNo">033</span> *<a name="line.33"></a>
+<span class="sourceLineNo">034</span> * @author &lt;a 
href="mailto:[email protected]"&gt;Daniel Rall&lt;/a&gt;<a name="line.34"></a>
+<span class="sourceLineNo">035</span> * @version $Id: LocaleTokenizer.java 
1851408 2019-01-15 19:31:48Z painter $<a name="line.35"></a>
+<span class="sourceLineNo">036</span> */<a name="line.36"></a>
+<span class="sourceLineNo">037</span>public class LocaleTokenizer<a 
name="line.37"></a>
+<span class="sourceLineNo">038</span>    implements Iterator&lt;Object&gt;<a 
name="line.38"></a>
+<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>     * Separates elements of the 
&lt;code&gt;Accept-Language&lt;/code&gt; HTTP<a name="line.41"></a>
+<span class="sourceLineNo">042</span>     * header.<a name="line.42"></a>
+<span class="sourceLineNo">043</span>     */<a name="line.43"></a>
+<span class="sourceLineNo">044</span>    private static final String 
LOCALE_SEPARATOR = ",";<a name="line.44"></a>
+<span class="sourceLineNo">045</span><a name="line.45"></a>
+<span class="sourceLineNo">046</span>    /**<a name="line.46"></a>
+<span class="sourceLineNo">047</span>     * Separates locale from quality 
within elements.<a name="line.47"></a>
+<span class="sourceLineNo">048</span>     */<a name="line.48"></a>
+<span class="sourceLineNo">049</span>    private static final char 
QUALITY_SEPARATOR = ';';<a name="line.49"></a>
+<span class="sourceLineNo">050</span><a name="line.50"></a>
+<span class="sourceLineNo">051</span>    /**<a name="line.51"></a>
+<span class="sourceLineNo">052</span>     * The default quality value for an 
&lt;code&gt;AcceptLanguage&lt;/code&gt;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>     * object.<a name="line.53"></a>
+<span class="sourceLineNo">054</span>     */<a name="line.54"></a>
+<span class="sourceLineNo">055</span>    protected static final Float 
DEFAULT_QUALITY = new Float(1.0f);<a name="line.55"></a>
+<span class="sourceLineNo">056</span><a name="line.56"></a>
+<span class="sourceLineNo">057</span>    /**<a name="line.57"></a>
+<span class="sourceLineNo">058</span>     * The parsed locales.<a 
name="line.58"></a>
+<span class="sourceLineNo">059</span>     */<a name="line.59"></a>
+<span class="sourceLineNo">060</span>    private 
ArrayList&lt;AcceptLanguage&gt; locales = new 
ArrayList&lt;AcceptLanguage&gt;(3);<a name="line.60"></a>
+<span class="sourceLineNo">061</span><a name="line.61"></a>
+<span class="sourceLineNo">062</span>    /**<a name="line.62"></a>
+<span class="sourceLineNo">063</span>     * Parses the 
&lt;code&gt;Accept-Language&lt;/code&gt; header.<a name="line.63"></a>
+<span class="sourceLineNo">064</span>     *<a name="line.64"></a>
+<span class="sourceLineNo">065</span>     * @param header The 
&lt;code&gt;Accept-Language&lt;/code&gt; header<a name="line.65"></a>
+<span class="sourceLineNo">066</span>     * (i.e. &lt;code&gt;en, es;q=0.8, 
zh-TW;q=0.1&lt;/code&gt;).<a name="line.66"></a>
+<span class="sourceLineNo">067</span>     */<a name="line.67"></a>
+<span class="sourceLineNo">068</span>    public LocaleTokenizer(String 
header)<a name="line.68"></a>
+<span class="sourceLineNo">069</span>    {<a name="line.69"></a>
+<span class="sourceLineNo">070</span>        StringTokenizer tok = new 
StringTokenizer(header, LOCALE_SEPARATOR);<a name="line.70"></a>
+<span class="sourceLineNo">071</span>        while (tok.hasMoreTokens())<a 
name="line.71"></a>
+<span class="sourceLineNo">072</span>        {<a name="line.72"></a>
+<span class="sourceLineNo">073</span>            AcceptLanguage acceptLang = 
new AcceptLanguage();<a name="line.73"></a>
+<span class="sourceLineNo">074</span>            String element = 
tok.nextToken().trim();<a name="line.74"></a>
+<span class="sourceLineNo">075</span>            int index;<a 
name="line.75"></a>
+<span class="sourceLineNo">076</span><a name="line.76"></a>
+<span class="sourceLineNo">077</span>            // Record and cut off any 
quality value that comes after a<a name="line.77"></a>
+<span class="sourceLineNo">078</span>            // semi-colon.<a 
name="line.78"></a>
+<span class="sourceLineNo">079</span>            if ( (index = 
element.indexOf(QUALITY_SEPARATOR)) != -1 )<a name="line.79"></a>
+<span class="sourceLineNo">080</span>            {<a name="line.80"></a>
+<span class="sourceLineNo">081</span>                String q = 
element.substring(index);<a name="line.81"></a>
+<span class="sourceLineNo">082</span>                element = 
element.substring(0, index);<a name="line.82"></a>
+<span class="sourceLineNo">083</span>                if ( (index = 
q.indexOf('=')) != -1 )<a name="line.83"></a>
+<span class="sourceLineNo">084</span>                {<a name="line.84"></a>
+<span class="sourceLineNo">085</span>                    try<a 
name="line.85"></a>
+<span class="sourceLineNo">086</span>                    {<a 
name="line.86"></a>
+<span class="sourceLineNo">087</span>                        
acceptLang.quality =<a name="line.87"></a>
+<span class="sourceLineNo">088</span>                            
Float.valueOf(q.substring(index + 1));<a name="line.88"></a>
+<span class="sourceLineNo">089</span>                    }<a 
name="line.89"></a>
+<span class="sourceLineNo">090</span>                    catch 
(NumberFormatException useDefault)<a name="line.90"></a>
+<span class="sourceLineNo">091</span>                    {<a 
name="line.91"></a>
+<span class="sourceLineNo">092</span>                        // ignore<a 
name="line.92"></a>
+<span class="sourceLineNo">093</span>                    }<a 
name="line.93"></a>
+<span class="sourceLineNo">094</span>                }<a name="line.94"></a>
+<span class="sourceLineNo">095</span>            }<a name="line.95"></a>
+<span class="sourceLineNo">096</span><a name="line.96"></a>
+<span class="sourceLineNo">097</span>            element = element.trim();<a 
name="line.97"></a>
+<span class="sourceLineNo">098</span><a name="line.98"></a>
+<span class="sourceLineNo">099</span>            // Create a Locale from the 
language.  A dash may separate the<a name="line.99"></a>
+<span class="sourceLineNo">100</span>            // language from the 
country.<a name="line.100"></a>
+<span class="sourceLineNo">101</span>            if ( (index = 
element.indexOf('-')) == -1 )<a name="line.101"></a>
+<span class="sourceLineNo">102</span>            {<a name="line.102"></a>
+<span class="sourceLineNo">103</span>                // No dash means no 
country.<a name="line.103"></a>
+<span class="sourceLineNo">104</span>                acceptLang.locale = new 
Locale(element, "");<a name="line.104"></a>
+<span class="sourceLineNo">105</span>            }<a name="line.105"></a>
+<span class="sourceLineNo">106</span>            else<a name="line.106"></a>
+<span class="sourceLineNo">107</span>            {<a name="line.107"></a>
+<span class="sourceLineNo">108</span>                acceptLang.locale = new 
Locale(element.substring(0, index),<a name="line.108"></a>
+<span class="sourceLineNo">109</span>                                          
     element.substring(index + 1));<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>            locales.add(acceptLang);<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>        // Sort by quality in descending 
order.<a name="line.115"></a>
+<span class="sourceLineNo">116</span>        Collections.sort(locales, 
Collections.reverseOrder());<a name="line.116"></a>
+<span class="sourceLineNo">117</span>    }<a name="line.117"></a>
+<span class="sourceLineNo">118</span><a name="line.118"></a>
+<span class="sourceLineNo">119</span>    /**<a name="line.119"></a>
+<span class="sourceLineNo">120</span>     * @return Whether there are more 
locales.<a name="line.120"></a>
+<span class="sourceLineNo">121</span>     */<a name="line.121"></a>
+<span class="sourceLineNo">122</span>    public boolean hasNext()<a 
name="line.122"></a>
+<span class="sourceLineNo">123</span>    {<a name="line.123"></a>
+<span class="sourceLineNo">124</span>        return !locales.isEmpty();<a 
name="line.124"></a>
+<span class="sourceLineNo">125</span>    }<a name="line.125"></a>
+<span class="sourceLineNo">126</span><a name="line.126"></a>
+<span class="sourceLineNo">127</span>    /**<a name="line.127"></a>
+<span class="sourceLineNo">128</span>     * Creates a 
&lt;code&gt;Locale&lt;/code&gt; from the next element of the<a 
name="line.128"></a>
+<span class="sourceLineNo">129</span>     * 
&lt;code&gt;Accept-Language&lt;/code&gt; header.<a name="line.129"></a>
+<span class="sourceLineNo">130</span>     *<a name="line.130"></a>
+<span class="sourceLineNo">131</span>     * @return The next highest-rated 
&lt;code&gt;Locale&lt;/code&gt;.<a name="line.131"></a>
+<span class="sourceLineNo">132</span>     * @throws NoSuchElementException No 
more locales.<a name="line.132"></a>
+<span class="sourceLineNo">133</span>     */<a name="line.133"></a>
+<span class="sourceLineNo">134</span>    public Object next()<a 
name="line.134"></a>
+<span class="sourceLineNo">135</span>    {<a name="line.135"></a>
+<span class="sourceLineNo">136</span>        if (locales.isEmpty())<a 
name="line.136"></a>
+<span class="sourceLineNo">137</span>        {<a name="line.137"></a>
+<span class="sourceLineNo">138</span>            throw new 
NoSuchElementException();<a name="line.138"></a>
+<span class="sourceLineNo">139</span>        }<a name="line.139"></a>
+<span class="sourceLineNo">140</span>        return ((AcceptLanguage) 
locales.remove(0)).locale;<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    }<a name="line.141"></a>
+<span class="sourceLineNo">142</span><a name="line.142"></a>
+<span class="sourceLineNo">143</span>    /**<a name="line.143"></a>
+<span class="sourceLineNo">144</span>     * Not implemented.<a 
name="line.144"></a>
+<span class="sourceLineNo">145</span>     */<a name="line.145"></a>
+<span class="sourceLineNo">146</span>    public final void remove()<a 
name="line.146"></a>
+<span class="sourceLineNo">147</span>    {<a name="line.147"></a>
+<span class="sourceLineNo">148</span>        throw new 
UnsupportedOperationException(getClass().getName() +<a name="line.148"></a>
+<span class="sourceLineNo">149</span>                                          
      " does not support remove()");<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>    /**<a name="line.152"></a>
+<span class="sourceLineNo">153</span>     * Struct representing an element of 
the HTTP<a name="line.153"></a>
+<span class="sourceLineNo">154</span>     * 
&lt;code&gt;Accept-Language&lt;/code&gt; header.<a name="line.154"></a>
+<span class="sourceLineNo">155</span>     */<a name="line.155"></a>
+<span class="sourceLineNo">156</span>    protected static class AcceptLanguage 
implements Comparable&lt;Object&gt;<a name="line.156"></a>
+<span class="sourceLineNo">157</span>    {<a name="line.157"></a>
+<span class="sourceLineNo">158</span>        /**<a name="line.158"></a>
+<span class="sourceLineNo">159</span>         * The language and country.<a 
name="line.159"></a>
+<span class="sourceLineNo">160</span>         */<a name="line.160"></a>
+<span class="sourceLineNo">161</span>        Locale locale;<a 
name="line.161"></a>
+<span class="sourceLineNo">162</span><a name="line.162"></a>
+<span class="sourceLineNo">163</span>        /**<a name="line.163"></a>
+<span class="sourceLineNo">164</span>         * The quality of our locale (as 
values approach<a name="line.164"></a>
+<span class="sourceLineNo">165</span>         * &lt;code&gt;1.0&lt;/code&gt;, 
they indicate increased user preference).<a name="line.165"></a>
+<span class="sourceLineNo">166</span>         */<a name="line.166"></a>
+<span class="sourceLineNo">167</span>        Float quality = 
DEFAULT_QUALITY;<a name="line.167"></a>
+<span class="sourceLineNo">168</span>        <a name="line.168"></a>
+<span class="sourceLineNo">169</span>                @Override<a 
name="line.169"></a>
+<span class="sourceLineNo">170</span>        public int compareTo(Object 
acceptLang)<a name="line.170"></a>
+<span class="sourceLineNo">171</span>        {<a name="line.171"></a>
+<span class="sourceLineNo">172</span>                        if ( acceptLang 
== null )<a name="line.172"></a>
+<span class="sourceLineNo">173</span>                                throw new 
NullPointerException("AcceptLanguage not found");<a name="line.173"></a>
+<span class="sourceLineNo">174</span>                        <a 
name="line.174"></a>
+<span class="sourceLineNo">175</span>                        if ( acceptLang 
instanceof AcceptLanguage )<a name="line.175"></a>
+<span class="sourceLineNo">176</span>                        {<a 
name="line.176"></a>
+<span class="sourceLineNo">177</span>                                Float q2 
= ((AcceptLanguage) acceptLang).quality;<a name="line.177"></a>
+<span class="sourceLineNo">178</span>                                return 
quality.compareTo( q2 );<a name="line.178"></a>
+<span class="sourceLineNo">179</span>                        } else {<a 
name="line.179"></a>
+<span class="sourceLineNo">180</span>                                throw new 
NullPointerException("The object to compare is not the correct type");<a 
name="line.180"></a>
+<span class="sourceLineNo">181</span>                        }<a 
name="line.181"></a>
+<span class="sourceLineNo">182</span>                                <a 
name="line.182"></a>
+<span class="sourceLineNo">183</span>        }<a name="line.183"></a>
+<span class="sourceLineNo">184</span>    }<a name="line.184"></a>
+<span class="sourceLineNo">185</span>}<a name="line.185"></a>
 
 
 
@@ -236,6 +251,7 @@
 
 
 
-</PRE>
-</BODY>
-</HTML>
+</pre>
+</div>
+</body>
+</html>
\ No newline at end of file


Reply via email to