From 257e8c3f33755a12209b203545f314286ce05382 Mon Sep 17 00:00:00 2001 From: gegy1000 Date: Tue, 18 Jun 2019 21:46:11 +0200 Subject: Parse profile json from cli args --- src/main/java/cuchaz/enigma/gui/Gui.java | 5 +++-- src/main/java/cuchaz/enigma/gui/GuiController.java | 12 +++++------- 2 files changed, 8 insertions(+), 9 deletions(-) (limited to 'src/main/java/cuchaz/enigma/gui') 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; import com.google.common.collect.Lists; import cuchaz.enigma.Constants; +import cuchaz.enigma.EnigmaProfile; import cuchaz.enigma.ExceptionIgnorer; import cuchaz.enigma.analysis.*; import cuchaz.enigma.config.Config; @@ -93,7 +94,7 @@ public class Gui { } } - public Gui() { + public Gui(EnigmaProfile profile) { Config.getInstance().lookAndFeel.setGlobalLAF(); // init frame @@ -112,7 +113,7 @@ public class Gui { }); } - this.controller = new GuiController(this); + this.controller = new GuiController(this, profile); // init file choosers 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; import com.google.common.collect.Lists; import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.strobel.decompiler.languages.java.ast.CompilationUnit; -import cuchaz.enigma.CompiledSourceTypeLoader; -import cuchaz.enigma.Enigma; -import cuchaz.enigma.EnigmaProject; -import cuchaz.enigma.SourceProvider; +import cuchaz.enigma.*; import cuchaz.enigma.analysis.*; import cuchaz.enigma.api.service.ObfuscationTestService; import cuchaz.enigma.bytecode.translators.SourceFixVisitor; @@ -70,10 +67,11 @@ public class GuiController { private DecompiledClassSource currentSource; - public GuiController(Gui gui) { + public GuiController(Gui gui, EnigmaProfile profile) { this.gui = gui; - // TODO: load and set profile - this.enigma = Enigma.create(); + this.enigma = Enigma.builder() + .setProfile(profile) + .build(); } public boolean isDirty() { -- cgit v1.2.3