Fix #81 -- validate renames across related classes

6 files changed, 41 insertions, 37 deletions

diff --git a/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java b/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
index d7be1a9d..770520bb 100644
--- a/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
+++ b/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
@@ -197,7 +197,11 @@ public class MenuBar extends JMenuBar {
                                 JMenuItem search = new JMenuItem("Search");
                                 search.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_SPACE, InputEvent.SHIFT_MASK));
                                 menu.add(search);
-                                search.addActionListener(event -> new SearchDialog(this.gui).show());
+                                search.addActionListener(event -> {
+                                        if (this.gui.getController().getDeobfuscator() != null) {
+                                                new SearchDialog(this.gui).show();
+                                        }
+                                });
 
                         }
                 }
diff --git a/src/main/java/cuchaz/enigma/translation/mapping/EntryRemapper.java b/src/main/java/cuchaz/enigma/translation/mapping/EntryRemapper.java
index ed9f8202..8c4a3268 100644
--- a/src/main/java/cuchaz/enigma/translation/mapping/EntryRemapper.java
+++ b/src/main/java/cuchaz/enigma/translation/mapping/EntryRemapper.java
@@ -28,7 +28,7 @@ public class EntryRemapper {
 
                 this.deobfuscator = new MappingTranslator(obfToDeobf, obfResolver);
 
-                this.validator = new MappingValidator(obfToDeobf, deobfuscator, obfResolver);
+                this.validator = new MappingValidator(obfToDeobf, deobfuscator, jarIndex);
         }
 
         public EntryRemapper(JarIndex jarIndex) {
diff --git a/src/main/java/cuchaz/enigma/translation/mapping/MappingValidator.java b/src/main/java/cuchaz/enigma/translation/mapping/MappingValidator.java
index 9be48c3a..a20c5028 100644
--- a/src/main/java/cuchaz/enigma/translation/mapping/MappingValidator.java
+++ b/src/main/java/cuchaz/enigma/translation/mapping/MappingValidator.java
@@ -1,26 +1,30 @@
 package cuchaz.enigma.translation.mapping;
 
+import cuchaz.enigma.analysis.index.InheritanceIndex;
+import cuchaz.enigma.analysis.index.JarIndex;
 import cuchaz.enigma.throwables.IllegalNameException;
 import cuchaz.enigma.translation.Translator;
 import cuchaz.enigma.translation.mapping.tree.EntryTree;
+import cuchaz.enigma.translation.representation.entry.ClassEntry;
 import cuchaz.enigma.translation.representation.entry.Entry;
 
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.stream.Collectors;
 
 public class MappingValidator {
         private final EntryTree<EntryMapping> obfToDeobf;
         private final Translator deobfuscator;
-        private final EntryResolver entryResolver;
+        private final JarIndex index;
 
-        public MappingValidator(EntryTree<EntryMapping> obfToDeobf, Translator deobfuscator, EntryResolver entryResolver) {
+        public MappingValidator(EntryTree<EntryMapping> obfToDeobf, Translator deobfuscator, JarIndex index) {
                 this.obfToDeobf = obfToDeobf;
                 this.deobfuscator = deobfuscator;
-                this.entryResolver = entryResolver;
+                this.index = index;
         }
 
         public void validateRename(Entry<?> entry, String name) throws IllegalNameException {
-                Collection<Entry<?>> equivalentEntries = entryResolver.resolveEquivalentEntries(entry);
+                Collection<Entry<?>> equivalentEntries = index.getEntryResolver().resolveEquivalentEntries(entry);
                 for (Entry<?> equivalentEntry : equivalentEntries) {
                         equivalentEntry.validateName(name);
                         validateUnique(equivalentEntry, name);
@@ -28,19 +32,38 @@ public class MappingValidator {
         }
 
         private void validateUnique(Entry<?> entry, String name) {
-                Entry<?> translatedEntry = deobfuscator.translate(entry);
-                Collection<Entry<?>> translatedSiblings = obfToDeobf.getSiblings(entry).stream()
-                                .map(deobfuscator::translate)
-                                .collect(Collectors.toList());
+                ClassEntry containingClass = entry.getContainingClass();
+                Collection<ClassEntry> relatedClasses = getRelatedClasses(containingClass);
 
-                if (!isUnique(translatedEntry, translatedSiblings, name)) {
-                        throw new IllegalNameException(name, "Name is not unique in " + translatedEntry.getParent() + "!");
+                for (ClassEntry relatedClass : relatedClasses) {
+                        Entry<?> relatedEntry = entry.replaceAncestor(containingClass, relatedClass);
+                        Entry<?> translatedEntry = deobfuscator.translate(relatedEntry);
+
+                        Collection<Entry<?>> translatedSiblings = obfToDeobf.getChildren(relatedClass).stream()
+                                        .filter(e -> !entry.equals(e))
+                                        .map(deobfuscator::translate)
+                                        .collect(Collectors.toList());
+
+                        if (!isUnique(translatedEntry, translatedSiblings, name)) {
+                                throw new IllegalNameException(name, "Name is not unique in " + translatedEntry.getParent() + "!");
+                        }
                 }
         }
 
+        private Collection<ClassEntry> getRelatedClasses(ClassEntry classEntry) {
+                InheritanceIndex inheritanceIndex = index.getInheritanceIndex();
+
+                Collection<ClassEntry> relatedClasses = new HashSet<>();
+                relatedClasses.add(classEntry);
+                relatedClasses.addAll(inheritanceIndex.getChildren(classEntry));
+                relatedClasses.addAll(inheritanceIndex.getAncestors(classEntry));
+
+                return relatedClasses;
+        }
+
         private boolean isUnique(Entry<?> entry, Collection<Entry<?>> siblings, String name) {
-                for (Entry<?> child : siblings) {
-                        if (entry.canConflictWith(child) && child.getName().equals(name)) {
+                for (Entry<?> sibling : siblings) {
+                        if (entry.canConflictWith(sibling) && sibling.getName().equals(name)) {
                                 return false;
                         }
                 }
diff --git a/src/main/java/cuchaz/enigma/translation/mapping/tree/DeltaTrackingTree.java b/src/main/java/cuchaz/enigma/translation/mapping/tree/DeltaTrackingTree.java
index 255fa5fb..d8b1f50f 100644
--- a/src/main/java/cuchaz/enigma/translation/mapping/tree/DeltaTrackingTree.java
+++ b/src/main/java/cuchaz/enigma/translation/mapping/tree/DeltaTrackingTree.java
@@ -55,11 +55,6 @@ public class DeltaTrackingTree<T> implements EntryTree<T> {
                 return delegate.getChildren(entry);
         }
 
-        @Override
-        public Collection<Entry<?>> getSiblings(Entry<?> entry) {
-                return delegate.getSiblings(entry);
-        }
-
         @Nullable
         @Override
         public EntryTreeNode<T> findNode(Entry<?> entry) {
diff --git a/src/main/java/cuchaz/enigma/translation/mapping/tree/EntryTree.java b/src/main/java/cuchaz/enigma/translation/mapping/tree/EntryTree.java
index daaefcc1..f919a393 100644
--- a/src/main/java/cuchaz/enigma/translation/mapping/tree/EntryTree.java
+++ b/src/main/java/cuchaz/enigma/translation/mapping/tree/EntryTree.java
@@ -14,8 +14,6 @@ import java.util.stream.Stream;
 public interface EntryTree<T> extends EntryMap<T>, Iterable<EntryTreeNode<T>>, Translatable {
         Collection<Entry<?>> getChildren(Entry<?> entry);
 
-        Collection<Entry<?>> getSiblings(Entry<?> entry);
-
         @Nullable
         EntryTreeNode<T> findNode(Entry<?> entry);
 
diff --git a/src/main/java/cuchaz/enigma/translation/mapping/tree/HashEntryTree.java b/src/main/java/cuchaz/enigma/translation/mapping/tree/HashEntryTree.java
index bb21de6f..02f2c04a 100644
--- a/src/main/java/cuchaz/enigma/translation/mapping/tree/HashEntryTree.java
+++ b/src/main/java/cuchaz/enigma/translation/mapping/tree/HashEntryTree.java
@@ -73,22 +73,6 @@ public class HashEntryTree<T> implements EntryTree<T> {
         }
 
         @Override
-        public Collection<Entry<?>> getSiblings(Entry<?> entry) {
-                List<HashTreeNode<T>> path = computePath(entry, false);
-                if (path.size() <= 1) {
-                        return getSiblings(entry, root.keySet());
-                }
-                HashTreeNode<T> parent = path.get(path.size() - 2);
-                return getSiblings(entry, parent.getChildren());
-        }
-
-        private Collection<Entry<?>> getSiblings(Entry<?> entry, Collection<Entry<?>> children) {
-                Set<Entry<?>> siblings = new HashSet<>(children);
-                siblings.remove(entry);
-                return siblings;
-        }
-
-        @Override
         @Nullable
         public HashTreeNode<T> findNode(Entry<?> target) {
                 List<Entry<?>> parentChain = target.getAncestry();