1.0.7.42

yccheok · yccheok · commit 4c9e87489015 · 2019-11-28T23:19:27.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,17 +4,17 @@
     <body>
     <!--fe78440e-e0fe-4efb-881d-264a01be483c-->
     
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.41 had been released.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.42 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 Java 11.
+        Bugfix:  Fix indicator editor.
     </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.41 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.42 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=21/11/2019
+news_id=28/11/2019
 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,17 +4,17 @@
     <body>
     <!--fe78440e-e0fe-4efb-881d-264a01be483c-->
     
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.41 had been released.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.42 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 Java 11.
+        Bugfix:  Fix indicator editor.
     </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.41 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.42 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=21/11/2019
+news_id=28/11/2019
 news_url=http://jstock-static.appspot.com/news_information/zh/index.html
diff --git a/appengine/jstock-static/war/news_information/index.html b/appengine/jstock-static/war/news_information/index.html
@@ -4,17 +4,17 @@
     <body>
     <!--fe78440e-e0fe-4efb-881d-264a01be483c-->
     
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.41 had been released.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.42 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 Java 11.
+        Bugfix:  Fix indicator editor.
     </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.41 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.42 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=21/11/2019
+news_id=28/11/2019
 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,17 +4,17 @@
     <body>
     <!--fe78440e-e0fe-4efb-881d-264a01be483c-->
     
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.40 had been released.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.42 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:  Fix Windows installer.
+        Bugfix:  Fix indicator editor.
     </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.40 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.42 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=21/11/2019
+news_id=28/11/2019
 news_url=http://jstock-static.appspot.com/news_information/zh/index.html
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.42 - 2019-11-28
+  Bugfix:  Fix indicator editor.
+  
 JStock 1.0.7.41 - 2019-11-25
   Bugfix:  Support Java 11.
 
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.41-setup.exe"
+OutFile "jstock-1.0.7.42-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.1</fileVersion>
-    <txtFileVersion>1.1.7.1</txtFileVersion>
+    <fileVersion>1.1.7.2</fileVersion>
+    <txtFileVersion>1.1.7.2</txtFileVersion>
     <fileDescription>JStock - Stock Market Software</fileDescription>
     <copyright>Yan Cheng Cheok &lt;yancheng.cheok@gmail.com&gt;</copyright>
-    <productVersion>1.1.7.1</productVersion>
-    <txtProductVersion>1.1.7.1</txtProductVersion>
+    <productVersion>1.1.7.2</productVersion>
+    <txtProductVersion>1.1.7.2</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/alert/GoogleMail.java b/src/org/yccheok/jstock/alert/GoogleMail.java
@@ -20,7 +20,6 @@
 package org.yccheok.jstock.alert;
 
 import com.google.api.client.auth.oauth2.Credential;
-import com.google.api.client.util.Base64;
 import com.google.api.services.gmail.Gmail;
 import com.google.api.services.gmail.model.Message;
 import java.io.ByteArrayOutputStream;
@@ -65,8 +64,8 @@ private static MimeMessage createEmail(String to, String cc, String from, String
 
     private static Message createMessageWithEmail(MimeMessage email) throws MessagingException, IOException {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        email.writeTo(baos);
-        String encodedEmail = Base64.encodeBase64URLSafeString(baos.toByteArray());
+        email.writeTo(baos);        
+        String encodedEmail = java.util.Base64.getUrlEncoder().encodeToString(baos.toByteArray());
         Message message = new Message();
         message.setRaw(encodedEmail);
         return message;
diff --git a/src/org/yccheok/jstock/analysis/AbstractBean.java b/src/org/yccheok/jstock/analysis/AbstractBean.java
@@ -23,32 +23,54 @@ public class AbstractBean {
     // during restore.
     protected transient PropertyChangeSupport propertySupport = new PropertyChangeSupport(this);
     
+    // readResolve will no longer be triggered any more after upgrading from
+    // XStream 1.4.2 to 1.4.11.1 (Because we want to support Java 11)
+    // The correct solution is that, all affected classes need to implement 
+    // Serializable. However, if we do so, all previous written XML files are no
+    // longer valid - https://github.com/x-stream/xstream/issues/179
+    //
+    // As such, we will abandon usage of readResolve, with our very own hacked
+    // workaround.
+    //
     /* initialize a transient field at deserialization? */
     private Object readResolve() {
         propertySupport = new PropertyChangeSupport(this);
         return this;
     }
   
+    private void ensurePropertySupportIsNotNull() {
+        if (propertySupport == null) {
+            propertySupport = new PropertyChangeSupport(this);
+        }
+    }
+    
     public void addPropertyChangeListener(PropertyChangeListener listener) {
+        ensurePropertySupportIsNotNull();
         propertySupport.addPropertyChangeListener(listener);
     }
     public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) {
+        ensurePropertySupportIsNotNull();
         propertySupport.addPropertyChangeListener( propertyName, listener);
     }
     public void removePropertyChangeListener(PropertyChangeListener listener) {
+        ensurePropertySupportIsNotNull();
         propertySupport.removePropertyChangeListener(listener);
     }
     public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) {
+        ensurePropertySupportIsNotNull();
         propertySupport.removePropertyChangeListener(propertyName, listener);
     }
     
     protected void firePropertyChange(String propertyName, boolean oldValue, boolean newValue) {
+        ensurePropertySupportIsNotNull();
         propertySupport.firePropertyChange(propertyName, oldValue, newValue);
     }
     protected void firePropertyChange(String propertyName, int oldValue, int newValue) {
+        ensurePropertySupportIsNotNull();
         propertySupport.firePropertyChange(propertyName, oldValue, newValue);
     }
     protected void firePropertyChange(String propertyName, Object oldValue, Object newValue) {
+        ensurePropertySupportIsNotNull();
         propertySupport.firePropertyChange(propertyName, oldValue, newValue);
     }    
 }
diff --git a/src/org/yccheok/jstock/gui/Utils.java b/src/org/yccheok/jstock/gui/Utils.java
@@ -2741,11 +2741,11 @@ public ApplicationInfo(int applicationVersionID, String windowsDownloadLink, Str
 
     ////////////////////////////////////////////////////////////////////////////
     ////////////////////////////////////////////////////////////////////////////
-    private static final String ABOUT_BOX_VERSION_STRING = "1.0.7.41";
+    private static final String ABOUT_BOX_VERSION_STRING = "1.0.7.42";
 
-    // 1.0.7.41
+    // 1.0.7.42
     // For About box comparision on latest version purpose.
-    private static final int APPLICATION_VERSION_ID = 1171;
+    private static final int APPLICATION_VERSION_ID = 1172;
     ////////////////////////////////////////////////////////////////////////////
     ////////////////////////////////////////////////////////////////////////////
     
