You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2014/12/20 13:13:32 UTC
svn commit: r1646961 -
/maven/doxia/doxia-tools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
Author: michaelo
Date: Sat Dec 20 12:13:32 2014
New Revision: 1646961
URL: http://svn.apache.org/r1646961
Log:
[DOXIATOOLS-49] Print artifactId only in modules menu when module has no name
Modified:
maven/doxia/doxia-tools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
Modified: maven/doxia/doxia-tools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java?rev=1646961&r1=1646960&r2=1646961&view=diff
==============================================================================
--- maven/doxia/doxia-tools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java (original)
+++ maven/doxia/doxia-tools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java Sat Dec 20 12:13:32 2014
@@ -1231,25 +1231,12 @@ public class DefaultSiteTool
for ( Model model : models )
{
String reactorUrl = getDistMgmntSiteUrl( model );
- String name = name( model );
+ String name = ( model.getName() == null ) ? model.getArtifactId() : model.getName();
appendMenuItem( project, menu, name, reactorUrl, model.getArtifactId() );
}
}
- private static String name( final Model model )
- {
- String name = model.getName();
-
- if ( name == null )
- {
- name = "Unnamed - " + model.getGroupId() + ":" + model.getArtifactId() + ":"
- + model.getPackaging() + ":" + model.getVersion();
- }
-
- return name;
- }
-
/**
* @param project not null
* @param menu not null