diff --git a/src/net/apocalypselabs/symat/ExitControl.java b/src/net/apocalypselabs/symat/ExitControl.java new file mode 100644 index 0000000..e1170a4 --- /dev/null +++ b/src/net/apocalypselabs/symat/ExitControl.java @@ -0,0 +1,91 @@ +/* + * Copyright (c) 2015, Netsyms Technologies + * All rights reserved. + * + * + * CODE LICENSE ========== + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation and/or + * other materials provided with the distribution. + * + * 3. Neither the name of the copyright holder nor the names of its contributors + * may be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * 4. You adhere to the Media License detailed below. If you do not, this license + * is automatically revoked and you must purge all copies of the software you + * possess, in source or binary form. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * + * MEDIA LICENSE ========== + * All images and other graphical files ("media") included with this + * software are copyright (c) 2015 Netsyms Technologies. You may not distribute + * the graphics or any program, source code repository, or other digital storage + * media containing them without permission from Netsyms Technologies. + * This ban on distribution only applies to publicly available systems. + * A password-protected network file share, USB drive, or other storage scheme that + * cannot be easily accessed by the public is generally allowed. If in doubt, + * contact Netsyms Technologies. If Netsyms Technologies allows or denies + * you permission, that decision is considered final and binding. + * + * You may only use the media for personal, + * non-commercial, non-educational use unless: + * 1, You have paid for the software and media via the SyMAT website, + * or 2, you are using it as part of the 15-day trial period. + * Other uses are prohibited without permission. + * If any part of this license is deemed unenforcable, the remainder + * of the license remains in full effect. + */ +package net.apocalypselabs.symat; + +import static java.awt.Frame.MAXIMIZED_BOTH; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import javax.swing.JOptionPane; + +/** + * Runs closing logic, saves settings, prompts user, etc. + * + * @author Skylar + */ +public class ExitControl extends WindowAdapter { + + @Override + public void windowClosing(WindowEvent we) { + int p = JOptionPane.showConfirmDialog(Main.mainPane, + "Are you sure you want to exit SyMAT?", + "Exit SyMAT", + JOptionPane.YES_NO_OPTION, + JOptionPane.QUESTION_MESSAGE); + if (p == JOptionPane.YES_OPTION) { + if (Main.maingui.getExtendedState() == MAXIMIZED_BOTH) { + PrefStorage.saveSetting("framemaxed", "yes"); + } else { + PrefStorage.saveSetting("framemaxed", "no"); + PrefStorage.saveSetting("framewidth", String.valueOf(Main.maingui.getWidth())); + PrefStorage.saveSetting("frameheight", String.valueOf(Main.maingui.getHeight())); + PrefStorage.saveSetting("framexpos", String.valueOf(Main.maingui.getLocationOnScreen().x)); + PrefStorage.saveSetting("frameypos", String.valueOf(Main.maingui.getLocationOnScreen().y)); + } + PrefStorage.save(); + System.exit(0); + } + } +} diff --git a/src/net/apocalypselabs/symat/Functions.java b/src/net/apocalypselabs/symat/Functions.java index bf7d83f..19f3e03 100644 --- a/src/net/apocalypselabs/symat/Functions.java +++ b/src/net/apocalypselabs/symat/Functions.java @@ -162,7 +162,7 @@ public class Functions { * Quit SyMAT. */ public void quitApplication() { - System.exit(0); + new ExitControl().windowClosing(null); } /* diff --git a/src/net/apocalypselabs/symat/Main.java b/src/net/apocalypselabs/symat/Main.java index 4b42029..d4f8615 100644 --- a/src/net/apocalypselabs/symat/Main.java +++ b/src/net/apocalypselabs/symat/Main.java @@ -174,24 +174,7 @@ public class Main extends JRibbonFrame { setLocationRelativeTo(null); // Run things when app closed - addWindowListener(new WindowAdapter() { - @Override - public void windowClosing(WindowEvent we) { - int p = JOptionPane.showConfirmDialog(Main.mainPane, - "Are you sure you want to exit SyMAT?", - "Exit SyMAT", - JOptionPane.YES_NO_OPTION, - JOptionPane.QUESTION_MESSAGE); - if (p == JOptionPane.YES_OPTION) { - if (getExtendedState() == MAXIMIZED_BOTH) { - PrefStorage.saveSetting("framemaxed", "yes"); - } else { - PrefStorage.saveSetting("framemaxed", "no"); - } - System.exit(0); - } - } - }); + addWindowListener(new ExitControl()); // Open initial windows boolean loaded = false; diff --git a/src/net/apocalypselabs/symat/PrefStorage.java b/src/net/apocalypselabs/symat/PrefStorage.java index d24ac8b..da9a489 100644 --- a/src/net/apocalypselabs/symat/PrefStorage.java +++ b/src/net/apocalypselabs/symat/PrefStorage.java @@ -96,6 +96,7 @@ public class PrefStorage { public static boolean save() { try { prefs.flush(); + prefs.sync(); } catch (BackingStoreException ex) { System.err.println("Settings could not be saved!"); return false;