svn commit: r1082461 - in /maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src: main/java/org/apache/maven/doxia/site/decoration/inheritance/ test/java/org/apache/maven/doxia/site/decoration/inheritance/

[ltheussl]

Author: ltheussl
Date: Thu Mar 17 12:37:02 2011
New Revision: 1082461

URL: http://svn.apache.org/viewvc?rev=1082461&view=rev
Log:
distinguish between empty and null hrefs

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/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritenceAssemblerTest.java

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=1082461&r1=1082460&r2=1082461&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
 Thu Mar 17 12:37:02 2011
@@ -34,7 +34,6 @@ import org.apache.maven.doxia.site.decor
 import org.apache.maven.doxia.site.decoration.Skin;
 import org.apache.maven.doxia.site.decoration.Version;
 
-import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 
 /**
@@ -157,17 +156,9 @@ public class DefaultDecorationModelInher
      */
     private void relativizeBannerPaths( final Banner banner, final String 
baseUrl )
     {
-        if ( banner != null )
-        {
-            if ( StringUtils.isNotEmpty( banner.getHref() ) )
-            {
-                banner.setHref( relativizeLink( banner.getHref(), baseUrl ) );
-            }
-            if ( StringUtils.isNotEmpty( banner.getSrc() ) )
-            {
-                banner.setSrc( relativizeLink( banner.getSrc(), baseUrl ) );
-            }
-        }
+        // banner has been checked to be not null, both href and src may be 
empty or null
+        banner.setHref( relativizeLink( banner.getHref(), baseUrl ) );
+        banner.setSrc( relativizeLink( banner.getSrc(), baseUrl ) );
     }
 
     private void rebaseBannerPaths( final Banner banner, final URLContainer 
urlContainer )
@@ -294,24 +285,13 @@ public class DefaultDecorationModelInher
 
     private void relativizeLinkItemPaths( final LinkItem item, final String 
baseUrl )
     {
-        if ( StringUtils.isNotEmpty( item.getHref() ) )
-        {
-            String href = relativizeLink( item.getHref(), baseUrl );
-            if ( StringUtils.isNotEmpty( href ) )
-            {
-                item.setHref( href );
-            }
-        }
-        else
-        {
-            item.setHref( relativizeLink( "", baseUrl ) );
-        }
+        item.setHref( relativizeLink( item.getHref(), baseUrl ) );
     }
 
     private void rebaseLinkItemPaths( final LinkItem item, final URLContainer 
urlContainer )
     {
         item.setHref( rebaseLink( item.getHref(), urlContainer ) );
-   }
+    }
 
     private void relativizeLogoPaths( final Logo logo, final String baseUrl )
     {

Modified: 
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritenceAssemblerTest.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritenceAssemblerTest.java?rev=1082461&r1=1082460&r2=1082461&view=diff
==============================================================================
--- 
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritenceAssemblerTest.java
 (original)
+++ 
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritenceAssemblerTest.java
 Thu Mar 17 12:37:02 2011
@@ -613,7 +613,7 @@ public class DecorationModelInheritenceA
         model.getBody().addBreadcrumb( createLinkItem( "Foo", null ) );
         assembler.resolvePaths( model, "http://foo.apache.org"; );
         assertEquals( "Check size", 1, model.getBody().getBreadcrumbs().size() 
);
-        assertEquals( "Check item", createLinkItem( "Foo", "" ), 
model.getBody().getBreadcrumbs().get( 0 ) );
+        assertEquals( "Check item", createLinkItem( "Foo", null ), 
model.getBody().getBreadcrumbs().get( 0 ) );
     }
 
     public void testBreadcrumbs()
@@ -706,7 +706,7 @@ public class DecorationModelInheritenceA
         model.addPoweredBy( createLogo( "Foo", "http://foo.apache.org";, null ) 
);
         assembler.resolvePaths( model, "http://foo.apache.org"; );
         assertEquals( "Check size", 1, model.getPoweredBy().size() );
-        assertEquals( "Check item", createLogo( "Foo", 
"http://foo.apache.org";, null ), model.getPoweredBy().get( 0 ) );
+        assertEquals( "Check item", createLogo( "Foo", "", null ), 
model.getPoweredBy().get( 0 ) );
     }
 
     private static Banner createBanner( String name, String href, String src, 
String alt )