diff --git a/examples/BasicServletDemo/src/java/BasicServletDemo/package-info.java b/examples/BasicServletDemo/src/java/BasicServletDemo/package-info.java index 4416ab3f46d3b27f114e71ccada0291eebd9e2a2..9dceaf637e8f572c8b71f94e8d1707ef260e3bb5 100644 --- a/examples/BasicServletDemo/src/java/BasicServletDemo/package-info.java +++ b/examples/BasicServletDemo/src/java/BasicServletDemo/package-info.java @@ -1,5 +1,5 @@ /** - * BasicServletDemo project using open-dis7 Java library: examples supporting the NPS MOVES MV3500 Networked Graphics course. + * BasicServletDemo project using opendis7 Java library: examples supporting the NPS MOVES MV3500 Networked Graphics course. * * @see java.lang.Package * @see <a href="https://stackoverflow.com/questions/22095487/why-is-package-info-java-useful">StackOverflow: why-is-package-info-java-useful</a> diff --git a/examples/DisDemo/nbproject/project.properties b/examples/DisDemo/nbproject/project.properties index fc4d35111e95d4fa1e2ad97d5b686bac1a67c83c..dd371e1bc0b1b8575db564f1c09ddb0b28205160 100644 --- a/examples/DisDemo/nbproject/project.properties +++ b/examples/DisDemo/nbproject/project.properties @@ -33,12 +33,12 @@ dist.jar=${dist.dir}/DisDemo.jar dist.javadoc.dir=${dist.dir}/javadoc endorsed.classpath= excludes= -file.reference.open-dis7-full.jar=../../lib/open-dis7-full.jar +file.reference.opendis7-full.jar=../../lib/opendis7-full.jar file.reference.srm-4.4.0.jar=lib/srm-4.4.0.jar includes=** jar.compress=false javac.classpath=\ - ${file.reference.open-dis7-full.jar} + ${file.reference.opendis7-full.jar} # Space-separated list of extra javac options javac.compilerargs=-Xlint:unchecked javac.deprecation=true diff --git a/examples/DisDemo/src/DisDemo/package-info.java b/examples/DisDemo/src/DisDemo/package-info.java index 6969463a1c8cb9f8501072a3257c0cafbc13a31d..9e99ae3f8cc8a7e46aa0a788f861652660cd037f 100644 --- a/examples/DisDemo/src/DisDemo/package-info.java +++ b/examples/DisDemo/src/DisDemo/package-info.java @@ -1,5 +1,5 @@ /** - * <p>DisDemo project using open-dis7 Java library: examples supporting the NPS MOVES MV3500 Networked Graphics course.</p> + * <p>DisDemo project using opendis7 Java library: examples supporting the NPS MOVES MV3500 Networked Graphics course.</p> * * <p>Example output is found in the * <a href="../../../../DisDemo/build.run.log.txt">build.run.log.txt</a> file.</p> diff --git a/examples/DisShooting/nbproject/project.properties b/examples/DisShooting/nbproject/project.properties index 68097a0ae978706d36edd357e76d4c618466bfdd..dd140177bd3a95b584c4af822702693a0d6f40a6 100644 --- a/examples/DisShooting/nbproject/project.properties +++ b/examples/DisShooting/nbproject/project.properties @@ -34,14 +34,14 @@ dist.jar=${dist.dir}/DisShooting.jar dist.javadoc.dir=${dist.dir}/javadoc endorsed.classpath= excludes= -file.reference.open-dis7-full.jar=../../lib/open-dis7-full.jar +file.reference.opendis7-full.jar=../../lib/opendis7-full.jar file.reference.srm-4.4.0.jar=lib/srm-4.4.0.jar includes=** jar.archive.disabled=${jnlp.enabled} jar.compress=false jar.index=${jnlp.enabled} javac.classpath=\ - ${file.reference.open-dis7-full.jar}:\ + ${file.reference.opendis7-full.jar}:\ ${file.reference.srm-4.4.0.jar} # Space-separated list of extra javac options javac.compilerargs= diff --git a/examples/DisShooting/src/DisShooting/package-info.java b/examples/DisShooting/src/DisShooting/package-info.java index 7dd333547ed6098f722757e5271021696a43ddda..6ab81a6072b020e190eb68930329acd419dba769 100644 --- a/examples/DisShooting/src/DisShooting/package-info.java +++ b/examples/DisShooting/src/DisShooting/package-info.java @@ -1,5 +1,5 @@ /** - * <p>DisShooting project using open-dis7 Java library: examples supporting the NPS MOVES MV3500 Networked Graphics course.</p> + * <p>DisShooting project using opendis7 Java library: examples supporting the NPS MOVES MV3500 Networked Graphics course.</p> * * <p>Example output is found in the * <a href="../../../../DisShooting/build.run.log.txt">build.run.log.txt</a> file.</p> diff --git a/examples/WebsocketGateway/nbproject/project.properties b/examples/WebsocketGateway/nbproject/project.properties index e9fc3e3c4ddc8648f7ee5ad7a2a59efb92217d0b..34dbaad695fe0f314a275800022aab05e88a5563 100644 --- a/examples/WebsocketGateway/nbproject/project.properties +++ b/examples/WebsocketGateway/nbproject/project.properties @@ -39,11 +39,10 @@ file.reference.jetty-servlet.jar=lib/jetty-servlet-9.4.31.v20200723.jar file.reference.jetty-util.jar=lib/jetty-util-9.4.31.v20200723.jar file.reference.jetty-webapp.jar=lib/jetty-webapp-9.4.31.v20200723.jar file.reference.jetty-xml.jar=lib/jetty-xml-9.4.31.v20200723.jar +file.reference.opendis7-full.jar=../../lib/opendis7-full.jar file.reference.servlet-api-3.1.jar=lib/servlet-api-3.1.jar file.reference.slf4j-api-1.7.5.jar=lib/slf4j-api-1.7.5.jar file.reference.slf4j-jdk14-1.7.30.jar=lib/slf4j-jdk14-1.7.30.jar -file.reference.open-dis7-enumerations-classes.jar=lib/dis/open-dis7-enumerations-classes.jar -file.reference.open-dis7-pdus-classes.jar=lib/dis/open-dis7-pdus-classes.jar file.reference.websocket-api.jar=lib/websocket/websocket-api-9.4.31.v20200723.jar file.reference.websocket-common.jar=lib/websocket/websocket-common-9.4.31.v20200723.jar file.reference.websocket-server.jar=lib/websocket/websocket-server-9.4.31.v20200723.jar @@ -57,12 +56,11 @@ javac.classpath=\ ${file.reference.jetty-server.jar}:\ ${file.reference.jetty-servlet.jar}:\ ${file.reference.jetty-webapp.jar}:\ - ${file.reference.open-dis7-enumerations-classes.jar}:\ - ${file.reference.open-dis7-pdus-classes.jar}:\ ${file.reference.servlet-api-3.1.jar}:\ ${file.reference.websocket-api.jar}:\ ${file.reference.websocket-servlet.jar}:\ - ${file.reference.websocket-server.jar} + ${file.reference.websocket-server.jar}:\ + ${file.reference.opendis7-full.jar} # Space-separated list of extra javac options javac.compilerargs=-Xlint:unchecked javac.deprecation=true diff --git a/examples/build.xml b/examples/build.xml index 3997a854f4ab4f7210863df3bf45ff24e68ffd80..1ffa49ebd08688e193dcee47792e939472bad0df 100644 --- a/examples/build.xml +++ b/examples/build.xml @@ -95,8 +95,8 @@ <nbbrowse url="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/tree/master/examples"/> </target> - <target name="view.open-dis7.javadoc" description="view open-dis7 javadoc documentation in web browser (via Netbeans only)"> - <echo message="https://savage.nps.edu/open-dis7-java/javadoc"/> - <nbbrowse url="https://savage.nps.edu/open-dis7-java/javadoc"/> + <target name="view.opendis7.javadoc" description="view opendis7 javadoc documentation in web browser (via Netbeans only)"> + <echo message="https://savage.nps.edu/opendis7-java/javadoc"/> + <nbbrowse url="https://savage.nps.edu/opendis7-java/javadoc"/> </target> </project> diff --git a/examples/nbproject/genfiles.properties b/examples/nbproject/genfiles.properties index 3741c764e2fc085a09c2895ed0ac34e92bfbfb6a..d711f95a38829448e5e8d26f2e87a1c3221065fb 100644 --- a/examples/nbproject/genfiles.properties +++ b/examples/nbproject/genfiles.properties @@ -3,6 +3,6 @@ build.xml.script.CRC32=b64626c8 build.xml.stylesheet.CRC32=f85dc8f2@1.91.1.48 # 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=e09aa35e -nbproject/build-impl.xml.script.CRC32=7c2cd7eb -nbproject/build-impl.xml.stylesheet.CRC32=d549e5cc@1.99.0.48 +nbproject/build-impl.xml.data.CRC32=ef6dc3cc +nbproject/build-impl.xml.script.CRC32=e75c0d85 +nbproject/build-impl.xml.stylesheet.CRC32=12e0a6c2@1.101.0.48 diff --git a/examples/nbproject/project.properties b/examples/nbproject/project.properties index 05bc4b376e0a667e9523f2b023235e86bb5d98c6..97b3a51fedf550924bb57af956dda4f6c8925578 100644 --- a/examples/nbproject/project.properties +++ b/examples/nbproject/project.properties @@ -38,18 +38,18 @@ endorsed.classpath= excludes= file.reference.dis-enums-1.3.jar=../lib/dis-enums-1.3.jar -file.reference.open-dis7-full.jar=../lib/open-dis7-full.jar +file.reference.opendis7-full.jar=../lib/opendis7-full.jar file.reference.open-dis_4.16.jar=../lib/open-dis_4.16.jar -#file.reference.open-dis7-enumerations-classes.jar=../lib/open-dis7-enumerations-classes.jar -#file.reference.open-dis7-pdus-classes.jar=../lib/open-dis7-pdus-classes.jar +#file.reference.opendis7-enumerations-classes.jar=../lib/opendis7-enumerations-classes.jar +#file.reference.opendis7-pdus-classes.jar=../lib/opendis7-pdus-classes.jar includes=** jar.compress=false javac.classpath=\ - ${file.reference.open-dis7-full.jar}:\ + ${file.reference.opendis7-full.jar}:\ ${file.reference.open-dis_4.16.jar}:\ ${file.reference.dis-enums-1.3.jar} -# ${file.reference.open-dis7-enumerations-classes.jar}:\ -# ${file.reference.open-dis7-pdus-classes.jar}:\ +# ${file.reference.opendis7-enumerations-classes.jar}:\ +# ${file.reference.opendis7-pdus-classes.jar}:\ # Space-separated list of extra javac options javac.compilerargs=-Xlint:deprecation -Xlint:unchecked @@ -59,8 +59,8 @@ javac.modulepath= javac.processormodulepath= javac.processorpath=\ ${javac.classpath} -javac.source=16 -javac.target=16 +javac.source=17 +javac.target=17 javac.test.classpath=\ ${javac.classpath}:\ ${build.classes.dir} @@ -76,7 +76,7 @@ javadoc.noindex=false javadoc.nonavbar=false javadoc.notree=false javadoc.private=false -#javadoc.reference.open-dis7-enumerations-classes.jar=../lib/open-dis7-enumerations-javadoc.jar +#javadoc.reference.opendis7-enumerations-classes.jar=../lib/opendis7-enumerations-javadoc.jar javadoc.splitindex=true javadoc.use=true javadoc.version=false @@ -103,7 +103,7 @@ run.test.classpath=\ run.test.modulepath=\ ${javac.test.modulepath} source.encoding=UTF-8 -#source.reference.open-dis7-enumerations-classes.jar=../lib/open-dis7-enumerations-source.jar +#source.reference.opendis7-enumerations-classes.jar=../lib/opendis7-enumerations-source.jar src.dir=src src.src.dir=DisDemo\\src src.src2.dir=DisShooting\\src diff --git a/examples/nbproject/project.xml b/examples/nbproject/project.xml index 35d0f85a1528b1c434a3ac57f77400f7e8d2b268..073e5685e69b44a5d01a212467cba725e0342a0e 100644 --- a/examples/nbproject/project.xml +++ b/examples/nbproject/project.xml @@ -17,6 +17,7 @@ <word>customizable</word> <word>deserialization</word> <word>instantiable</word> + <word>interpolators</word> <word>localhost</word> <word>marshalling</word> <word>multicast</word> diff --git a/examples/pduLog/ExamplePduCaptureLog.dislog b/examples/pduLog/ExamplePduCaptureLog.dislog deleted file mode 100644 index 6bef2500980837a1e623dffb8eab0a1f71eb5f2b..0000000000000000000000000000000000000000 --- a/examples/pduLog/ExamplePduCaptureLog.dislog +++ /dev/null @@ -1,74 +0,0 @@ -# Start, ENCODING_PLAINTEXT, 20210814_173156, DIS capture file, pduLog\PduCaptureLog2.dislog -[0,0,0,0,0,0,0,0],[7,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,63,-16,0,0,0,0,0,0,64,0,0,0,0,0,0,0,64,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65,108,108,80,100,117,83,101,110,100,101,0,0,0,0] # DisPduType 01 ENTITY_STATE -[0,0,0,0,1,93,-67,-104],[7,0,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 02 FIRE -[0,0,0,0,1,-7,8,72],[7,0,3,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 03 DETONATION -[0,0,0,0,2,50,81,32],[7,0,4,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 04 COLLISION -[0,0,0,0,2,93,-9,-68],[7,0,5,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 05 SERVICE_REQUEST -[0,0,0,0,2,122,-111,56],[7,0,6,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 06 RESUPPLY_OFFER -[0,0,0,0,2,-126,-99,96],[7,0,7,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 07 RESUPPLY_RECEIVED -[0,0,0,0,2,-120,45,-104],[7,0,8,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 08 RESUPPLY_CANCEL -[0,0,0,0,2,-117,-6,64],[7,0,9,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 09 REPAIR_COMPLETE -[0,0,0,0,2,-91,-90,-24],[7,0,10,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 10 REPAIR_RESPONSE -[0,0,0,0,2,-69,23,-108],[7,0,11,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 11 CREATE_ENTITY -[0,0,0,0,2,-54,-31,96],[7,0,12,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 12 REMOVE_ENTITY -[0,0,0,0,2,-49,27,104],[7,0,13,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 13 START_RESUME -[0,0,0,0,2,-32,-128,-120],[7,0,14,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 14 STOP_FREEZE -[0,0,0,0,2,-1,-93,-96],[7,0,15,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0] # DisPduType 15 ACKNOWLEDGE -[0,0,0,0,3,21,-126,116],[7,0,16,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 16 ACTION_REQUEST -[0,0,0,0,3,45,98,-12],[7,0,17,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 17 ACTION_RESPONSE -[0,0,0,0,3,65,92,60],[7,0,18,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 18 DATA_QUERY -[0,0,0,0,3,69,-60,-64],[7,0,19,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 19 SET_DATA -[0,0,0,0,3,75,25,52],[7,0,20,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 20 DATA -[0,0,0,0,3,80,68,64],[7,0,21,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 21 EVENT_REPORT -[0,0,0,0,3,94,-11,48],[7,0,22,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,1,0,0,0,-128,72,101,108,108,111,32,67,111,109,109,101,110,116,80,68,85,0,0,0,1,0,0,1,112,72,101,114,101,32,105,115,32,97,32,115,101,99,111,110,100,32,108,105,110,101,32,111,102,32,116,101,120,116,32,105,110,32,116,104,105,115,32,99,111,109,109,101,110,116,46,0,0] # DisPduType 22 COMMENT -[0,0,0,0,4,-11,8,-88],[7,0,23,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 23 ELECTROMAGNETIC_EMISSION -[0,0,0,0,5,6,70,84],[7,0,24,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 24 DESIGNATOR -[0,0,0,0,5,41,-124,52],[7,0,25,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 25 TRANSMITTER -[0,0,0,0,5,-60,-19,-64],[7,0,26,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,0,0,0,0,0,0] # DisPduType 26 SIGNAL -[0,0,0,0,5,-15,-53,-80],[7,0,27,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 27 RECEIVER -[0,0,0,0,6,11,-15,-44],[7,0,28,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 28 IDENTIFICATION_FRIEND_OR_FOE -[0,0,0,0,6,107,-107,8],[7,0,29,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 29 UNDERWATER_ACOUSTIC -[0,0,0,0,6,-121,-10,68],[7,0,30,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 30 SUPPLEMENTAL_EMISSION_ENTITY_STATE -[0,0,0,0,6,-115,42,-80],[7,0,31,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,0,0,0,0,0,0] # DisPduType 31 INTERCOM_SIGNAL -[0,0,0,0,6,-100,-47,-72],[7,0,32,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 32 INTERCOM_CONTROL -[0,0,0,0,6,-66,61,-8],[7,0,33,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 33 AGGREGATE_STATE -[0,0,0,0,7,25,44,24],[7,0,34,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 34 ISGROUPOF -[0,0,0,0,7,48,77,-108],[7,0,35,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 35 TRANSFER_OWNERSHIP -[0,0,0,0,7,92,46,0],[7,0,36,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 36 ISPARTOF -[0,0,0,0,7,-104,99,72],[7,0,37,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 37 MINEFIELD_STATE -[0,0,0,0,7,-6,51,-24],[7,0,38,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 38 MINEFIELD_QUERY -[0,0,0,0,8,10,73,124],[7,0,39,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 39 MINEFIELD_DATA -[0,0,0,0,8,24,-90,112],[7,0,40,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 40 MINEFIELD_RESPONSE_NACK -[0,0,0,0,8,29,73,-16],[7,0,41,9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 41 ENVIRONMENTAL_PROCESS -[0,0,0,0,8,66,73,-48],[7,0,42,9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 42 GRIDDED_DATA -[0,0,0,0,8,92,94,-60],[7,0,43,9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 43 POINT_OBJECT_STATE -[0,0,0,0,8,-59,113,-4],[7,0,44,9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 44 LINEAR_OBJECT_STATE -[0,0,0,0,8,-50,117,-52],[7,0,45,9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 45 AREAL_OBJECT_STATE -[0,0,0,0,8,-20,39,-64],[7,0,46,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 46 TIME_SPACE_POSITION_INFORMATION -[0,0,0,0,9,100,-111,36],[7,0,47,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 47 APPEARANCE -[0,0,0,0,9,119,65,32],[7,0,48,11,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 48 ARTICULATED_PARTS -[0,0,0,0,9,126,87,-8],[7,0,49,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 49 LIVE_ENTITY_FIRE -[0,0,0,0,9,-122,82,-16],[7,0,50,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 50 LIVE_ENTITY_DETONATION -[0,0,0,0,9,-86,-64,-72],[7,0,51,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 51 CREATE_ENTITY_RELIABLE -[0,0,0,0,9,-76,-125,-116],[7,0,52,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 52 REMOVE_ENTITY_RELIABLE -[0,0,0,0,9,-68,-60,112],[7,0,53,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 53 START_RESUME_RELIABLE -[0,0,0,0,9,-61,79,12],[7,0,54,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 54 STOP_FREEZE_RELIABLE -[0,0,0,0,9,-50,98,-4],[7,0,55,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0] # DisPduType 55 ACKNOWLEDGE_RELIABLE -[0,0,0,0,9,-42,124,-48],[7,0,56,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 56 ACTION_REQUEST_RELIABLE -[0,0,0,0,9,-31,42,104],[7,0,57,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 57 ACTION_RESPONSE_RELIABLE -[0,0,0,0,9,-21,-95,-76],[7,0,58,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 58 DATA_QUERY_RELIABLE -[0,0,0,0,9,-6,62,-72],[7,0,59,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 59 SET_DATA_RELIABLE -[0,0,0,0,10,2,74,-32],[7,0,60,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 60 DATA_RELIABLE -[0,0,0,0,10,12,-88,0],[7,0,61,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 61 EVENT_REPORT_RELIABLE -[0,0,0,0,10,22,-105,92],[7,0,62,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 62 COMMENT_RELIABLE -[0,0,0,0,10,26,-6,-52],[7,0,63,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 63 RECORD_RELIABLE -[0,0,0,0,10,54,-76,-40],[7,0,64,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 64 SET_RECORD_RELIABLE -[0,0,0,0,10,62,73,120],[7,0,65,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 65 RECORD_QUERY_RELIABLE -[0,0,0,0,10,81,92,-84],[7,0,66,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 66 COLLISION_ELASTIC -[0,0,0,0,10,87,-28,-116],[7,0,67,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 67 ENTITY_STATE_UPDATE -[0,0,0,0,10,93,64,8],[7,0,68,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 68 DIRECTED_ENERGY_FIRE -[0,0,0,0,10,-118,-59,40],[7,0,69,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 69 ENTITY_DAMAGE_STATUS -[0,0,0,0,10,-113,-122,-68],[7,0,70,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 70 INFORMATION_OPERATIONS_ACTION -[0,0,0,0,12,120,-36,-88],[7,0,71,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0] # DisPduType 71 INFORMATION_OPERATIONS_REPORT -[0,0,0,0,12,-114,53,-28],[7,0,72,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0] # DisPduType 72 ATTRIBUTE -# Finish, ENCODING_PLAINTEXT, 20210814_173309, DIS capture file, pduLog\PduCaptureLog2.dislog diff --git a/examples/src/HttpServletExamples/package-info.java b/examples/src/HttpServletExamples/package-info.java index dedf2ef972c9c50f5cca6d776a7cf8ae52e394df..6edc909860310326ed38eaf0d433f18046d041af 100644 --- a/examples/src/HttpServletExamples/package-info.java +++ b/examples/src/HttpServletExamples/package-info.java @@ -1,5 +1,5 @@ /** - * open-dis7 Http Servlet Java examples supporting the NPS MOVES MV3500 Networked Graphics course. + * opendis7 Http Servlet Java examples supporting the NPS MOVES MV3500 Networked Graphics course. * * @see <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/tree/master/examples">NetworkedGraphicsMV3500 examples</a> * @see java.lang.Package diff --git a/examples/src/OpenDis4Examples/EspduSender.java b/examples/src/OpenDis4Examples/EspduSender.java index ed43dc4562f55934869740fb799d86a5828d73e8..62b466a4f4b16bb177793b3c38d84429d62a99f6 100644 --- a/examples/src/OpenDis4Examples/EspduSender.java +++ b/examples/src/OpenDis4Examples/EspduSender.java @@ -22,11 +22,14 @@ public class EspduSender { /** Type of network connection */ public enum NetworkMode { - /** @see <a href="https://en.wikipedia.org/wiki/Unicast">https://en.wikipedia.org/wiki/Unicast</a> */ + /** Unicast network mode + * @see <a href="https://en.wikipedia.org/wiki/Unicast">https://en.wikipedia.org/wiki/Unicast</a> */ UNICAST, - /** @see <a href="https://en.wikipedia.org/wiki/Multicast">https://en.wikipedia.org/wiki/Multicast</a> */ + /** Multicast network mode + * @see <a href="https://en.wikipedia.org/wiki/Multicast">https://en.wikipedia.org/wiki/Multicast</a> */ MULTICAST, - /** @see <a href="https://en.wikipedia.org/wiki/Broadcasting_(networking)">https://en.wikipedia.org/wiki/Broadcasting_(networking)</a> */ + /** Broadcast network mode + * @see <a href="https://en.wikipedia.org/wiki/Broadcasting_(networking)">https://en.wikipedia.org/wiki/Broadcasting_(networking)</a> */ BROADCAST }; diff --git a/examples/src/OpenDis7Examples/AllPduReceiver.java b/examples/src/OpenDis7Examples/AllPduReceiver.java index 1c22fd5ad3c6605c40549c1e22db957dab403443..b88e6096de9e5a80b60be16eac5b96373f3d287c 100644 --- a/examples/src/OpenDis7Examples/AllPduReceiver.java +++ b/examples/src/OpenDis7Examples/AllPduReceiver.java @@ -13,9 +13,11 @@ import java.util.List; /** Listen to all kinds of PDUs and report them */ public class AllPduReceiver { - /** @see <a href="https://en.wikipedia.org/wiki/Multicast_address">https://en.wikipedia.org/wiki/Multicast_address</a> */ + /** default multicast address + * @see <a href="https://en.wikipedia.org/wiki/Multicast_address">https://en.wikipedia.org/wiki/Multicast_address</a> */ public static final String DEFAULT_MULTICAST_ADDRESS = AllPduSender.DEFAULT_MULTICAST_ADDRESS; - /** @see <a href="https://en.wikipedia.org/wiki/Port_(computer_networking)">https://en.wikipedia.org/wiki/Port_(computer_networking)</a> */ + /** default multicast port + * @see <a href="https://en.wikipedia.org/wiki/Port_(computer_networking)">https://en.wikipedia.org/wiki/Port_(computer_networking)</a> */ public static final int DEFAULT_MULTICAST_PORT = AllPduSender.DEFAULT_MULTICAST_PORT; /** TODO whether to use Fast ESPDU */ public static final boolean USE_FAST_ESPDU = false; diff --git a/examples/src/OpenDis7Examples/ExampleSimulationProgram.java b/examples/src/OpenDis7Examples/ExampleSimulationProgram.java index fcf13fc7100006c235bc5ac78cbfefde677ab6c7..3b3ee40842d3f452706fee2f898c0a51b5330102 100644 --- a/examples/src/OpenDis7Examples/ExampleSimulationProgram.java +++ b/examples/src/OpenDis7Examples/ExampleSimulationProgram.java @@ -27,7 +27,7 @@ import java.util.logging.Logger; */ public class ExampleSimulationProgram { - protected boolean verboseComments = true; + private boolean verboseComments = true; static final String NETWORK_ADDRESS_DEFAULT = "239.1.2.3"; static final int NETWORK_PORT_DEFAULT = 3000; String networkAddress = NETWORK_ADDRESS_DEFAULT; @@ -43,7 +43,7 @@ public class ExampleSimulationProgram double simulationTime; /** - * Output prefix to help with logging by identifying this class (overridden in subclass). + * Output prefix to help with logging by identifying this class (can be overridden in subclass). */ protected static String TRACE_PREFIX; @@ -51,15 +51,23 @@ public class ExampleSimulationProgram DisTime.TimestampStyle timestampStyle = DisTime.TimestampStyle.IEEE_ABSOLUTE; PduFactory pduFactory = new PduFactory(timestampStyle); - + + /** EntityID settings for entity 1 */ protected EntityID entityID_1 = new EntityID(); + /** EntityID settings for entity 2 */ protected EntityID entityID_2 = new EntityID(); + /** ESPDU for entity 1 */ protected EntityStatePdu entityStatePdu_1 = pduFactory.makeEntityStatePdu(); + /** ESPDU for entity 2 */ protected EntityStatePdu entityStatePdu_2 = pduFactory.makeEntityStatePdu(); - protected FirePdu firePdu_1a = pduFactory.makeFirePdu(); // for entity 1 first weapon (if any) -// protected FirePdu firePdu_1b = pduFactory.makeFirePdu(); // for entity 1 second weapon (if any) + /** FirePdu for entity 1 first weapon (if any) */ + protected FirePdu firePdu_1a = pduFactory.makeFirePdu(); + /** FirePdu for entity 1 second weapon (if any) */ + protected FirePdu firePdu_1b = pduFactory.makeFirePdu(); + /** MunitionDescriptor for these weapons */ protected MunitionDescriptor munitionDescriptor1 = new MunitionDescriptor(); + /** this class instantiated as an object */ SimulationManager simulationManager = new SimulationManager(); /** Get ready, get set... initialize simulation entities @@ -259,6 +267,7 @@ public class ExampleSimulationProgram } /** + * get current networkAddress as a string * @return the networkAddress */ public String getNetworkAddress() @@ -266,6 +275,7 @@ public class ExampleSimulationProgram return networkAddress; } /** + * set current networkAddress using a string * @param newNetworkAddress the networkAddress to set */ public final void setNetworkAddress(String newNetworkAddress) @@ -274,6 +284,7 @@ public class ExampleSimulationProgram } /** + * get current networkPort * @return the networkPort */ public int getNetworkPort() @@ -281,6 +292,7 @@ public class ExampleSimulationProgram return networkPort; } /** + * set current networkPort * @param newNetworkPort the networkPort to set */ public final void setNetworkPort(int newNetworkPort) @@ -421,6 +433,7 @@ public class ExampleSimulationProgram } /** + * test for verboseComments mode * @return whether verboseComments mode is enabled */ public boolean isVerboseComments() { @@ -428,6 +441,7 @@ public class ExampleSimulationProgram } /** + * set verboseComments mode * @param newVerboseComments whether verboseComments mode is enabled */ public void setVerboseComments(boolean newVerboseComments) { diff --git a/examples/src/OpenDis7Examples/PduReaderPlayer.java b/examples/src/OpenDis7Examples/PduReaderPlayer.java index 4c467bf3a505fca2e399cfbcc6993af5982b6829..71c1786c24f67c8cf5aefe1acfa080b51285f468 100644 --- a/examples/src/OpenDis7Examples/PduReaderPlayer.java +++ b/examples/src/OpenDis7Examples/PduReaderPlayer.java @@ -25,7 +25,8 @@ public class PduReaderPlayer /** Default multicast group address we send on. * @see <a href="https://en.wikipedia.org/wiki/Multicast_address">https://en.wikipedia.org/wiki/Multicast_address</a> */ public static final String DEFAULT_MULTICAST_ADDRESS = AllPduSender.DEFAULT_MULTICAST_ADDRESS; - /** @see <a href="https://en.wikipedia.org/wiki/Port_(computer_networking)">https://en.wikipedia.org/wiki/Port_(computer_networking)</a> */ + /** Default multicast port + * @see <a href="https://en.wikipedia.org/wiki/Port_(computer_networking)">https://en.wikipedia.org/wiki/Port_(computer_networking)</a> */ public static final int DEFAULT_MULTICAST_PORT = AllPduSender.DEFAULT_MULTICAST_PORT; private enum mystate diff --git a/examples/src/OpenDis7Examples/PduTrack.java b/examples/src/OpenDis7Examples/PduTrack.java index 0f2624cabc5e7ef5b147ba306f6dd7d7c7a10457..fa94e7bdb0d450a4525bbaa9f748070b30df53f6 100644 --- a/examples/src/OpenDis7Examples/PduTrack.java +++ b/examples/src/OpenDis7Examples/PduTrack.java @@ -31,7 +31,7 @@ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -// TODO move into open-dis7 distribution tree in package edu.nps.moves.dis7.utilities.stream; +// TODO move into opendis7 distribution tree in package edu.nps.moves.dis7.utilities.stream; package OpenDis7Examples; @@ -84,14 +84,17 @@ public class PduTrack private String x3dPositionInterpolatorDEF = new String(); private String x3dOrientationInterpolatorDEF = new String(); private boolean addLineBreaksWithinKeyValues = false; - + /** what kind of timestamp is being used */ public DisTime.TimestampStyle timestampStyle = DisTime.TimestampStyle.IEEE_ABSOLUTE; + /** direct access to pduFactory for creating new PDU instances */ protected PduFactory pduFactory = new PduFactory(timestampStyle); private LocalDateTime recordingStart; private LocalDateTime recordingStop; private String todaysDateString = new String(); + /** direct access to byteArrayOutputStream */ protected ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); + /** direct access to DataOutputStream */ protected DataOutputStream dataOutputStream = new DataOutputStream(byteArrayOutputStream); private String TRACE_PREFIX = "[" + (PduTrack.class.getSimpleName()) + "] "; @@ -161,6 +164,7 @@ public class PduTrack } /** + * Determine initial location, reset to (0 0 0) if not found * @return current initialLocation */ public Vector3Double getInitialLocation() { @@ -172,6 +176,7 @@ public class PduTrack return initialLocation; } /** + * Determine current location, reset to (0 0 0) if not found * @return current latestLocation */ public Vector3Double getLatestLocation() { @@ -197,18 +202,21 @@ public class PduTrack return pduList.get(index); } /** + * get current pduList * @return current pduList */ public ArrayList<Pdu> getPduList() { return pduList; } /** + * get current waypointsList * @return current waypointsList */ public ArrayList<Vector3Double> getWaypointsList() { return waypointsList; } /** + * current eulerAnglesList * @return current eulerAnglesList */ public ArrayList<EulerAngles> getEulerAnglesList() { @@ -470,6 +478,10 @@ public class PduTrack } return this; } + /** + * Utility method to create TimeSensor + * @return TimeSensor string in XML format + */ public String createX3dTimeSensorString() { StringBuilder sb = new StringBuilder(); @@ -746,6 +758,7 @@ public class PduTrack } /** + * get defaultWaypointInterval * @return current wayPointInterval */ public float getDefaultWaypointInterval() { @@ -778,16 +791,17 @@ public class PduTrack } return this; } - /** whether or not to insert commas between hex values - * */ + /** whether or not to insert commas between hex values */ private boolean insertCommas = true; /** + * determine whether comma insertion is turned on * @return whether or not to insert commas between hex values */ public boolean hasInsertCommas() { return insertCommas; } /** + * set whether comma insertion is turned on * @param insertCommas the insertCommas value to set */ public void setInsertCommas(boolean insertCommas) { diff --git a/examples/src/OpenDis7Examples/SimulationManager.java b/examples/src/OpenDis7Examples/SimulationManager.java index 3e18ef8ec2e140dc2695aa24d24cd7954821dfb8..7eb0abf4f4ad11e80d8c16c382f0e6f4c4469a19 100644 --- a/examples/src/OpenDis7Examples/SimulationManager.java +++ b/examples/src/OpenDis7Examples/SimulationManager.java @@ -31,7 +31,7 @@ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -// TODO move into open-dis7 distribution tree +// TODO move into opendis7 distribution tree package OpenDis7Examples; @@ -163,7 +163,7 @@ public class SimulationManager * Utility constructor for new record, description and reference remain blank * @param id identifying number * @param name common name - * @param isHostType + * @param isHostType whether or not this record is for a host */ public RecordType (int id, String name, boolean isHostType) { @@ -186,6 +186,7 @@ public class SimulationManager } /** + * get record id * @return the id */ public int getId() { @@ -193,6 +194,7 @@ public class SimulationManager } /** + * set record id * @param newID the id to set * @return same object to permit progressive setters */ @@ -202,6 +204,7 @@ public class SimulationManager } /** + * get record name * @return the name */ public String getName() { @@ -209,6 +212,7 @@ public class SimulationManager } /** + * set record name * @param newName the name to set * @return same object to permit progressive setters */ @@ -218,6 +222,7 @@ public class SimulationManager } /** + * get record description * @return the description */ public String getDescription() { @@ -225,6 +230,7 @@ public class SimulationManager } /** + * set record description * @param newDescription the description to set * @return same object to permit progressive setters */ @@ -234,6 +240,7 @@ public class SimulationManager } /** + * get record reference * @return the reference */ public String getReference() { @@ -241,6 +248,7 @@ public class SimulationManager } /** + * set record reference * @param newReference the reference to set * @return same object to permit progressive setters */ @@ -250,6 +258,7 @@ public class SimulationManager } /** + * get record alias name * @return the alias */ public String getAlias() { @@ -257,6 +266,7 @@ public class SimulationManager } /** + * set record alias name * @param alias the alias to set * @return same object to permit progressive setters */ @@ -445,6 +455,7 @@ public class SimulationManager } /** * Check for disThreadedNetworkInterface + * @return whether singleton disThreadedNetworkInterface has been instantiated */ protected boolean hasDisThreadedNetworkInterface() { diff --git a/examples/src/OpenDis7Examples/package-info.java b/examples/src/OpenDis7Examples/package-info.java index b29dde21cdfc777b8a687b037305ae242cfbcc95..d3e5e61a77e349a54b4ec5a1414679df87275a5b 100644 --- a/examples/src/OpenDis7Examples/package-info.java +++ b/examples/src/OpenDis7Examples/package-info.java @@ -1,5 +1,5 @@ /** - * open-dis7 Java examples supporting the NPS MOVES MV3500 Networked Graphics course. + * opendis7 Java examples supporting the NPS MOVES MV3500 Networked Graphics course. * * @see <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/tree/master/examples">NetworkedGraphicsMV3500 examples</a> * @see java.lang.Package