You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2017/05/15 17:45:32 UTC
[02/11] incubator-juneau-website git commit: Add
ConfigFile.getSectionAsInterface().
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/a61cb5e3/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigFileImpl.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigFileImpl.html b/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigFileImpl.html
index 1cf1b46..8863586 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigFileImpl.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigFileImpl.html
@@ -24,740 +24,778 @@
<span class="sourceLineNo">016</span>import static org.apache.juneau.internal.ThrowableUtils.*;<a name="line.16"></a>
<span class="sourceLineNo">017</span><a name="line.17"></a>
<span class="sourceLineNo">018</span>import java.io.*;<a name="line.18"></a>
-<span class="sourceLineNo">019</span>import java.nio.charset.*;<a name="line.19"></a>
-<span class="sourceLineNo">020</span>import java.util.*;<a name="line.20"></a>
-<span class="sourceLineNo">021</span>import java.util.concurrent.locks.*;<a name="line.21"></a>
-<span class="sourceLineNo">022</span><a name="line.22"></a>
-<span class="sourceLineNo">023</span>import org.apache.juneau.*;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import org.apache.juneau.internal.*;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import org.apache.juneau.json.*;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.juneau.parser.*;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.juneau.serializer.*;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.juneau.svl.*;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.juneau.svl.vars.*;<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> * Implementation class for {@link ConfigFile}.<a name="line.32"></a>
-<span class="sourceLineNo">033</span> */<a name="line.33"></a>
-<span class="sourceLineNo">034</span>public final class ConfigFileImpl extends ConfigFile {<a name="line.34"></a>
-<span class="sourceLineNo">035</span><a name="line.35"></a>
-<span class="sourceLineNo">036</span> private final File file;<a name="line.36"></a>
-<span class="sourceLineNo">037</span> private final Encoder encoder;<a name="line.37"></a>
-<span class="sourceLineNo">038</span> private final WriterSerializer serializer;<a name="line.38"></a>
-<span class="sourceLineNo">039</span> private final ReaderParser parser;<a name="line.39"></a>
-<span class="sourceLineNo">040</span> private final Charset charset;<a name="line.40"></a>
-<span class="sourceLineNo">041</span> final List<ConfigFileListener> listeners = Collections.synchronizedList(new ArrayList<ConfigFileListener>());<a name="line.41"></a>
-<span class="sourceLineNo">042</span><a name="line.42"></a>
-<span class="sourceLineNo">043</span> private Map<String,Section> sections; // The actual data.<a name="line.43"></a>
+<span class="sourceLineNo">019</span>import java.lang.reflect.*;<a name="line.19"></a>
+<span class="sourceLineNo">020</span>import java.nio.charset.*;<a name="line.20"></a>
+<span class="sourceLineNo">021</span>import java.util.*;<a name="line.21"></a>
+<span class="sourceLineNo">022</span>import java.util.concurrent.locks.*;<a name="line.22"></a>
+<span class="sourceLineNo">023</span><a name="line.23"></a>
+<span class="sourceLineNo">024</span>import org.apache.juneau.*;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import org.apache.juneau.internal.*;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import org.apache.juneau.json.*;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.juneau.parser.*;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.juneau.serializer.*;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.juneau.svl.*;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.juneau.svl.vars.*;<a name="line.30"></a>
+<span class="sourceLineNo">031</span><a name="line.31"></a>
+<span class="sourceLineNo">032</span>/**<a name="line.32"></a>
+<span class="sourceLineNo">033</span> * Implementation class for {@link ConfigFile}.<a name="line.33"></a>
+<span class="sourceLineNo">034</span> */<a name="line.34"></a>
+<span class="sourceLineNo">035</span>public final class ConfigFileImpl extends ConfigFile {<a name="line.35"></a>
+<span class="sourceLineNo">036</span><a name="line.36"></a>
+<span class="sourceLineNo">037</span> private final File file;<a name="line.37"></a>
+<span class="sourceLineNo">038</span> private final Encoder encoder;<a name="line.38"></a>
+<span class="sourceLineNo">039</span> private final WriterSerializer serializer;<a name="line.39"></a>
+<span class="sourceLineNo">040</span> private final ReaderParser parser;<a name="line.40"></a>
+<span class="sourceLineNo">041</span> private final BeanSession pBeanSession;<a name="line.41"></a>
+<span class="sourceLineNo">042</span> private final Charset charset;<a name="line.42"></a>
+<span class="sourceLineNo">043</span> final List<ConfigFileListener> listeners = Collections.synchronizedList(new ArrayList<ConfigFileListener>());<a name="line.43"></a>
<span class="sourceLineNo">044</span><a name="line.44"></a>
-<span class="sourceLineNo">045</span> private static final String DEFAULT = "default";<a name="line.45"></a>
+<span class="sourceLineNo">045</span> private Map<String,Section> sections; // The actual data.<a name="line.45"></a>
<span class="sourceLineNo">046</span><a name="line.46"></a>
-<span class="sourceLineNo">047</span> private final boolean readOnly;<a name="line.47"></a>
+<span class="sourceLineNo">047</span> private static final String DEFAULT = "default";<a name="line.47"></a>
<span class="sourceLineNo">048</span><a name="line.48"></a>
-<span class="sourceLineNo">049</span> volatile boolean hasBeenModified = false;<a name="line.49"></a>
-<span class="sourceLineNo">050</span> private ReadWriteLock lock = new ReentrantReadWriteLock();<a name="line.50"></a>
-<span class="sourceLineNo">051</span><a name="line.51"></a>
-<span class="sourceLineNo">052</span> long modifiedTimestamp;<a name="line.52"></a>
+<span class="sourceLineNo">049</span> private final boolean readOnly;<a name="line.49"></a>
+<span class="sourceLineNo">050</span><a name="line.50"></a>
+<span class="sourceLineNo">051</span> volatile boolean hasBeenModified = false;<a name="line.51"></a>
+<span class="sourceLineNo">052</span> private ReadWriteLock lock = new ReentrantReadWriteLock();<a name="line.52"></a>
<span class="sourceLineNo">053</span><a name="line.53"></a>
-<span class="sourceLineNo">054</span> /**<a name="line.54"></a>
-<span class="sourceLineNo">055</span> * Constructor.<a name="line.55"></a>
-<span class="sourceLineNo">056</span> * <p><a name="line.56"></a>
-<span class="sourceLineNo">057</span> * Loads the contents of the specified file into this config file.<a name="line.57"></a>
+<span class="sourceLineNo">054</span> long modifiedTimestamp;<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>
<span class="sourceLineNo">058</span> * <p><a name="line.58"></a>
-<span class="sourceLineNo">059</span> * If file does not initially exist, this object will start off empty.<a name="line.59"></a>
-<span class="sourceLineNo">060</span> *<a name="line.60"></a>
-<span class="sourceLineNo">061</span> * @param file The INI file on disk.<a name="line.61"></a>
-<span class="sourceLineNo">062</span> * If <jk>null</jk>, create an in-memory config file.<a name="line.62"></a>
-<span class="sourceLineNo">063</span> * @param readOnly Make this configuration file read-only.<a name="line.63"></a>
-<span class="sourceLineNo">064</span> * Attempting to set any values on this config file will cause {@link UnsupportedOperationException} to be thrown.<a name="line.64"></a>
-<span class="sourceLineNo">065</span> * @param encoder The encoder to use for encoding sensitive values in this configuration file.<a name="line.65"></a>
-<span class="sourceLineNo">066</span> * If <jk>null</jk>, defaults to {@link XorEncoder#INSTANCE}.<a name="line.66"></a>
-<span class="sourceLineNo">067</span> * @param serializer The serializer to use for serializing POJOs in the {@link #put(String, Object)} method.<a name="line.67"></a>
-<span class="sourceLineNo">068</span> * If <jk>null</jk>, defaults to {@link JsonSerializer#DEFAULT}.<a name="line.68"></a>
-<span class="sourceLineNo">069</span> * @param parser The parser to use for parsing POJOs in the {@link #getObject(Class,String)} method.<a name="line.69"></a>
-<span class="sourceLineNo">070</span> * If <jk>null</jk>, defaults to {@link JsonParser#DEFAULT}.<a name="line.70"></a>
-<span class="sourceLineNo">071</span> * @param charset The charset on the files.<a name="line.71"></a>
-<span class="sourceLineNo">072</span> * If <jk>null</jk>, defaults to {@link Charset#defaultCharset()}.<a name="line.72"></a>
-<span class="sourceLineNo">073</span> * @throws IOException<a name="line.73"></a>
-<span class="sourceLineNo">074</span> */<a name="line.74"></a>
-<span class="sourceLineNo">075</span> public ConfigFileImpl(File file, boolean readOnly, Encoder encoder, WriterSerializer serializer, ReaderParser parser, Charset charset) throws IOException {<a name="line.75"></a>
-<span class="sourceLineNo">076</span> this.file = file;<a name="line.76"></a>
-<span class="sourceLineNo">077</span> this.encoder = encoder == null ? XorEncoder.INSTANCE : encoder;<a name="line.77"></a>
-<span class="sourceLineNo">078</span> this.serializer = serializer == null ? JsonSerializer.DEFAULT : serializer;<a name="line.78"></a>
-<span class="sourceLineNo">079</span> this.parser = parser == null ? JsonParser.DEFAULT : parser;<a name="line.79"></a>
-<span class="sourceLineNo">080</span> this.charset = charset == null ? Charset.defaultCharset() : charset;<a name="line.80"></a>
-<span class="sourceLineNo">081</span> load();<a name="line.81"></a>
-<span class="sourceLineNo">082</span> this.readOnly = readOnly;<a name="line.82"></a>
-<span class="sourceLineNo">083</span> if (readOnly) {<a name="line.83"></a>
-<span class="sourceLineNo">084</span> this.sections = Collections.unmodifiableMap(this.sections);<a name="line.84"></a>
-<span class="sourceLineNo">085</span> for (Section s : sections.values())<a name="line.85"></a>
-<span class="sourceLineNo">086</span> s.setReadOnly();<a name="line.86"></a>
-<span class="sourceLineNo">087</span> }<a name="line.87"></a>
-<span class="sourceLineNo">088</span> }<a name="line.88"></a>
-<span class="sourceLineNo">089</span><a name="line.89"></a>
-<span class="sourceLineNo">090</span> /**<a name="line.90"></a>
-<span class="sourceLineNo">091</span> * Constructor.<a name="line.91"></a>
-<span class="sourceLineNo">092</span> * Shortcut for calling <code><jk>new</jk> ConfigFileImpl(file, <jk>false</jk>, <jk>null</jk>, <jk>null</jk>, <jk>null</jk>, <jk>null</jk>);</code><a name="line.92"></a>
-<span class="sourceLineNo">093</span> *<a name="line.93"></a>
-<span class="sourceLineNo">094</span> * @param file The config file. Does not need to exist.<a name="line.94"></a>
-<span class="sourceLineNo">095</span> * @throws IOException<a name="line.95"></a>
-<span class="sourceLineNo">096</span> */<a name="line.96"></a>
-<span class="sourceLineNo">097</span> public ConfigFileImpl(File file) throws IOException {<a name="line.97"></a>
-<span class="sourceLineNo">098</span> this(file, false, null, null, null, null);<a name="line.98"></a>
-<span class="sourceLineNo">099</span> }<a name="line.99"></a>
-<span class="sourceLineNo">100</span><a name="line.100"></a>
-<span class="sourceLineNo">101</span> /**<a name="line.101"></a>
-<span class="sourceLineNo">102</span> * Constructor.<a name="line.102"></a>
-<span class="sourceLineNo">103</span> * Shortcut for calling <code><jk>new</jk> ConfigFileImpl(<jk>null</jk>, <jk>false</jk>, <jk>null</jk>, <jk>null</jk>, <jk>null</jk>, <jk>null</jk>);</code><a name="line.103"></a>
-<span class="sourceLineNo">104</span> *<a name="line.104"></a>
-<span class="sourceLineNo">105</span> * @throws IOException<a name="line.105"></a>
-<span class="sourceLineNo">106</span> */<a name="line.106"></a>
-<span class="sourceLineNo">107</span> public ConfigFileImpl() throws IOException {<a name="line.107"></a>
-<span class="sourceLineNo">108</span> this(null);<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> @Override /* ConfigFile */<a name="line.111"></a>
-<span class="sourceLineNo">112</span> public ConfigFileImpl loadIfModified() throws IOException {<a name="line.112"></a>
-<span class="sourceLineNo">113</span> if (file == null)<a name="line.113"></a>
-<span class="sourceLineNo">114</span> return this;<a name="line.114"></a>
-<span class="sourceLineNo">115</span> writeLock();<a name="line.115"></a>
-<span class="sourceLineNo">116</span> try {<a name="line.116"></a>
-<span class="sourceLineNo">117</span> if (file.lastModified() > modifiedTimestamp)<a name="line.117"></a>
-<span class="sourceLineNo">118</span> load();<a name="line.118"></a>
-<span class="sourceLineNo">119</span> } finally {<a name="line.119"></a>
-<span class="sourceLineNo">120</span> writeUnlock();<a name="line.120"></a>
-<span class="sourceLineNo">121</span> }<a name="line.121"></a>
-<span class="sourceLineNo">122</span> return this;<a name="line.122"></a>
-<span class="sourceLineNo">123</span> }<a name="line.123"></a>
-<span class="sourceLineNo">124</span><a name="line.124"></a>
-<span class="sourceLineNo">125</span> @Override /* ConfigFile */<a name="line.125"></a>
-<span class="sourceLineNo">126</span> public ConfigFileImpl load() throws IOException {<a name="line.126"></a>
-<span class="sourceLineNo">127</span> Reader r = null;<a name="line.127"></a>
-<span class="sourceLineNo">128</span> if (file != null && file.exists())<a name="line.128"></a>
-<span class="sourceLineNo">129</span> r = new InputStreamReader(new FileInputStream(file), charset);<a name="line.129"></a>
-<span class="sourceLineNo">130</span> else<a name="line.130"></a>
-<span class="sourceLineNo">131</span> r = new StringReader("");<a name="line.131"></a>
-<span class="sourceLineNo">132</span> try {<a name="line.132"></a>
-<span class="sourceLineNo">133</span> load(r);<a name="line.133"></a>
-<span class="sourceLineNo">134</span> } finally {<a name="line.134"></a>
-<span class="sourceLineNo">135</span> r.close();<a name="line.135"></a>
-<span class="sourceLineNo">136</span> }<a name="line.136"></a>
-<span class="sourceLineNo">137</span> return this;<a name="line.137"></a>
-<span class="sourceLineNo">138</span> }<a name="line.138"></a>
-<span class="sourceLineNo">139</span><a name="line.139"></a>
-<span class="sourceLineNo">140</span> @Override /* ConfigFile */<a name="line.140"></a>
-<span class="sourceLineNo">141</span> public ConfigFileImpl load(Reader r) throws IOException {<a name="line.141"></a>
-<span class="sourceLineNo">142</span> assertFieldNotNull(r, "r");<a name="line.142"></a>
-<span class="sourceLineNo">143</span> writeLock();<a name="line.143"></a>
-<span class="sourceLineNo">144</span> try {<a name="line.144"></a>
-<span class="sourceLineNo">145</span> this.sections = Collections.synchronizedMap(new LinkedHashMap<String,Section>());<a name="line.145"></a>
-<span class="sourceLineNo">146</span> BufferedReader in = new BufferedReader(r);<a name="line.146"></a>
-<span class="sourceLineNo">147</span> try {<a name="line.147"></a>
-<span class="sourceLineNo">148</span> writeLock();<a name="line.148"></a>
-<span class="sourceLineNo">149</span> hasBeenModified = false;<a name="line.149"></a>
-<span class="sourceLineNo">150</span> try {<a name="line.150"></a>
-<span class="sourceLineNo">151</span> sections.clear();<a name="line.151"></a>
-<span class="sourceLineNo">152</span> String line = null;<a name="line.152"></a>
-<span class="sourceLineNo">153</span> Section section = getSection(null, true);<a name="line.153"></a>
-<span class="sourceLineNo">154</span> ArrayList<String> lines = new ArrayList<String>();<a name="line.154"></a>
-<span class="sourceLineNo">155</span> boolean canAppend = false;<a name="line.155"></a>
-<span class="sourceLineNo">156</span> while ((line = in.readLine()) != null) {<a name="line.156"></a>
-<span class="sourceLineNo">157</span> if (isSection(line)) {<a name="line.157"></a>
-<span class="sourceLineNo">158</span> section.addLines(null, lines.toArray(new String[lines.size()]));<a name="line.158"></a>
-<span class="sourceLineNo">159</span> lines.clear();<a name="line.159"></a>
-<span class="sourceLineNo">160</span> canAppend = false;<a name="line.160"></a>
-<span class="sourceLineNo">161</span> String sn = StringUtils.replaceUnicodeSequences(line.substring(line.indexOf('[')+1, line.indexOf(']')).trim());<a name="line.161"></a>
-<span class="sourceLineNo">162</span> section = getSection(sn, true).addHeaderComments(section.removeTrailingComments());<a name="line.162"></a>
-<span class="sourceLineNo">163</span> } else {<a name="line.163"></a>
-<span class="sourceLineNo">164</span> char c = line.isEmpty() ? 0 : line.charAt(0);<a name="line.164"></a>
-<span class="sourceLineNo">165</span> if ((c == ' ' || c == '\t') && canAppend && ! (isComment(line) || isAssignment(line)))<a name="line.165"></a>
-<span class="sourceLineNo">166</span> lines.add(lines.remove(lines.size()-1) + '\n' + line.substring(1));<a name="line.166"></a>
-<span class="sourceLineNo">167</span> else {<a name="line.167"></a>
-<span class="sourceLineNo">168</span> lines.add(line);<a name="line.168"></a>
-<span class="sourceLineNo">169</span> if (isAssignment(line))<a name="line.169"></a>
-<span class="sourceLineNo">170</span> canAppend = true;<a name="line.170"></a>
-<span class="sourceLineNo">171</span> else<a name="line.171"></a>
-<span class="sourceLineNo">172</span> canAppend = canAppend && ! (StringUtils.isEmpty(line) || isComment(line));<a name="line.172"></a>
-<span class="sourceLineNo">173</span> }<a name="line.173"></a>
-<span class="sourceLineNo">174</span> }<a name="line.174"></a>
-<span class="sourceLineNo">175</span> }<a name="line.175"></a>
-<span class="sourceLineNo">176</span> section.addLines(null, lines.toArray(new String[lines.size()]));<a name="line.176"></a>
-<span class="sourceLineNo">177</span> in.close();<a name="line.177"></a>
-<span class="sourceLineNo">178</span> if (hasBeenModified) // Set when values need to be encoded.<a name="line.178"></a>
-<span class="sourceLineNo">179</span> save();<a name="line.179"></a>
-<span class="sourceLineNo">180</span> if (file != null)<a name="line.180"></a>
-<span class="sourceLineNo">181</span> modifiedTimestamp = file.lastModified();<a name="line.181"></a>
-<span class="sourceLineNo">182</span> } finally {<a name="line.182"></a>
-<span class="sourceLineNo">183</span> writeUnlock();<a name="line.183"></a>
-<span class="sourceLineNo">184</span> }<a name="line.184"></a>
-<span class="sourceLineNo">185</span> } finally {<a name="line.185"></a>
-<span class="sourceLineNo">186</span> in.close();<a name="line.186"></a>
-<span class="sourceLineNo">187</span> }<a name="line.187"></a>
-<span class="sourceLineNo">188</span> } finally {<a name="line.188"></a>
-<span class="sourceLineNo">189</span> writeUnlock();<a name="line.189"></a>
-<span class="sourceLineNo">190</span> }<a name="line.190"></a>
-<span class="sourceLineNo">191</span> for (ConfigFileListener l : listeners)<a name="line.191"></a>
-<span class="sourceLineNo">192</span> l.onLoad(this);<a name="line.192"></a>
-<span class="sourceLineNo">193</span> return this;<a name="line.193"></a>
-<span class="sourceLineNo">194</span> }<a name="line.194"></a>
-<span class="sourceLineNo">195</span><a name="line.195"></a>
-<span class="sourceLineNo">196</span><a name="line.196"></a>
-<span class="sourceLineNo">197</span> //--------------------------------------------------------------------------------<a name="line.197"></a>
-<span class="sourceLineNo">198</span> // Map methods<a name="line.198"></a>
-<span class="sourceLineNo">199</span> //--------------------------------------------------------------------------------<a name="line.199"></a>
-<span class="sourceLineNo">200</span><a name="line.200"></a>
-<span class="sourceLineNo">201</span> @Override /* Map */<a name="line.201"></a>
-<span class="sourceLineNo">202</span> public Section get(Object key) {<a name="line.202"></a>
-<span class="sourceLineNo">203</span> if (StringUtils.isEmpty(key))<a name="line.203"></a>
-<span class="sourceLineNo">204</span> key = DEFAULT;<a name="line.204"></a>
-<span class="sourceLineNo">205</span> readLock();<a name="line.205"></a>
-<span class="sourceLineNo">206</span> try {<a name="line.206"></a>
-<span class="sourceLineNo">207</span> return sections.get(key);<a name="line.207"></a>
-<span class="sourceLineNo">208</span> } finally {<a name="line.208"></a>
-<span class="sourceLineNo">209</span> readUnlock();<a name="line.209"></a>
-<span class="sourceLineNo">210</span> }<a name="line.210"></a>
-<span class="sourceLineNo">211</span> }<a name="line.211"></a>
-<span class="sourceLineNo">212</span><a name="line.212"></a>
-<span class="sourceLineNo">213</span> @Override /* Map */<a name="line.213"></a>
-<span class="sourceLineNo">214</span> public Section put(String key, Section section) {<a name="line.214"></a>
-<span class="sourceLineNo">215</span> Set<String> changes = createChanges();<a name="line.215"></a>
-<span class="sourceLineNo">216</span> Section old = put(key, section, changes);<a name="line.216"></a>
-<span class="sourceLineNo">217</span> signalChanges(changes);<a name="line.217"></a>
-<span class="sourceLineNo">218</span> return old;<a name="line.218"></a>
-<span class="sourceLineNo">219</span> }<a name="line.219"></a>
-<span class="sourceLineNo">220</span><a name="line.220"></a>
-<span class="sourceLineNo">221</span> private Section put(String key, Section section, Set<String> changes) {<a name="line.221"></a>
-<span class="sourceLineNo">222</span> if (StringUtils.isEmpty(key))<a name="line.222"></a>
-<span class="sourceLineNo">223</span> key = DEFAULT;<a name="line.223"></a>
-<span class="sourceLineNo">224</span> writeLock();<a name="line.224"></a>
-<span class="sourceLineNo">225</span> try {<a name="line.225"></a>
-<span class="sourceLineNo">226</span> Section prev = sections.put(key, section);<a name="line.226"></a>
-<span class="sourceLineNo">227</span> findChanges(changes, prev, section);<a name="line.227"></a>
-<span class="sourceLineNo">228</span> return prev;<a name="line.228"></a>
-<span class="sourceLineNo">229</span> } finally {<a name="line.229"></a>
-<span class="sourceLineNo">230</span> writeUnlock();<a name="line.230"></a>
-<span class="sourceLineNo">231</span> }<a name="line.231"></a>
-<span class="sourceLineNo">232</span> }<a name="line.232"></a>
-<span class="sourceLineNo">233</span><a name="line.233"></a>
-<span class="sourceLineNo">234</span> @Override /* Map */<a name="line.234"></a>
-<span class="sourceLineNo">235</span> public void putAll(Map<? extends String,? extends Section> map) {<a name="line.235"></a>
-<span class="sourceLineNo">236</span> Set<String> changes = createChanges();<a name="line.236"></a>
-<span class="sourceLineNo">237</span> writeLock();<a name="line.237"></a>
-<span class="sourceLineNo">238</span> try {<a name="line.238"></a>
-<span class="sourceLineNo">239</span> for (Map.Entry<? extends String,? extends Section> e : map.entrySet())<a name="line.239"></a>
-<span class="sourceLineNo">240</span> put(e.getKey(), e.getValue(), changes);<a name="line.240"></a>
-<span class="sourceLineNo">241</span> } finally {<a name="line.241"></a>
-<span class="sourceLineNo">242</span> writeUnlock();<a name="line.242"></a>
-<span class="sourceLineNo">243</span> }<a name="line.243"></a>
-<span class="sourceLineNo">244</span> signalChanges(changes);<a name="line.244"></a>
-<span class="sourceLineNo">245</span> }<a name="line.245"></a>
-<span class="sourceLineNo">246</span><a name="line.246"></a>
-<span class="sourceLineNo">247</span> @Override /* Map */<a name="line.247"></a>
-<span class="sourceLineNo">248</span> public void clear() {<a name="line.248"></a>
-<span class="sourceLineNo">249</span> Set<String> changes = createChanges();<a name="line.249"></a>
-<span class="sourceLineNo">250</span> writeLock();<a name="line.250"></a>
-<span class="sourceLineNo">251</span> try {<a name="line.251"></a>
-<span class="sourceLineNo">252</span> for (Section s : values())<a name="line.252"></a>
-<span class="sourceLineNo">253</span> findChanges(changes, s, null);<a name="line.253"></a>
-<span class="sourceLineNo">254</span> sections.clear();<a name="line.254"></a>
-<span class="sourceLineNo">255</span> } finally {<a name="line.255"></a>
-<span class="sourceLineNo">256</span> writeUnlock();<a name="line.256"></a>
-<span class="sourceLineNo">257</span> }<a name="line.257"></a>
-<span class="sourceLineNo">258</span> signalChanges(changes);<a name="line.258"></a>
+<span class="sourceLineNo">059</span> * Loads the contents of the specified file into this config file.<a name="line.59"></a>
+<span class="sourceLineNo">060</span> * <p><a name="line.60"></a>
+<span class="sourceLineNo">061</span> * If file does not initially exist, this object will start off empty.<a name="line.61"></a>
+<span class="sourceLineNo">062</span> *<a name="line.62"></a>
+<span class="sourceLineNo">063</span> * @param file The INI file on disk.<a name="line.63"></a>
+<span class="sourceLineNo">064</span> * If <jk>null</jk>, create an in-memory config file.<a name="line.64"></a>
+<span class="sourceLineNo">065</span> * @param readOnly Make this configuration file read-only.<a name="line.65"></a>
+<span class="sourceLineNo">066</span> * Attempting to set any values on this config file will cause {@link UnsupportedOperationException} to be thrown.<a name="line.66"></a>
+<span class="sourceLineNo">067</span> * @param encoder The encoder to use for encoding sensitive values in this configuration file.<a name="line.67"></a>
+<span class="sourceLineNo">068</span> * If <jk>null</jk>, defaults to {@link XorEncoder#INSTANCE}.<a name="line.68"></a>
+<span class="sourceLineNo">069</span> * @param serializer The serializer to use for serializing POJOs in the {@link #put(String, Object)} method.<a name="line.69"></a>
+<span class="sourceLineNo">070</span> * If <jk>null</jk>, defaults to {@link JsonSerializer#DEFAULT}.<a name="line.70"></a>
+<span class="sourceLineNo">071</span> * @param parser The parser to use for parsing POJOs in the {@link #getObject(String,Class)} method.<a name="line.71"></a>
+<span class="sourceLineNo">072</span> * If <jk>null</jk>, defaults to {@link JsonParser#DEFAULT}.<a name="line.72"></a>
+<span class="sourceLineNo">073</span> * @param charset The charset on the files.<a name="line.73"></a>
+<span class="sourceLineNo">074</span> * If <jk>null</jk>, defaults to {@link Charset#defaultCharset()}.<a name="line.74"></a>
+<span class="sourceLineNo">075</span> * @throws IOException<a name="line.75"></a>
+<span class="sourceLineNo">076</span> */<a name="line.76"></a>
+<span class="sourceLineNo">077</span> public ConfigFileImpl(File file, boolean readOnly, Encoder encoder, WriterSerializer serializer, ReaderParser parser, Charset charset) throws IOException {<a name="line.77"></a>
+<span class="sourceLineNo">078</span> this.file = file;<a name="line.78"></a>
+<span class="sourceLineNo">079</span> this.encoder = encoder == null ? XorEncoder.INSTANCE : encoder;<a name="line.79"></a>
+<span class="sourceLineNo">080</span> this.serializer = serializer == null ? JsonSerializer.DEFAULT : serializer;<a name="line.80"></a>
+<span class="sourceLineNo">081</span> this.parser = parser == null ? JsonParser.DEFAULT : parser;<a name="line.81"></a>
+<span class="sourceLineNo">082</span> this.charset = charset == null ? Charset.defaultCharset() : charset;<a name="line.82"></a>
+<span class="sourceLineNo">083</span> load();<a name="line.83"></a>
+<span class="sourceLineNo">084</span> this.readOnly = readOnly;<a name="line.84"></a>
+<span class="sourceLineNo">085</span> if (readOnly) {<a name="line.85"></a>
+<span class="sourceLineNo">086</span> this.sections = Collections.unmodifiableMap(this.sections);<a name="line.86"></a>
+<span class="sourceLineNo">087</span> for (Section s : sections.values())<a name="line.87"></a>
+<span class="sourceLineNo">088</span> s.setReadOnly();<a name="line.88"></a>
+<span class="sourceLineNo">089</span> }<a name="line.89"></a>
+<span class="sourceLineNo">090</span> this.pBeanSession = this.parser.getBeanContext().createSession();<a name="line.90"></a>
+<span class="sourceLineNo">091</span> }<a name="line.91"></a>
+<span class="sourceLineNo">092</span><a name="line.92"></a>
+<span class="sourceLineNo">093</span> /**<a name="line.93"></a>
+<span class="sourceLineNo">094</span> * Constructor.<a name="line.94"></a>
+<span class="sourceLineNo">095</span> * Shortcut for calling <code><jk>new</jk> ConfigFileImpl(file, <jk>false</jk>, <jk>null</jk>, <jk>null</jk>, <jk>null</jk>, <jk>null</jk>);</code><a name="line.95"></a>
+<span class="sourceLineNo">096</span> *<a name="line.96"></a>
+<span class="sourceLineNo">097</span> * @param file The config file. Does not need to exist.<a name="line.97"></a>
+<span class="sourceLineNo">098</span> * @throws IOException<a name="line.98"></a>
+<span class="sourceLineNo">099</span> */<a name="line.99"></a>
+<span class="sourceLineNo">100</span> public ConfigFileImpl(File file) throws IOException {<a name="line.100"></a>
+<span class="sourceLineNo">101</span> this(file, false, null, null, null, null);<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> * Constructor.<a name="line.105"></a>
+<span class="sourceLineNo">106</span> * Shortcut for calling <code><jk>new</jk> ConfigFileImpl(<jk>null</jk>, <jk>false</jk>, <jk>null</jk>, <jk>null</jk>, <jk>null</jk>, <jk>null</jk>);</code><a name="line.106"></a>
+<span class="sourceLineNo">107</span> *<a name="line.107"></a>
+<span class="sourceLineNo">108</span> * @throws IOException<a name="line.108"></a>
+<span class="sourceLineNo">109</span> */<a name="line.109"></a>
+<span class="sourceLineNo">110</span> public ConfigFileImpl() throws IOException {<a name="line.110"></a>
+<span class="sourceLineNo">111</span> this(null);<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> @Override /* ConfigFile */<a name="line.114"></a>
+<span class="sourceLineNo">115</span> public ConfigFileImpl loadIfModified() throws IOException {<a name="line.115"></a>
+<span class="sourceLineNo">116</span> if (file == null)<a name="line.116"></a>
+<span class="sourceLineNo">117</span> return this;<a name="line.117"></a>
+<span class="sourceLineNo">118</span> writeLock();<a name="line.118"></a>
+<span class="sourceLineNo">119</span> try {<a name="line.119"></a>
+<span class="sourceLineNo">120</span> if (file.lastModified() > modifiedTimestamp)<a name="line.120"></a>
+<span class="sourceLineNo">121</span> load();<a name="line.121"></a>
+<span class="sourceLineNo">122</span> } finally {<a name="line.122"></a>
+<span class="sourceLineNo">123</span> writeUnlock();<a name="line.123"></a>
+<span class="sourceLineNo">124</span> }<a name="line.124"></a>
+<span class="sourceLineNo">125</span> return this;<a name="line.125"></a>
+<span class="sourceLineNo">126</span> }<a name="line.126"></a>
+<span class="sourceLineNo">127</span><a name="line.127"></a>
+<span class="sourceLineNo">128</span> @Override /* ConfigFile */<a name="line.128"></a>
+<span class="sourceLineNo">129</span> public ConfigFileImpl load() throws IOException {<a name="line.129"></a>
+<span class="sourceLineNo">130</span> Reader r = null;<a name="line.130"></a>
+<span class="sourceLineNo">131</span> if (file != null && file.exists())<a name="line.131"></a>
+<span class="sourceLineNo">132</span> r = new InputStreamReader(new FileInputStream(file), charset);<a name="line.132"></a>
+<span class="sourceLineNo">133</span> else<a name="line.133"></a>
+<span class="sourceLineNo">134</span> r = new StringReader("");<a name="line.134"></a>
+<span class="sourceLineNo">135</span> try {<a name="line.135"></a>
+<span class="sourceLineNo">136</span> load(r);<a name="line.136"></a>
+<span class="sourceLineNo">137</span> } finally {<a name="line.137"></a>
+<span class="sourceLineNo">138</span> r.close();<a name="line.138"></a>
+<span class="sourceLineNo">139</span> }<a name="line.139"></a>
+<span class="sourceLineNo">140</span> return this;<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> @Override /* ConfigFile */<a name="line.143"></a>
+<span class="sourceLineNo">144</span> public ConfigFileImpl load(Reader r) throws IOException {<a name="line.144"></a>
+<span class="sourceLineNo">145</span> assertFieldNotNull(r, "r");<a name="line.145"></a>
+<span class="sourceLineNo">146</span> writeLock();<a name="line.146"></a>
+<span class="sourceLineNo">147</span> try {<a name="line.147"></a>
+<span class="sourceLineNo">148</span> this.sections = Collections.synchronizedMap(new LinkedHashMap<String,Section>());<a name="line.148"></a>
+<span class="sourceLineNo">149</span> BufferedReader in = new BufferedReader(r);<a name="line.149"></a>
+<span class="sourceLineNo">150</span> try {<a name="line.150"></a>
+<span class="sourceLineNo">151</span> writeLock();<a name="line.151"></a>
+<span class="sourceLineNo">152</span> hasBeenModified = false;<a name="line.152"></a>
+<span class="sourceLineNo">153</span> try {<a name="line.153"></a>
+<span class="sourceLineNo">154</span> sections.clear();<a name="line.154"></a>
+<span class="sourceLineNo">155</span> String line = null;<a name="line.155"></a>
+<span class="sourceLineNo">156</span> Section section = getSection(null, true);<a name="line.156"></a>
+<span class="sourceLineNo">157</span> ArrayList<String> lines = new ArrayList<String>();<a name="line.157"></a>
+<span class="sourceLineNo">158</span> boolean canAppend = false;<a name="line.158"></a>
+<span class="sourceLineNo">159</span> while ((line = in.readLine()) != null) {<a name="line.159"></a>
+<span class="sourceLineNo">160</span> if (isSection(line)) {<a name="line.160"></a>
+<span class="sourceLineNo">161</span> section.addLines(null, lines.toArray(new String[lines.size()]));<a name="line.161"></a>
+<span class="sourceLineNo">162</span> lines.clear();<a name="line.162"></a>
+<span class="sourceLineNo">163</span> canAppend = false;<a name="line.163"></a>
+<span class="sourceLineNo">164</span> String sn = StringUtils.replaceUnicodeSequences(line.substring(line.indexOf('[')+1, line.indexOf(']')).trim());<a name="line.164"></a>
+<span class="sourceLineNo">165</span> section = getSection(sn, true).addHeaderComments(section.removeTrailingComments());<a name="line.165"></a>
+<span class="sourceLineNo">166</span> } else {<a name="line.166"></a>
+<span class="sourceLineNo">167</span> char c = line.isEmpty() ? 0 : line.charAt(0);<a name="line.167"></a>
+<span class="sourceLineNo">168</span> if ((c == ' ' || c == '\t') && canAppend && ! (isComment(line) || isAssignment(line)))<a name="line.168"></a>
+<span class="sourceLineNo">169</span> lines.add(lines.remove(lines.size()-1) + '\n' + line.substring(1));<a name="line.169"></a>
+<span class="sourceLineNo">170</span> else {<a name="line.170"></a>
+<span class="sourceLineNo">171</span> lines.add(line);<a name="line.171"></a>
+<span class="sourceLineNo">172</span> if (isAssignment(line))<a name="line.172"></a>
+<span class="sourceLineNo">173</span> canAppend = true;<a name="line.173"></a>
+<span class="sourceLineNo">174</span> else<a name="line.174"></a>
+<span class="sourceLineNo">175</span> canAppend = canAppend && ! (StringUtils.isEmpty(line) || isComment(line));<a name="line.175"></a>
+<span class="sourceLineNo">176</span> }<a name="line.176"></a>
+<span class="sourceLineNo">177</span> }<a name="line.177"></a>
+<span class="sourceLineNo">178</span> }<a name="line.178"></a>
+<span class="sourceLineNo">179</span> section.addLines(null, lines.toArray(new String[lines.size()]));<a name="line.179"></a>
+<span class="sourceLineNo">180</span> in.close();<a name="line.180"></a>
+<span class="sourceLineNo">181</span> if (hasBeenModified) // Set when values need to be encoded.<a name="line.181"></a>
+<span class="sourceLineNo">182</span> save();<a name="line.182"></a>
+<span class="sourceLineNo">183</span> if (file != null)<a name="line.183"></a>
+<span class="sourceLineNo">184</span> modifiedTimestamp = file.lastModified();<a name="line.184"></a>
+<span class="sourceLineNo">185</span> } finally {<a name="line.185"></a>
+<span class="sourceLineNo">186</span> writeUnlock();<a name="line.186"></a>
+<span class="sourceLineNo">187</span> }<a name="line.187"></a>
+<span class="sourceLineNo">188</span> } finally {<a name="line.188"></a>
+<span class="sourceLineNo">189</span> in.close();<a name="line.189"></a>
+<span class="sourceLineNo">190</span> }<a name="line.190"></a>
+<span class="sourceLineNo">191</span> } finally {<a name="line.191"></a>
+<span class="sourceLineNo">192</span> writeUnlock();<a name="line.192"></a>
+<span class="sourceLineNo">193</span> }<a name="line.193"></a>
+<span class="sourceLineNo">194</span> for (ConfigFileListener l : listeners)<a name="line.194"></a>
+<span class="sourceLineNo">195</span> l.onLoad(this);<a name="line.195"></a>
+<span class="sourceLineNo">196</span> return this;<a name="line.196"></a>
+<span class="sourceLineNo">197</span> }<a name="line.197"></a>
+<span class="sourceLineNo">198</span><a name="line.198"></a>
+<span class="sourceLineNo">199</span> @Override /* ConfigFile */<a name="line.199"></a>
+<span class="sourceLineNo">200</span> protected String serialize(Object value) throws SerializeException {<a name="line.200"></a>
+<span class="sourceLineNo">201</span> if (value == null)<a name="line.201"></a>
+<span class="sourceLineNo">202</span> return "";<a name="line.202"></a>
+<span class="sourceLineNo">203</span> Class<?> c = value.getClass();<a name="line.203"></a>
+<span class="sourceLineNo">204</span> if (isSimpleType(c))<a name="line.204"></a>
+<span class="sourceLineNo">205</span> return value.toString();<a name="line.205"></a>
+<span class="sourceLineNo">206</span> String s = serializer.toString(value);<a name="line.206"></a>
+<span class="sourceLineNo">207</span> if (s.startsWith("'"))<a name="line.207"></a>
+<span class="sourceLineNo">208</span> return s.substring(1, s.length()-1);<a name="line.208"></a>
+<span class="sourceLineNo">209</span> return s;<a name="line.209"></a>
+<span class="sourceLineNo">210</span> }<a name="line.210"></a>
+<span class="sourceLineNo">211</span><a name="line.211"></a>
+<span class="sourceLineNo">212</span> @Override /* ConfigFile */<a name="line.212"></a>
+<span class="sourceLineNo">213</span> @SuppressWarnings({ "unchecked" })<a name="line.213"></a>
+<span class="sourceLineNo">214</span> protected <T> T parse(String s, Type type, Type...args) throws ParseException {<a name="line.214"></a>
+<span class="sourceLineNo">215</span><a name="line.215"></a>
+<span class="sourceLineNo">216</span> if (StringUtils.isEmpty(s))<a name="line.216"></a>
+<span class="sourceLineNo">217</span> return null;<a name="line.217"></a>
+<span class="sourceLineNo">218</span><a name="line.218"></a>
+<span class="sourceLineNo">219</span> if (isSimpleType(type))<a name="line.219"></a>
+<span class="sourceLineNo">220</span> return (T)pBeanSession.convertToType(s, (Class<?>)type);<a name="line.220"></a>
+<span class="sourceLineNo">221</span><a name="line.221"></a>
+<span class="sourceLineNo">222</span> char s1 = StringUtils.charAt(s, 0);<a name="line.222"></a>
+<span class="sourceLineNo">223</span> if (s1 != '[' && s1 != '{' && ! "null".equals(s))<a name="line.223"></a>
+<span class="sourceLineNo">224</span> s = '\'' + s + '\'';<a name="line.224"></a>
+<span class="sourceLineNo">225</span><a name="line.225"></a>
+<span class="sourceLineNo">226</span> return parser.parse(s, type, args);<a name="line.226"></a>
+<span class="sourceLineNo">227</span> }<a name="line.227"></a>
+<span class="sourceLineNo">228</span><a name="line.228"></a>
+<span class="sourceLineNo">229</span> private static boolean isSimpleType(Type t) {<a name="line.229"></a>
+<span class="sourceLineNo">230</span> if (! (t instanceof Class))<a name="line.230"></a>
+<span class="sourceLineNo">231</span> return false;<a name="line.231"></a>
+<span class="sourceLineNo">232</span> Class<?> c = (Class<?>)t;<a name="line.232"></a>
+<span class="sourceLineNo">233</span> return (c == String.class || c.isPrimitive() || c.isAssignableFrom(Number.class) || c == Boolean.class || c.isEnum());<a name="line.233"></a>
+<span class="sourceLineNo">234</span> }<a name="line.234"></a>
+<span class="sourceLineNo">235</span><a name="line.235"></a>
+<span class="sourceLineNo">236</span><a name="line.236"></a>
+<span class="sourceLineNo">237</span> //--------------------------------------------------------------------------------<a name="line.237"></a>
+<span class="sourceLineNo">238</span> // Map methods<a name="line.238"></a>
+<span class="sourceLineNo">239</span> //--------------------------------------------------------------------------------<a name="line.239"></a>
+<span class="sourceLineNo">240</span><a name="line.240"></a>
+<span class="sourceLineNo">241</span> @Override /* Map */<a name="line.241"></a>
+<span class="sourceLineNo">242</span> public Section get(Object key) {<a name="line.242"></a>
+<span class="sourceLineNo">243</span> if (StringUtils.isEmpty(key))<a name="line.243"></a>
+<span class="sourceLineNo">244</span> key = DEFAULT;<a name="line.244"></a>
+<span class="sourceLineNo">245</span> readLock();<a name="line.245"></a>
+<span class="sourceLineNo">246</span> try {<a name="line.246"></a>
+<span class="sourceLineNo">247</span> return sections.get(key);<a name="line.247"></a>
+<span class="sourceLineNo">248</span> } finally {<a name="line.248"></a>
+<span class="sourceLineNo">249</span> readUnlock();<a name="line.249"></a>
+<span class="sourceLineNo">250</span> }<a name="line.250"></a>
+<span class="sourceLineNo">251</span> }<a name="line.251"></a>
+<span class="sourceLineNo">252</span><a name="line.252"></a>
+<span class="sourceLineNo">253</span> @Override /* Map */<a name="line.253"></a>
+<span class="sourceLineNo">254</span> public Section put(String key, Section section) {<a name="line.254"></a>
+<span class="sourceLineNo">255</span> Set<String> changes = createChanges();<a name="line.255"></a>
+<span class="sourceLineNo">256</span> Section old = put(key, section, changes);<a name="line.256"></a>
+<span class="sourceLineNo">257</span> signalChanges(changes);<a name="line.257"></a>
+<span class="sourceLineNo">258</span> return old;<a name="line.258"></a>
<span class="sourceLineNo">259</span> }<a name="line.259"></a>
<span class="sourceLineNo">260</span><a name="line.260"></a>
-<span class="sourceLineNo">261</span> @Override /* Map */<a name="line.261"></a>
-<span class="sourceLineNo">262</span> public boolean containsKey(Object key) {<a name="line.262"></a>
-<span class="sourceLineNo">263</span> if (StringUtils.isEmpty(key))<a name="line.263"></a>
-<span class="sourceLineNo">264</span> key = DEFAULT;<a name="line.264"></a>
-<span class="sourceLineNo">265</span> return sections.containsKey(key);<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> @Override /* Map */<a name="line.268"></a>
-<span class="sourceLineNo">269</span> public boolean containsValue(Object value) {<a name="line.269"></a>
-<span class="sourceLineNo">270</span> return sections.containsValue(value);<a name="line.270"></a>
-<span class="sourceLineNo">271</span> }<a name="line.271"></a>
-<span class="sourceLineNo">272</span><a name="line.272"></a>
-<span class="sourceLineNo">273</span> @Override /* Map */<a name="line.273"></a>
-<span class="sourceLineNo">274</span> public Set<Map.Entry<String,Section>> entrySet() {<a name="line.274"></a>
-<span class="sourceLineNo">275</span><a name="line.275"></a>
-<span class="sourceLineNo">276</span> // We need to create our own set so that entries are removed correctly.<a name="line.276"></a>
-<span class="sourceLineNo">277</span> return new AbstractSet<Map.Entry<String,Section>>() {<a name="line.277"></a>
-<span class="sourceLineNo">278</span> @Override /* Map */<a name="line.278"></a>
-<span class="sourceLineNo">279</span> public Iterator<Map.Entry<String,Section>> iterator() {<a name="line.279"></a>
-<span class="sourceLineNo">280</span> return new Iterator<Map.Entry<String,Section>>() {<a name="line.280"></a>
-<span class="sourceLineNo">281</span> Iterator<Map.Entry<String,Section>> i = sections.entrySet().iterator();<a name="line.281"></a>
-<span class="sourceLineNo">282</span> Map.Entry<String,Section> i2;<a name="line.282"></a>
-<span class="sourceLineNo">283</span><a name="line.283"></a>
-<span class="sourceLineNo">284</span> @Override /* Iterator */<a name="line.284"></a>
-<span class="sourceLineNo">285</span> public boolean hasNext() {<a name="line.285"></a>
-<span class="sourceLineNo">286</span> return i.hasNext();<a name="line.286"></a>
-<span class="sourceLineNo">287</span> }<a name="line.287"></a>
-<span class="sourceLineNo">288</span><a name="line.288"></a>
-<span class="sourceLineNo">289</span> @Override /* Iterator */<a name="line.289"></a>
-<span class="sourceLineNo">290</span> public Map.Entry<String,Section> next() {<a name="line.290"></a>
-<span class="sourceLineNo">291</span> i2 = i.next();<a name="line.291"></a>
-<span class="sourceLineNo">292</span> return i2;<a name="line.292"></a>
-<span class="sourceLineNo">293</span> }<a name="line.293"></a>
-<span class="sourceLineNo">294</span><a name="line.294"></a>
-<span class="sourceLineNo">295</span> @Override /* Iterator */<a name="line.295"></a>
-<span class="sourceLineNo">296</span> public void remove() {<a name="line.296"></a>
-<span class="sourceLineNo">297</span> Set<String> changes = createChanges();<a name="line.297"></a>
-<span class="sourceLineNo">298</span> findChanges(changes, i2.getValue(), null);<a name="line.298"></a>
-<span class="sourceLineNo">299</span> i.remove();<a name="line.299"></a>
-<span class="sourceLineNo">300</span> signalChanges(changes);<a name="line.300"></a>
-<span class="sourceLineNo">301</span> }<a name="line.301"></a>
-<span class="sourceLineNo">302</span> };<a name="line.302"></a>
-<span class="sourceLineNo">303</span> }<a name="line.303"></a>
-<span class="sourceLineNo">304</span><a name="line.304"></a>
-<span class="sourceLineNo">305</span> @Override /* Map */<a name="line.305"></a>
-<span class="sourceLineNo">306</span> public int size() {<a name="line.306"></a>
-<span class="sourceLineNo">307</span> return sections.size();<a name="line.307"></a>
-<span class="sourceLineNo">308</span> }<a name="line.308"></a>
-<span class="sourceLineNo">309</span> };<a name="line.309"></a>
-<span class="sourceLineNo">310</span> }<a name="line.310"></a>
-<span class="sourceLineNo">311</span><a name="line.311"></a>
-<span class="sourceLineNo">312</span> @Override /* Map */<a name="line.312"></a>
-<span class="sourceLineNo">313</span> public boolean isEmpty() {<a name="line.313"></a>
-<span class="sourceLineNo">314</span> return sections.isEmpty();<a name="line.314"></a>
-<span class="sourceLineNo">315</span> }<a name="line.315"></a>
-<span class="sourceLineNo">316</span><a name="line.316"></a>
-<span class="sourceLineNo">317</span> @Override /* Map */<a name="line.317"></a>
-<span class="sourceLineNo">318</span> public Set<String> keySet() {<a name="line.318"></a>
-<span class="sourceLineNo">319</span><a name="line.319"></a>
-<span class="sourceLineNo">320</span> // We need to create our own set so that sections are removed correctly.<a name="line.320"></a>
-<span class="sourceLineNo">321</span> return new AbstractSet<String>() {<a name="line.321"></a>
-<span class="sourceLineNo">322</span> @Override /* Set */<a name="line.322"></a>
-<span class="sourceLineNo">323</span> public Iterator<String> iterator() {<a name="line.323"></a>
-<span class="sourceLineNo">324</span> return new Iterator<String>() {<a name="line.324"></a>
-<span class="sourceLineNo">325</span> Iterator<String> i = sections.keySet().iterator();<a name="line.325"></a>
-<span class="sourceLineNo">326</span> String i2;<a name="line.326"></a>
-<span class="sourceLineNo">327</span><a name="line.327"></a>
-<span class="sourceLineNo">328</span> @Override /* Iterator */<a name="line.328"></a>
-<span class="sourceLineNo">329</span> public boolean hasNext() {<a name="line.329"></a>
-<span class="sourceLineNo">330</span> return i.hasNext();<a name="line.330"></a>
-<span class="sourceLineNo">331</span> }<a name="line.331"></a>
-<span class="sourceLineNo">332</span><a name="line.332"></a>
-<span class="sourceLineNo">333</span> @Override /* Iterator */<a name="line.333"></a>
-<span class="sourceLineNo">334</span> public String next() {<a name="line.334"></a>
-<span class="sourceLineNo">335</span> i2 = i.next();<a name="line.335"></a>
-<span class="sourceLineNo">336</span> return i2;<a name="line.336"></a>
-<span class="sourceLineNo">337</span> }<a name="line.337"></a>
-<span class="sourceLineNo">338</span><a name="line.338"></a>
-<span class="sourceLineNo">339</span> @Override /* Iterator */<a name="line.339"></a>
-<span class="sourceLineNo">340</span> public void remove() {<a name="line.340"></a>
-<span class="sourceLineNo">341</span> Set<String> changes = createChanges();<a name="line.341"></a>
-<span class="sourceLineNo">342</span> findChanges(changes, sections.get(i2), null);<a name="line.342"></a>
-<span class="sourceLineNo">343</span> i.remove();<a name="line.343"></a>
-<span class="sourceLineNo">344</span> signalChanges(changes);<a name="line.344"></a>
-<span class="sourceLineNo">345</span> }<a name="line.345"></a>
-<span class="sourceLineNo">346</span> };<a name="line.346"></a>
-<span class="sourceLineNo">347</span> }<a name="line.347"></a>
-<span class="sourceLineNo">348</span><a name="line.348"></a>
-<span class="sourceLineNo">349</span> @Override /* Set */<a name="line.349"></a>
-<span class="sourceLineNo">350</span> public int size() {<a name="line.350"></a>
-<span class="sourceLineNo">351</span> return sections.size();<a name="line.351"></a>
-<span class="sourceLineNo">352</span> }<a name="line.352"></a>
-<span class="sourceLineNo">353</span> };<a name="line.353"></a>
-<span class="sourceLineNo">354</span> }<a name="line.354"></a>
-<span class="sourceLineNo">355</span><a name="line.355"></a>
-<span class="sourceLineNo">356</span> @Override /* Map */<a name="line.356"></a>
-<span class="sourceLineNo">357</span> public int size() {<a name="line.357"></a>
-<span class="sourceLineNo">358</span> return sections.size();<a name="line.358"></a>
-<span class="sourceLineNo">359</span> }<a name="line.359"></a>
-<span class="sourceLineNo">360</span><a name="line.360"></a>
-<span class="sourceLineNo">361</span> @Override /* Map */<a name="line.361"></a>
-<span class="sourceLineNo">362</span> public Collection<Section> values() {<a name="line.362"></a>
-<span class="sourceLineNo">363</span> return new AbstractCollection<Section>() {<a name="line.363"></a>
-<span class="sourceLineNo">364</span> @Override /* Collection */<a name="line.364"></a>
-<span class="sourceLineNo">365</span> public Iterator<Section> iterator() {<a name="line.365"></a>
-<span class="sourceLineNo">366</span> return new Iterator<Section>() {<a name="line.366"></a>
-<span class="sourceLineNo">367</span> Iterator<Section> i = sections.values().iterator();<a name="line.367"></a>
-<span class="sourceLineNo">368</span> Section i2;<a name="line.368"></a>
-<span class="sourceLineNo">369</span><a name="line.369"></a>
-<span class="sourceLineNo">370</span> @Override /* Iterator */<a name="line.370"></a>
-<span class="sourceLineNo">371</span> public boolean hasNext() {<a name="line.371"></a>
-<span class="sourceLineNo">372</span> return i.hasNext();<a name="line.372"></a>
-<span class="sourceLineNo">373</span> }<a name="line.373"></a>
-<span class="sourceLineNo">374</span><a name="line.374"></a>
-<span class="sourceLineNo">375</span> @Override /* Iterator */<a name="line.375"></a>
-<span class="sourceLineNo">376</span> public Section next() {<a name="line.376"></a>
-<span class="sourceLineNo">377</span> i2 = i.next();<a name="line.377"></a>
-<span class="sourceLineNo">378</span> return i2;<a name="line.378"></a>
-<span class="sourceLineNo">379</span> }<a name="line.379"></a>
-<span class="sourceLineNo">380</span><a name="line.380"></a>
-<span class="sourceLineNo">381</span> @Override /* Iterator */<a name="line.381"></a>
-<span class="sourceLineNo">382</span> public void remove() {<a name="line.382"></a>
-<span class="sourceLineNo">383</span> Set<String> changes = createChanges();<a name="line.383"></a>
-<span class="sourceLineNo">384</span> findChanges(changes, i2, null);<a name="line.384"></a>
-<span class="sourceLineNo">385</span> i.remove();<a name="line.385"></a>
-<span class="sourceLineNo">386</span> signalChanges(changes);<a name="line.386"></a>
-<span class="sourceLineNo">387</span> }<a name="line.387"></a>
-<span class="sourceLineNo">388</span> };<a name="line.388"></a>
-<span class="sourceLineNo">389</span> }<a name="line.389"></a>
-<span class="sourceLineNo">390</span> @Override /* Collection */<a name="line.390"></a>
-<span class="sourceLineNo">391</span> public int size() {<a name="line.391"></a>
-<span class="sourceLineNo">392</span> return sections.size();<a name="line.392"></a>
-<span class="sourceLineNo">393</span> }<a name="line.393"></a>
-<span class="sourceLineNo">394</span> };<a name="line.394"></a>
-<span class="sourceLineNo">395</span> }<a name="line.395"></a>
-<span class="sourceLineNo">396</span><a name="line.396"></a>
-<span class="sourceLineNo">397</span> @Override /* Map */<a name="line.397"></a>
-<span class="sourceLineNo">398</span> public Section remove(Object key) {<a name="line.398"></a>
-<span class="sourceLineNo">399</span> Set<String> changes = createChanges();<a name="line.399"></a>
-<span class="sourceLineNo">400</span> Section prev = remove(key, changes);<a name="line.400"></a>
-<span class="sourceLineNo">401</span> signalChanges(changes);<a name="line.401"></a>
-<span class="sourceLineNo">402</span> return prev;<a name="line.402"></a>
-<span class="sourceLineNo">403</span> }<a name="line.403"></a>
-<span class="sourceLineNo">404</span><a name="line.404"></a>
-<span class="sourceLineNo">405</span> private Section remove(Object key, Set<String> changes) {<a name="line.405"></a>
-<span class="sourceLineNo">406</span> writeLock();<a name="line.406"></a>
-<span class="sourceLineNo">407</span> try {<a name="line.407"></a>
-<span class="sourceLineNo">408</span> Section prev = sections.remove(key);<a name="line.408"></a>
-<span class="sourceLineNo">409</span> findChanges(changes, prev, null);<a name="line.409"></a>
-<span class="sourceLineNo">410</span> return prev;<a name="line.410"></a>
-<span class="sourceLineNo">411</span> } finally {<a name="line.411"></a>
-<span class="sourceLineNo">412</span> writeUnlock();<a name="line.412"></a>
-<span class="sourceLineNo">413</span> }<a name="line.413"></a>
-<span class="sourceLineNo">414</span> }<a name="line.414"></a>
-<span class="sourceLineNo">415</span><a name="line.415"></a>
-<span class="sourceLineNo">416</span><a name="line.416"></a>
-<span class="sourceLineNo">417</span> //--------------------------------------------------------------------------------<a name="line.417"></a>
-<span class="sourceLineNo">418</span> // API methods<a name="line.418"></a>
-<span class="sourceLineNo">419</span> //--------------------------------------------------------------------------------<a name="line.419"></a>
+<span class="sourceLineNo">261</span> private Section put(String key, Section section, Set<String> changes) {<a name="line.261"></a>
+<span class="sourceLineNo">262</span> if (StringUtils.isEmpty(key))<a name="line.262"></a>
+<span class="sourceLineNo">263</span> key = DEFAULT;<a name="line.263"></a>
+<span class="sourceLineNo">264</span> writeLock();<a name="line.264"></a>
+<span class="sourceLineNo">265</span> try {<a name="line.265"></a>
+<span class="sourceLineNo">266</span> Section prev = sections.put(key, section);<a name="line.266"></a>
+<span class="sourceLineNo">267</span> findChanges(changes, prev, section);<a name="line.267"></a>
+<span class="sourceLineNo">268</span> return prev;<a name="line.268"></a>
+<span class="sourceLineNo">269</span> } finally {<a name="line.269"></a>
+<span class="sourceLineNo">270</span> writeUnlock();<a name="line.270"></a>
+<span class="sourceLineNo">271</span> }<a name="line.271"></a>
+<span class="sourceLineNo">272</span> }<a name="line.272"></a>
+<span class="sourceLineNo">273</span><a name="line.273"></a>
+<span class="sourceLineNo">274</span> @Override /* Map */<a name="line.274"></a>
+<span class="sourceLineNo">275</span> public void putAll(Map<? extends String,? extends Section> map) {<a name="line.275"></a>
+<span class="sourceLineNo">276</span> Set<String> changes = createChanges();<a name="line.276"></a>
+<span class="sourceLineNo">277</span> writeLock();<a name="line.277"></a>
+<span class="sourceLineNo">278</span> try {<a name="line.278"></a>
+<span class="sourceLineNo">279</span> for (Map.Entry<? extends String,? extends Section> e : map.entrySet())<a name="line.279"></a>
+<span class="sourceLineNo">280</span> put(e.getKey(), e.getValue(), changes);<a name="line.280"></a>
+<span class="sourceLineNo">281</span> } finally {<a name="line.281"></a>
+<span class="sourceLineNo">282</span> writeUnlock();<a name="line.282"></a>
+<span class="sourceLineNo">283</span> }<a name="line.283"></a>
+<span class="sourceLineNo">284</span> signalChanges(changes);<a name="line.284"></a>
+<span class="sourceLineNo">285</span> }<a name="line.285"></a>
+<span class="sourceLineNo">286</span><a name="line.286"></a>
+<span class="sourceLineNo">287</span> @Override /* Map */<a name="line.287"></a>
+<span class="sourceLineNo">288</span> public void clear() {<a name="line.288"></a>
+<span class="sourceLineNo">289</span> Set<String> changes = createChanges();<a name="line.289"></a>
+<span class="sourceLineNo">290</span> writeLock();<a name="line.290"></a>
+<span class="sourceLineNo">291</span> try {<a name="line.291"></a>
+<span class="sourceLineNo">292</span> for (Section s : values())<a name="line.292"></a>
+<span class="sourceLineNo">293</span> findChanges(changes, s, null);<a name="line.293"></a>
+<span class="sourceLineNo">294</span> sections.clear();<a name="line.294"></a>
+<span class="sourceLineNo">295</span> } finally {<a name="line.295"></a>
+<span class="sourceLineNo">296</span> writeUnlock();<a name="line.296"></a>
+<span class="sourceLineNo">297</span> }<a name="line.297"></a>
+<span class="sourceLineNo">298</span> signalChanges(changes);<a name="line.298"></a>
+<span class="sourceLineNo">299</span> }<a name="line.299"></a>
+<span class="sourceLineNo">300</span><a name="line.300"></a>
+<span class="sourceLineNo">301</span> @Override /* Map */<a name="line.301"></a>
+<span class="sourceLineNo">302</span> public boolean containsKey(Object key) {<a name="line.302"></a>
+<span class="sourceLineNo">303</span> if (StringUtils.isEmpty(key))<a name="line.303"></a>
+<span class="sourceLineNo">304</span> key = DEFAULT;<a name="line.304"></a>
+<span class="sourceLineNo">305</span> return sections.containsKey(key);<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">308</span> @Override /* Map */<a name="line.308"></a>
+<span class="sourceLineNo">309</span> public boolean containsValue(Object value) {<a name="line.309"></a>
+<span class="sourceLineNo">310</span> return sections.containsValue(value);<a name="line.310"></a>
+<span class="sourceLineNo">311</span> }<a name="line.311"></a>
+<span class="sourceLineNo">312</span><a name="line.312"></a>
+<span class="sourceLineNo">313</span> @Override /* Map */<a name="line.313"></a>
+<span class="sourceLineNo">314</span> public Set<Map.Entry<String,Section>> entrySet() {<a name="line.314"></a>
+<span class="sourceLineNo">315</span><a name="line.315"></a>
+<span class="sourceLineNo">316</span> // We need to create our own set so that entries are removed correctly.<a name="line.316"></a>
+<span class="sourceLineNo">317</span> return new AbstractSet<Map.Entry<String,Section>>() {<a name="line.317"></a>
+<span class="sourceLineNo">318</span> @Override /* Map */<a name="line.318"></a>
+<span class="sourceLineNo">319</span> public Iterator<Map.Entry<String,Section>> iterator() {<a name="line.319"></a>
+<span class="sourceLineNo">320</span> return new Iterator<Map.Entry<String,Section>>() {<a name="line.320"></a>
+<span class="sourceLineNo">321</span> Iterator<Map.Entry<String,Section>> i = sections.entrySet().iterator();<a name="line.321"></a>
+<span class="sourceLineNo">322</span> Map.Entry<String,Section> i2;<a name="line.322"></a>
+<span class="sourceLineNo">323</span><a name="line.323"></a>
+<span class="sourceLineNo">324</span> @Override /* Iterator */<a name="line.324"></a>
+<span class="sourceLineNo">325</span> public boolean hasNext() {<a name="line.325"></a>
+<span class="sourceLineNo">326</span> return i.hasNext();<a name="line.326"></a>
+<span class="sourceLineNo">327</span> }<a name="line.327"></a>
+<span class="sourceLineNo">328</span><a name="line.328"></a>
+<span class="sourceLineNo">329</span> @Override /* Iterator */<a name="line.329"></a>
+<span class="sourceLineNo">330</span> public Map.Entry<String,Section> next() {<a name="line.330"></a>
+<span class="sourceLineNo">331</span> i2 = i.next();<a name="line.331"></a>
+<span class="sourceLineNo">332</span> return i2;<a name="line.332"></a>
+<span class="sourceLineNo">333</span> }<a name="line.333"></a>
+<span class="sourceLineNo">334</span><a name="line.334"></a>
+<span class="sourceLineNo">335</span> @Override /* Iterator */<a name="line.335"></a>
+<span class="sourceLineNo">336</span> public void remove() {<a name="line.336"></a>
+<span class="sourceLineNo">337</span> Set<String> changes = createChanges();<a name="line.337"></a>
+<span class="sourceLineNo">338</span> findChanges(changes, i2.getValue(), null);<a name="line.338"></a>
+<span class="sourceLineNo">339</span> i.remove();<a name="line.339"></a>
+<span class="sourceLineNo">340</span> signalChanges(changes);<a name="line.340"></a>
+<span class="sourceLineNo">341</span> }<a name="line.341"></a>
+<span class="sourceLineNo">342</span> };<a name="line.342"></a>
+<span class="sourceLineNo">343</span> }<a name="line.343"></a>
+<span class="sourceLineNo">344</span><a name="line.344"></a>
+<span class="sourceLineNo">345</span> @Override /* Map */<a name="line.345"></a>
+<span class="sourceLineNo">346</span> public int size() {<a name="line.346"></a>
+<span class="sourceLineNo">347</span> return sections.size();<a name="line.347"></a>
+<span class="sourceLineNo">348</span> }<a name="line.348"></a>
+<span class="sourceLineNo">349</span> };<a name="line.349"></a>
+<span class="sourceLineNo">350</span> }<a name="line.350"></a>
+<span class="sourceLineNo">351</span><a name="line.351"></a>
+<span class="sourceLineNo">352</span> @Override /* Map */<a name="line.352"></a>
+<span class="sourceLineNo">353</span> public boolean isEmpty() {<a name="line.353"></a>
+<span class="sourceLineNo">354</span> return sections.isEmpty();<a name="line.354"></a>
+<span class="sourceLineNo">355</span> }<a name="line.355"></a>
+<span class="sourceLineNo">356</span><a name="line.356"></a>
+<span class="sourceLineNo">357</span> @Override /* Map */<a name="line.357"></a>
+<span class="sourceLineNo">358</span> public Set<String> keySet() {<a name="line.358"></a>
+<span class="sourceLineNo">359</span><a name="line.359"></a>
+<span class="sourceLineNo">360</span> // We need to create our own set so that sections are removed correctly.<a name="line.360"></a>
+<span class="sourceLineNo">361</span> return new AbstractSet<String>() {<a name="line.361"></a>
+<span class="sourceLineNo">362</span> @Override /* Set */<a name="line.362"></a>
+<span class="sourceLineNo">363</span> public Iterator<String> iterator() {<a name="line.363"></a>
+<span class="sourceLineNo">364</span> return new Iterator<String>() {<a name="line.364"></a>
+<span class="sourceLineNo">365</span> Iterator<String> i = sections.keySet().iterator();<a name="line.365"></a>
+<span class="sourceLineNo">366</span> String i2;<a name="line.366"></a>
+<span class="sourceLineNo">367</span><a name="line.367"></a>
+<span class="sourceLineNo">368</span> @Override /* Iterator */<a name="line.368"></a>
+<span class="sourceLineNo">369</span> public boolean hasNext() {<a name="line.369"></a>
+<span class="sourceLineNo">370</span> return i.hasNext();<a name="line.370"></a>
+<span class="sourceLineNo">371</span> }<a name="line.371"></a>
+<span class="sourceLineNo">372</span><a name="line.372"></a>
+<span class="sourceLineNo">373</span> @Override /* Iterator */<a name="line.373"></a>
+<span class="sourceLineNo">374</span> public String next() {<a name="line.374"></a>
+<span class="sourceLineNo">375</span> i2 = i.next();<a name="line.375"></a>
+<span class="sourceLineNo">376</span> return i2;<a name="line.376"></a>
+<span class="sourceLineNo">377</span> }<a name="line.377"></a>
+<span class="sourceLineNo">378</span><a name="line.378"></a>
+<span class="sourceLineNo">379</span> @Override /* Iterator */<a name="line.379"></a>
+<span class="sourceLineNo">380</span> public void remove() {<a name="line.380"></a>
+<span class="sourceLineNo">381</span> Set<String> changes = createChanges();<a name="line.381"></a>
+<span class="sourceLineNo">382</span> findChanges(changes, sections.get(i2), null);<a name="line.382"></a>
+<span class="sourceLineNo">383</span> i.remove();<a name="line.383"></a>
+<span class="sourceLineNo">384</span> signalChanges(changes);<a name="line.384"></a>
+<span class="sourceLineNo">385</span> }<a name="line.385"></a>
+<span class="sourceLineNo">386</span> };<a name="line.386"></a>
+<span class="sourceLineNo">387</span> }<a name="line.387"></a>
+<span class="sourceLineNo">388</span><a name="line.388"></a>
+<span class="sourceLineNo">389</span> @Override /* Set */<a name="line.389"></a>
+<span class="sourceLineNo">390</span> public int size() {<a name="line.390"></a>
+<span class="sourceLineNo">391</span> return sections.size();<a name="line.391"></a>
+<span class="sourceLineNo">392</span> }<a name="line.392"></a>
+<span class="sourceLineNo">393</span> };<a name="line.393"></a>
+<span class="sourceLineNo">394</span> }<a name="line.394"></a>
+<span class="sourceLineNo">395</span><a name="line.395"></a>
+<span class="sourceLineNo">396</span> @Override /* Map */<a name="line.396"></a>
+<span class="sourceLineNo">397</span> public int size() {<a name="line.397"></a>
+<span class="sourceLineNo">398</span> return sections.size();<a name="line.398"></a>
+<span class="sourceLineNo">399</span> }<a name="line.399"></a>
+<span class="sourceLineNo">400</span><a name="line.400"></a>
+<span class="sourceLineNo">401</span> @Override /* Map */<a name="line.401"></a>
+<span class="sourceLineNo">402</span> public Collection<Section> values() {<a name="line.402"></a>
+<span class="sourceLineNo">403</span> return new AbstractCollection<Section>() {<a name="line.403"></a>
+<span class="sourceLineNo">404</span> @Override /* Collection */<a name="line.404"></a>
+<span class="sourceLineNo">405</span> public Iterator<Section> iterator() {<a name="line.405"></a>
+<span class="sourceLineNo">406</span> return new Iterator<Section>() {<a name="line.406"></a>
+<span class="sourceLineNo">407</span> Iterator<Section> i = sections.values().iterator();<a name="line.407"></a>
+<span class="sourceLineNo">408</span> Section i2;<a name="line.408"></a>
+<span class="sourceLineNo">409</span><a name="line.409"></a>
+<span class="sourceLineNo">410</span> @Override /* Iterator */<a name="line.410"></a>
+<span class="sourceLineNo">411</span> public boolean hasNext() {<a name="line.411"></a>
+<span class="sourceLineNo">412</span> return i.hasNext();<a name="line.412"></a>
+<span class="sourceLineNo">413</span> }<a name="line.413"></a>
+<span class="sourceLineNo">414</span><a name="line.414"></a>
+<span class="sourceLineNo">415</span> @Override /* Iterator */<a name="line.415"></a>
+<span class="sourceLineNo">416</span> public Section next() {<a name="line.416"></a>
+<span class="sourceLineNo">417</span> i2 = i.next();<a name="line.417"></a>
+<span class="sourceLineNo">418</span> return i2;<a name="line.418"></a>
+<span class="sourceLineNo">419</span> }<a name="line.419"></a>
<span class="sourceLineNo">420</span><a name="line.420"></a>
-<span class="sourceLineNo">421</span> @Override /* ConfigFile */<a name="line.421"></a>
-<span class="sourceLineNo">422</span> public String get(String sectionName, String sectionKey) {<a name="line.422"></a>
-<span class="sourceLineNo">423</span> assertFieldNotNull(sectionKey, "sectionKey");<a name="line.423"></a>
-<span class="sourceLineNo">424</span> Section s = get(sectionName);<a name="line.424"></a>
-<span class="sourceLineNo">425</span> if (s == null)<a name="line.425"></a>
-<span class="sourceLineNo">426</span> return null;<a name="line.426"></a>
-<span class="sourceLineNo">427</span> Object s2 = s.get(sectionKey);<a name="line.427"></a>
-<span class="sourceLineNo">428</span> return (s2 == null ? null : s2.toString());<a name="line.428"></a>
-<span class="sourceLineNo">429</span> }<a name="line.429"></a>
-<span class="sourceLineNo">430</span><a name="line.430"></a>
-<span class="sourceLineNo">431</span> @Override /* ConfigFile */<a name="line.431"></a>
-<span class="sourceLineNo">432</span> public String put(String sectionName, String sectionKey, Object value, boolean encoded) {<a name="line.432"></a>
-<span class="sourceLineNo">433</span> assertFieldNotNull(sectionKey, "sectionKey");<a name="line.433"></a>
-<span class="sourceLineNo">434</span> Section s = getSection(sectionName, true);<a name="line.434"></a>
-<span class="sourceLineNo">435</span> return s.put(sectionKey, value.toString(), encoded);<a name="line.435"></a>
-<span class="sourceLineNo">436</span> }<a name="line.436"></a>
-<span class="sourceLineNo">437</span><a name="line.437"></a>
-<span class="sourceLineNo">438</span> @Override /* ConfigFile */<a name="line.438"></a>
-<span class="sourceLineNo">439</span> public String remove(String sectionName, String sectionKey) {<a name="line.439"></a>
-<span class="sourceLineNo">440</span> assertFieldNotNull(sectionKey, "sectionKey");<a name="line.440"></a>
-<span class="sourceLineNo">441</span> Section s = getSection(sectionName, false);<a name="line.441"></a>
-<span class="sourceLineNo">442</span> if (s == null)<a name="line.442"></a>
-<span class="sourceLineNo">443</span> return null;<a name="line.443"></a>
-<span class="sourceLineNo">444</span> return s.remove(sectionKey);<a name="line.444"></a>
-<span class="sourceLineNo">445</span> }<a name="line.445"></a>
-<span class="sourceLineNo">446</span><a name="line.446"></a>
-<span class="sourceLineNo">447</span> @Override /* ConfigFile */<a name="line.447"></a>
-<span class="sourceLineNo">448</span> public ConfigFileImpl addLines(String section, String...lines) {<a name="line.448"></a>
-<span class="sourceLineNo">449</span> Set<String> changes = createChanges();<a name="line.449"></a>
-<span class="sourceLineNo">450</span> writeLock();<a name="line.450"></a>
-<span class="sourceLineNo">451</span> try {<a name="line.451"></a>
-<span class="sourceLineNo">452</span> getSection(section, true).addLines(changes, lines);<a name="line.452"></a>
-<span class="sourceLineNo">453</span> } finally {<a name="line.453"></a>
-<span class="sourceLineNo">454</span> writeUnlock();<a name="line.454"></a>
-<span class="sourceLineNo">455</span> }<a name="line.455"></a>
-<span class="sourceLineNo">456</span> signalChanges(changes);<a name="line.456"></a>
-<span class="sourceLineNo">457</span> return this;<a name="line.457"></a>
-<span class="sourceLineNo">458</span> }<a name="line.458"></a>
-<span class="sourceLineNo">459</span><a name="line.459"></a>
-<span class="sourceLineNo">460</span> @Override /* ConfigFile */<a name="line.460"></a>
-<span class="sourceLineNo">461</span> public ConfigFileImpl addHeaderComments(String section, String...headerComments) {<a name="line.461"></a>
-<span class="sourceLineNo">462</span> writeLock();<a name="line.462"></a>
-<span class="sourceLineNo">463</span> try {<a name="line.463"></a>
-<span class="sourceLineNo">464</span> if (headerComments == null)<a name="line.464"></a>
-<span class="sourceLineNo">465</span> headerComments = new String[0];<a name="line.465"></a>
-<span class="sourceLineNo">466</span> getSection(section, true).addHeaderComments(Arrays.asList(headerComments));<a name="line.466"></a>
-<span class="sourceLineNo">467</span> } finally {<a name="line.467"></a>
-<span class="sourceLineNo">468</span> writeUnlock();<a name="line.468"></a>
-<span class="sourceLineNo">469</span> }<a name="line.469"></a>
-<span class="sourceLineNo">470</span> return this;<a name="line.470"></a>
-<span class="sourceLineNo">471</span> }<a name="line.471"></a>
-<span class="sourceLineNo">472</span><a name="line.472"></a>
-<span class="sourceLineNo">473</span> @Override /* ConfigFile */<a name="line.473"></a>
-<span class="sourceLineNo">474</span> public ConfigFileImpl clearHeaderComments(String section) {<a name="line.474"></a>
-<span class="sourceLineNo">475</span> writeLock();<a name="line.475"></a>
-<span class="sourceLineNo">476</span> try {<a name="line.476"></a>
-<span class="sourceLineNo">477</span> Section s = getSection(section, false);<a name="line.477"></a>
-<span class="sourceLineNo">478</span> if (s != null)<a name="line.478"></a>
-<span class="sourceLineNo">479</span> s.clearHeaderComments();<a name="line.479"></a>
-<span class="sourceLineNo">480</span> } finally {<a name="line.480"></a>
-<span class="sourceLineNo">481</span> writeUnlock();<a name="line.481"></a>
-<span class="sourceLineNo">482</span> }<a name="line.482"></a>
-<span class="sourceLineNo">483</span> return this;<a name="line.483"></a>
-<span class="sourceLineNo">484</span> }<a name="line.484"></a>
-<span class="sourceLineNo">485</span><a name="line.485"></a>
-<span class="sourceLineNo">486</span> @Override /* ConfigFile */<a name="line.486"></a>
-<span class="sourceLineNo">487</span> public Section getSection(String name) {<a name="line.487"></a>
-<span class="sourceLineNo">488</span> return getSection(name, false);<a name="line.488"></a>
-<span class="sourceLineNo">489</span> }<a name="line.489"></a>
-<span class="sourceLineNo">490</span><a name="line.490"></a>
-<span class="sourceLineNo">491</span> @Override /* ConfigFile */<a name="line.491"></a>
-<span class="sourceLineNo">492</span> public Section getSection(String name, boolean create) {<a name="line.492"></a>
-<span class="sourceLineNo">493</span> if (StringUtils.isEmpty(name))<a name="line.493"></a>
-<span class="sourceLineNo">494</span> name = DEFAULT;<a name="line.494"></a>
-<span class="sourceLineNo">495</span> Section s = sections.get(name);<a name="line.495"></a>
-<span class="sourceLineNo">496</span> if (s != null)<a name="line.496"></a>
-<span class="sourceLineNo">497</span> return s;<a name="line.497"></a>
-<span class="sourceLineNo">498</span> if (create) {<a name="line.498"></a>
-<span class="sourceLineNo">499</span> s = new Section().setParent(this).setName(name);<a name="line.499"></a>
-<span class="sourceLineNo">500</span> sections.put(name, s);<a name="line.500"></a>
-<span class="sourceLineNo">501</span> return s;<a name="line.501"></a>
+<span class="sourceLineNo">421</span> @Override /* Iterator */<a name="line.421"></a>
+<span class="sourceLineNo">422</span> public void remove() {<a name="line.422"></a>
+<span class="sourceLineNo">423</span> Set<String> changes = createChanges();<a name="line.423"></a>
+<span class="sourceLineNo">424</span> findChanges(changes, i2, null);<a name="line.424"></a>
+<span class="sourceLineNo">425</span> i.remove();<a name="line.425"></a>
+<span class="sourceLineNo">426</span> signalChanges(changes);<a name="line.426"></a>
+<span class="sourceLineNo">427</span> }<a name="line.427"></a>
+<span class="sourceLineNo">428</span> };<a name="line.428"></a>
+<span class="sourceLineNo">429</span> }<a name="line.429"></a>
+<span class="sourceLineNo">430</span> @Override /* Collection */<a name="line.430"></a>
+<span class="sourceLineNo">431</span> public int size() {<a name="line.431"></a>
+<span class="sourceLineNo">432</span> return sections.size();<a name="line.432"></a>
+<span class="sourceLineNo">433</span> }<a name="line.433"></a>
+<span class="sourceLineNo">434</span> };<a name="line.434"></a>
+<span class="sourceLineNo">435</span> }<a name="line.435"></a>
+<span class="sourceLineNo">436</span><a name="line.436"></a>
+<span class="sourceLineNo">437</span> @Override /* Map */<a name="line.437"></a>
+<span class="sourceLineNo">438</span> public Section remove(Object key) {<a name="line.438"></a>
+<span class="sourceLineNo">439</span> Set<String> changes = createChanges();<a name="line.439"></a>
+<span class="sourceLineNo">440</span> Section prev = remove(key, changes);<a name="line.440"></a>
+<span class="sourceLineNo">441</span> signalChanges(changes);<a name="line.441"></a>
+<span class="sourceLineNo">442</span> return prev;<a name="line.442"></a>
+<span class="sourceLineNo">443</span> }<a name="line.443"></a>
+<span class="sourceLineNo">444</span><a name="line.444"></a>
+<span class="sourceLineNo">445</span> private Section remove(Object key, Set<String> changes) {<a name="line.445"></a>
+<span class="sourceLineNo">446</span> writeLock();<a name="line.446"></a>
+<span class="sourceLineNo">447</span> try {<a name="line.447"></a>
+<span class="sourceLineNo">448</span> Section prev = sections.remove(key);<a name="line.448"></a>
+<span class="sourceLineNo">449</span> findChanges(changes, prev, null);<a name="line.449"></a>
+<span class="sourceLineNo">450</span> return prev;<a name="line.450"></a>
+<span class="sourceLineNo">451</span> } finally {<a name="line.451"></a>
+<span class="sourceLineNo">452</span> writeUnlock();<a name="line.452"></a>
+<span class="sourceLineNo">453</span> }<a name="line.453"></a>
+<span class="sourceLineNo">454</span> }<a name="line.454"></a>
+<span class="sourceLineNo">455</span><a name="line.455"></a>
+<span class="sourceLineNo">456</span><a name="line.456"></a>
+<span class="sourceLineNo">457</span> //--------------------------------------------------------------------------------<a name="line.457"></a>
+<span class="sourceLineNo">458</span> // API methods<a name="line.458"></a>
+<span class="sourceLineNo">459</span> //--------------------------------------------------------------------------------<a name="line.459"></a>
+<span class="sourceLineNo">460</span><a name="line.460"></a>
+<span class="sourceLineNo">461</span> @Override /* ConfigFile */<a name="line.461"></a>
+<span class="sourceLineNo">462</span> public String get(String sectionName, String sectionKey) {<a name="line.462"></a>
+<span class="sourceLineNo">463</span> assertFieldNotNull(sectionKey, "sectionKey");<a name="line.463"></a>
+<span class="sourceLineNo">464</span> Section s = get(sectionName);<a name="line.464"></a>
+<span class="sourceLineNo">465</span> if (s == null)<a name="line.465"></a>
+<span class="sourceLineNo">466</span> return null;<a name="line.466"></a>
+<span class="sourceLineNo">467</span> Object s2 = s.get(sectionKey);<a name="line.467"></a>
+<span class="sourceLineNo">468</span> return (s2 == null ? null : s2.toString());<a name="line.468"></a>
+<span class="sourceLineNo">469</span> }<a name="line.469"></a>
+<span class="sourceLineNo">470</span><a name="line.470"></a>
+<span class="sourceLineNo">471</span> @Override /* ConfigFile */<a name="line.471"></a>
+<span class="sourceLineNo">472</span> public String put(String sectionName, String sectionKey, Object value, boolean encoded) throws SerializeException {<a name="line.472"></a>
+<span class="sourceLineNo">473</span> assertFieldNotNull(sectionKey, "sectionKey");<a name="line.473"></a>
+<span class="sourceLineNo">474</span> Section s = getSection(sectionName, true);<a name="line.474"></a>
+<span class="sourceLineNo">475</span> return s.put(sectionKey, serialize(value), encoded);<a name="line.475"></a>
+<span class="sourceLineNo">476</span> }<a name="line.476"></a>
+<span class="sourceLineNo">477</span><a name="line.477"></a>
+<span class="sourceLineNo">478</span> @Override /* ConfigFile */<a name="line.478"></a>
+<span class="sourceLineNo">479</span> public String put(String sectionName, String sectionKey, String value, boolean encoded) {<a name="line.479"></a>
+<span class="sourceLineNo">480</span> assertFieldNotNull(sectionKey, "sectionKey");<a name="line.480"></a>
+<span class="sourceLineNo">481</span> Section s = getSection(sectionName, true);<a name="line.481"></a>
+<span class="sourceLineNo">482</span> return s.put(sectionKey, value, encoded);<a name="line.482"></a>
+<span class="sourceLineNo">483</span> }<a name="line.483"></a>
+<span class="sourceLineNo">484</span><a name="line.484"></a>
+<span class="sourceLineNo">485</span> @Override /* ConfigFile */<a name="line.485"></a>
+<spa
<TRUNCATED>