Fix for most recent release

examples/nbproject/project.properties

@@ -35,15 +35,15 @@ endorsed.classpath=
 excludes=
 file.reference.dis-enums-1.3.jar=../lib/dis-enums-1.3.jar
 file.reference.open-dis7-entities-all.jar=../lib/open-dis7-entities-all.jar
-file.reference.open-dis7.jar=../lib/open-dis7.jar
+file.reference.open-dis7-java.jar=../lib/open-dis7-java.jar
 file.reference.open-dis_4.16.jar=../lib/open-dis_4.16.jar
 includes=**
 jar.compress=false
 javac.classpath=\
-    ${file.reference.open-dis7.jar}:\
+    ${file.reference.open-dis7-java.jar}:\
     ${file.reference.open-dis7-entities-all.jar}:\
-    ${file.reference.dis-enums-1.3.jar}:\
-    ${file.reference.open-dis_4.16.jar}
+    ${file.reference.open-dis_4.16.jar}:\
+    ${file.reference.dis-enums-1.3.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
@@ -69,6 +69,7 @@ javadoc.noindex=false
 javadoc.nonavbar=false
 javadoc.notree=false
 javadoc.private=false
+javadoc.reference.open-dis7-java.jar=../lib/open-dis7-javadoc.jar
 javadoc.splitindex=true
 javadoc.use=true
 javadoc.version=false
@@ -95,4 +96,5 @@ run.test.classpath=\
 run.test.modulepath=\
     ${javac.test.modulepath}
 source.encoding=UTF-8
+source.reference.open-dis7-java.jar=../lib/open-dis7-source.jar
 src.dir=src

examples/src/OpenDis7Examples/EspduReceiver.java

-package OpenDis7Examples; 
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-
-import edu.nps.moves.dis7.*;
-import edu.nps.moves.dis7.util.*;
-import edu.nps.moves.disenum.PduType;
-
-/**
- * Receives PDUs from the network in IEEE DIS format.
- * Adapted from OpenDIS library example package edu.nps.moves.examples
- *
- * @author DMcG
- * @version $Id:$
- */
-public class EspduReceiver
-{
-    /** Max size of a PDU in binary format that we can receive. This is actually
-     * somewhat outdated--PDUs can be larger--but this is a reasonable starting point.
-     */
-    public static final int MAX_PDU_SIZE = 8192;
-
-    /** Default multicast group address we send on. */
-    public static final String DEFAULT_MULTICAST_ADDRESS = "239.1.2.3";
-	
-    /** Default multicast port used, matches Wireshark DIS capture default */
-    public static final int    DEFAULT_MULTICAST_PORT    = 3000;
-
-    public static void main(String args[])
-	{
-		System.out.println("DisExamplesOpenDis7.EspduReceiver started...");
-		
-        MulticastSocket socket;
-        DatagramPacket packet;
-        InetAddress address;
-        PduFactory pduFactory = new PduFactory();
-
-        try {
-            // Specify the socket to receive data
-            socket = new MulticastSocket(DEFAULT_MULTICAST_PORT);
-            socket.setBroadcast(true);
-       
-            // address = InetAddress.getByName(EspduSender.DEFAULT_MULTICAST_GROUP);
-            // socket.joinGroup(address);
-
-            while (true) // Loop infinitely, receiving datagrams
-			{
-                byte buffer[] = new byte[MAX_PDU_SIZE];
-                packet = new DatagramPacket(buffer, buffer.length);
-
-                socket.receive(packet);
-
-                List<Pdu> pduBundle = pduFactory.getPdusFromBundle(packet.getData());
-                if (pduBundle.size() > 1)
-                    System.out.println("Bundle size is " + pduBundle.size());
-                Iterator iterator = pduBundle.iterator();
-
-                while(iterator.hasNext())
-                {
-                    Pdu aPdu = (Pdu)iterator.next();
-                
-                    System.out.println("received PDU " + aPdu.getPduType().getValue() + " " + aPdu.getPduType().name() + " of type " + aPdu.getClass().getName());
-                    if(aPdu instanceof EntityStatePdu)
-                    {
-                        EntityID eid = ((EntityStatePdu)aPdu).getEntityID();
-                        Vector3Double position = ((EntityStatePdu)aPdu).getEntityLocation();
-                        System.out.println("  ID triplet: [" + eid.getSiteID()+ ", " + eid.getApplicationID()+ ", " + eid.getEntityID()+ "] ");
-                        System.out.println("  Location in DIS coordinates: [" + position.getX() + ", " + position.getY() + ", " + position.getZ() + "]");
-// TODO fix library!
-                        System.out.println("** TODO error, 'PDU not implemented' is a library bug");
-                    }
-                } // end iterator loop through PDU bundle
-            } // end while
-        } // End try
-        catch (IOException e)
-		{
-            System.out.println("Problem with DisExamplesOpenDis7.EspduReceiver, see exception trace:");
-            System.out.println(e);
-        }
-		System.out.println("DisExamplesOpenDis7.EspduReceiver complete.");
-    } // end main
-} // end class
+package OpenDis7Examples; 
+
+import java.io.*;
+import java.net.*;
+import java.util.*;
+
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.util.*;
+
+/**
+ * Receives PDUs from the network in IEEE DIS format.
+ * Adapted from OpenDIS library example package edu.nps.moves.examples
+ *
+ * @author DMcG
+ * @version $Id:$
+ */
+public class EspduReceiver
+{
+    /** Max size of a PDU in binary format that we can receive. This is actually
+     * somewhat outdated--PDUs can be larger--but this is a reasonable starting point.
+     */
+    public static final int MAX_PDU_SIZE = 8192;
+
+    /** Default multicast group address we send on. */
+    public static final String DEFAULT_MULTICAST_ADDRESS = "239.1.2.3";
+	
+    /** Default multicast port used, matches Wireshark DIS capture default */
+    public static final int    DEFAULT_MULTICAST_PORT    = 3000;
+
+    public static void main(String args[])
+	{
+		System.out.println("DisExamplesOpenDis7.EspduReceiver started...");
+		
+        MulticastSocket socket;
+        DatagramPacket packet;
+        InetAddress address;
+        PduFactory pduFactory = new PduFactory();
+
+        try {
+            // Specify the socket to receive data
+            socket = new MulticastSocket(DEFAULT_MULTICAST_PORT);
+            socket.setBroadcast(true);
+       
+            // address = InetAddress.getByName(EspduSender.DEFAULT_MULTICAST_GROUP);
+            // socket.joinGroup(address);
+
+            while (true) // Loop infinitely, receiving datagrams
+			{
+                byte buffer[] = new byte[MAX_PDU_SIZE];
+                packet = new DatagramPacket(buffer, buffer.length);
+
+                socket.receive(packet);
+
+                List<Pdu> pduBundle = pduFactory.getPdusFromBundle(packet.getData(),packet.getLength());
+                if (pduBundle.size() > 1)
+                    System.out.println("Bundle size is " + pduBundle.size());
+                Iterator iterator = pduBundle.iterator();
+
+                while(iterator.hasNext())
+                {
+                    Pdu aPdu = (Pdu)iterator.next();
+                
+                    System.out.println("received PDU " + aPdu.getPduType().getValue() + " " + aPdu.getPduType().name() + " of type " + aPdu.getClass().getName());
+                    if(aPdu instanceof EntityStatePdu)
+                    {
+                        EntityID eid = ((EntityStatePdu)aPdu).getEntityID();
+                        Vector3Double position = ((EntityStatePdu)aPdu).getEntityLocation();
+                        System.out.println("  ID triplet: [" + eid.getSiteID()+ ", " + eid.getApplicationID()+ ", " + eid.getEntityID()+ "] ");
+                        System.out.println("  Location in DIS coordinates: [" + position.getX() + ", " + position.getY() + ", " + position.getZ() + "]");
+                    }
+                } // end iterator loop through PDU bundle
+            } // end while
+        } // End try
+        catch (IOException e)
+		{
+            System.out.println("Problem with DisExamplesOpenDis7.EspduReceiver, see exception trace:");
+            System.out.println(e);
+        }
+		System.out.println("DisExamplesOpenDis7.EspduReceiver complete.");
+    } // end main
+} // end class