JStock 1.0.7.50

yccheok · yccheok · commit dca5db3857f9 · 2021-06-20T05:28:01.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,7 +4,7 @@
     <body>
     <!--fe78440e-e0fe-4efb-881d-264a01be483c-->
     
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.49 had been released.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.50 had been released.</p>
     
     <p style="margin-top: 10; font-size: 9px; font-family: Tahoma"></p>
 
@@ -14,7 +14,7 @@
 
     <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.49 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.50 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=14/06/2021
+news_id=20/06/2021
 news_url=https://raw.githubusercontent.com/yccheok/jstock/master/appengine/jstock-static/war/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,7 +4,7 @@
     <body>
     <!--fe78440e-e0fe-4efb-881d-264a01be483c-->
     
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.49 had been released.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.50 had been released.</p>
     
     <p style="margin-top: 10; font-size: 9px; font-family: Tahoma"></p>
 
@@ -14,7 +14,7 @@
     
     <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.49 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.50 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=14/06/2021
+news_id=20/06/2021
 news_url=https://raw.githubusercontent.com/yccheok/jstock/master/appengine/jstock-static/war/news_information/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=1179
-windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-49/jstock-1.0.7.49-setup.exe
-linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-49/jstock-1.0.7.49-bin.zip
-macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-49/jstock-1.0.7.49-bin.zip
-solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-49/jstock-1.0.7.49-bin.zip
+applicationVersionID=1180
+windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-50/jstock-1.0.7.50-setup.exe
+linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-50/jstock-1.0.7.50-bin.zip
+macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-50/jstock-1.0.7.50-bin.zip
+solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-50/jstock-1.0.7.50-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=1179
-windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-49/jstock-1.0.7.49-setup.exe
-linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-49/jstock-1.0.7.49-bin.zip
-macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-49/jstock-1.0.7.49-bin.zip
-solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-49/jstock-1.0.7.49-bin.zip
+applicationVersionID=1180
+windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-50/jstock-1.0.7.50-setup.exe
+linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-50/jstock-1.0.7.50-bin.zip
+macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-50/jstock-1.0.7.50-bin.zip
+solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-50/jstock-1.0.7.50-bin.zip
diff --git a/appengine/jstock-static/war/news_information/index.html b/appengine/jstock-static/war/news_information/index.html
@@ -4,7 +4,7 @@
     <body>
     <!--fe78440e-e0fe-4efb-881d-264a01be483c-->
     
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.49 had been released.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.50 had been released.</p>
     
     <p style="margin-top: 10; font-size: 9px; font-family: Tahoma"></p>
 
@@ -14,7 +14,7 @@
 
     <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.49 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.50 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=14/06/2021
+news_id=20/06/2021
 news_url=https://raw.githubusercontent.com/yccheok/jstock/master/appengine/jstock-static/war/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,7 +4,7 @@
     <body>
     <!--fe78440e-e0fe-4efb-881d-264a01be483c-->
     
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.49 had been released.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.50 had been released.</p>
     
     <p style="margin-top: 10; font-size: 9px; font-family: Tahoma"></p>
 
@@ -14,7 +14,7 @@
     
     <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.49 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.50 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=14/06/2021
+news_id=20/06/2021
 news_url=https://raw.githubusercontent.com/yccheok/jstock/master/appengine/jstock-static/war/news_information/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=1179
-windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-49/jstock-1.0.7.49-setup.exe
-linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-49/jstock-1.0.7.49-bin.zip
-macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-49/jstock-1.0.7.49-bin.zip
-solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-49/jstock-1.0.7.49-bin.zip
+applicationVersionID=1180
+windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-50/jstock-1.0.7.50-setup.exe
+linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-50/jstock-1.0.7.50-bin.zip
+macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-50/jstock-1.0.7.50-bin.zip
+solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-50/jstock-1.0.7.50-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=1179
-windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-49/jstock-1.0.7.49-setup.exe
-linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-49/jstock-1.0.7.49-bin.zip
-macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-49/jstock-1.0.7.49-bin.zip
-solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-49/jstock-1.0.7.49-bin.zip
+applicationVersionID=1180
+windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-50/jstock-1.0.7.50-setup.exe
+linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-50/jstock-1.0.7.50-bin.zip
+macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-50/jstock-1.0.7.50-bin.zip
+solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-50/jstock-1.0.7.50-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.7.50 - 2021-06-20
+  Feature: Stability fix.
+
 JStock 1.0.7.49 - 2021-06-14
   Feature: Stability fix.
   
diff --git a/src/org/yccheok/jstock/data/messages_de.properties b/src/org/yccheok/jstock/data/messages_de.properties
@@ -1,5 +1,10 @@
 #errors/warnings/info
 
+info_message_press_ok_after_browser_is_closed=Only press OK after the browser is closed.
+
+error_message_fail_to_launch_browser=Fail to launch browser.
+error_title_fail_to_launch_browser=Fail to launch browser
+
 info_message_export_successfully=Export successfully.
 
 info_message_file_saved_template="{0}" gespeichert.
diff --git a/src/org/yccheok/jstock/data/messages_en.properties b/src/org/yccheok/jstock/data/messages_en.properties
@@ -1,5 +1,10 @@
 #errors/warnings/info
 
+info_message_press_ok_after_browser_is_closed=Only press OK after the browser is closed.
+
+error_message_fail_to_launch_browser=Fail to launch browser.
+error_title_fail_to_launch_browser=Fail to launch browser
+
 info_message_export_successfully=Export successfully.
 
 info_message_file_saved_template="{0}" saved.
diff --git a/src/org/yccheok/jstock/data/messages_it.properties b/src/org/yccheok/jstock/data/messages_it.properties
@@ -1,5 +1,10 @@
 #errors/warnings/info
 
+info_message_press_ok_after_browser_is_closed=Only press OK after the browser is closed.
+
+error_message_fail_to_launch_browser=Fail to launch browser.
+error_title_fail_to_launch_browser=Fail to launch browser
+
 info_message_export_successfully=Export successfully.
 
 info_message_file_saved_template="{0}" Salvato.
diff --git a/src/org/yccheok/jstock/data/messages_zh.properties b/src/org/yccheok/jstock/data/messages_zh.properties
@@ -1,5 +1,10 @@
 #errors/warnings/info
 
+info_message_press_ok_after_browser_is_closed=\u53ea\u6709\u5728\u6d4f\u89c8\u5668\u5173\u95ed\u540e\u624d\u6309\u786e\u5b9a\u3002
+
+error_message_fail_to_launch_browser=\u65e0\u6cd5\u542f\u52a8\u6d4f\u89c8\u5668\u3002
+error_title_fail_to_launch_browser=\u65e0\u6cd5\u542f\u52a8\u6d4f\u89c8\u5668
+
 info_message_export_successfully=\u5bfc\u51fa\u6210\u529f.
 
 info_message_file_saved_template="{0}" \u5df2\u4fdd\u5b58\u3002
diff --git a/src/org/yccheok/jstock/data/messages_zh_TW.properties b/src/org/yccheok/jstock/data/messages_zh_TW.properties
@@ -1,5 +1,10 @@
 #errors/warnings/info
 
+info_message_press_ok_after_browser_is_closed=\u53ea\u6709\u5728\u700f\u89bd\u5668\u95dc\u9589\u5f8c\u624d\u6309\u78ba\u5b9a\u3002
+
+error_message_fail_to_launch_browser=\u7121\u6cd5\u555f\u52d5\u700f\u89bd\u5668\u3002
+error_title_fail_to_launch_browser=\u7121\u6cd5\u555f\u52d5\u700f\u89bd\u5668
+
 info_message_export_successfully=\u5c0e\u51fa\u6210\u529f\u3002
 
 info_message_file_saved_template="{0}" \u5df2\u4fdd\u5b58\u3002
diff --git a/src/org/yccheok/jstock/google/MyAuthorizationCodeInstalledApp.java b/src/org/yccheok/jstock/google/MyAuthorizationCodeInstalledApp.java
@@ -27,11 +27,17 @@
 import com.google.api.client.repackaged.com.google.common.base.Preconditions;
 import com.google.api.client.util.store.FileDataStoreFactory;
 import com.google.api.services.oauth2.model.Userinfoplus;
+import java.awt.Desktop;
 import java.io.IOException;
+import java.net.URI;
+import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.yccheok.jstock.engine.Pair;
+import static org.yccheok.jstock.gui.trading.GUIUtils.openURLInBrowser;
+import org.yccheok.jstock.internationalization.GUIBundle;
+import org.yccheok.jstock.internationalization.MessagesBundle;
 
 /**
  *
@@ -159,50 +165,87 @@ protected void onAuthorization(AuthorizationCodeRequestUrl authorizationUrl) thr
 
             @Override
             public void run() {
-                SimpleSwingBrowser _browser = new SimpleSwingBrowser();
-                
-                _browser.setDefaultCloseOperation(javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE);
-                _browser.addWindowListener(new java.awt.event.WindowAdapter() {
-                    @Override
-                    public void windowClosed(java.awt.event.WindowEvent evt) {
-                        performRedirectUri();
-                    }
-                    
-                    @Override
-                    public void windowClosing(java.awt.event.WindowEvent evt) {                        
-                        SimpleSwingBrowser _browser = browser;
-                        if (_browser != null) {
-                            _browser.setVisible(false);
-                            try {
-                                // Possible cause random exception
-                                // java.lang.NullPointerException
-                                //     at javafx.embed.swing.JFXPanel.getInputMethodRequests(JFXPanel.java:810)
-                                //
-                                // If such exception happens, there's no chance to execute windowClosed.
-                                _browser.dispose();
-                            } catch (Exception ex) {
-                                performRedirectUri();
-                                log.error(null, ex);
-                            }
-                            browser = null;
-                        }
-                    }
-                    @Override
-                    public void windowDeiconified(java.awt.event.WindowEvent evt) {
-                    }
-                    @Override
-                    public void windowIconified(java.awt.event.WindowEvent evt) {
-                    }
-                });
-                
-                browser = _browser;
-                _browser.loadURL(url);
-                _browser.setVisible(true);
+               if (!launchJavaFxBrowser(url)) {
+                   launchDesktopBrowser(url);
+               }
            }     
        });       
        
     }
 
+    private void launchDesktopBrowser(String url) {
+        try {
+            if (openURLInBrowser(url)) {
+                // Show dialog, to prevent performRedirectUri from being executed
+                // immediately.
+                JOptionPane.showMessageDialog(
+                        null, 
+                        MessagesBundle.getString("info_message_press_ok_after_browser_is_closed"),
+                        GUIBundle.getString("MainFrame_Application_Title"),
+                        JOptionPane.INFORMATION_MESSAGE
+                );
+            } else {
+                JOptionPane.showMessageDialog(
+                        null, 
+                        MessagesBundle.getString("error_message_fail_to_launch_browser"), 
+                        MessagesBundle.getString("error_title_fail_to_launch_browser"),
+                        JOptionPane.ERROR_MESSAGE
+                );
+            }
+        } finally {
+            performRedirectUri();
+        }
+    }
+    
+    private boolean launchJavaFxBrowser(String url) {
+        try {
+            SimpleSwingBrowser _browser = new SimpleSwingBrowser();
+
+           _browser.setDefaultCloseOperation(javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE);
+           _browser.addWindowListener(new java.awt.event.WindowAdapter() {
+               @Override
+               public void windowClosed(java.awt.event.WindowEvent evt) {
+                   performRedirectUri();
+               }
+
+               @Override
+               public void windowClosing(java.awt.event.WindowEvent evt) {                        
+                   SimpleSwingBrowser _browser = browser;
+                   if (_browser != null) {
+                       _browser.setVisible(false);
+                       try {
+                           // Possible cause random exception
+                           // java.lang.NullPointerException
+                           //     at javafx.embed.swing.JFXPanel.getInputMethodRequests(JFXPanel.java:810)
+                           //
+                           // If such exception happens, there's no chance to execute windowClosed.
+                           _browser.dispose();
+                       } catch (Exception ex) {
+                           performRedirectUri();
+                           log.error(null, ex);
+                       }
+                       browser = null;
+                   }
+               }
+               @Override
+               public void windowDeiconified(java.awt.event.WindowEvent evt) {
+               }
+               @Override
+               public void windowIconified(java.awt.event.WindowEvent evt) {
+               }
+           });
+
+           browser = _browser;
+           _browser.loadURL(url);
+           _browser.setVisible(true);
+        } catch (Exception e) {
+            log.error(null, e);
+            return false;
+        }
+        
+        return true;
+    }
+    
     private void performRedirectUri() {
         String uri = redirectUri;
 
diff --git a/src/org/yccheok/jstock/google/SimpleSwingBrowser.java b/src/org/yccheok/jstock/google/SimpleSwingBrowser.java
@@ -47,6 +47,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.yccheok.jstock.gui.JStock;
+import static org.yccheok.jstock.gui.trading.GUIUtils.openURLInBrowser;
 import org.yccheok.jstock.internationalization.MessagesBundle;
   
 public class SimpleSwingBrowser extends JDialog {
@@ -78,12 +79,8 @@ private void initMenu() {
         jMenuItem.setText(bundle.getString("SimpleSwingBrowser_OpenInBrowser"));
 
         jMenuItem.addActionListener((ActionEvent e) -> {
-            if (url != null && Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) {
-                try {
-                    Desktop.getDesktop().browse(new URI(url));
-                } catch (URISyntaxException | IOException ex) {
-                    log.error(null, ex);
-                }
+            if (url != null) {
+                openURLInBrowser(url);
             }
         });
         
diff --git a/src/org/yccheok/jstock/gui/UIOptions.java b/src/org/yccheok/jstock/gui/UIOptions.java
@@ -42,6 +42,7 @@ public class UIOptions {
     public static final String DEPOSIT_SUMMARY_JDIALOG = "DEPOSIT_SUMMARY_JDIALOG";
     
     public static final String DIVIDEND_SUMMARY_JDIALOG = "DIVIDEND_SUMMARY_JDIALOG";
+    public static final String DIVIDEND_SUMMARY_BAR_CHART_JDIALOG = "DIVIDEND_SUMMARY_BAR_CHART_JDIALOG";
     
     public static final String AUTO_DIVIDEND_JDIALOG = "AUTO_DIVIDEND_JDIALOG";
     
diff --git a/src/org/yccheok/jstock/gui/Utils.java b/src/org/yccheok/jstock/gui/Utils.java
diff --git a/src/org/yccheok/jstock/gui/portfolio/DividendSummaryBarChartJDialog.form b/src/org/yccheok/jstock/gui/portfolio/DividendSummaryBarChartJDialog.form
diff --git a/src/org/yccheok/jstock/gui/portfolio/DividendSummaryBarChartJDialog.java b/src/org/yccheok/jstock/gui/portfolio/DividendSummaryBarChartJDialog.java
