project update

MANIFEST.MF

-Manifest-Version: 1.0
-Ant-Version: Apache Ant 1.10.7
-Created-By: 14+36-1461 (Oracle Corporation)
-Built-By: open-dis-7-java
-Specification-Title: DIS 7 Class Library
-Specification-Version: 7.0
-Specification-Vendor: Naval Postgraduate School
-Implementation-Title: edu.nps.moves.dis7
-Implementation-Version: build01
-Implementation-Vendor: Naval Postgraduate School
-Sealed: false
-
-Name: edu/nps/moves/dis7
-Sealed: true
-
-Name: edu/nps/moves/dis7/enumerations
-Sealed: true
-
-Name: edu/nps/moves/dis7/jammers
-Sealed: true
-
-Name: edu/nps/moves/dis7/objecttypes
-Sealed: true

nbproject/build-impl.xml

@@ -217,7 +217,6 @@ is divided into following sections:
         <condition property="have.tests">
             <or>
                 <available file="${test.src.dir}"/>
-                <available file="${test.dist.dir}"/>
             </or>
         </condition>
         <condition property="have.sources">
@@ -315,7 +314,6 @@ is divided into following sections:
         <fail unless="src.dir">Must set src.dir</fail>
         <fail unless="src.src-generated.dir">Must set src.src-generated.dir</fail>
         <fail unless="test.src.dir">Must set test.src.dir</fail>
-        <fail unless="test.dist.dir">Must set test.dist.dir</fail>
         <fail unless="build.dir">Must set build.dir</fail>
         <fail unless="dist.dir">Must set dist.dir</fail>
         <fail unless="build.classes.dir">Must set build.classes.dir</fail>
@@ -617,9 +615,6 @@ is divided into following sections:
                             <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
                                 <filename name="@{testincludes}"/>
                             </fileset>
-                            <fileset dir="${test.dist.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
-                                <filename name="@{testincludes}"/>
-                            </fileset>
                             <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
                                 <filename name="${test.binarytestincludes}"/>
                             </fileset>
@@ -646,9 +641,6 @@ is divided into following sections:
                     <fileset dir="${test.src.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
                         <filename name="@{testincludes}"/>
                     </fileset>
-                    <fileset dir="${test.dist.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
-                        <filename name="@{testincludes}"/>
-                    </fileset>
                 </union>
                 <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
                 <testng classfilesetref="test.set" failureProperty="tests.failed" jvm="${platform.java}" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="open-dis7-java" testname="TestNG tests" workingDir="${work.dir}">
@@ -1589,14 +1581,14 @@ is divided into following sections:
         <!-- You can override this target in the ../build.xml file. -->
     </target>
     <target depends="-init-source-module-properties" if="named.module.internal" name="-init-test-javac-module-properties-with-module">
-        <j2seproject3:modulename property="test.module.name" sourcepath="${test.src.dir}:${test.dist.dir}"/>
-        <condition else="${empty.dir}" property="javac.test.sourcepath" value="${test.src.dir}:${test.dist.dir}">
+        <j2seproject3:modulename property="test.module.name" sourcepath="${test.src.dir}"/>
+        <condition else="${empty.dir}" property="javac.test.sourcepath" value="${test.src.dir}">
             <and>
                 <isset property="test.module.name"/>
                 <length length="0" string="${test.module.name}" when="greater"/>
             </and>
         </condition>
-        <condition else="--patch-module ${module.name}=${test.src.dir}:${test.dist.dir} --add-reads ${module.name}=ALL-UNNAMED" property="javac.test.compilerargs" value="--add-reads ${test.module.name}=ALL-UNNAMED">
+        <condition else="--patch-module ${module.name}=${test.src.dir} --add-reads ${module.name}=ALL-UNNAMED" property="javac.test.compilerargs" value="--add-reads ${test.module.name}=ALL-UNNAMED">
             <and>
                 <isset property="test.module.name"/>
                 <length length="0" string="${test.module.name}" when="greater"/>
@@ -1637,17 +1629,16 @@ is divided into following sections:
     </target>
     <target depends="-init-test-javac-module-properties-with-module,-init-test-module-properties-without-module" name="-init-test-module-properties"/>
     <target if="do.depend.true" name="-compile-test-depend">
-        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}:${test.dist.dir}"/>
+        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
     </target>
     <target depends="init,deps-jar,compile,-init-test-module-properties,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
-        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" modulepath="${javac.test.modulepath}" processorpath="${javac.test.processorpath}" sourcepath="${javac.test.sourcepath}" srcdir="${test.src.dir}:${test.dist.dir}">
+        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" modulepath="${javac.test.modulepath}" processorpath="${javac.test.processorpath}" sourcepath="${javac.test.sourcepath}" srcdir="${test.src.dir}">
             <customize>
                 <compilerarg line="${javac.test.compilerargs}"/>
             </customize>
         </j2seproject3:javac>
         <copy todir="${build.test.classes.dir}">
             <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-            <fileset dir="${test.dist.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
         </copy>
     </target>
     <target name="-post-compile-test">
@@ -1662,14 +1653,13 @@ is divided into following sections:
     <target depends="init,deps-jar,compile,-init-test-module-properties,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
         <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
-        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}, module-info.java" modulepath="${javac.test.modulepath}" processorpath="${javac.test.processorpath}" sourcepath="${test.src.dir}:${test.dist.dir}" srcdir="${test.src.dir}:${test.dist.dir}">
+        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}, module-info.java" modulepath="${javac.test.modulepath}" processorpath="${javac.test.processorpath}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}">
             <customize>
                 <compilerarg line="${javac.test.compilerargs}"/>
             </customize>
         </j2seproject3:javac>
         <copy todir="${build.test.classes.dir}">
             <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-            <fileset dir="${test.dist.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
         </copy>
     </target>
     <target name="-post-compile-test-single">

nbproject/project.properties

@@ -45,16 +45,18 @@ file.reference.junit-platform-console-1.6.2.jar=testlibs/junit-platform-console-
 file.reference.junit-platform-engine-1.6.2.jar=testlibs/junit-platform-engine-1.6.2.jar
 file.reference.junit-platform-launcher-1.6.2.jar=testlibs/junit-platform-launcher-1.6.2.jar
 file.reference.junit-platform-reporting-1.6.2.jar=testlibs/junit-platform-reporting-1.6.2.jar
-file.reference.open-dis7-enumerations-classes.jar=dist/open-dis7-enumerations-classes.jar
+file.reference.open-dis7-java-src=src
+file.reference.open-dis7-java-src-generated=src-generated
 file.reference.opentest4j-1.2.0.jar=testlibs/opentest4j-1.2.0.jar
 includes=**
 jar.archive.disabled=${jnlp.enabled}
 jar.compress=false
 jar.index=${jnlp.enabled}
 javac.classpath=\
+    ${file.reference.open-dis7-java-src}:\
+    ${file.reference.open-dis7-java-src-generated}:\
     ${file.reference.commons-io-2.6.jar}:\
-    ${file.reference.guava-28.0-jre.jar}:\
-    ${file.reference.open-dis7-enumerations-classes.jar}
+    ${file.reference.guava-28.0-jre.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=-Xlint:unchecked
 javac.deprecation=true
@@ -70,7 +72,9 @@ javac.test.classpath=\
     ${build.classes.dir}:\
     ${libs.junit_5.classpath}:\
     ${file.reference.apiguardian-api-1.1.0.jar}:\
-    ${libs.hamcrest.classpath}
+    ${libs.hamcrest.classpath}:\
+    ${file.reference.open-dis7-java-src}:\
+    ${file.reference.open-dis7-java-src-generated}
 javac.test.modulepath=\
     ${javac.modulepath}
 javac.test.processorpath=\
@@ -83,7 +87,6 @@ javadoc.noindex=false
 javadoc.nonavbar=false
 javadoc.notree=false
 javadoc.private=false
-javadoc.reference.open-dis7-enumerations-classes.jar=dist/open-dis7-enumerations-javadoc.jar
 javadoc.splitindex=true
 javadoc.use=true
 javadoc.version=false
@@ -133,13 +136,12 @@ run.test.classpath=\
     ${file.reference.junit-platform-engine-1.6.2.jar}:\
     ${file.reference.junit-platform-launcher-1.6.2.jar}:\
     ${file.reference.junit-platform-reporting-1.6.2.jar}:\
-    ${file.reference.opentest4j-1.2.0.jar}
+    ${file.reference.opentest4j-1.2.0.jar}:\
+    ${file.reference.open-dis7-java-src}:\
+    ${file.reference.open-dis7-java-src-generated}
 run.test.modulepath=\
     ${javac.test.modulepath}
 source.encoding=UTF-8
-source.reference.open-dis7-enumerations-classes.jar=dist/open-dis7-enumerations-source.jar
 src.dir=src
 src.src-generated.dir=src-generated
-test.dist.dir=dist
 test.src.dir=test
-manifest.file=MANIFEST.MF

nbproject/project.xml

@@ -11,7 +11,6 @@
             </source-roots>
             <test-roots>
                 <root id="test.src.dir"/>
-                <root id="test.dist.dir"/>
             </test-roots>
         </data>
         <spellchecker-wordlist xmlns="http://www.netbeans.org/ns/spellchecker-wordlist/1">

src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/Cross_Eye/Cross_Eye.java

-package edu.nps.moves.dis7.jammers.Deception.Angle.Cross_Eye;
-
-import edu.nps.moves.dis7.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * SISO-REF-010-v28, 2020-05-07
- *
- * Jamming technique uid: 284
- */
-public class Cross_Eye extends JammingTechnique
-{
-    public Cross_Eye()
-    {
-        setKind((byte)2); // Deception
-        setCategory((byte)10); // Angle
-        setSubCategory((byte)15); // Cross-Eye
-    }
-}

src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/Cross_Polarization/Cross_Polarization.java

-package edu.nps.moves.dis7.jammers.Deception.Angle.Cross_Polarization;
-
-import edu.nps.moves.dis7.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * SISO-REF-010-v28, 2020-05-07
- *
- * Jamming technique uid: 284
- */
-public class Cross_Polarization extends JammingTechnique
-{
-    public Cross_Polarization()
-    {
-        setKind((byte)2); // Deception
-        setCategory((byte)10); // Angle
-        setSubCategory((byte)20); // Cross-Polarization
-    }
-}

src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/Sea_Bounced/Sea_Bounced.java

-package edu.nps.moves.dis7.jammers.Deception.Angle.Sea_Bounced;
-
-import edu.nps.moves.dis7.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * SISO-REF-010-v28, 2020-05-07
- *
- * Jamming technique uid: 284
- */
-public class Sea_Bounced extends JammingTechnique
-{
-    public Sea_Bounced()
-    {
-        setKind((byte)2); // Deception
-        setCategory((byte)10); // Angle
-        setSubCategory((byte)35); // Sea-Bounced
-    }
-}