JStock 1.0.7.25

yccheok · yccheok · commit a6daff51aa40 · 2017-05-24T23:47:53.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,21 +4,19 @@
     <body>
     <!--fe78440e-e0fe-4efb-881d-264a01be483c-->
     
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.24 had been released.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.25 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">
-	Feature: Swiss stock market supports Google Finance as price source.
-    </p>
-
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
-	Bugfix:  Fix Yahoo stock history API.
+    Feature: Save changePrices and changePricePercentages to disk so we can have 
+           daily profit information even when internet is not available. This
+           is for Android app purpose only.
     </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.24 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.25 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=05/24/17
+news_id=05/25/17
 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,21 +4,19 @@
     <body>
     <!--fe78440e-e0fe-4efb-881d-264a01be483c-->
     
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.24 had been released.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.25 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">
-	Feature: Swiss stock market supports Google Finance as price source.
-    </p>
-
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
-	Bugfix:  Fix Yahoo stock history API.
+    Feature: Save changePrices and changePricePercentages to disk so we can have 
+           daily profit information even when internet is not available. This
+           is for Android app purpose only.
     </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.24 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>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">You may download latest JStock 1.0.7.25 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=05/24/17
+news_id=05/25/17
 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=1153
-windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-24/jstock-1.0.7.24-setup.exe
-linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-24/jstock-1.0.7.24-bin.zip
-macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-24/jstock-1.0.7.24-bin.zip
-solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-24/jstock-1.0.7.24-bin.zip
+applicationVersionID=1154
+windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-25/jstock-1.0.7.25-setup.exe
+linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-25/jstock-1.0.7.25-bin.zip
+macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-25/jstock-1.0.7.25-bin.zip
+solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-25/jstock-1.0.7.25-bin.zip
diff --git a/appengine/jstock-static/war/news_information/index.html b/appengine/jstock-static/war/news_information/index.html
@@ -4,21 +4,19 @@
     <body>
     <!--fe78440e-e0fe-4efb-881d-264a01be483c-->
     
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.24 had been released.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.25 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">
-	Feature: Swiss stock market supports Google Finance as price source.
-    </p>
-
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
-	Bugfix:  Fix Yahoo stock history API.
+    Feature: Save changePrices and changePricePercentages to disk so we can have 
+           daily profit information even when internet is not available. This
+           is for Android app purpose only.
     </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.24 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.25 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=05/24/17
+news_id=05/25/17
 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,21 +4,19 @@
     <body>
     <!--fe78440e-e0fe-4efb-881d-264a01be483c-->
     
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.24 had been released.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.25 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">
-	Feature: Swiss stock market supports Google Finance as price source.
-    </p>
-
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
-	Bugfix:  Fix Yahoo stock history API.
+    Feature: Save changePrices and changePricePercentages to disk so we can have 
+           daily profit information even when internet is not available. This
+           is for Android app purpose only.
     </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.24 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>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">You may download latest JStock 1.0.7.25 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=05/24/17
+news_id=05/25/17
 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=1153
-windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-24/jstock-1.0.7.24-setup.exe
-linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-24/jstock-1.0.7.24-bin.zip
-macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-24/jstock-1.0.7.24-bin.zip
-solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-24/jstock-1.0.7.24-bin.zip
+applicationVersionID=1154
+windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-25/jstock-1.0.7.25-setup.exe
+linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-25/jstock-1.0.7.25-bin.zip
+macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-25/jstock-1.0.7.25-bin.zip
+solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-25/jstock-1.0.7.25-bin.zip
diff --git a/docs/changelog.txt b/docs/changelog.txt
@@ -1,6 +1,11 @@
 ﻿This file summarizes changes in JStock releases.
 Numbers in parentheses refer to SourceForge.net tracker item numbers (#XXXXX)
 
+JStock 1.0.7.25 - 2017-05-25
+  Feature: Save changePrices and changePricePercentages to disk so we can have 
+           daily profit information even when internet is not available. This
+           is for Android app purpose only.
+
 JStock 1.0.7.24 - 2017-05-24
   Feature: Swiss stock market supports Google Finance as price source.
   Bugfix:  Fix Yahoo stock history API.
diff --git a/installer/windows/jstock.nsi b/installer/windows/jstock.nsi
@@ -12,7 +12,7 @@ Name ${PRODUCT_NAME}
 RequestExecutionLevel admin ;Workaround for Vista
 
 ; The file to write
-OutFile "jstock-1.0.7.24-setup.exe"
+OutFile "jstock-1.0.7.25-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.5.3</fileVersion>
-    <txtFileVersion>1.1.5.3</txtFileVersion>
+    <fileVersion>1.1.5.4</fileVersion>
+    <txtFileVersion>1.1.5.4</txtFileVersion>
     <fileDescription>JStock - Stock Market Software</fileDescription>
     <copyright>Yan Cheng Cheok &lt;yancheng.cheok@gmail.com&gt;</copyright>
-    <productVersion>1.1.5.3</productVersion>
-    <txtProductVersion>1.1.5.3</txtProductVersion>
+    <productVersion>1.1.5.4</productVersion>
+    <txtProductVersion>1.1.5.4</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/gui/PortfolioManagementJPanel.java b/src/org/yccheok/jstock/gui/PortfolioManagementJPanel.java
@@ -2400,25 +2400,44 @@ private boolean saveCSVPortfolio() {
         
     private boolean savePortfolioRealTimeInfo(String directory, PortfolioRealTimeInfo portfolioRealTimeInfo) {
         PortfolioRealTimeInfo _portfolioRealTimeInfo = new PortfolioRealTimeInfo(portfolioRealTimeInfo);
-        
+
         Map<Code, Double> goodStockPrices = new HashMap<>();
+        Map<Code, Double> goodChangePrices = new HashMap<>();
+        Map<Code, Double> goodChangePricePercentages = new HashMap<>();
         Map<Code, Currency> goodCurrencies = new HashMap<>();
         Map<CurrencyPair, Double> goodExchangeRates = new HashMap<>();
-        
+
         ////////////////////////////////////////////////////////////////////////
         // goodStockPrices
         ////////////////////////////////////////////////////////////////////////
         for (Code code : getBuyCodes()) {
             final Double price = _portfolioRealTimeInfo.stockPrices.get(code);
+            final Double changePrice = _portfolioRealTimeInfo.changePrices.get(code);
+            final Double changePricePercentage = _portfolioRealTimeInfo.changePricePercentages.get(code);
+
             if (price == null) {
                 // Having 0 is important too, so that we can generate correct
                 // portfolioinfos.csv
                 goodStockPrices.put(code, 0.0);
             } else {
                 goodStockPrices.put(code, price);
             }
+
+            if (changePrice == null) {
+                // Having 0 is not really that important. We just mimic what is being done on goodStockPrices.
+                goodChangePrices.put(code, 0.0);
+            } else {
+                goodChangePrices.put(code, changePrice);
+            }
+
+            if (changePricePercentage == null) {
+                // Having 0 is not really that important. We just mimic what is being done on goodStockPrices.
+                goodChangePricePercentages.put(code, 0.0);
+            } else {
+                goodChangePricePercentages.put(code, changePricePercentage);
+            }
         }
-        
+
         ////////////////////////////////////////////////////////////////////////
         // goodCurrencies. Don't use getBuyCodes, as we need to perform currency
         // conversion on sell stocks too.
@@ -2429,7 +2448,7 @@ private boolean savePortfolioRealTimeInfo(String directory, PortfolioRealTimeInf
                 goodCurrencies.put(code, currency);
             }
         }
-        
+
         ////////////////////////////////////////////////////////////////////////
         // goodExchangeRates
         ////////////////////////////////////////////////////////////////////////
@@ -2439,15 +2458,19 @@ private boolean savePortfolioRealTimeInfo(String directory, PortfolioRealTimeInf
                 goodExchangeRates.put(currencyPair, rate);
             }
         }
-        
+
         _portfolioRealTimeInfo.stockPrices.clear();
         _portfolioRealTimeInfo.currencies.clear();
         _portfolioRealTimeInfo.exchangeRates.clear();
-        
+        _portfolioRealTimeInfo.changePrices.clear();
+        _portfolioRealTimeInfo.changePricePercentages.clear();
+
         _portfolioRealTimeInfo.stockPrices.putAll(goodStockPrices);
         _portfolioRealTimeInfo.currencies.putAll(goodCurrencies);
         _portfolioRealTimeInfo.exchangeRates.putAll(goodExchangeRates);
-        
+        _portfolioRealTimeInfo.changePrices.putAll(goodChangePrices);
+        _portfolioRealTimeInfo.changePricePercentages.putAll(goodChangePricePercentages);
+
         final File stockPricesFile = new File(directory + "portfolio-real-time-info.json");
         return _portfolioRealTimeInfo.save(stockPricesFile);
     }
@@ -2674,7 +2697,9 @@ private void update(RealTimeStockMonitor monitor, final RealTimeStockMonitor.Res
         
         final Map<Code, Double> stockPrices = this.portfolioRealTimeInfo.stockPrices;
         final Map<Code, Currency> currencies = this.portfolioRealTimeInfo.currencies;
- 
+        final Map<Code, Double> changePrices = portfolioRealTimeInfo.changePrices;
+        final Map<Code, Double> changePricePercentages = portfolioRealTimeInfo.changePricePercentages;
+
         final Set<Code> buyCodes = this.getBuyCodes();
         final Set<Code> sellCodes = this.getSellCodes();
         
@@ -2706,6 +2731,21 @@ private void update(RealTimeStockMonitor monitor, final RealTimeStockMonitor.Res
                         }
                     }
                 }
+                
+                final double changePrice = stock.getChangePrice();
+                final double changePricePercentage = stock.getChangePricePercentage();
+
+                Double oldChangePrice = changePrices.get(code);
+                changePrices.put(code, changePrice);
+                if (oldChangePrice == null || oldChangePrice != changePrice) {
+                    portfolioRealTimeInfo.changePricesDirty = true;
+                }
+
+                Double oldChangePricePercentage = changePricePercentages.get(code);
+                changePricePercentages.put(code, changePricePercentage);
+                if (oldChangePricePercentage == null || oldChangePricePercentage != changePricePercentage) {
+                    portfolioRealTimeInfo.changePricePercentagesDirty = true;
+                }
             } else if (sellCodes.contains(code)) {
                 if (currency != null) {
                     final Currency oldCurrency = currencies.put(code, currency);
diff --git a/src/org/yccheok/jstock/gui/Utils.java b/src/org/yccheok/jstock/gui/Utils.java
@@ -2736,11 +2736,11 @@ public ApplicationInfo(int applicationVersionID, String windowsDownloadLink, Str
 
     ////////////////////////////////////////////////////////////////////////////
     ////////////////////////////////////////////////////////////////////////////
-    private static final String ABOUT_BOX_VERSION_STRING = "1.0.7.24";
+    private static final String ABOUT_BOX_VERSION_STRING = "1.0.7.25";
 
-    // 1.0.7.24
+    // 1.0.7.25
     // For About box comparision on latest version purpose.
-    private static final int APPLICATION_VERSION_ID = 1153;
+    private static final int APPLICATION_VERSION_ID = 1154;
     ////////////////////////////////////////////////////////////////////////////
     ////////////////////////////////////////////////////////////////////////////
     
diff --git a/src/org/yccheok/jstock/portfolio/PortfolioRealTimeInfo.java b/src/org/yccheok/jstock/portfolio/PortfolioRealTimeInfo.java
