diff options
| author | 2018-06-22 22:00:48 +0200 | |
|---|---|---|
| committer | 2018-06-22 22:00:48 +0200 | |
| commit | 21cc365c2c24c586b526f91806c8c27c3cddebe5 (patch) | |
| tree | da769016d2d0cb6b6b612cd00615bda08aa2b029 | |
| parent | Merge branch 'master' into asm (diff) | |
| download | enigma-21cc365c2c24c586b526f91806c8c27c3cddebe5.tar.gz enigma-21cc365c2c24c586b526f91806c8c27c3cddebe5.tar.xz enigma-21cc365c2c24c586b526f91806c8c27c3cddebe5.zip | |
Fix compile issues
| -rw-r--r-- | src/main/java/cuchaz/enigma/analysis/JarIndex.java | 3 | ||||
| -rw-r--r-- | src/main/java/cuchaz/enigma/gui/GuiTricks.java | 5 | ||||
| -rw-r--r-- | src/main/java/cuchaz/enigma/mapping/MappingsTinyReader.java | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/src/main/java/cuchaz/enigma/analysis/JarIndex.java b/src/main/java/cuchaz/enigma/analysis/JarIndex.java index 2f3501d4..87e6e886 100644 --- a/src/main/java/cuchaz/enigma/analysis/JarIndex.java +++ b/src/main/java/cuchaz/enigma/analysis/JarIndex.java | |||
| @@ -385,8 +385,7 @@ public class JarIndex { | |||
| 385 | 385 | ||
| 386 | public Set<ClassEntry> getInterfaces(String className) { | 386 | public Set<ClassEntry> getInterfaces(String className) { |
| 387 | ClassEntry classEntry = entryPool.getClass(className); | 387 | ClassEntry classEntry = entryPool.getClass(className); |
| 388 | Set<ClassEntry> interfaces = new HashSet<>(); | 388 | Set<ClassEntry> interfaces = new HashSet<>(this.translationIndex.getInterfaces(classEntry)); |
| 389 | interfaces.addAll(this.translationIndex.getInterfaces(classEntry)); | ||
| 390 | for (ClassEntry ancestor : this.translationIndex.getAncestry(classEntry)) { | 389 | for (ClassEntry ancestor : this.translationIndex.getAncestry(classEntry)) { |
| 391 | interfaces.addAll(this.translationIndex.getInterfaces(ancestor)); | 390 | interfaces.addAll(this.translationIndex.getInterfaces(ancestor)); |
| 392 | } | 391 | } |
diff --git a/src/main/java/cuchaz/enigma/gui/GuiTricks.java b/src/main/java/cuchaz/enigma/gui/GuiTricks.java index 8bf57d38..92084559 100644 --- a/src/main/java/cuchaz/enigma/gui/GuiTricks.java +++ b/src/main/java/cuchaz/enigma/gui/GuiTricks.java | |||
| @@ -14,7 +14,6 @@ package cuchaz.enigma.gui; | |||
| 14 | import javax.swing.*; | 14 | import javax.swing.*; |
| 15 | import java.awt.*; | 15 | import java.awt.*; |
| 16 | import java.awt.event.ActionListener; | 16 | import java.awt.event.ActionListener; |
| 17 | import java.util.Arrays; | ||
| 18 | 17 | ||
| 19 | public class GuiTricks { | 18 | public class GuiTricks { |
| 20 | 19 | ||
| @@ -27,7 +26,7 @@ public class GuiTricks { | |||
| 27 | public static void deactivateButton(JButton button) { | 26 | public static void deactivateButton(JButton button) { |
| 28 | button.setEnabled(false); | 27 | button.setEnabled(false); |
| 29 | button.setText(""); | 28 | button.setText(""); |
| 30 | for (ActionListener listener : Arrays.asList(button.getActionListeners())) { | 29 | for (ActionListener listener : button.getActionListeners()) { |
| 31 | button.removeActionListener(listener); | 30 | button.removeActionListener(listener); |
| 32 | } | 31 | } |
| 33 | } | 32 | } |
| @@ -35,7 +34,7 @@ public class GuiTricks { | |||
| 35 | public static void activateButton(JButton button, String text, ActionListener newListener) { | 34 | public static void activateButton(JButton button, String text, ActionListener newListener) { |
| 36 | button.setText(text); | 35 | button.setText(text); |
| 37 | button.setEnabled(true); | 36 | button.setEnabled(true); |
| 38 | for (ActionListener listener : Arrays.asList(button.getActionListeners())) { | 37 | for (ActionListener listener : button.getActionListeners()) { |
| 39 | button.removeActionListener(listener); | 38 | button.removeActionListener(listener); |
| 40 | } | 39 | } |
| 41 | button.addActionListener(newListener); | 40 | button.addActionListener(newListener); |
diff --git a/src/main/java/cuchaz/enigma/mapping/MappingsTinyReader.java b/src/main/java/cuchaz/enigma/mapping/MappingsTinyReader.java index 7205fd56..69d5684b 100644 --- a/src/main/java/cuchaz/enigma/mapping/MappingsTinyReader.java +++ b/src/main/java/cuchaz/enigma/mapping/MappingsTinyReader.java | |||
| @@ -73,7 +73,7 @@ public class MappingsTinyReader { | |||
| 73 | break; | 73 | break; |
| 74 | case "MTH-ARG": | 74 | case "MTH-ARG": |
| 75 | classMapping = classMappingMap.computeIfAbsent(parts[1], k -> new ClassMapping(parts[1])); | 75 | classMapping = classMappingMap.computeIfAbsent(parts[1], k -> new ClassMapping(parts[1])); |
| 76 | classMapping.setArgumentName(parts[3], new Signature(parts[2]), Integer.parseInt(parts[4]), parts[5]); | 76 | classMapping.setArgumentName(parts[3], new MethodDescriptor(parts[2]), Integer.parseInt(parts[4]), parts[5]); |
| 77 | break; | 77 | break; |
| 78 | default: | 78 | default: |
| 79 | throw new MappingParseException(file, lineNumber, "Unknown token '" + token + "' !"); | 79 | throw new MappingParseException(file, lineNumber, "Unknown token '" + token + "' !"); |