From b35d3a3cd4b02bbaf61a7dc4bbb00194cc9c7e53 Mon Sep 17 00:00:00 2001 From: Danila Fedorin Date: Sun, 30 Jul 2017 15:00:08 -0700 Subject: [PATCH] Remove the window as a part of the Abacus class. --- src/main/java/org/nwapw/abacus/Abacus.java | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/src/main/java/org/nwapw/abacus/Abacus.java b/src/main/java/org/nwapw/abacus/Abacus.java index 250c8b5..ff649b5 100644 --- a/src/main/java/org/nwapw/abacus/Abacus.java +++ b/src/main/java/org/nwapw/abacus/Abacus.java @@ -34,10 +34,6 @@ public class Abacus { */ public static final File CONFIG_FILE = new File("config.toml"); - /** - * The main Abacus UI. - */ - private Window mainUi; /** * The plugin manager responsible for * loading and unloading plugins, @@ -63,7 +59,6 @@ public class Abacus { */ public Abacus(){ pluginManager = new PluginManager(); - mainUi = new Window(this); numberReducer = new NumberReducer(this); configuration = new ConfigurationObject(CONFIG_FILE); configuration.save(CONFIG_FILE); @@ -81,8 +76,6 @@ public class Abacus { e.printStackTrace(); } pluginManager.load(); - - mainUi.setVisible(true); } /** @@ -101,14 +94,6 @@ public class Abacus { return pluginManager; } - /** - * Gets the current UI. - * @return the UI window in this abacus instance. - */ - public Window getMainUi() { - return mainUi; - } - /** * Get the reducer that is responsible for transforming * an expression into a number. @@ -171,6 +156,6 @@ public class Abacus { e.printStackTrace(); } - new Abacus(); + new Window(new Abacus()).setVisible(true); } }