- I added the variance display for class declar...

- I added the variance display for class declarations. - I changed the
display of sealed symbols from "qualified" to "sealed". - I removed the
display of the leading "?" character for symbols coming from a Java
meta-attribute.

3 files changed, 9 insertions, 1 deletions

diff --git a/sources/scala/tools/scaladoc/SymbolTablePrinter.java b/sources/scala/tools/scaladoc/SymbolTablePrinter.java
index 638bcee31a..d2d64f7004 100644
--- a/sources/scala/tools/scaladoc/SymbolTablePrinter.java
+++ b/sources/scala/tools/scaladoc/SymbolTablePrinter.java
@@ -152,6 +152,11 @@ public abstract class MySymbolTablePrinter extends SymbolTablePrinter {
     public SymbolTablePrinter printShortSignature(Symbol symbol, boolean addLink) {
         String keyword = getSymbolKeywordForDoc(symbol);
         if (keyword != null) print(keyword).space();
+        // variance
+        if (symbol.variance() > 0)
+            print("+");
+        else if (symbol.variance() < 0)
+            print("-");
 	printSymbol(symbol, addLink);
         return printType(symbol.loBound(), ">:");
     }
diff --git a/sources/scala/tools/scaladoc/SymbolTablePrinterFactory.java b/sources/scala/tools/scaladoc/SymbolTablePrinterFactory.java
index ad78902dad..18b2e23915 100644
--- a/sources/scala/tools/scaladoc/SymbolTablePrinterFactory.java
+++ b/sources/scala/tools/scaladoc/SymbolTablePrinterFactory.java
@@ -33,6 +33,9 @@ class SymbolTablePrinterFactory {
 
 		public void printSymbol(Symbol sym, boolean addLink) {
 		    String name = sym.nameString();
+                    // remove the leading "?" for names that come from attributes
+                    if (name.startsWith("?"))
+                        name = name.substring(1);
 		    if (global.debug) name = sym.name.toString();
 		    if (isDocumented.apply(sym))
 			if (addLink)
diff --git a/sources/scalac/symtab/Modifiers.java b/sources/scalac/symtab/Modifiers.java
index 952736083f..173eda4e61 100644
--- a/sources/scalac/symtab/Modifiers.java
+++ b/sources/scalac/symtab/Modifiers.java
@@ -139,7 +139,7 @@ public interface Modifiers {
             if (isProtected(flags)) buffer.append("protected ");
             if (isAbstract(flags)) buffer.append("abstract ");
             if (isFinal(flags)) buffer.append("final ");
-            if (isSealed(flags)) buffer.append("qualified ");
+            if (isSealed(flags)) buffer.append("sealed ");
             if (isInterface(flags)) buffer.append("interface ");
             if (isCase(flags)) buffer.append("case ");
             if (isDef(flags)) buffer.append("def ");