Added Support Google Finance for Australia.

yccheok · yccheok · commit efea71f58606 · 2014-12-21T15:40:04.000+08:00
Added Keppel DC Reit (AJBU.SI)

Added 8IH.AX
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,15 @@
     <body>
     <!--fe78440e-e0fe-4efb-881d-264a01be483c-->
     
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7t had been released.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7u 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 Sweden.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">Feature: Support Google Finance for Australia.</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.7t 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.7u 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=17/12/14
+news_id=21/12/14
 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,15 @@
     <body>
     <!--fe78440e-e0fe-4efb-881d-264a01be483c-->
     
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7t had been released.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7u 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 Sweden.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">Feature: Support Google Finance for Australia.</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.7t 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.7u 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=17/12/14
+news_id=21/12/14
 news_url=http://jstock-static.appspot.com/news_information/zh/index.html
diff --git a/appengine/jstock-android-static/war/stocks_information/australia/stocks.zip b/appengine/jstock-android-static/war/stocks_information/australia/stocks.zip
diff --git a/appengine/jstock-android-static/war/stocks_information/singapore/stocks.zip b/appengine/jstock-android-static/war/stocks_information/singapore/stocks.zip
diff --git a/appengine/jstock-android-static/war/stocks_information/stock-info-database-meta.json b/appengine/jstock-android-static/war/stocks_information/stock-info-database-meta.json
@@ -1 +1 @@
-{"Netherlands":1414082923000,"Canada":1410760743000,"China":1410760743000,"India":1413476847000,"UnitedState":1412866595000,"Malaysia":1416958370000,"HongKong":1390994275000,"Portugal":1405521850000,"Indonesia":1403805375000,"Germany":1411400461000,"Singapore":1411400461000,"Australia":1418045499000,"Denmark":1418230184000,"Sweden":1418830110000}
+{"Netherlands":1414082923000,"Canada":1410760743000,"China":1410760743000,"India":1413476847000,"UnitedState":1412866595000,"Malaysia":1416958370000,"HongKong":1390994275000,"Portugal":1405521850000,"Indonesia":1403805375000,"Germany":1411400461000,"Singapore":1418830110000,"Australia":1418830110000,"Denmark":1418230184000,"Sweden":1418830110000}
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=1123
-windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7t/jstock-1.0.7t-setup.exe
-linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7t/jstock-1.0.7t-bin.zip
-macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7t/jstock-1.0.7t-bin.zip
-solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7t/jstock-1.0.7t-bin.zip
+applicationVersionID=1124
+windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7u/jstock-1.0.7u-setup.exe
+linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7u/jstock-1.0.7u-bin.zip
+macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7u/jstock-1.0.7u-bin.zip
+solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7u/jstock-1.0.7u-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=1123
-windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7t/jstock-1.0.7t-setup.exe
-linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7t/jstock-1.0.7t-bin.zip
-macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7t/jstock-1.0.7t-bin.zip
-solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7t/jstock-1.0.7t-bin.zip
+applicationVersionID=1124
+windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7u/jstock-1.0.7u-setup.exe
+linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7u/jstock-1.0.7u-bin.zip
+macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7u/jstock-1.0.7u-bin.zip
+solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7u/jstock-1.0.7u-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,15 @@
     <body>
     <!--fe78440e-e0fe-4efb-881d-264a01be483c-->
     
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7t had been released.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7u 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 Sweden.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">Feature: Support Google Finance for Australia.</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.7t 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.7u 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=17/12/14
+news_id=21/12/14
 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,15 @@
     <body>
     <!--fe78440e-e0fe-4efb-881d-264a01be483c-->
     
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7t had been released.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7u 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 Sweden.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">Feature: Support Google Finance for Australia.</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.7t 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.7u 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=17/12/14
+news_id=21/12/14
 news_url=http://jstock-static.appspot.com/news_information/zh/index.html
diff --git a/appengine/jstock-static/war/stocks_information/australia/stocks.zip b/appengine/jstock-static/war/stocks_information/australia/stocks.zip
diff --git a/appengine/jstock-static/war/stocks_information/singapore/stocks.zip b/appengine/jstock-static/war/stocks_information/singapore/stocks.zip
diff --git a/appengine/jstock-static/war/stocks_information/stock-info-database-meta.json b/appengine/jstock-static/war/stocks_information/stock-info-database-meta.json
@@ -1 +1 @@
-{"Netherlands":1414082923000,"Canada":1410760743000,"China":1410760743000,"India":1413476847000,"UnitedState":1412866595000,"Malaysia":1416958370000,"HongKong":1390994275000,"Portugal":1405521850000,"Indonesia":1403805375000,"Germany":1411400461000,"Singapore":1411400461000,"Australia":1418045499000,"Denmark":1418230184000,"Sweden":1418830110000}
+{"Netherlands":1414082923000,"Canada":1410760743000,"China":1410760743000,"India":1413476847000,"UnitedState":1412866595000,"Malaysia":1416958370000,"HongKong":1390994275000,"Portugal":1405521850000,"Indonesia":1403805375000,"Germany":1411400461000,"Singapore":1418830110000,"Australia":1418830110000,"Denmark":1418230184000,"Sweden":1418830110000}
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=1123
-windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7t/jstock-1.0.7t-setup.exe
-linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7t/jstock-1.0.7t-bin.zip
-macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7t/jstock-1.0.7t-bin.zip
-solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7t/jstock-1.0.7t-bin.zip
+applicationVersionID=1124
+windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7u/jstock-1.0.7u-setup.exe
+linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7u/jstock-1.0.7u-bin.zip
+macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7u/jstock-1.0.7u-bin.zip
+solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7u/jstock-1.0.7u-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=1123
-windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7t/jstock-1.0.7t-setup.exe
-linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7t/jstock-1.0.7t-bin.zip
-macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7t/jstock-1.0.7t-bin.zip
-solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7t/jstock-1.0.7t-bin.zip
+applicationVersionID=1124
+windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7u/jstock-1.0.7u-setup.exe
+linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7u/jstock-1.0.7u-bin.zip
+macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7u/jstock-1.0.7u-bin.zip
+solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7u/jstock-1.0.7u-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.7u - 2014-12-21
+  Feature: Support Google Finance for Australia.
+  
 JStock 1.0.7t - 2014-12-17
   Feature: Support Google Finance for Sweden.
   
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.7t-setup.exe"
+OutFile "jstock-1.0.7u-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.3</fileVersion>
-    <txtFileVersion>1.1.2.3</txtFileVersion>
+    <fileVersion>1.1.2.4</fileVersion>
+    <txtFileVersion>1.1.2.4</txtFileVersion>
     <fileDescription>JStock - Stock Market Software</fileDescription>
     <copyright>Yan Cheng Cheok &lt;yancheng.cheok@gmail.com&gt;</copyright>
-    <productVersion>1.1.2.3</productVersion>
-    <txtProductVersion>1.1.2.3</txtProductVersion>
+    <productVersion>1.1.2.4</productVersion>
+    <txtProductVersion>1.1.2.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/engine/Factories.java b/src/org/yccheok/jstock/engine/Factories.java
@@ -164,6 +164,7 @@ public int compare(StockServerFactory o1, StockServerFactory o2) {
         yahooSet.add(BrazilYahooStockServerFactory.class);
         
         australiaList.add(YahooStockServerFactory.newInstance());
+        australiaList.add(GoogleStockServerFactory.newInstance());
         austriaList.add(YahooStockServerFactory.newInstance());
         austriaList.add(GoogleStockServerFactory.newInstance());
         belgiumList.add(YahooStockServerFactory.newInstance());
diff --git a/src/org/yccheok/jstock/engine/Utils.java b/src/org/yccheok/jstock/engine/Utils.java
@@ -831,6 +831,7 @@ public static Set<PriceSource> getSupportedPriceSources(Country country) {
         twoLetterSuffixes.put(".TW", "TPE:");
         twoLetterSuffixes.put(".NZ", "NZE:");
         twoLetterSuffixes.put(".ST", "STO:");
+        twoLetterSuffixes.put(".AX", "ASX:");
         
         countries.put("AX", Country.Australia);
         countries.put("VI", Country.Austria);
@@ -903,6 +904,8 @@ public static Set<PriceSource> getSupportedPriceSources(Country country) {
         toGoogleIndex.put("^TWII", "TPE:TAIEX");
         toGoogleIndex.put("^NZ50", "NZE:NZ50G");
         toGoogleIndex.put("^OMX", "INDEXNASDAQ:OMXS30");
+        toGoogleIndex.put("^AXJO", "INDEXASX:XJO");
+        toGoogleIndex.put("^AORD", "INDEXASX:XAO");
         
         // 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
@@ -2701,11 +2701,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.7t";
+    private static final String ABOUT_BOX_VERSION_STRING = "1.0.7u";
 
-    // 1.0.7t
+    // 1.0.7u
     // For About box comparision on latest version purpose.
-    private static final int APPLICATION_VERSION_ID = 1123;
+    private static final int APPLICATION_VERSION_ID = 1124;
         
     private static final Executor zombiePool = Executors.newFixedThreadPool(Utils.NUM_OF_THREADS_ZOMBIE_POOL);
 
diff --git a/test/org/yccheok/jstock/engine/UtilsTest.java b/test/org/yccheok/jstock/engine/UtilsTest.java
@@ -114,6 +114,16 @@ public void testToGoogleFormat() {
         result = Utils.toGoogleFormat(code);
         assertEquals(expResult, result);
 
+        code = Code.newInstance("^AXJO");
+        expResult = "INDEXASX:XJO";
+        result = Utils.toGoogleFormat(code);
+        assertEquals(expResult, result);
+
+        code = Code.newInstance("^AORD");
+        expResult = "INDEXASX:XAO";
+        result = Utils.toGoogleFormat(code);
+        assertEquals(expResult, result);
+
         code = Code.newInstance("USDMYR=X");
         expResult = "CURRENCY:USDMYR";
         result = Utils.toGoogleFormat(code);
@@ -183,5 +193,10 @@ public void testToGoogleFormat() {
         expResult = "NSE:TATAMOTORS";
         result = Utils.toGoogleFormat(code);
         assertEquals(expResult, result);
+        
+        code = Code.newInstance("8ih.ax");
+        expResult = "ASX:8IH";
+        result = Utils.toGoogleFormat(code);
+        assertEquals(expResult, result);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{"Netherlands":1414082923000,"Canada":1410760743000,"China":1410760743000,"India":1413476847000,"UnitedState":1412866595000,"Malaysia":1416958370000,"HongKong":1390994275000,"Portugal":1405521850000,"Indonesia":1403805375000,"Germany":1411400461000,"Singapore":1411400461000,"Australia":1418045499000,"Denmark":1418230184000,"Sweden":1418830110000}`
	`1`	`+{"Netherlands":1414082923000,"Canada":1410760743000,"China":1410760743000,"India":1413476847000,"UnitedState":1412866595000,"Malaysia":1416958370000,"HongKong":1390994275000,"Portugal":1405521850000,"Indonesia":1403805375000,"Germany":1411400461000,"Singapore":1418830110000,"Australia":1418830110000,"Denmark":1418230184000,"Sweden":1418830110000}`