1.0.7x

yccheok · yccheok · commit c02d4fc8d248 · 2015-02-15T17:42:25.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,15 +4,17 @@
     <body>
     <!--fe78440e-e0fe-4efb-881d-264a01be483c-->
     
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7w had been released.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7x 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:  Allow user to enable/disable new currency exchange feature.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">Feature: Show foreign currency in portfolio page, to avoid user confusion.</p>
+  
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">Feature: Google Finance supported in Belgium.</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.7w 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.7x 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=13/02/15
+news_id=15/02/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,15 +4,17 @@
     <body>
     <!--fe78440e-e0fe-4efb-881d-264a01be483c-->
     
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7w had been released.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7x 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:  Allow user to enable/disable new currency exchange feature.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">Feature: Show foreign currency in portfolio page, to avoid user confusion.</p>
+  
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">Feature: Google Finance supported in Belgium.</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.7w 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.7x 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=13/02/15
+news_id=15/02/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=1126
-windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7w/jstock-1.0.7w-setup.exe
-linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7w/jstock-1.0.7w-bin.zip
-macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7w/jstock-1.0.7w-bin.zip
-solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7w/jstock-1.0.7w-bin.zip
+applicationVersionID=1127
+windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7x/jstock-1.0.7x-setup.exe
+linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7x/jstock-1.0.7x-bin.zip
+macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7x/jstock-1.0.7x-bin.zip
+solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7x/jstock-1.0.7x-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=1126
-windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7w/jstock-1.0.7w-setup.exe
-linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7w/jstock-1.0.7w-bin.zip
-macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7w/jstock-1.0.7w-bin.zip
-solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7w/jstock-1.0.7w-bin.zip
+applicationVersionID=1127
+windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7x/jstock-1.0.7x-setup.exe
+linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7x/jstock-1.0.7x-bin.zip
+macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7x/jstock-1.0.7x-bin.zip
+solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7x/jstock-1.0.7x-bin.zip
diff --git a/appengine/jstock-static/war/news_information/index.html b/appengine/jstock-static/war/news_information/index.html
@@ -4,15 +4,17 @@
     <body>
     <!--fe78440e-e0fe-4efb-881d-264a01be483c-->
     
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7w had been released.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7x 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:  Allow user to enable/disable new currency exchange feature.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">Feature: Show foreign currency in portfolio page, to avoid user confusion.</p>
+  
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">Feature: Google Finance supported in Belgium.</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.7w 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.7x 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=13/02/15
+news_id=15/02/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,15 +4,17 @@
     <body>
     <!--fe78440e-e0fe-4efb-881d-264a01be483c-->
     
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7w had been released.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7x 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:  Allow user to enable/disable new currency exchange feature.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">Feature: Show foreign currency in portfolio page, to avoid user confusion.</p>
+  
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">Feature: Google Finance supported in Belgium.</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.7w 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.7x 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=13/02/15
+news_id=15/02/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=1126
-windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7w/jstock-1.0.7w-setup.exe
-linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7w/jstock-1.0.7w-bin.zip
-macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7w/jstock-1.0.7w-bin.zip
-solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7w/jstock-1.0.7w-bin.zip
+applicationVersionID=1127
+windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7x/jstock-1.0.7x-setup.exe
+linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7x/jstock-1.0.7x-bin.zip
+macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7x/jstock-1.0.7x-bin.zip
+solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7x/jstock-1.0.7x-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=1126
-windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7w/jstock-1.0.7w-setup.exe
-linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7w/jstock-1.0.7w-bin.zip
-macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7w/jstock-1.0.7w-bin.zip
-solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7w/jstock-1.0.7w-bin.zip
+applicationVersionID=1127
+windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7x/jstock-1.0.7x-setup.exe
+linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7x/jstock-1.0.7x-bin.zip
+macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7x/jstock-1.0.7x-bin.zip
+solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7x/jstock-1.0.7x-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.7x - 2015-02-15
+  Feature: Show foreign currency in portfolio page, to avoid user confusion.
+  Feature: Google Finance supported in Belgium.
+
 JStock 1.0.7w - 2015-02-13
   Bugfix:  Allow user to enable/disable new currency exchange feature.
   
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.7w-setup.exe"
+OutFile "jstock-1.0.7x-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.2.6</fileVersion>
-    <txtFileVersion>1.1.2.6</txtFileVersion>
+    <fileVersion>1.1.2.7</fileVersion>
+    <txtFileVersion>1.1.2.7</txtFileVersion>
     <fileDescription>JStock - Stock Market Software</fileDescription>
     <copyright>Yan Cheng Cheok &lt;yancheng.cheok@gmail.com&gt;</copyright>
-    <productVersion>1.1.2.6</productVersion>
-    <txtProductVersion>1.1.2.6</txtProductVersion>
+    <productVersion>1.1.2.7</productVersion>
+    <txtProductVersion>1.1.2.7</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/engine/Factories.java b/src/org/yccheok/jstock/engine/Factories.java
@@ -170,6 +170,7 @@ public int compare(StockServerFactory o1, StockServerFactory o2) {
         austriaList.add(YahooStockServerFactory.newInstance());
         austriaList.add(GoogleStockServerFactory.newInstance());
         belgiumList.add(YahooStockServerFactory.newInstance());
+        belgiumList.add(GoogleStockServerFactory.newInstance());
         brazilList.add(BrazilYahooStockServerFactory.newInstance());
         brazilList.add(GoogleStockServerFactory.newInstance());
         canadaList.add(YahooStockServerFactory.newInstance());
diff --git a/src/org/yccheok/jstock/engine/Utils.java b/src/org/yccheok/jstock/engine/Utils.java
@@ -97,7 +97,7 @@ public static Stock getEmptyStock(Code code, Symbol symbol) {
     } 
     
     public static Country toCountry(Code code) {
-        assert(countries.keySet().size() == 44);
+        assert(countries.keySet().size() == 45);
         
         String string = code.toString();
         int index = string.lastIndexOf(".");
@@ -833,9 +833,11 @@ public static Set<PriceSource> getSupportedPriceSources(Country country) {
         twoLetterSuffixes.put(".NZ", "NZE:");
         twoLetterSuffixes.put(".ST", "STO:");
         twoLetterSuffixes.put(".AX", "ASX:");
+        twoLetterSuffixes.put(".BR", "EBR:");
         
         countries.put("AX", Country.Australia);
         countries.put("VI", Country.Austria);
+        countries.put("BR", Country.Belgium);
         countries.put("SA", Country.Brazil);
         countries.put("TO", Country.Canada);
         countries.put("V", Country.Canada); // TSXV
@@ -907,6 +909,7 @@ public static Set<PriceSource> getSupportedPriceSources(Country country) {
         toGoogleIndex.put("^OMX", "INDEXNASDAQ:OMXS30");
         toGoogleIndex.put("^AXJO", "INDEXASX:XJO");
         toGoogleIndex.put("^AORD", "INDEXASX:XAO");
+        toGoogleIndex.put("^BFX", "INDEXEURO:BEL20");
         
         // TODO : Need revision. We no longer have primaryStockServerFactoryClasses
         // concept. Going to replace with PriceSource.
diff --git a/src/org/yccheok/jstock/gui/Utils.java b/src/org/yccheok/jstock/gui/Utils.java
@@ -2711,11 +2711,11 @@ public ApplicationInfo(int applicationVersionID, String windowsDownloadLink, Str
     // Remember to update isCloudFileCompatible method.
     private static final int CLOUD_FILE_VERSION_ID = 1107;
 
-    private static final String ABOUT_BOX_VERSION_STRING = "1.0.7w";
+    private static final String ABOUT_BOX_VERSION_STRING = "1.0.7x";
 
-    // 1.0.7w
+    // 1.0.7x
     // For About box comparision on latest version purpose.
-    private static final int APPLICATION_VERSION_ID = 1126;
+    private static final int APPLICATION_VERSION_ID = 1127;
         
     private static final Executor zombiePool = Executors.newFixedThreadPool(Utils.NUM_OF_THREADS_ZOMBIE_POOL);
 
