sync

yccheok · yccheok · commit aa1eaf8f6723 · 2017-01-21T01:06:16.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,20 @@
     <body>
     <!--fe78440e-e0fe-4efb-881d-264a01be483c-->
     
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.18 had been released.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.19 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: JStock is partnering with DriveWealth, to provide U.S. stock trading service. You can own a fraction of share, with total cost as low as $1.99!
+    Feature: Added millisecond speed option for indicator scanning.
     </p>
     <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
-    Feature: Better way to report the progress of indicator scanning.
+    Bugfix:  Various bug fixes and improvements for U.S. stock trading.
     </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.18 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.19 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=12/28/16
+news_id=01/21/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,20 @@
     <body>
     <!--fe78440e-e0fe-4efb-881d-264a01be483c-->
     
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.18 had been released.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.19 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: JStock is partnering with DriveWealth, to provide U.S. stock trading service. You can own a fraction of share, with total cost as low as $1.99!
+    Feature: Added millisecond speed option for indicator scanning.
     </p>
     <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
-    Feature: Better way to report the progress of indicator scanning.
+    Bugfix:  Various bug fixes and improvements for U.S. stock trading.
     </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.18 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.19 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=12/28/16
+news_id=01/21/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=1147
-windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-18/jstock-1.0.7.18-setup.exe
-linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-18/jstock-1.0.7.18-bin.zip
-macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-18/jstock-1.0.7.18-bin.zip
-solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-18/jstock-1.0.7.18-bin.zip
+applicationVersionID=1148
+windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-19/jstock-1.0.7.19-setup.exe
+linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-19/jstock-1.0.7.19-bin.zip
+macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-19/jstock-1.0.7.19-bin.zip
+solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-19/jstock-1.0.7.19-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=1147
-windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-18/jstock-1.0.7.18-setup.exe
-linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-18/jstock-1.0.7.18-bin.zip
-macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-18/jstock-1.0.7.18-bin.zip
-solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-18/jstock-1.0.7.18-bin.zip
+applicationVersionID=1148
+windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-19/jstock-1.0.7.19-setup.exe
+linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-19/jstock-1.0.7.19-bin.zip
+macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-19/jstock-1.0.7.19-bin.zip
+solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-19/jstock-1.0.7.19-bin.zip
diff --git a/appengine/jstock-static/war/news_information/index.html b/appengine/jstock-static/war/news_information/index.html
@@ -4,20 +4,20 @@
     <body>
     <!--fe78440e-e0fe-4efb-881d-264a01be483c-->
     
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.18 had been released.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.19 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: JStock is partnering with DriveWealth, to provide U.S. stock trading service. You can own a fraction of share, with total cost as low as $1.99!
+    Feature: Added millisecond speed option for indicator scanning.
     </p>
     <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
-    Feature: Better way to report the progress of indicator scanning.
+    Bugfix:  Various bug fixes and improvements for U.S. stock trading.
     </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.18 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.19 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=12/28/16
+news_id=01/21/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,20 +4,20 @@
     <body>
     <!--fe78440e-e0fe-4efb-881d-264a01be483c-->
     
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.18 had been released.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.19 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: JStock is partnering with DriveWealth, to provide U.S. stock trading service. You can own a fraction of share, with total cost as low as $1.99!
+    Feature: Added millisecond speed option for indicator scanning.
     </p>
     <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
-    Feature: Better way to report the progress of indicator scanning.
+    Bugfix:  Various bug fixes and improvements for U.S. stock trading.
     </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.18 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.19 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=12/28/16
+news_id=01/21/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=1147
-windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-18/jstock-1.0.7.18-setup.exe
-linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-18/jstock-1.0.7.18-bin.zip
-macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-18/jstock-1.0.7.18-bin.zip
-solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-18/jstock-1.0.7.18-bin.zip
+applicationVersionID=1148
+windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-19/jstock-1.0.7.19-setup.exe
+linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-19/jstock-1.0.7.19-bin.zip
+macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-19/jstock-1.0.7.19-bin.zip
+solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-19/jstock-1.0.7.19-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=1147
-windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-18/jstock-1.0.7.18-setup.exe
-linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-18/jstock-1.0.7.18-bin.zip
-macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-18/jstock-1.0.7.18-bin.zip
-solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-18/jstock-1.0.7.18-bin.zip
+applicationVersionID=1148
+windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-19/jstock-1.0.7.19-setup.exe
+linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-19/jstock-1.0.7.19-bin.zip
+macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-19/jstock-1.0.7.19-bin.zip
+solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-19/jstock-1.0.7.19-bin.zip
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.19 - 2017-01-21
+  Feature: Added millisecond speed option for indicator scanning.
+  Bugfix:  Various bug fixes and improvements for U.S. stock trading.
+  
 JStock 1.0.7.18 - 2016-12-27
   Feature: JStock is partnering with DriveWealth, to provide U.S. stock trading
            service.
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.18-setup.exe"
+OutFile "jstock-1.0.7.19-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.7</fileVersion>
-    <txtFileVersion>1.1.4.7</txtFileVersion>
+    <fileVersion>1.1.4.8</fileVersion>
+    <txtFileVersion>1.1.4.8</txtFileVersion>
     <fileDescription>JStock - Stock Market Software</fileDescription>
     <copyright>Yan Cheng Cheok &lt;yancheng.cheok@gmail.com&gt;</copyright>
-    <productVersion>1.1.4.7</productVersion>
-    <txtProductVersion>1.1.4.7</txtProductVersion>
+    <productVersion>1.1.4.8</productVersion>
+    <txtProductVersion>1.1.4.8</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/data/gui.properties b/src/org/yccheok/jstock/data/gui.properties
@@ -781,4 +781,4 @@ FairUsagePolicyJDialog_Description=Google Finance and Yahoo Finance will block y
 FairUsagePolicyJDialog_StockIndicatorScanningSpeed=Stock indicator scanning speed
 FairUsagePolicyJDialog_slow=10 seconds (Slow speed, recommended)
 FairUsagePolicyJDialog_fast=1 second
-FairUsagePolicyJDialog_second=second(s)
+FairUsagePolicyJDialog_millisecond=millisecond(s)
diff --git a/src/org/yccheok/jstock/data/gui_de.properties b/src/org/yccheok/jstock/data/gui_de.properties
@@ -772,7 +772,7 @@ OptionsGUIJPanel_UseLargeFont=Use large font
 OptionsGUIJPanel_Font=Font
 FairUsagePolicyJDialog_Description=Google Finance and Yahoo Finance will block you from accessing stock data for period of time, if you scan with high speed.
 FairUsagePolicyJDialog_fast=1 second
-FairUsagePolicyJDialog_second=second(s)
+FairUsagePolicyJDialog_millisecond=millisecond(s)
 FairUsagePolicyJDialog_slow=10 seconds (Slow speed, recommended)
 FairUsagePolicyJDialog_StockIndicatorScanningSpeed=Stock indicator scanning speed
 FairUsagePolicyJDialog_Title=Fair Usage Policy
diff --git a/src/org/yccheok/jstock/data/gui_en.properties b/src/org/yccheok/jstock/data/gui_en.properties
@@ -775,7 +775,7 @@ OptionsGUIJPanel_UseLargeFont=Use large font
 OptionsGUIJPanel_Font=Font
 FairUsagePolicyJDialog_Description=Google Finance and Yahoo Finance will block you from accessing stock data for period of time, if you scan with high speed.
 FairUsagePolicyJDialog_fast=1 second
-FairUsagePolicyJDialog_second=second(s)
+FairUsagePolicyJDialog_millisecond=millisecond(s)
 FairUsagePolicyJDialog_slow=10 seconds (Slow speed, recommended)
 FairUsagePolicyJDialog_StockIndicatorScanningSpeed=Stock indicator scanning speed
 FairUsagePolicyJDialog_Title=Fair Usage Policy
diff --git a/src/org/yccheok/jstock/data/gui_it.properties b/src/org/yccheok/jstock/data/gui_it.properties
@@ -776,7 +776,7 @@ OptionsGUIJPanel_UseLargeFont=Use large font
 OptionsGUIJPanel_Font=Font
 FairUsagePolicyJDialog_Description=Google Finance and Yahoo Finance will block you from accessing stock data for period of time, if you scan with high speed.
 FairUsagePolicyJDialog_fast=1 second
-FairUsagePolicyJDialog_second=second(s)
+FairUsagePolicyJDialog_millisecond=millisecond(s)
 FairUsagePolicyJDialog_slow=10 seconds (Slow speed, recommended)
 FairUsagePolicyJDialog_StockIndicatorScanningSpeed=Stock indicator scanning speed
 FairUsagePolicyJDialog_Title=Fair Usage Policy
diff --git a/src/org/yccheok/jstock/data/gui_zh.properties b/src/org/yccheok/jstock/data/gui_zh.properties
@@ -769,7 +769,7 @@ OptionsGUIJPanel_UseLargeFont=\u4f7f\u7528\u5927\u5b57\u4f53
 OptionsGUIJPanel_Font=\u5b57\u4f53
 FairUsagePolicyJDialog_Description=\u5982\u679c\u60a8\u7528\u9ad8\u901f\u626b\u63cf\uff0c\u8c37\u6b4c\u8d22\u7ecf\u53ca\u96c5\u864e\u8d22\u7ecf\u5c06\u963b\u6b62\u60a8\u8bfb\u53d6\u80a1\u7968\u6570\u636e\u4e00\u6bb5\u65f6\u95f4\u3002
 FairUsagePolicyJDialog_fast=1\u79d2
-FairUsagePolicyJDialog_second=\u79d2
+FairUsagePolicyJDialog_millisecond=\u6beb\u79d2
 FairUsagePolicyJDialog_slow=10\u79d2\uff08\u6162\u901f\uff0c\u63a8\u8350\u7684\uff09
 FairUsagePolicyJDialog_StockIndicatorScanningSpeed=\u80a1\u7968\u6307\u6807\u626b\u63cf\u901f\u5ea6
 FairUsagePolicyJDialog_Title=\u516c\u5e73\u4f7f\u7528\u653f\u7b56
diff --git a/src/org/yccheok/jstock/data/gui_zh_TW.properties b/src/org/yccheok/jstock/data/gui_zh_TW.properties
@@ -767,7 +767,7 @@ OptionsGUIJPanel_Font=\u5b57\u9ad4
 OptionsGUIJPanel_UseLargeFont=\u4f7f\u7528\u5927\u5b57\u9ad4
 FairUsagePolicyJDialog_Description=\u5982\u679c\u60a8\u7528\u9ad8\u901f\u6383\u63cf\uff0c\u8c37\u6b4c\u8ca1\u7d93\u53ca\u96c5\u864e\u8ca1\u7d93\u5c07\u963b\u6b62\u60a8\u8b80\u53d6\u80a1\u7968\u6578\u64da\u4e00\u6bb5\u6642\u9593\u3002
 FairUsagePolicyJDialog_fast=1\u79d2
-FairUsagePolicyJDialog_second=\u79d2
+FairUsagePolicyJDialog_millisecond=\u6beb\u79d2
 FairUsagePolicyJDialog_slow=10\u79d2\uff08\u6162\u901f\uff0c\u63a8\u85a6\u7684\uff09
 FairUsagePolicyJDialog_StockIndicatorScanningSpeed=\u80a1\u7968\u6307\u6a19\u6383\u63cf\u901f\u5ea6
 FairUsagePolicyJDialog_Title=\u516c\u5e73\u4f7f\u7528\u653f\u7b56
diff --git a/src/org/yccheok/jstock/gui/JStock.java b/src/org/yccheok/jstock/gui/JStock.java
@@ -72,6 +72,7 @@
 
 import org.yccheok.jstock.gui.trading.TradingJPanel;
 import org.yccheok.jstock.gui.trading.TradingView;
+import org.yccheok.jstock.internationalization.DriveWealthBundle;
 import org.yccheok.jstock.trading.api.InstrumentManager;
 
 
@@ -153,7 +154,7 @@ private void init() {
         this.initJXLayerOnJComboBox();
         this.initKeyBindings();
         this.initDriveWealthInstruments();
-                
+
         // Turn to the last viewed page.
         final int lastSelectedPageIndex = this.getJStockOptions().getLastSelectedPageIndex();
         if (this.jTabbedPane1.getTabCount() > lastSelectedPageIndex) {
@@ -4557,7 +4558,7 @@ public String getBestStatusBarMessage() {
             currentName = this.getJStockOptions().getPortfolioName();
             _timestamp = this.portfolioManagementJPanel.getTimestamp();
         } else if (selected == this.tradingJPanel) {
-            currentName = "DriveWealth - Market data is provided by BATS";
+            currentName = DriveWealthBundle.getString("Drivewealth_data_by_BATS");
             _timestamp = TradingView.getInstance().getTimestamp();
         } else {
             return GUIBundle.getString("MainFrame_Connected");
diff --git a/src/org/yccheok/jstock/gui/JStockOptions.java b/src/org/yccheok/jstock/gui/JStockOptions.java
diff --git a/src/org/yccheok/jstock/gui/Utils.java b/src/org/yccheok/jstock/gui/Utils.java
