diff --git a/nbproject/project.properties b/nbproject/project.properties index 35d22b6..3c24412 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -1,4 +1,4 @@ -#Tue, 11 Apr 2017 19:27:26 +0200 +#Thu, 13 Apr 2017 20:27:39 +0200 annotation.processing.enabled=true annotation.processing.enabled.in.editor=false annotation.processing.processors.list= diff --git a/src/gui/Globals.java b/src/gui/Globals.java index cfca00e..9d3b47c 100644 --- a/src/gui/Globals.java +++ b/src/gui/Globals.java @@ -213,10 +213,6 @@ public class Globals { prefs.put(PrefKeys.STRATEGIES, cfgs.toString()); } - public static class FileKeys { - - - } @@ -253,6 +249,12 @@ public class Globals { putTraders(traders); } + + + public static void clearAll(){ + putStrategies(new JSONObject()); + putTraders(new JSONArray()); + } public static void loadFile(File f) throws IOException { diff --git a/src/gui/SeSimApplication.java b/src/gui/SeSimApplication.java index 5c80616..0172d29 100644 --- a/src/gui/SeSimApplication.java +++ b/src/gui/SeSimApplication.java @@ -76,13 +76,13 @@ public class SeSimApplication extends javax.swing.JFrame { GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment(); GraphicsDevice[] screens = ge.getScreenDevices(); - - Window w = screens[1].getFullScreenWindow(); + + //Window w = screens[1].getFullScreenWindow(); - JFrame dummy = new JFrame(screens[1].getDefaultConfiguration()); +// JFrame dummy = new JFrame(screens[1].getDefaultConfiguration()); - setLocationRelativeTo(dummy); - dummy.dispose(); + // setLocationRelativeTo(dummy); + // dummy.dispose(); for (GraphicsDevice gd:screens){ //Window w = gd.getFullScreenWindow(); @@ -864,7 +864,7 @@ public class SeSimApplication extends javax.swing.JFrame { }//GEN-LAST:event_closeMenuItemActionPerformed private void clearMenuItemActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_clearMenuItemActionPerformed - // TODO add your handling code here: + Globals.clearAll(); }//GEN-LAST:event_clearMenuItemActionPerformed /**