diff --git a/assignments/nbproject/project.properties b/assignments/nbproject/project.properties
index 05c6f493d71c7f76c47f470d33e5afb981989e3e..95236e694c46e5685d8ceab31d2a9951f57477f9 100644
--- a/assignments/nbproject/project.properties
+++ b/assignments/nbproject/project.properties
@@ -38,20 +38,16 @@ excludes=
file.reference.commons-io-2.6.jar=../lib/commons-io-2.6.jar
file.reference.dis-enums-1.3.jar=../lib/dis-enums-1.3.jar
file.reference.guava-28.0-jre.jar=../lib/guava-28.0-jre.jar
-file.reference.open-dis7-entities-all.jar=../lib/open-dis7-entities-all.jar
-file.reference.open-dis7-java.jar=../lib/open-dis7-java.jar
-file.reference.open-dis7-javadoc.jar=../lib/open-dis7-javadoc.jar
-file.reference.open-dis7-source.jar=../lib/open-dis7-source.jar
+file.reference.open-dis7-classes.jar=../lib/open-dis7-classes.jar
+file.reference.open-dis7-enumerations-classes.jar=../lib/open-dis7-enumerations-classes.jar
file.reference.open-dis_4.16.jar=../lib/open-dis_4.16.jar
includes=**
jar.archive.disabled=${jnlp.enabled}
jar.compress=false
jar.index=${jnlp.enabled}
javac.classpath=\
- ${file.reference.open-dis7-entities-all.jar}:\
- ${file.reference.open-dis7-java.jar}:\
- ${file.reference.open-dis7-javadoc.jar}:\
- ${file.reference.open-dis7-source.jar}:\
+ ${file.reference.open-dis7-classes.jar}:\
+ ${file.reference.open-dis7-enumerations-classes.jar}:\
${file.reference.commons-io-2.6.jar}:\
${file.reference.guava-28.0-jre.jar}:\
${file.reference.open-dis_4.16.jar}:\
@@ -81,7 +77,8 @@ javadoc.noindex=false
javadoc.nonavbar=false
javadoc.notree=false
javadoc.private=false
-javadoc.reference.open-dis7-java.jar=../lib/open-dis7-javadoc.jar
+javadoc.reference.open-dis7-classes.jar=../lib/open-dis7-javadoc.jar
+javadoc.reference.open-dis7-enumerations-classes.jar=../lib/open-dis7-enumerations-javadoc.jar
javadoc.splitindex=true
javadoc.use=true
javadoc.version=false
@@ -125,6 +122,7 @@ run.test.classpath=\
run.test.modulepath=\
${javac.test.modulepath}
source.encoding=UTF-8
-source.reference.open-dis7-java.jar=../lib/open-dis7-source.jar
+source.reference.open-dis7-classes.jar=../lib/open-dis7-source.jar
+source.reference.open-dis7-enumerations-classes.jar=../lib/open-dis7-enumerations-source.jar
src.dir=src
test.src.dir=test
diff --git a/conferences/IITSEC2020/IITSEC2020_DIS_Tutorial_20031.pptx b/conferences/IITSEC2020/IITSEC2020_DIS_Tutorial_20031.pptx
index c6bc50c3edec43270d6dfd1bf22073ec01831d65..4ffc9d3c9e9bf457eeb3baa8f2601705779b4f9d 100644
Binary files a/conferences/IITSEC2020/IITSEC2020_DIS_Tutorial_20031.pptx and b/conferences/IITSEC2020/IITSEC2020_DIS_Tutorial_20031.pptx differ
diff --git a/examples/nbproject/project.properties b/examples/nbproject/project.properties
index a7dc2db7ef8fef792b98ddfcdb28836db1d71427..f11e12f96580d144294b62b00a3b759d1afa36b1 100644
--- a/examples/nbproject/project.properties
+++ b/examples/nbproject/project.properties
@@ -36,18 +36,14 @@ excludes=
file.reference.commons-io-2.6.jar=../lib/commons-io-2.6.jar
file.reference.dis-enums-1.3.jar=../lib/dis-enums-1.3.jar
file.reference.guava-28.0-jre.jar=../lib/guava-28.0-jre.jar
-file.reference.open-dis7-entities-all.jar=../lib/open-dis7-entities-all.jar
-file.reference.open-dis7-java.jar=../lib/open-dis7-java.jar
-file.reference.open-dis7-javadoc.jar=../lib/open-dis7-javadoc.jar
-file.reference.open-dis7-source.jar=../lib/open-dis7-source.jar
+file.reference.open-dis7-classes.jar=../lib/open-dis7-classes.jar
+file.reference.open-dis7-enumerations-classes.jar=../lib/open-dis7-enumerations-classes.jar
file.reference.open-dis_4.16.jar=../lib/open-dis_4.16.jar
includes=**
jar.compress=false
javac.classpath=\
- ${file.reference.open-dis7-entities-all.jar}:\
- ${file.reference.open-dis7-java.jar}:\
- ${file.reference.open-dis7-javadoc.jar}:\
- ${file.reference.open-dis7-source.jar}:\
+ ${file.reference.open-dis7-classes.jar}:\
+ ${file.reference.open-dis7-enumerations-classes.jar}:\
${file.reference.commons-io-2.6.jar}:\
${file.reference.guava-28.0-jre.jar}:\
${file.reference.open-dis_4.16.jar}:\
@@ -77,7 +73,8 @@ javadoc.noindex=false
javadoc.nonavbar=false
javadoc.notree=false
javadoc.private=false
-javadoc.reference.open-dis7-java.jar=../lib/open-dis7-javadoc.jar
+javadoc.reference.open-dis7-classes.jar=../lib/open-dis7-javadoc.jar
+javadoc.reference.open-dis7-enumerations-classes.jar=../lib/open-dis7-enumerations-javadoc.jar
javadoc.splitindex=true
javadoc.use=true
javadoc.version=false
@@ -104,5 +101,6 @@ run.test.classpath=\
run.test.modulepath=\
${javac.test.modulepath}
source.encoding=UTF-8
-source.reference.open-dis7-java.jar=../lib/open-dis7-source.jar
+source.reference.open-dis7-classes.jar=../lib/open-dis7-source.jar
+source.reference.open-dis7-enumerations-classes.jar=../lib/open-dis7-enumerations-source.jar
src.dir=src
diff --git a/examples/src/OpenDis4Examples/EspduReceiver.java b/examples/src/OpenDis4Examples/EspduReceiver.java
index 036477c953c41cf14a02136981a4c4275e9c651a..d34a6d60bbad03fba7e9a7b4db4755547014d3fb 100644
--- a/examples/src/OpenDis4Examples/EspduReceiver.java
+++ b/examples/src/OpenDis4Examples/EspduReceiver.java
@@ -30,7 +30,7 @@ public class EspduReceiver
public static void main(String args[])
{
- System.out.println("DisExamples.EspduReceiver started...");
+ System.out.println("OpenDis4Examples.EspduReceiver started...");
MulticastSocket socket;
DatagramPacket packet;
@@ -75,7 +75,7 @@ public class EspduReceiver
} // End try
catch (IOException e)
{
- System.out.println("Problem with DisExamples.EspduReceiver, see exception trace:");
+ System.out.println("Problem with OpenDis4Examples.EspduReceiver, see exception trace:");
System.out.println(e);
}
} // end main
diff --git a/examples/src/OpenDis4Examples/EspduSender.java b/examples/src/OpenDis4Examples/EspduSender.java
index 078cd1b3399633589b67ab38d4bada72fc28b3fb..dd0c8eeec4164f60ca5a2b83998ab411d5a6a22b 100644
--- a/examples/src/OpenDis4Examples/EspduSender.java
+++ b/examples/src/OpenDis4Examples/EspduSender.java
@@ -45,7 +45,7 @@ public class EspduSender {
*/
public static void main(String args[])
{
- System.out.println("DisExamples.EspduSender started... send " + NUMBER_TO_SEND + " ESPDUs, initial index=0");
+ System.out.println("OpenDis4Examples.EspduSender started... send " + NUMBER_TO_SEND + " ESPDUs, initial index=0");
/**
* an entity state pdu
*/
@@ -263,7 +263,7 @@ public class EspduSender {
}
catch (IOException | InterruptedException e)
{
- System.out.println("Problem with DisExamples.EspduSender, see exception trace:");
+ System.out.println("Problem with OpenDis4Examples.EspduSender, see exception trace:");
System.out.println(e);
}
}
@@ -315,7 +315,7 @@ public class EspduSender {
}
catch (SocketException e)
{
- System.out.println("Problem with DisExamples.EspduSender.getBroadcastAddresses(), see exception trace:");
+ System.out.println("Problem with OpenDis4Examples.EspduSender.getBroadcastAddresses(), see exception trace:");
System.out.println(e);
}
return broadcastAddresses;
diff --git a/examples/src/OpenDis4Examples/PduReceiver.java b/examples/src/OpenDis4Examples/PduReceiver.java
index 77923859df15cb83b5fa61e2189ccb765ef2f1fb..ab7161154619af3dc3588d28659188cc4a8bd71a 100644
--- a/examples/src/OpenDis4Examples/PduReceiver.java
+++ b/examples/src/OpenDis4Examples/PduReceiver.java
@@ -23,7 +23,7 @@ public class PduReceiver
try
{
- System.out.println("DisExamples.PduReceiver started...");
+ System.out.println("OpenDis4Examples.PduReceiver started...");
socket = new MulticastSocket (MULTICAST_PORT);
address = InetAddress.getByName(MULTICAST_GROUP);
socket.joinGroup(address);
@@ -61,12 +61,12 @@ public class PduReceiver
}
catch (IOException e)
{
- System.out.println("Problem with DisExamples.PduReceiver, see exception trace:");
+ System.out.println("Problem with OpenDis4Examples.PduReceiver, see exception trace:");
System.out.println(e);
}
finally
{
- System.out.println("DisExamples.PduReceiver complete.");
+ System.out.println("OpenDis4Examples.PduReceiver complete.");
}
}
}
diff --git a/examples/src/OpenDis4Examples/PduSender.java b/examples/src/OpenDis4Examples/PduSender.java
index 63b17f128756e2422f70137a5c58fdc0e6d4bae5..6767f24044f4ead5bffcaf01217c126c23b1f321 100644
--- a/examples/src/OpenDis4Examples/PduSender.java
+++ b/examples/src/OpenDis4Examples/PduSender.java
@@ -44,7 +44,7 @@ public class PduSender
public void run()
{
- System.out.println("DisExamples.PduSender started...");
+ System.out.println("OpenDis4Examples.PduSender started...");
try {
List<Pdu> generatedPdusList = new ArrayList<>();
diff --git a/examples/src/OpenDis7Examples/AllPduReceiver.java b/examples/src/OpenDis7Examples/AllPduReceiver.java
index c2ad0f3b89eeeddbf8522d69587640ff2a9b58ee..9b2eff5bd8f2558718d194cdc3f878c03ab6b43d 100644
--- a/examples/src/OpenDis7Examples/AllPduReceiver.java
+++ b/examples/src/OpenDis7Examples/AllPduReceiver.java
@@ -22,7 +22,7 @@ public class AllPduReceiver
DatagramPacket packet;
try {
- System.out.println("DisExamplesOpenDis7.AllPduReceiver started...");
+ System.out.println("OpenDis7Examples.AllPduReceiver started...");
if (args.length == 2) {
socket = new MulticastSocket(Integer.parseInt(args[0]));
address = InetAddress.getByName(args[1]);
@@ -84,11 +84,11 @@ public class AllPduReceiver
}
}
catch (IOException e) {
- System.out.println("Problem with DisExamplesOpenDis7.AllPduReceiver, see exception trace:");
+ System.out.println("Problem with OpenDis7Examples.AllPduReceiver, see exception trace:");
System.out.println(e);
}
finally {
- System.out.println("DisExamplesOpenDis7.AllPduReceiver complete.");
+ System.out.println("OpenDis7Examples.AllPduReceiver complete.");
}
}
}
diff --git a/examples/src/OpenDis7Examples/AllPduSender.java b/examples/src/OpenDis7Examples/AllPduSender.java
index 1d01685d32e62a81beee06b2ed21538ee265caa0..75960f7cdcb161e92de90de5ed7fc51dd9a2c367 100755
--- a/examples/src/OpenDis7Examples/AllPduSender.java
+++ b/examples/src/OpenDis7Examples/AllPduSender.java
@@ -43,7 +43,7 @@ public class AllPduSender
public int run()
{
- System.out.println("DisExamplesOpenDis7.AllPduSender started...");
+ System.out.println("OpenDis7Examples.AllPduSender started...");
try
{
System.out.println("Generate PDUs and note issues, if any...");
@@ -481,6 +481,6 @@ public class AllPduSender
allPduSender = new AllPduSender(DEFAULT_MULTICAST_PORT, DEFAULT_MULTICAST_ADDRESS);
totalSentPdus = allPduSender.run();
}
- System.out.println("DisExamplesOpenDis7.AllPduSender complete, sent " + totalSentPdus + " PDUs total.");
+ System.out.println("OpenDis7Examples.AllPduSender complete, sent " + totalSentPdus + " PDUs total.");
}
}
diff --git a/examples/src/OpenDis7Examples/EspduReceiver.java b/examples/src/OpenDis7Examples/EspduReceiver.java
index 81eb4183d1f63d9b5bd8a7c51ed60de94d807e6f..8aed96189b4056a02a65f5013c128c41770bf1f5 100755
--- a/examples/src/OpenDis7Examples/EspduReceiver.java
+++ b/examples/src/OpenDis7Examples/EspduReceiver.java
@@ -29,7 +29,7 @@ public class EspduReceiver
public static void main(String args[])
{
- System.out.println("DisExamplesOpenDis7.EspduReceiver started...");
+ System.out.println("OpenDis7Examples.EspduReceiver started...");
MulticastSocket socket;
DatagramPacket packet;
@@ -83,9 +83,9 @@ public class EspduReceiver
} // end try block
catch (IOException e)
{
- System.out.println("Problem with DisExamplesOpenDis7.EspduReceiver, see exception trace:");
+ System.out.println("Problem with OpenDis7Examples.EspduReceiver, see exception trace:");
System.out.println(e);
}
- System.out.println("DisExamplesOpenDis7.EspduReceiver complete.");
+ System.out.println("OpenDis7Examples.EspduReceiver complete.");
} // end main
} // end class
diff --git a/examples/src/OpenDis7Examples/EspduSender.java b/examples/src/OpenDis7Examples/EspduSender.java
index 2933e2da02151db7b0064163a00def6b3606eda1..ba14938950369c329ae859cf634f1903ddf47624 100644
--- a/examples/src/OpenDis7Examples/EspduSender.java
+++ b/examples/src/OpenDis7Examples/EspduSender.java
@@ -52,7 +52,7 @@ public class EspduSender
@SuppressWarnings("SleepWhileInLoop") // allows Thread.sleep(value) without warning in code
public static void main(String args[])
{
- System.out.println("DisExamplesOpenDis7.EspduSender started...");
+ System.out.println("OpenDis7Examples.EspduSender started...");
// Default settings. These are used if no system properties are set.
// If system properties are passed in, these are overridden later.
@@ -121,7 +121,7 @@ public class EspduSender
{
throw new RuntimeException("*** Error: sending to multicast address, but destination address " + address.toString() + "is not multicast");
}
- socket.joinGroup(address);
+ socket.joinGroup(address); // TODO select correct NetworkInterface
}
} // end networkModeString
}
@@ -147,7 +147,7 @@ public class EspduSender
entityID.setSiteID ((short)1); // TODO utility method to allow int values
entityID.setApplicationID((short)2);
entityID.setEntityID ((short)3);
- espdu.setEntityID(entityID);
+ espdu.setEntityID(entityID); // TODO utility method to allow setting all three at once
// Set the entity type. SISO has a big list of enumerations, so that by
// specifying various numbers we can say this is an M1A2 American tank,
@@ -156,27 +156,38 @@ public class EspduSender
// enumerations in C++ and Java, but to keep things simple we just use
// numbers here.
- // New way using entity jar(s)
- espdu.setEntityType(new edu.nps.moves.dis7.entities.usa.platform.land.M1A2());
-
- // Manual way:
- /*
- */
+ // Manual way to identify platform information:
EntityType entityType = espdu.getEntityType();
- entityType.setEntityKind(EntityKind.PLATFORM); //(short) 1); // Platform (vs lifeform, munition, sensor, etc.)
- entityType.setCountry(Country.UNITED_STATES_OF_AMERICA_USA); // 225 USA
- entityType.setDomain(Domain.inst(PlatformDomain.LAND)); // Land (vs air, surface, subsurface, space)
+ entityType.setEntityKind (EntityKind.PLATFORM); //(short) 1); // Platform (vs lifeform, munition, sensor, etc.)
+ entityType.setCountry (Country.UNITED_STATES_OF_AMERICA_USA); // 225 USA
+ entityType.setDomain (Domain.inst(PlatformDomain.LAND)); // Land (vs air, surface, subsurface, space)
entityType.setCategory ((byte) 1); // Tank
entityType.setSubCategory((byte) 1); // M1 Abrams
entityType.setSpecific ((byte) 3); // M1A2 Abrams
+
+ // New way using entity jar(s)
+ espdu.setEntityType(new edu.nps.moves.dis7.entities.usa.platform.land.M1A2());
+ // or simply use import statement above
+ espdu.setEntityType(M1A2());
+
+ // Inspecting an enumeration:
+ System.out.println("espdu entityType information:");
+ System.out.println(" EntityKind =" + espdu.getEntityType().getEntityKind());
+ System.out.println(" Country =" + espdu.getEntityType().getCountry());
+ System.out.println(" Domain =" + espdu.getEntityType().getDomain());
+ System.out.println(" Category =" + espdu.getEntityType().getCategory());
+ System.out.println(" SubCategory=" + espdu.getEntityType().getSubCategory());
+ System.out.println(" Specific =" + espdu.getEntityType().getCountry());
+ // TODO round trip lookup
- Set<InetAddress> broadcastAddresses;
+ Set<InetAddress> localNetworkAddresses;
try // Loop through sending N ESPDUs
{
System.out.println("Sending " + NUMBER_PDUS_TO_SEND + " sets of packets:"); // + address.toString()
- for (int index = 0; index < NUMBER_PDUS_TO_SEND; index++) {
+ for (int index = 0; index < NUMBER_PDUS_TO_SEND; index++)
+ {
// DIS time is a pain in the uh, neck. DIS time units are 2^31-1 units per
// hour, and time is set to DIS time units from the top of the hour.
// This means that if you start sending just before the top of the hour
@@ -264,33 +275,33 @@ public class EspduSender
firePdu.setLocationInWorldCoordinates(espdu.getEntityLocation());
byte[] fireArray = firePdu.marshal();
- broadcastAddresses = getBroadcastAddresses();
- for (InetAddress broadcast : broadcastAddresses) {
- if (espduArray.length > 0)
- {
- System.out.println("Sending espdu datagram packet to " + broadcast);
- packet = new DatagramPacket(espduArray, espduArray.length, broadcast, port);
- socket.send(packet);
- }
- // TODO experiment with these! 8)
- if (fireArray.length > 0)
- {
- System.out.println("Sending fire datagram packet to " + broadcast);
- packet = new DatagramPacket(fireArray, fireArray.length, broadcast, port); // alternate
- socket.send(packet);
- } }
-
+ localNetworkAddresses = getBroadcastAddresses();
+ for (InetAddress broadcast : localNetworkAddresses) {
+ if (espduArray.length > 0)
+ {
+ System.out.println("Sending espdu datagram packet to " + broadcast);
+ packet = new DatagramPacket(espduArray, espduArray.length, broadcast, port);
+ socket.send(packet);
+ }
+ // TODO experiment with these! 8)
+ if (fireArray.length > 0)
+ {
+ System.out.println("Sending fire datagram packet to " + broadcast);
+ packet = new DatagramPacket(fireArray, fireArray.length, broadcast, port); // alternate
+ socket.send(packet);
+ }
+ }
// Send every 1 second within loop. Otherwise all this will be all over in a fraction of a second.
Thread.sleep(1000); // msec
}
}
catch (Exception e)
{
- System.out.println("Problem with DisExamplesOpenDis7.EspduSender, see exception trace:");
+ System.out.println("Problem with OpenDis7Examples.EspduSender, see exception trace:");
System.out.println(e);
}
System.out.println("===============");
- System.out.println("DisExamplesOpenDis7.EspduSender complete.");
+ System.out.println("OpenDis7Examples.EspduSender complete.");
}
/**
@@ -319,25 +330,25 @@ public class EspduSender
if (anInterface.isUp())
{
- for (InterfaceAddress anAddress : anInterface.getInterfaceAddresses()) {
- if ((anAddress == null || anAddress.getAddress().isLinkLocalAddress()))
- {
- continue;
- }
-
- //System.out.println("Getting broadcast address for " + anAddress);
- InetAddress broadcastAddress = anAddress.getBroadcast();
- if (broadcastAddress != null)
- {
- broadcastAddresses.add(broadcastAddress);
- }
- }
+ for (InterfaceAddress anAddress : anInterface.getInterfaceAddresses()) {
+ if ((anAddress == null || anAddress.getAddress().isLinkLocalAddress()))
+ {
+ continue;
+ }
+
+ //System.out.println("Getting broadcast address for " + anAddress);
+ InetAddress broadcastAddress = anAddress.getBroadcast();
+ if (broadcastAddress != null)
+ {
+ broadcastAddresses.add(broadcastAddress);
+ }
+ }
}
}
}
catch (SocketException e)
{
- System.out.println("Problem with DisExamplesOpenDis7.EspduSender.getBroadcastAddresses(), see exception trace:");
+ System.out.println("Problem with OpenDis7Examples.EspduSender.getBroadcastAddresses(), see exception trace:");
System.out.println(e);
}
return broadcastAddresses;
diff --git a/examples/src/OpenDis7Examples/PduListenerSaver.java b/examples/src/OpenDis7Examples/PduListenerSaver.java
index 3e0f35a7b7c7bcc02d845af76e3608f22d4e7782..271a5276e008a32266d9bb296884315eb3fbf01d 100644
--- a/examples/src/OpenDis7Examples/PduListenerSaver.java
+++ b/examples/src/OpenDis7Examples/PduListenerSaver.java
@@ -36,7 +36,7 @@ public class PduListenerSaver
String multicastAddress = DEFAULT_MULTICAST_ADDRESS;
int multicastPort = DEFAULT_MULTICAST_PORT;
- System.out.println("DisExamplesOpenDis7.PduListenerSaver started...");
+ System.out.println("OpenDis7Examples.PduListenerSaver started...");
switch (args.length) {
case 0:
diff --git a/examples/src/OpenDis7Examples/PduReaderPlayer.java b/examples/src/OpenDis7Examples/PduReaderPlayer.java
index bdfc3c568c576e3bedaf95e4c9736be1044ab482..9564e2fc8918f707eb7e500a559b7a4db02ec473 100644
--- a/examples/src/OpenDis7Examples/PduReaderPlayer.java
+++ b/examples/src/OpenDis7Examples/PduReaderPlayer.java
@@ -38,7 +38,7 @@ public class PduReaderPlayer
int multicastPort = DEFAULT_MULTICAST_PORT;
boolean sendToNet = false;
- System.out.println("DisExamplesOpenDis7.PduReaderPlayer started...");
+ System.out.println("OpenDis7Examples.PduReaderPlayer started...");
switch (args.length) {
case 0:
@@ -84,7 +84,7 @@ public class PduReaderPlayer
}
}
System.out.println("Ending pdu files playback for directory " + outputDirectory);
- System.out.println("DisExamplesOpenDis7.PduReaderPlayer complete.");
+ System.out.println("OpenDis7Examples.PduReaderPlayer complete.");
System.exit(0); // not sure why this is necessary with Netbeans...
}
catch (IOException ex) {
diff --git a/lib/open-dis7-entities-all.jar b/lib/open-dis7-entities-all.jar
deleted file mode 100644
index bf060b7480f219bcd0d821c1a466e257a81bd33e..0000000000000000000000000000000000000000
Binary files a/lib/open-dis7-entities-all.jar and /dev/null differ
diff --git a/lib/open-dis7-java.jar b/lib/open-dis7-java.jar
deleted file mode 100644
index 638d31ec50395d2c1989181448740e172623e307..0000000000000000000000000000000000000000
Binary files a/lib/open-dis7-java.jar and /dev/null differ
diff --git a/presentations/07_NetworkScalability.pptx b/presentations/07_NetworkScalability.pptx
index e87e14b138acfeea4204c4726317f88791feedbf..28bf26c20ecab765e034c1e850ffc0d770628809 100644
Binary files a/presentations/07_NetworkScalability.pptx and b/presentations/07_NetworkScalability.pptx differ