Fix broken links in ajdoc. Part 2 : fix links to types in other packages.

1 files changed, 7 insertions, 2 deletions

diff --git a/ajdoc/src/org/aspectj/tools/ajdoc/HtmlDecorator.java b/ajdoc/src/org/aspectj/tools/ajdoc/HtmlDecorator.java
index 8b85a6761..a7f3e2b06 100644
--- a/ajdoc/src/org/aspectj/tools/ajdoc/HtmlDecorator.java
+++ b/ajdoc/src/org/aspectj/tools/ajdoc/HtmlDecorator.java
@@ -479,7 +479,11 @@ class HtmlDecorator {
         		String linkName = rootDir.getAbsolutePath() + "/";
         		if (currDecl.getKind().isType()) {
         			linkName = packagePath + currDecl.getName();
-        			linkRef = currDecl.toLabelString() + ".html";
+					linkRef =
+						getRelativeComponent(packagePath)
+							+ packagePath
+							+ currDecl.toLabelString()
+							+ ".html";
         		} else {
         			
         			linkName = packagePath + currDecl.getParent().getName() + "." + currDecl.getName();
@@ -510,7 +514,8 @@ class HtmlDecorator {
 
     /**
      * Generates a relative directory path fragment that can be 
-     * usd to navigate "upwards".
+     * used to navigate "upwards" from the directory location
+     * implied by the argument.
 	 * @param packagePath
 	 * @return String consisting of multiple "../" parts, one for 
 	 * 		each component part of the input <code>packagePath</code>.