make arbitrage calculation optional

diff --git a/src/com/tedpearson/ypp/market/ControlPanel.java b/src/com/tedpearson/ypp/market/ControlPanel.java
index ccdc7c6730cf410e001d02144b3c436a23274bda..62886c16e6a88cb9310b0b129b58274ec8478879 100644 (file)
--- a/src/com/tedpearson/ypp/market/ControlPanel.java
+++ b/src/com/tedpearson/ypp/market/ControlPanel.java
@@ -19,6 +19,7 @@ public class ControlPanel extends JFrame {
                final Preferences prefs = Preferences.userNodeForPackage(getClass());
                final JCheckBox toPCTB = new JCheckBox("Upload to PCTB?", prefs.getBoolean("uploadToPCTB", true));
                final JCheckBox toYarrg = new JCheckBox("Upload to Yarrg?", prefs.getBoolean("uploadToYarrg", true));
+               final JCheckBox showArbitrage = new JCheckBox("Show arbitrage?", prefs.getBoolean("showArbitrage", false));
 
                final JRadioButton live = new JRadioButton("Use live servers");
                final JRadioButton testing = new JRadioButton("Use testing servers");
@@ -34,9 +35,10 @@ public class ControlPanel extends JFrame {
                    com.tedpearson.ypp.market.Version.version;
                JLabel version = new JLabel(version_label);
 
-               setLayout(new GridLayout(6,1));
+               setLayout(new GridLayout(7,1));
                add(toPCTB);
                add(toYarrg);
+               add(showArbitrage);
                add(live);
                add(testing);
                add(version);
@@ -49,6 +51,7 @@ public class ControlPanel extends JFrame {
                        public void actionPerformed(ActionEvent e) {
                                prefs.putBoolean("uploadToPCTB", toPCTB.isSelected());
                                prefs.putBoolean("uploadToYarrg", toYarrg.isSelected());
+                               prefs.putBoolean("showArbitrage", showArbitrage.isSelected());
                                prefs.putBoolean("useLiveServers", live.isSelected());
                                System.exit(exitstatus);
                        }

diff --git a/src/com/tedpearson/ypp/market/MarketUploader.java b/src/com/tedpearson/ypp/market/MarketUploader.java
index 9aa8f046301e1480e90aaf7ef2c56f61f4958aa5..11f085b74570871ab8b33e040b45f1d16f72ce94 100644 (file)
--- a/src/com/tedpearson/ypp/market/MarketUploader.java
+++ b/src/com/tedpearson/ypp/market/MarketUploader.java
@@ -55,6 +55,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 
        private boolean uploadToYarrg;
        private boolean uploadToPCTB;
+       private boolean showArbitrage;
 
        private String islandName = null;
        private String oceanName = null;
@@ -229,6 +230,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
                
                uploadToYarrg=prefs.getBoolean("uploadToYarrg", true);
                uploadToPCTB=prefs.getBoolean("uploadToPCTB", true);
+               showArbitrage=prefs.getBoolean("showArbitrage", true);
 
                EventQueueMonitor.addTopLevelWindowListener(this);
                if (EventQueueMonitor.isGUIInitialized()) {
@@ -427,7 +429,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 
                ArrayList<ArrayList<String>> data = getData(accesstable);
 
-               if (false) {
+               if (showArbitrage) {
                        calculateArbitrage(data);
                }