You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by lt...@apache.org on 2009/08/01 08:07:38 UTC
svn commit: r799807 -
/maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
Author: ltheussl
Date: Sat Aug 1 06:07:37 2009
New Revision: 799807
URL: http://svn.apache.org/viewvc?rev=799807&view=rev
Log:
[MSHARED-117] Parent menu item is not inherited if no url in parent
Modified:
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
Modified: maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java?rev=799807&r1=799806&r2=799807&view=diff
==============================================================================
--- maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java (original)
+++ maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java Sat Aug 1 06:07:37 2009
@@ -820,21 +820,24 @@
}
parentUrl = getRelativePath( parentUrl, project.getUrl() );
-
- if ( menu.getName() == null )
- {
- menu.setName( i18n.getString( "site-tool", locale, "decorationModel.menu.parentproject" ) );
- }
-
- MenuItem item = new MenuItem();
- item.setName( parentProject.getName() );
- item.setHref( parentUrl );
- menu.addItem( item );
}
else
{
- decorationModel.removeMenuRef( "parent" );
+ // parent has no url, assume relative path is given by site structure
+ String parentPath = parentProject.getBasedir().getAbsolutePath();
+ String projectPath = project.getBasedir().getAbsolutePath();
+ parentUrl = getRelativePath( parentPath, projectPath ) + "/index.html";
}
+
+ if ( menu.getName() == null )
+ {
+ menu.setName( i18n.getString( "site-tool", locale, "decorationModel.menu.parentproject" ) );
+ }
+
+ MenuItem item = new MenuItem();
+ item.setName( parentProject.getName() );
+ item.setHref( parentUrl );
+ menu.addItem( item );
}
}