JStock 1.0.7.44

yccheok · yccheok · commit e939264f05f9 · 2020-01-24T09:07:59.000+08:00
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.7.44 - 2020-01-23
+  Bugfix:  Fix open from cloud and save to cloud.
+  
 JStock 1.0.7.43 - 2019-12-24
   Bugfix:  Fix open from cloud and save to cloud.
   
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.43-setup.exe"
+OutFile "jstock-1.0.7.44-setup.exe"
 LicenseData "gpl-2.0.txt"
  
 ; The default installation directory
diff --git a/installer/windows/jstock.xml b/installer/windows/jstock.xml
@@ -27,12 +27,12 @@
     <opt>-Dsun.java2d.dpiaware=false</opt>
   </jre>
   <versionInfo>
-    <fileVersion>1.1.7.3</fileVersion>
-    <txtFileVersion>1.1.7.3</txtFileVersion>
+    <fileVersion>1.1.7.44</fileVersion>
+    <txtFileVersion>1.1.7.44</txtFileVersion>
     <fileDescription>JStock - Stock Market Software</fileDescription>
     <copyright>Yan Cheng Cheok &lt;yancheng.cheok@gmail.com&gt;</copyright>
-    <productVersion>1.1.7.3</productVersion>
-    <txtProductVersion>1.1.7.3</txtProductVersion>
+    <productVersion>1.1.7.44</productVersion>
+    <txtProductVersion>1.1.7.44</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
@@ -70,6 +70,7 @@ PortfolioManagementJPanel_CashDepositPortfolio=Cash Deposit Portfolio
 PortfolioManagementJPanel_DividendPortfolio=Dividend Portfolio
 PortfolioManagementJPanel_Date=Date
 PortfolioManagementJPanel_Stock=Stock
+PortfolioManagementJPanel_Code=Code
 PortfolioManagementJPanel_Units=Units
 PortfolioManagementJPanel_PurchasePrice=Purchase Price
 PortfolioManagementJPanel_CurrentPrice=Current Price
diff --git a/src/org/yccheok/jstock/data/gui_de.properties b/src/org/yccheok/jstock/data/gui_de.properties
@@ -71,6 +71,7 @@ PortfolioManagementJPanel_CashDepositPortfolio=Bareinlagen-Portfolio
 PortfolioManagementJPanel_DividendPortfolio=Dividenden-Portfolio
 PortfolioManagementJPanel_Date=Datum
 PortfolioManagementJPanel_Stock=Aktie
+PortfolioManagementJPanel_Code=Code
 PortfolioManagementJPanel_Units=Einheiten
 PortfolioManagementJPanel_PurchasePrice=Kaufpreis
 PortfolioManagementJPanel_CurrentPrice=Aktueller Preis
diff --git a/src/org/yccheok/jstock/data/gui_en.properties b/src/org/yccheok/jstock/data/gui_en.properties
@@ -71,6 +71,7 @@ PortfolioManagementJPanel_CashDepositPortfolio=Cash Deposit Portfolio
 PortfolioManagementJPanel_DividendPortfolio=Dividend Portfolio
 PortfolioManagementJPanel_Date=Date
 PortfolioManagementJPanel_Stock=Stock
+PortfolioManagementJPanel_Code=Code
 PortfolioManagementJPanel_Units=Units
 PortfolioManagementJPanel_PurchasePrice=Purchase Price
 PortfolioManagementJPanel_CurrentPrice=Current Price
diff --git a/src/org/yccheok/jstock/data/gui_it.properties b/src/org/yccheok/jstock/data/gui_it.properties
@@ -70,6 +70,7 @@ PortfolioManagementJPanel_CashDepositPortfolio=Portfoglio deposito cassa
 PortfolioManagementJPanel_DividendPortfolio=Portfoglio dividendo
 PortfolioManagementJPanel_Date=Data
 PortfolioManagementJPanel_Stock=Titolo
+PortfolioManagementJPanel_Code=Codice
 PortfolioManagementJPanel_Units=Unit\u00e0
 PortfolioManagementJPanel_PurchasePrice=Prezzo d'acquisto
 PortfolioManagementJPanel_CurrentPrice=Prezzo corrente
diff --git a/src/org/yccheok/jstock/data/gui_zh.properties b/src/org/yccheok/jstock/data/gui_zh.properties
@@ -70,6 +70,7 @@ PortfolioManagementJPanel_CashDepositPortfolio=\u73b0\u91d1\u5b58\u6b3e
 PortfolioManagementJPanel_DividendPortfolio=\u80a1\u606f\u7ec4\u5408
 PortfolioManagementJPanel_Date=\u65e5\u671f
 PortfolioManagementJPanel_Stock=\u80a1\u7968
+PortfolioManagementJPanel_Code=\u80a1\u7968\u4ee3\u53f7
 PortfolioManagementJPanel_Units=\u5355\u4f4d
 PortfolioManagementJPanel_PurchasePrice=\u4e70\u4ef7
 PortfolioManagementJPanel_CurrentPrice=\u73b0\u4ef7
diff --git a/src/org/yccheok/jstock/data/gui_zh_TW.properties b/src/org/yccheok/jstock/data/gui_zh_TW.properties
@@ -70,6 +70,7 @@ PortfolioManagementJPanel_CashDepositPortfolio=\u73fe\u91d1\u5b58\u6b3e
 PortfolioManagementJPanel_DividendPortfolio=\u80a1\u606f\u7d44\u5408
 PortfolioManagementJPanel_Date=\u65e5\u671f
 PortfolioManagementJPanel_Stock=\u80a1\u7968
+PortfolioManagementJPanel_Code=\u80a1\u7968\u4ee3\u865f
 PortfolioManagementJPanel_Units=\u55ae\u4f4d
 PortfolioManagementJPanel_PurchasePrice=\u8cb7\u50f9
 PortfolioManagementJPanel_CurrentPrice=\u73fe\u50f9
diff --git a/src/org/yccheok/jstock/gui/Utils.java b/src/org/yccheok/jstock/gui/Utils.java
@@ -2743,9 +2743,9 @@ public ApplicationInfo(int applicationVersionID, String windowsDownloadLink, Str
     ////////////////////////////////////////////////////////////////////////////
     private static final String ABOUT_BOX_VERSION_STRING = "1.0.7.43";
 
-    // 1.0.7.43
+    // 1.0.7.44
     // For About box comparision on latest version purpose.
-    private static final int APPLICATION_VERSION_ID = 1173;
+    private static final int APPLICATION_VERSION_ID = 1174;
     ////////////////////////////////////////////////////////////////////////////
     ////////////////////////////////////////////////////////////////////////////
     
diff --git a/src/org/yccheok/jstock/gui/treetable/BuyPortfolioTreeTableModelEx.java b/src/org/yccheok/jstock/gui/treetable/BuyPortfolioTreeTableModelEx.java
@@ -61,6 +61,7 @@ public BuyPortfolioTreeTableModelEx() {
     static {
         final String[] tmp = {
             GUIBundle.getString("PortfolioManagementJPanel_Stock"),
+            GUIBundle.getString("PortfolioManagementJPanel_Code"),
             GUIBundle.getString("PortfolioManagementJPanel_Date"),
             GUIBundle.getString("PortfolioManagementJPanel_Units"),
             GUIBundle.getString("PortfolioManagementJPanel_PurchasePrice"),
@@ -80,6 +81,7 @@ public BuyPortfolioTreeTableModelEx() {
     // Types of the columns.
     private static final Class[]  cTypes = { 
         TreeTableModel.class,
+        Code.class,
         org.yccheok.jstock.engine.SimpleDate.class,
         Double.class,
         Double.class,
@@ -392,40 +394,40 @@ public Object getValueAt(Object node, int column) {
                 case 0:
                     return GUIBundle.getString("PortfolioManagementJPanel_Buy");
         
-                case 5:
+                case 6:
                     if (isFeeCalculationEnabled) {
                         return new DoubleWrapper(decimalPlace, portfolio.getNetTotal(localCurrency));
                     } else {
                         return new DoubleWrapper(decimalPlace, portfolio.getTotal(localCurrency));
                     }
                     
-                case 6:
+                case 7:
                     return new DoubleWrapper(decimalPlace, getCurrentValue(localCurrency));
                     
-                case 7:
+                case 8:
                     if (isFeeCalculationEnabled) {
                         return new DoubleWrapper(decimalPlace, this.getNetGainLossValue(localCurrency));
                     } else {
                         return new DoubleWrapper(decimalPlace, this.getGainLossValue(localCurrency));
                     }                        
                     
-                case 8:
+                case 9:
                     if (isFeeCalculationEnabled) {
                         return new DoubleWrapper(DecimalPlace.Two, this.getNetGainLossPercentage(localCurrency));
                     } else {
                         return new DoubleWrapper(DecimalPlace.Two, this.getGainLossPercentage(localCurrency));
                     }
     
-                case 9:
+                case 10:
                     return new DoubleWrapper(decimalPlace, portfolio.getBroker());
                     
-                case 10:
+                case 11:
                     return new DoubleWrapper(decimalPlace, portfolio.getClearingFee());
                     
-                case 11:
+                case 12:
                     return new DoubleWrapper(decimalPlace, portfolio.getStampDuty());
                     
-                case 12:
+                case 13:
                     return portfolio.getComment();
             }
         }
@@ -446,17 +448,20 @@ public Object getValueAt(Object node, int column) {
             switch(column) {
                 case 0:
                     return ((Transaction)transactionSummary.getChildAt(0)).getStockInfo().symbol;
-                    
-                case 2:
+
+                case 1:
+                    return ((Transaction)transactionSummary.getChildAt(0)).getStockInfo().code;
+                                        
+                case 3:
                     return transactionSummary.getQuantity();
                     
-                case 3:
+                case 4:
                     return new DoubleWrapper(decimalPlace, this.getPurchasePrice(transactionSummary));
                     
-                case 4:
+                case 5:
                     return new DoubleWrapper(decimalPlace, this.getCurrentPrice(transactionSummary));
                     
-                case 5:
+                case 6:
                     if (shouldConvertPenceToPound == false) {
                         if (isFeeCalculationEnabled) {
                             return DoubleWithCurrency.create(stockCurrency, decimalPlace, transactionSummary.getNetTotal());
@@ -471,14 +476,14 @@ public Object getValueAt(Object node, int column) {
                         }
                     }
                     
-                case 6:
+                case 7:
                     if (shouldConvertPenceToPound == false) {
                         return DoubleWithCurrency.create(stockCurrency, decimalPlace, this.getCurrentValue(transactionSummary));
                     } else {
                         return DoubleWithCurrency.create(stockCurrency, decimalPlace, this.getCurrentValue(transactionSummary) / 100.0);
                     }                    
                     
-                case 7:
+                case 8:
                     if (shouldConvertPenceToPound == false) {
                         if (isFeeCalculationEnabled) {
                             return DoubleWithCurrency.create(stockCurrency, decimalPlace, this.getNetGainLossValue(transactionSummary));
@@ -493,23 +498,23 @@ public Object getValueAt(Object node, int column) {
                         }
                     }
                     
-                case 8:
+                case 9:
                     if (isFeeCalculationEnabled) {
                         return new DoubleWrapper(DecimalPlace.Two, this.getNetGainLossPercentage(transactionSummary));
                     } else {
                         return new DoubleWrapper(DecimalPlace.Two, this.getGainLossPercentage(transactionSummary));
                     }
                     
-                case 9:
+                case 10:
                     return new DoubleWrapper(decimalPlace, transactionSummary.getBroker());
                     
-                case 10:
+                case 11:
                     return new DoubleWrapper(decimalPlace, transactionSummary.getClearingFee());
                     
-                case 11:
+                case 12:
                     return new DoubleWrapper(decimalPlace, transactionSummary.getStampDuty());
                     
-                case 12:
+                case 13:
                     return transactionSummary.getComment();                    
             }
         }
@@ -530,18 +535,21 @@ public Object getValueAt(Object node, int column) {
                     return (transaction).getStockInfo().symbol;
 
                 case 1:
+                    return (transaction).getStockInfo().code;
+                                        
+                case 2:
                     return transaction.getDate();
                     
-                case 2:
+                case 3:
                     return transaction.getQuantity();
                     
-                case 3:
+                case 4:
                     return transaction.getPrice();
                     
-                case 4:
+                case 5:
                     return this.getCurrentPrice(transaction);
                     
-                case 5:
+                case 6:
                     if (shouldConvertPenceToPound == false) {
                         if (isFeeCalculationEnabled) {
                             return DoubleWithCurrency.create(stockCurrency, decimalPlace, transaction.getNetTotal());
@@ -556,14 +564,14 @@ public Object getValueAt(Object node, int column) {
                         }
                     }
                     
-                case 6:
+                case 7:
                     if (shouldConvertPenceToPound == false) {
                         return DoubleWithCurrency.create(stockCurrency, decimalPlace, this.getCurrentValue(transaction));
                     } else {
                         return DoubleWithCurrency.create(stockCurrency, decimalPlace, this.getCurrentValue(transaction) / 100.0);
                     }
                     
-                case 7:
+                case 8:
                     if (shouldConvertPenceToPound == false) {
                         if (isFeeCalculationEnabled) {
                             return DoubleWithCurrency.create(stockCurrency, decimalPlace, this.getNetGainLossValue(transaction));
@@ -578,23 +586,23 @@ public Object getValueAt(Object node, int column) {
                         }
                     }
                     
-                case 8:
+                case 9:
                     if (isFeeCalculationEnabled) {
                         return new DoubleWrapper(DecimalPlace.Two, this.getNetGainLossPercentage(transaction));
                     } else {
                         return new DoubleWrapper(DecimalPlace.Two, this.getGainLossPercentage(transaction));
                     }
                     
-                case 9:
+                case 10:
                     return new DoubleWrapper(decimalPlace, transaction.getBroker());
                     
-                case 10:
+                case 11:
                     return new DoubleWrapper(decimalPlace, transaction.getClearingFee());
                     
-                case 11:
+                case 12:
                     return new DoubleWrapper(decimalPlace, transaction.getStampDuty());
                     
-                case 12:
+                case 13:
                     return transaction.getComment();
             }
         }
diff --git a/src/org/yccheok/jstock/gui/treetable/SellPortfolioTreeTableModelEx.java b/src/org/yccheok/jstock/gui/treetable/SellPortfolioTreeTableModelEx.java
