Skip to content
Snippets Groups Projects
Commit c3b7c5df authored by Terry D. Norbraten's avatar Terry D. Norbraten
Browse files

Merge origin/master

parents 694d8dd4 18a4cfe7
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
assignments/build.xml
+ 3
− 3
View file @ c3b7c5df
...@@ -130,9 +130,9 @@ POSSIBILITY OF SUCH DAMAGE. ...@@ -130,9 +130,9 @@ POSSIBILITY OF SUCH DAMAGE.
</target> </target>
<!-- ensure backwards compatibility of produced jar to specified version of Java, though project itself may be higher --> <!-- ensure backwards compatibility of produced jar to specified version of Java, though project itself may be higher -->
<property name="java.source" value="17"/><!-- LTS --> <!-- <property name="java.source" value="21"/>LTS -->
<property name="java.target" value="17"/><!-- LTS --> <!-- <property name="java.target" value="21"/>LTS -->
<property name="java.release" value="17"/><!-- LTS --><!-- simpler, less verbose than -source -target --> <!-- <property name="java.release" value="21"/>LTS --><!-- simpler, less verbose than -source -target -->
<property name="dist.javadoc.dir" value="dist/javadoc"/> <property name="dist.javadoc.dir" value="dist/javadoc"/>
<property name="javadoc.additionalparam" value=""/> <property name="javadoc.additionalparam" value=""/>
......
assignments/nbproject/project.xml
+ 44
− 43
View file @ c3b7c5df
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://www.netbeans.org/ns/project/1"> <project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.java.j2seproject</type> <type>org.netbeans.modules.java.j2seproject</type>
<configuration> <configuration>
<data xmlns="http://www.netbeans.org/ns/j2se-project/3"> <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
<name>Networked Graphics MV3500 assignments</name> <name>Networked Graphics MV3500 assignments</name>
<source-roots> <explicit-platform explicit-source-supported="true"/>
<root id="src.dir"/> <source-roots>
</source-roots> <root id="src.dir"/>
<test-roots> </source-roots>
<root id="test.src.dir"/> <test-roots>
</test-roots> <root id="test.src.dir"/>
</data> </test-roots>
<spellchecker-wordlist xmlns="http://www.netbeans.org/ns/spellchecker-wordlist/1"> </data>
<word>accessor</word> <spellchecker-wordlist xmlns="http://www.netbeans.org/ns/spellchecker-wordlist/1">
<word>autogeneration</word> <word>accessor</word>
<word>classpath</word> <word>autogeneration</word>
<word>Cygwin</word> <word>classpath</word>
<word>deliverables</word> <word>Cygwin</word>
<word>docx</word> <word>deliverables</word>
<word>https</word> <word>docx</word>
<word>interarrival</word> <word>https</word>
<word>javadoc</word> <word>interarrival</word>
<word>localhost</word> <word>javadoc</word>
<word>multicast</word> <word>localhost</word>
<word>Netbeans</word> <word>multicast</word>
<word>netcat</word> <word>Netbeans</word>
<word>NPS</word> <word>netcat</word>
<word>pdu</word> <word>NPS</word>
<word>README</word> <word>pdu</word>
<word>simkit</word> <word>README</word>
<word>simulationists</word> <word>simkit</word>
<word>SISO</word> <word>simulationists</word>
<word>subpackage</word> <word>SISO</word>
<word>teardown</word> <word>subpackage</word>
<word>txt</word> <word>teardown</word>
<word>UML</word> <word>txt</word>
<word>unicast</word> <word>UML</word>
<word>wikipedia</word> <word>unicast</word>
<word>Wireshark</word> <word>wikipedia</word>
</spellchecker-wordlist> <word>Wireshark</word>
</configuration> </spellchecker-wordlist>
</project> </configuration>
</project>
examples/build.xml
+ 3
− 3
View file @ c3b7c5df
...@@ -134,9 +134,9 @@ POSSIBILITY OF SUCH DAMAGE. ...@@ -134,9 +134,9 @@ POSSIBILITY OF SUCH DAMAGE.
</target> </target>
<!-- ensure backwards compatibility of produced jar to specified version of Java, though project itself may be higher --> <!-- ensure backwards compatibility of produced jar to specified version of Java, though project itself may be higher -->
<property name="java.source" value="17"/><!-- LTS --> <!-- <property name="java.source" value="21"/>LTS -->
<property name="java.target" value="17"/><!-- LTS --> <!-- <property name="java.target" value="21"/>LTS -->
<property name="java.release" value="17"/><!-- LTS --><!-- simpler, less verbose than -source -target --> <!-- <property name="java.release" value="21"/>LTS --><!-- simpler, less verbose than -source -target -->
<property name="dist.javadoc.dir" value="dist/javadoc"/> <property name="dist.javadoc.dir" value="dist/javadoc"/>
<property name="javadoc.additionalparam" value=""/> <property name="javadoc.additionalparam" value=""/>
......
examples/nbproject/project.xml
+ 92
− 91
View file @ c3b7c5df
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://www.netbeans.org/ns/project/1"> <project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.java.j2seproject</type> <type>org.netbeans.modules.java.j2seproject</type>
<configuration> <configuration>
<data xmlns="http://www.netbeans.org/ns/j2se-project/3"> <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
<name>Networked Graphics MV3500 examples</name> <name>Networked Graphics MV3500 examples</name>
<source-roots> <explicit-platform explicit-source-supported="true"/>
<root id="src.dir"/> <source-roots>
<root id="src.src.dir"/> <root id="src.dir"/>
<root id="src.src2.dir"/> <root id="src.src.dir"/>
</source-roots> <root id="src.src2.dir"/>
<test-roots/> </source-roots>
</data> <test-roots/>
<spellchecker-wordlist xmlns="http://www.netbeans.org/ns/spellchecker-wordlist/1"> </data>
<word>accessor</word> <spellchecker-wordlist xmlns="http://www.netbeans.org/ns/spellchecker-wordlist/1">
<word>autogeneration</word> <word>accessor</word>
<word>classpath</word> <word>autogeneration</word>
<word>CommentPdu</word> <word>classpath</word>
<word>CourseExamples</word> <word>CommentPdu</word>
<word>createDatagramSocket</word> <word>CourseExamples</word>
<word>createThreads</word> <word>createDatagramSocket</word>
<word>customizable</word> <word>createThreads</word>
<word>Cygwin</word> <word>customizable</word>
<word>Datagram</word> <word>Cygwin</word>
<word>datagramSocket</word> <word>Datagram</word>
<word>deserialization</word> <word>datagramSocket</word>
<word>DisChannel</word> <word>deserialization</word>
<word>DisPduType</word> <word>DisChannel</word>
<word>DisThreadedNetworkInterface</word> <word>DisPduType</word>
<word>docx</word> <word>DisThreadedNetworkInterface</word>
<word>ExampleSimulationProgram</word> <word>docx</word>
<word>ExampleTrackInterpolation</word> <word>ExampleSimulationProgram</word>
<word>getEspduCount</word> <word>ExampleTrackInterpolation</word>
<word>getNetworkAddress</word> <word>getEspduCount</word>
<word>getNetworkPort</word> <word>getNetworkAddress</word>
<word>gitlab</word> <word>getNetworkPort</word>
<word>html</word> <word>gitlab</word>
<word>initialLocation</word> <word>html</word>
<word>instantiable</word> <word>initialLocation</word>
<word>interarrival</word> <word>instantiable</word>
<word>interpolators</word> <word>interarrival</word>
<word>ipconfig</word> <word>interpolators</word>
<word>isAlive</word> <word>ipconfig</word>
<word>isClosed</word> <word>isAlive</word>
<word>isConnected</word> <word>isClosed</word>
<word>isInterrupted</word> <word>isConnected</word>
<word>javadoc</word> <word>isInterrupted</word>
<word>joinGroup</word> <word>javadoc</word>
<word>killThread</word> <word>joinGroup</word>
<word>latestLocation</word> <word>killThread</word>
<word>leaveGroup</word> <word>latestLocation</word>
<word>localhost</word> <word>leaveGroup</word>
<word>loopback</word> <word>localhost</word>
<word>marshalling</word> <word>loopback</word>
<word>multicast</word> <word>marshalling</word>
<word>NetBeans</word> <word>multicast</word>
<word>netcat</word> <word>NetBeans</word>
<word>NPS</word> <word>netcat</word>
<word>pdu</word> <word>NPS</word>
<word>PduCaptureLog</word> <word>pdu</word>
<word>pduLog</word> <word>PduCaptureLog</word>
<word>PduRecorder</word> <word>pduLog</word>
<word>PDUs</word> <word>PduRecorder</word>
<word>pduSentList</word> <word>PDUs</word>
<word>pduTrack</word> <word>pduSentList</word>
<word>png</word> <word>pduTrack</word>
<word>prepended</word> <word>png</word>
<word>receiveThread</word> <word>prepended</word>
<word>runSimulation</word> <word>receiveThread</word>
<word>sendingThread</word> <word>runSimulation</word>
<word>setKillSentinelAndInterrupts</word> <word>sendingThread</word>
<word>simkit</word> <word>setKillSentinelAndInterrupts</word>
<word>simulationComplete</word> <word>simkit</word>
<word>simulationists</word> <word>simulationComplete</word>
<word>src</word> <word>simulationists</word>
<word>subclassed</word> <word>src</word>
<word>subpackage</word> <word>subclassed</word>
<word>TcpExamples</word> <word>subpackage</word>
<word>teardown</word> <word>TcpExamples</word>
<word>thisHostName</word> <word>teardown</word>
<word>timestep</word> <word>thisHostName</word>
<word>TrackSimulationProgram</word> <word>timestep</word>
<word>txt</word> <word>TrackSimulationProgram</word>
<word>UdpMulticastHttpExamples</word> <word>txt</word>
<word>unicast</word> <word>UdpMulticastHttpExamples</word>
<word>waypoint</word> <word>unicast</word>
<word>waypoints</word> <word>waypoint</word>
<word>Wireshark</word> <word>waypoints</word>
</spellchecker-wordlist> <word>Wireshark</word>
</configuration> </spellchecker-wordlist>
</project> </configuration>
</project>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment