juneau-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamesbog...@apache.org
Subject [13/22] incubator-juneau-website git commit: Update javadocs.
Date Sun, 24 Sep 2017 20:08:53 GMT
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/eb2492a5/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 cb2b543..cbdd7a5 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
@@ -253,580 +253,589 @@
 <span class="sourceLineNo">245</span>         return (T)pBeanSession.convertToType(s, (Class&lt;?&gt;)type);<a name="line.245"></a>
 <span class="sourceLineNo">246</span><a name="line.246"></a>
 <span class="sourceLineNo">247</span>      char s1 = firstNonWhitespaceChar(s);<a name="line.247"></a>
-<span class="sourceLineNo">248</span>      if (s1 != '[' &amp;&amp; s1 != '{' &amp;&amp; ! "null".equals(s))<a name="line.248"></a>
-<span class="sourceLineNo">249</span>         s = '\'' + s + '\'';<a name="line.249"></a>
-<span class="sourceLineNo">250</span><a name="line.250"></a>
-<span class="sourceLineNo">251</span>      if (parser == null)<a name="line.251"></a>
-<span class="sourceLineNo">252</span>         parser = this.parser;<a name="line.252"></a>
-<span class="sourceLineNo">253</span><a name="line.253"></a>
-<span class="sourceLineNo">254</span>      return parser.parse(s, type, args);<a name="line.254"></a>
-<span class="sourceLineNo">255</span>   }<a name="line.255"></a>
-<span class="sourceLineNo">256</span><a name="line.256"></a>
-<span class="sourceLineNo">257</span>   private static boolean isSimpleType(Type t) {<a name="line.257"></a>
-<span class="sourceLineNo">258</span>      if (! (t instanceof Class))<a name="line.258"></a>
-<span class="sourceLineNo">259</span>         return false;<a name="line.259"></a>
-<span class="sourceLineNo">260</span>      Class&lt;?&gt; c = (Class&lt;?&gt;)t;<a name="line.260"></a>
-<span class="sourceLineNo">261</span>      return (c == String.class || c.isPrimitive() || c.isAssignableFrom(Number.class) || c == Boolean.class || c.isEnum());<a name="line.261"></a>
-<span class="sourceLineNo">262</span>   }<a name="line.262"></a>
-<span class="sourceLineNo">263</span><a name="line.263"></a>
-<span class="sourceLineNo">264</span><a name="line.264"></a>
-<span class="sourceLineNo">265</span>   //--------------------------------------------------------------------------------<a name="line.265"></a>
-<span class="sourceLineNo">266</span>   // Map methods<a name="line.266"></a>
-<span class="sourceLineNo">267</span>   //--------------------------------------------------------------------------------<a name="line.267"></a>
-<span class="sourceLineNo">268</span><a name="line.268"></a>
-<span class="sourceLineNo">269</span>   @Override /* Map */<a name="line.269"></a>
-<span class="sourceLineNo">270</span>   public Section get(Object key) {<a name="line.270"></a>
-<span class="sourceLineNo">271</span>      if (StringUtils.isEmpty(key))<a name="line.271"></a>
-<span class="sourceLineNo">272</span>         key = DEFAULT;<a name="line.272"></a>
-<span class="sourceLineNo">273</span>      readLock();<a name="line.273"></a>
-<span class="sourceLineNo">274</span>      try {<a name="line.274"></a>
-<span class="sourceLineNo">275</span>         return sections.get(key);<a name="line.275"></a>
-<span class="sourceLineNo">276</span>      } finally {<a name="line.276"></a>
-<span class="sourceLineNo">277</span>         readUnlock();<a name="line.277"></a>
-<span class="sourceLineNo">278</span>      }<a name="line.278"></a>
-<span class="sourceLineNo">279</span>   }<a name="line.279"></a>
-<span class="sourceLineNo">280</span><a name="line.280"></a>
-<span class="sourceLineNo">281</span>   @Override /* Map */<a name="line.281"></a>
-<span class="sourceLineNo">282</span>   public Section put(String key, Section section) {<a name="line.282"></a>
-<span class="sourceLineNo">283</span>      Set&lt;String&gt; changes = createChanges();<a name="line.283"></a>
-<span class="sourceLineNo">284</span>      Section old = put(key, section, changes);<a name="line.284"></a>
-<span class="sourceLineNo">285</span>      signalChanges(changes);<a name="line.285"></a>
-<span class="sourceLineNo">286</span>      return old;<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>   private Section put(String key, Section section, Set&lt;String&gt; changes) {<a name="line.289"></a>
-<span class="sourceLineNo">290</span>      if (StringUtils.isEmpty(key))<a name="line.290"></a>
-<span class="sourceLineNo">291</span>         key = DEFAULT;<a name="line.291"></a>
-<span class="sourceLineNo">292</span>      writeLock();<a name="line.292"></a>
-<span class="sourceLineNo">293</span>      try {<a name="line.293"></a>
-<span class="sourceLineNo">294</span>         Section prev = sections.put(key, section);<a name="line.294"></a>
-<span class="sourceLineNo">295</span>         findChanges(changes, prev, section);<a name="line.295"></a>
-<span class="sourceLineNo">296</span>         return prev;<a name="line.296"></a>
-<span class="sourceLineNo">297</span>      } finally {<a name="line.297"></a>
-<span class="sourceLineNo">298</span>         writeUnlock();<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><a name="line.301"></a>
-<span class="sourceLineNo">302</span>   @Override /* Map */<a name="line.302"></a>
-<span class="sourceLineNo">303</span>   public void putAll(Map&lt;? extends String,? extends Section&gt; map) {<a name="line.303"></a>
-<span class="sourceLineNo">304</span>      Set&lt;String&gt; changes = createChanges();<a name="line.304"></a>
-<span class="sourceLineNo">305</span>      writeLock();<a name="line.305"></a>
-<span class="sourceLineNo">306</span>      try {<a name="line.306"></a>
-<span class="sourceLineNo">307</span>         for (Map.Entry&lt;? extends String,? extends Section&gt; e : map.entrySet())<a name="line.307"></a>
-<span class="sourceLineNo">308</span>            put(e.getKey(), e.getValue(), changes);<a name="line.308"></a>
-<span class="sourceLineNo">309</span>      } finally {<a name="line.309"></a>
-<span class="sourceLineNo">310</span>         writeUnlock();<a name="line.310"></a>
-<span class="sourceLineNo">311</span>      }<a name="line.311"></a>
-<span class="sourceLineNo">312</span>      signalChanges(changes);<a name="line.312"></a>
-<span class="sourceLineNo">313</span>   }<a name="line.313"></a>
-<span class="sourceLineNo">314</span><a name="line.314"></a>
-<span class="sourceLineNo">315</span>   @Override /* Map */<a name="line.315"></a>
-<span class="sourceLineNo">316</span>   public void clear() {<a name="line.316"></a>
-<span class="sourceLineNo">317</span>      Set&lt;String&gt; changes = createChanges();<a name="line.317"></a>
-<span class="sourceLineNo">318</span>      writeLock();<a name="line.318"></a>
-<span class="sourceLineNo">319</span>      try {<a name="line.319"></a>
-<span class="sourceLineNo">320</span>         for (Section s : values())<a name="line.320"></a>
-<span class="sourceLineNo">321</span>            findChanges(changes, s, null);<a name="line.321"></a>
-<span class="sourceLineNo">322</span>         sections.clear();<a name="line.322"></a>
-<span class="sourceLineNo">323</span>      } finally {<a name="line.323"></a>
-<span class="sourceLineNo">324</span>         writeUnlock();<a name="line.324"></a>
-<span class="sourceLineNo">325</span>      }<a name="line.325"></a>
-<span class="sourceLineNo">326</span>      signalChanges(changes);<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 /* Map */<a name="line.329"></a>
-<span class="sourceLineNo">330</span>   public boolean containsKey(Object key) {<a name="line.330"></a>
-<span class="sourceLineNo">331</span>      if (StringUtils.isEmpty(key))<a name="line.331"></a>
-<span class="sourceLineNo">332</span>         key = DEFAULT;<a name="line.332"></a>
-<span class="sourceLineNo">333</span>      return sections.containsKey(key);<a name="line.333"></a>
-<span class="sourceLineNo">334</span>   }<a name="line.334"></a>
-<span class="sourceLineNo">335</span><a name="line.335"></a>
-<span class="sourceLineNo">336</span>   @Override /* Map */<a name="line.336"></a>
-<span class="sourceLineNo">337</span>   public boolean containsValue(Object value) {<a name="line.337"></a>
-<span class="sourceLineNo">338</span>      return sections.containsValue(value);<a name="line.338"></a>
-<span class="sourceLineNo">339</span>   }<a name="line.339"></a>
-<span class="sourceLineNo">340</span><a name="line.340"></a>
-<span class="sourceLineNo">341</span>   @Override /* Map */<a name="line.341"></a>
-<span class="sourceLineNo">342</span>   public Set&lt;Map.Entry&lt;String,Section&gt;&gt; entrySet() {<a name="line.342"></a>
-<span class="sourceLineNo">343</span><a name="line.343"></a>
-<span class="sourceLineNo">344</span>      // We need to create our own set so that entries are removed correctly.<a name="line.344"></a>
-<span class="sourceLineNo">345</span>      return new AbstractSet&lt;Map.Entry&lt;String,Section&gt;&gt;() {<a name="line.345"></a>
-<span class="sourceLineNo">346</span>         @Override /* Map */<a name="line.346"></a>
-<span class="sourceLineNo">347</span>         public Iterator&lt;Map.Entry&lt;String,Section&gt;&gt; iterator() {<a name="line.347"></a>
-<span class="sourceLineNo">348</span>            return new Iterator&lt;Map.Entry&lt;String,Section&gt;&gt;() {<a name="line.348"></a>
-<span class="sourceLineNo">349</span>               Iterator&lt;Map.Entry&lt;String,Section&gt;&gt; i = sections.entrySet().iterator();<a name="line.349"></a>
-<span class="sourceLineNo">350</span>               Map.Entry&lt;String,Section&gt; i2;<a name="line.350"></a>
-<span class="sourceLineNo">351</span><a name="line.351"></a>
-<span class="sourceLineNo">352</span>               @Override /* Iterator */<a name="line.352"></a>
-<span class="sourceLineNo">353</span>               public boolean hasNext() {<a name="line.353"></a>
-<span class="sourceLineNo">354</span>                  return i.hasNext();<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 /* Iterator */<a name="line.357"></a>
-<span class="sourceLineNo">358</span>               public Map.Entry&lt;String,Section&gt; next() {<a name="line.358"></a>
-<span class="sourceLineNo">359</span>                  i2 = i.next();<a name="line.359"></a>
-<span class="sourceLineNo">360</span>                  return i2;<a name="line.360"></a>
-<span class="sourceLineNo">361</span>               }<a name="line.361"></a>
-<span class="sourceLineNo">362</span><a name="line.362"></a>
-<span class="sourceLineNo">363</span>               @Override /* Iterator */<a name="line.363"></a>
-<span class="sourceLineNo">364</span>               public void remove() {<a name="line.364"></a>
-<span class="sourceLineNo">365</span>                  Set&lt;String&gt; changes = createChanges();<a name="line.365"></a>
-<span class="sourceLineNo">366</span>                  findChanges(changes, i2.getValue(), null);<a name="line.366"></a>
-<span class="sourceLineNo">367</span>                  i.remove();<a name="line.367"></a>
-<span class="sourceLineNo">368</span>                  signalChanges(changes);<a name="line.368"></a>
-<span class="sourceLineNo">369</span>               }<a name="line.369"></a>
-<span class="sourceLineNo">370</span>            };<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 /* Map */<a name="line.373"></a>
-<span class="sourceLineNo">374</span>         public int size() {<a name="line.374"></a>
-<span class="sourceLineNo">375</span>            return sections.size();<a name="line.375"></a>
-<span class="sourceLineNo">376</span>         }<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><a name="line.379"></a>
-<span class="sourceLineNo">380</span>   @Override /* Map */<a name="line.380"></a>
-<span class="sourceLineNo">381</span>   public boolean isEmpty() {<a name="line.381"></a>
-<span class="sourceLineNo">382</span>      return sections.isEmpty();<a name="line.382"></a>
-<span class="sourceLineNo">383</span>   }<a name="line.383"></a>
-<span class="sourceLineNo">384</span><a name="line.384"></a>
-<span class="sourceLineNo">385</span>   @Override /* Map */<a name="line.385"></a>
-<span class="sourceLineNo">386</span>   public Set&lt;String&gt; keySet() {<a name="line.386"></a>
-<span class="sourceLineNo">387</span><a name="line.387"></a>
-<span class="sourceLineNo">388</span>      // We need to create our own set so that sections are removed correctly.<a name="line.388"></a>
-<span class="sourceLineNo">389</span>      return new AbstractSet&lt;String&gt;() {<a name="line.389"></a>
-<span class="sourceLineNo">390</span>         @Override /* Set */<a name="line.390"></a>
-<span class="sourceLineNo">391</span>         public Iterator&lt;String&gt; iterator() {<a name="line.391"></a>
-<span class="sourceLineNo">392</span>            return new Iterator&lt;String&gt;() {<a name="line.392"></a>
-<span class="sourceLineNo">393</span>               Iterator&lt;String&gt; i = sections.keySet().iterator();<a name="line.393"></a>
-<span class="sourceLineNo">394</span>               String i2;<a name="line.394"></a>
-<span class="sourceLineNo">395</span><a name="line.395"></a>
-<span class="sourceLineNo">396</span>               @Override /* Iterator */<a name="line.396"></a>
-<span class="sourceLineNo">397</span>               public boolean hasNext() {<a name="line.397"></a>
-<span class="sourceLineNo">398</span>                  return i.hasNext();<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 /* Iterator */<a name="line.401"></a>
-<span class="sourceLineNo">402</span>               public String next() {<a name="line.402"></a>
-<span class="sourceLineNo">403</span>                  i2 = i.next();<a name="line.403"></a>
-<span class="sourceLineNo">404</span>                  return i2;<a name="line.404"></a>
-<span class="sourceLineNo">405</span>               }<a name="line.405"></a>
-<span class="sourceLineNo">406</span><a name="line.406"></a>
-<span class="sourceLineNo">407</span>               @Override /* Iterator */<a name="line.407"></a>
-<span class="sourceLineNo">408</span>               public void remove() {<a name="line.408"></a>
-<span class="sourceLineNo">409</span>                  Set&lt;String&gt; changes = createChanges();<a name="line.409"></a>
-<span class="sourceLineNo">410</span>                  findChanges(changes, sections.get(i2), null);<a name="line.410"></a>
-<span class="sourceLineNo">411</span>                  i.remove();<a name="line.411"></a>
-<span class="sourceLineNo">412</span>                  signalChanges(changes);<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>         @Override /* Set */<a name="line.417"></a>
-<span class="sourceLineNo">418</span>         public int size() {<a name="line.418"></a>
-<span class="sourceLineNo">419</span>            return sections.size();<a name="line.419"></a>
-<span class="sourceLineNo">420</span>         }<a name="line.420"></a>
-<span class="sourceLineNo">421</span>      };<a name="line.421"></a>
-<span class="sourceLineNo">422</span>   }<a name="line.422"></a>
-<span class="sourceLineNo">423</span><a name="line.423"></a>
-<span class="sourceLineNo">424</span>   @Override /* Map */<a name="line.424"></a>
-<span class="sourceLineNo">425</span>   public int size() {<a name="line.425"></a>
-<span class="sourceLineNo">426</span>      return sections.size();<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>   @Override /* Map */<a name="line.429"></a>
-<span class="sourceLineNo">430</span>   public Collection&lt;Section&gt; values() {<a name="line.430"></a>
-<span class="sourceLineNo">431</span>      return new AbstractCollection&lt;Section&gt;() {<a name="line.431"></a>
-<span class="sourceLineNo">432</span>         @Override /* Collection */<a name="line.432"></a>
-<span class="sourceLineNo">433</span>         public Iterator&lt;Section&gt; iterator() {<a name="line.433"></a>
-<span class="sourceLineNo">434</span>            return new Iterator&lt;Section&gt;() {<a name="line.434"></a>
-<span class="sourceLineNo">435</span>               Iterator&lt;Section&gt; i = sections.values().iterator();<a name="line.435"></a>
-<span class="sourceLineNo">436</span>               Section i2;<a name="line.436"></a>
+<span class="sourceLineNo">248</span>      if (isArray(type) &amp;&amp; s1 != '[')<a name="line.248"></a>
+<span class="sourceLineNo">249</span>         s = '[' + s + ']';<a name="line.249"></a>
+<span class="sourceLineNo">250</span>      else if (s1 != '[' &amp;&amp; s1 != '{' &amp;&amp; ! "null".equals(s))<a name="line.250"></a>
+<span class="sourceLineNo">251</span>         s = '\'' + s + '\'';<a name="line.251"></a>
+<span class="sourceLineNo">252</span><a name="line.252"></a>
+<span class="sourceLineNo">253</span>      if (parser == null)<a name="line.253"></a>
+<span class="sourceLineNo">254</span>         parser = this.parser;<a name="line.254"></a>
+<span class="sourceLineNo">255</span><a name="line.255"></a>
+<span class="sourceLineNo">256</span>      return parser.parse(s, type, args);<a name="line.256"></a>
+<span class="sourceLineNo">257</span>   }<a name="line.257"></a>
+<span class="sourceLineNo">258</span><a name="line.258"></a>
+<span class="sourceLineNo">259</span>   private static boolean isSimpleType(Type t) {<a name="line.259"></a>
+<span class="sourceLineNo">260</span>      if (! (t instanceof Class))<a name="line.260"></a>
+<span class="sourceLineNo">261</span>         return false;<a name="line.261"></a>
+<span class="sourceLineNo">262</span>      Class&lt;?&gt; c = (Class&lt;?&gt;)t;<a name="line.262"></a>
+<span class="sourceLineNo">263</span>      return (c == String.class || c.isPrimitive() || c.isAssignableFrom(Number.class) || c == Boolean.class || c.isEnum());<a name="line.263"></a>
+<span class="sourceLineNo">264</span>   }<a name="line.264"></a>
+<span class="sourceLineNo">265</span><a name="line.265"></a>
+<span class="sourceLineNo">266</span>   private static boolean isArray(Type t) {<a name="line.266"></a>
+<span class="sourceLineNo">267</span>      if (! (t instanceof Class))<a name="line.267"></a>
+<span class="sourceLineNo">268</span>         return false;<a name="line.268"></a>
+<span class="sourceLineNo">269</span>      Class&lt;?&gt; c = (Class&lt;?&gt;)t;<a name="line.269"></a>
+<span class="sourceLineNo">270</span>      return (c.isArray());<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>   //--------------------------------------------------------------------------------<a name="line.274"></a>
+<span class="sourceLineNo">275</span>   // Map methods<a name="line.275"></a>
+<span class="sourceLineNo">276</span>   //--------------------------------------------------------------------------------<a name="line.276"></a>
+<span class="sourceLineNo">277</span><a name="line.277"></a>
+<span class="sourceLineNo">278</span>   @Override /* Map */<a name="line.278"></a>
+<span class="sourceLineNo">279</span>   public Section get(Object key) {<a name="line.279"></a>
+<span class="sourceLineNo">280</span>      if (StringUtils.isEmpty(key))<a name="line.280"></a>
+<span class="sourceLineNo">281</span>         key = DEFAULT;<a name="line.281"></a>
+<span class="sourceLineNo">282</span>      readLock();<a name="line.282"></a>
+<span class="sourceLineNo">283</span>      try {<a name="line.283"></a>
+<span class="sourceLineNo">284</span>         return sections.get(key);<a name="line.284"></a>
+<span class="sourceLineNo">285</span>      } finally {<a name="line.285"></a>
+<span class="sourceLineNo">286</span>         readUnlock();<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><a name="line.289"></a>
+<span class="sourceLineNo">290</span>   @Override /* Map */<a name="line.290"></a>
+<span class="sourceLineNo">291</span>   public Section put(String key, Section section) {<a name="line.291"></a>
+<span class="sourceLineNo">292</span>      Set&lt;String&gt; changes = createChanges();<a name="line.292"></a>
+<span class="sourceLineNo">293</span>      Section old = put(key, section, changes);<a name="line.293"></a>
+<span class="sourceLineNo">294</span>      signalChanges(changes);<a name="line.294"></a>
+<span class="sourceLineNo">295</span>      return old;<a name="line.295"></a>
+<span class="sourceLineNo">296</span>   }<a name="line.296"></a>
+<span class="sourceLineNo">297</span><a name="line.297"></a>
+<span class="sourceLineNo">298</span>   private Section put(String key, Section section, Set&lt;String&gt; changes) {<a name="line.298"></a>
+<span class="sourceLineNo">299</span>      if (StringUtils.isEmpty(key))<a name="line.299"></a>
+<span class="sourceLineNo">300</span>         key = DEFAULT;<a name="line.300"></a>
+<span class="sourceLineNo">301</span>      writeLock();<a name="line.301"></a>
+<span class="sourceLineNo">302</span>      try {<a name="line.302"></a>
+<span class="sourceLineNo">303</span>         Section prev = sections.put(key, section);<a name="line.303"></a>
+<span class="sourceLineNo">304</span>         findChanges(changes, prev, section);<a name="line.304"></a>
+<span class="sourceLineNo">305</span>         return prev;<a name="line.305"></a>
+<span class="sourceLineNo">306</span>      } finally {<a name="line.306"></a>
+<span class="sourceLineNo">307</span>         writeUnlock();<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>   @Override /* Map */<a name="line.311"></a>
+<span class="sourceLineNo">312</span>   public void putAll(Map&lt;? extends String,? extends Section&gt; map) {<a name="line.312"></a>
+<span class="sourceLineNo">313</span>      Set&lt;String&gt; changes = createChanges();<a name="line.313"></a>
+<span class="sourceLineNo">314</span>      writeLock();<a name="line.314"></a>
+<span class="sourceLineNo">315</span>      try {<a name="line.315"></a>
+<span class="sourceLineNo">316</span>         for (Map.Entry&lt;? extends String,? extends Section&gt; e : map.entrySet())<a name="line.316"></a>
+<span class="sourceLineNo">317</span>            put(e.getKey(), e.getValue(), changes);<a name="line.317"></a>
+<span class="sourceLineNo">318</span>      } finally {<a name="line.318"></a>
+<span class="sourceLineNo">319</span>         writeUnlock();<a name="line.319"></a>
+<span class="sourceLineNo">320</span>      }<a name="line.320"></a>
+<span class="sourceLineNo">321</span>      signalChanges(changes);<a name="line.321"></a>
+<span class="sourceLineNo">322</span>   }<a name="line.322"></a>
+<span class="sourceLineNo">323</span><a name="line.323"></a>
+<span class="sourceLineNo">324</span>   @Override /* Map */<a name="line.324"></a>
+<span class="sourceLineNo">325</span>   public void clear() {<a name="line.325"></a>
+<span class="sourceLineNo">326</span>      Set&lt;String&gt; changes = createChanges();<a name="line.326"></a>
+<span class="sourceLineNo">327</span>      writeLock();<a name="line.327"></a>
+<span class="sourceLineNo">328</span>      try {<a name="line.328"></a>
+<span class="sourceLineNo">329</span>         for (Section s : values())<a name="line.329"></a>
+<span class="sourceLineNo">330</span>            findChanges(changes, s, null);<a name="line.330"></a>
+<span class="sourceLineNo">331</span>         sections.clear();<a name="line.331"></a>
+<span class="sourceLineNo">332</span>      } finally {<a name="line.332"></a>
+<span class="sourceLineNo">333</span>         writeUnlock();<a name="line.333"></a>
+<span class="sourceLineNo">334</span>      }<a name="line.334"></a>
+<span class="sourceLineNo">335</span>      signalChanges(changes);<a name="line.335"></a>
+<span class="sourceLineNo">336</span>   }<a name="line.336"></a>
+<span class="sourceLineNo">337</span><a name="line.337"></a>
+<span class="sourceLineNo">338</span>   @Override /* Map */<a name="line.338"></a>
+<span class="sourceLineNo">339</span>   public boolean containsKey(Object key) {<a name="line.339"></a>
+<span class="sourceLineNo">340</span>      if (StringUtils.isEmpty(key))<a name="line.340"></a>
+<span class="sourceLineNo">341</span>         key = DEFAULT;<a name="line.341"></a>
+<span class="sourceLineNo">342</span>      return sections.containsKey(key);<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 boolean containsValue(Object value) {<a name="line.346"></a>
+<span class="sourceLineNo">347</span>      return sections.containsValue(value);<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>   @Override /* Map */<a name="line.350"></a>
+<span class="sourceLineNo">351</span>   public Set&lt;Map.Entry&lt;String,Section&gt;&gt; entrySet() {<a name="line.351"></a>
+<span class="sourceLineNo">352</span><a name="line.352"></a>
+<span class="sourceLineNo">353</span>      // We need to create our own set so that entries are removed correctly.<a name="line.353"></a>
+<span class="sourceLineNo">354</span>      return new AbstractSet&lt;Map.Entry&lt;String,Section&gt;&gt;() {<a name="line.354"></a>
+<span class="sourceLineNo">355</span>         @Override /* Map */<a name="line.355"></a>
+<span class="sourceLineNo">356</span>         public Iterator&lt;Map.Entry&lt;String,Section&gt;&gt; iterator() {<a name="line.356"></a>
+<span class="sourceLineNo">357</span>            return new Iterator&lt;Map.Entry&lt;String,Section&gt;&gt;() {<a name="line.357"></a>
+<span class="sourceLineNo">358</span>               Iterator&lt;Map.Entry&lt;String,Section&gt;&gt; i = sections.entrySet().iterator();<a name="line.358"></a>
+<span class="sourceLineNo">359</span>               Map.Entry&lt;String,Section&gt; i2;<a name="line.359"></a>
+<span class="sourceLineNo">360</span><a name="line.360"></a>
+<span class="sourceLineNo">361</span>               @Override /* Iterator */<a name="line.361"></a>
+<span class="sourceLineNo">362</span>               public boolean hasNext() {<a name="line.362"></a>
+<span class="sourceLineNo">363</span>                  return i.hasNext();<a name="line.363"></a>
+<span class="sourceLineNo">364</span>               }<a name="line.364"></a>
+<span class="sourceLineNo">365</span><a name="line.365"></a>
+<span class="sourceLineNo">366</span>               @Override /* Iterator */<a name="line.366"></a>
+<span class="sourceLineNo">367</span>               public Map.Entry&lt;String,Section&gt; next() {<a name="line.367"></a>
+<span class="sourceLineNo">368</span>                  i2 = i.next();<a name="line.368"></a>
+<span class="sourceLineNo">369</span>                  return i2;<a name="line.369"></a>
+<span class="sourceLineNo">370</span>               }<a name="line.370"></a>
+<span class="sourceLineNo">371</span><a name="line.371"></a>
+<span class="sourceLineNo">372</span>               @Override /* Iterator */<a name="line.372"></a>
+<span class="sourceLineNo">373</span>               public void remove() {<a name="line.373"></a>
+<span class="sourceLineNo">374</span>                  Set&lt;String&gt; changes = createChanges();<a name="line.374"></a>
+<span class="sourceLineNo">375</span>                  findChanges(changes, i2.getValue(), null);<a name="line.375"></a>
+<span class="sourceLineNo">376</span>                  i.remove();<a name="line.376"></a>
+<span class="sourceLineNo">377</span>                  signalChanges(changes);<a name="line.377"></a>
+<span class="sourceLineNo">378</span>               }<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><a name="line.381"></a>
+<span class="sourceLineNo">382</span>         @Override /* Map */<a name="line.382"></a>
+<span class="sourceLineNo">383</span>         public int size() {<a name="line.383"></a>
+<span class="sourceLineNo">384</span>            return sections.size();<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 /* Map */<a name="line.389"></a>
+<span class="sourceLineNo">390</span>   public boolean isEmpty() {<a name="line.390"></a>
+<span class="sourceLineNo">391</span>      return sections.isEmpty();<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>   @Override /* Map */<a name="line.394"></a>
+<span class="sourceLineNo">395</span>   public Set&lt;String&gt; keySet() {<a name="line.395"></a>
+<span class="sourceLineNo">396</span><a name="line.396"></a>
+<span class="sourceLineNo">397</span>      // We need to create our own set so that sections are removed correctly.<a name="line.397"></a>
+<span class="sourceLineNo">398</span>      return new AbstractSet&lt;String&gt;() {<a name="line.398"></a>
+<span class="sourceLineNo">399</span>         @Override /* Set */<a name="line.399"></a>
+<span class="sourceLineNo">400</span>         public Iterator&lt;String&gt; iterator() {<a name="line.400"></a>
+<span class="sourceLineNo">401</span>            return new Iterator&lt;String&gt;() {<a name="line.401"></a>
+<span class="sourceLineNo">402</span>               Iterator&lt;String&gt; i = sections.keySet().iterator();<a name="line.402"></a>
+<span class="sourceLineNo">403</span>               String i2;<a name="line.403"></a>
+<span class="sourceLineNo">404</span><a name="line.404"></a>
+<span class="sourceLineNo">405</span>               @Override /* Iterator */<a name="line.405"></a>
+<span class="sourceLineNo">406</span>               public boolean hasNext() {<a name="line.406"></a>
+<span class="sourceLineNo">407</span>                  return i.hasNext();<a name="line.407"></a>
+<span class="sourceLineNo">408</span>               }<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 String next() {<a name="line.411"></a>
+<span class="sourceLineNo">412</span>                  i2 = i.next();<a name="line.412"></a>
+<span class="sourceLineNo">413</span>                  return i2;<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>               @Override /* Iterator */<a name="line.416"></a>
+<span class="sourceLineNo">417</span>               public void remove() {<a name="line.417"></a>
+<span class="sourceLineNo">418</span>                  Set&lt;String&gt; changes = createChanges();<a name="line.418"></a>
+<span class="sourceLineNo">419</span>                  findChanges(changes, sections.get(i2), null);<a name="line.419"></a>
+<span class="sourceLineNo">420</span>                  i.remove();<a name="line.420"></a>
+<span class="sourceLineNo">421</span>                  signalChanges(changes);<a name="line.421"></a>
+<span class="sourceLineNo">422</span>               }<a name="line.422"></a>
+<span class="sourceLineNo">423</span>            };<a name="line.423"></a>
+<span class="sourceLineNo">424</span>         }<a name="line.424"></a>
+<span class="sourceLineNo">425</span><a name="line.425"></a>
+<span class="sourceLineNo">426</span>         @Override /* Set */<a name="line.426"></a>
+<span class="sourceLineNo">427</span>         public int size() {<a name="line.427"></a>
+<span class="sourceLineNo">428</span>            return sections.size();<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>   }<a name="line.431"></a>
+<span class="sourceLineNo">432</span><a name="line.432"></a>
+<span class="sourceLineNo">433</span>   @Override /* Map */<a name="line.433"></a>
+<span class="sourceLineNo">434</span>   public int size() {<a name="line.434"></a>
+<span class="sourceLineNo">435</span>      return sections.size();<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 /* Iterator */<a name="line.438"></a>
-<span class="sourceLineNo">439</span>               public boolean hasNext() {<a name="line.439"></a>
-<span class="sourceLineNo">440</span>                  return i.hasNext();<a name="line.440"></a>
-<span class="sourceLineNo">441</span>               }<a name="line.441"></a>
-<span class="sourceLineNo">442</span><a name="line.442"></a>
-<span class="sourceLineNo">443</span>               @Override /* Iterator */<a name="line.443"></a>
-<span class="sourceLineNo">444</span>               public Section next() {<a name="line.444"></a>
-<span class="sourceLineNo">445</span>                  i2 = i.next();<a name="line.445"></a>
-<span class="sourceLineNo">446</span>                  return i2;<a name="line.446"></a>
-<span class="sourceLineNo">447</span>               }<a name="line.447"></a>
-<span class="sourceLineNo">448</span><a name="line.448"></a>
-<span class="sourceLineNo">449</span>               @Override /* Iterator */<a name="line.449"></a>
-<span class="sourceLineNo">450</span>               public void remove() {<a name="line.450"></a>
-<span class="sourceLineNo">451</span>                  Set&lt;String&gt; changes = createChanges();<a name="line.451"></a>
-<span class="sourceLineNo">452</span>                  findChanges(changes, i2, null);<a name="line.452"></a>
-<span class="sourceLineNo">453</span>                  i.remove();<a name="line.453"></a>
-<span class="sourceLineNo">454</span>                  signalChanges(changes);<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>         @Override /* Collection */<a name="line.458"></a>
-<span class="sourceLineNo">459</span>         public int size() {<a name="line.459"></a>
-<span class="sourceLineNo">460</span>            return sections.size();<a name="line.460"></a>
-<span class="sourceLineNo">461</span>         }<a name="line.461"></a>
-<span class="sourceLineNo">462</span>      };<a name="line.462"></a>
-<span class="sourceLineNo">463</span>   }<a name="line.463"></a>
-<span class="sourceLineNo">464</span><a name="line.464"></a>
-<span class="sourceLineNo">465</span>   @Override /* Map */<a name="line.465"></a>
-<span class="sourceLineNo">466</span>   public Section remove(Object key) {<a name="line.466"></a>
-<span class="sourceLineNo">467</span>      Set&lt;String&gt; changes = createChanges();<a name="line.467"></a>
-<span class="sourceLineNo">468</span>      Section prev = remove(key, changes);<a name="line.468"></a>
-<span class="sourceLineNo">469</span>      signalChanges(changes);<a name="line.469"></a>
-<span class="sourceLineNo">470</span>      return prev;<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>   private Section remove(Object key, Set&lt;String&gt; changes) {<a name="line.473"></a>
-<span class="sourceLineNo">474</span>      writeLock();<a name="line.474"></a>
-<span class="sourceLineNo">475</span>      try {<a name="line.475"></a>
-<span class="sourceLineNo">476</span>         Section prev = sections.remove(key);<a name="line.476"></a>
-<span class="sourceLineNo">477</span>         findChanges(changes, prev, null);<a name="line.477"></a>
-<span class="sourceLineNo">478</span>         return prev;<a name="line.478"></a>
-<span class="sourceLineNo">479</span>      } finally {<a name="line.479"></a>
-<span class="sourceLineNo">480</span>         writeUnlock();<a name="line.480"></a>
-<span class="sourceLineNo">481</span>      }<a name="line.481"></a>
-<span class="sourceLineNo">482</span>   }<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>   //--------------------------------------------------------------------------------<a name="line.485"></a>
-<span class="sourceLineNo">486</span>   // API methods<a name="line.486"></a>
-<span class="sourceLineNo">487</span>   //--------------------------------------------------------------------------------<a name="line.487"></a>
-<span class="sourceLineNo">488</span><a name="line.488"></a>
-<span class="sourceLineNo">489</span>   @Override /* ConfigFile */<a name="line.489"></a>
-<span class="sourceLineNo">490</span>   public String get(String sectionName, String sectionKey) {<a name="line.490"></a>
-<span class="sourceLineNo">491</span>      assertFieldNotNull(sectionKey, "sectionKey");<a name="line.491"></a>
-<span class="sourceLineNo">492</span>      Section s = get(sectionName);<a name="line.492"></a>
-<span class="sourceLineNo">493</span>      if (s == null)<a name="line.493"></a>
-<span class="sourceLineNo">494</span>         return null;<a name="line.494"></a>
-<span class="sourceLineNo">495</span>      Object s2 = s.get(sectionKey);<a name="line.495"></a>
-<span class="sourceLineNo">496</span>      return (s2 == null ? null : s2.toString());<a name="line.496"></a>
-<span class="sourceLineNo">497</span>   }<a name="line.497"></a>
-<span class="sourceLineNo">498</span><a name="line.498"></a>
-<span class="sourceLineNo">499</span>   @SuppressWarnings("hiding")<a name="line.499"></a>
-<span class="sourceLineNo">500</span>   @Override /* ConfigFile */<a name="line.500"></a>
-<span class="sourceLineNo">501</span>   public String put(String sectionName, String sectionKey, Object value, Serializer serializer, boolean encoded,<a name="line.501"></a>
-<span class="sourceLineNo">502</span>         boolean newline) throws SerializeException {<a name="line.502"></a>
-<span class="sourceLineNo">503</span>      assertFieldNotNull(sectionKey, "sectionKey");<a name="line.503"></a>
-<span class="sourceLineNo">504</span>      Section s = getSection(sectionName, true);<a name="line.504"></a>
-<span class="sourceLineNo">505</span>      return s.put(sectionKey, serialize(value, serializer, newline), encoded);<a name="line.505"></a>
+<span class="sourceLineNo">438</span>   @Override /* Map */<a name="line.438"></a>
+<span class="sourceLineNo">439</span>   public Collection&lt;Section&gt; values() {<a name="line.439"></a>
+<span class="sourceLineNo">440</span>      return new AbstractCollection&lt;Section&gt;() {<a name="line.440"></a>
+<span class="sourceLineNo">441</span>         @Override /* Collection */<a name="line.441"></a>
+<span class="sourceLineNo">442</span>         public Iterator&lt;Section&gt; iterator() {<a name="line.442"></a>
+<span class="sourceLineNo">443</span>            return new Iterator&lt;Section&gt;() {<a name="line.443"></a>
+<span class="sourceLineNo">444</span>               Iterator&lt;Section&gt; i = sections.values().iterator();<a name="line.444"></a>
+<span class="sourceLineNo">445</span>               Section i2;<a name="line.445"></a>
+<span class="sourceLineNo">446</span><a name="line.446"></a>
+<span class="sourceLineNo">447</span>               @Override /* Iterator */<a name="line.447"></a>
+<span class="sourceLineNo">448</span>               public boolean hasNext() {<a name="line.448"></a>
+<span class="sourceLineNo">449</span>                  return i.hasNext();<a name="line.449"></a>
+<span class="sourceLineNo">450</span>               }<a name="line.450"></a>
+<span class="sourceLineNo">451</span><a name="line.451"></a>
+<span class="sourceLineNo">452</span>               @Override /* Iterator */<a name="line.452"></a>
+<span class="sourceLineNo">453</span>               public Section next() {<a name="line.453"></a>
+<span class="sourceLineNo">454</span>                  i2 = i.next();<a name="line.454"></a>
+<span class="sourceLineNo">455</span>                  return i2;<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>               @Override /* Iterator */<a name="line.458"></a>
+<span class="sourceLineNo">459</span>               public void remove() {<a name="line.459"></a>
+<span class="sourceLineNo">460</span>                  Set&lt;String&gt; changes = createChanges();<a name="line.460"></a>
+<span class="sourceLineNo">461</span>                  findChanges(changes, i2, null);<a name="line.461"></a>
+<span class="sourceLineNo">462</span>                  i.remove();<a name="line.462"></a>
+<span class="sourceLineNo">463</span>                  signalChanges(changes);<a name="line.463"></a>
+<span class="sourceLineNo">464</span>               }<a name="line.464"></a>
+<span class="sourceLineNo">465</span>            };<a name="line.465"></a>
+<span class="sourceLineNo">466</span>         }<a name="line.466"></a>
+<span class="sourceLineNo">467</span>         @Override /* Collection */<a name="line.467"></a>
+<span class="sourceLineNo">468</span>         public int size() {<a name="line.468"></a>
+<span class="sourceLineNo">469</span>            return sections.size();<a name="line.469"></a>
+<span class="sourceLineNo">470</span>         }<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><a name="line.473"></a>
+<span class="sourceLineNo">474</span>   @Override /* Map */<a name="line.474"></a>
+<span class="sourceLineNo">475</span>   public Section remove(Object key) {<a name="line.475"></a>
+<span class="sourceLineNo">476</span>      Set&lt;String&gt; changes = createChanges();<a name="line.476"></a>
+<span class="sourceLineNo">477</span>      Section prev = remove(key, changes);<a name="line.477"></a>
+<span class="sourceLineNo">478</span>      signalChanges(changes);<a name="line.478"></a>
+<span class="sourceLineNo">479</span>      return prev;<a name="line.479"></a>
+<span class="sourceLineNo">480</span>   }<a name="line.480"></a>
+<span class="sourceLineNo">481</span><a name="line.481"></a>
+<span class="sourceLineNo">482</span>   private Section remove(Object key, Set&lt;String&gt; changes) {<a name="line.482"></a>
+<span class="sourceLineNo">483</span>      writeLock();<a name="line.483"></a>
+<span class="sourceLineNo">484</span>      try {<a name="line.484"></a>
+<span class="sourceLineNo">485</span>         Section prev = sections.remove(key);<a name="line.485"></a>
+<span class="sourceLineNo">486</span>         findChanges(changes, prev, null);<a name="line.486"></a>
+<span class="sourceLineNo">487</span>         return prev;<a name="line.487"></a>
+<span class="sourceLineNo">488</span>      } finally {<a name="line.488"></a>
+<span class="sourceLineNo">489</span>         writeUnlock();<a name="line.489"></a>
+<span class="sourceLineNo">490</span>      }<a name="line.490"></a>
+<span class="sourceLineNo">491</span>   }<a name="line.491"></a>
+<span class="sourceLineNo">492</span><a name="line.492"></a>
+<span class="sourceLineNo">493</span><a name="line.493"></a>
+<span class="sourceLineNo">494</span>   //--------------------------------------------------------------------------------<a name="line.494"></a>
+<span class="sourceLineNo">495</span>   // API methods<a name="line.495"></a>
+<span class="sourceLineNo">496</span>   //--------------------------------------------------------------------------------<a name="line.496"></a>
+<span class="sourceLineNo">497</span><a name="line.497"></a>
+<span class="sourceLineNo">498</span>   @Override /* ConfigFile */<a name="line.498"></a>
+<span class="sourceLineNo">499</span>   public String get(String sectionName, String sectionKey) {<a name="line.499"></a>
+<span class="sourceLineNo">500</span>      assertFieldNotNull(sectionKey, "sectionKey");<a name="line.500"></a>
+<span class="sourceLineNo">501</span>      Section s = get(sectionName);<a name="line.501"></a>
+<span class="sourceLineNo">502</span>      if (s == null)<a name="line.502"></a>
+<span class="sourceLineNo">503</span>         return null;<a name="line.503"></a>
+<span class="sourceLineNo">504</span>      Object s2 = s.get(sectionKey);<a name="line.504"></a>
+<span class="sourceLineNo">505</span>      return (s2 == null ? null : s2.toString());<a name="line.505"></a>
 <span class="sourceLineNo">506</span>   }<a name="line.506"></a>
 <span class="sourceLineNo">507</span><a name="line.507"></a>
-<span class="sourceLineNo">508</span>   @Override /* ConfigFile */<a name="line.508"></a>
-<span class="sourceLineNo">509</span>   public String put(String sectionName, String sectionKey, String value, boolean encoded) {<a name="line.509"></a>
-<span class="sourceLineNo">510</span>      assertFieldNotNull(sectionKey, "sectionKey");<a name="line.510"></a>
-<span class="sourceLineNo">511</span>      Section s = getSection(sectionName, true);<a name="line.511"></a>
-<span class="sourceLineNo">512</span>      return s.put(sectionKey, value, encoded);<a name="line.512"></a>
-<span class="sourceLineNo">513</span>   }<a name="line.513"></a>
-<span class="sourceLineNo">514</span><a name="line.514"></a>
-<span class="sourceLineNo">515</span>   @Override /* ConfigFile */<a name="line.515"></a>
-<span class="sourceLineNo">516</span>   public String remove(String sectionName, String sectionKey) {<a name="line.516"></a>
-<span class="sourceLineNo">517</span>      assertFieldNotNull(sectionKey, "sectionKey");<a name="line.517"></a>
-<span class="sourceLineNo">518</span>      Section s = getSection(sectionName, false);<a name="line.518"></a>
-<span class="sourceLineNo">519</span>      if (s == null)<a name="line.519"></a>
-<span class="sourceLineNo">520</span>         return null;<a name="line.520"></a>
-<span class="sourceLineNo">521</span>      return s.remove(sectionKey);<a name="line.521"></a>
+<span class="sourceLineNo">508</span>   @SuppressWarnings("hiding")<a name="line.508"></a>
+<span class="sourceLineNo">509</span>   @Override /* ConfigFile */<a name="line.509"></a>
+<span class="sourceLineNo">510</span>   public String put(String sectionName, String sectionKey, Object value, Serializer serializer, boolean encoded,<a name="line.510"></a>
+<span class="sourceLineNo">511</span>         boolean newline) throws SerializeException {<a name="line.511"></a>
+<span class="sourceLineNo">512</span>      assertFieldNotNull(sectionKey, "sectionKey");<a name="line.512"></a>
+<span class="sourceLineNo">513</span>      Section s = getSection(sectionName, true);<a name="line.513"></a>
+<span class="sourceLineNo">514</span>      return s.put(sectionKey, serialize(value, serializer, newline), encoded);<a name="line.514"></a>
+<span class="sourceLineNo">515</span>   }<a name="line.515"></a>
+<span class="sourceLineNo">516</span><a name="line.516"></a>
+<span class="sourceLineNo">517</span>   @Override /* ConfigFile */<a name="line.517"></a>
+<span class="sourceLineNo">518</span>   public String put(String sectionName, String sectionKey, String value, boolean encoded) {<a name="line.518"></a>
+<span class="sourceLineNo">519</span>      assertFieldNotNull(sectionKey, "sectionKey");<a name="line.519"></a>
+<span class="sourceLineNo">520</span>      Section s = getSection(sectionName, true);<a name="line.520"></a>
+<span class="sourceLineNo">521</span>      return s.put(sectionKey, value, encoded);<a name="line.521"></a>
 <span class="sourceLineNo">522</span>   }<a name="line.522"></a>
 <span class="sourceLineNo">523</span><a name="line.523"></a>
 <span class="sourceLineNo">524</span>   @Override /* ConfigFile */<a name="line.524"></a>
-<span class="sourceLineNo">525</span>   public ConfigFileImpl addLines(String section, String...lines) {<a name="line.525"></a>
-<span class="sourceLineNo">526</span>      Set&lt;String&gt; changes = createChanges();<a name="line.526"></a>
-<span class="sourceLineNo">527</span>      writeLock();<a name="line.527"></a>
-<span class="sourceLineNo">528</span>      try {<a name="line.528"></a>
-<span class="sourceLineNo">529</span>         getSection(section, true).addLines(changes, lines);<a name="line.529"></a>
-<span class="sourceLineNo">530</span>      } finally {<a name="line.530"></a>
-<span class="sourceLineNo">531</span>         writeUnlock();<a name="line.531"></a>
-<span class="sourceLineNo">532</span>      }<a name="line.532"></a>
-<span class="sourceLineNo">533</span>      signalChanges(changes);<a name="line.533"></a>
-<span class="sourceLineNo">534</span>      return this;<a name="line.534"></a>
-<span class="sourceLineNo">535</span>   }<a name="line.535"></a>
-<span class="sourceLineNo">536</span><a name="line.536"></a>
-<span class="sourceLineNo">537</span>   @Override /* ConfigFile */<a name="line.537"></a>
-<span class="sourceLineNo">538</span>   public ConfigFileImpl addHeaderComments(String section, String...headerComments) {<a name="line.538"></a>
-<span class="sourceLineNo">539</span>      writeLock();<a name="line.539"></a>
-<span class="sourceLineNo">540</span>      try {<a name="line.540"></a>
-<span class="sourceLineNo">541</span>         if (headerComments == null)<a name="line.541"></a>
-<span class="sourceLineNo">542</span>            headerComments = new String[0];<a name="line.542"></a>
-<span class="sourceLineNo">543</span>         getSection(section, true).addHeaderComments(Arrays.asList(headerComments));<a name="line.543"></a>
-<span class="sourceLineNo">544</span>      } finally {<a name="line.544"></a>
-<span class="sourceLineNo">545</span>         writeUnlock();<a name="line.545"></a>
-<span class="sourceLineNo">546</span>      }<a name="line.546"></a>
-<span class="sourceLineNo">547</span>      return this;<a name="line.547"></a>
-<span class="sourceLineNo">548</span>   }<a name="line.548"></a>
-<span class="sourceLineNo">549</span><a name="line.549"></a>
-<span class="sourceLineNo">550</span>   @Override /* ConfigFile */<a name="line.550"></a>
-<span class="sourceLineNo">551</span>   public ConfigFileImpl clearHeaderComments(String section) {<a name="line.551"></a>
-<span class="sourceLineNo">552</span>      writeLock();<a name="line.552"></a>
-<span class="sourceLineNo">553</span>      try {<a name="line.553"></a>
-<span class="sourceLineNo">554</span>         Section s = getSection(section, false);<a name="line.554"></a>
-<span class="sourceLineNo">555</span>         if (s != null)<a name="line.555"></a>
-<span class="sourceLineNo">556</span>            s.clearHeaderComments();<a name="line.556"></a>
-<span class="sourceLineNo">557</span>      } finally {<a name="line.557"></a>
-<span class="sourceLineNo">558</span>         writeUnlock();<a name="line.558"></a>
-<span class="sourceLineNo">559</span>      }<a name="line.559"></a>
-<span class="sourceLineNo">560</span>      return this;<a name="line.560"></a>
-<span class="sourceLineNo">561</span>   }<a name="line.561"></a>
-<span class="sourceLineNo">562</span><a name="line.562"></a>
-<span class="sourceLineNo">563</span>   @Override /* ConfigFile */<a name="line.563"></a>
-<span class="sourceLineNo">564</span>   public Section getSection(String name) {<a name="line.564"></a>
-<span class="sourceLineNo">565</span>      return getSection(name, false);<a name="line.565"></a>
-<span class="sourceLineNo">566</span>   }<a name="line.566"></a>
-<span class="sourceLineNo">567</span><a name="line.567"></a>
-<span class="sourceLineNo">568</span>   @Override /* ConfigFile */<a name="line.568"></a>
-<span class="sourceLineNo">569</span>   public Section getSection(String name, boolean create) {<a name="line.569"></a>
-<span class="sourceLineNo">570</span>      if (StringUtils.isEmpty(name))<a name="line.570"></a>
-<span class="sourceLineNo">571</span>         name = DEFAULT;<a name="line.571"></a>
-<span class="sourceLineNo">572</span>      Section s = sections.get(name);<a name="line.572"></a>
-<span class="sourceLineNo">573</span>      if (s != null)<a name="line.573"></a>
-<span class="sourceLineNo">574</span>         return s;<a name="line.574"></a>
-<span class="sourceLineNo">575</span>      if (create) {<a name="line.575"></a>
-<span class="sourceLineNo">576</span>         s = new Section().setParent(this).setName(name);<a name="line.576"></a>
-<span class="sourceLineNo">577</span>         sections.put(name, s);<a name="line.577"></a>
-<span class="sourceLineNo">578</span>         return s;<a name="line.578"></a>
-<span class="sourceLineNo">579</span>      }<a name="line.579"></a>
-<span class="sourceLineNo">580</span>      return null;<a name="line.580"></a>
-<span class="sourceLineNo">581</span>   }<a name="line.581"></a>
-<span class="sourceLineNo">582</span><a name="line.582"></a>
-<span class="sourceLineNo">583</span>   @Override /* ConfigFile */<a name="line.583"></a>
-<span class="sourceLineNo">584</span>   public ConfigFileImpl addSection(String name) {<a name="line.584"></a>
-<span class="sourceLineNo">585</span>      writeLock();<a name="line.585"></a>
-<span class="sourceLineNo">586</span>      try {<a name="line.586"></a>
-<span class="sourceLineNo">587</span>         getSection(name, true);<a name="line.587"></a>
-<span class="sourceLineNo">588</span>      } finally {<a name="line.588"></a>
-<span class="sourceLineNo">589</span>         writeUnlock();<a name="line.589"></a>
-<span class="sourceLineNo">590</span>      }<a name="line.590"></a>
-<span class="sourceLineNo">591</span>      return this;<a name="line.591"></a>
-<span class="sourceLineNo">592</span>   }<a name="line.592"></a>
-<span class="sourceLineNo">593</span><a name="line.593"></a>
-<span class="sourceLineNo">594</span>   @Override /* ConfigFile */<a name="line.594"></a>
-<span class="sourceLineNo">595</span>   public ConfigFile setSection(String name, Map&lt;String,String&gt; contents) {<a name="line.595"></a>
-<span class="sourceLineNo">596</span>      writeLock();<a name="line.596"></a>
-<span class="sourceLineNo">597</span>      try {<a name="line.597"></a>
-<span class="sourceLineNo">598</span>         put(name, new Section(contents).setParent(this).setName(name));<a name="line.598"></a>
-<span class="sourceLineNo">599</span>      } finally {<a name="line.599"></a>
-<span class="sourceLineNo">600</span>         writeUnlock();<a name="line.600"></a>
-<span class="sourceLineNo">601</span>      }<a name="line.601"></a>
-<span class="sourceLineNo">602</span>      return this;<a name="line.602"></a>
-<span class="sourceLineNo">603</span>   }<a name="line.603"></a>
-<span class="sourceLineNo">604</span><a name="line.604"></a>
-<span class="sourceLineNo">605</span>   @Override /* ConfigFile */<a name="line.605"></a>
-<span class="sourceLineNo">606</span>   public ConfigFileImpl removeSection(String name) {<a name="line.606"></a>
-<span class="sourceLineNo">607</span>      Set&lt;String&gt; changes = createChanges();<a name="line.607"></a>
-<span class="sourceLineNo">608</span>      writeLock();<a name="line.608"></a>
-<span class="sourceLineNo">609</span>      try {<a name="line.609"></a>
-<span class="sourceLineNo">610</span>         Section prev = sections.remove(name);<a name="line.610"></a>
-<span class="sourceLineNo">611</span>         if (changes != null &amp;&amp; prev != null)<a name="line.611"></a>
-<span class="sourceLineNo">612</span>            findChanges(changes, prev, null);<a name="line.612"></a>
-<span class="sourceLineNo">613</span>      } finally {<a name="line.613"></a>
-<span class="sourceLineNo">614</span>         writeUnlock();<a name="line.614"></a>
-<span class="sourceLineNo">615</span>      }<a name="line.615"></a>
-<span class="sourceLineNo">616</span>      signalChanges(changes);<a name="line.616"></a>
-<span class="sourceLineNo">617</span>      return this;<a name="line.617"></a>
-<span class="sourceLineNo">618</span>   }<a name="line.618"></a>
-<span class="sourceLineNo">619</span><a name="line.619"></a>
-<span class="sourceLineNo">620</span>   @Override /* ConfigFile */<a name="line.620"></a>
-<span class="sourceLineNo">621</span>   public Set&lt;String&gt; getSectionKeys(String sectionName) {<a name="line.621"></a>
-<span class="sourceLineNo">622</span>      Section s = get(sectionName);<a name="line.622"></a>
-<span class="sourceLineNo">623</span>      if (s == null)<a name="line.623"></a>
-<span class="sourceLineNo">624</span>         return null;<a name="line.624"></a>
-<span class="sourceLineNo">625</span>      return s.keySet();<a name="line.625"></a>
-<span class="sourceLineNo">626</span>   }<a name="line.626"></a>
-<span class="sourceLineNo">627</span><a name="line.627"></a>
-<span class="sourceLineNo">628</span>   @Override /* ConfigFile */<a name="line.628"></a>
-<span class="sourceLineNo">629</span>   public boolean isEncoded(String key) {<a name="line.629"></a>
-<span class="sourceLineNo">630</span>      assertFieldNotNull(key, "key");<a name="line.630"></a>
-<span class="sourceLineNo">631</span>      String section = getSectionName(key);<a name="line.631"></a>
-<span class="sourceLineNo">632</span>      Section s = getSection(section, false);<a name="line.632"></a>
-<span class="sourceLineNo">633</span>      if (s == null)<a name="line.633"></a>
-<span class="sourceLineNo">634</span>         return false;<a name="line.634"></a>
-<span class="sourceLineNo">635</span>      return s.isEncoded(getSectionKey(key));<a name="line.635"></a>
-<span class="sourceLineNo">636</span>   }<a name="line.636"></a>
-<span class="sourceLineNo">637</span><a name="line.637"></a>
-<span class="sourceLineNo">638</span>   @Override /* ConfigFile */<a name="line.638"></a>
-<span class="sourceLineNo">639</span>   public ConfigFileImpl save() throws IOException {<a name="line.639"></a>
-<span class="sourceLineNo">640</span>      writeLock();<a name="line.640"></a>
-<span class="sourceLineNo">641</span>      try {<a name="line.641"></a>
-<span class="sourceLineNo">642</span>         if (file == null)<a name="line.642"></a>
-<span class="sourceLineNo">643</span>            throw new UnsupportedOperationException("No backing file specified for config file.");<a name="line.643"></a>
-<span class="sourceLineNo">644</span>         Writer out = new OutputStreamWriter(new FileOutputStream(file), charset);<a name="line.644"></a>
-<span class="sourceLineNo">645</span>         try {<a name="line.645"></a>
-<span class="sourceLineNo">646</span>            serializeTo(out);<a name="line.646"></a>
-<span class="sourceLineNo">647</span>            hasBeenModified = false;<a name="line.647"></a>
-<span class="sourceLineNo">648</span>            modifiedTimestamp = file.lastModified();<a name="line.648"></a>
-<span class="sourceLineNo">649</span>         } finally {<a name="line.649"></a>
-<span class="sourceLineNo">650</span>            out.close();<a name="line.650"></a>
-<span class="sourceLineNo">651</span>         }<a name="line.651"></a>
-<span class="sourceLineNo">652</span>         for (ConfigFileListener l : listeners)<a name="line.652"></a>
-<span class="sourceLineNo">653</span>            l.onSave(this);<a name="line.653"></a>
-<span class="sourceLineNo">654</span>         return this;<a name="line.654"></a>
-<span class="sourceLineNo">655</span>      } finally {<a name="line.655"></a>
-<span class="sourceLineNo">656</span>         writeUnlock();<a name="line.656"></a>
-<span class="sourceLineNo">657</span>      }<a name="line.657"></a>
-<span class="sourceLineNo">658</span>   }<a name="line.658"></a>
-<span class="sourceLineNo">659</span><a name="line.659"></a>
-<span class="sourceLineNo">660</span>   @Override /* ConfigFile */<a name="line.660"></a>
-<span class="sourceLineNo">661</span>   public ConfigFileImpl serializeTo(Writer out, ConfigFileFormat format) throws IOException {<a name="line.661"></a>
-<span class="sourceLineNo">662</span>      readLock();<a name="line.662"></a>
-<span class="sourceLineNo">663</span>      try {<a name="line.663"></a>
-<span class="sourceLineNo">664</span>         PrintWriter pw = (out instanceof PrintWriter ? (PrintWriter)out : new PrintWriter(out));<a name="line.664"></a>
-<span class="sourceLineNo">665</span>         for (Section s : sections.values())<a name="line.665"></a>
-<span class="sourceLineNo">666</span>            s.writeTo(pw, format);<a name="line.666"></a>
-<span class="sourceLineNo">667</span>         pw.flush();<a name="line.667"></a>
-<span class="sourceLineNo">668</span>         pw.close();<a name="line.668"></a>
-<span class="sourceLineNo">669</span>         out.close();<a name="line.669"></a>
-<span class="sourceLineNo">670</span>      } finally {<a name="line.670"></a>
-<span class="sourceLineNo">671</span>         readUnlock();<a name="line.671"></a>
-<span class="sourceLineNo">672</span>      }<a name="line.672"></a>
-<span class="sourceLineNo">673</span>      return this;<a name="line.673"></a>
-<span class="sourceLineNo">674</span>   }<a name="line.674"></a>
-<span class="sourceLineNo">675</span><a name="line.675"></a>
-<span class="sourceLineNo">676</span>   void setHasBeenModified() {<a name="line.676"></a>
-<span class="sourceLineNo">677</span>      hasBeenModified = true;<a name="line.677"></a>
-<span class="sourceLineNo">678</span>   }<a name="line.678"></a>
-<span class="sourceLineNo">679</span><a name="line.679"></a>
-<span class="sourceLineNo">680</span>   @Override /* ConfigFile */<a name="line.680"></a>
-<span class="sourceLineNo">681</span>   public String toString() {<a name="line.681"></a>
-<span class="sourceLineNo">682</span>      try {<a name="line.682"></a>
-<span class="sourceLineNo">683</span>         StringWriter sw = new StringWriter();<a name="line.683"></a>
-<span class="sourceLineNo">684</span>         toWritable().writeTo(sw);<a name="line.684"></a>
-<span class="sourceLineNo">685</span>         return sw.toString();<a name="line.685"></a>
-<span class="sourceLineNo">686</span>      } catch (IOException e) {<a name="line.686"></a>
-<span class="sourceLineNo">687</span>         return e.getLocalizedMessage();<a name="line.687"></a>
-<span class="sourceLineNo">688</span>      }<a name="line.688"></a>
-<span class="sourceLineNo">689</span>   }<a name="line.689"></a>
-<span class="sourceLineNo">690</span><a name="line.690"></a>
-<span class="sourceLineNo">691</span>   @Override /* ConfigFile */<a name="line.691"></a>
-<span class="sourceLineNo">692</span>   public ConfigFile addListener(ConfigFileListener listener) {<a name="line.692"></a>
-<span class="sourceLineNo">693</span>      assertFieldNotNull(listener, "listener");<a name="line.693"></a>
-<span class="sourceLineNo">694</span>      writeLock();<a name="line.694"></a>
-<span class="sourceLineNo">695</span>      try {<a name="line.695"></a>
-<span class="sourceLineNo">696</span>         this.listeners.add(listener);<a name="line.696"></a>
-<span class="sourceLineNo">697</span>         return this;<a name="line.697"></a>
-<span class="sourceLineNo">698</span>      } finally {<a name="line.698"></a>
-<span class="sourceLineNo">699</span>         writeUnlock();<a name="line.699"></a>
-<span class="sourceLineNo">700</span>      }<a name="line.700"></a>
-<span class="sourceLineNo">701</span>   }<a name="line.701"></a>
-<span class="sourceLineNo">702</span><a name="line.702"></a>
-<span class="sourceLineNo">703</span>   List&lt;ConfigFileListener&gt; getListeners() {<a name="line.703"></a>
-<span class="sourceLineNo">704</span>      return listeners;<a name="line.704"></a>
-<span class="sourceLineNo">705</span>   }<a name="line.705"></a>
-<span class="sourceLineNo">706</span><a name="line.706"></a>
-<span class="sourceLineNo">707</span>   @Override /* ConfigFile */<a name="line.707"></a>
-<span class="sourceLineNo">708</span>   public Writable toWritable() {<a name="line.708"></a>
-<span class="sourceLineNo">709</span>      return new ConfigFileWritable(this);<a name="line.709"></a>
+<span class="sourceLineNo">525</span>   public String remove(String sectionName, String sectionKey) {<a name="line.525"></a>
+<span class="sourceLineNo">526</span>      assertFieldNotNull(sectionKey, "sectionKey");<a name="line.526"></a>
+<span class="sourceLineNo">527</span>      Section s = getSection(sectionName, false);<a name="line.527"></a>
+<span class="sourceLineNo">528</span>      if (s == null)<a name="line.528"></a>
+<span class="sourceLineNo">529</span>         return null;<a name="line.529"></a>
+<span class="sourceLineNo">530</span>      return s.remove(sectionKey);<a name="line.530"></a>
+<span class="sourceLineNo">531</span>   }<a name="line.531"></a>
+<span class="sourceLineNo">532</span><a name="line.532"></a>
+<span class="sourceLineNo">533</span>   @Override /* ConfigFile */<a name="line.533"></a>
+<span class="sourceLineNo">534</span>   public ConfigFileImpl addLines(String section, String...lines) {<a name="line.534"></a>
+<span class="sourceLineNo">535</span>      Set&lt;String&gt; changes = createChanges();<a name="line.535"></a>
+<span class="sourceLineNo">536</span>      writeLock();<a name="line.536"></a>
+<span class="sourceLineNo">537</span>      try {<a name="line.537"></a>
+<span class="sourceLineNo">538</span>         getSection(section, true).addLines(changes, lines);<a name="line.538"></a>
+<span class="sourceLineNo">539</span>      } finally {<a name="line.539"></a>
+<span class="sourceLineNo">540</span>         writeUnlock();<a name="line.540"></a>
+<span class="sourceLineNo">541</span>      }<a name="line.541"></a>
+<span class="sourceLineNo">542</span>      signalChanges(changes);<a name="line.542"></a>
+<span class="sourceLineNo">543</span>      return this;<a name="line.543"></a>
+<span class="sourceLineNo">544</span>   }<a name="line.544"></a>
+<span class="sourceLineNo">545</span><a name="line.545"></a>
+<span class="sourceLineNo">546</span>   @Override /* ConfigFile */<a name="line.546"></a>
+<span class="sourceLineNo">547</span>   public ConfigFileImpl addHeaderComments(String section, String...headerComments) {<a name="line.547"></a>
+<span class="sourceLineNo">548</span>      writeLock();<a name="line.548"></a>
+<span class="sourceLineNo">549</span>      try {<a name="line.549"></a>
+<span class="sourceLineNo">550</span>         if (headerComments == null)<a name="line.550"></a>
+<span class="sourceLineNo">551</span>            headerComments = new String[0];<a name="line.551"></a>
+<span class="sourceLineNo">552</span>         getSection(section, true).addHeaderComments(Arrays.asList(headerComments));<a name="line.552"></a>
+<span class="sourceLineNo">553</span>      } finally {<a name="line.553"></a>
+<span class="sourceLineNo">554</span>         writeUnlock();<a name="line.554"></a>
+<span class="sourceLineNo">555</span>      }<a name="line.555"></a>
+<span class="sourceLineNo">556</span>      return this;<a name="line.556"></a>
+<span class="sourceLineNo">557</span>   }<a name="line.557"></a>
+<span class="sourceLineNo">558</span><a name="line.558"></a>
+<span class="sourceLineNo">559</span>   @Override /* ConfigFile */<a name="line.559"></a>
+<span class="sourceLineNo">560</span>   public ConfigFileImpl clearHeaderComments(String section) {<a name="line.560"></a>
+<span class="sourceLineNo">561</span>      writeLock();<a name="line.561"></a>
+<span class="sourceLineNo">562</span>      try {<a name="line.562"></a>
+<span class="sourceLineNo">563</span>         Section s = getSection(section, false);<a name="line.563"></a>
+<span class="sourceLineNo">564</span>         if (s != null)<a name="line.564"></a>
+<span class="sourceLineNo">565</span>            s.clearHeaderComments();<a name="line.565"></a>
+<span class="sourceLineNo">566</span>      } finally {<a name="line.566"></a>
+<span class="sourceLineNo">567</span>         writeUnlock();<a name="line.567"></a>
+<span class="sourceLineNo">568</span>      }<a name="line.568"></a>
+<span class="sourceLineNo">569</span>      return this;<a name="line.569"></a>
+<span class="sourceLineNo">570</span>   }<a name="line.570"></a>
+<span class="sourceLineNo">571</span><a name="line.571"></a>
+<span class="sourceLineNo">572</span>   @Override /* ConfigFile */<a name="line.572"></a>
+<span class="sourceLineNo">573</span>   public Section getSection(String name) {<a name="line.573"></a>
+<span class="sourceLineNo">574</span>      return getSection(name, false);<a name="line.574"></a>
+<span class="sourceLineNo">575</span>   }<a name="line.575"></a>
+<span class="sourceLineNo">576</span><a name="line.576"></a>
+<span class="sourceLineNo">577</span>   @Override /* ConfigFile */<a name="line.577"></a>
+<span class="sourceLineNo">578</span>   public Section getSection(String name, boolean create) {<a name="line.578"></a>
+<span class="sourceLineNo">579</span>      if (StringUtils.isEmpty(name))<a name="line.579"></a>
+<span class="sourceLineNo">580</span>         name = DEFAULT;<a name="line.580"></a>
+<span class="sourceLineNo">581</span>      Section s = sections.get(name);<a name="line.581"></a>
+<span class="sourceLineNo">582</span>      if (s != null)<a name="line.582"></a>
+<span class="sourceLineNo">583</span>         return s;<a name="line.583"></a>
+<span class="sourceLineNo">584</span>      if (create) {<a name="line.584"></a>
+<span class="sourceLineNo">585</span>         s = new Section().setParent(this).setName(name);<a name="line.585"></a>
+<span class="sourceLineNo">586</span>         sections.put(name, s);<a name="line.586"></a>
+<span class="sourceLineNo">587</span>         return s;<a name="line.587"></a>
+<span class="sourceLineNo">588</span>      }<a name="line.588"></a>
+<span class="sourceLineNo">589</span>      return null;<a name="line.589"></a>
+<span class="sourceLineNo">590</span>   }<a name="line.590"></a>
+<span class="sourceLineNo">591</span><a name="line.591"></a>
+<span class="sourceLineNo">592</span>   @Override /* ConfigFile */<a name="line.592"></a>
+<span class="sourceLineNo">593</span>   public ConfigFileImpl addSection(String name) {<a name="line.593"></a>
+<span class="sourceLineNo">594</span>      writeLock();<a name="line.594"></a>
+<span class="sourceLineNo">595</span>      try {<a name="line.595"></a>
+<span class="sourceLineNo">596</span>         getSection(name, true);<a name="line.596"></a>
+<span class="sourceLineNo">597</span>      } finally {<a name="line.597"></a>
+<span class="sourceLineNo">598</span>         writeUnlock();<a name="line.598"></a>
+<span class="sourceLineNo">599</span>      }<a name="line.599"></a>
+<span class="sourceLineNo">600</span>      return this;<a name="line.600"></a>
+<span class="sourceLineNo">601</span>   }<a name="line.601"></a>
+<span class="sourceLineNo">602</span><a name="line.602"></a>
+<span class="sourceLineNo">603</span>   @Override /* ConfigFile */<a name="line.603"></a>
+<span class="sourceLineNo">604</span>   public ConfigFile setSection(String name, Map&lt;String,String&gt; contents) {<a name="line.604"></a>
+<span class="sourceLineNo">605</span>      writeLock();<a name="line.605"></a>
+<span class="sourceLineNo">606</span>      try {<a name="line.606"></a>
+<span class="sourceLineNo">607</span>         put(name, new Section(contents).setParent(this).setName(name));<a name="line.607"></a>
+<span class="sourceLineNo">608</span>      } finally {<a name="line.608"></a>
+<span class="sourceLineNo">609</span>         writeUnlock();<a name="line.609"></a>
+<span class="sourceLineNo">610</span>      }<a name="line.610"></a>
+<span class="sourceLineNo">611</span>      return this;<a name="line.611"></a>
+<span class="sourceLineNo">612</span>   }<a name="line.612"></a>
+<span class="sourceLineNo">613</span><a name="line.613"></a>
+<span class="sourceLineNo">614</span>   @Override /* ConfigFile */<a name="line.614"></a>
+<span class="sourceLineNo">615</span>   public ConfigFileImpl removeSection(String name) {<a name="line.615"></a>
+<span class="sourceLineNo">616</span>      Set&lt;String&gt; changes = createChanges();<a name="line.616"></a>
+<span class="sourceLineNo">617</span>      writeLock();<a name="line.617"></a>
+<span class="sourceLineNo">618</span>      try {<a name="line.618"></a>
+<span class="sourceLineNo">619</span>         Section prev = sections.remove(name);<a name="line.619"></a>
+<span class="sourceLineNo">620</span>         if (changes != null &amp;&amp; prev != null)<a name="line.620"></a>
+<span class="sourceLineNo">621</span>            findChanges(changes, prev, null);<a name="line.621"></a>
+<span class="sourceLineNo">622</span>      } finally {<a name="line.622"></a>
+<span class="sourceLineNo">623</span>         writeUnlock();<a name="line.623"></a>
+<span class="sourceLineNo">624</span>      }<a name="line.624"></a>
+<span class="sourceLineNo">625</span>      signalChanges(changes);<a name="line.625"></a>
+<span class="sourceLineNo">626</span>      return this;<a name="line.626"></a>
+<span class="sourceLineNo">627</span>   }<a name="line.627"></a>
+<span class="sourceLineNo">628</span><a name="line.628"></a>
+<span class="sourceLineNo">629</span>   @Override /* ConfigFile */<a name="line.629"></a>
+<span class="sourceLineNo">630</span>   public Set&lt;String&gt; getSectionKeys(String sectionName) {<a name="line.630"></a>
+<span class="sourceLineNo">631</span>      Section s = get(sectionName);<a name="line.631"></a>
+<span class="sourceLineNo">632</span>      if (s == null)<a name="line.632"></a>
+<span class="sourceLineNo">633</span>         return null;<a name="line.633"></a>
+<span class="sourceLineNo">634</span>      return s.keySet();<a name="line.634"></a>
+<span class="sourceLineNo">635</span>   }<a name="line.635"></a>
+<span class="sourceLineNo">636</span><a name="line.636"></a>
+<span class="sourceLineNo">637</span>   @Override /* ConfigFile */<a name="line.637"></a>
+<span class="sourceLineNo">638</span>   public boolean isEncoded(String key) {<a name="line.638"></a>
+<span class="sourceLineNo">639</span>      assertFieldNotNull(key, "key");<a name="line.639"></a>
+<span class="sourceLineNo">640</span>      String section = getSectionName(key);<a name="line.640"></a>
+<span class="sourceLineNo">641</span>      Section s = getSection(section, false);<a name="line.641"></a>
+<span class="sourceLineNo">642</span>      if (s == null)<a name="line.642"></a>
+<span class="sourceLineNo">643</span>         return false;<a name="line.643"></a>
+<span class="sourceLineNo">644</span>      return s.isEncoded(getSectionKey(key));<a name="line.644"></a>
+<span class="sourceLineNo">645</span>   }<a name="line.645"></a>
+<span class="sourceLineNo">646</span><a name="line.646"></a>
+<span class="sourceLineNo">647</span>   @Override /* ConfigFile */<a name="line.647"></a>
+<span class="sourceLineNo">648</span>   public ConfigFileImpl save() throws IOException {<a name="line.648"></a>
+<span class="sourceLineNo">649</span>      writeLock();<a name="line.649"></a>
+<span class="sourceLineNo">650</span>      try {<a name="line.650"></a>
+<span class="sourceLineNo">651</span>         if (file == null)<a name="line.651"></a>
+<span class="sourceLineNo">652</span>            throw new UnsupportedOperationException("No backing file specified for config file.");<a name="line.652"></a>
+<span class="sourceLineNo">653</span>         Writer out = new OutputStreamWriter(new FileOutputStream(file), charset);<a name="line.653"></a>
+<span class="sourceLineNo">654</span>         try {<a name="line.654"></a>
+<span class="sourceLineNo">655</span>            serializeTo(out);<a name="line.655"></a>
+<span class="sourceLineNo">656</span>            hasBeenModified = false;<a name="line.656"></a>
+<span class="sourceLineNo">657</span>            modifiedTimestamp = file.lastModified();<a name="line.657"></a>
+<span class="sourceLineNo">658</span>         } finally {<a name="line.658"></a>
+<span class="sourceLineNo">659</span>            out.close();<a name="line.659"></a>
+<span class="sourceLineNo">660</span>         }<a name="line.660"></a>
+<span class="sourceLineNo">661</span>         for (ConfigFileListener l : listeners)<a name="line.661"></a>
+<span class="sourceLineNo">662</span>            l.onSave(this);<a name="line.662"></a>
+<span class="sourceLineNo">663</span>         return this;<a name="line.663"></a>
+<span class="sourceLineNo">664</span>      } finally {<a name="line.664"></a>
+<span class="sourceLineNo">665</span>         writeUnlock();<a name="line.665"></a>
+<span class="sourceLineNo">666</span>      }<a name="line.666"></a>
+<span class="sourceLineNo">667</span>   }<a name="line.667"></a>
+<span class="sourceLineNo">668</span><a name="line.668"></a>
+<span class="sourceLineNo">669</span>   @Override /* ConfigFile */<a name="line.669"></a>
+<span class="sourceLineNo">670</span>   public ConfigFileImpl serializeTo(Writer out, ConfigFileFormat format) throws IOException {<a name="line.670"></a>
+<span class="sourceLineNo">671</span>      readLock();<a name="line.671"></a>
+<span class="sourceLineNo">672</span>      try {<a name="line.672"></a>
+<span class="sourceLineNo">673</span>         PrintWriter pw = (out instanceof PrintWriter ? (PrintWriter)out : new PrintWriter(out));<a name="line.673"></a>
+<span class="sourceLineNo">674</span>         for (Section s : sections.values())<a name="line.674"></a>
+<span class="sourceLineNo">675</span>            s.writeTo(pw, format);<a name="line.675"></a>
+<span class="sourceLineNo">676</span>         pw.flush();<a name="line.676"></a>
+<span class="sourceLineNo">677</span>         pw.close();<a name="line.677"></a>
+<span class="sourceLineNo">678</span>         out.close();<a name="line.678"></a>
+<span class="sourceLineNo">679</span>      } finally {<a name="line.679"></a>
+<span class="sourceLineNo">680</span>         readUnlock();<a name="line.680"></a>
+<span class="sourceLineNo">681</span>      }<a name="line.681"></a>
+<span class="sourceLineNo">682</span>      return this;<a name="line.682"></a>
+<span class="sourceLineNo">683</span>   }<a name="line.683"></a>
+<span class="sourceLineNo">684</span><a name="line.684"></a>
+<span class="sourceLineNo">685</span>   void setHasBeenModified() {<a name="line.685"></a>
+<span class="sourceLineNo">686</span>      hasBeenModified = true;<a name="line.686"></a>
+<span class="sourceLineNo">687</span>   }<a name="line.687"></a>
+<span class="sourceLineNo">688</span><a name="line.688"></a>
+<span class="sourceLineNo">689</span>   @Override /* ConfigFile */<a name="line.689"></a>
+<span class="sourceLineNo">690</span>   public String toString() {<a name="line.690"></a>
+<span class="sourceLineNo">691</span>      try {<a name="line.691"></a>
+<span class="sourceLineNo">692</span>         StringWriter sw = new StringWriter();<a name="line.692"></a>
+<span class="sourceLineNo">693</span>         toWritable().writeTo(sw);<a name="line.693"></a>
+<span class="sourceLineNo">694</span>         return sw.toString();<a name="line.694"></a>
+<span class="sourceLineNo">695</span>      } catch (IOException e) {<a name="line.695"></a>
+<span class="sourceLineNo">696</span>         return e.getLocalizedMessage();<a name="line.696"></a>
+<span class="sourceLineNo">697</span>      }<a name="line.697"></a>
+<span class="sourceLineNo">698</span>   }<a name="line.698"></a>
+<span class="sourceLineNo">699</span><a name="line.699"></a>
+<span class="sourceLineNo">700</span>   @Override /* ConfigFile */<a name="line.700"></a>
+<span class="sourceLineNo">701</span>   public ConfigFile addListener(ConfigFileListener listener) {<a name="line.701"></a>
+<span class="sourceLineNo">702</span>      assertFieldNotNull(listener, "listener");<a name="line.702"></a>
+<span class="sourceLineNo">703</span>      writeLock();<a name="line.703"></a>
+<span class="sourceLineNo">704</span>      try {<a name="line.704"></a>
+<span class="sourceLineNo">705</span>         this.listeners.add(listener);<a name="line.705"></a>
+<span class="sourceLineNo">706</span>         return this;<a name="line.706"></a>
+<span class="sourceLineNo">707</span>      } finally {<a name="line.707"></a>
+<span class="sourceLineNo">708</span>         writeUnlock();<a name="line.708"></a>
+<span class="sourceLineNo">709</span>      }<a name="line.709"></a>
 <span class="sourceLineNo">710</span>   }<a name="line.710"></a>
 <span class="sourceLineNo">711</span><a name="line.711"></a>
-<span class="sourceLineNo">712</span>   @Override /* ConfigFile */<a name="line.712"></a>
-<span class="sourceLineNo">713</span>   public ConfigFile merge(ConfigFile cf) {<a name="line.713"></a>
-<span class="sourceLineNo">714</span>      assertFieldNotNull(cf, "cf");<a name="line.714"></a>
-<span class="sourceLineNo">715</span>      Set&lt;String&gt; changes = createChanges();<a name="line.715"></a>
-<span class="sourceLineNo">716</span>      writeLock();<a name="line.716"></a>
-<span class="sourceLineNo">717</span>      try {<a name="line.717"></a>
-<span class="sourceLineNo">718</span>         for (String sectionName : this.keySet())<a name="line.718"></a>
-<span class="sourceLineNo">719</span>            if (! cf.containsKey(sectionName))<a name="line.719"></a>
-<span class="sourceLineNo">720</span>               remove(sectionName, changes);<a name="line.720"></a>
-<span class="sourceLineNo">721</span><a name="line.721"></a>
-<span class="sourceLineNo">722</span>         for (Map.Entry&lt;String,Section&gt; e : cf.entrySet())<a name="line.722"></a>
-<span class="sourceLineNo">723</span>            put(e.getKey(), e.getValue(), changes);<a name="line.723"></a>
-<span class="sourceLineNo">724</span><a name="line.724"></a>
-<span class="sourceLineNo">725</span>      } finally {<a name="line.725"></a>
-<span class="sourceLineNo">726</span>         writeUnlock();<a name="line.726"></a>
-<span class="sourceLineNo">727</span>      }<a name="line.727"></a>
-<span class="sourceLineNo">728</span>      signalChanges(changes);<a name="line.728"></a>
-<span class="sourceLineNo">729</span>      return this;<a name="line.729"></a>
-<span class="sourceLineNo">730</span>   }<a name="line.730"></a>
-<span class="sourceLineNo">731</span><a name="line.731"></a>
-<span class="sourceLineNo">732</span>   Encoder getEncoder() {<a name="line.732"></a>
-<span class="sourceLineNo">733</span>      return encoder;<a name="line.733"></a>
-<span class="sourceLineNo">734</span>   }<a name="line.734"></a>
-<span class="sourceLineNo">735</span><a name="line.735"></a>
-<span class="sourceLineNo">736</span>   @Override /* ConfigFile */<a name="line.736"></a>
-<span class="sourceLineNo">737</span>   protected BeanSession getBeanSession() {<a name="line.737"></a>
-<span class="sourceLineNo">738</span>      return pBeanSession;<a name="line.738"></a>
+<span class="sourceLineNo">712</span>   List&lt;ConfigFileListener&gt; getListeners() {<a name="line.712"></a>
+<span class="sourceLineNo">713</span>      return listeners;<a name="line.713"></a>
+<span class="sourceLineNo">714</span>   }<a name="line.714"></a>
+<span class="sourceLineNo">715</span><a name="line.715"></a>
+<span class="sourceLineNo">716</span>   @Override /* ConfigFile */<a name="line.716"></a>
+<span class="sourceLineNo">717</span>   public Writable toWritable() {<a name="line.717"></a>
+<span class="sourceLineNo">718</span>      return new ConfigFileWritable(this);<a name="line.718"></a>
+<span class="sourceLineNo">719</span>   }<a name="line.719"></a>
+<span class="sourceLineNo">720</span><a name="line.720"></a>
+<span class="sourceLineNo">721</span>   @Override /* ConfigFile */<a name="line.721"></a>
+<span class="sourceLineNo">722</span>   public ConfigFile merge(ConfigFile cf) {<a name="line.722"></a>
+<span class="sourceLineNo">723</span>      assertFieldNotNull(cf, "cf");<a name="line.723"></a>
+<span class="sourceLineNo">724</span>      Set&lt;String&gt; changes = createChanges();<a name="line.724"></a>
+<span class="sourceLineNo">725</span>      writeLock();<a name="line.725"></a>
+<span class="sourceLineNo">726</span>      try {<a name="line.726"></a>
+<span class="sourceLineNo">727</span>         for (String sectionName : this.keySet())<a name="line.727"></a>
+<span class="sourceLineNo">728</span>            if (! cf.containsKey(sectionName))<a name="line.728"></a>
+<span class="sourceLineNo">729</span>               remove(sectionName, changes);<a name="line.729"></a>
+<span class="sourceLineNo">730</span><a name="line.730"></a>
+<span class="sourceLineNo">731</span>         for (Map.Entry&lt;String,Section&gt; e : cf.entrySet())<a name="line.731"></a>
+<span class="sourceLineNo">732</span>            put(e.getKey(), e.getValue(), changes);<a name="line.732"></a>
+<span class="sourceLineNo">733</span><a name="line.733"></a>
+<span class="sourceLineNo">734</span>      } finally {<a name="line.734"></a>
+<span class="sourceLineNo">735</span>         writeUnlock();<a name="line.735"></a>
+<span class="sourceLineNo">736</span>      }<a name="line.736"></a>
+<span class="sourceLineNo">737</span>      signalChanges(changes);<a name="line.737"></a>
+<span class="sourceLineNo">738</span>      return this;<a name="line.738"></a>
 <span class="sourceLineNo">739</span>   }<a name="line.739"></a>
 <span class="sourceLineNo">740</span><a name="line.740"></a>
-<span class="sourceLineNo">741</span>   @Override /* ConfigFile */<a name="line.741"></a>
-<span class="sourceLineNo">742</span>   protected void readLock() {<a name="line.742"></a>
-<span class="sourceLineNo">743</span>      lock.readLock().lock();<a name="line.743"></a>
-<span class="sourceLineNo">744</span>   }<a name="line.744"></a>
-<span class="sourceLineNo">745</span><a name="line.745"></a>
-<span class="sourceLineNo">746</span>   @Override /* ConfigFile */<a name="line.746"></a>
-<span class="sourceLineNo">747</span>   protected void readUnlock() {<a name="line.747"></a>
-<span class="sourceLineNo">748</span>      lock.readLock().unlock();<a name="line.748"></a>
-<span class="sourceLineNo">749</span>   }<a name="line.749"></a>
-<span class="sourceLineNo">750</span><a name="line.750"></a>
-<span class="sourceLineNo">751</span>   private void writeLock() {<a name="line.751"></a>
-<span class="sourceLineNo">752</span>      if (readOnly)<a name="line.752"></a>
-<span class="sourceLineNo">753</span>         throw new UnsupportedOperationException("Cannot modify read-only ConfigFile.");<a name="line.753"></a>
-<span class="sourceLineNo">754</span>      lock.writeLock().lock();<a name="line.754"></a>
-

<TRUNCATED>


Mime
View raw message