Bug fixes

gradle.properties

@@ -1,4 +1,4 @@
-docletVersion=0.3.0
-schemaVersion=0.3.0
+docletVersion=0.4.0
+schemaVersion=0.4.0
 docletTitle=XmlDoclet
 docletName=xmldoclet

xmldoclet/src/main/java/com/saxonica/xmldoclet/builder/XmlBuilder.java

@@ -308,9 +308,14 @@ public void processTree(DocTree tree) {
                 break;
             case PARAM:
             case RETURN:
-            case DEPRECATED:
                 // Handled in enclosing class
                 break;
+            case DEPRECATED:
+                DeprecatedTree depTree = (DeprecatedTree) tree;
+                startElement(depTree.getTagName());
+                html(depTree.getBody());
+                endElement(depTree.getTagName());
+                break;
             case CODE:
             case LITERAL:
                 LiteralTree ltree = (LiteralTree) tree;

xmldoclet/src/main/java/com/saxonica/xmldoclet/builder/XmlProcessor.java

@@ -158,7 +158,16 @@ public void scan() {
         builder = new XmlBuilder(this);
         startDocument();
         for (Element element : elements) {
-            xmlscan(element);
+            if (element.getKind() == ElementKind.CLASS) {
+                TypeElement xelem = (TypeElement) element;
+                if (xelem.getNestingKind() == NestingKind.TOP_LEVEL) {
+                    // Don't output nested, inner classes at the top level. They'll automatically
+                    // be output in the surrounding class
+                    xmlscan(element);
+                }
+            } else {
+                xmlscan(element);
+            }
         }
         endDocument();
 

xmldoclet/src/main/java/com/saxonica/xmldoclet/scanners/XmlExecutableElement.java

@@ -32,7 +32,8 @@ public void scan(DocTree tree) {
         for (TypeMirror ttype : element.getThrownTypes()) {
             Element telem = ((DeclaredType) ttype).asElement();
             // N.B. I'd like to use the fully qualified name here (it's what toString() returns),
-            // but I can't work out how to get the fully qualified name from the ThrowsTree
+            // but I can't work out how to get the fully qualified name from the ThrowsTree.
+            // Note that we try to be careful in the matching code below.
             thrownTypes.put(telem.getSimpleName().toString(), (DeclaredType) ttype);
         }
 
@@ -79,7 +80,17 @@ public void scan(DocTree tree) {
 
                         if (block.getKind() == DocTree.Kind.THROWS) {
                             String name = ((ThrowsTree) block).getExceptionName().getSignature();
-                            thrownTypes.remove(name);
+                            // The name could be either com.example.Exception or just Exception.
+                            // If either of those occurs in thrownTypes, we want to remove it.
+                            String removeKey = null;
+                            for (String key : thrownTypes.keySet()) {
+                                if (name.equals(key) || name.equals(thrownTypes.get(key).toString())) {
+                                    removeKey = key;
+                                }
+                            }
+                            if (removeKey != null) {
+                                thrownTypes.remove(removeKey);
+                            }
                         }
                         break;
                 }
@@ -89,7 +100,7 @@ public void scan(DocTree tree) {
             if (!thrownTypes.isEmpty()) {
                 for (String name : thrownTypes.keySet()) {
                     Map<String,String> tattr = new HashMap<>();
-                    tattr.put("exception", name);
+                    tattr.put("exception", thrownTypes.get(name).toString());
                     builder.startElement("throws", tattr);
                     builder.endElement("throws");
                 }

xmldoclet/src/main/java/com/saxonica/xmldoclet/scanners/XmlTypeElement.java

@@ -55,6 +55,9 @@ public void scan(DocTree tree) {
                 attr.clear();
                 attr.put("name", tp.toString());
                 builder.startElement("typeparam", attr);
+                for (TypeMirror bound : tp.getBounds()) {
+                    TypeUtils.xmlType(builder, "type", bound);
+                }
                 builder.endElement("typeparam");
             }
             builder.endElement("typeparams");

xmldoclet/src/test/java/com/saxonica/xmldoclet/DocletTest.java

@@ -41,10 +41,11 @@ public void sample() {
     public void saxonSample() {
         String[] docletArgs = new String[]{
                 "-doclet", XmlDoclet.class.getName(),
+                "-private",
                 "-docletpath", "build/classes/",
                 "-classpath", "/Users/ndw/.m2/repository/jline/jline/2.14.6/jline-2.14.6.jar:/Volumes/Saxonica/src/saxonica/saxondev/build/releases/eej/lib/xmlresolver-5.2.2.jar",
                 "-sourcepath", "../../saxondev/src/main/java",
-                "net.sf.saxon.serialize", "net.sf.saxon.event"
+                "net.sf.saxon.trans"
         };
 
         DocumentationTool docTool = ToolProvider.getSystemDocumentationTool();