diff options
Diffstat (limited to 'src/main/java/cuchaz')
4 files changed, 17 insertions, 5 deletions
diff --git a/src/main/java/cuchaz/enigma/EnigmaProject.java b/src/main/java/cuchaz/enigma/EnigmaProject.java index dd1f9fa4..bb2f7faa 100644 --- a/src/main/java/cuchaz/enigma/EnigmaProject.java +++ b/src/main/java/cuchaz/enigma/EnigmaProject.java | |||
| @@ -37,7 +37,6 @@ import java.util.jar.JarEntry; | |||
| 37 | import java.util.jar.JarOutputStream; | 37 | import java.util.jar.JarOutputStream; |
| 38 | import java.util.stream.Collectors; | 38 | import java.util.stream.Collectors; |
| 39 | 39 | ||
| 40 | // TODO: Naming? | ||
| 41 | public class EnigmaProject { | 40 | public class EnigmaProject { |
| 42 | private final Enigma enigma; | 41 | private final Enigma enigma; |
| 43 | 42 | ||
diff --git a/src/main/java/cuchaz/enigma/analysis/index/JarIndex.java b/src/main/java/cuchaz/enigma/analysis/index/JarIndex.java index 38d2b08e..763282b8 100644 --- a/src/main/java/cuchaz/enigma/analysis/index/JarIndex.java +++ b/src/main/java/cuchaz/enigma/analysis/index/JarIndex.java | |||
| @@ -59,16 +59,16 @@ public class JarIndex implements JarIndexer { | |||
| 59 | public void indexJar(ClassCache classCache, ProgressListener progress) { | 59 | public void indexJar(ClassCache classCache, ProgressListener progress) { |
| 60 | progress.init(4, "Indexing jar"); | 60 | progress.init(4, "Indexing jar"); |
| 61 | 61 | ||
| 62 | progress.step(1, "Entries"); | 62 | progress.step(1, "Entries..."); |
| 63 | classCache.visit(() -> new IndexClassVisitor(this, Opcodes.ASM5), ClassReader.SKIP_CODE); | 63 | classCache.visit(() -> new IndexClassVisitor(this, Opcodes.ASM5), ClassReader.SKIP_CODE); |
| 64 | 64 | ||
| 65 | progress.step(2, "Entry references"); | 65 | progress.step(2, "Entry references..."); |
| 66 | classCache.visit(() -> new IndexReferenceVisitor(this, Opcodes.ASM5), ClassReader.SKIP_FRAMES); | 66 | classCache.visit(() -> new IndexReferenceVisitor(this, Opcodes.ASM5), ClassReader.SKIP_FRAMES); |
| 67 | 67 | ||
| 68 | progress.step(3, "Bridge methods"); | 68 | progress.step(3, "Bridge methods..."); |
| 69 | bridgeMethodIndex.findBridgeMethods(); | 69 | bridgeMethodIndex.findBridgeMethods(); |
| 70 | 70 | ||
| 71 | progress.step(4, "Processing"); | 71 | progress.step(4, "Processing..."); |
| 72 | processIndex(this); | 72 | processIndex(this); |
| 73 | } | 73 | } |
| 74 | 74 | ||
diff --git a/src/main/java/cuchaz/enigma/gui/GuiController.java b/src/main/java/cuchaz/enigma/gui/GuiController.java index a55d2cd3..4410bf35 100644 --- a/src/main/java/cuchaz/enigma/gui/GuiController.java +++ b/src/main/java/cuchaz/enigma/gui/GuiController.java | |||
| @@ -160,6 +160,12 @@ public class GuiController { | |||
| 160 | refreshCurrentClass(); | 160 | refreshCurrentClass(); |
| 161 | } | 161 | } |
| 162 | 162 | ||
| 163 | public void dropMappings() { | ||
| 164 | if (project == null) return; | ||
| 165 | |||
| 166 | ProgressDialog.runOffThread(this.gui.getFrame(), progress -> project.dropMappings(progress)); | ||
| 167 | } | ||
| 168 | |||
| 163 | public void exportSource(final Path path) { | 169 | public void exportSource(final Path path) { |
| 164 | if (project == null) return; | 170 | if (project == null) return; |
| 165 | 171 | ||
diff --git a/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java b/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java index 5578325b..a3bd2fe5 100644 --- a/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java +++ b/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java | |||
| @@ -29,6 +29,7 @@ public class MenuBar extends JMenuBar { | |||
| 29 | public final JMenuItem saveMappingEnigmaDirectoryMenu; | 29 | public final JMenuItem saveMappingEnigmaDirectoryMenu; |
| 30 | public final JMenuItem saveMappingsSrgMenu; | 30 | public final JMenuItem saveMappingsSrgMenu; |
| 31 | public final JMenuItem closeMappingsMenu; | 31 | public final JMenuItem closeMappingsMenu; |
| 32 | public final JMenuItem dropMappingsMenu; | ||
| 32 | public final JMenuItem exportSourceMenu; | 33 | public final JMenuItem exportSourceMenu; |
| 33 | public final JMenuItem exportJarMenu; | 34 | public final JMenuItem exportJarMenu; |
| 34 | private final Gui gui; | 35 | private final Gui gui; |
| @@ -149,6 +150,12 @@ public class MenuBar extends JMenuBar { | |||
| 149 | }); | 150 | }); |
| 150 | this.closeMappingsMenu = item; | 151 | this.closeMappingsMenu = item; |
| 151 | } | 152 | } |
| 153 | { | ||
| 154 | JMenuItem item = new JMenuItem("Drop Invalid Mappings"); | ||
| 155 | menu.add(item); | ||
| 156 | item.addActionListener(event -> this.gui.getController().dropMappings()); | ||
| 157 | this.dropMappingsMenu = item; | ||
| 158 | } | ||
| 152 | menu.addSeparator(); | 159 | menu.addSeparator(); |
| 153 | { | 160 | { |
| 154 | JMenuItem item = new JMenuItem("Export Source..."); | 161 | JMenuItem item = new JMenuItem("Export Source..."); |