Author: ltheussl
Date: Fri Dec 17 14:32:15 2010
New Revision: 1050402
URL: http://svn.apache.org/viewvc?rev=1050402&view=rev
Log:
[MSHARED-174] do not remove modules menu if it gets inherited
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=1050402&r1=1050401&r2=1050402&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
Fri Dec 17 14:32:15 2010
@@ -963,8 +963,9 @@ public class DefaultSiteTool
}
populateModulesMenuItemsFromModels( project, models, menu
);
}
- else
+ else if ( decorationModel.getMenuRef( "modules" ).getInherit() ==
null )
{
+ // only remove if project has no modules AND menu is not
inherited, see MSHARED-174
decorationModel.removeMenuRef( "modules" );
}
}