Sync

yccheok · yccheok · commit d94bd8f2a238 · 2017-05-24T01:14:37.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,20 +4,21 @@
     <body>
     <!--fe78440e-e0fe-4efb-881d-264a01be483c-->
     
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.22 had been released.</p>
+    <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"></p>
 
     <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
-    Feature: Support Google Finance for Indonesia.
+	Feature: Swiss stock market supports Google Finance as price source.
     </p>
+
     <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
-    Bugfix:  DriveWealth advertising wording change.
+	Bugfix:  Fix Yahoo stock history API.
     </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.22 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.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>
     
     </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=04/16/17
+news_id=05/24/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,20 +4,21 @@
     <body>
     <!--fe78440e-e0fe-4efb-881d-264a01be483c-->
     
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.22 had been released.</p>
+    <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"></p>
 
     <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
-    Feature: Support Google Finance for Indonesia.
+	Feature: Swiss stock market supports Google Finance as price source.
     </p>
+
     <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
-    Bugfix:  DriveWealth advertising wording change.
+	Bugfix:  Fix Yahoo stock history API.
     </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.22 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.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>
     
     </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=04/16/17
+news_id=05/24/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=1151
-windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-22/jstock-1.0.7.22-setup.exe
-linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-22/jstock-1.0.7.22-bin.zip
-macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-22/jstock-1.0.7.22-bin.zip
-solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-22/jstock-1.0.7.22-bin.zip
+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
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=1151
-windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-22/jstock-1.0.7.22-setup.exe
-linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-22/jstock-1.0.7.22-bin.zip
-macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-22/jstock-1.0.7.22-bin.zip
-solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-22/jstock-1.0.7.22-bin.zip
+applicationVersionID=1152
+windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-23/jstock-1.0.7.23-setup.exe
+linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-23/jstock-1.0.7.23-bin.zip
+macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-23/jstock-1.0.7.23-bin.zip
+solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-23/jstock-1.0.7.23-bin.zip
diff --git a/appengine/jstock-static/war/news_information/index.html b/appengine/jstock-static/war/news_information/index.html
@@ -4,17 +4,21 @@
     <body>
     <!--fe78440e-e0fe-4efb-881d-264a01be483c-->
     
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.23 had been released.</p>
+    <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"></p>
 
     <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
-    Feature: Support Google Finance for Malaysia.
+	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.
     </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.23 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.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>
     
     </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/18/17
+news_id=05/24/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,17 +4,21 @@
     <body>
     <!--fe78440e-e0fe-4efb-881d-264a01be483c-->
     
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.23 had been released.</p>
+    <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"></p>
 
     <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
-    Feature: Support Google Finance for Malaysia.
+	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.
     </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.23 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.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>
     
     </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/18/17
+news_id=05/24/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=1152
-windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-23/jstock-1.0.7.23-setup.exe
-linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-23/jstock-1.0.7.23-bin.zip
-macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-23/jstock-1.0.7.23-bin.zip
-solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-23/jstock-1.0.7.23-bin.zip
+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
diff --git a/appengine/jstock-webapp/slow.py b/appengine/jstock-webapp/slow.py
@@ -7,6 +7,9 @@ def get(self):
 
     def post(self):
         time.sleep(1024)
+
+    def put(self):
+        time.sleep(1024)
         
 app = webapp2.WSGIApplication([
     (r'/.*', AnyHandler)
diff --git a/docs/changelog.txt b/docs/changelog.txt
@@ -1,6 +1,10 @@
 ﻿This file summarizes changes in JStock releases.
 Numbers in parentheses refer to SourceForge.net tracker item numbers (#XXXXX)
 
+JStock 1.0.7.24 - 2017-05-24
+  Feature: Swiss stock market supports Google Finance as price source.
+  Feature: Fix Yahoo stock history API.
+
 JStock 1.0.7.23 - 2017-05-18
   Feature: Support Google Finance for Malaysia.
   
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.23-setup.exe"
+OutFile "jstock-1.0.7.24-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.2</fileVersion>
-    <txtFileVersion>1.1.5.2</txtFileVersion>
+    <fileVersion>1.1.5.3</fileVersion>
+    <txtFileVersion>1.1.5.3</txtFileVersion>
     <fileDescription>JStock - Stock Market Software</fileDescription>
     <copyright>Yan Cheng Cheok &lt;yancheng.cheok@gmail.com&gt;</copyright>
-    <productVersion>1.1.5.2</productVersion>
-    <txtProductVersion>1.1.5.2</txtProductVersion>
+    <productVersion>1.1.5.3</productVersion>
+    <txtProductVersion>1.1.5.3</txtProductVersion>
     <productName>JStock - Stock Market Software</productName>
     <companyName>Yan Cheng Cheok &lt;yancheng.cheok@gmail.com&gt;</companyName>
     <internalName>jstock</internalName>
diff --git a/nbproject/project.properties b/nbproject/project.properties
@@ -1,12 +1,17 @@
 file.reference.controlsfx-8.40.12.jar=libs/controlsfx-8.40.12/controlsfx-8.40.12.jar
+file.reference.converter-gson-2.3.0.jar=libs/retrofit2/converter-gson-2.3.0.jar
 file.reference.dom4j-1.6.1.jar-1=libs/feed4j/libs/dom4j-1.6.1.jar
 file.reference.feed4j.jar=libs/feed4j/feed4j.jar
 file.reference.google-api-services-gmail-v1-rev34-1.21.0.jar=libs/gmail/google-api-services-gmail-v1-rev34-1.21.0.jar
+file.reference.gson-2.6.2.jar=libs/retrofit2/gson-2.6.2.jar
 file.reference.jfxrt.jar=C:\\Program Files\\Java\\jdk1.8.0_111\\jre\\lib\\ext\\jfxrt.jar
 file.reference.jgoogleanalytics-0.5.jar=libs/jgoogleanalytics/jgoogleanalytics-0.5.jar
 file.reference.nekohtml.jar=libs/feed4j/libs/nekohtml.jar
+file.reference.okhttp-3.8.0.jar=libs/retrofit2/okhttp-3.8.0.jar
+file.reference.okio-1.13.0.jar=libs/retrofit2/okio-1.13.0.jar
 #Fri Dec 11 01:05:48 SGT 2015
 file.reference.pinyin4j-2.5.0.jar=libs/pinyin4j-2.5.0/lib/pinyin4j-2.5.0.jar
+file.reference.retrofit-2.3.0.jar=libs/retrofit2/retrofit-2.3.0.jar
 file.reference.sqlite-jdbc-3.16.1.jar=libs/sqlite/sqlite-jdbc-3.16.1.jar
 file.reference.xercesImpl.jar=libs/feed4j/libs/xercesImpl.jar
 file.reference.xml-apis.jar=libs/feed4j/libs/xml-apis.jar
@@ -37,7 +42,6 @@ build.dir=build
 javac.deprecation=false
 file.reference.jxlayer.jar=libs/jxlayer/jxlayer.jar
 file.reference.jakarta-oro-2.0.8.jar=libs/commons-validator/jakarta-oro-2.0.8.jar
-file.reference.gson-2.2.4.jar=libs/google-gson-2.2.4/gson-2.2.4.jar
 file.reference.forms-1.1.0.jar=libs/forms-1.1.0.jar
 file.reference.kxml2-2.3.0.jar=libs/xstream/kxml2-2.3.0.jar
 file.reference.opencsv-2.3.jar=libs/opencsv/opencsv-2.3.jar
@@ -120,8 +124,8 @@ javac.classpath=\
     ${file.reference.jxlayer.jar}:\
     ${file.reference.pinyin4j-2.5.0.jar}:\
     ${file.reference.xstream-1.4.2.jar}:\
-    ${file.reference.gson-2.2.4.jar}:\
     ${file.reference.jsr305-1.3.9.jar}:\
+    ${file.reference.gson-2.6.2.jar}:\
     ${file.reference.google-api-client-java6-1.21.0.jar}:\
     ${file.reference.google-oauth-client-java6-1.21.0.jar}:\
     ${file.reference.google-oauth-client-jetty-1.21.0.jar}:\
@@ -145,7 +149,11 @@ javac.classpath=\
     ${file.reference.controlsfx-8.40.12.jar}:\
     ${file.reference.jgoogleanalytics-0.5.jar}:\
     ${file.reference.jfxrt.jar}:\
-    ${file.reference.sqlite-jdbc-3.16.1.jar}
+    ${file.reference.sqlite-jdbc-3.16.1.jar}:\
+    ${file.reference.retrofit-2.3.0.jar}:\
+    ${file.reference.converter-gson-2.3.0.jar}:\
+    ${file.reference.okhttp-3.8.0.jar}:\
+    ${file.reference.okio-1.13.0.jar}
     ${file.reference.jgoogleanalytics-0.5.jar}
 javadoc.noindex=false
 annotation.processing.enabled.in.editor=false
diff --git a/src/org/yccheok/jstock/gui/JStock.java b/src/org/yccheok/jstock/gui/JStock.java
@@ -1047,6 +1047,12 @@ private void formWindowClosed(java.awt.event.WindowEvent evt) {//GEN-FIRST:event
                 _stockInfoDatabaseMetaPool.shutdownNow();
             }
 
+            ExecutorService _googleCodeDatabasePool = this.googleCodeDatabasePool;
+            this.googleCodeDatabasePool = null;
+            if (_googleCodeDatabasePool != null) {
+                _googleCodeDatabasePool.shutdownNow();
+            }
+
             // Always be the first statement. As no matter what happen, we must
             // save all the configuration files.
             this.save();
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.23";
+    private static final String ABOUT_BOX_VERSION_STRING = "1.0.7.24";
 
-    // 1.0.7.23
+    // 1.0.7.24
     // For About box comparision on latest version purpose.
-    private static final int APPLICATION_VERSION_ID = 1152;
+    private static final int APPLICATION_VERSION_ID = 1153;
     ////////////////////////////////////////////////////////////////////////////
     ////////////////////////////////////////////////////////////////////////////
     
diff --git a/src/org/yccheok/jstock/network/Utils.java b/src/org/yccheok/jstock/network/Utils.java
@@ -51,7 +51,9 @@ public enum Type {
         ANDROID_FAQ,
         DRIVEWEALTH_LOG,
         GOOGLE_CODE_DATABASE_META,
-        GOOGLE_CODE_DATABASE
+        GOOGLE_CODE_DATABASE,
+        MISSING_STOCK_CODE_SERVICE,
+        YAHOO_FINANCE_API
     }
 
     private Utils() {
@@ -118,6 +120,8 @@ public static String getJStockStaticServer() {
         map.put(Type.DRIVEWEALTH_LOG, "https://jstock-drivewealth.appspot.com/log");
         map.put(Type.GOOGLE_CODE_DATABASE_META, JSTOCK_STATIC_SERVER + "stocks_information/google-code-database-meta.json");
         map.put(Type.GOOGLE_CODE_DATABASE, JSTOCK_STATIC_SERVER + "stocks_information/" + COUNTRY_TEMPLATE + "/google-code-database.zip");
+        map.put(Type.MISSING_STOCK_CODE_SERVICE, JSTOCK_WEBAPP_SERVER + "missing-stock-code/");
+        map.put(Type.YAHOO_FINANCE_API, "https://finance-yql.media.yahoo.com/v7/finance/");
 
         zh_map.put(Type.CHAT_SERVER_TXT, JSTOCK_STATIC_SERVER + "servers_information/chat_server.txt");
         zh_map.put(Type.NTP_SERVER_TXT, JSTOCK_STATIC_SERVER + "servers_information/ntp_server.txt");
@@ -142,6 +146,8 @@ public static String getJStockStaticServer() {
         zh_map.put(Type.DRIVEWEALTH_LOG, "https://jstock-drivewealth.appspot.com/log");
         zh_map.put(Type.GOOGLE_CODE_DATABASE_META, JSTOCK_STATIC_SERVER + "stocks_information/google-code-database-meta.json");
         zh_map.put(Type.GOOGLE_CODE_DATABASE, JSTOCK_STATIC_SERVER + "stocks_information/" + COUNTRY_TEMPLATE + "/google-code-database.zip");
+        zh_map.put(Type.MISSING_STOCK_CODE_SERVICE, JSTOCK_WEBAPP_SERVER + "missing-stock-code/");
+        zh_map.put(Type.YAHOO_FINANCE_API, "https://finance-yql.media.yahoo.com/v7/finance/");
 
         zh_Hant_map.put(Type.CHAT_SERVER_TXT, JSTOCK_STATIC_SERVER + "servers_information/chat_server.txt");
         zh_Hant_map.put(Type.NTP_SERVER_TXT, JSTOCK_STATIC_SERVER + "servers_information/ntp_server.txt");
@@ -166,6 +172,8 @@ public static String getJStockStaticServer() {
         zh_Hant_map.put(Type.DRIVEWEALTH_LOG, "https://jstock-drivewealth.appspot.com/log");
         zh_Hant_map.put(Type.GOOGLE_CODE_DATABASE_META, JSTOCK_STATIC_SERVER + "stocks_information/google-code-database-meta.json");
         zh_Hant_map.put(Type.GOOGLE_CODE_DATABASE, JSTOCK_STATIC_SERVER + "stocks_information/" + COUNTRY_TEMPLATE + "/google-code-database.zip");
+        zh_Hant_map.put(Type.MISSING_STOCK_CODE_SERVICE, JSTOCK_WEBAPP_SERVER + "missing-stock-code/");
+        zh_Hant_map.put(Type.YAHOO_FINANCE_API, "https://finance-yql.media.yahoo.com/v7/finance/");
 
         assert(map.size() == Type.values().length);
         assert(zh_map.size() == Type.values().length);
