Sync with BitBucket.

yccheok · yccheok · commit 6c0cfac2edeb · 2015-12-28T23:33:32.000+08:00
diff --git a/appengine/jstock-android-static/war/news_information/index.html b/appengine/jstock-android-static/war/news_information/index.html
@@ -4,29 +4,17 @@
     <body>
     <!--fe78440e-e0fe-4efb-881d-264a01be483c-->
     
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.11 had been released.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.12 had been released.</p>
     
     <p style="margin-top: 10; font-size: 9px; font-family: Tahoma"></p>
 
     <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
-    Bugfix:  Email alert by using Google oAuth2.0.
-    </p>
-    
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
-    Bugfix:  Select best country after open from cloud.
-    </p>
-    
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
-    Bugfix:  Malaysia stock history speed.
-    </p>
-    
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
-    Bugfix:  Make indicator scanner less busy to avoid Error message: "Unable to process request at this time -- error 999".
+    Bugfix:  Avoid possible data corruption.
     </p>
            
     <p style="margin-top: 10; font-size: 9px; font-family: Tahoma"></p>
     
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">You may download latest JStock 1.0.7.11 from <a href="http://jstock.org/download.html?utm_source=jstock&utm_medium=news_update">http://jstock.org/download.html</a>. After upgrade, your personal data will be preserved.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">You may download latest JStock 1.0.7.12 from <a href="http://jstock.org/download.html?utm_source=jstock&utm_medium=news_update">http://jstock.org/download.html</a>. After upgrade, your personal data will be preserved.</p>
     
     </body>
 </html>
diff --git a/appengine/jstock-android-static/war/news_information/index.txt b/appengine/jstock-android-static/war/news_information/index.txt
@@ -1,3 +1,3 @@
 id=ltsgi4R41y6x9GucPlNn5ls5HPDzKBIgRezXRcuYF/AjqV9XZCmyDJ9wl+KWaTed
-news_id=15/12/15
+news_id=29/12/15
 news_url=http://jstock-static.appspot.com/news_information/index.html
diff --git a/appengine/jstock-android-static/war/news_information/zh/index.html b/appengine/jstock-android-static/war/news_information/zh/index.html
@@ -4,29 +4,17 @@
     <body>
     <!--fe78440e-e0fe-4efb-881d-264a01be483c-->
     
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.11 had been released.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.12 had been released.</p>
     
     <p style="margin-top: 10; font-size: 9px; font-family: Tahoma"></p>
 
     <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
-    Bugfix:  Email alert by using Google oAuth2.0.
-    </p>
-    
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
-    Bugfix:  Select best country after open from cloud.
-    </p>
-    
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
-    Bugfix:  Malaysia stock history speed.
-    </p>
-    
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
-    Bugfix:  Make indicator scanner less busy to avoid Error message: "Unable to process request at this time -- error 999".
+    Bugfix:  Avoid possible data corruption.
     </p>
            
     <p style="margin-top: 10; font-size: 9px; font-family: Tahoma"></p>
     
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">You may download latest JStock 1.0.7.11 from <a href="http://jstock.org/download.html?utm_source=jstock&utm_medium=news_update">http://jstock.org/download.html</a>. After upgrade, your personal data will be preserved.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">You may download latest JStock 1.0.7.12 from <a href="http://jstock.org/zh/download.html?utm_source=jstock&utm_medium=news_update">http://jstock.org/zh/download.html</a>. After upgrade, your personal data will be preserved.</p>
     
     </body>
 </html>
diff --git a/appengine/jstock-android-static/war/news_information/zh/index.txt b/appengine/jstock-android-static/war/news_information/zh/index.txt
@@ -1,3 +1,3 @@
 id=ltsgi4R41y6x9GucPlNn5ls5HPDzKBIgRezXRcuYF/AjqV9XZCmyDJ9wl+KWaTed
-news_id=15/12/15
+news_id=29/12/15
 news_url=http://jstock-static.appspot.com/news_information/zh/index.html
diff --git a/appengine/jstock-android-static/war/version_information/index.txt b/appengine/jstock-android-static/war/version_information/index.txt
@@ -1,5 +1,5 @@
-applicationVersionID=1140
-windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-11/jstock-1.0.7.11-setup.exe
-linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-11/jstock-1.0.7.11-bin.zip
-macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-11/jstock-1.0.7.11-bin.zip
-solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-11/jstock-1.0.7.11-bin.zip
+applicationVersionID=1141
+windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-12/jstock-1.0.7.12-setup.exe
+linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-12/jstock-1.0.7.12-bin.zip
+macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-12/jstock-1.0.7.12-bin.zip
+solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-12/jstock-1.0.7.12-bin.zip
diff --git a/appengine/jstock-android-static/war/version_information/zh/index.txt b/appengine/jstock-android-static/war/version_information/zh/index.txt
@@ -1,5 +1,5 @@
-applicationVersionID=1140
-windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-11/jstock-1.0.7.11-setup.exe
-linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-11/jstock-1.0.7.11-bin.zip
-macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-11/jstock-1.0.7.11-bin.zip
-solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-11/jstock-1.0.7.11-bin.zip
+applicationVersionID=1141
+windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-12/jstock-1.0.7.12-setup.exe
+linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-12/jstock-1.0.7.12-bin.zip
+macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-12/jstock-1.0.7.12-bin.zip
+solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-12/jstock-1.0.7.12-bin.zip
diff --git a/appengine/jstock-static/war/news_information/index.html b/appengine/jstock-static/war/news_information/index.html
@@ -4,29 +4,17 @@
     <body>
     <!--fe78440e-e0fe-4efb-881d-264a01be483c-->
     
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.11 had been released.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.12 had been released.</p>
     
     <p style="margin-top: 10; font-size: 9px; font-family: Tahoma"></p>
 
     <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
-    Bugfix:  Email alert by using Google oAuth2.0.
-    </p>
-    
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
-    Bugfix:  Select best country after open from cloud.
-    </p>
-    
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
-    Bugfix:  Malaysia stock history speed.
-    </p>
-    
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
-    Bugfix:  Make indicator scanner less busy to avoid Error message: "Unable to process request at this time -- error 999".
+    Bugfix:  Avoid possible data corruption.
     </p>
            
     <p style="margin-top: 10; font-size: 9px; font-family: Tahoma"></p>
     
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">You may download latest JStock 1.0.7.11 from <a href="http://jstock.org/download.html?utm_source=jstock&utm_medium=news_update">http://jstock.org/download.html</a>. After upgrade, your personal data will be preserved.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">You may download latest JStock 1.0.7.12 from <a href="http://jstock.org/download.html?utm_source=jstock&utm_medium=news_update">http://jstock.org/download.html</a>. After upgrade, your personal data will be preserved.</p>
     
     </body>
 </html>
diff --git a/appengine/jstock-static/war/news_information/index.txt b/appengine/jstock-static/war/news_information/index.txt
@@ -1,3 +1,3 @@
 id=ltsgi4R41y6x9GucPlNn5ls5HPDzKBIgRezXRcuYF/AjqV9XZCmyDJ9wl+KWaTed
-news_id=15/12/15
+news_id=29/12/15
 news_url=http://jstock-static.appspot.com/news_information/index.html
diff --git a/appengine/jstock-static/war/news_information/zh/index.html b/appengine/jstock-static/war/news_information/zh/index.html
@@ -4,29 +4,17 @@
     <body>
     <!--fe78440e-e0fe-4efb-881d-264a01be483c-->
     
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.11 had been released.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.12 had been released.</p>
     
     <p style="margin-top: 10; font-size: 9px; font-family: Tahoma"></p>
 
     <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
-    Bugfix:  Email alert by using Google oAuth2.0.
-    </p>
-    
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
-    Bugfix:  Select best country after open from cloud.
-    </p>
-    
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
-    Bugfix:  Malaysia stock history speed.
-    </p>
-    
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
-    Bugfix:  Make indicator scanner less busy to avoid Error message: "Unable to process request at this time -- error 999".
+    Bugfix:  Avoid possible data corruption.
     </p>
            
     <p style="margin-top: 10; font-size: 9px; font-family: Tahoma"></p>
     
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">You may download latest JStock 1.0.7.11 from <a href="http://jstock.org/download.html?utm_source=jstock&utm_medium=news_update">http://jstock.org/download.html</a>. After upgrade, your personal data will be preserved.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">You may download latest JStock 1.0.7.12 from <a href="http://jstock.org/zh/download.html?utm_source=jstock&utm_medium=news_update">http://jstock.org/zh/download.html</a>. After upgrade, your personal data will be preserved.</p>
     
     </body>
 </html>
diff --git a/appengine/jstock-static/war/news_information/zh/index.txt b/appengine/jstock-static/war/news_information/zh/index.txt
@@ -1,3 +1,3 @@
 id=ltsgi4R41y6x9GucPlNn5ls5HPDzKBIgRezXRcuYF/AjqV9XZCmyDJ9wl+KWaTed
-news_id=15/12/15
+news_id=29/12/15
 news_url=http://jstock-static.appspot.com/news_information/zh/index.html
diff --git a/appengine/jstock-static/war/version_information/index.txt b/appengine/jstock-static/war/version_information/index.txt
@@ -1,5 +1,5 @@
-applicationVersionID=1140
-windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-11/jstock-1.0.7.11-setup.exe
-linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-11/jstock-1.0.7.11-bin.zip
-macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-11/jstock-1.0.7.11-bin.zip
-solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-11/jstock-1.0.7.11-bin.zip
+applicationVersionID=1141
+windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-12/jstock-1.0.7.12-setup.exe
+linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-12/jstock-1.0.7.12-bin.zip
+macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-12/jstock-1.0.7.12-bin.zip
+solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-12/jstock-1.0.7.12-bin.zip
diff --git a/appengine/jstock-static/war/version_information/zh/index.txt b/appengine/jstock-static/war/version_information/zh/index.txt
@@ -1,5 +1,5 @@
-applicationVersionID=1140
-windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-11/jstock-1.0.7.11-setup.exe
-linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-11/jstock-1.0.7.11-bin.zip
-macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-11/jstock-1.0.7.11-bin.zip
-solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-11/jstock-1.0.7.11-bin.zip
+applicationVersionID=1141
+windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-12/jstock-1.0.7.12-setup.exe
+linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-12/jstock-1.0.7.12-bin.zip
+macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-12/jstock-1.0.7.12-bin.zip
+solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-12/jstock-1.0.7.12-bin.zip
diff --git a/docs/changelog.txt b/docs/changelog.txt
@@ -1,6 +1,9 @@
 ﻿This file summarizes changes in JStock releases.
 Numbers in parentheses refer to SourceForge.net tracker item numbers (#XXXXX)
 
+JStock 1.0.7.12 - 2015-12-29
+  Bugfix:  Avoid possible data corruption.
+  
 JStock 1.0.7.11 - 2015-12-15
   Bugfix:  Email alert by using Google oAuth2.0.
   Bugfix:  Select best country after open from cloud.
diff --git a/installer/windows/jstock.nsi b/installer/windows/jstock.nsi
@@ -11,7 +11,7 @@ Name ${PRODUCT_NAME}
 RequestExecutionLevel admin ;Workaround for Vista
 
 ; The file to write
-OutFile "jstock-1.0.7.11-setup.exe"
+OutFile "jstock-1.0.7.12-setup.exe"
 LicenseData "gpl-2.0.txt"
  
 ; The default installation directory
diff --git a/installer/windows/jstock.xml b/installer/windows/jstock.xml
@@ -25,12 +25,12 @@
     <maxHeapSize>512</maxHeapSize>
   </jre>
   <versionInfo>
-    <fileVersion>1.1.4.0</fileVersion>
-    <txtFileVersion>1.1.4.0</txtFileVersion>
+    <fileVersion>1.1.4.1</fileVersion>
+    <txtFileVersion>1.1.4.1</txtFileVersion>
     <fileDescription>JStock - Stock Market Software</fileDescription>
     <copyright>Yan Cheng Cheok &lt;yancheng.cheok@gmail.com&gt;</copyright>
-    <productVersion>1.1.4.0</productVersion>
-    <txtProductVersion>1.1.4.0</txtProductVersion>
+    <productVersion>1.1.4.1</productVersion>
+    <txtProductVersion>1.1.4.1</txtProductVersion>
     <productName>JStock - Stock Market Software</productName>
     <companyName>Yan Cheng Cheok &lt;yancheng.cheok@gmail.com&gt;</companyName>
     <internalName>jstock</internalName>
diff --git a/src/org/yccheok/jstock/file/Statements.java b/src/org/yccheok/jstock/file/Statements.java
@@ -150,8 +150,7 @@ public static Statements newInstanceFromBuyPortfolioTreeTableModel(BuyPortfolioT
                 atoms.add(new Atom(stock.code.toString(), tmp[0]));
                 atoms.add(new Atom(stock.symbol.toString(), tmp[1]));
                 
-                DateFormat dateFormat = org.yccheok.jstock.gui.Utils.getCommonDateFormat();
-                final String dateString = transaction.getDate() != null ? dateFormat.format(transaction.getDate().getTime()) : "";                        
+                final String dateString = transaction.getDate() != null ? org.yccheok.jstock.gui.Utils.commonDateFormat(transaction.getDate().getTime()) : "";                        
                 atoms.add(new Atom(dateString, tmp[2]));
                 atoms.add(new Atom(transaction.getQuantity(), tmp[3]));
                 atoms.add(new Atom(transaction.getPrice(), tmp[4]));
@@ -209,15 +208,13 @@ public static Statements newInstanceFromStockHistoryServer(StockHistoryServer se
         
         final int size = server.size();
         
-        final DateFormat dateFormat = org.yccheok.jstock.gui.Utils.getCommonDateFormat();
-        
         Stock stock = null;
         for (int i = 0; i < size; i++) {
             final long timestamp = server.getTimestamp(i);
             stock = server.getStock(timestamp);
             assert(timestamp != 0 && stock != null);
             final List<Atom> atoms = new ArrayList<Atom>();
-            final Atom atom0 = new Atom(dateFormat.format(timestamp), guiBundleWrapper.getString("StockHistory_Date"));
+            final Atom atom0 = new Atom(org.yccheok.jstock.gui.Utils.commonDateFormat(timestamp), guiBundleWrapper.getString("StockHistory_Date"));
             final Atom atom1 = new Atom(Double.valueOf(stock.getOpenPrice()), guiBundleWrapper.getString("StockHistory_Open"));
             final Atom atom2 = new Atom(Double.valueOf(stock.getHighPrice()), guiBundleWrapper.getString("StockHistory_High"));
             final Atom atom3 = new Atom(Double.valueOf(stock.getLowPrice()), guiBundleWrapper.getString("StockHistory_Low"));
@@ -775,8 +772,7 @@ else if (c.equals(StockInfo.class)) {
                     atoms.add(new Atom(stockInfo.symbol.toString(), symbol_string));                    
                 }
                 else if (c.equals(Date.class)) {
-                    DateFormat dateFormat = org.yccheok.jstock.gui.Utils.getCommonDateFormat();
-                    atoms.add(new Atom(object != null ? dateFormat.format(((Date)object).getTime()) : "", type));
+                    atoms.add(new Atom(object != null ? org.yccheok.jstock.gui.Utils.commonDateFormat(((Date)object).getTime()) : "", type));
                 } else {
                     // For fall below and rise above, null value is permitted.
                     // Use empty string to represent null value.
@@ -863,10 +859,9 @@ public static Statements newInstanceFromSellPortfolioTreeTableModel(SellPortfoli
                 atoms.add(new Atom(stock.code.toString(), tmp[0]));
                 atoms.add(new Atom(stock.symbol.toString(), tmp[1]));
                 
-                DateFormat dateFormat = org.yccheok.jstock.gui.Utils.getCommonDateFormat();
-                final String referenceDateString = transaction.getReferenceDate() != null ? dateFormat.format(transaction.getReferenceDate().getTime()) : "";
+                final String referenceDateString = transaction.getReferenceDate() != null ? org.yccheok.jstock.gui.Utils.commonDateFormat(transaction.getReferenceDate().getTime()) : "";
                 atoms.add(new Atom(referenceDateString, tmp[2]));
-                final String dateString = transaction.getDate() != null ? dateFormat.format(transaction.getDate().getTime()) : "";
+                final String dateString = transaction.getDate() != null ? org.yccheok.jstock.gui.Utils.commonDateFormat(transaction.getDate().getTime()) : "";
                 atoms.add(new Atom(dateString, tmp[3]));
                 atoms.add(new Atom(transaction.getQuantity(), tmp[4]));
                 atoms.add(new Atom(transaction.getPrice(), tmp[5]));
diff --git a/src/org/yccheok/jstock/gui/IndicatorScannerJPanel.java b/src/org/yccheok/jstock/gui/IndicatorScannerJPanel.java
@@ -379,11 +379,11 @@ public void run() {
                             Utils.playAlertSound();
                         }
                         try {
-                            // Make it rest for 1 minute. Yahoo does have quota
+                            // Make it rest for 2 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(2*60*1000);
                             
                             //Thread.sleep(jStockOptions.getAlertSpeed() * 1000);
                         }
diff --git a/src/org/yccheok/jstock/gui/Utils.java b/src/org/yccheok/jstock/gui/Utils.java
