Skip to content

Fix for issue #577, avoid using reflection #578

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

Merged
vsch merged 1 commit into from
Apr 16, 2025
Merged

Fix for issue #577, avoid using reflection #578

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
18 changes: 5 additions & 13 deletions flexmark-util-misc/src/main/java/com/vladsch/flexmark/util/misc/BitFieldSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import org.jetbrains.annotations.NotNull;

import java.io.Serializable;
import java.lang.reflect.Field;
import java.util.AbstractSet;
import java.util.Collection;
import java.util.Iterator;
Expand Down Expand Up @@ -36,26 +35,19 @@ static class UniverseLoader {

@SuppressWarnings("rawtypes")
@NotNull
public static Enum[] getUniverseSlow(Class elementType) {
public static <E extends Enum<E>> Enum[] getUniverseSlow(Class<E> elementType) {
assert (elementType.isEnum());
Enum[] cachedUniverse = enumUniverseMap.get(elementType);
if (cachedUniverse != null) return cachedUniverse;

Field[] fields = elementType.getFields();
int enums = 0;
for (Field field : fields) {
if (field.getType().isEnum()) enums++;
}

E[] constants = elementType.getEnumConstants();
int enums = constants.length;
if (enums > 0) {
cachedUniverse = new Enum[enums];

enums = 0;
for (Field field : fields) {
if (field.getType().isEnum()) {
//noinspection unchecked
cachedUniverse[enums++] = Enum.valueOf((Class<Enum>) field.getType(), field.getName());
}
for (E constant : constants) {
cachedUniverse[enums++] = constant;
}
} else {
cachedUniverse = ZERO_LENGTH_ENUM_ARRAY;
Expand Down