Make sure to use UTF-8 in any case for I/O, change "Mark as deobfuscated" key and clean up

2 files changed, 4 insertions, 6 deletions

diff --git a/src/main/java/cuchaz/enigma/analysis/ClassImplementationsTreeNode.java b/src/main/java/cuchaz/enigma/analysis/ClassImplementationsTreeNode.java
index 2a231cb..70ece24 100644
--- a/src/main/java/cuchaz/enigma/analysis/ClassImplementationsTreeNode.java
+++ b/src/main/java/cuchaz/enigma/analysis/ClassImplementationsTreeNode.java
@@ -60,7 +60,7 @@ public class ClassImplementationsTreeNode extends DefaultMutableTreeNode {
 
     public static ClassImplementationsTreeNode findNode(ClassImplementationsTreeNode node, MethodEntry entry) {
         // is this the node?
-        if (node.entry.equals(entry)) {
+        if (node.entry.equals(entry.getClassEntry())) {
             return node;
         }
 
diff --git a/src/main/java/cuchaz/enigma/analysis/TreeDumpVisitor.java b/src/main/java/cuchaz/enigma/analysis/TreeDumpVisitor.java
index ef8a190..de39d36 100644
--- a/src/main/java/cuchaz/enigma/analysis/TreeDumpVisitor.java
+++ b/src/main/java/cuchaz/enigma/analysis/TreeDumpVisitor.java
@@ -14,10 +14,8 @@ import com.strobel.componentmodel.Key;
 import com.strobel.decompiler.languages.java.ast.*;
 import com.strobel.decompiler.patterns.Pattern;
 
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.Writer;
+import java.io.*;
+import java.nio.charset.Charset;
 
 public class TreeDumpVisitor implements IAstVisitor<Void, Void> {
 
@@ -32,7 +30,7 @@ public class TreeDumpVisitor implements IAstVisitor<Void, Void> {
     @Override
     public Void visitCompilationUnit(CompilationUnit node, Void ignored) {
         try {
-            m_out = new FileWriter(m_file);
+            m_out = new OutputStreamWriter(new FileOutputStream(m_file), Charset.forName("UTF-8"));
             recurse(node, ignored);
             m_out.close();
             return null;