You are viewing a plain text version of this content. The canonical link for it is here.
Posted to doxia-commits@maven.apache.org by hb...@apache.org on 2009/11/25 18:17:06 UTC
svn commit: r884200 - in
/maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src:
main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
test/resources/merged.xml test/resources/parent.xml
Author: hboutemy
Date: Wed Nov 25 17:17:06 2009
New Revision: 884200
URL: http://svn.apache.org/viewvc?rev=884200&view=rev
Log:
[DOXIASITETOOLS-35] fixed model interpolation for text-only banners (without src value)
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/resources/merged.xml
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/resources/parent.xml
Modified: maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java?rev=884200&r1=884199&r2=884200&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java Wed Nov 25 17:17:06 2009
@@ -147,8 +147,14 @@
{
if ( banner != null )
{
- banner.setHref( convertPath( banner.getHref(), urlContainer ) );
- banner.setSrc( convertPath( banner.getSrc(), urlContainer ) );
+ if ( banner.getHref() != null )
+ {
+ banner.setHref( convertPath( banner.getHref(), urlContainer ) );
+ }
+ if ( banner.getSrc() != null )
+ {
+ banner.setSrc( convertPath( banner.getSrc(), urlContainer ) );
+ }
}
}
Modified: maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/resources/merged.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/resources/merged.xml?rev=884200&r1=884199&r2=884200&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/resources/merged.xml (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/resources/merged.xml Wed Nov 25 17:17:06 2009
@@ -25,7 +25,6 @@
name="Child">
<bannerLeft>
<name>The Jakarta Project</name>
- <src>http://jakarta.apache.org/images/jakarta-logo.gif</src>
<href>http://jakarta.apache.org/</href>
</bannerLeft>
<bannerRight>
Modified: maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/resources/parent.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/resources/parent.xml?rev=884200&r1=884199&r2=884200&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/resources/parent.xml (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/resources/parent.xml Wed Nov 25 17:17:06 2009
@@ -25,7 +25,6 @@
name="Parent Name">
<bannerLeft>
<name>The Jakarta Project</name>
- <src>http://jakarta.apache.org/images/jakarta-logo.gif</src>
<href>http://jakarta.apache.org/</href>
</bannerLeft>
<bannerRight>