diff options
| author | 2019-06-16 23:49:25 +0200 | |
|---|---|---|
| committer | 2019-06-16 23:49:25 +0200 | |
| commit | e27d5967029f4f3da8889dd673ba516dcd9f3ac8 (patch) | |
| tree | 71c98afad01cafdb2884da288e494e8761c2a8ff /src/main/java/cuchaz/enigma/gui/dialog | |
| parent | Merge remote-tracking branch 'origin/master' into proposal-tweak (diff) | |
| download | enigma-fork-e27d5967029f4f3da8889dd673ba516dcd9f3ac8.tar.gz enigma-fork-e27d5967029f4f3da8889dd673ba516dcd9f3ac8.tar.xz enigma-fork-e27d5967029f4f3da8889dd673ba516dcd9f3ac8.zip | |
Plugin rework along with API rework: Enigma split from EnigmaProject; plugins now provide services configurable via a profile
Diffstat (limited to 'src/main/java/cuchaz/enigma/gui/dialog')
| -rw-r--r-- | src/main/java/cuchaz/enigma/gui/dialog/ProgressDialog.java | 3 | ||||
| -rw-r--r-- | src/main/java/cuchaz/enigma/gui/dialog/SearchDialog.java | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/cuchaz/enigma/gui/dialog/ProgressDialog.java b/src/main/java/cuchaz/enigma/gui/dialog/ProgressDialog.java index 84fe7c8..c135d03 100644 --- a/src/main/java/cuchaz/enigma/gui/dialog/ProgressDialog.java +++ b/src/main/java/cuchaz/enigma/gui/dialog/ProgressDialog.java | |||
| @@ -57,7 +57,7 @@ public class ProgressDialog implements ProgressListener, AutoCloseable { | |||
| 57 | this.frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE); | 57 | this.frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE); |
| 58 | } | 58 | } |
| 59 | 59 | ||
| 60 | public static void runInThread(final JFrame parent, final ProgressRunnable runnable) { | 60 | public static void runOffThread(final JFrame parent, final ProgressRunnable runnable) { |
| 61 | new Thread(() -> | 61 | new Thread(() -> |
| 62 | { | 62 | { |
| 63 | try (ProgressDialog progress = new ProgressDialog(parent)) { | 63 | try (ProgressDialog progress = new ProgressDialog(parent)) { |
| @@ -68,6 +68,7 @@ public class ProgressDialog implements ProgressListener, AutoCloseable { | |||
| 68 | }).start(); | 68 | }).start(); |
| 69 | } | 69 | } |
| 70 | 70 | ||
| 71 | @Override | ||
| 71 | public void close() { | 72 | public void close() { |
| 72 | this.frame.dispose(); | 73 | this.frame.dispose(); |
| 73 | } | 74 | } |
diff --git a/src/main/java/cuchaz/enigma/gui/dialog/SearchDialog.java b/src/main/java/cuchaz/enigma/gui/dialog/SearchDialog.java index a122bd8..1657d7b 100644 --- a/src/main/java/cuchaz/enigma/gui/dialog/SearchDialog.java +++ b/src/main/java/cuchaz/enigma/gui/dialog/SearchDialog.java | |||
| @@ -40,7 +40,7 @@ public class SearchDialog { | |||
| 40 | this.parent = parent; | 40 | this.parent = parent; |
| 41 | 41 | ||
| 42 | deobfClasses = Lists.newArrayList(); | 42 | deobfClasses = Lists.newArrayList(); |
| 43 | this.parent.getController().getDeobfuscator().getSeparatedClasses(Lists.newArrayList(), deobfClasses); | 43 | this.parent.getController().addSeparatedClasses(Lists.newArrayList(), deobfClasses); |
| 44 | deobfClasses.removeIf(ClassEntry::isInnerClass); | 44 | deobfClasses.removeIf(ClassEntry::isInnerClass); |
| 45 | } | 45 | } |
| 46 | 46 | ||