ClassPath back to it's original state

This commit is contained in:
Clisprail
2014-02-23 13:23:04 +01:00
parent 51fee33c87
commit 85929bf312
@@ -34,25 +34,23 @@ import org.parabot.core.ui.components.VerboseLoader;
* @author Matt * @author Matt
*/ */
public class ClassPath { public class ClassPath {
public final HashMap<String, ClassNode> classes; public final HashMap<String, ClassNode> classes = new HashMap<String, ClassNode>();
public final Map<String, URL> resources; public final Map<String, URL> resources = new HashMap<String, URL>();
private boolean isJar;
private boolean parseJar; private boolean isJar = false;
private ArrayList<URL> jarFiles; private boolean parseJar = true;
private ArrayList<URL> jarFiles = new ArrayList<URL>();
public URL lastParsed = null; public URL lastParsed = null;
public ClassPath() { public ClassPath() {
this(false);
} }
public ClassPath(final boolean isJar) { public ClassPath(final boolean isJar) {
this.isJar = isJar; this.isJar = isJar;
this.classes = new HashMap<String, ClassNode>();
this.resources = new HashMap<String, URL>();
this.jarFiles = new ArrayList<URL>();
} }
public void addJar(final File file) { public void addJar(final File file) {
try { try {
addJar(file.toURI().toURL()); addJar(file.toURI().toURL());
@@ -60,7 +58,7 @@ public class ClassPath {
e.printStackTrace(); e.printStackTrace();
} }
} }
public void addJar(final URL url) { public void addJar(final URL url) {
this.lastParsed = url; this.lastParsed = url;
try { try {
@@ -98,8 +96,8 @@ public class ClassPath {
} }
VerboseLoader.get().onProgressUpdate(100); VerboseLoader.get().onProgressUpdate(100);
} }
/** /**
* Adds a jar to this classpath * Adds a jar to this classpath
@@ -123,7 +121,7 @@ public class ClassPath {
public void parseJarFiles(final boolean enabled) { public void parseJarFiles(final boolean enabled) {
this.parseJar = enabled; this.parseJar = enabled;
} }
/** /**
* Finds and loads all classes/jar files in folder * Finds and loads all classes/jar files in folder
* @param directory * @param directory
@@ -289,4 +287,4 @@ public class ClassPath {
} }
} }
} }