Skip to content
Snippets Groups Projects
Commit e8058265 authored by terry-norbraten's avatar terry-norbraten
Browse files

refactor for latest generated enum source

parent ebbdbc43
No related branches found
No related tags found
No related merge requests found
...@@ -118,10 +118,9 @@ public class PduFactory ...@@ -118,10 +118,9 @@ public class PduFactory
return pdu; return pdu;
} }
private LiveEntityPdu addBoilerPlate(LiveEntityPdu pdu) private LiveEntityFamilyPdu addBoilerPlate(LiveEntityFamilyPdu pdu)
{ {
pdu.setSubprotocolNumber(DISLiveEntitySubprotocolNumber.NO_SUBPROTOCOL) pdu.setExerciseID(defaultExerciseId)
.setExerciseID(defaultExerciseId)
.setTimestamp(doTime()) .setTimestamp(doTime())
.setLength((short) pdu.getMarshalledSize()); //todo check if should be done in Pdu class .setLength((short) pdu.getMarshalledSize()); //todo check if should be done in Pdu class
...@@ -992,8 +991,8 @@ public class PduFactory ...@@ -992,8 +991,8 @@ public class PduFactory
.setEntityLocation(new LiveEntityRelativeWorldCoordinates()) .setEntityLocation(new LiveEntityRelativeWorldCoordinates())
.setEntityOrientation(new LiveEntityOrientation()) .setEntityOrientation(new LiveEntityOrientation())
.setOrientationError(new LiveEntityOrientationError()) .setOrientationError(new LiveEntityOrientationError())
.setPositionError(new LiveEntityPositionError())*/ .setPositionError(new LiveEntityPositionError())
pdu.setSubprotocolNumber(DISLiveEntitySubprotocolNumber.NO_SUBPROTOCOL); pdu.setSubprotocolNumber(DISLiveEntitySubprotocolNumber.NO_SUBPROTOCOL);*/
return (TSPIPdu) addBoilerPlate(pdu); return (TSPIPdu) addBoilerPlate(pdu);
} }
...@@ -1012,8 +1011,8 @@ public class PduFactory ...@@ -1012,8 +1011,8 @@ public class PduFactory
.setCapabilities(new SurfacePlatformCapabilities()) .setCapabilities(new SurfacePlatformCapabilities())
.setAppearanceFields(new Appearance()) .setAppearanceFields(new Appearance())
.setEntityMarking(newEntityMarking()) .setEntityMarking(newEntityMarking())
.setForceId(ForceID.OTHER)*/ .setForceId(ForceID.OTHER)
pdu.setSubprotocolNumber(DISLiveEntitySubprotocolNumber.NO_SUBPROTOCOL); pdu.setSubprotocolNumber(DISLiveEntitySubprotocolNumber.NO_SUBPROTOCOL);*/
return (AppearancePdu) addBoilerPlate(pdu); return (AppearancePdu) addBoilerPlate(pdu);
} }
...@@ -1026,7 +1025,7 @@ public class PduFactory ...@@ -1026,7 +1025,7 @@ public class PduFactory
{ {
ArticulatedPartsPdu pdu = new ArticulatedPartsPdu() ArticulatedPartsPdu pdu = new ArticulatedPartsPdu()
.setLiveEntityId(new EntityID()); .setLiveEntityId(new EntityID());
pdu.setSubprotocolNumber(DISLiveEntitySubprotocolNumber.NO_SUBPROTOCOL); /*pdu.setSubprotocolNumber(DISLiveEntitySubprotocolNumber.NO_SUBPROTOCOL);*/
return (ArticulatedPartsPdu) addBoilerPlate(pdu); return (ArticulatedPartsPdu) addBoilerPlate(pdu);
} }
...@@ -1046,8 +1045,8 @@ public class PduFactory ...@@ -1046,8 +1045,8 @@ public class PduFactory
/* /*
.setLocation(new LiveEntityRelativeWorldCoordinates()) .setLocation(new LiveEntityRelativeWorldCoordinates())
.setVelocity(new LiveEntityLinearVelocity()) .setVelocity(new LiveEntityLinearVelocity())
*/
pdu.setSubprotocolNumber(DISLiveEntitySubprotocolNumber.NO_SUBPROTOCOL); pdu.setSubprotocolNumber(DISLiveEntitySubprotocolNumber.NO_SUBPROTOCOL);
*/
return (LEFirePdu) addBoilerPlate(pdu); return (LEFirePdu) addBoilerPlate(pdu);
} }
...@@ -1069,8 +1068,8 @@ public class PduFactory ...@@ -1069,8 +1068,8 @@ public class PduFactory
.setMunitionOrientation(new LiveEntityOrientation16()) .setMunitionOrientation(new LiveEntityOrientation16())
.setVelocity(new LiveEntityLinearVelocity()) .setVelocity(new LiveEntityLinearVelocity())
.setWorldLocation(new LiveEntityRelativeWorldCoordinates()) .setWorldLocation(new LiveEntityRelativeWorldCoordinates())
*/
pdu.setSubprotocolNumber(DISLiveEntitySubprotocolNumber.NO_SUBPROTOCOL); pdu.setSubprotocolNumber(DISLiveEntitySubprotocolNumber.NO_SUBPROTOCOL);
*/
return (LEDetonationPdu) addBoilerPlate(pdu); return (LEDetonationPdu) addBoilerPlate(pdu);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment