*** empty log message ***

3 files changed, 20 insertions, 111 deletions

diff --git a/sources/scala/tools/scaladoc/HTMLGenerator.java b/sources/scala/tools/scaladoc/HTMLGenerator.java
index 769cf953eb..3d8978bad7 100644
--- a/sources/scala/tools/scaladoc/HTMLGenerator.java
+++ b/sources/scala/tools/scaladoc/HTMLGenerator.java
@@ -997,7 +997,8 @@ public class HTMLGenerator {
                 page.printAhref(
                     packageSummaryPage(sym),
                     CLASSES_FRAME,
-                    sym.fullNameString());
+		    removeHtmlSuffix(Location.getURI(sym).toString()));
+		//                    sym.fullNameString());
 	        page.printlnSTag("br");
 	    }
             page.undent();
@@ -1077,23 +1078,25 @@ public class HTMLGenerator {
         page.printHeader(ATTRS_META, getGenerator());
 	page.printOpenBody();
 
+	page.printlnOTag("table", ATTRS_NAVIGATION).indent();
+	page.printlnOTag("tr").indent();
+	page.printlnOTag("td", ATTRS_NAVIGATION_LINKS).indent();
+
+	printPath(sym);
+	//            page.printlnAhref(definitionURL(sym), ROOT_FRAME, sym.fullNameString());
+
+	page.printlnCTag("td");
+	page.printlnCTag("tr");
+	page.printlnCTag("table");
+	page.printlnSTag("p");
+
+
         String[] titles = new String[]{ "Objects", "Traits", "Classes" };
         if (sym.isRoot()) {
             Tree[][] members = ScalaSearch.getSortedPackageMemberList(tree);
             for (int i = 0; i < titles.length; i++)
                 addTreeTable(members[i], "All " + titles[i], true);
         } else {
-	    page.printlnOTag("table", ATTRS_NAVIGATION).indent();
-	    page.printlnOTag("tr").indent();
-	    page.printlnOTag("td", ATTRS_NAVIGATION_LINKS).indent();
-
-            page.printlnAhref(definitionURL(sym), ROOT_FRAME, sym.fullNameString());
-
-            page.printlnCTag("td");
-            page.printlnCTag("tr");
-            page.printlnCTag("table");
-
-            page.printlnSTag("p");
             Tree[][] members = members(tree);
             for (int i = 0; i < titles.length; i++)
                 addTreeTable(members[i + 2], titles[i], false);
@@ -1560,6 +1563,7 @@ public class HTMLGenerator {
      * @param label
      */
     protected Symbol findSymbolFromString(Symbol context, String classOrObject, String label) {
+	/*
 	String path;
 	// absolute path
 	if (classOrObject.startsWith(new Character(ScalaSearch.classChar).toString()) ||
@@ -1591,5 +1595,7 @@ public class HTMLGenerator {
 		return sym.moduleClass().lookup(Name.fromString(label).toTermName());
 	    }
 	}
+	*/
+	return Symbol.NONE;
     }
 }
diff --git a/sources/scala/tools/scaladoc/ScalaSearch.java b/sources/scala/tools/scaladoc/ScalaSearch.java
index e753c0f2b5..5777beca19 100644
--- a/sources/scala/tools/scaladoc/ScalaSearch.java
+++ b/sources/scala/tools/scaladoc/ScalaSearch.java
@@ -36,68 +36,6 @@ import scalac.util.NameTransformer;
 public class ScalaSearch {
 
     /**
-     * Character which ends a name to indicates it is a class symbol
-     * name.
-     */
-    public static final char classChar = ',';
-
-    /**
-     * Character which ends a name to indicates it is an object symbol
-     * name.
-     */
-    public static final char objectChar = '.';
-
-    /**
-     * Returns the list of owners of a symbol (including itself).
-     *
-     * @param sym
-     */
-    public static Symbol[] getOwners(Symbol sym) {
-        List l = getOwnersAux(sym);
-        return (Symbol[]) l.toArray(new Symbol[l.size()]);
-    }
-
-    // where
-    private static List getOwnersAux(Symbol sym) {
-	if (sym == Symbol.NONE)
-	    return new LinkedList();
-	else {
-	    List ownerStaticPath = getOwnersAux(sym.owner());
-	    sym = sym.isModuleClass() ? sym.module() : sym;
-	    ownerStaticPath.add(sym);
-	    return ownerStaticPath;
-	}
-    }
-
-    /**
-     * Gives a string representation of this symbol.
-     *
-     * @param sym
-     * @param showOwners
-     */
-    public static String getSymbolName(Symbol sym, boolean showOwners) {
-        return (showOwners) ? getOwnersString(sym) : sym.nameString();
-    }
-
-    /**
-     * Returns a string representation of the path leading to this
-     * symbol.
-     *
-     * @param sym
-     * @return the string representation of this symbol
-     */
-    public static String getOwnersString(Symbol sym) {
-	Symbol[] elements = getOwners(sym);
-	StringBuffer buff = new StringBuffer();
-        // we ignore elements[0] which contains the root symbol
-	for (int i = 1; i < elements.length; i++) {
-            if (i > 1) buff.append(objectChar);
-	    buff.append(elements[i].nameString());
-	}
-	return buff.toString();
-    }
-
-    /**
      * Class representing functions on trees.
      */
     public static abstract class TreeFun {
@@ -475,35 +413,4 @@ public class ScalaSearch {
 	}
 	return new Pair(owners, groups);
     }
-
-    // where
-    public static Symbol lookup(Symbol root, String path) {
-	if (path.equals(""))
-	    return root;
-	else {
-	    int classEnd = path.indexOf(classChar);
-	    int objectEnd = path.indexOf(objectChar);
-	    if (classEnd > 0 && (objectEnd == -1 || objectEnd > classEnd)) {
-		String name = path.substring(0, classEnd);
-		String rest = path.substring(classEnd + 1);
-		Symbol member = root.moduleClass().lookup(Name.fromString(name).toTypeName());
-		if (member.isClass())
-		    return lookup(member, rest);
-		else
-		    return Symbol.NONE;
-	    }
-	    else if (objectEnd > 0 && (classEnd == -1 || classEnd > objectEnd)) {
-		String name = path.substring(0, objectEnd);
-		String rest = path.substring(objectEnd + 1);
-		Symbol member = root.moduleClass().lookup(Name.fromString(name).toTermName());
-		if (member.isModule())
-		    return lookup(member, rest);
-		else
-		    return Symbol.NONE;
-	    }
-	    else
-		throw Debug.abort("illegal path", path);
-	}
-    }
-
 }
diff --git a/sources/scala/tools/scaladoc/SymbolTablePrinter.java b/sources/scala/tools/scaladoc/SymbolTablePrinter.java
index e1b49f396a..b8f31ac75a 100644
--- a/sources/scala/tools/scaladoc/SymbolTablePrinter.java
+++ b/sources/scala/tools/scaladoc/SymbolTablePrinter.java
@@ -166,12 +166,8 @@ public class SymbolTablePrinter extends scalac.symtab.SymbolTablePrinter {
      * @param addLink
      */
     public SymbolTablePrinter printSignature(Symbol symbol, boolean addLink) {
-        String keyword = getSymbolKeyword(symbol);
-        if (keyword != null) print(keyword).space();
-        String inner = getSymbolInnerString(symbol);
-	htmlGenerator.printSymbol(symbol, addLink);
-        return printType(symbol.loBound(), ">:")
-	    .printSymbolType(symbol, inner);
+	return printShortSignature(symbol, addLink)
+	    .printSymbolType(symbol, getSymbolInnerString(symbol));
     }
 
     /**