Closes mozilla-mobile#7: Add support for Enum.

This also fixes a bug where Enum would be added twice to the api.txt file.
agi90 · Nov 6, 2018 · 30889f6 · 30889f6
1 parent 4ff685a
commit 30889f6
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/apidoc-plugin/src/main/java/org/mozilla/doclet/ApiDoclet.java b/apidoc-plugin/src/main/java/org/mozilla/doclet/ApiDoclet.java
@@ -122,9 +122,6 @@ private void writePackage(PackageDoc packageDoc, Writer writer) {
         sorted(packageDoc.allClasses()).forEach(
                 c -> writeClass(c, writer.indent()));
 
-        sorted(packageDoc.enums()).forEach(
-                c -> writeClass(c, writer.indent()));
-
         writer.line("}");
         writer.newLine();
     }
@@ -145,8 +142,10 @@ private String toLine(ClassDoc classDoc) {
         String classLine = annotationFragment(classDoc);
         classLine += classDoc.modifiers() + " ";
 
-        if (!classDoc.isInterface()) {
+        if (!classDoc.isInterface() && !classDoc.isEnum()) {
             classLine += "class ";
+        } else if (classDoc.isEnum()) {
+            classLine += "enum ";
         }
 
         classLine += classDoc.name();
@@ -160,7 +159,8 @@ private String toLine(ClassDoc classDoc) {
 
         if (classDoc.superclass() != null
                 // Ignore trivial superclass
-                && !classDoc.superclass().toString().equals("java.lang.Object")) {
+                && !classDoc.superclass().toString().equals("java.lang.Object")
+                && !classDoc.isEnum()) {
             classLine += "extends " + classDoc.superclass() + " ";
         }
 

diff --git a/apidoc-plugin/src/test/fake_root/org/mozilla/test/TestClass.java b/apidoc-plugin/src/test/fake_root/org/mozilla/test/TestClass.java
@@ -105,4 +105,9 @@ public static class TestTypeBoundVariable<T extends java.lang.Runnable> {
     public static interface TestInterfaceTypeVariable<T> {
         public void testTypeVariableMethod(T arg);
     }
+
+    public static enum TestEnum {
+        TestEnumConstantOne,
+        TestEnumConstantTwo,
+    }
 }
diff --git a/apidoc-plugin/src/test/resources/expected-doclet-output.txt b/apidoc-plugin/src/test/resources/expected-doclet-output.txt
@@ -53,6 +53,13 @@ package org.mozilla.test {
     ctor public TestAbstractClass();
   }
 
+  public static final enum TestClass.TestEnum {
+    method public static org.mozilla.test.TestClass.TestEnum[] values();
+    method public static org.mozilla.test.TestClass.TestEnum valueOf(java.lang.String);
+    enum_constant public static final org.mozilla.test.TestClass.TestEnum TestEnumConstantOne;
+    enum_constant public static final org.mozilla.test.TestClass.TestEnum TestEnumConstantTwo;
+  }
+
   public static class TestClass.TestExtends extends org.mozilla.test.TestClass.TestInterfaceImpl {
     ctor public TestExtends();
   }