You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2016/02/06 23:26:15 UTC
svn commit: r1728890 - 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/ test/resources/
Author: hboutemy
Date: Sat Feb 6 22:26:15 2016
New Revision: 1728890
URL: http://svn.apache.org/viewvc?rev=1728890&view=rev
Log:
[DOXIASITETOOLS-147] link breadcrumbs to index.html instead of directory (like menus)
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
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/resources/merged.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=1728890&r1=1728889&r2=1728890&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 Sat Feb 6 22:26:15 2016
@@ -226,7 +226,7 @@ public class DefaultDecorationModelInher
{
LinkItem breadcrumb = new LinkItem();
breadcrumb.setName( name );
- breadcrumb.setHref( "" );
+ breadcrumb.setHref( "index.html" );
cBody.getBreadcrumbs().add( breadcrumb );
}
cBody.setBreadcrumbs( mergeLinkItemLists( cBody.getBreadcrumbs(), pBody.getBreadcrumbs(), urlContainer,
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=1728890&r1=1728889&r2=1728890&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 Sat Feb 6 22:26:15 2016
@@ -773,7 +773,7 @@ public class DecorationModelInheritenceA
// now with child breadcrumb
child = new DecorationModel();
child.setBody( new Body() );
- child.getBody().addBreadcrumb( createLinkItem( "Child", "" ) );
+ child.getBody().addBreadcrumb( createLinkItem( "Child", "index.html" ) );
assembler.assembleModelInheritance( "childName", child, parent,
"http://parent.com/child/", "http://parent.com/" );
assertBreadcrumbsCorrect( child.getBody().getBreadcrumbs(), "Child", parentHref );
@@ -802,7 +802,7 @@ public class DecorationModelInheritenceA
{
assertEquals( "Check size", 2, breadcrumbs.size() );
assertEquals( "Check parent item", createLinkItem( "Parent", parentHref ), breadcrumbs.get( 0 ) );
- assertEquals( "Check child item", createLinkItem( childName, "" ), breadcrumbs.get( 1 ) );
+ assertEquals( "Check child item", createLinkItem( childName, "index.html" ), breadcrumbs.get( 1 ) );
}
/**
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=1728890&r1=1728889&r2=1728890&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 Sat Feb 6 22:26:15 2016
@@ -47,7 +47,7 @@ under the License.
<item name="Apache" href="http://www.apache.org/"/>
<item name="Jakarta Commons" href="http://jakarta.apache.org/commons/"/>
<item name="Sandbox" href="http://jakarta.apache.org/commons/sandbox/"/>
- <item name="Name" href=""/>
+ <item name="Name" href="index.html"/>
</breadcrumbs>
<menu name="Top Menu" inherit="top">