Modified:
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.html
==============================================================================
---
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.html
(original)
+++
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.html
Thu Feb 11 22:36:31 2016
@@ -46,7 +46,7 @@
<a class="jxr_linenumber" name="L38" href="#L38">38</a> <em
class="jxr_javadoccomment"> *</em>
<a class="jxr_linenumber" name="L39" href="#L39">39</a> <em
class="jxr_javadoccomment"> * @author <a href="<a
href="mailto:[email protected]";
target="alexandria_uri">mailto:[email protected]</a>">Brett
Porter</a></em>
<a class="jxr_linenumber" name="L40" href="#L40">40</a> <em
class="jxr_javadoccomment"> * @author <a href="<a
href="mailto:[email protected]";
target="alexandria_uri">mailto:[email protected]</a>">Henning P.
Schmiedehausen</a></em>
-<a class="jxr_linenumber" name="L41" href="#L41">41</a> <em
class="jxr_javadoccomment"> * @version $Id:
DefaultDecorationModelInheritanceAssembler.java 1728890 2016-02-06 22:26:15Z
hboutemy $</em>
+<a class="jxr_linenumber" name="L41" href="#L41">41</a> <em
class="jxr_javadoccomment"> * @version $Id:
DefaultDecorationModelInheritanceAssembler.java 1729881 2016-02-11 19:33:03Z
michaelo $</em>
<a class="jxr_linenumber" name="L42" href="#L42">42</a> <em
class="jxr_javadoccomment"> */</em>
<a class="jxr_linenumber" name="L43" href="#L43">43</a> @Component( role =
DecorationModelInheritanceAssembler.<strong class="jxr_keyword">class</strong> )
<a class="jxr_linenumber" name="L44" href="#L44">44</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong>
<a
href="../../../../../../../org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.html">DefaultDecorationModelInheritanceAssembler</a>
@@ -219,255 +219,251 @@
<a class="jxr_linenumber" name="L211" href="#L211">211</a>
pBody = <strong class="jxr_keyword">new</strong> Body();
<a class="jxr_linenumber" name="L212" href="#L212">212</a> }
<a class="jxr_linenumber" name="L213" href="#L213">213</a>
-<a class="jxr_linenumber" name="L214" href="#L214">214</a> <strong
class="jxr_keyword">if</strong> ( cBody.getHead() == <strong
class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L214" href="#L214">214</a> <strong
class="jxr_keyword">if</strong> ( cBody.getHead() == <strong
class="jxr_keyword">null</strong> && pBody.getHead() != <strong
class="jxr_keyword">null</strong> )
<a class="jxr_linenumber" name="L215" href="#L215">215</a> {
<a class="jxr_linenumber" name="L216" href="#L216">216</a>
cBody.setHead( pBody.getHead() );
<a class="jxr_linenumber" name="L217" href="#L217">217</a> }
-<a class="jxr_linenumber" name="L218" href="#L218">218</a> <strong
class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="L219" href="#L219">219</a> {
-<a class="jxr_linenumber" name="L220" href="#L220">220</a>
cBody.setHead( Xpp3Dom.mergeXpp3Dom( (Xpp3Dom) cBody.getHead(), (Xpp3Dom)
pBody.getHead() ) );
-<a class="jxr_linenumber" name="L221" href="#L221">221</a> }
-<a class="jxr_linenumber" name="L222" href="#L222">222</a>
-<a class="jxr_linenumber" name="L223" href="#L223">223</a>
cBody.setLinks( mergeLinkItemLists( cBody.getLinks(), pBody.getLinks(),
urlContainer, false ) );
-<a class="jxr_linenumber" name="L224" href="#L224">224</a>
-<a class="jxr_linenumber" name="L225" href="#L225">225</a> <strong
class="jxr_keyword">if</strong> ( cBody.getBreadcrumbs().isEmpty() &&
!pBody.getBreadcrumbs().isEmpty() )
-<a class="jxr_linenumber" name="L226" href="#L226">226</a> {
-<a class="jxr_linenumber" name="L227" href="#L227">227</a>
LinkItem breadcrumb = <strong class="jxr_keyword">new</strong> LinkItem();
-<a class="jxr_linenumber" name="L228" href="#L228">228</a>
breadcrumb.setName( name );
-<a class="jxr_linenumber" name="L229" href="#L229">229</a>
breadcrumb.setHref( <span class="jxr_string">"index.html"</span> );
-<a class="jxr_linenumber" name="L230" href="#L230">230</a>
cBody.getBreadcrumbs().add( breadcrumb );
-<a class="jxr_linenumber" name="L231" href="#L231">231</a> }
-<a class="jxr_linenumber" name="L232" href="#L232">232</a>
cBody.setBreadcrumbs( mergeLinkItemLists( cBody.getBreadcrumbs(),
pBody.getBreadcrumbs(), urlContainer,
-<a class="jxr_linenumber" name="L233" href="#L233">233</a>
<strong class="jxr_keyword">true</strong> ) );
-<a class="jxr_linenumber" name="L234" href="#L234">234</a>
-<a class="jxr_linenumber" name="L235" href="#L235">235</a>
cBody.setMenus( mergeMenus( cBody.getMenus(), pBody.getMenus(), urlContainer )
);
-<a class="jxr_linenumber" name="L236" href="#L236">236</a>
-<a class="jxr_linenumber" name="L237" href="#L237">237</a> <strong
class="jxr_keyword">if</strong> ( cBody.getFooter() == <strong
class="jxr_keyword">null</strong> && pBody.getFooter() != <strong
class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L238" href="#L238">238</a> {
-<a class="jxr_linenumber" name="L239" href="#L239">239</a>
cBody.setFooter( pBody.getFooter() );
-<a class="jxr_linenumber" name="L240" href="#L240">240</a> }
-<a class="jxr_linenumber" name="L241" href="#L241">241</a> }
-<a class="jxr_linenumber" name="L242" href="#L242">242</a> }
-<a class="jxr_linenumber" name="L243" href="#L243">243</a>
-<a class="jxr_linenumber" name="L244" href="#L244">244</a> <strong
class="jxr_keyword">private</strong> List<Menu> mergeMenus( <strong
class="jxr_keyword">final</strong> List<Menu> childMenus, <strong
class="jxr_keyword">final</strong> List<Menu> parentMenus,
-<a class="jxr_linenumber" name="L245" href="#L245">245</a>
<strong class="jxr_keyword">final</strong> <a
href="../../../../../../../org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.html">URLContainer</a>
urlContainer )
-<a class="jxr_linenumber" name="L246" href="#L246">246</a> {
-<a class="jxr_linenumber" name="L247" href="#L247">247</a>
List<Menu> menus = <strong class="jxr_keyword">new</strong>
ArrayList<Menu>( childMenus.size() + parentMenus.size() );
-<a class="jxr_linenumber" name="L248" href="#L248">248</a>
-<a class="jxr_linenumber" name="L249" href="#L249">249</a> <strong
class="jxr_keyword">for</strong> ( Menu menu : childMenus )
-<a class="jxr_linenumber" name="L250" href="#L250">250</a> {
-<a class="jxr_linenumber" name="L251" href="#L251">251</a>
menus.add( menu );
-<a class="jxr_linenumber" name="L252" href="#L252">252</a> }
-<a class="jxr_linenumber" name="L253" href="#L253">253</a>
-<a class="jxr_linenumber" name="L254" href="#L254">254</a> <strong
class="jxr_keyword">int</strong> topCounter = 0;
-<a class="jxr_linenumber" name="L255" href="#L255">255</a> <strong
class="jxr_keyword">for</strong> ( Menu menu : parentMenus )
-<a class="jxr_linenumber" name="L256" href="#L256">256</a> {
-<a class="jxr_linenumber" name="L257" href="#L257">257</a> <strong
class="jxr_keyword">if</strong> ( <span class="jxr_string">"top"</span>.equals(
menu.getInherit() ) )
-<a class="jxr_linenumber" name="L258" href="#L258">258</a> {
-<a class="jxr_linenumber" name="L259" href="#L259">259</a>
<strong class="jxr_keyword">final</strong> Menu clone = menu.clone();
-<a class="jxr_linenumber" name="L260" href="#L260">260</a>
-<a class="jxr_linenumber" name="L261" href="#L261">261</a>
rebaseMenuPaths( clone.getItems(), urlContainer );
-<a class="jxr_linenumber" name="L262" href="#L262">262</a>
-<a class="jxr_linenumber" name="L263" href="#L263">263</a>
menus.add( topCounter, clone );
-<a class="jxr_linenumber" name="L264" href="#L264">264</a>
topCounter++;
-<a class="jxr_linenumber" name="L265" href="#L265">265</a> }
-<a class="jxr_linenumber" name="L266" href="#L266">266</a> <strong
class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (
<span class="jxr_string">"bottom"</span>.equals( menu.getInherit() ) )
-<a class="jxr_linenumber" name="L267" href="#L267">267</a> {
-<a class="jxr_linenumber" name="L268" href="#L268">268</a>
<strong class="jxr_keyword">final</strong> Menu clone = menu.clone();
-<a class="jxr_linenumber" name="L269" href="#L269">269</a>
-<a class="jxr_linenumber" name="L270" href="#L270">270</a>
rebaseMenuPaths( clone.getItems(), urlContainer );
+<a class="jxr_linenumber" name="L218" href="#L218">218</a>
+<a class="jxr_linenumber" name="L219" href="#L219">219</a>
cBody.setLinks( mergeLinkItemLists( cBody.getLinks(), pBody.getLinks(),
urlContainer, false ) );
+<a class="jxr_linenumber" name="L220" href="#L220">220</a>
+<a class="jxr_linenumber" name="L221" href="#L221">221</a> <strong
class="jxr_keyword">if</strong> ( cBody.getBreadcrumbs().isEmpty() &&
!pBody.getBreadcrumbs().isEmpty() )
+<a class="jxr_linenumber" name="L222" href="#L222">222</a> {
+<a class="jxr_linenumber" name="L223" href="#L223">223</a>
LinkItem breadcrumb = <strong class="jxr_keyword">new</strong> LinkItem();
+<a class="jxr_linenumber" name="L224" href="#L224">224</a>
breadcrumb.setName( name );
+<a class="jxr_linenumber" name="L225" href="#L225">225</a>
breadcrumb.setHref( <span class="jxr_string">"index.html"</span> );
+<a class="jxr_linenumber" name="L226" href="#L226">226</a>
cBody.getBreadcrumbs().add( breadcrumb );
+<a class="jxr_linenumber" name="L227" href="#L227">227</a> }
+<a class="jxr_linenumber" name="L228" href="#L228">228</a>
cBody.setBreadcrumbs( mergeLinkItemLists( cBody.getBreadcrumbs(),
pBody.getBreadcrumbs(), urlContainer,
+<a class="jxr_linenumber" name="L229" href="#L229">229</a>
<strong class="jxr_keyword">true</strong> ) );
+<a class="jxr_linenumber" name="L230" href="#L230">230</a>
+<a class="jxr_linenumber" name="L231" href="#L231">231</a>
cBody.setMenus( mergeMenus( cBody.getMenus(), pBody.getMenus(), urlContainer )
);
+<a class="jxr_linenumber" name="L232" href="#L232">232</a>
+<a class="jxr_linenumber" name="L233" href="#L233">233</a> <strong
class="jxr_keyword">if</strong> ( cBody.getFooter() == <strong
class="jxr_keyword">null</strong> && pBody.getFooter() != <strong
class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L234" href="#L234">234</a> {
+<a class="jxr_linenumber" name="L235" href="#L235">235</a>
cBody.setFooter( pBody.getFooter() );
+<a class="jxr_linenumber" name="L236" href="#L236">236</a> }
+<a class="jxr_linenumber" name="L237" href="#L237">237</a> }
+<a class="jxr_linenumber" name="L238" href="#L238">238</a> }
+<a class="jxr_linenumber" name="L239" href="#L239">239</a>
+<a class="jxr_linenumber" name="L240" href="#L240">240</a> <strong
class="jxr_keyword">private</strong> List<Menu> mergeMenus( <strong
class="jxr_keyword">final</strong> List<Menu> childMenus, <strong
class="jxr_keyword">final</strong> List<Menu> parentMenus,
+<a class="jxr_linenumber" name="L241" href="#L241">241</a>
<strong class="jxr_keyword">final</strong> <a
href="../../../../../../../org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.html">URLContainer</a>
urlContainer )
+<a class="jxr_linenumber" name="L242" href="#L242">242</a> {
+<a class="jxr_linenumber" name="L243" href="#L243">243</a>
List<Menu> menus = <strong class="jxr_keyword">new</strong>
ArrayList<Menu>( childMenus.size() + parentMenus.size() );
+<a class="jxr_linenumber" name="L244" href="#L244">244</a>
+<a class="jxr_linenumber" name="L245" href="#L245">245</a> <strong
class="jxr_keyword">for</strong> ( Menu menu : childMenus )
+<a class="jxr_linenumber" name="L246" href="#L246">246</a> {
+<a class="jxr_linenumber" name="L247" href="#L247">247</a>
menus.add( menu );
+<a class="jxr_linenumber" name="L248" href="#L248">248</a> }
+<a class="jxr_linenumber" name="L249" href="#L249">249</a>
+<a class="jxr_linenumber" name="L250" href="#L250">250</a> <strong
class="jxr_keyword">int</strong> topCounter = 0;
+<a class="jxr_linenumber" name="L251" href="#L251">251</a> <strong
class="jxr_keyword">for</strong> ( Menu menu : parentMenus )
+<a class="jxr_linenumber" name="L252" href="#L252">252</a> {
+<a class="jxr_linenumber" name="L253" href="#L253">253</a> <strong
class="jxr_keyword">if</strong> ( <span class="jxr_string">"top"</span>.equals(
menu.getInherit() ) )
+<a class="jxr_linenumber" name="L254" href="#L254">254</a> {
+<a class="jxr_linenumber" name="L255" href="#L255">255</a>
<strong class="jxr_keyword">final</strong> Menu clone = menu.clone();
+<a class="jxr_linenumber" name="L256" href="#L256">256</a>
+<a class="jxr_linenumber" name="L257" href="#L257">257</a>
rebaseMenuPaths( clone.getItems(), urlContainer );
+<a class="jxr_linenumber" name="L258" href="#L258">258</a>
+<a class="jxr_linenumber" name="L259" href="#L259">259</a>
menus.add( topCounter, clone );
+<a class="jxr_linenumber" name="L260" href="#L260">260</a>
topCounter++;
+<a class="jxr_linenumber" name="L261" href="#L261">261</a> }
+<a class="jxr_linenumber" name="L262" href="#L262">262</a> <strong
class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (
<span class="jxr_string">"bottom"</span>.equals( menu.getInherit() ) )
+<a class="jxr_linenumber" name="L263" href="#L263">263</a> {
+<a class="jxr_linenumber" name="L264" href="#L264">264</a>
<strong class="jxr_keyword">final</strong> Menu clone = menu.clone();
+<a class="jxr_linenumber" name="L265" href="#L265">265</a>
+<a class="jxr_linenumber" name="L266" href="#L266">266</a>
rebaseMenuPaths( clone.getItems(), urlContainer );
+<a class="jxr_linenumber" name="L267" href="#L267">267</a>
+<a class="jxr_linenumber" name="L268" href="#L268">268</a>
menus.add( clone );
+<a class="jxr_linenumber" name="L269" href="#L269">269</a> }
+<a class="jxr_linenumber" name="L270" href="#L270">270</a> }
<a class="jxr_linenumber" name="L271" href="#L271">271</a>
-<a class="jxr_linenumber" name="L272" href="#L272">272</a>
menus.add( clone );
-<a class="jxr_linenumber" name="L273" href="#L273">273</a> }
-<a class="jxr_linenumber" name="L274" href="#L274">274</a> }
-<a class="jxr_linenumber" name="L275" href="#L275">275</a>
-<a class="jxr_linenumber" name="L276" href="#L276">276</a> <strong
class="jxr_keyword">return</strong> menus;
-<a class="jxr_linenumber" name="L277" href="#L277">277</a> }
-<a class="jxr_linenumber" name="L278" href="#L278">278</a>
-<a class="jxr_linenumber" name="L279" href="#L279">279</a> <strong
class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong>
relativizeMenuPaths( <strong class="jxr_keyword">final</strong>
List<MenuItem> items, <strong class="jxr_keyword">final</strong> String
baseUrl )
-<a class="jxr_linenumber" name="L280" href="#L280">280</a> {
-<a class="jxr_linenumber" name="L281" href="#L281">281</a> <strong
class="jxr_keyword">for</strong> ( MenuItem item : items )
-<a class="jxr_linenumber" name="L282" href="#L282">282</a> {
-<a class="jxr_linenumber" name="L283" href="#L283">283</a>
relativizeLinkItemPaths( item, baseUrl );
-<a class="jxr_linenumber" name="L284" href="#L284">284</a>
relativizeMenuPaths( item.getItems(), baseUrl );
-<a class="jxr_linenumber" name="L285" href="#L285">285</a> }
-<a class="jxr_linenumber" name="L286" href="#L286">286</a> }
-<a class="jxr_linenumber" name="L287" href="#L287">287</a>
-<a class="jxr_linenumber" name="L288" href="#L288">288</a> <strong
class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong>
rebaseMenuPaths( <strong class="jxr_keyword">final</strong>
List<MenuItem> items, <strong class="jxr_keyword">final</strong>
URLContainer urlContainer )
-<a class="jxr_linenumber" name="L289" href="#L289">289</a> {
-<a class="jxr_linenumber" name="L290" href="#L290">290</a> <strong
class="jxr_keyword">for</strong> ( MenuItem item : items )
-<a class="jxr_linenumber" name="L291" href="#L291">291</a> {
-<a class="jxr_linenumber" name="L292" href="#L292">292</a>
rebaseLinkItemPaths( item, urlContainer );
-<a class="jxr_linenumber" name="L293" href="#L293">293</a>
rebaseMenuPaths( item.getItems(), urlContainer );
-<a class="jxr_linenumber" name="L294" href="#L294">294</a> }
-<a class="jxr_linenumber" name="L295" href="#L295">295</a> }
-<a class="jxr_linenumber" name="L296" href="#L296">296</a>
-<a class="jxr_linenumber" name="L297" href="#L297">297</a> <strong
class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong>
relativizeLinkItemPaths( <strong class="jxr_keyword">final</strong> LinkItem
item, <strong class="jxr_keyword">final</strong> String baseUrl )
-<a class="jxr_linenumber" name="L298" href="#L298">298</a> {
-<a class="jxr_linenumber" name="L299" href="#L299">299</a>
item.setHref( relativizeLink( item.getHref(), baseUrl ) );
-<a class="jxr_linenumber" name="L300" href="#L300">300</a> }
-<a class="jxr_linenumber" name="L301" href="#L301">301</a>
-<a class="jxr_linenumber" name="L302" href="#L302">302</a> <strong
class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong>
rebaseLinkItemPaths( <strong class="jxr_keyword">final</strong> LinkItem item,
<strong class="jxr_keyword">final</strong> URLContainer urlContainer )
-<a class="jxr_linenumber" name="L303" href="#L303">303</a> {
-<a class="jxr_linenumber" name="L304" href="#L304">304</a>
item.setHref( urlContainer.rebaseLink( item.getHref() ) );
-<a class="jxr_linenumber" name="L305" href="#L305">305</a> }
-<a class="jxr_linenumber" name="L306" href="#L306">306</a>
-<a class="jxr_linenumber" name="L307" href="#L307">307</a> <strong
class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong>
relativizeLogoPaths( <strong class="jxr_keyword">final</strong> Logo logo,
<strong class="jxr_keyword">final</strong> String baseUrl )
-<a class="jxr_linenumber" name="L308" href="#L308">308</a> {
-<a class="jxr_linenumber" name="L309" href="#L309">309</a>
logo.setImg( relativizeLink( logo.getImg(), baseUrl ) );
-<a class="jxr_linenumber" name="L310" href="#L310">310</a>
relativizeLinkItemPaths( logo, baseUrl );
-<a class="jxr_linenumber" name="L311" href="#L311">311</a> }
-<a class="jxr_linenumber" name="L312" href="#L312">312</a>
-<a class="jxr_linenumber" name="L313" href="#L313">313</a> <strong
class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong>
rebaseLogoPaths( <strong class="jxr_keyword">final</strong> Logo logo, <strong
class="jxr_keyword">final</strong> URLContainer urlContainer )
-<a class="jxr_linenumber" name="L314" href="#L314">314</a> {
-<a class="jxr_linenumber" name="L315" href="#L315">315</a>
logo.setImg( urlContainer.rebaseLink( logo.getImg() ) );
-<a class="jxr_linenumber" name="L316" href="#L316">316</a>
rebaseLinkItemPaths( logo, urlContainer );
-<a class="jxr_linenumber" name="L317" href="#L317">317</a> }
-<a class="jxr_linenumber" name="L318" href="#L318">318</a>
-<a class="jxr_linenumber" name="L319" href="#L319">319</a> <strong
class="jxr_keyword">private</strong> List<LinkItem> mergeLinkItemLists(
<strong class="jxr_keyword">final</strong> List<LinkItem> childList,
<strong class="jxr_keyword">final</strong> List<LinkItem> parentList,
-<a class="jxr_linenumber" name="L320" href="#L320">320</a>
<strong class="jxr_keyword">final</strong> <a
href="../../../../../../../org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.html">URLContainer</a>
urlContainer, <strong class="jxr_keyword">boolean</strong>
cutParentAfterDuplicate )
-<a class="jxr_linenumber" name="L321" href="#L321">321</a> {
-<a class="jxr_linenumber" name="L322" href="#L322">322</a>
List<LinkItem> items = <strong class="jxr_keyword">new</strong>
ArrayList<LinkItem>( childList.size() + parentList.size() );
-<a class="jxr_linenumber" name="L323" href="#L323">323</a>
-<a class="jxr_linenumber" name="L324" href="#L324">324</a> <strong
class="jxr_keyword">for</strong> ( LinkItem item : parentList )
-<a class="jxr_linenumber" name="L325" href="#L325">325</a> {
-<a class="jxr_linenumber" name="L326" href="#L326">326</a> <strong
class="jxr_keyword">if</strong> ( !items.contains( item ) &&
!childList.contains( item ) )
-<a class="jxr_linenumber" name="L327" href="#L327">327</a> {
-<a class="jxr_linenumber" name="L328" href="#L328">328</a>
<strong class="jxr_keyword">final</strong> LinkItem clone = item.clone();
-<a class="jxr_linenumber" name="L329" href="#L329">329</a>
-<a class="jxr_linenumber" name="L330" href="#L330">330</a>
rebaseLinkItemPaths( clone, urlContainer );
-<a class="jxr_linenumber" name="L331" href="#L331">331</a>
-<a class="jxr_linenumber" name="L332" href="#L332">332</a>
items.add( clone );
-<a class="jxr_linenumber" name="L333" href="#L333">333</a> }
-<a class="jxr_linenumber" name="L334" href="#L334">334</a> <strong
class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (
cutParentAfterDuplicate )
-<a class="jxr_linenumber" name="L335" href="#L335">335</a> {
-<a class="jxr_linenumber" name="L336" href="#L336">336</a> <em
class="jxr_comment">// if a parent item is found in child, ignore next items
(case for breadcrumbs)</em>
-<a class="jxr_linenumber" name="L337" href="#L337">337</a> <em
class="jxr_comment">// merge ( "B > E", "A > B > C > D" ) -> "A
> B > E" (notice missing "C > D")</em>
-<a class="jxr_linenumber" name="L338" href="#L338">338</a> <em
class="jxr_comment">// see
http://jira.codehaus.org/browse/DOXIASITETOOLS-62</em>
-<a class="jxr_linenumber" name="L339" href="#L339">339</a>
<strong class="jxr_keyword">break</strong>;
-<a class="jxr_linenumber" name="L340" href="#L340">340</a> }
-<a class="jxr_linenumber" name="L341" href="#L341">341</a> }
-<a class="jxr_linenumber" name="L342" href="#L342">342</a>
-<a class="jxr_linenumber" name="L343" href="#L343">343</a> <strong
class="jxr_keyword">for</strong> ( LinkItem item : childList )
-<a class="jxr_linenumber" name="L344" href="#L344">344</a> {
-<a class="jxr_linenumber" name="L345" href="#L345">345</a> <strong
class="jxr_keyword">if</strong> ( !items.contains( item ) )
-<a class="jxr_linenumber" name="L346" href="#L346">346</a> {
-<a class="jxr_linenumber" name="L347" href="#L347">347</a>
items.add( item );
-<a class="jxr_linenumber" name="L348" href="#L348">348</a> }
-<a class="jxr_linenumber" name="L349" href="#L349">349</a> }
-<a class="jxr_linenumber" name="L350" href="#L350">350</a>
-<a class="jxr_linenumber" name="L351" href="#L351">351</a> <strong
class="jxr_keyword">return</strong> items;
-<a class="jxr_linenumber" name="L352" href="#L352">352</a> }
-<a class="jxr_linenumber" name="L353" href="#L353">353</a>
-<a class="jxr_linenumber" name="L354" href="#L354">354</a> <strong
class="jxr_keyword">private</strong> List<Logo> mergePoweredByLists(
<strong class="jxr_keyword">final</strong> List<Logo> childList, <strong
class="jxr_keyword">final</strong> List<Logo> parentList,
-<a class="jxr_linenumber" name="L355" href="#L355">355</a>
<strong class="jxr_keyword">final</strong> <a
href="../../../../../../../org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.html">URLContainer</a>
urlContainer )
-<a class="jxr_linenumber" name="L356" href="#L356">356</a> {
-<a class="jxr_linenumber" name="L357" href="#L357">357</a>
List<Logo> logos = <strong class="jxr_keyword">new</strong>
ArrayList<Logo>( childList.size() + parentList.size() );
-<a class="jxr_linenumber" name="L358" href="#L358">358</a>
-<a class="jxr_linenumber" name="L359" href="#L359">359</a> <strong
class="jxr_keyword">for</strong> ( Logo logo : parentList )
-<a class="jxr_linenumber" name="L360" href="#L360">360</a> {
-<a class="jxr_linenumber" name="L361" href="#L361">361</a> <strong
class="jxr_keyword">if</strong> ( !logos.contains( logo ) )
-<a class="jxr_linenumber" name="L362" href="#L362">362</a> {
-<a class="jxr_linenumber" name="L363" href="#L363">363</a>
<strong class="jxr_keyword">final</strong> Logo clone = logo.clone();
-<a class="jxr_linenumber" name="L364" href="#L364">364</a>
-<a class="jxr_linenumber" name="L365" href="#L365">365</a>
rebaseLogoPaths( clone, urlContainer );
+<a class="jxr_linenumber" name="L272" href="#L272">272</a> <strong
class="jxr_keyword">return</strong> menus;
+<a class="jxr_linenumber" name="L273" href="#L273">273</a> }
+<a class="jxr_linenumber" name="L274" href="#L274">274</a>
+<a class="jxr_linenumber" name="L275" href="#L275">275</a> <strong
class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong>
relativizeMenuPaths( <strong class="jxr_keyword">final</strong>
List<MenuItem> items, <strong class="jxr_keyword">final</strong> String
baseUrl )
+<a class="jxr_linenumber" name="L276" href="#L276">276</a> {
+<a class="jxr_linenumber" name="L277" href="#L277">277</a> <strong
class="jxr_keyword">for</strong> ( MenuItem item : items )
+<a class="jxr_linenumber" name="L278" href="#L278">278</a> {
+<a class="jxr_linenumber" name="L279" href="#L279">279</a>
relativizeLinkItemPaths( item, baseUrl );
+<a class="jxr_linenumber" name="L280" href="#L280">280</a>
relativizeMenuPaths( item.getItems(), baseUrl );
+<a class="jxr_linenumber" name="L281" href="#L281">281</a> }
+<a class="jxr_linenumber" name="L282" href="#L282">282</a> }
+<a class="jxr_linenumber" name="L283" href="#L283">283</a>
+<a class="jxr_linenumber" name="L284" href="#L284">284</a> <strong
class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong>
rebaseMenuPaths( <strong class="jxr_keyword">final</strong>
List<MenuItem> items, <strong class="jxr_keyword">final</strong>
URLContainer urlContainer )
+<a class="jxr_linenumber" name="L285" href="#L285">285</a> {
+<a class="jxr_linenumber" name="L286" href="#L286">286</a> <strong
class="jxr_keyword">for</strong> ( MenuItem item : items )
+<a class="jxr_linenumber" name="L287" href="#L287">287</a> {
+<a class="jxr_linenumber" name="L288" href="#L288">288</a>
rebaseLinkItemPaths( item, urlContainer );
+<a class="jxr_linenumber" name="L289" href="#L289">289</a>
rebaseMenuPaths( item.getItems(), urlContainer );
+<a class="jxr_linenumber" name="L290" href="#L290">290</a> }
+<a class="jxr_linenumber" name="L291" href="#L291">291</a> }
+<a class="jxr_linenumber" name="L292" href="#L292">292</a>
+<a class="jxr_linenumber" name="L293" href="#L293">293</a> <strong
class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong>
relativizeLinkItemPaths( <strong class="jxr_keyword">final</strong> LinkItem
item, <strong class="jxr_keyword">final</strong> String baseUrl )
+<a class="jxr_linenumber" name="L294" href="#L294">294</a> {
+<a class="jxr_linenumber" name="L295" href="#L295">295</a>
item.setHref( relativizeLink( item.getHref(), baseUrl ) );
+<a class="jxr_linenumber" name="L296" href="#L296">296</a> }
+<a class="jxr_linenumber" name="L297" href="#L297">297</a>
+<a class="jxr_linenumber" name="L298" href="#L298">298</a> <strong
class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong>
rebaseLinkItemPaths( <strong class="jxr_keyword">final</strong> LinkItem item,
<strong class="jxr_keyword">final</strong> URLContainer urlContainer )
+<a class="jxr_linenumber" name="L299" href="#L299">299</a> {
+<a class="jxr_linenumber" name="L300" href="#L300">300</a>
item.setHref( urlContainer.rebaseLink( item.getHref() ) );
+<a class="jxr_linenumber" name="L301" href="#L301">301</a> }
+<a class="jxr_linenumber" name="L302" href="#L302">302</a>
+<a class="jxr_linenumber" name="L303" href="#L303">303</a> <strong
class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong>
relativizeLogoPaths( <strong class="jxr_keyword">final</strong> Logo logo,
<strong class="jxr_keyword">final</strong> String baseUrl )
+<a class="jxr_linenumber" name="L304" href="#L304">304</a> {
+<a class="jxr_linenumber" name="L305" href="#L305">305</a>
logo.setImg( relativizeLink( logo.getImg(), baseUrl ) );
+<a class="jxr_linenumber" name="L306" href="#L306">306</a>
relativizeLinkItemPaths( logo, baseUrl );
+<a class="jxr_linenumber" name="L307" href="#L307">307</a> }
+<a class="jxr_linenumber" name="L308" href="#L308">308</a>
+<a class="jxr_linenumber" name="L309" href="#L309">309</a> <strong
class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong>
rebaseLogoPaths( <strong class="jxr_keyword">final</strong> Logo logo, <strong
class="jxr_keyword">final</strong> URLContainer urlContainer )
+<a class="jxr_linenumber" name="L310" href="#L310">310</a> {
+<a class="jxr_linenumber" name="L311" href="#L311">311</a>
logo.setImg( urlContainer.rebaseLink( logo.getImg() ) );
+<a class="jxr_linenumber" name="L312" href="#L312">312</a>
rebaseLinkItemPaths( logo, urlContainer );
+<a class="jxr_linenumber" name="L313" href="#L313">313</a> }
+<a class="jxr_linenumber" name="L314" href="#L314">314</a>
+<a class="jxr_linenumber" name="L315" href="#L315">315</a> <strong
class="jxr_keyword">private</strong> List<LinkItem> mergeLinkItemLists(
<strong class="jxr_keyword">final</strong> List<LinkItem> childList,
<strong class="jxr_keyword">final</strong> List<LinkItem> parentList,
+<a class="jxr_linenumber" name="L316" href="#L316">316</a>
<strong class="jxr_keyword">final</strong> <a
href="../../../../../../../org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.html">URLContainer</a>
urlContainer, <strong class="jxr_keyword">boolean</strong>
cutParentAfterDuplicate )
+<a class="jxr_linenumber" name="L317" href="#L317">317</a> {
+<a class="jxr_linenumber" name="L318" href="#L318">318</a>
List<LinkItem> items = <strong class="jxr_keyword">new</strong>
ArrayList<LinkItem>( childList.size() + parentList.size() );
+<a class="jxr_linenumber" name="L319" href="#L319">319</a>
+<a class="jxr_linenumber" name="L320" href="#L320">320</a> <strong
class="jxr_keyword">for</strong> ( LinkItem item : parentList )
+<a class="jxr_linenumber" name="L321" href="#L321">321</a> {
+<a class="jxr_linenumber" name="L322" href="#L322">322</a> <strong
class="jxr_keyword">if</strong> ( !items.contains( item ) &&
!childList.contains( item ) )
+<a class="jxr_linenumber" name="L323" href="#L323">323</a> {
+<a class="jxr_linenumber" name="L324" href="#L324">324</a>
<strong class="jxr_keyword">final</strong> LinkItem clone = item.clone();
+<a class="jxr_linenumber" name="L325" href="#L325">325</a>
+<a class="jxr_linenumber" name="L326" href="#L326">326</a>
rebaseLinkItemPaths( clone, urlContainer );
+<a class="jxr_linenumber" name="L327" href="#L327">327</a>
+<a class="jxr_linenumber" name="L328" href="#L328">328</a>
items.add( clone );
+<a class="jxr_linenumber" name="L329" href="#L329">329</a> }
+<a class="jxr_linenumber" name="L330" href="#L330">330</a> <strong
class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (
cutParentAfterDuplicate )
+<a class="jxr_linenumber" name="L331" href="#L331">331</a> {
+<a class="jxr_linenumber" name="L332" href="#L332">332</a> <em
class="jxr_comment">// if a parent item is found in child, ignore next items
(case for breadcrumbs)</em>
+<a class="jxr_linenumber" name="L333" href="#L333">333</a> <em
class="jxr_comment">// merge ( "B > E", "A > B > C > D" ) -> "A
> B > E" (notice missing "C > D")</em>
+<a class="jxr_linenumber" name="L334" href="#L334">334</a> <em
class="jxr_comment">// see
http://jira.codehaus.org/browse/DOXIASITETOOLS-62</em>
+<a class="jxr_linenumber" name="L335" href="#L335">335</a>
<strong class="jxr_keyword">break</strong>;
+<a class="jxr_linenumber" name="L336" href="#L336">336</a> }
+<a class="jxr_linenumber" name="L337" href="#L337">337</a> }
+<a class="jxr_linenumber" name="L338" href="#L338">338</a>
+<a class="jxr_linenumber" name="L339" href="#L339">339</a> <strong
class="jxr_keyword">for</strong> ( LinkItem item : childList )
+<a class="jxr_linenumber" name="L340" href="#L340">340</a> {
+<a class="jxr_linenumber" name="L341" href="#L341">341</a> <strong
class="jxr_keyword">if</strong> ( !items.contains( item ) )
+<a class="jxr_linenumber" name="L342" href="#L342">342</a> {
+<a class="jxr_linenumber" name="L343" href="#L343">343</a>
items.add( item );
+<a class="jxr_linenumber" name="L344" href="#L344">344</a> }
+<a class="jxr_linenumber" name="L345" href="#L345">345</a> }
+<a class="jxr_linenumber" name="L346" href="#L346">346</a>
+<a class="jxr_linenumber" name="L347" href="#L347">347</a> <strong
class="jxr_keyword">return</strong> items;
+<a class="jxr_linenumber" name="L348" href="#L348">348</a> }
+<a class="jxr_linenumber" name="L349" href="#L349">349</a>
+<a class="jxr_linenumber" name="L350" href="#L350">350</a> <strong
class="jxr_keyword">private</strong> List<Logo> mergePoweredByLists(
<strong class="jxr_keyword">final</strong> List<Logo> childList, <strong
class="jxr_keyword">final</strong> List<Logo> parentList,
+<a class="jxr_linenumber" name="L351" href="#L351">351</a>
<strong class="jxr_keyword">final</strong> <a
href="../../../../../../../org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.html">URLContainer</a>
urlContainer )
+<a class="jxr_linenumber" name="L352" href="#L352">352</a> {
+<a class="jxr_linenumber" name="L353" href="#L353">353</a>
List<Logo> logos = <strong class="jxr_keyword">new</strong>
ArrayList<Logo>( childList.size() + parentList.size() );
+<a class="jxr_linenumber" name="L354" href="#L354">354</a>
+<a class="jxr_linenumber" name="L355" href="#L355">355</a> <strong
class="jxr_keyword">for</strong> ( Logo logo : parentList )
+<a class="jxr_linenumber" name="L356" href="#L356">356</a> {
+<a class="jxr_linenumber" name="L357" href="#L357">357</a> <strong
class="jxr_keyword">if</strong> ( !logos.contains( logo ) )
+<a class="jxr_linenumber" name="L358" href="#L358">358</a> {
+<a class="jxr_linenumber" name="L359" href="#L359">359</a>
<strong class="jxr_keyword">final</strong> Logo clone = logo.clone();
+<a class="jxr_linenumber" name="L360" href="#L360">360</a>
+<a class="jxr_linenumber" name="L361" href="#L361">361</a>
rebaseLogoPaths( clone, urlContainer );
+<a class="jxr_linenumber" name="L362" href="#L362">362</a>
+<a class="jxr_linenumber" name="L363" href="#L363">363</a>
logos.add( clone );
+<a class="jxr_linenumber" name="L364" href="#L364">364</a> }
+<a class="jxr_linenumber" name="L365" href="#L365">365</a> }
<a class="jxr_linenumber" name="L366" href="#L366">366</a>
-<a class="jxr_linenumber" name="L367" href="#L367">367</a>
logos.add( clone );
-<a class="jxr_linenumber" name="L368" href="#L368">368</a> }
-<a class="jxr_linenumber" name="L369" href="#L369">369</a> }
-<a class="jxr_linenumber" name="L370" href="#L370">370</a>
-<a class="jxr_linenumber" name="L371" href="#L371">371</a> <strong
class="jxr_keyword">for</strong> ( Logo logo : childList )
-<a class="jxr_linenumber" name="L372" href="#L372">372</a> {
-<a class="jxr_linenumber" name="L373" href="#L373">373</a> <strong
class="jxr_keyword">if</strong> ( !logos.contains( logo ) )
-<a class="jxr_linenumber" name="L374" href="#L374">374</a> {
-<a class="jxr_linenumber" name="L375" href="#L375">375</a>
logos.add( logo );
-<a class="jxr_linenumber" name="L376" href="#L376">376</a> }
-<a class="jxr_linenumber" name="L377" href="#L377">377</a> }
-<a class="jxr_linenumber" name="L378" href="#L378">378</a>
-<a class="jxr_linenumber" name="L379" href="#L379">379</a> <strong
class="jxr_keyword">return</strong> logos;
-<a class="jxr_linenumber" name="L380" href="#L380">380</a> }
-<a class="jxr_linenumber" name="L381" href="#L381">381</a>
-<a class="jxr_linenumber" name="L382" href="#L382">382</a> <em
class="jxr_comment">// relativize only affects absolute links, if the link has
the same scheme, host and port</em>
-<a class="jxr_linenumber" name="L383" href="#L383">383</a> <em
class="jxr_comment">// as the base, it is made into a relative link as viewed
from the base</em>
-<a class="jxr_linenumber" name="L384" href="#L384">384</a> <strong
class="jxr_keyword">private</strong> String relativizeLink( <strong
class="jxr_keyword">final</strong> String link, <strong
class="jxr_keyword">final</strong> String baseUri )
-<a class="jxr_linenumber" name="L385" href="#L385">385</a> {
-<a class="jxr_linenumber" name="L386" href="#L386">386</a> <strong
class="jxr_keyword">if</strong> ( link == <strong
class="jxr_keyword">null</strong> || baseUri == <strong
class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L387" href="#L387">387</a> {
-<a class="jxr_linenumber" name="L388" href="#L388">388</a> <strong
class="jxr_keyword">return</strong> link;
-<a class="jxr_linenumber" name="L389" href="#L389">389</a> }
-<a class="jxr_linenumber" name="L390" href="#L390">390</a>
-<a class="jxr_linenumber" name="L391" href="#L391">391</a> <em
class="jxr_comment">// this shouldn't be necessary, just to swallow mal-formed
hrefs</em>
-<a class="jxr_linenumber" name="L392" href="#L392">392</a> <strong
class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L393" href="#L393">393</a> {
-<a class="jxr_linenumber" name="L394" href="#L394">394</a> <strong
class="jxr_keyword">final</strong> <a
href="../../../../../../../org/apache/maven/doxia/site/decoration/inheritance/URIPathDescriptor.html">URIPathDescriptor</a>
path = <strong class="jxr_keyword">new</strong> <a
href="../../../../../../../org/apache/maven/doxia/site/decoration/inheritance/URIPathDescriptor.html">URIPathDescriptor</a>(
baseUri, link );
-<a class="jxr_linenumber" name="L395" href="#L395">395</a>
-<a class="jxr_linenumber" name="L396" href="#L396">396</a> <strong
class="jxr_keyword">return</strong> path.relativizeLink().toString();
+<a class="jxr_linenumber" name="L367" href="#L367">367</a> <strong
class="jxr_keyword">for</strong> ( Logo logo : childList )
+<a class="jxr_linenumber" name="L368" href="#L368">368</a> {
+<a class="jxr_linenumber" name="L369" href="#L369">369</a> <strong
class="jxr_keyword">if</strong> ( !logos.contains( logo ) )
+<a class="jxr_linenumber" name="L370" href="#L370">370</a> {
+<a class="jxr_linenumber" name="L371" href="#L371">371</a>
logos.add( logo );
+<a class="jxr_linenumber" name="L372" href="#L372">372</a> }
+<a class="jxr_linenumber" name="L373" href="#L373">373</a> }
+<a class="jxr_linenumber" name="L374" href="#L374">374</a>
+<a class="jxr_linenumber" name="L375" href="#L375">375</a> <strong
class="jxr_keyword">return</strong> logos;
+<a class="jxr_linenumber" name="L376" href="#L376">376</a> }
+<a class="jxr_linenumber" name="L377" href="#L377">377</a>
+<a class="jxr_linenumber" name="L378" href="#L378">378</a> <em
class="jxr_comment">// relativize only affects absolute links, if the link has
the same scheme, host and port</em>
+<a class="jxr_linenumber" name="L379" href="#L379">379</a> <em
class="jxr_comment">// as the base, it is made into a relative link as viewed
from the base</em>
+<a class="jxr_linenumber" name="L380" href="#L380">380</a> <strong
class="jxr_keyword">private</strong> String relativizeLink( <strong
class="jxr_keyword">final</strong> String link, <strong
class="jxr_keyword">final</strong> String baseUri )
+<a class="jxr_linenumber" name="L381" href="#L381">381</a> {
+<a class="jxr_linenumber" name="L382" href="#L382">382</a> <strong
class="jxr_keyword">if</strong> ( link == <strong
class="jxr_keyword">null</strong> || baseUri == <strong
class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L383" href="#L383">383</a> {
+<a class="jxr_linenumber" name="L384" href="#L384">384</a> <strong
class="jxr_keyword">return</strong> link;
+<a class="jxr_linenumber" name="L385" href="#L385">385</a> }
+<a class="jxr_linenumber" name="L386" href="#L386">386</a>
+<a class="jxr_linenumber" name="L387" href="#L387">387</a> <em
class="jxr_comment">// this shouldn't be necessary, just to swallow mal-formed
hrefs</em>
+<a class="jxr_linenumber" name="L388" href="#L388">388</a> <strong
class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="L389" href="#L389">389</a> {
+<a class="jxr_linenumber" name="L390" href="#L390">390</a> <strong
class="jxr_keyword">final</strong> <a
href="../../../../../../../org/apache/maven/doxia/site/decoration/inheritance/URIPathDescriptor.html">URIPathDescriptor</a>
path = <strong class="jxr_keyword">new</strong> <a
href="../../../../../../../org/apache/maven/doxia/site/decoration/inheritance/URIPathDescriptor.html">URIPathDescriptor</a>(
baseUri, link );
+<a class="jxr_linenumber" name="L391" href="#L391">391</a>
+<a class="jxr_linenumber" name="L392" href="#L392">392</a> <strong
class="jxr_keyword">return</strong> path.relativizeLink().toString();
+<a class="jxr_linenumber" name="L393" href="#L393">393</a> }
+<a class="jxr_linenumber" name="L394" href="#L394">394</a> <strong
class="jxr_keyword">catch</strong> ( IllegalArgumentException e )
+<a class="jxr_linenumber" name="L395" href="#L395">395</a> {
+<a class="jxr_linenumber" name="L396" href="#L396">396</a> <strong
class="jxr_keyword">return</strong> link;
<a class="jxr_linenumber" name="L397" href="#L397">397</a> }
-<a class="jxr_linenumber" name="L398" href="#L398">398</a> <strong
class="jxr_keyword">catch</strong> ( IllegalArgumentException e )
-<a class="jxr_linenumber" name="L399" href="#L399">399</a> {
-<a class="jxr_linenumber" name="L400" href="#L400">400</a> <strong
class="jxr_keyword">return</strong> link;
-<a class="jxr_linenumber" name="L401" href="#L401">401</a> }
-<a class="jxr_linenumber" name="L402" href="#L402">402</a> }
-<a class="jxr_linenumber" name="L403" href="#L403">403</a>
-<a class="jxr_linenumber" name="L404" href="#L404">404</a> <em
class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L405" href="#L405">405</a> <em
class="jxr_javadoccomment"> * Contains an old and a new path.</em>
-<a class="jxr_linenumber" name="L406" href="#L406">406</a> <em
class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L407" href="#L407">407</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong>
<strong class="jxr_keyword">class</strong> <a
href="../../../../../../../org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.html">URLContainer</a>
-<a class="jxr_linenumber" name="L408" href="#L408">408</a> {
+<a class="jxr_linenumber" name="L398" href="#L398">398</a> }
+<a class="jxr_linenumber" name="L399" href="#L399">399</a>
+<a class="jxr_linenumber" name="L400" href="#L400">400</a> <em
class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L401" href="#L401">401</a> <em
class="jxr_javadoccomment"> * Contains an old and a new path.</em>
+<a class="jxr_linenumber" name="L402" href="#L402">402</a> <em
class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L403" href="#L403">403</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong>
<strong class="jxr_keyword">class</strong> <a
href="../../../../../../../org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.html">URLContainer</a>
+<a class="jxr_linenumber" name="L404" href="#L404">404</a> {
+<a class="jxr_linenumber" name="L405" href="#L405">405</a>
+<a class="jxr_linenumber" name="L406" href="#L406">406</a> <strong
class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong>
String oldPath;
+<a class="jxr_linenumber" name="L407" href="#L407">407</a>
+<a class="jxr_linenumber" name="L408" href="#L408">408</a> <strong
class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong>
String newPath;
<a class="jxr_linenumber" name="L409" href="#L409">409</a>
-<a class="jxr_linenumber" name="L410" href="#L410">410</a> <strong
class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong>
String oldPath;
-<a class="jxr_linenumber" name="L411" href="#L411">411</a>
-<a class="jxr_linenumber" name="L412" href="#L412">412</a> <strong
class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong>
String newPath;
-<a class="jxr_linenumber" name="L413" href="#L413">413</a>
-<a class="jxr_linenumber" name="L414" href="#L414">414</a> <em
class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L415" href="#L415">415</a> <em
class="jxr_javadoccomment"> * Construct a URLContainer.</em>
-<a class="jxr_linenumber" name="L416" href="#L416">416</a> <em
class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L417" href="#L417">417</a> <em
class="jxr_javadoccomment"> * @param oldPath the old path.</em>
-<a class="jxr_linenumber" name="L418" href="#L418">418</a> <em
class="jxr_javadoccomment"> * @param newPath the new path.</em>
-<a class="jxr_linenumber" name="L419" href="#L419">419</a> <em
class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L420" href="#L420">420</a> <strong
class="jxr_keyword">public</strong> <a
href="../../../../../../../org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.html">URLContainer</a>(
<strong class="jxr_keyword">final</strong> String oldPath, <strong
class="jxr_keyword">final</strong> String newPath )
-<a class="jxr_linenumber" name="L421" href="#L421">421</a> {
-<a class="jxr_linenumber" name="L422" href="#L422">422</a> <strong
class="jxr_keyword">this</strong>.oldPath = oldPath;
-<a class="jxr_linenumber" name="L423" href="#L423">423</a> <strong
class="jxr_keyword">this</strong>.newPath = newPath;
-<a class="jxr_linenumber" name="L424" href="#L424">424</a> }
-<a class="jxr_linenumber" name="L425" href="#L425">425</a>
-<a class="jxr_linenumber" name="L426" href="#L426">426</a> <em
class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L427" href="#L427">427</a> <em
class="jxr_javadoccomment"> * Get the new path.</em>
-<a class="jxr_linenumber" name="L428" href="#L428">428</a> <em
class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L429" href="#L429">429</a> <em
class="jxr_javadoccomment"> * @return the new path.</em>
-<a class="jxr_linenumber" name="L430" href="#L430">430</a> <em
class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L431" href="#L431">431</a> <strong
class="jxr_keyword">public</strong> String getNewPath()
-<a class="jxr_linenumber" name="L432" href="#L432">432</a> {
-<a class="jxr_linenumber" name="L433" href="#L433">433</a> <strong
class="jxr_keyword">return</strong> <strong
class="jxr_keyword">this</strong>.newPath;
-<a class="jxr_linenumber" name="L434" href="#L434">434</a> }
-<a class="jxr_linenumber" name="L435" href="#L435">435</a>
-<a class="jxr_linenumber" name="L436" href="#L436">436</a> <em
class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L437" href="#L437">437</a> <em
class="jxr_javadoccomment"> * Get the old path.</em>
-<a class="jxr_linenumber" name="L438" href="#L438">438</a> <em
class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L439" href="#L439">439</a> <em
class="jxr_javadoccomment"> * @return the old path.</em>
-<a class="jxr_linenumber" name="L440" href="#L440">440</a> <em
class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L441" href="#L441">441</a> <strong
class="jxr_keyword">public</strong> String getOldPath()
-<a class="jxr_linenumber" name="L442" href="#L442">442</a> {
-<a class="jxr_linenumber" name="L443" href="#L443">443</a> <strong
class="jxr_keyword">return</strong> <strong
class="jxr_keyword">this</strong>.oldPath;
-<a class="jxr_linenumber" name="L444" href="#L444">444</a> }
-<a class="jxr_linenumber" name="L445" href="#L445">445</a>
-<a class="jxr_linenumber" name="L446" href="#L446">446</a> <em
class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L447" href="#L447">447</a> <em
class="jxr_javadoccomment"> * Rebase only affects relative links, a
relative link wrt an old base gets translated,</em>
-<a class="jxr_linenumber" name="L448" href="#L448">448</a> <em
class="jxr_javadoccomment"> * so it points to the same location as
viewed from a new base</em>
-<a class="jxr_linenumber" name="L449" href="#L449">449</a> <em
class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L450" href="#L450">450</a> <strong
class="jxr_keyword">public</strong> String rebaseLink( <strong
class="jxr_keyword">final</strong> String link )
-<a class="jxr_linenumber" name="L451" href="#L451">451</a> {
-<a class="jxr_linenumber" name="L452" href="#L452">452</a> <strong
class="jxr_keyword">if</strong> ( link == <strong
class="jxr_keyword">null</strong> || getOldPath() == <strong
class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L453" href="#L453">453</a> {
-<a class="jxr_linenumber" name="L454" href="#L454">454</a>
<strong class="jxr_keyword">return</strong> link;
-<a class="jxr_linenumber" name="L455" href="#L455">455</a> }
-<a class="jxr_linenumber" name="L456" href="#L456">456</a>
-<a class="jxr_linenumber" name="L457" href="#L457">457</a> <strong
class="jxr_keyword">final</strong> <a
href="../../../../../../../org/apache/maven/doxia/site/decoration/inheritance/URIPathDescriptor.html">URIPathDescriptor</a>
oldPath = <strong class="jxr_keyword">new</strong> <a
href="../../../../../../../org/apache/maven/doxia/site/decoration/inheritance/URIPathDescriptor.html">URIPathDescriptor</a>(
getOldPath(), link );
-<a class="jxr_linenumber" name="L458" href="#L458">458</a>
-<a class="jxr_linenumber" name="L459" href="#L459">459</a> <strong
class="jxr_keyword">return</strong> oldPath.rebaseLink( getNewPath()
).toString();
-<a class="jxr_linenumber" name="L460" href="#L460">460</a> }
-<a class="jxr_linenumber" name="L461" href="#L461">461</a> }
-<a class="jxr_linenumber" name="L462" href="#L462">462</a> }
+<a class="jxr_linenumber" name="L410" href="#L410">410</a> <em
class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L411" href="#L411">411</a> <em
class="jxr_javadoccomment"> * Construct a URLContainer.</em>
+<a class="jxr_linenumber" name="L412" href="#L412">412</a> <em
class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L413" href="#L413">413</a> <em
class="jxr_javadoccomment"> * @param oldPath the old path.</em>
+<a class="jxr_linenumber" name="L414" href="#L414">414</a> <em
class="jxr_javadoccomment"> * @param newPath the new path.</em>
+<a class="jxr_linenumber" name="L415" href="#L415">415</a> <em
class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L416" href="#L416">416</a> <strong
class="jxr_keyword">public</strong> <a
href="../../../../../../../org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.html">URLContainer</a>(
<strong class="jxr_keyword">final</strong> String oldPath, <strong
class="jxr_keyword">final</strong> String newPath )
+<a class="jxr_linenumber" name="L417" href="#L417">417</a> {
+<a class="jxr_linenumber" name="L418" href="#L418">418</a> <strong
class="jxr_keyword">this</strong>.oldPath = oldPath;
+<a class="jxr_linenumber" name="L419" href="#L419">419</a> <strong
class="jxr_keyword">this</strong>.newPath = newPath;
+<a class="jxr_linenumber" name="L420" href="#L420">420</a> }
+<a class="jxr_linenumber" name="L421" href="#L421">421</a>
+<a class="jxr_linenumber" name="L422" href="#L422">422</a> <em
class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L423" href="#L423">423</a> <em
class="jxr_javadoccomment"> * Get the new path.</em>
+<a class="jxr_linenumber" name="L424" href="#L424">424</a> <em
class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L425" href="#L425">425</a> <em
class="jxr_javadoccomment"> * @return the new path.</em>
+<a class="jxr_linenumber" name="L426" href="#L426">426</a> <em
class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L427" href="#L427">427</a> <strong
class="jxr_keyword">public</strong> String getNewPath()
+<a class="jxr_linenumber" name="L428" href="#L428">428</a> {
+<a class="jxr_linenumber" name="L429" href="#L429">429</a> <strong
class="jxr_keyword">return</strong> <strong
class="jxr_keyword">this</strong>.newPath;
+<a class="jxr_linenumber" name="L430" href="#L430">430</a> }
+<a class="jxr_linenumber" name="L431" href="#L431">431</a>
+<a class="jxr_linenumber" name="L432" href="#L432">432</a> <em
class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L433" href="#L433">433</a> <em
class="jxr_javadoccomment"> * Get the old path.</em>
+<a class="jxr_linenumber" name="L434" href="#L434">434</a> <em
class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L435" href="#L435">435</a> <em
class="jxr_javadoccomment"> * @return the old path.</em>
+<a class="jxr_linenumber" name="L436" href="#L436">436</a> <em
class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L437" href="#L437">437</a> <strong
class="jxr_keyword">public</strong> String getOldPath()
+<a class="jxr_linenumber" name="L438" href="#L438">438</a> {
+<a class="jxr_linenumber" name="L439" href="#L439">439</a> <strong
class="jxr_keyword">return</strong> <strong
class="jxr_keyword">this</strong>.oldPath;
+<a class="jxr_linenumber" name="L440" href="#L440">440</a> }
+<a class="jxr_linenumber" name="L441" href="#L441">441</a>
+<a class="jxr_linenumber" name="L442" href="#L442">442</a> <em
class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L443" href="#L443">443</a> <em
class="jxr_javadoccomment"> * Rebase only affects relative links, a
relative link wrt an old base gets translated,</em>
+<a class="jxr_linenumber" name="L444" href="#L444">444</a> <em
class="jxr_javadoccomment"> * so it points to the same location as
viewed from a new base</em>
+<a class="jxr_linenumber" name="L445" href="#L445">445</a> <em
class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L446" href="#L446">446</a> <strong
class="jxr_keyword">public</strong> String rebaseLink( <strong
class="jxr_keyword">final</strong> String link )
+<a class="jxr_linenumber" name="L447" href="#L447">447</a> {
+<a class="jxr_linenumber" name="L448" href="#L448">448</a> <strong
class="jxr_keyword">if</strong> ( link == <strong
class="jxr_keyword">null</strong> || getOldPath() == <strong
class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L449" href="#L449">449</a> {
+<a class="jxr_linenumber" name="L450" href="#L450">450</a>
<strong class="jxr_keyword">return</strong> link;
+<a class="jxr_linenumber" name="L451" href="#L451">451</a> }
+<a class="jxr_linenumber" name="L452" href="#L452">452</a>
+<a class="jxr_linenumber" name="L453" href="#L453">453</a> <strong
class="jxr_keyword">final</strong> <a
href="../../../../../../../org/apache/maven/doxia/site/decoration/inheritance/URIPathDescriptor.html">URIPathDescriptor</a>
oldPath = <strong class="jxr_keyword">new</strong> <a
href="../../../../../../../org/apache/maven/doxia/site/decoration/inheritance/URIPathDescriptor.html">URIPathDescriptor</a>(
getOldPath(), link );
+<a class="jxr_linenumber" name="L454" href="#L454">454</a>
+<a class="jxr_linenumber" name="L455" href="#L455">455</a> <strong
class="jxr_keyword">return</strong> oldPath.rebaseLink( getNewPath()
).toString();
+<a class="jxr_linenumber" name="L456" href="#L456">456</a> }
+<a class="jxr_linenumber" name="L457" href="#L457">457</a> }
+<a class="jxr_linenumber" name="L458" href="#L458">458</a> }
</pre>
<hr/>
<div id="footer">Copyright © 2005–2016 <a
href="http://www.apache.org/";>The Apache Software Foundation</a>. All rights
reserved.</div>
Modified:
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/inheritance/package-frame.html
==============================================================================
---
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/inheritance/package-frame.html
(original)
+++
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/inheritance/package-frame.html
Thu Feb 11 22:36:31 2016
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html;
charset=UTF-8" />
- <title>Doxia :: Decoration Model 1.7-SNAPSHOT Reference Package
org.apache.maven.doxia.site.decoration.inheritance</title>
+ <title>Doxia :: Decoration Model 1.7 Reference Package
org.apache.maven.doxia.site.decoration.inheritance</title>
<link rel="stylesheet" type="text/css"
href="../../../../../../../stylesheet.css" title="style" />
</head>
<body>
Modified:
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/inheritance/package-summary.html
==============================================================================
---
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/inheritance/package-summary.html
(original)
+++
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/inheritance/package-summary.html
Thu Feb 11 22:36:31 2016
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html;
charset=UTF-8" />
- <title>Doxia :: Decoration Model 1.7-SNAPSHOT Reference Package
org.apache.maven.doxia.site.decoration.inheritance</title>
+ <title>Doxia :: Decoration Model 1.7 Reference Package
org.apache.maven.doxia.site.decoration.inheritance</title>
<link rel="stylesheet" type="text/css"
href="../../../../../../../stylesheet.css" title="style" />
</head>
<body>
Modified:
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/io/xpp3/DecorationXpp3Reader.html
==============================================================================
---
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/io/xpp3/DecorationXpp3Reader.html
(original)
+++
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/io/xpp3/DecorationXpp3Reader.html
Thu Feb 11 22:36:31 2016
@@ -679,7 +679,7 @@
<a class="jxr_linenumber" name="L671" href="#L671">671</a> {
<a class="jxr_linenumber" name="L672" href="#L672">672</a> <strong
class="jxr_keyword">if</strong> ( checkFieldWithDuplicate( parser, <span
class="jxr_string">"head"</span>, <strong class="jxr_keyword">null</strong>,
parsed ) )
<a class="jxr_linenumber" name="L673" href="#L673">673</a> {
-<a class="jxr_linenumber" name="L674" href="#L674">674</a>
body.setHead( org.codehaus.plexus.util.xml.Xpp3DomBuilder.build( parser,
<strong class="jxr_keyword">true</strong> ) );
+<a class="jxr_linenumber" name="L674" href="#L674">674</a>
body.setHead( getTrimmedValue( parser.nextText() ) );
<a class="jxr_linenumber" name="L675" href="#L675">675</a> }
<a class="jxr_linenumber" name="L676" href="#L676">676</a> <strong
class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (
checkFieldWithDuplicate( parser, <span class="jxr_string">"links"</span>,
<strong class="jxr_keyword">null</strong>, parsed ) )
<a class="jxr_linenumber" name="L677" href="#L677">677</a> {
Modified:
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/io/xpp3/DecorationXpp3Writer.html
==============================================================================
---
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/io/xpp3/DecorationXpp3Writer.html
(original)
+++
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/io/xpp3/DecorationXpp3Writer.html
Thu Feb 11 22:36:31 2016
@@ -156,7 +156,7 @@
<a class="jxr_linenumber" name="L148" href="#L148">148</a>
serializer.startTag( NAMESPACE, tagName );
<a class="jxr_linenumber" name="L149" href="#L149">149</a> <strong
class="jxr_keyword">if</strong> ( body.getHead() != <strong
class="jxr_keyword">null</strong> )
<a class="jxr_linenumber" name="L150" href="#L150">150</a> {
-<a class="jxr_linenumber" name="L151" href="#L151">151</a>
((Xpp3Dom) body.getHead()).writeToSerializer( NAMESPACE, serializer );
+<a class="jxr_linenumber" name="L151" href="#L151">151</a>
serializer.startTag( NAMESPACE, <span class="jxr_string">"head"</span> ).text(
body.getHead() ).endTag( NAMESPACE, <span class="jxr_string">"head"</span> );
<a class="jxr_linenumber" name="L152" href="#L152">152</a> }
<a class="jxr_linenumber" name="L153" href="#L153">153</a> <strong
class="jxr_keyword">if</strong> ( ( body.getLinks() != <strong
class="jxr_keyword">null</strong> ) && ( body.getLinks().size() > 0
) )
<a class="jxr_linenumber" name="L154" href="#L154">154</a> {
Modified:
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/io/xpp3/package-frame.html
==============================================================================
---
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/io/xpp3/package-frame.html
(original)
+++
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/io/xpp3/package-frame.html
Thu Feb 11 22:36:31 2016
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html;
charset=UTF-8" />
- <title>Doxia :: Decoration Model 1.7-SNAPSHOT Reference Package
org.apache.maven.doxia.site.decoration.io.xpp3</title>
+ <title>Doxia :: Decoration Model 1.7 Reference Package
org.apache.maven.doxia.site.decoration.io.xpp3</title>
<link rel="stylesheet" type="text/css"
href="../../../../../../../../stylesheet.css" title="style" />
</head>
<body>
Modified:
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/io/xpp3/package-summary.html
==============================================================================
---
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/io/xpp3/package-summary.html
(original)
+++
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/io/xpp3/package-summary.html
Thu Feb 11 22:36:31 2016
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html;
charset=UTF-8" />
- <title>Doxia :: Decoration Model 1.7-SNAPSHOT Reference Package
org.apache.maven.doxia.site.decoration.io.xpp3</title>
+ <title>Doxia :: Decoration Model 1.7 Reference Package
org.apache.maven.doxia.site.decoration.io.xpp3</title>
<link rel="stylesheet" type="text/css"
href="../../../../../../../../stylesheet.css" title="style" />
</head>
<body>
Modified:
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/package-frame.html
==============================================================================
---
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/package-frame.html
(original)
+++
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/package-frame.html
Thu Feb 11 22:36:31 2016
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html;
charset=UTF-8" />
- <title>Doxia :: Decoration Model 1.7-SNAPSHOT Reference Package
org.apache.maven.doxia.site.decoration</title>
+ <title>Doxia :: Decoration Model 1.7 Reference Package
org.apache.maven.doxia.site.decoration</title>
<link rel="stylesheet" type="text/css"
href="../../../../../../stylesheet.css" title="style" />
</head>
<body>
Modified:
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/package-summary.html
==============================================================================
---
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/package-summary.html
(original)
+++
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/org/apache/maven/doxia/site/decoration/package-summary.html
Thu Feb 11 22:36:31 2016
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html;
charset=UTF-8" />
- <title>Doxia :: Decoration Model 1.7-SNAPSHOT Reference Package
org.apache.maven.doxia.site.decoration</title>
+ <title>Doxia :: Decoration Model 1.7 Reference Package
org.apache.maven.doxia.site.decoration</title>
<link rel="stylesheet" type="text/css"
href="../../../../../../stylesheet.css" title="style" />
</head>
<body>
Modified:
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/overview-frame.html
==============================================================================
---
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/overview-frame.html
(original)
+++
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/overview-frame.html
Thu Feb 11 22:36:31 2016
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html;
charset=UTF-8" />
- <title>Doxia :: Decoration Model 1.7-SNAPSHOT Reference</title>
+ <title>Doxia :: Decoration Model 1.7 Reference</title>
<link rel="stylesheet" type="text/css" href="stylesheet.css"
title="style" />
</head>
<body>
Modified:
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/overview-summary.html
==============================================================================
---
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/overview-summary.html
(original)
+++
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xref/overview-summary.html
Thu Feb 11 22:36:31 2016
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html;
charset=UTF-8" />
- <title>Doxia :: Decoration Model 1.7-SNAPSHOT Reference</title>
+ <title>Doxia :: Decoration Model 1.7 Reference</title>
<link rel="stylesheet" type="text/css" href="stylesheet.css"
title="style" />
</head>
<body>
@@ -24,7 +24,7 @@
</ul>
</div>
- <h2>Doxia :: Decoration Model 1.7-SNAPSHOT
Reference</h2>
+ <h2>Doxia :: Decoration Model 1.7 Reference</h2>
<table class="summary">
<thead>
Modified:
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xsd/decoration-1.7.0.xsd
==============================================================================
---
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xsd/decoration-1.7.0.xsd
(original)
+++
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/xsd/decoration-1.7.0.xsd
Thu Feb 11 22:36:31 2016
@@ -191,16 +191,11 @@
<xs:documentation source="description">The main content
decoration.</xs:documentation>
</xs:annotation>
<xs:sequence>
- <xs:element minOccurs="0" name="head">
+ <xs:element minOccurs="0" name="head" type="xs:string">
<xs:annotation>
<xs:documentation source="version">1.0.0+</xs:documentation>
- <xs:documentation source="description">Additional content (like
Javascript) to include in the HEAD block of the generated
pages.</xs:documentation>
+ <xs:documentation source="description">Additional content (like
JavaScript) to include in the HEAD block of the generated
pages.</xs:documentation>
</xs:annotation>
- <xs:complexType>
- <xs:sequence>
- <xs:any minOccurs="0" maxOccurs="unbounded"
processContents="skip"/>
- </xs:sequence>
- </xs:complexType>
</xs:element>
<xs:element minOccurs="0" name="links">
<xs:annotation>
Modified:
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/allclasses-frame.html
==============================================================================
---
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/allclasses-frame.html
(original)
+++
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/allclasses-frame.html
Thu Feb 11 22:36:31 2016
@@ -2,8 +2,8 @@
<!-- NewPage -->
<html lang="fr">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>All Classes (Doxia :: Document Renderer 1.7-SNAPSHOT API)</title>
+<meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
+<title>All Classes (Doxia :: Document Renderer 1.7 API)</title>
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
</head>
<body>
Modified:
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/allclasses-noframe.html
==============================================================================
---
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/allclasses-noframe.html
(original)
+++
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/allclasses-noframe.html
Thu Feb 11 22:36:31 2016
@@ -2,8 +2,8 @@
<!-- NewPage -->
<html lang="fr">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>All Classes (Doxia :: Document Renderer 1.7-SNAPSHOT API)</title>
+<meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
+<title>All Classes (Doxia :: Document Renderer 1.7 API)</title>
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
</head>
<body>
Modified:
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/constant-values.html
==============================================================================
---
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/constant-values.html
(original)
+++
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/constant-values.html
Thu Feb 11 22:36:31 2016
@@ -2,14 +2,14 @@
<!-- NewPage -->
<html lang="fr">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Constant Field Values (Doxia :: Document Renderer 1.7-SNAPSHOT
API)</title>
+<meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
+<title>Constant Field Values (Doxia :: Document Renderer 1.7 API)</title>
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
</head>
<body>
<script type="text/javascript"><!--
if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Constant Field Values (Doxia :: Document
Renderer 1.7-SNAPSHOT API)";
+ parent.document.title="Constant Field Values (Doxia :: Document
Renderer 1.7 API)";
}
//-->
</script>
Modified:
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/deprecated-list.html
==============================================================================
---
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/deprecated-list.html
(original)
+++
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/deprecated-list.html
Thu Feb 11 22:36:31 2016
@@ -2,14 +2,14 @@
<!-- NewPage -->
<html lang="fr">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Deprecated List (Doxia :: Document Renderer 1.7-SNAPSHOT API)</title>
+<meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
+<title>Deprecated List (Doxia :: Document Renderer 1.7 API)</title>
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
</head>
<body>
<script type="text/javascript"><!--
if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Deprecated List (Doxia :: Document Renderer
1.7-SNAPSHOT API)";
+ parent.document.title="Deprecated List (Doxia :: Document Renderer 1.7
API)";
}
//-->
</script>
Modified:
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/help-doc.html
==============================================================================
---
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/help-doc.html
(original)
+++
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/help-doc.html
Thu Feb 11 22:36:31 2016
@@ -2,14 +2,14 @@
<!-- NewPage -->
<html lang="fr">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>API Help (Doxia :: Document Renderer 1.7-SNAPSHOT API)</title>
+<meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
+<title>API Help (Doxia :: Document Renderer 1.7 API)</title>
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
</head>
<body>
<script type="text/javascript"><!--
if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="API Help (Doxia :: Document Renderer
1.7-SNAPSHOT API)";
+ parent.document.title="API Help (Doxia :: Document Renderer 1.7 API)";
}
//-->
</script>
Modified:
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/index-all.html
==============================================================================
---
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/index-all.html
(original)
+++
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/index-all.html
Thu Feb 11 22:36:31 2016
@@ -2,14 +2,14 @@
<!-- NewPage -->
<html lang="fr">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Index (Doxia :: Document Renderer 1.7-SNAPSHOT API)</title>
+<meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
+<title>Index (Doxia :: Document Renderer 1.7 API)</title>
<link rel="stylesheet" type="text/css" href="./stylesheet.css" title="Style">
</head>
<body>
<script type="text/javascript"><!--
if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Index (Doxia :: Document Renderer 1.7-SNAPSHOT
API)";
+ parent.document.title="Index (Doxia :: Document Renderer 1.7 API)";
}
//-->
</script>
Modified:
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/index.html
==============================================================================
---
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/index.html
(original)
+++
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/index.html
Thu Feb 11 22:36:31 2016
@@ -2,8 +2,8 @@
<!-- NewPage -->
<html lang="fr">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Doxia :: Document Renderer 1.7-SNAPSHOT API</title>
+<meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
+<title>Doxia :: Document Renderer 1.7 API</title>
<script type="text/javascript">
targetPage = "" + window.location.search;
if (targetPage != "" && targetPage != "undefined")
Modified:
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/org/apache/maven/doxia/docrenderer/AbstractDocumentRenderer.html
==============================================================================
---
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/org/apache/maven/doxia/docrenderer/AbstractDocumentRenderer.html
(original)
+++
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/org/apache/maven/doxia/docrenderer/AbstractDocumentRenderer.html
Thu Feb 11 22:36:31 2016
@@ -2,14 +2,14 @@
<!-- NewPage -->
<html lang="fr">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>AbstractDocumentRenderer (Doxia :: Document Renderer 1.7-SNAPSHOT
API)</title>
+<meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
+<title>AbstractDocumentRenderer (Doxia :: Document Renderer 1.7 API)</title>
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css"
title="Style">
</head>
<body>
<script type="text/javascript"><!--
if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="AbstractDocumentRenderer (Doxia :: Document
Renderer 1.7-SNAPSHOT API)";
+ parent.document.title="AbstractDocumentRenderer (Doxia :: Document
Renderer 1.7 API)";
}
//-->
</script>
Modified:
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/org/apache/maven/doxia/docrenderer/DocRenderer.html
==============================================================================
---
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/org/apache/maven/doxia/docrenderer/DocRenderer.html
(original)
+++
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/org/apache/maven/doxia/docrenderer/DocRenderer.html
Thu Feb 11 22:36:31 2016
@@ -2,14 +2,14 @@
<!-- NewPage -->
<html lang="fr">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>DocRenderer (Doxia :: Document Renderer 1.7-SNAPSHOT API)</title>
+<meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
+<title>DocRenderer (Doxia :: Document Renderer 1.7 API)</title>
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css"
title="Style">
</head>
<body>
<script type="text/javascript"><!--
if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="DocRenderer (Doxia :: Document Renderer
1.7-SNAPSHOT API)";
+ parent.document.title="DocRenderer (Doxia :: Document Renderer 1.7
API)";
}
//-->
</script>
Modified:
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/org/apache/maven/doxia/docrenderer/DocumentRenderer.html
==============================================================================
---
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/org/apache/maven/doxia/docrenderer/DocumentRenderer.html
(original)
+++
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/org/apache/maven/doxia/docrenderer/DocumentRenderer.html
Thu Feb 11 22:36:31 2016
@@ -2,14 +2,14 @@
<!-- NewPage -->
<html lang="fr">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>DocumentRenderer (Doxia :: Document Renderer 1.7-SNAPSHOT API)</title>
+<meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
+<title>DocumentRenderer (Doxia :: Document Renderer 1.7 API)</title>
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css"
title="Style">
</head>
<body>
<script type="text/javascript"><!--
if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="DocumentRenderer (Doxia :: Document Renderer
1.7-SNAPSHOT API)";
+ parent.document.title="DocumentRenderer (Doxia :: Document Renderer
1.7 API)";
}
//-->
</script>
Modified:
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/org/apache/maven/doxia/docrenderer/DocumentRendererContext.html
==============================================================================
---
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/org/apache/maven/doxia/docrenderer/DocumentRendererContext.html
(original)
+++
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/org/apache/maven/doxia/docrenderer/DocumentRendererContext.html
Thu Feb 11 22:36:31 2016
@@ -2,14 +2,14 @@
<!-- NewPage -->
<html lang="fr">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>DocumentRendererContext (Doxia :: Document Renderer 1.7-SNAPSHOT
API)</title>
+<meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
+<title>DocumentRendererContext (Doxia :: Document Renderer 1.7 API)</title>
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css"
title="Style">
</head>
<body>
<script type="text/javascript"><!--
if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="DocumentRendererContext (Doxia :: Document
Renderer 1.7-SNAPSHOT API)";
+ parent.document.title="DocumentRendererContext (Doxia :: Document
Renderer 1.7 API)";
}
//-->
</script>
Modified:
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/org/apache/maven/doxia/docrenderer/DocumentRendererException.html
==============================================================================
---
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/org/apache/maven/doxia/docrenderer/DocumentRendererException.html
(original)
+++
websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-doc-renderer/apidocs/org/apache/maven/doxia/docrenderer/DocumentRendererException.html
Thu Feb 11 22:36:31 2016
@@ -2,14 +2,14 @@
<!-- NewPage -->
<html lang="fr">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>DocumentRendererException (Doxia :: Document Renderer 1.7-SNAPSHOT
API)</title>
+<meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
+<title>DocumentRendererException (Doxia :: Document Renderer 1.7 API)</title>
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css"
title="Style">
</head>
<body>
<script type="text/javascript"><!--
if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="DocumentRendererException (Doxia :: Document
Renderer 1.7-SNAPSHOT API)";
+ parent.document.title="DocumentRendererException (Doxia :: Document
Renderer 1.7 API)";
}
//-->
</script>
