Sync with BitBucket.

Author: yccheok

src/org/yccheok/jstock/data/gui.properties

@@ -757,7 +757,6 @@ SaveToCloudJDialog_SignOut=Sign out
 OptionsAlertJPanel_SignOut=Sign out
 OptionsNetworkJPanel_GoogleFinance=Google Finance
 OptionsNetworkJPanel_YahooFinance=Yahoo Finance
-OptionsNetworkJPanel_KLSEInfo=KLSE Info
 WatchlistInfo_Country=Country
 WatchlistInfo_Name=Watchlist Name
 WatchlistInfo_Size=Size

src/org/yccheok/jstock/data/gui_de.properties

@@ -753,7 +753,6 @@ SaveToCloudJDialog_SignOut=Sign out
 OptionsAlertJPanel_SignOut=Sign out
 OptionsNetworkJPanel_GoogleFinance=Google Finance
 OptionsNetworkJPanel_YahooFinance=Yahoo Finance
-OptionsNetworkJPanel_KLSEInfo=KLSE Info
 WatchlistInfo_Country=Country
 WatchlistInfo_Name=Watchlist Name
 WatchlistInfo_Size=Size

src/org/yccheok/jstock/data/gui_en.properties

@@ -757,7 +757,6 @@ SaveToCloudJDialog_SignOut=Sign out
 OptionsAlertJPanel_SignOut=Sign out
 OptionsNetworkJPanel_GoogleFinance=Google Finance
 OptionsNetworkJPanel_YahooFinance=Yahoo Finance
-OptionsNetworkJPanel_KLSEInfo=KLSE Info
 WatchlistInfo_Country=Country
 WatchlistInfo_Name=Watchlist Name
 WatchlistInfo_Size=Size

src/org/yccheok/jstock/data/gui_it.properties

@@ -757,7 +757,6 @@ SaveToCloudJDialog_SignOut=Sign out
 OptionsAlertJPanel_SignOut=Sign out
 OptionsNetworkJPanel_GoogleFinance=Google Finance
 OptionsNetworkJPanel_YahooFinance=Yahoo Finance
-OptionsNetworkJPanel_KLSEInfo=KLSE Info
 WatchlistInfo_Country=Country
 WatchlistInfo_Name=Watchlist Name
 WatchlistInfo_Size=Size

src/org/yccheok/jstock/data/gui_zh.properties

@@ -750,7 +750,6 @@ SaveToCloudJDialog_SignOut=\u767b\u51fa
 OptionsAlertJPanel_SignOut=\u767b\u51fa
 OptionsNetworkJPanel_GoogleFinance=\u8c37\u6b4c\u8d22\u7ecf
 OptionsNetworkJPanel_YahooFinance=\u96c5\u864e\u8d22\u7ecf
-OptionsNetworkJPanel_KLSEInfo=KLSE Info
 WatchlistInfo_Country=Country
 WatchlistInfo_Name=Watchlist Name
 WatchlistInfo_Size=Size

src/org/yccheok/jstock/data/gui_zh_TW.properties

@@ -748,7 +748,6 @@ SaveToCloudJDialog_SignOut=\u767b\u51fa
 OptionsAlertJPanel_SignOut=\u767b\u51fa
 OptionsNetworkJPanel_GoogleFinance=\u8c37\u6b4c\u8ca1\u7d93
 OptionsNetworkJPanel_YahooFinance=\u96c5\u864e\u8ca1\u7d93
-OptionsNetworkJPanel_KLSEInfo=KLSE Info
 WatchlistInfo_Country=Country
 WatchlistInfo_Name=Watchlist Name
 WatchlistInfo_Size=Size

src/org/yccheok/jstock/gui/IndicatorScannerJPanel.java

@@ -379,7 +379,13 @@ public void run() {
                             Utils.playAlertSound();
                         }
                         try {
-                            Thread.sleep(jStockOptions.getAlertSpeed() * 1000);
+                            // Make it rest for 1 minute. Yahoo does have quota
+                            // for every ip. If we are too greedy, we will get
+                            // Error message: "Unable to process request at this time -- error 999"
+                            // https://help.yahoo.com/kb/SLN2253.html
+                            Thread.sleep(1*60*1000);
+                            
+                            //Thread.sleep(jStockOptions.getAlertSpeed() * 1000);
                         }
                         catch (InterruptedException exp) {
                             log.error(null, exp);

src/org/yccheok/jstock/gui/JStock.java

@@ -3739,7 +3739,7 @@ public void initJStockOptions(JStockOptions jStockOptions) {
 
         /* Hard core fix. */
         if (this.jStockOptions.getScanningSpeed() == 0) {
-            this.jStockOptions.setScanningSpeed(5000);
+            this.jStockOptions.setScanningSpeed(1*60*1000);
         }
 
         final String proxyHost = this.jStockOptions.getProxyServer();

src/org/yccheok/jstock/gui/JStockOptions.java

@@ -119,7 +119,9 @@ public JStockOptions() {
         this.singleIndicatorAlert = true;
         this.proxyServer = "";
         this.proxyPort = -1;
-        this.scanningSpeed = 10000;
+        // In milliseconds.
+        this.scanningSpeed = 1*60*1000;
+        // In seconds.
         this.alertSpeed = 5;
         this.looknFeel = null;
         this.alwaysOnTop = false;
@@ -189,7 +191,9 @@ public JStockOptions() {
     private transient String indicatorPassword;
     private String proxyServer;
     private int proxyPort;
-    private int scanningSpeed;  /* In ms. */
+    // In milliseconds.
+    private int scanningSpeed;
+    // In seconds.
     private int alertSpeed;
     // Opps! Spelling mistake (Should be lookNFeel). However, due to XML
     // serialization compatibility, we decide not to fix it.
@@ -563,6 +567,12 @@ private Object readResolve() {
 
         if (this.priceSources == null) {
             this.priceSources = new EnumMap<Country, PriceSource>(Country.class);
+        } else {
+            // Still here for xstream backward compatible. Shall be removed
+            // after a while.
+            if (this.priceSources.get(Country.Malaysia) == PriceSource.KLSEInfo) {
+                this.priceSources.put(Country.Malaysia, PriceSource.Yahoo);
+            }
         }
 
         if (this.currencies == null) {

src/org/yccheok/jstock/gui/OptionsNetworkJPanel.java

@@ -535,11 +535,10 @@ private static String[] getPriceSourceEntryValues(Country country) {
 
     private volatile SwingWorker testConnectionSwingWorker = null;
 
-    private static final Map<String, String> priceSourceEntries = new HashMap<String, String>();
+    private static final Map<String, String> priceSourceEntries = new HashMap<>();
     static {
         priceSourceEntries.put(PriceSource.Yahoo.name(), GUIBundle.getString("OptionsNetworkJPanel_YahooFinance"));
         priceSourceEntries.put(PriceSource.Google.name(), GUIBundle.getString("OptionsNetworkJPanel_GoogleFinance"));
-        priceSourceEntries.put(PriceSource.KLSEInfo.name(), GUIBundle.getString("OptionsNetworkJPanel_KLSEInfo"));
     }
 
     // Variables declaration - do not modify//GEN-BEGIN:variables