From 21cc365c2c24c586b526f91806c8c27c3cddebe5 Mon Sep 17 00:00:00 2001 From: gegy1000 Date: Fri, 22 Jun 2018 22:00:48 +0200 Subject: Fix compile issues --- src/main/java/cuchaz/enigma/analysis/JarIndex.java | 3 +-- src/main/java/cuchaz/enigma/gui/GuiTricks.java | 5 ++--- 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 { public Set getInterfaces(String className) { ClassEntry classEntry = entryPool.getClass(className); - Set interfaces = new HashSet<>(); - interfaces.addAll(this.translationIndex.getInterfaces(classEntry)); + Set interfaces = new HashSet<>(this.translationIndex.getInterfaces(classEntry)); for (ClassEntry ancestor : this.translationIndex.getAncestry(classEntry)) { interfaces.addAll(this.translationIndex.getInterfaces(ancestor)); } 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; import javax.swing.*; import java.awt.*; import java.awt.event.ActionListener; -import java.util.Arrays; public class GuiTricks { @@ -27,7 +26,7 @@ public class GuiTricks { public static void deactivateButton(JButton button) { button.setEnabled(false); button.setText(""); - for (ActionListener listener : Arrays.asList(button.getActionListeners())) { + for (ActionListener listener : button.getActionListeners()) { button.removeActionListener(listener); } } @@ -35,7 +34,7 @@ public class GuiTricks { public static void activateButton(JButton button, String text, ActionListener newListener) { button.setText(text); button.setEnabled(true); - for (ActionListener listener : Arrays.asList(button.getActionListeners())) { + for (ActionListener listener : button.getActionListeners()) { button.removeActionListener(listener); } 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 { break; case "MTH-ARG": classMapping = classMappingMap.computeIfAbsent(parts[1], k -> new ClassMapping(parts[1])); - classMapping.setArgumentName(parts[3], new Signature(parts[2]), Integer.parseInt(parts[4]), parts[5]); + classMapping.setArgumentName(parts[3], new MethodDescriptor(parts[2]), Integer.parseInt(parts[4]), parts[5]); break; default: throw new MappingParseException(file, lineNumber, "Unknown token '" + token + "' !"); -- cgit v1.2.3