accept Terry's changes

src/edu/nps/moves/dis7/utilities/PduFactory.java

@@ -118,10 +118,9 @@ public class PduFactory
     return pdu;
   }
 
-  private LiveEntityPdu addBoilerPlate(LiveEntityPdu pdu)
+  private LiveEntityFamilyPdu addBoilerPlate(LiveEntityFamilyPdu pdu)
   {
-    pdu.setSubprotocolNumber(DISLiveEntitySubprotocolNumber.NO_SUBPROTOCOL)
-      .setExerciseID(defaultExerciseId)
+    pdu.setExerciseID(defaultExerciseId)
       .setTimestamp(doTime())
       .setLength((short) pdu.getMarshalledSize());  //todo check if should be done in Pdu class
 
@@ -993,9 +992,9 @@ public class PduFactory
             .setEntityLocation(new LiveEntityRelativeWorldCoordinates())
             .setEntityOrientation(new LiveEntityOrientation())
             .setOrientationError(new LiveEntityOrientationError())
-            .setPositionError(new LiveEntityPositionError())*/
-//    pdu.setSubprotocolNumber(DISLiveEntitySubprotocolNumber.NO_SUBPROTOCOL);
-//    return (TSPIPdu) addBoilerPlate(pdu);
+            .setPositionError(new LiveEntityPositionError())
+    pdu.setSubprotocolNumber(DISLiveEntitySubprotocolNumber.NO_SUBPROTOCOL);*/
+    return (TSPIPdu) addBoilerPlate(pdu);
   }
 
   /**
@@ -1014,9 +1013,9 @@ public class PduFactory
             .setCapabilities(new SurfacePlatformCapabilities())
             .setAppearanceFields(new Appearance())
             .setEntityMarking(newEntityMarking())
-            .setForceId(ForceID.OTHER)*/
-//    pdu.setSubprotocolNumber(DISLiveEntitySubprotocolNumber.NO_SUBPROTOCOL);
-//    return (AppearancePdu) addBoilerPlate(pdu);
+            .setForceId(ForceID.OTHER)
+    pdu.setSubprotocolNumber(DISLiveEntitySubprotocolNumber.NO_SUBPROTOCOL);*/
+    return (AppearancePdu) addBoilerPlate(pdu);
   }
 
   /**
@@ -1028,9 +1027,8 @@ public class PduFactory
   {
     ArticulatedPartsPdu pdu = new ArticulatedPartsPdu()
       .setLiveEntityId(new EntityID());
-    return pdu;
-//    pdu.setSubprotocolNumber(DISLiveEntitySubprotocolNumber.NO_SUBPROTOCOL);
-//    return (ArticulatedPartsPdu) addBoilerPlate(pdu);
+    /*pdu.setSubprotocolNumber(DISLiveEntitySubprotocolNumber.NO_SUBPROTOCOL);*/
+    return (ArticulatedPartsPdu) addBoilerPlate(pdu);
   }
 
   /**
@@ -1050,9 +1048,9 @@ public class PduFactory
     /*
             .setLocation(new LiveEntityRelativeWorldCoordinates())
             .setVelocity(new LiveEntityLinearVelocity())
+    pdu.setSubprotocolNumber(DISLiveEntitySubprotocolNumber.NO_SUBPROTOCOL);
      */
-//    pdu.setSubprotocolNumber(DISLiveEntitySubprotocolNumber.NO_SUBPROTOCOL);
-//    return (LEFirePdu) addBoilerPlate(pdu);
+    return (LEFirePdu) addBoilerPlate(pdu);
   }
 
   /**
@@ -1074,9 +1072,9 @@ public class PduFactory
             .setMunitionOrientation(new LiveEntityOrientation16())
             .setVelocity(new LiveEntityLinearVelocity())
             .setWorldLocation(new LiveEntityRelativeWorldCoordinates())
+    pdu.setSubprotocolNumber(DISLiveEntitySubprotocolNumber.NO_SUBPROTOCOL);
      */
-//    pdu.setSubprotocolNumber(DISLiveEntitySubprotocolNumber.NO_SUBPROTOCOL);
-//    return (LEDetonationPdu) addBoilerPlate(pdu);
+    return (LEDetonationPdu) addBoilerPlate(pdu);
   }
 
   /**