Date format for data entry can now be chosen user level.

IARC-CSU · Oct 7, 2016 · 664f94a · 664f94a
1 parent 55ee283
commit 664f94a
Show file tree

Hide file tree

Showing 24 changed files with 489 additions and 193 deletions.
diff --git a/CanReg5.zip.tmp2 b/CanReg5.zip.tmp2
diff --git a/appinfo.properties b/appinfo.properties
@@ -1,10 +1,10 @@
 #Everything can be manually updated except buildnum and builddate.
-#Fri, 06 May 2016 16:02:40 +0200
-program.BUILDNUM=1545
+#Fri, 07 Oct 2016 14:54:47 +0200
+program.BUILDNUM=1557
 program.AUTHOR=Morten Johannes Ervik, CSU/IARC
-program.BUILDDATE=20160506160240
+program.BUILDDATE=20161007145447
 program.DESCRIPTION=
 program.COPYRIGHT=2008-2016
-program.VERSION=5.00.39
+program.VERSION=5.00.40BETA
 program.COMPANY=International Agency for Research on Cancer
 program.PROGNAME=CanReg
diff --git a/buildnumber.properties b/buildnumber.properties
@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Fri May 06 16:02:40 CEST 2016
-build.number=1546
+#Fri Oct 07 14:54:47 CEST 2016
+build.number=1558
diff --git a/changelog.txt b/changelog.txt
@@ -1,5 +1,12 @@
 Changelog
 
+5.00.40 BETA
+- Updated R libraries and R script for installation of those.
+- Added another common population format for children ([0,5>,[5,10>,[10,15>).
+- Fixed a bug in that hindered user setting number of cancers in top N cancer trends. (R tables configuration files.)
+- Updated Spanish translation.
+- Various fixes.
+
 5.00.39
 - Users can now perform "Exact search" while entering a new case.
 - System definition files are now always saved in UTF-8.

diff --git a/conf/tables/r/.Rhistory b/conf/tables/r/.Rhistory
diff --git a/inno-settings.txt b/inno-settings.txt
@@ -1 +1 @@
-#define MyAppVersion "5.00.39"
+#define MyAppVersion "5.00.40BETA"
diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
@@ -192,7 +192,12 @@ is divided into following sections:
                 </not>
             </and>
         </condition>
-        <property name="javac.fork" value="${jdkBug6558476}"/>
+        <condition else="false" property="javac.fork">
+            <or>
+                <istrue value="${jdkBug6558476}"/>
+                <istrue value="${javac.external.vm}"/>
+            </or>
+        </condition>
         <property name="jar.index" value="false"/>
         <property name="jar.index.metainf" value="${jar.index}"/>
         <property name="copylibs.rebase" value="true"/>
@@ -218,6 +223,7 @@ is divided into following sections:
         <condition else="" property="testng.debug.mode" value="-mixed">
             <istrue value="${junit+testng.available}"/>
         </condition>
+        <property name="java.failonerror" value="true"/>
     </target>
     <target name="-post-init">
         <!-- Empty placeholder for easier customization. -->
@@ -694,7 +700,7 @@ is divided into following sections:
             <sequential>
                 <property environment="env"/>
                 <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
-                <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">
+                <java classname="@{classname}" dir="${profiler.info.dir}" failonerror="${java.failonerror}" fork="true" jvm="${profiler.info.jvm}">
                     <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
                     <jvmarg value="${profiler.info.jvmargs.agent}"/>
                     <jvmarg line="${profiler.info.jvmargs}"/>
@@ -769,7 +775,7 @@ is divided into following sections:
             <attribute default="${debug.classpath}" name="classpath"/>
             <element name="customize" optional="true"/>
             <sequential>
-                <java classname="@{classname}" dir="${work.dir}" fork="true">
+                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
                     <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
                     <jvmarg line="${debug-args-line}"/>
                     <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
@@ -796,7 +802,7 @@ is divided into following sections:
             <attribute default="jvm" name="jvm"/>
             <element name="customize" optional="true"/>
             <sequential>
-                <java classname="@{classname}" dir="${work.dir}" fork="true">
+                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
                     <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
                     <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
                     <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>

diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
@@ -4,8 +4,8 @@ build.xml.stylesheet.CRC32=be360661
 # 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=b83d30e6
-nbproject/build-impl.xml.script.CRC32=442af7ca
-nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.75.2.48
+nbproject/build-impl.xml.script.CRC32=3cc18e26
+nbproject/build-impl.xml.stylesheet.CRC32=05530350@1.79.1.48
 nbproject/profiler-build-impl.xml.data.CRC32=49fbe16f
 nbproject/profiler-build-impl.xml.script.CRC32=abda56ed
 nbproject/profiler-build-impl.xml.stylesheet.CRC32=[email protected]
diff --git a/nbproject/jnlp-impl.xml b/nbproject/jnlp-impl.xml
@@ -411,6 +411,153 @@ made subject to such option by the copyright holder.
     <target name="-extend-manifest-codebase-override" depends="-check-manifest-codebase,-extend-manifest-codebase-override-warning" if="manifest.codebase.override">
         <property name="manifest.codebase.attribute" value="${manifest.custom.codebase}"/>
     </target>
+
+    <target name="-check-manifest-application-library-allowable-codebase">
+        <condition property="manifest.application.library.allowable.codebase.copy" value="${jnlp.dest.dir}">
+            <and>
+                <isset property="jnlp.codebase.type"/>
+                <equals arg1="${jnlp.codebase.type}" arg2="local"/>
+                <or>
+                    <not><isset property="manifest.custom.application.library.allowable.codebase"/></not>
+                    <equals arg1="${manifest.custom.application.library.allowable.codebase}" arg2=""/>
+                </or>
+            </and>
+        </condition>
+        <condition property="manifest.application.library.allowable.codebase.copy" value="${jnlp.codebase.user}">
+            <and>
+                <isset property="jnlp.codebase.type"/>
+                <equals arg1="${jnlp.codebase.type}" arg2="user"/>
+                <isset property="jnlp.codebase.user"/>
+                <not><equals arg1="${jnlp.codebase.type}" arg2=""/></not>
+                <or>
+                    <not><isset property="manifest.custom.application.library.allowable.codebase"/></not>
+                    <equals arg1="${manifest.custom.application.library.allowable.codebase}" arg2=""/>
+                </or>
+            </and>
+        </condition>
+        <condition property="manifest.application.library.allowable.codebase.web">
+            <and>
+                <isset property="jnlp.codebase.type"/>
+                <equals arg1="${jnlp.codebase.type}" arg2="web"/>
+                <or>
+                    <not><isset property="manifest.custom.application.library.allowable.codebase"/></not>
+                    <equals arg1="${manifest.custom.application.library.allowable.codebase}" arg2=""/>
+                </or>
+            </and>
+        </condition>
+        <condition property="manifest.application.library.allowable.codebase.other">
+            <and>
+                <not><isset property="manifest.application.library.allowable.codebase.copy"/></not>
+                <not><isset property="manifest.application.library.allowable.codebase.web"/></not>
+                <or>
+                    <not><isset property="manifest.custom.application.library.allowable.codebase"/></not>
+                    <equals arg1="${manifest.custom.application.library.allowable.codebase}" arg2=""/>
+                </or>
+            </and>
+        </condition>
+        <condition property="manifest.application.library.allowable.codebase.override">
+            <and>
+                <isset property="manifest.custom.application.library.allowable.codebase"/>
+                <not><equals arg1="${manifest.custom.application.library.allowable.codebase}" arg2=""/></not>
+            </and>
+        </condition>
+        <condition property="manifest.application.library.allowable.codebase.override.warning">
+            <and>
+                <isset property="manifest.application.library.allowable.codebase.override"/>
+                <equals arg1="${manifest.custom.application.library.allowable.codebase}" arg2="*"/>
+            </and>
+        </condition>
+    </target>
+    <target name="-extend-manifest-application-library-allowable-codebase-copy" depends="-check-manifest-application-library-allowable-codebase" if="manifest.application.library.allowable.codebase.copy">
+        <property name="manifest.application.library.allowable.codebase.attribute" value="${manifest.application.library.allowable.codebase.copy}"/>
+    </target>
+    <target name="-extend-manifest-application-library-allowable-codebase-web" depends="-check-manifest-application-library-allowable-codebase" if="manifest.application.library.allowable.codebase.web">
+        <property name="manifest.application.library.allowable.codebase.attribute" value="*"/>
+        <echo message="Warning: Setting Application-Library-Allowable-Codebase manifest attribute to '*' due to current JNLP Codebase setting. Set manifest.custom.application.library.allowable.codebase property to override the non-secure value '*'." level="warning"/>
+    </target>
+    <target name="-extend-manifest-application-library-allowable-codebase-other" depends="-check-manifest-application-library-allowable-codebase" if="manifest.application.library.allowable.codebase.other">
+        <property name="manifest.application.library.allowable.codebase.attribute" value="*"/>
+        <echo message="Warning: Setting Application-Library-Allowable-Codebase manifest attribute to '*' due to current JNLP Codebase setting. Set manifest.custom.application.library.allowable.codebase property to override the non-secure value '*'." level="warning"/>
+    </target>
+    <target name="-extend-manifest-application-library-allowable-codebase-override-warning" depends="-check-manifest-application-library-allowable-codebase" if="manifest.application.library.allowable.codebase.override.warning">
+        <echo message="Warning: Application-Library-Allowable-Codebase manifest attribute should be used to restrict JAR repurposing. Preferably set manifest.custom.application.library.allowable.codebase to more specific value than the non-secure '*'" level="warning"/>
+    </target>
+    <target name="-extend-manifest-application-library-allowable-codebase-override" depends="-check-manifest-application-library-allowable-codebase,-extend-manifest-application-library-allowable-codebase-override-warning" if="manifest.application.library.allowable.codebase.override">
+        <property name="manifest.application.library.allowable.codebase.attribute" value="${manifest.custom.application.library.allowable.codebase}"/>
+    </target>
+    <target name="-check-manifest-caller-allowable-codebase">
+        <condition property="manifest.caller.allowable.codebase.copy" value="${jnlp.dest.dir}">
+            <and>
+                <isset property="jnlp.codebase.type"/>
+                <equals arg1="${jnlp.codebase.type}" arg2="local"/>
+                <or>
+                    <not><isset property="manifest.custom.caller.allowable.codebase"/></not>
+                    <equals arg1="${manifest.custom.caller.allowable.codebase}" arg2=""/>
+                </or>
+            </and>
+        </condition>
+        <condition property="manifest.caller.allowable.codebase.copy" value="${jnlp.codebase.user}">
+            <and>
+                <isset property="jnlp.codebase.type"/>
+                <equals arg1="${jnlp.codebase.type}" arg2="user"/>
+                <isset property="jnlp.codebase.user"/>
+                <not><equals arg1="${jnlp.codebase.type}" arg2=""/></not>
+                <or>
+                    <not><isset property="manifest.custom.caller.allowable.codebase"/></not>
+                    <equals arg1="${manifest.custom.caller.allowable.codebase}" arg2=""/>
+                </or>
+            </and>
+        </condition>
+        <condition property="manifest.caller.allowable.codebase.web">
+            <and>
+                <isset property="jnlp.codebase.type"/>
+                <equals arg1="${jnlp.codebase.type}" arg2="web"/>
+                <or>
+                    <not><isset property="manifest.custom.caller.allowable.codebase"/></not>
+                    <equals arg1="${manifest.custom.caller.allowable.codebase}" arg2=""/>
+                </or>
+            </and>
+        </condition>
+        <condition property="manifest.caller.allowable.codebase.other">
+            <and>
+                <not><isset property="manifest.caller.allowable.codebase.copy"/></not>
+                <not><isset property="manifest.caller.allowable.codebase.web"/></not>
+                <or>
+                    <not><isset property="manifest.custom.caller.allowable.codebase"/></not>
+                    <equals arg1="${manifest.custom.caller.allowable.codebase}" arg2=""/>
+                </or>
+            </and>
+        </condition>
+        <condition property="manifest.caller.allowable.codebase.override">
+            <and>
+                <isset property="manifest.custom.caller.allowable.codebase"/>
+                <not><equals arg1="${manifest.custom.caller.allowable.codebase}" arg2=""/></not>
+            </and>
+        </condition>
+        <condition property="manifest.caller.allowable.codebase.override.warning">
+            <and>
+                <isset property="manifest.caller.allowable.codebase.override"/>
+                <equals arg1="${manifest.custom.caller.allowable.codebase}" arg2="*"/>
+            </and>
+        </condition>
+    </target>
+    <target name="-extend-manifest-caller-allowable-codebase-copy" depends="-check-manifest-caller-allowable-codebase" if="manifest.caller.allowable.codebase.copy">
+        <property name="manifest.caller.allowable.codebase.attribute" value="${manifest.caller.allowable.codebase.copy}"/>
+    </target>
+    <target name="-extend-manifest-caller-allowable-codebase-web" depends="-check-manifest-caller-allowable-codebase" if="manifest.caller.allowable.codebase.web">
+        <property name="manifest.caller.allowable.codebase.attribute" value="*"/>
+        <echo message="Warning: Setting Caller-Allowable-Codebase manifest attribute to '*' due to current JNLP Codebase setting. Set manifest.custom.caller.allowable.codebase property to override the non-secure value '*'." level="warning"/>
+    </target>
+    <target name="-extend-manifest-caller-allowable-codebase-other" depends="-check-manifest-caller-allowable-codebase" if="manifest.caller.allowable.codebase.other">
+        <property name="manifest.caller.allowable.codebase.attribute" value="*"/>
+        <echo message="Warning: Setting Caller-Allowable-Codebase manifest attribute to '*' due to current JNLP Codebase setting. Set manifest.custom.caller.allowable.codebase property to override the non-secure value '*'." level="warning"/>
+    </target>
+    <target name="-extend-manifest-caller-allowable-codebase-override-warning" depends="-check-manifest-caller-allowable-codebase" if="manifest.caller.allowable.codebase.override.warning">
+        <echo message="Warning: Caller-Allowable-Codebase manifest attribute should be used to restrict JavaScript access. Preferably set manifest.custom.caller.allowable.codebase to more specific value than the non-secure '*'" level="warning"/>
+    </target>
+    <target name="-extend-manifest-caller-allowable-codebase-override" depends="-check-manifest-caller-allowable-codebase,-extend-manifest-caller-allowable-codebase-override-warning" if="manifest.caller.allowable.codebase.override">
+        <property name="manifest.caller.allowable.codebase.attribute" value="${manifest.custom.caller.allowable.codebase}"/>
+    </target>
     <target name="-check-manifest-permissions">
         <condition property="manifest.permissions.all">
             <and>
@@ -460,10 +607,15 @@ made subject to such option by the copyright holder.
     <target name="-add-manifest-security" depends="-init-macrodef-extend-manifest,
                     -extend-manifest-codebase-copy,-extend-manifest-codebase-web,-extend-manifest-codebase-other,-extend-manifest-codebase-override,
                     -extend-manifest-permissions-sandbox,-extend-manifest-permissions-all,-extend-manifest-permissions-override,
-                    -extend-manifest-application-name">
+                    -extend-manifest-application-name, -extend-manifest-application-library-allowable-codebase-copy, -extend-manifest-application-library-allowable-codebase-web,
+                    -extend-manifest-application-library-allowable-codebase-other, -extend-manifest-application-library-allowable-codebase-override,
+                    -extend-manifest-caller-allowable-codebase-copy, -extend-manifest-caller-allowable-codebase-web, -extend-manifest-caller-allowable-codebase-other,
+                    -extend-manifest-caller-allowable-codebase-override">
         <jnlp:extend-manifest>
             <customize>
                 <attribute name="Codebase" value="${manifest.codebase.attribute}"/>
+                <attribute name="Application-Library-Allowable-Codebase" value="${manifest.application.library.allowable.codebase.attribute}"/>
+                <attribute name="Caller-Allowable-Codebase" value="${manifest.caller.allowable.codebase.attribute}"/>
                 <attribute name="Permissions" value="${manifest.permissions.attribute}"/>
                 <attribute name="Application-Name" value="${manifest.application.name.attribute}"/>
             </customize>

diff --git a/nbproject/jnlp-impl_backup.xml b/nbproject/jnlp-impl_backup.xml
@@ -449,17 +449,28 @@ made subject to such option by the copyright holder.
     <target name="-extend-manifest-permissions-override" depends="-check-manifest-permissions" if="manifest.permissions.override">
         <property name="manifest.permissions.attribute" value="${manifest.custom.permissions}"/>
     </target>
+    <target name="-extend-manifest-application-name">
+        <condition property="manifest.application.name.attribute" value="${manifest.custom.application.name}" else="${application.title}">
+            <and>
+                <isset property="manifest.custom.application.name"/>
+                <not><equals arg1="${manifest.custom.application.name}" arg2=""/></not>
+            </and>
+        </condition>
+    </target>
     <target name="-add-manifest-security" depends="-init-macrodef-extend-manifest,
                     -extend-manifest-codebase-copy,-extend-manifest-codebase-web,-extend-manifest-codebase-other,-extend-manifest-codebase-override,
-                    -extend-manifest-permissions-sandbox,-extend-manifest-permissions-all,-extend-manifest-permissions-override">
+                    -extend-manifest-permissions-sandbox,-extend-manifest-permissions-all,-extend-manifest-permissions-override,
+                    -extend-manifest-application-name">
         <jnlp:extend-manifest>
             <customize>
                 <attribute name="Codebase" value="${manifest.codebase.attribute}"/>
                 <attribute name="Permissions" value="${manifest.permissions.attribute}"/>
+                <attribute name="Application-Name" value="${manifest.application.name.attribute}"/>
             </customize>
         </jnlp:extend-manifest>
         <echo message="Added manifest attribute Codebase: ${manifest.codebase.attribute}" level="verbose"/>
         <echo message="Added manifest attribute Permissions: ${manifest.permissions.attribute}" level="verbose"/>
+        <echo message="Added manifest attribute Application-Name: ${manifest.application.name.attribute}" level="verbose"/>
     </target>
 
     <target name="-do-jar-applet" depends="-test-jnlp-type,-init-macrodef-copylibs" if="is.applet+mkdist.available">
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		#define MyAppVersion "5.00.39"
		#define MyAppVersion "5.00.40BETA"