1.1 --- a/data/dictionary.xml Wed May 28 23:30:27 2014 +0200
1.2 +++ b/data/dictionary.xml Mon Jun 22 21:59:38 2020 +0200
1.3 @@ -5,7 +5,7 @@
1.4
1.5 Permission is granted to copy, distribute and/or modify this document
1.6 under the terms of the GNU Free Documentation License, Version 1.3
1.7 -or any later version published by the Free Software Foundation;
1.8 +published by the Free Software Foundation;
1.9 with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
1.10 A copy of the license is included in the section entitled "GNU
1.11 Free Documentation License".
2.1 --- a/data/dictionary.xsd Wed May 28 23:30:27 2014 +0200
2.2 +++ b/data/dictionary.xsd Mon Jun 22 21:59:38 2020 +0200
2.3 @@ -5,8 +5,7 @@
2.4
2.5 This program is free software: you can redistribute it and/or modify
2.6 it under the terms of the GNU General Public License as published by
2.7 -the Free Software Foundation, either version 3 of the License, or
2.8 -(at your option) any later version.
2.9 +the Free Software Foundation, version 3 of the License.
2.10
2.11 This program is distributed in the hope that it will be useful,
2.12 but WITHOUT ANY WARRANTY; without even the implied warranty of
3.1 --- a/java/dictionary-generator/build.xml Wed May 28 23:30:27 2014 +0200
3.2 +++ b/java/dictionary-generator/build.xml Mon Jun 22 21:59:38 2020 +0200
3.3 @@ -51,8 +51,7 @@
3.4 -init-macrodef-junit: defines macro for junit execution
3.5 -init-macrodef-debug: defines macro for class debugging
3.6 -init-macrodef-java: defines macro for class execution
3.7 - -do-jar-with-manifest: JAR building (if you are using a manifest)
3.8 - -do-jar-without-manifest: JAR building (if you are not using a manifest)
3.9 + -do-jar: JAR building
3.10 run: execution of project
3.11 -javadoc-build: Javadoc generation
3.12 test-report: JUnit report generation
4.1 --- a/java/dictionary-generator/nbproject/build-impl.xml Wed May 28 23:30:27 2014 +0200
4.2 +++ b/java/dictionary-generator/nbproject/build-impl.xml Mon Jun 22 21:59:38 2020 +0200
4.3 @@ -46,14 +46,15 @@
4.4 <property file="${user.properties.file}"/>
4.5 <!-- The two properties below are usually overridden -->
4.6 <!-- by the active platform. Just a fallback. -->
4.7 - <property name="default.javac.source" value="1.4"/>
4.8 - <property name="default.javac.target" value="1.4"/>
4.9 + <property name="default.javac.source" value="1.6"/>
4.10 + <property name="default.javac.target" value="1.6"/>
4.11 </target>
4.12 <target depends="-pre-init,-init-private,-init-user" name="-init-project">
4.13 <property file="nbproject/configs/${config}.properties"/>
4.14 <property file="nbproject/project.properties"/>
4.15 </target>
4.16 <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
4.17 + <property name="platform.java" value="${java.home}/bin/java"/>
4.18 <available file="${manifest.file}" property="manifest.available"/>
4.19 <condition property="splashscreen.available">
4.20 <and>
4.21 @@ -71,16 +72,20 @@
4.22 </not>
4.23 </and>
4.24 </condition>
4.25 - <condition property="manifest.available+main.class">
4.26 + <condition property="profile.available">
4.27 <and>
4.28 - <isset property="manifest.available"/>
4.29 - <isset property="main.class.available"/>
4.30 + <isset property="javac.profile"/>
4.31 + <length length="0" string="${javac.profile}" when="greater"/>
4.32 + <matches pattern="((1\.[89])|9)(\..*)?" string="${javac.source}"/>
4.33 </and>
4.34 </condition>
4.35 <condition property="do.archive">
4.36 - <not>
4.37 - <istrue value="${jar.archive.disabled}"/>
4.38 - </not>
4.39 + <or>
4.40 + <not>
4.41 + <istrue value="${jar.archive.disabled}"/>
4.42 + </not>
4.43 + <istrue value="${not.archive.disabled}"/>
4.44 + </or>
4.45 </condition>
4.46 <condition property="do.mkdist">
4.47 <and>
4.48 @@ -91,12 +96,6 @@
4.49 </not>
4.50 </and>
4.51 </condition>
4.52 - <condition property="manifest.available+main.class+mkdist.available">
4.53 - <and>
4.54 - <istrue value="${manifest.available+main.class}"/>
4.55 - <isset property="do.mkdist"/>
4.56 - </and>
4.57 - </condition>
4.58 <condition property="do.archive+manifest.available">
4.59 <and>
4.60 <isset property="manifest.available"/>
4.61 @@ -115,24 +114,12 @@
4.62 <istrue value="${do.archive}"/>
4.63 </and>
4.64 </condition>
4.65 - <condition property="do.archive+manifest.available+main.class">
4.66 + <condition property="do.archive+profile.available">
4.67 <and>
4.68 - <istrue value="${manifest.available+main.class}"/>
4.69 + <isset property="profile.available"/>
4.70 <istrue value="${do.archive}"/>
4.71 </and>
4.72 </condition>
4.73 - <condition property="manifest.available-mkdist.available">
4.74 - <or>
4.75 - <istrue value="${manifest.available}"/>
4.76 - <isset property="do.mkdist"/>
4.77 - </or>
4.78 - </condition>
4.79 - <condition property="manifest.available+main.class-mkdist.available">
4.80 - <or>
4.81 - <istrue value="${manifest.available+main.class}"/>
4.82 - <isset property="do.mkdist"/>
4.83 - </or>
4.84 - </condition>
4.85 <condition property="have.tests">
4.86 <or>
4.87 <available file="${test.src.dir}"/>
4.88 @@ -169,6 +156,7 @@
4.89 <property name="application.args" value=""/>
4.90 <property name="source.encoding" value="${file.encoding}"/>
4.91 <property name="runtime.encoding" value="${source.encoding}"/>
4.92 + <property name="manifest.encoding" value="${source.encoding}"/>
4.93 <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
4.94 <and>
4.95 <isset property="javadoc.encoding"/>
4.96 @@ -186,7 +174,15 @@
4.97 </condition>
4.98 <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
4.99 <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
4.100 - <length length="0" string="${endorsed.classpath}" when="greater"/>
4.101 + <and>
4.102 + <isset property="endorsed.classpath"/>
4.103 + <not>
4.104 + <equals arg1="${endorsed.classpath}" arg2="" trim="true"/>
4.105 + </not>
4.106 + </and>
4.107 + </condition>
4.108 + <condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}">
4.109 + <isset property="profile.available"/>
4.110 </condition>
4.111 <condition else="false" property="jdkBug6558476">
4.112 <and>
4.113 @@ -196,7 +192,12 @@
4.114 </not>
4.115 </and>
4.116 </condition>
4.117 - <property name="javac.fork" value="${jdkBug6558476}"/>
4.118 + <condition else="false" property="javac.fork">
4.119 + <or>
4.120 + <istrue value="${jdkBug6558476}"/>
4.121 + <istrue value="${javac.external.vm}"/>
4.122 + </or>
4.123 + </condition>
4.124 <property name="jar.index" value="false"/>
4.125 <property name="jar.index.metainf" value="${jar.index}"/>
4.126 <property name="copylibs.rebase" value="true"/>
4.127 @@ -222,6 +223,7 @@
4.128 <condition else="" property="testng.debug.mode" value="-mixed">
4.129 <istrue value="${junit+testng.available}"/>
4.130 </condition>
4.131 + <property name="java.failonerror" value="true"/>
4.132 </target>
4.133 <target name="-post-init">
4.134 <!-- Empty placeholder for easier customization. -->
4.135 @@ -275,6 +277,7 @@
4.136 <path path="@{classpath}"/>
4.137 </classpath>
4.138 <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
4.139 + <compilerarg line="${javac.profile.cmd.line.arg}"/>
4.140 <compilerarg line="${javac.compilerargs}"/>
4.141 <compilerarg value="-processorpath"/>
4.142 <compilerarg path="@{processorpath}:${empty.dir}"/>
4.143 @@ -314,6 +317,7 @@
4.144 <path path="@{classpath}"/>
4.145 </classpath>
4.146 <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
4.147 + <compilerarg line="${javac.profile.cmd.line.arg}"/>
4.148 <compilerarg line="${javac.compilerargs}"/>
4.149 <customize/>
4.150 </javac>
4.151 @@ -446,7 +450,7 @@
4.152 </fileset>
4.153 </union>
4.154 <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
4.155 - <testng classfilesetref="test.set" failureProperty="tests.failed" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="dictionary-generator" testname="TestNG tests" workingDir="${work.dir}">
4.156 + <testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="dictionary-generator" testname="TestNG tests" workingDir="${work.dir}">
4.157 <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
4.158 <propertyset>
4.159 <propertyref prefix="test-sys-prop."/>
4.160 @@ -696,7 +700,7 @@
4.161 <sequential>
4.162 <property environment="env"/>
4.163 <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
4.164 - <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">
4.165 + <java classname="@{classname}" dir="${profiler.info.dir}" failonerror="${java.failonerror}" fork="true" jvm="${profiler.info.jvm}">
4.166 <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
4.167 <jvmarg value="${profiler.info.jvmargs.agent}"/>
4.168 <jvmarg line="${profiler.info.jvmargs}"/>
4.169 @@ -771,7 +775,7 @@
4.170 <attribute default="${debug.classpath}" name="classpath"/>
4.171 <element name="customize" optional="true"/>
4.172 <sequential>
4.173 - <java classname="@{classname}" dir="${work.dir}" fork="true">
4.174 + <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
4.175 <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
4.176 <jvmarg line="${debug-args-line}"/>
4.177 <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
4.178 @@ -798,7 +802,7 @@
4.179 <attribute default="jvm" name="jvm"/>
4.180 <element name="customize" optional="true"/>
4.181 <sequential>
4.182 - <java classname="@{classname}" dir="${work.dir}" fork="true">
4.183 + <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
4.184 <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
4.185 <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
4.186 <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
4.187 @@ -837,8 +841,8 @@
4.188 </chainedmapper>
4.189 </pathconvert>
4.190 <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
4.191 - <copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
4.192 - <fileset dir="${build.classes.dir}"/>
4.193 + <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}">
4.194 + <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
4.195 <manifest>
4.196 <attribute name="Class-Path" value="${jar.classpath}"/>
4.197 <customize/>
4.198 @@ -849,8 +853,8 @@
4.199 </target>
4.200 <target name="-init-presetdef-jar">
4.201 <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
4.202 - <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
4.203 - <j2seproject1:fileset dir="${build.classes.dir}"/>
4.204 + <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifestencoding="UTF-8">
4.205 + <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
4.206 </jar>
4.207 </presetdef>
4.208 </target>
4.209 @@ -966,65 +970,67 @@
4.210 <!-- Empty placeholder for easier customization. -->
4.211 <!-- You can override this target in the ../build.xml file. -->
4.212 </target>
4.213 - <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available-mkdist.available">
4.214 - <j2seproject1:jar/>
4.215 + <target depends="init" if="do.archive" name="-do-jar-create-manifest" unless="manifest.available">
4.216 + <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
4.217 + <touch file="${tmp.manifest.file}" verbose="false"/>
4.218 </target>
4.219 - <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class-mkdist.available">
4.220 - <j2seproject1:jar manifest="${manifest.file}"/>
4.221 + <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
4.222 + <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
4.223 + <copy encoding="${manifest.encoding}" file="${manifest.file}" outputencoding="UTF-8" tofile="${tmp.manifest.file}"/>
4.224 </target>
4.225 - <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available">
4.226 - <j2seproject1:jar manifest="${manifest.file}">
4.227 - <j2seproject1:manifest>
4.228 - <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
4.229 - </j2seproject1:manifest>
4.230 - </j2seproject1:jar>
4.231 + <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
4.232 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
4.233 + <attribute name="Main-Class" value="${main.class}"/>
4.234 + </manifest>
4.235 + </target>
4.236 + <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
4.237 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
4.238 + <attribute name="Profile" value="${javac.profile}"/>
4.239 + </manifest>
4.240 + </target>
4.241 + <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-set-splashscreen">
4.242 + <basename file="${application.splash}" property="splashscreen.basename"/>
4.243 + <mkdir dir="${build.classes.dir}/META-INF"/>
4.244 + <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
4.245 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
4.246 + <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
4.247 + </manifest>
4.248 + </target>
4.249 + <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.mkdist" name="-do-jar-copylibs">
4.250 + <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
4.251 <echo level="info">To run this application from the command line without Ant, try:</echo>
4.252 + <property location="${dist.jar}" name="dist.jar.resolved"/>
4.253 + <echo level="info">java -jar "${dist.jar.resolved}"</echo>
4.254 + </target>
4.255 + <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
4.256 + <j2seproject1:jar manifest="${tmp.manifest.file}"/>
4.257 <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
4.258 <property location="${dist.jar}" name="dist.jar.resolved"/>
4.259 <pathconvert property="run.classpath.with.dist.jar">
4.260 <path path="${run.classpath}"/>
4.261 <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
4.262 </pathconvert>
4.263 - <echo level="info">java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
4.264 + <condition else="" property="jar.usage.message" value="To run this application from the command line without Ant, try:${line.separator}${platform.java} -cp ${run.classpath.with.dist.jar} ${main.class}">
4.265 + <isset property="main.class.available"/>
4.266 + </condition>
4.267 + <condition else="debug" property="jar.usage.level" value="info">
4.268 + <isset property="main.class.available"/>
4.269 + </condition>
4.270 + <echo level="${jar.usage.level}" message="${jar.usage.message}"/>
4.271 </target>
4.272 - <target depends="init" if="do.archive" name="-do-jar-with-libraries-create-manifest" unless="manifest.available">
4.273 - <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
4.274 - <touch file="${tmp.manifest.file}" verbose="false"/>
4.275 - </target>
4.276 - <target depends="init" if="do.archive+manifest.available" name="-do-jar-with-libraries-copy-manifest">
4.277 - <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
4.278 - <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
4.279 - </target>
4.280 - <target depends="init,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest" if="do.archive+main.class.available" name="-do-jar-with-libraries-set-main">
4.281 - <manifest file="${tmp.manifest.file}" mode="update">
4.282 - <attribute name="Main-Class" value="${main.class}"/>
4.283 - </manifest>
4.284 - </target>
4.285 - <target depends="init,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-with-libraries-set-splashscreen">
4.286 - <basename file="${application.splash}" property="splashscreen.basename"/>
4.287 - <mkdir dir="${build.classes.dir}/META-INF"/>
4.288 - <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
4.289 - <manifest file="${tmp.manifest.file}" mode="update">
4.290 - <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
4.291 - </manifest>
4.292 - </target>
4.293 - <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest,-do-jar-with-libraries-set-main,-do-jar-with-libraries-set-splashscreen" if="do.mkdist" name="-do-jar-with-libraries-pack">
4.294 - <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
4.295 - <echo level="info">To run this application from the command line without Ant, try:</echo>
4.296 - <property location="${dist.jar}" name="dist.jar.resolved"/>
4.297 - <echo level="info">java -jar "${dist.jar.resolved}"</echo>
4.298 - </target>
4.299 - <target depends="-do-jar-with-libraries-pack" if="do.archive" name="-do-jar-with-libraries-delete-manifest">
4.300 + <target depends="-do-jar-copylibs" if="do.archive" name="-do-jar-delete-manifest">
4.301 <delete>
4.302 <fileset file="${tmp.manifest.file}"/>
4.303 </delete>
4.304 </target>
4.305 - <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest,-do-jar-with-libraries-set-main,-do-jar-with-libraries-set-splashscreen,-do-jar-with-libraries-pack,-do-jar-with-libraries-delete-manifest" name="-do-jar-with-libraries"/>
4.306 + <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-do-jar-jar,-do-jar-delete-manifest" name="-do-jar-without-libraries"/>
4.307 + <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-do-jar-copylibs,-do-jar-delete-manifest" name="-do-jar-with-libraries"/>
4.308 <target name="-post-jar">
4.309 <!-- Empty placeholder for easier customization. -->
4.310 <!-- You can override this target in the ../build.xml file. -->
4.311 </target>
4.312 - <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar" description="Build JAR." name="jar"/>
4.313 + <target depends="init,compile,-pre-jar,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/>
4.314 + <target depends="init,compile,-pre-jar,-do-jar,-post-jar" description="Build JAR." name="jar"/>
4.315 <!--
4.316 =================
4.317 EXECUTION SECTION
4.318 @@ -1181,7 +1187,7 @@
4.319 <target depends="-profile-check" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-test-with-main">
4.320 <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
4.321 <startprofiler/>
4.322 - <antcal target="run-test-with-main"/>
4.323 + <antcall target="run-test-with-main"/>
4.324 </target>
4.325 <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent">
4.326 <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
4.327 @@ -1203,11 +1209,14 @@
4.328 </not>
4.329 </and>
4.330 </condition>
4.331 - <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
4.332 + <condition else="" property="bug5101868workaround" value="*.java">
4.333 + <matches pattern="1\.[56](\..*)?" string="${java.version}"/>
4.334 + </condition>
4.335 + <javadoc additionalparam="-J-Dfile.encoding=${file.encoding} ${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
4.336 <classpath>
4.337 <path path="${javac.classpath}"/>
4.338 </classpath>
4.339 - <fileset dir="${src.dir}" excludes="*.java,${excludes}" includes="${includes}">
4.340 + <fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
4.341 <filename name="**/*.java"/>
4.342 </fileset>
4.343 <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
4.344 @@ -1281,7 +1290,7 @@
4.345 <mkdir dir="${build.test.results.dir}"/>
4.346 </target>
4.347 <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
4.348 - <j2seproject3:test testincludes="**/*Test.java"/>
4.349 + <j2seproject3:test includes="${includes}" testincludes="**/*Test.java"/>
4.350 </target>
4.351 <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
4.352 <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
5.1 --- a/java/dictionary-generator/nbproject/genfiles.properties Wed May 28 23:30:27 2014 +0200
5.2 +++ b/java/dictionary-generator/nbproject/genfiles.properties Mon Jun 22 21:59:38 2020 +0200
5.3 @@ -1,8 +1,8 @@
5.4 build.xml.data.CRC32=0fb53d62
5.5 -build.xml.script.CRC32=171efbd0
5.6 -build.xml.stylesheet.CRC32=28e38971@1.56.1.46
5.7 +build.xml.script.CRC32=37b2e9d9
5.8 +build.xml.stylesheet.CRC32=8064a381@1.80.1.48
5.9 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
5.10 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
5.11 nbproject/build-impl.xml.data.CRC32=0fb53d62
5.12 -nbproject/build-impl.xml.script.CRC32=c75bc2a9
5.13 -nbproject/build-impl.xml.stylesheet.CRC32=c6d2a60f@1.56.1.46
5.14 +nbproject/build-impl.xml.script.CRC32=b1b0b76b
5.15 +nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48
6.1 --- a/java/dictionary-generator/src/cz/frantovo/telco/dictionary/DocumentNamespaceContext.java Wed May 28 23:30:27 2014 +0200
6.2 +++ b/java/dictionary-generator/src/cz/frantovo/telco/dictionary/DocumentNamespaceContext.java Mon Jun 22 21:59:38 2020 +0200
6.3 @@ -4,8 +4,7 @@
6.4 *
6.5 * This program is free software: you can redistribute it and/or modify
6.6 * it under the terms of the GNU General Public License as published by
6.7 - * the Free Software Foundation, either version 3 of the License, or
6.8 - * (at your option) any later version.
6.9 + * the Free Software Foundation, version 3 of the License.
6.10 *
6.11 * This program is distributed in the hope that it will be useful,
6.12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
7.1 --- a/java/dictionary-generator/src/cz/frantovo/telco/dictionary/Functions.java Wed May 28 23:30:27 2014 +0200
7.2 +++ b/java/dictionary-generator/src/cz/frantovo/telco/dictionary/Functions.java Mon Jun 22 21:59:38 2020 +0200
7.3 @@ -4,8 +4,7 @@
7.4 *
7.5 * This program is free software: you can redistribute it and/or modify
7.6 * it under the terms of the GNU General Public License as published by
7.7 - * the Free Software Foundation, either version 3 of the License, or
7.8 - * (at your option) any later version.
7.9 + * the Free Software Foundation, version 3 of the License.
7.10 *
7.11 * This program is distributed in the hope that it will be useful,
7.12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
8.1 --- a/java/dictionary-generator/src/cz/frantovo/telco/dictionary/Generator.java Wed May 28 23:30:27 2014 +0200
8.2 +++ b/java/dictionary-generator/src/cz/frantovo/telco/dictionary/Generator.java Mon Jun 22 21:59:38 2020 +0200
8.3 @@ -4,8 +4,7 @@
8.4 *
8.5 * This program is free software: you can redistribute it and/or modify
8.6 * it under the terms of the GNU General Public License as published by
8.7 - * the Free Software Foundation, either version 3 of the License, or
8.8 - * (at your option) any later version.
8.9 + * the Free Software Foundation, version 3 of the License.
8.10 *
8.11 * This program is distributed in the hope that it will be useful,
8.12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
9.1 --- a/java/dictionary-generator/src/cz/frantovo/telco/dictionary/IndexEntry.java Wed May 28 23:30:27 2014 +0200
9.2 +++ b/java/dictionary-generator/src/cz/frantovo/telco/dictionary/IndexEntry.java Mon Jun 22 21:59:38 2020 +0200
9.3 @@ -4,8 +4,7 @@
9.4 *
9.5 * This program is free software: you can redistribute it and/or modify
9.6 * it under the terms of the GNU General Public License as published by
9.7 - * the Free Software Foundation, either version 3 of the License, or
9.8 - * (at your option) any later version.
9.9 + * the Free Software Foundation, version 3 of the License.
9.10 *
9.11 * This program is distributed in the hope that it will be useful,
9.12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10.1 --- a/java/dictionary-generator/src/cz/frantovo/telco/dictionary/MappedNamespaceContext.java Wed May 28 23:30:27 2014 +0200
10.2 +++ b/java/dictionary-generator/src/cz/frantovo/telco/dictionary/MappedNamespaceContext.java Mon Jun 22 21:59:38 2020 +0200
10.3 @@ -4,8 +4,7 @@
10.4 *
10.5 * This program is free software: you can redistribute it and/or modify
10.6 * it under the terms of the GNU General Public License as published by
10.7 - * the Free Software Foundation, either version 3 of the License, or
10.8 - * (at your option) any later version.
10.9 + * the Free Software Foundation, version 3 of the License.
10.10 *
10.11 * This program is distributed in the hope that it will be useful,
10.12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11.1 --- a/java/dictionary-generator/src/cz/frantovo/telco/dictionary/OneItemIterator.java Wed May 28 23:30:27 2014 +0200
11.2 +++ b/java/dictionary-generator/src/cz/frantovo/telco/dictionary/OneItemIterator.java Mon Jun 22 21:59:38 2020 +0200
11.3 @@ -4,8 +4,7 @@
11.4 *
11.5 * This program is free software: you can redistribute it and/or modify
11.6 * it under the terms of the GNU General Public License as published by
11.7 - * the Free Software Foundation, either version 3 of the License, or
11.8 - * (at your option) any later version.
11.9 + * the Free Software Foundation, version 3 of the License.
11.10 *
11.11 * This program is distributed in the hope that it will be useful,
11.12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12.1 --- a/java/dictionary-generator/src/cz/frantovo/telco/dictionary/SynonymsEntry.java Wed May 28 23:30:27 2014 +0200
12.2 +++ b/java/dictionary-generator/src/cz/frantovo/telco/dictionary/SynonymsEntry.java Mon Jun 22 21:59:38 2020 +0200
12.3 @@ -4,8 +4,7 @@
12.4 *
12.5 * This program is free software: you can redistribute it and/or modify
12.6 * it under the terms of the GNU General Public License as published by
12.7 - * the Free Software Foundation, either version 3 of the License, or
12.8 - * (at your option) any later version.
12.9 + * the Free Software Foundation, version 3 of the License.
12.10 *
12.11 * This program is distributed in the hope that it will be useful,
12.12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13.1 --- a/java/dictionary-generator/src/cz/frantovo/telco/dictionary/Xmlns.java Wed May 28 23:30:27 2014 +0200
13.2 +++ b/java/dictionary-generator/src/cz/frantovo/telco/dictionary/Xmlns.java Mon Jun 22 21:59:38 2020 +0200
13.3 @@ -4,8 +4,7 @@
13.4 *
13.5 * This program is free software: you can redistribute it and/or modify
13.6 * it under the terms of the GNU General Public License as published by
13.7 - * the Free Software Foundation, either version 3 of the License, or
13.8 - * (at your option) any later version.
13.9 + * the Free Software Foundation, version 3 of the License.
13.10 *
13.11 * This program is distributed in the hope that it will be useful,
13.12 * but WITHOUT ANY WARRANTY; without even the implied warranty of