starting on field matching gui

5 files changed, 49 insertions, 14 deletions

diff --git a/src/cuchaz/enigma/convert/Matches.java b/src/cuchaz/enigma/convert/ClassMatches.java
index 19bb155..f8b2afd 100644
--- a/src/cuchaz/enigma/convert/Matches.java
+++ b/src/cuchaz/enigma/convert/ClassMatches.java
@@ -14,7 +14,7 @@ import com.google.common.collect.Sets;
 import cuchaz.enigma.mapping.ClassEntry;
 
 
-public class Matches implements Iterable<ClassMatch> {
+public class ClassMatches implements Iterable<ClassMatch> {
 
         Collection<ClassMatch> m_matches;
         Map<ClassEntry,ClassMatch> m_matchesBySource;
@@ -25,11 +25,11 @@ public class Matches implements Iterable<ClassMatch> {
         Set<ClassEntry> m_unmatchedSourceClasses;
         Set<ClassEntry> m_unmatchedDestClasses;
         
-        public Matches() {
+        public ClassMatches() {
                 this(new ArrayList<ClassMatch>());
         }
         
-        public Matches(Collection<ClassMatch> matches) {
+        public ClassMatches(Collection<ClassMatch> matches) {
                 m_matches = matches;
                 m_matchesBySource = Maps.newHashMap();
                 m_matchesByDest = Maps.newHashMap();
diff --git a/src/cuchaz/enigma/convert/FieldMatches.java b/src/cuchaz/enigma/convert/FieldMatches.java
new file mode 100644
index 0000000..f78a8f5
--- /dev/null
+++ b/src/cuchaz/enigma/convert/FieldMatches.java
@@ -0,0 +1,35 @@
+package cuchaz.enigma.convert;
+
+import java.util.Collection;
+import java.util.Set;
+
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
+import com.google.common.collect.Sets;
+
+import cuchaz.enigma.mapping.ClassEntry;
+import cuchaz.enigma.mapping.FieldEntry;
+
+
+public class FieldMatches {
+
+        private BiMap<FieldEntry,FieldEntry> m_matches;
+        private Set<FieldEntry> m_unmatchedSourceFields;
+        
+        public FieldMatches() {
+                m_matches = HashBiMap.create();
+                m_unmatchedSourceFields = Sets.newHashSet();
+        }
+        
+        public void addUnmatchedSourceFields(Set<FieldEntry> fieldEntries) {
+                m_unmatchedSourceFields.addAll(fieldEntries);
+        }
+        
+        public Collection<ClassEntry> getSourceClassesWithUnmatchedFields() {
+                Set<ClassEntry> classEntries = Sets.newHashSet();
+                for (FieldEntry fieldEntry : m_unmatchedSourceFields) {
+                        classEntries.add(fieldEntry.getClassEntry());
+                }
+                return classEntries;
+        }
+}
diff --git a/src/cuchaz/enigma/convert/MappingsConverter.java b/src/cuchaz/enigma/convert/MappingsConverter.java
index 5883878..667ee9d 100644
--- a/src/cuchaz/enigma/convert/MappingsConverter.java
+++ b/src/cuchaz/enigma/convert/MappingsConverter.java
@@ -37,7 +37,7 @@ import cuchaz.enigma.mapping.MethodMapping;
 
 public class MappingsConverter {
         
-        public static Matches computeMatches(JarFile sourceJar, JarFile destJar, Mappings mappings) {
+        public static ClassMatches computeMatches(JarFile sourceJar, JarFile destJar, Mappings mappings) {
                 
                 // index jars
                 System.out.println("Indexing source jar...");
@@ -49,7 +49,7 @@ public class MappingsConverter {
                 
                 // compute the matching
                 ClassMatching matching = computeMatching(sourceJar, sourceIndex, destJar, destIndex, null);
-                return new Matches(matching.matches());
+                return new ClassMatches(matching.matches());
         }
         
         public static ClassMatching computeMatching(JarFile sourceJar, JarIndex sourceIndex, JarFile destJar, JarIndex destIndex, BiMap<ClassEntry,ClassEntry> knownMatches) {
@@ -115,7 +115,7 @@ public class MappingsConverter {
                 return lastMatching;
         }
         
-        public static Mappings newMappings(Matches matches, Mappings oldMappings, Deobfuscator sourceDeobfuscator, Deobfuscator destDeobfuscator) {
+        public static Mappings newMappings(ClassMatches matches, Mappings oldMappings, Deobfuscator sourceDeobfuscator, Deobfuscator destDeobfuscator) {
                 
                 // sort the unique matches by size of inner class chain
                 Multimap<Integer,Entry<ClassEntry,ClassEntry>> matchesByDestChainSize = HashMultimap.create();
@@ -172,7 +172,7 @@ public class MappingsConverter {
                 return newMappings;
         }
         
-        private static ClassMapping migrateClassMapping(ClassEntry newObfClass, ClassMapping mapping, final Matches matches, boolean useSimpleName) {
+        private static ClassMapping migrateClassMapping(ClassEntry newObfClass, ClassMapping mapping, final ClassMatches matches, boolean useSimpleName) {
                 
                 ClassNameReplacer replacer = new ClassNameReplacer() {
                         @Override
diff --git a/src/cuchaz/enigma/convert/MatchesReader.java b/src/cuchaz/enigma/convert/MatchesReader.java
index 808f8d0..b43535c 100644
--- a/src/cuchaz/enigma/convert/MatchesReader.java
+++ b/src/cuchaz/enigma/convert/MatchesReader.java
@@ -14,19 +14,19 @@ import cuchaz.enigma.mapping.ClassEntry;
 
 public class MatchesReader {
         
-        public static Matches read(File file)
+        public static ClassMatches readClasses(File file)
         throws IOException {
                 try (BufferedReader in = new BufferedReader(new FileReader(file))) {
-                        Matches matches = new Matches();
+                        ClassMatches matches = new ClassMatches();
                         String line = null;
                         while ((line = in.readLine()) != null) {
-                                matches.add(readMatch(line));
+                                matches.add(readClassMatch(line));
                         }
                         return matches;
                 }
         }
 
-        private static ClassMatch readMatch(String line)
+        private static ClassMatch readClassMatch(String line)
         throws IOException {
                 String[] sides = line.split(":", 2);
                 return new ClassMatch(readClasses(sides[0]), readClasses(sides[1]));
diff --git a/src/cuchaz/enigma/convert/MatchesWriter.java b/src/cuchaz/enigma/convert/MatchesWriter.java
index 49ffb6d..6658e2a 100644
--- a/src/cuchaz/enigma/convert/MatchesWriter.java
+++ b/src/cuchaz/enigma/convert/MatchesWriter.java
@@ -9,16 +9,16 @@ import cuchaz.enigma.mapping.ClassEntry;
 
 public class MatchesWriter {
         
-        public static void write(Matches matches, File file)
+        public static void writeClasses(ClassMatches matches, File file)
         throws IOException {
                 try (FileWriter out = new FileWriter(file)) {
                         for (ClassMatch match : matches) {
-                                writeMatch(out, match);
+                                writeClassMatch(out, match);
                         }
                 }
         }
 
-        private static void writeMatch(FileWriter out, ClassMatch match)
+        private static void writeClassMatch(FileWriter out, ClassMatch match)
         throws IOException {
                 writeClasses(out, match.sourceClasses);
                 out.write(":");