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

diff --git a/ajdoc/src/org/aspectj/tools/ajdoc/HtmlDecorator.java b/ajdoc/src/org/aspectj/tools/ajdoc/HtmlDecorator.java
index 8b85a676177edafd6ffbe22a21a36b792c6a0a4c..a7f3e2b06adf8225665dba2fc148dd92d7abb758 100644 (file)
--- 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>.