1.0.7.31

yccheok · Mar 3, 2018 · 14a50f6 · 14a50f6
1 parent 46b1629
commit 14a50f6
Show file tree

Hide file tree

Showing 18 changed files with 63 additions and 88 deletions.
diff --git a/appengine/jstock-android-static/war/news_information/index.html b/appengine/jstock-android-static/war/news_information/index.html
@@ -4,25 +4,17 @@
     <body>
     <!--fe78440e-e0fe-4efb-881d-264a01be483c-->
 
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.30 had been released.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.31 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:  Due to licensing and legal issue, we will not support Malaysia stock market moving forward.
-    </p>
-
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
-    Dear Malaysia stock investors, due to licensing and legal issue, we will not support Malaysia stock market moving forward. Please backup all your data via Help -> Export...We apologise for any inconvenience.
-    </p>
-
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
-    <img src="http://jstock-static.appspot.com/news_information/0.png" />
+    Bugfix:  Fix on broken URL.
     </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.30 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.31 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=16/11/17
+news_id=03/03/2018
 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,25 +4,17 @@
     <body>
     <!--fe78440e-e0fe-4efb-881d-264a01be483c-->
 
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.30 had been released.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.31 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:  Due to licensing and legal issue, we will not support Malaysia stock market moving forward.
-    </p>
-
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
-    Dear Malaysia stock investors, due to licensing and legal issue, we will not support Malaysia stock market moving forward. Please backup all your data via Help -> Export...We apologise for any inconvenience.
-    </p>
-
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
-    <img src="http://jstock-static.appspot.com/news_information/0.png" />
+    Bugfix:  Fix on broken URL.
     </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.30 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.31 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=16/11/17
+news_id=03/03/2018
 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=1159
-windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-30/jstock-1.0.7.30-setup.exe
-linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-30/jstock-1.0.7.30-bin.zip
-macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-30/jstock-1.0.7.30-bin.zip
-solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-30/jstock-1.0.7.30-bin.zip
+applicationVersionID=1160
+windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-31/jstock-1.0.7.31-setup.exe
+linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-31/jstock-1.0.7.31-bin.zip
+macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-31/jstock-1.0.7.31-bin.zip
+solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-31/jstock-1.0.7.31-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=1159
-windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-30/jstock-1.0.7.30-setup.exe
-linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-30/jstock-1.0.7.30-bin.zip
-macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-30/jstock-1.0.7.30-bin.zip
-solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-30/jstock-1.0.7.30-bin.zip
+applicationVersionID=1160
+windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-31/jstock-1.0.7.31-setup.exe
+linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-31/jstock-1.0.7.31-bin.zip
+macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-31/jstock-1.0.7.31-bin.zip
+solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-31/jstock-1.0.7.31-bin.zip
diff --git a/appengine/jstock-static/war/news_information/index.html b/appengine/jstock-static/war/news_information/index.html
@@ -4,25 +4,17 @@
     <body>
     <!--fe78440e-e0fe-4efb-881d-264a01be483c-->
 
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.30 had been released.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.31 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:  Due to licensing and legal issue, we will not support Malaysia stock market moving forward.
-    </p>
-
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
-    Dear Malaysia stock investors, due to licensing and legal issue, we will not support Malaysia stock market moving forward. Please backup all your data via Help -> Export...We apologise for any inconvenience.
-    </p>
-
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
-    <img src="http://jstock-static.appspot.com/news_information/0.png" />
+    Bugfix:  Fix on broken URL.
     </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.30 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.31 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=16/11/17
+news_id=03/03/2018
 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,25 +4,17 @@
     <body>
     <!--fe78440e-e0fe-4efb-881d-264a01be483c-->
 
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.30 had been released.</p>
+    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.31 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:  Due to licensing and legal issue, we will not support Malaysia stock market moving forward.
-    </p>
-
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
-    Dear Malaysia stock investors, due to licensing and legal issue, we will not support Malaysia stock market moving forward. Please backup all your data via Help -> Export...We apologise for any inconvenience.
-    </p>
-
-    <p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
-    <img src="http://jstock-static.appspot.com/news_information/0.png" />
+    Bugfix:  Fix on broken URL.
     </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.30 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.31 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=16/11/17
+news_id=03/03/2018
 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=1159
-windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-30/jstock-1.0.7.30-setup.exe
-linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-30/jstock-1.0.7.30-bin.zip
-macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-30/jstock-1.0.7.30-bin.zip
-solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-30/jstock-1.0.7.30-bin.zip
+applicationVersionID=1160
+windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-31/jstock-1.0.7.31-setup.exe
+linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-31/jstock-1.0.7.31-bin.zip
+macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-31/jstock-1.0.7.31-bin.zip
+solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-31/jstock-1.0.7.31-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=1159
-windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-30/jstock-1.0.7.30-setup.exe
-linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-30/jstock-1.0.7.30-bin.zip
-macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-30/jstock-1.0.7.30-bin.zip
-solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-30/jstock-1.0.7.30-bin.zip
+applicationVersionID=1160
+windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-31/jstock-1.0.7.31-setup.exe
+linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-31/jstock-1.0.7.31-bin.zip
+macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-31/jstock-1.0.7.31-bin.zip
+solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-31/jstock-1.0.7.31-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.31 - 2018-03-03
+  Bugfix:  Fix on broken URL.
+
 JStock 1.0.7.30 - 2017-11-15
   Bugfix:  Due to licensing and legal issue, we will not support Malaysia stock 
            market moving forward.

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.30-setup.exe"
+OutFile "jstock-1.0.7.31-setup.exe"
 LicenseData "gpl-2.0.txt"
 
 ; The default installation directory

diff --git a/installer/windows/jstock.xml b/installer/windows/jstock.xml
@@ -17,6 +17,7 @@
   <jre>
     <path></path>
     <bundledJre64Bit>false</bundledJre64Bit>
+    <bundledJreAsFallback>false</bundledJreAsFallback>
     <minVersion>1.7.0</minVersion>
     <maxVersion></maxVersion>
     <jdkPreference>preferJre</jdkPreference>
@@ -25,15 +26,17 @@
     <maxHeapSize>512</maxHeapSize>
   </jre>
   <versionInfo>
-    <fileVersion>1.1.5.9</fileVersion>
-    <txtFileVersion>1.1.5.9</txtFileVersion>
+    <fileVersion>1.1.6.0</fileVersion>
+    <txtFileVersion>1.1.6.0</txtFileVersion>
     <fileDescription>JStock - Stock Market Software</fileDescription>
     <copyright>Yan Cheng Cheok &lt;[email protected]&gt;</copyright>
-    <productVersion>1.1.5.9</productVersion>
-    <txtProductVersion>1.1.5.9</txtProductVersion>
+    <productVersion>1.1.6.0</productVersion>
+    <txtProductVersion>1.1.6.0</txtProductVersion>
     <productName>JStock - Stock Market Software</productName>
     <companyName>Yan Cheng Cheok &lt;[email protected]&gt;</companyName>
     <internalName>jstock</internalName>
     <originalFilename>jstock.exe</originalFilename>
+    <trademarks></trademarks>
+    <language>ENGLISH_US</language>
   </versionInfo>
 </launch4jConfig>
diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
@@ -46,8 +46,8 @@ is divided into following sections:
         <property file="${user.properties.file}"/>
         <!-- The two properties below are usually overridden -->
         <!-- by the active platform. Just a fallback. -->
-        <property name="default.javac.source" value="1.4"/>
-        <property name="default.javac.target" value="1.4"/>
+        <property name="default.javac.source" value="1.6"/>
+        <property name="default.javac.target" value="1.6"/>
     </target>
     <target depends="-pre-init,-init-private,-init-user" name="-init-project">
         <property file="nbproject/configs/${config}.properties"/>
@@ -76,7 +76,7 @@ is divided into following sections:
             <and>
                 <isset property="javac.profile"/>
                 <length length="0" string="${javac.profile}" when="greater"/>
-                <matches pattern="1\.[89](\..*)?" string="${javac.source}"/>
+                <matches pattern="((1\.[89])|9)(\..*)?" string="${javac.source}"/>
             </and>
         </condition>
         <condition property="do.archive">
@@ -156,6 +156,7 @@ is divided into following sections:
         <property name="application.args" value=""/>
         <property name="source.encoding" value="${file.encoding}"/>
         <property name="runtime.encoding" value="${source.encoding}"/>
+        <property name="manifest.encoding" value="${source.encoding}"/>
         <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
             <and>
                 <isset property="javadoc.encoding"/>
@@ -840,7 +841,7 @@ is divided into following sections:
                     </chainedmapper>
                 </pathconvert>
                 <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
-                <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
+                <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" manifestencoding="UTF-8" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
                     <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
                     <manifest>
                         <attribute name="Class-Path" value="${jar.classpath}"/>
@@ -852,7 +853,7 @@ is divided into following sections:
     </target>
     <target name="-init-presetdef-jar">
         <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
+            <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifestencoding="UTF-8">
                 <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
             </jar>
         </presetdef>
@@ -975,23 +976,23 @@ is divided into following sections:
     </target>
     <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
         <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
-        <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
+        <copy encoding="${manifest.encoding}" file="${manifest.file}" outputencoding="UTF-8" tofile="${tmp.manifest.file}"/>
     </target>
     <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
-        <manifest file="${tmp.manifest.file}" mode="update">
+        <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
             <attribute name="Main-Class" value="${main.class}"/>
         </manifest>
     </target>
     <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
-        <manifest file="${tmp.manifest.file}" mode="update">
+        <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
             <attribute name="Profile" value="${javac.profile}"/>
         </manifest>
     </target>
     <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-set-splashscreen">
         <basename file="${application.splash}" property="splashscreen.basename"/>
         <mkdir dir="${build.classes.dir}/META-INF"/>
         <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
-        <manifest file="${tmp.manifest.file}" mode="update">
+        <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
             <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
         </manifest>
     </target>
@@ -1186,7 +1187,7 @@ is divided into following sections:
     <target depends="-profile-check" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-test-with-main">
         <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
         <startprofiler/>
-        <antcal target="run-test-with-main"/>
+        <antcall target="run-test-with-main"/>
     </target>
     <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent">
         <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>

diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
@@ -4,5 +4,5 @@ build.xml.stylesheet.CRC32=240b97a2
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
 nbproject/build-impl.xml.data.CRC32=0b7e11a9
-nbproject/build-impl.xml.script.CRC32=a1d90831
-nbproject/build-impl.xml.stylesheet.CRC32=05530350@1.79.1.48
+nbproject/build-impl.xml.script.CRC32=7f9a2dba
+nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48