From 92f60aebd10aae1ed01a1ac9e62c55b33abd078a Mon Sep 17 00:00:00 2001
From: Norman Walsh <ndw@nwalsh.com>
Date: Tue, 29 Oct 2024 08:24:37 +0000
Subject: [PATCH] Fix the way enums are handled; release 0.16.0

---
 gradle.properties                                      |  4 ++--
 sample/src/main/java/org/example/EnumTest.java         |  7 +++++++
 .../com/saxonica/xmldoclet/scanners/XmlPackage.java    |  5 ++---
 xmldoclet/src/main/resources/doclet.rnc                | 10 +---------
 4 files changed, 12 insertions(+), 14 deletions(-)
 create mode 100644 sample/src/main/java/org/example/EnumTest.java

diff --git a/gradle.properties b/gradle.properties
index d657db1..43a3a5d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-docletVersion=0.15.0
-schemaVersion=0.13.0
+docletVersion=0.16.0
+schemaVersion=0.16.0
 docletTitle=XmlDoclet
 docletName=xmldoclet
diff --git a/sample/src/main/java/org/example/EnumTest.java b/sample/src/main/java/org/example/EnumTest.java
new file mode 100644
index 0000000..d621ac4
--- /dev/null
+++ b/sample/src/main/java/org/example/EnumTest.java
@@ -0,0 +1,7 @@
+package org.example;
+
+public class EnumTest {
+    private enum XmlState {NOT_STARTED, IN_DOCUMENT, START_ELEMENT, CONTENT, OUT_DOCUMENT};
+    private XmlState state;
+
+}
diff --git a/xmldoclet/src/main/java/com/saxonica/xmldoclet/scanners/XmlPackage.java b/xmldoclet/src/main/java/com/saxonica/xmldoclet/scanners/XmlPackage.java
index 9e6e913..cb51a99 100644
--- a/xmldoclet/src/main/java/com/saxonica/xmldoclet/scanners/XmlPackage.java
+++ b/xmldoclet/src/main/java/com/saxonica/xmldoclet/scanners/XmlPackage.java
@@ -44,12 +44,11 @@ public void recursiveRefs(Element element) {
                 case INTERFACE:
                     TypeUtils.xmlType(builder, "interfaceref", child.asType());
                     break;
-                case ENUM:
-                    TypeUtils.xmlType(builder, "enumref", child.asType());
-                    break;
                 case ANNOTATION_TYPE:
                     TypeUtils.xmlType(builder, "annotationtyperef", child.asType());
                     break;
+                case ENUM:
+                case ENUM_CONSTANT:
                 case FIELD:
                 case METHOD:
                 case CONSTRUCTOR:
diff --git a/xmldoclet/src/main/resources/doclet.rnc b/xmldoclet/src/main/resources/doclet.rnc
index 8f639f0..c21af40 100644
--- a/xmldoclet/src/main/resources/doclet.rnc
+++ b/xmldoclet/src/main/resources/doclet.rnc
@@ -51,7 +51,7 @@ package =
         attribute name { text },
         purpose?,
         description?,
-        (classref|interfaceref|enumref|annotationtyperef)*
+        (classref|interfaceref|annotationtyperef)*
     }
 
 classref =
@@ -70,14 +70,6 @@ interfaceref =
         param*
     }
 
-enumref =
-    element enumref {
-        attribute package { text }?,
-        attribute name { text },
-        attribute fullname { text },
-        empty
-    }
-
 annotationtyperef =
     element annotationtyperef {
         attribute package { text }?,