diff options
Diffstat (limited to 'src/main/java/cuchaz/enigma/gui')
| -rw-r--r-- | src/main/java/cuchaz/enigma/gui/Gui.java | 5 | ||||
| -rw-r--r-- | src/main/java/cuchaz/enigma/gui/GuiController.java | 12 |
2 files changed, 8 insertions, 9 deletions
diff --git a/src/main/java/cuchaz/enigma/gui/Gui.java b/src/main/java/cuchaz/enigma/gui/Gui.java index 6fc9fcf..5b9a331 100644 --- a/src/main/java/cuchaz/enigma/gui/Gui.java +++ b/src/main/java/cuchaz/enigma/gui/Gui.java | |||
| @@ -13,6 +13,7 @@ package cuchaz.enigma.gui; | |||
| 13 | 13 | ||
| 14 | import com.google.common.collect.Lists; | 14 | import com.google.common.collect.Lists; |
| 15 | import cuchaz.enigma.Constants; | 15 | import cuchaz.enigma.Constants; |
| 16 | import cuchaz.enigma.EnigmaProfile; | ||
| 16 | import cuchaz.enigma.ExceptionIgnorer; | 17 | import cuchaz.enigma.ExceptionIgnorer; |
| 17 | import cuchaz.enigma.analysis.*; | 18 | import cuchaz.enigma.analysis.*; |
| 18 | import cuchaz.enigma.config.Config; | 19 | import cuchaz.enigma.config.Config; |
| @@ -93,7 +94,7 @@ public class Gui { | |||
| 93 | } | 94 | } |
| 94 | } | 95 | } |
| 95 | 96 | ||
| 96 | public Gui() { | 97 | public Gui(EnigmaProfile profile) { |
| 97 | Config.getInstance().lookAndFeel.setGlobalLAF(); | 98 | Config.getInstance().lookAndFeel.setGlobalLAF(); |
| 98 | 99 | ||
| 99 | // init frame | 100 | // init frame |
| @@ -112,7 +113,7 @@ public class Gui { | |||
| 112 | }); | 113 | }); |
| 113 | } | 114 | } |
| 114 | 115 | ||
| 115 | this.controller = new GuiController(this); | 116 | this.controller = new GuiController(this, profile); |
| 116 | 117 | ||
| 117 | // init file choosers | 118 | // init file choosers |
| 118 | this.jarFileChooser = new FileDialog(getFrame(), "Open Jar", FileDialog.LOAD); | 119 | this.jarFileChooser = new FileDialog(getFrame(), "Open Jar", FileDialog.LOAD); |
diff --git a/src/main/java/cuchaz/enigma/gui/GuiController.java b/src/main/java/cuchaz/enigma/gui/GuiController.java index 4410bf3..209b5d1 100644 --- a/src/main/java/cuchaz/enigma/gui/GuiController.java +++ b/src/main/java/cuchaz/enigma/gui/GuiController.java | |||
| @@ -14,10 +14,7 @@ package cuchaz.enigma.gui; | |||
| 14 | import com.google.common.collect.Lists; | 14 | import com.google.common.collect.Lists; |
| 15 | import com.google.common.util.concurrent.ThreadFactoryBuilder; | 15 | import com.google.common.util.concurrent.ThreadFactoryBuilder; |
| 16 | import com.strobel.decompiler.languages.java.ast.CompilationUnit; | 16 | import com.strobel.decompiler.languages.java.ast.CompilationUnit; |
| 17 | import cuchaz.enigma.CompiledSourceTypeLoader; | 17 | import cuchaz.enigma.*; |
| 18 | import cuchaz.enigma.Enigma; | ||
| 19 | import cuchaz.enigma.EnigmaProject; | ||
| 20 | import cuchaz.enigma.SourceProvider; | ||
| 21 | import cuchaz.enigma.analysis.*; | 18 | import cuchaz.enigma.analysis.*; |
| 22 | import cuchaz.enigma.api.service.ObfuscationTestService; | 19 | import cuchaz.enigma.api.service.ObfuscationTestService; |
| 23 | import cuchaz.enigma.bytecode.translators.SourceFixVisitor; | 20 | import cuchaz.enigma.bytecode.translators.SourceFixVisitor; |
| @@ -70,10 +67,11 @@ public class GuiController { | |||
| 70 | 67 | ||
| 71 | private DecompiledClassSource currentSource; | 68 | private DecompiledClassSource currentSource; |
| 72 | 69 | ||
| 73 | public GuiController(Gui gui) { | 70 | public GuiController(Gui gui, EnigmaProfile profile) { |
| 74 | this.gui = gui; | 71 | this.gui = gui; |
| 75 | // TODO: load and set profile | 72 | this.enigma = Enigma.builder() |
| 76 | this.enigma = Enigma.create(); | 73 | .setProfile(profile) |
| 74 | .build(); | ||
| 77 | } | 75 | } |
| 78 | 76 | ||
| 79 | public boolean isDirty() { | 77 | public boolean isDirty() { |