Fix clicking anywhere on the class tree opening the last selected class

Author: Col-E

src/me/coley/jremapper/Main.java

@@ -14,8 +14,8 @@ public static void main(String[] args) {
 		}
 		Program program = new Program();
 		program.showGui();
-		program.onFileSelect(new java.io.File("JRemapper.jar"));
-		program.onClassSelect(program.getJarReader().getMapping().getOrCreateClassMapping("me/coley/bmf/FieldNode"));
+		//program.onFileSelect(new java.io.File("JRemapper.jar"));
+		//program.onClassSelect(program.getJarReader().getMapping().getOrCreateClassMapping("me/coley/bmf/FieldNode"));
 	}
 
 }

src/me/coley/jremapper/gui/component/tree/FileTree.java

@@ -45,7 +45,7 @@ public void setup() {
 		String jarName = read.getFile().getName();
 		MappingTreeNode root = new MappingTreeNode(jarName, null);
 		DefaultTreeModel model = new DefaultTreeModel(root);
-		FileSelectionListener sel = new FileSelectionListener(callback);
+		FileSelectionListener sel = new FileSelectionListener(tree, callback);
 		tree.addTreeSelectionListener(sel);
 		tree.addMouseListener(sel);
 		tree.setModel(model);
@@ -58,7 +58,7 @@ public void setup() {
 			ClassMapping mapping = read.getMapping().getMapping(className);
 			String curName = mapping.name.getValue();
 			// Create directory path based on current mapping stored name.
-			ArrayList<String> dirPath = new ArrayList<String>(Arrays.asList(curName.split("/")));
+			List<String> dirPath = new ArrayList<>(Arrays.asList(curName.split("/")));
 			// Create directory of nodes
 			generateTreePath(root, dirPath, mapping, model);
 		}
@@ -75,8 +75,8 @@ public void setup() {
 	public void update(JarReader read, String originalName, String newPathName) {
 		ClassMapping mapping = read.getMapping().getMapping(originalName);
 		String curPathName = mapping.name.getValue();
-		ArrayList<String> curPath = new ArrayList<String>(Arrays.asList(curPathName.split("/")));
-		ArrayList<String> newPath = new ArrayList<String>(Arrays.asList(newPathName.split("/")));
+		List<String> curPath = new ArrayList<>(Arrays.asList(curPathName.split("/")));
+		List<String> newPath = new ArrayList<>(Arrays.asList(newPathName.split("/")));
 		DefaultTreeModel model = (DefaultTreeModel) tree.getModel();
 		//
 		MappingTreeNode root = (MappingTreeNode) tree.getModel().getRoot();
@@ -93,7 +93,7 @@ public void update(JarReader read, String originalName, String newPathName) {
 	 * @param dirPath
 	 * @param model
 	 */
-	private void removeTreePath(MappingTreeNode parent, ArrayList<String> dirPath, DefaultTreeModel model) {
+	private void removeTreePath(MappingTreeNode parent, List<String> dirPath, DefaultTreeModel model) {
 		while (dirPath.size() > 0) {
 			String section = dirPath.get(0);
 			MappingTreeNode node = parent.getChild(section);
@@ -122,7 +122,7 @@ private void removeTreePath(MappingTreeNode parent, ArrayList<String> dirPath, D
 	 * @param mapping
 	 * @param model
 	 */
-	private void generateTreePath(MappingTreeNode parent, ArrayList<String> dirPath, ClassMapping mapping, DefaultTreeModel model) {
+	private void generateTreePath(MappingTreeNode parent, List<String> dirPath, ClassMapping mapping, DefaultTreeModel model) {
 		while (dirPath.size() > 0) {
 			String section = dirPath.get(0);
 			MappingTreeNode node;

src/me/coley/jremapper/gui/listener/FileSelectionListener.java

@@ -3,6 +3,7 @@
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 
+import javax.swing.JTree;
 import javax.swing.event.TreeSelectionEvent;
 import javax.swing.event.TreeSelectionListener;
 import javax.swing.tree.TreeNode;
@@ -13,9 +14,11 @@
 public class FileSelectionListener implements TreeSelectionListener, MouseListener {
 	private final Program callback;
 	private TreeNode lastNode;
+	private JTree tree;
 
-	public FileSelectionListener(Program callback) {
+	public FileSelectionListener(JTree tree, Program callback) {
 		this.callback = callback;
+		this.tree = tree;
 	}
 
 	@Override
@@ -28,8 +31,11 @@ public void valueChanged(TreeSelectionEvent e) {
 	public void mouseClicked(MouseEvent e) {
 		TreeNode node = lastNode;
 		if (node != null && node.isLeaf() && (node instanceof MappingTreeNode)) {
-			MappingTreeNode mtn = (MappingTreeNode) node;
-			callback.onClassSelect(mtn.getMapping());
+			if (tree.getSelectionPath().getLastPathComponent().equals(node)) {
+				MappingTreeNode mtn = (MappingTreeNode) node;
+				callback.onClassSelect(mtn.getMapping());
+			}
+			
 		}
 	}
 

src/me/coley/jremapper/parse/Context.java

@@ -12,7 +12,7 @@
 import me.coley.jremapper.Program;
 
 public class Context {
-	private final static List<String> ID_FLOW = Arrays.asList("if ", "else", "do", "while", "for", "continue", "break");
+	//private final static List<String> ID_FLOW = Arrays.asList("if ", "else", "do", "while", "for", "continue", "break");
 	private final static List<String> ID_MODIFIERS = Arrays.asList("abstract", "final", "interface", "native", "private", "protected", "public", "static", "strict", "synchronized", "transient",
 			"volatile");
 	private final static List<String> ID_PRIMITIVES = Arrays.asList("void", "boolean", "byte", "char", "short", "int", "long", "float", "double");