svn commit: r392177 - /maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java

[brett]

Author: brett
Date: Thu Apr  6 21:20:14 2006
New Revision: 392177

URL: http://svn.apache.org/viewcvs?rev=392177&view=rev
Log:
[MSITE-86] fix link rendering when URL is null

Modified:
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java

Modified: 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
URL: 
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java?rev=392177&r1=392176&r2=392177&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
 Thu Apr  6 21:20:14 2006
@@ -711,7 +711,7 @@
                     String reactorUrl = reactorProject.getUrl();
                     String name = reactorProject.getName();
 
-                    appendMenuItem( menu, name, reactorUrl );
+                    appendMenuItem( menu, name, reactorUrl, 
reactorProject.getArtifactId() );
                 }
             }
         }
@@ -730,31 +730,38 @@
                 String reactorUrl = model.getUrl();
                 String name = model.getName();
 
-                appendMenuItem( menu, name, reactorUrl );
+                appendMenuItem( menu, name, reactorUrl, model.getArtifactId() 
);
             }
         }
     }
 
-    private void appendMenuItem( Menu menu, String name, String href )
+    private void appendMenuItem( Menu menu, String name, String href, String 
defaultHref )
     {
-        if ( href != null )
+        String selectedHref = href;
+
+        if ( selectedHref == null )
         {
-            MenuItem item = new MenuItem();
-            item.setName( name );
+            selectedHref = defaultHref;
+        }
 
-            String baseUrl = project.getUrl();
-            href = getRelativePath( href, baseUrl );
+        MenuItem item = new MenuItem();
+        item.setName( name );
 
-            if ( href.endsWith( "/" ) )
-            {
-                item.setHref( href + "index.html" );
-            }
-            else
-            {
-                item.setHref( href + "/index.html" );
-            }
-            menu.addItem( item );
+        String baseUrl = project.getUrl();
+        if ( baseUrl != null )
+        {
+            selectedHref = getRelativePath( selectedHref, baseUrl );
+        }
+
+        if ( selectedHref.endsWith( "/" ) )
+        {
+            item.setHref( selectedHref + "index.html" );
+        }
+        else
+        {
+            item.setHref( selectedHref + "/index.html" );
         }
+        menu.addItem( item );
     }
 
     protected Map locateReports( List reports, Map documents, Locale locale )