Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the way enums are handled; release 0.16.0 #23

Merged
merged 1 commit into from
Oct 29, 2024
Merged

Fix the way enums are handled; release 0.16.0 #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
docletVersion=0.15.0
schemaVersion=0.13.0
docletVersion=0.16.0
schemaVersion=0.16.0
docletTitle=XmlDoclet
docletName=xmldoclet
7 changes: 7 additions & 0 deletions sample/src/main/java/org/example/EnumTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

}
5 changes: 2 additions & 3 deletions xmldoclet/src/main/java/com/saxonica/xmldoclet/scanners/XmlPackage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
10 changes: 1 addition & 9 deletions xmldoclet/src/main/resources/doclet.rnc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ package =
attribute name { text },
purpose?,
description?,
(classref|interfaceref|enumref|annotationtyperef)*
(classref|interfaceref|annotationtyperef)*
}

classref =
Expand All @@ -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 }?,
Expand Down
Loading