Proper code style

This commit is contained in:
Clisprail
2014-02-24 23:29:20 +01:00
parent fd5be2da22
commit f509181666
@@ -36,20 +36,25 @@ import org.parabot.core.ui.components.VerboseLoader;
* @author Matt * @author Matt
*/ */
public class ClassPath { public class ClassPath {
public final HashMap<String, ClassNode> classes = new HashMap<String, ClassNode>(); public final HashMap<String, ClassNode> classes;
public final Map<String, URL> resources = new HashMap<String, URL>(); public final Map<String, URL> resources;
public URL lastParsed;
private ClassRemapper classRemapper;
private boolean isJar;
private boolean parseJar;
private ArrayList<URL> jarFiles;
private boolean isJar = false;
private boolean parseJar = true;
private ArrayList<URL> jarFiles = new ArrayList<URL>();
public URL lastParsed = null;
public ClassPath() { public ClassPath() {
this(false);
} }
public ClassPath(final boolean isJar) { public ClassPath(final boolean isJar) {
this.classes = new HashMap<String, ClassNode>();
this.resources = new HashMap<String, URL>();
this.classRemapper = new ClassRemapper();
this.parseJar = true;
this.jarFiles = new ArrayList<URL>();
this.isJar = isJar; this.isJar = isJar;
} }
@@ -179,8 +184,6 @@ public class ClassPath {
} }
} }
ClassRemapper class_mapper = new ClassRemapper();
/** /**
* Loads class from input stream * Loads class from input stream
* *
@@ -191,7 +194,7 @@ public class ClassPath {
ClassReader cr = new ClassReader(in); ClassReader cr = new ClassReader(in);
ClassNode cn = new ClassNode(); ClassNode cn = new ClassNode();
cr.accept(cn, 0); cr.accept(cn, 0);
RemappingClassAdapter rca = new RemappingClassAdapter(cn,class_mapper); RemappingClassAdapter rca = new RemappingClassAdapter(cn,classRemapper);
ClassNode remapped = new ClassNode(); ClassNode remapped = new ClassNode();
cn.accept(rca); cn.accept(rca);
classes.put(cn.name, remapped); classes.put(cn.name, remapped);