langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java Mon Nov 14 19:45:41 2016 +0530
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java Mon Nov 14 16:33:48 2016 -0800
@@ -25,7 +25,6 @@
package jdk.javadoc.internal.doclets.toolkit.util;
-import java.io.IOException;
import java.lang.annotation.Documented;
import java.lang.ref.SoftReference;
import java.text.CollationKey;
@@ -77,9 +76,7 @@
import com.sun.source.util.TreePath;
import jdk.javadoc.internal.doclets.toolkit.CommentUtils.DocCommentDuo;
import jdk.javadoc.internal.doclets.toolkit.Configuration;
-import jdk.javadoc.internal.doclets.toolkit.DocletException;
import jdk.javadoc.internal.doclets.toolkit.Messages;
-import jdk.javadoc.internal.doclets.toolkit.Resources;
import jdk.javadoc.internal.doclets.toolkit.WorkArounds;
import static javax.lang.model.element.ElementKind.*;
@@ -258,14 +255,6 @@
return getEnclosingTypeElement(e) == null || isStatic(e);
}
- public boolean matches(Element e1, Element e2) {
- if (isExecutableElement(e1) && isExecutableElement(e1)) {
- return executableMembersEqual((ExecutableElement)e1, (ExecutableElement)e2);
- } else {
- return e1.getSimpleName().equals(e2.getSimpleName());
- }
- }
-
/**
* Copy doc-files directory and its contents from the source
* package directory to the generated documentation directory.
@@ -2161,6 +2150,13 @@
return convertToExecutableElement(getItems(e, false, METHOD));
}
+ public int getOrdinalValue(VariableElement member) {
+ if (member == null || member.getKind() != ENUM_CONSTANT) {
+ throw new IllegalArgumentException("must be an enum constant: " + member);
+ }
+ return member.getEnclosingElement().getEnclosedElements().indexOf(member);
+ }
+
public long getLineNumber(Element e) {
TreePath path = getTreePath(e);
if (path == null) { // maybe null if synthesized