External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 04:52:07 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Made ClassScanner classloader aware.

Browse source
This commit is contained in:
Lymia Aluysia 2016-09-24 11:31:26 -05:00
parent 14f97ba24a
commit 3c2dd8d335
No known key found for this signature in database
GPG key ID: DB2E204C989251F7
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage/src/main/java/mage/cards/Sets.java
View file

@ -64,7 +64,7 @@ public class Sets extends HashMap<String, ExpansionSet> {
private Sets() {
ArrayList<String> packages = new ArrayList<>();
packages.add("mage.sets");
for (Class c : ClassScanner.findClasses(packages, ExpansionSet.class)) {
for (Class c : ClassScanner.findClasses(null, packages, ExpansionSet.class)) {
try {
addSet((ExpansionSet) c.getMethod("getInstance").invoke(null));
} catch (Exception ex) {

2
Mage/src/main/java/mage/cards/repository/CardScanner.java
View file

@ -63,7 +63,7 @@ public class CardScanner {
}
ExpansionRepository.instance.setContentVersion(ExpansionRepository.instance.getContentVersionConstant());
for (Class c : ClassScanner.findClasses(packages, CardImpl.class)) {
for (Class c : ClassScanner.findClasses(null, packages, CardImpl.class)) {
if (!CardRepository.instance.cardExists(c.getCanonicalName())) {
Card card = CardImpl.createCard(c);
if (card != null) {

16
Mage/src/main/java/mage/util/ClassScanner.java
View file

@ -46,10 +46,10 @@ import java.util.jar.JarInputStream;
*/
public class ClassScanner {
public static List<Class> findClasses(List<String> packages, Class<?> type) {
public static List<Class> findClasses(ClassLoader classLoader, List<String> packages, Class<?> type) {
List<Class> cards = new ArrayList<>();
try {
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
if(classLoader == null) classLoader = Thread.currentThread().getContextClassLoader();
assert classLoader != null;
HashMap<String, String> dirs = new HashMap<>();
@ -71,19 +71,19 @@ public class ClassScanner {
}
for (String filePath : dirs.keySet()) {
cards.addAll(findClasses(new File(filePath), dirs.get(filePath), type));
cards.addAll(findClasses(classLoader, new File(filePath), dirs.get(filePath), type));
}
for (String filePath : jars) {
File file = new File(URLDecoder.decode(filePath, "UTF-8"));
cards.addAll(findClassesInJar(file, packages, type));
cards.addAll(findClassesInJar(classLoader, file, packages, type));
}
} catch (IOException ex) {
}
return cards;
}
private static List<Class> findClasses(File directory, String packageName, Class<?> type) {
private static List<Class> findClasses(ClassLoader classLoader, File directory, String packageName, Class<?> type) {
List<Class> cards = new ArrayList<>();
if (!directory.exists()) {
return cards;
@ -92,7 +92,7 @@ public class ClassScanner {
for (File file : directory.listFiles()) {
if (file.getName().endsWith(".class")) {
try {
Class<?> clazz = Class.forName(packageName + '.' + file.getName().substring(0, file.getName().length() - 6));
Class<?> clazz = Class.forName(packageName + '.' + file.getName().substring(0, file.getName().length() - 6), true, classLoader);
if (type.isAssignableFrom(clazz)) {
cards.add(clazz);
}
@ -103,7 +103,7 @@ public class ClassScanner {
return cards;
}
private static List<Class> findClassesInJar(File file, List<String> packages, Class<?> type) {
private static List<Class> findClassesInJar(ClassLoader classLoader, File file, List<String> packages, Class<?> type) {
List<Class> cards = new ArrayList<>();
if (!file.exists()) {
return cards;
@ -123,7 +123,7 @@ public class ClassScanner {
if (packages.contains(packageName)) {
Class<?> clazz;
try {
clazz = Class.forName(className);
clazz = Class.forName(className, true, classLoader);
if (type.isAssignableFrom(clazz)) {
cards.add(clazz);
}