From d339385cf2f65e059b9eda306788d62233cd1536 Mon Sep 17 00:00:00 2001 From: Danila Fedorin Date: Tue, 1 Aug 2017 09:53:38 -0700 Subject: [PATCH] Switch to the new UI. --- src/main/java/org/nwapw/abacus/Abacus.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/nwapw/abacus/Abacus.java b/src/main/java/org/nwapw/abacus/Abacus.java index 1ee8f8a..16738b2 100644 --- a/src/main/java/org/nwapw/abacus/Abacus.java +++ b/src/main/java/org/nwapw/abacus/Abacus.java @@ -1,6 +1,7 @@ package org.nwapw.abacus; import org.nwapw.abacus.config.ConfigurationObject; +import org.nwapw.abacus.fx.AbacusApplication; import org.nwapw.abacus.number.NaiveNumber; import org.nwapw.abacus.number.NumberInterface; import org.nwapw.abacus.parsing.LexerTokenizer; @@ -11,9 +12,7 @@ import org.nwapw.abacus.plugin.PluginManager; import org.nwapw.abacus.plugin.StandardPlugin; import org.nwapw.abacus.tree.NumberReducer; import org.nwapw.abacus.tree.TreeNode; -import org.nwapw.abacus.window.Window; -import javax.swing.*; import java.io.File; import java.io.IOException; import java.lang.reflect.InvocationTargetException; @@ -79,13 +78,7 @@ public class Abacus { } public static void main(String[] args) { - try { - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (ClassNotFoundException | InstantiationException | UnsupportedLookAndFeelException | IllegalAccessException e) { - e.printStackTrace(); - } - - new Window(new Abacus()).setVisible(true); + AbacusApplication.launch(AbacusApplication.class, args); } /**