From 1742190f784d0d62e7cc869eebafdfe1927e448f Mon Sep 17 00:00:00 2001 From: lclc98 Date: Sat, 2 Jul 2016 21:57:31 +1000 Subject: Removed unused methods --- .../java/cuchaz/enigma/convert/ClassForest.java | 6 ---- .../java/cuchaz/enigma/convert/ClassMatches.java | 8 ----- .../cuchaz/enigma/convert/MappingsConverter.java | 35 ---------------------- .../java/cuchaz/enigma/convert/MemberMatches.java | 12 -------- 4 files changed, 61 deletions(-) (limited to 'src/main/java/cuchaz/enigma/convert') diff --git a/src/main/java/cuchaz/enigma/convert/ClassForest.java b/src/main/java/cuchaz/enigma/convert/ClassForest.java index b08d48f..c9b44b3 100644 --- a/src/main/java/cuchaz/enigma/convert/ClassForest.java +++ b/src/main/java/cuchaz/enigma/convert/ClassForest.java @@ -28,12 +28,6 @@ public class ClassForest { this.forest = HashMultimap.create(); } - public void addAll(Iterable entries) { - for (ClassEntry entry : entries) { - add(entry); - } - } - public void add(ClassEntry entry) { try { this.forest.put(this.identifier.identify(entry), entry); diff --git a/src/main/java/cuchaz/enigma/convert/ClassMatches.java b/src/main/java/cuchaz/enigma/convert/ClassMatches.java index 0b7e803..851c082 100644 --- a/src/main/java/cuchaz/enigma/convert/ClassMatches.java +++ b/src/main/java/cuchaz/enigma/convert/ClassMatches.java @@ -121,18 +121,10 @@ public class ClassMatches implements Iterable { return m_ambiguousMatchesBySource.keySet(); } - public ClassMatch getAmbiguousMatchBySource(ClassEntry sourceClass) { - return m_ambiguousMatchesBySource.get(sourceClass); - } - public ClassMatch getMatchBySource(ClassEntry sourceClass) { return m_matchesBySource.get(sourceClass); } - public ClassMatch getMatchByDest(ClassEntry destClass) { - return m_matchesByDest.get(destClass); - } - public void removeSource(ClassEntry sourceClass) { ClassMatch match = m_matchesBySource.get(sourceClass); if (match != null) { diff --git a/src/main/java/cuchaz/enigma/convert/MappingsConverter.java b/src/main/java/cuchaz/enigma/convert/MappingsConverter.java index d1daadb..7739adf 100644 --- a/src/main/java/cuchaz/enigma/convert/MappingsConverter.java +++ b/src/main/java/cuchaz/enigma/convert/MappingsConverter.java @@ -236,41 +236,6 @@ public class MappingsConverter { return classMatches.getUniqueMatches().containsKey(classEntry); } - public static void convertMappings(Mappings mappings, BiMap changes) { - - // sort the changes so classes are renamed in the correct order - // ie. if we have the mappings a->b, b->c, we have to apply b->c before a->b - LinkedHashMap sortedChanges = Maps.newLinkedHashMap(); - int numChangesLeft = changes.size(); - while (!changes.isEmpty()) { - Iterator> iter = changes.entrySet().iterator(); - while (iter.hasNext()) { - Map.Entry change = iter.next(); - if (changes.containsKey(change.getValue())) { - sortedChanges.put(change.getKey(), change.getValue()); - iter.remove(); - } - } - - // did we remove any changes? - if (numChangesLeft - changes.size() > 0) { - // keep going - numChangesLeft = changes.size(); - } else { - // can't sort anymore. There must be a loop - break; - } - } - if (!changes.isEmpty()) { - throw new Error("Unable to sort class changes! There must be a cycle."); - } - - // convert the mappings in the correct class order - for (Map.Entry entry : sortedChanges.entrySet()) { - mappings.renameObfClass(entry.getKey().getName(), entry.getValue().getName()); - } - } - public interface Doer { Collection getDroppedEntries(MappingsChecker checker); diff --git a/src/main/java/cuchaz/enigma/convert/MemberMatches.java b/src/main/java/cuchaz/enigma/convert/MemberMatches.java index 32850cc..662c1db 100644 --- a/src/main/java/cuchaz/enigma/convert/MemberMatches.java +++ b/src/main/java/cuchaz/enigma/convert/MemberMatches.java @@ -47,23 +47,11 @@ public class MemberMatches { assert (wasAdded); } - public void addUnmatchedSourceEntries(Iterable sourceEntries) { - for (T sourceEntry : sourceEntries) { - addUnmatchedSourceEntry(sourceEntry); - } - } - public void addUnmatchedDestEntry(T destEntry) { boolean wasAdded = m_unmatchedDestEntries.put(destEntry.getClassEntry(), destEntry); assert (wasAdded); } - public void addUnmatchedDestEntries(Iterable destEntriesntries) { - for (T entry : destEntriesntries) { - addUnmatchedDestEntry(entry); - } - } - public void addUnmatchableSourceEntry(T sourceEntry) { boolean wasAdded = m_unmatchableSourceEntries.put(sourceEntry.getClassEntry(), sourceEntry); assert (wasAdded); -- cgit v1.2.3