github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-25 11:11:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed Windows classloading - test on MacOS

Browse source
This commit is contained in:
BetaSteward 2011-05-08 12:36:05 -04:00
parent 6cda7ea076
commit 1558e37abd
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Mage/src/mage/cards/ExpansionSet.java
View file

@ -157,7 +157,7 @@ public abstract class ExpansionSet implements Serializable {
private List<Card> getCardClassesForPackage(String packageName) { private List<Card> getCardClassesForPackage(String packageName) {
ClassLoader classLoader = this.getClass().getClassLoader(); ClassLoader classLoader = this.getClass().getClassLoader();
assert classLoader != null; assert classLoader != null;
String path = packageName.replace(".", File.separator); String path = packageName.replace(".", "/");
Enumeration<URL> resources = null; Enumeration<URL> resources = null;
try { try {
resources = classLoader.getResources(path); resources = classLoader.getResources(path);
@ -185,7 +185,7 @@ public abstract class ExpansionSet implements Serializable {
if (jarPath.contains("!")) { if (jarPath.contains("!")) {
jarPath = jarPath.substring(0, jarPath.lastIndexOf('!')); jarPath = jarPath.substring(0, jarPath.lastIndexOf('!'));
} }
String filePathElement = "file:" + File.separator; String filePathElement = "file:";
if (jarPath.startsWith(filePathElement)) { if (jarPath.startsWith(filePathElement)) {
try { try {
jarPath = URLDecoder.decode(jarPath.substring(jarPath.indexOf(filePathElement) + filePathElement.length()), "UTF-8"); jarPath = URLDecoder.decode(jarPath.substring(jarPath.indexOf(filePathElement) + filePathElement.length()), "UTF-8");
@ -258,7 +258,7 @@ public abstract class ExpansionSet implements Serializable {
break; break;
} }
if ((jarEntry.getName().startsWith(packageName)) && (jarEntry.getName().endsWith(".class"))) { if ((jarEntry.getName().startsWith(packageName)) && (jarEntry.getName().endsWith(".class"))) {
String clazz = jarEntry.getName().replaceAll(File.separator, "\\.").replace(".class", ""); String clazz = jarEntry.getName().replaceAll("/", "\\.").replace(".class", "");
Class c = cl.loadClass(clazz); Class c = cl.loadClass(clazz);
if (CardImpl.class.isAssignableFrom(c)) { if (CardImpl.class.isAssignableFrom(c)) {
classes.add(c); classes.add(c);