diff --git a/src-generated/edu/nps/moves/dis7/APA.java b/src-generated/edu/nps/moves/dis7/APA.java
index 1e2bc072e2425a18a4082959b1b24670e8e12c8a..259145336c69c5d8a833536c486b6238ef56572e 100644
--- a/src-generated/edu/nps/moves/dis7/APA.java
+++ b/src-generated/edu/nps/moves/dis7/APA.java
@@ -1,184 +1,184 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * additional passive activity
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class APA extends Object implements Serializable
-{
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * additional passive activity
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class APA extends Object implements Serializable
+{
protected short parameterIndex;
-
+
protected short value;
-
-
-/** Constructor */
- public APA()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += 2; // parameterIndex
- marshalSize += 2; // value
-
- return marshalSize;
-}
-
-
-/** Setter for {@link APA#parameterIndex}*/
-public APA setParameterIndex(short pParameterIndex)
+
+
+/** Constructor */
+ public APA()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 2; // parameterIndex
+ marshalSize += 2; // value
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link APA#parameterIndex}*/
+public APA setParameterIndex(short pParameterIndex)
{
- parameterIndex = pParameterIndex;
- return this;
-}
-
-/** Getter for {@link APA#parameterIndex}*/
-public short getParameterIndex()
+ parameterIndex = pParameterIndex;
+ return this;
+}
+
+/** Getter for {@link APA#parameterIndex}*/
+public short getParameterIndex()
{
return parameterIndex;
-}
-
-/** Setter for {@link APA#value}*/
-public APA setValue(short pValue)
+}
+
+/** Setter for {@link APA#value}*/
+public APA setValue(short pValue)
{
- value = pValue;
- return this;
-}
-
-/** Getter for {@link APA#value}*/
-public short getValue()
+ value = pValue;
+ return this;
+}
+
+/** Getter for {@link APA#value}*/
+public short getValue()
{
return value;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeShort(parameterIndex);
- dos.writeShort(value);
+ {
+ dos.writeShort(parameterIndex);
+ dos.writeShort(value);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- parameterIndex = (short)dis.readUnsignedShort();
- uPosition += 2;
- value = (short)dis.readUnsignedShort();
- uPosition += 2;
+ {
+ parameterIndex = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ value = (short)dis.readUnsignedShort();
+ uPosition += 2;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putShort( (short)parameterIndex);
- buff.putShort( (short)value);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- parameterIndex = (short)(buff.getShort() & 0xFFFF);
- value = (short)(buff.getShort() & 0xFFFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putShort( (short)parameterIndex);
+ buff.putShort( (short)value);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ parameterIndex = (short)(buff.getShort() & 0xFFFF);
+ value = (short)(buff.getShort() & 0xFFFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final APA rhs = (APA)obj;
-
- if( ! (parameterIndex == rhs.parameterIndex)) ivarsEqual = false;
- if( ! (value == rhs.value)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final APA rhs = (APA)obj;
+
+ if( ! (parameterIndex == rhs.parameterIndex)) ivarsEqual = false;
+ if( ! (value == rhs.value)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" parameterIndex: ").append(parameterIndex).append("\n");
- sb.append(" value: ").append(value).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" parameterIndex: ").append(parameterIndex).append("\n");
+ sb.append(" value: ").append(value).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/AcknowledgePdu.java b/src-generated/edu/nps/moves/dis7/AcknowledgePdu.java
index 35c62b2865948c9e20631e274e560782a264050f..5cc16d4797e4f240cfe268a907a1669e98a33dbe 100644
--- a/src-generated/edu/nps/moves/dis7/AcknowledgePdu.java
+++ b/src-generated/edu/nps/moves/dis7/AcknowledgePdu.java
@@ -1,213 +1,213 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 7.5.6 Acknowledges the receipt of a Start/Resume PDU, Stop/Freeze PDU, Create Entity PDU, or Remove Entity PDU. See 5.6.5.6.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class AcknowledgePdu extends SimulationManagementFamilyPdu implements Serializable
-{
- /** type of message being acknowledged uid 69 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 7.5.6 Acknowledges the receipt of a Start/Resume PDU, Stop/Freeze PDU, Create Entity PDU, or Remove Entity PDU. See 5.6.5.6.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class AcknowledgePdu extends SimulationManagementFamilyPdu implements Serializable
+{
+ /** type of message being acknowledged uid 69 */
protected AcknowledgeAcknowledgeFlag acknowledgeFlag = AcknowledgeAcknowledgeFlag.values()[0];
-
- /** Whether or not the receiving entity was able to comply with the request uid 70 */
+
+ /** Whether or not the receiving entity was able to comply with the request uid 70 */
protected AcknowledgeResponseFlag responseFlag = AcknowledgeResponseFlag.values()[0];
-
- /** Request ID that is unique */
+
+ /** Request ID that is unique */
protected int requestID;
-
-
-/** Constructor */
- public AcknowledgePdu()
- {
- setPduType( DISPDUType.ACKNOWLEDGE );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += acknowledgeFlag.getMarshalledSize();
- marshalSize += responseFlag.getMarshalledSize();
- marshalSize += 4; // requestID
-
- return marshalSize;
-}
-
-
-/** Setter for {@link AcknowledgePdu#acknowledgeFlag}*/
-public AcknowledgePdu setAcknowledgeFlag(AcknowledgeAcknowledgeFlag pAcknowledgeFlag)
+
+
+/** Constructor */
+ public AcknowledgePdu()
+ {
+ setPduType( DISPDUType.ACKNOWLEDGE );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += acknowledgeFlag.getMarshalledSize();
+ marshalSize += responseFlag.getMarshalledSize();
+ marshalSize += 4; // requestID
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link AcknowledgePdu#acknowledgeFlag}*/
+public AcknowledgePdu setAcknowledgeFlag(AcknowledgeAcknowledgeFlag pAcknowledgeFlag)
{
- acknowledgeFlag = pAcknowledgeFlag;
- return this;
-}
-
-/** Getter for {@link AcknowledgePdu#acknowledgeFlag}*/
-public AcknowledgeAcknowledgeFlag getAcknowledgeFlag()
+ acknowledgeFlag = pAcknowledgeFlag;
+ return this;
+}
+
+/** Getter for {@link AcknowledgePdu#acknowledgeFlag}*/
+public AcknowledgeAcknowledgeFlag getAcknowledgeFlag()
{
return acknowledgeFlag;
-}
-
-/** Setter for {@link AcknowledgePdu#responseFlag}*/
-public AcknowledgePdu setResponseFlag(AcknowledgeResponseFlag pResponseFlag)
+}
+
+/** Setter for {@link AcknowledgePdu#responseFlag}*/
+public AcknowledgePdu setResponseFlag(AcknowledgeResponseFlag pResponseFlag)
{
- responseFlag = pResponseFlag;
- return this;
-}
-
-/** Getter for {@link AcknowledgePdu#responseFlag}*/
-public AcknowledgeResponseFlag getResponseFlag()
+ responseFlag = pResponseFlag;
+ return this;
+}
+
+/** Getter for {@link AcknowledgePdu#responseFlag}*/
+public AcknowledgeResponseFlag getResponseFlag()
{
return responseFlag;
-}
-
-/** Setter for {@link AcknowledgePdu#requestID}*/
-public AcknowledgePdu setRequestID(int pRequestID)
+}
+
+/** Setter for {@link AcknowledgePdu#requestID}*/
+public AcknowledgePdu setRequestID(int pRequestID)
{
- requestID = pRequestID;
- return this;
-}
-
-/** Getter for {@link AcknowledgePdu#requestID}*/
-public int getRequestID()
+ requestID = pRequestID;
+ return this;
+}
+
+/** Getter for {@link AcknowledgePdu#requestID}*/
+public int getRequestID()
{
return requestID;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- acknowledgeFlag.marshal(dos);
- responseFlag.marshal(dos);
- dos.writeInt(requestID);
+ {
+ acknowledgeFlag.marshal(dos);
+ responseFlag.marshal(dos);
+ dos.writeInt(requestID);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- acknowledgeFlag = AcknowledgeAcknowledgeFlag.unmarshalEnum(dis);
- uPosition += acknowledgeFlag.getMarshalledSize();
- responseFlag = AcknowledgeResponseFlag.unmarshalEnum(dis);
- uPosition += responseFlag.getMarshalledSize();
- requestID = dis.readInt();
- uPosition += 4;
+ {
+ acknowledgeFlag = AcknowledgeAcknowledgeFlag.unmarshalEnum(dis);
+ uPosition += acknowledgeFlag.getMarshalledSize();
+ responseFlag = AcknowledgeResponseFlag.unmarshalEnum(dis);
+ uPosition += responseFlag.getMarshalledSize();
+ requestID = dis.readInt();
+ uPosition += 4;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- acknowledgeFlag.marshal(buff);
- responseFlag.marshal(buff);
- buff.putInt( (int)requestID);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ acknowledgeFlag.marshal(buff);
+ responseFlag.marshal(buff);
+ buff.putInt( (int)requestID);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- acknowledgeFlag = AcknowledgeAcknowledgeFlag.unmarshalEnum(buff);
- responseFlag = AcknowledgeResponseFlag.unmarshalEnum(buff);
- requestID = buff.getInt();
- return getMarshalledSize();
+
+ acknowledgeFlag = AcknowledgeAcknowledgeFlag.unmarshalEnum(buff);
+ responseFlag = AcknowledgeResponseFlag.unmarshalEnum(buff);
+ requestID = buff.getInt();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final AcknowledgePdu rhs = (AcknowledgePdu)obj;
-
- if( ! (acknowledgeFlag == rhs.acknowledgeFlag)) ivarsEqual = false;
- if( ! (responseFlag == rhs.responseFlag)) ivarsEqual = false;
- if( ! (requestID == rhs.requestID)) ivarsEqual = false;
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final AcknowledgePdu rhs = (AcknowledgePdu)obj;
+
+ if( ! (acknowledgeFlag == rhs.acknowledgeFlag)) ivarsEqual = false;
+ if( ! (responseFlag == rhs.responseFlag)) ivarsEqual = false;
+ if( ! (requestID == rhs.requestID)) ivarsEqual = false;
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" acknowledgeFlag: ").append(acknowledgeFlag).append("\n");
- sb.append(" responseFlag: ").append(responseFlag).append("\n");
- sb.append(" requestID: ").append(requestID).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" acknowledgeFlag: ").append(acknowledgeFlag).append("\n");
+ sb.append(" responseFlag: ").append(responseFlag).append("\n");
+ sb.append(" requestID: ").append(requestID).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/AcknowledgeRPdu.java b/src-generated/edu/nps/moves/dis7/AcknowledgeRPdu.java
index 201a8f0b4318ac64fe8c40d7408c187d1167bf7c..87a195304d40e7b4f5223cec7d769342bf6dfdba 100644
--- a/src-generated/edu/nps/moves/dis7/AcknowledgeRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/AcknowledgeRPdu.java
@@ -1,213 +1,213 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.12.4.6 Serves the same function as the Acknowledge PDU but is used to acknowledge the receipt of a Create Entity-R PDU, a Remove Entity-R PDU, a Start/Resume-R PDU, or a Stop/Freeze-R PDU.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class AcknowledgeRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
-{
- /** ack flags uid 69 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 5.12.4.6 Serves the same function as the Acknowledge PDU but is used to acknowledge the receipt of a Create Entity-R PDU, a Remove Entity-R PDU, a Start/Resume-R PDU, or a Stop/Freeze-R PDU.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class AcknowledgeRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
+{
+ /** ack flags uid 69 */
protected AcknowledgeAcknowledgeFlag acknowledgeFlag = AcknowledgeAcknowledgeFlag.values()[0];
-
- /** response flags uid 70 */
+
+ /** response flags uid 70 */
protected AcknowledgeResponseFlag responseFlag = AcknowledgeResponseFlag.values()[0];
-
- /** Request ID */
+
+ /** Request ID */
protected int requestID;
-
-
-/** Constructor */
- public AcknowledgeRPdu()
- {
- setPduType( DISPDUType.ACKNOWLEDGE_RELIABLE );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += acknowledgeFlag.getMarshalledSize();
- marshalSize += responseFlag.getMarshalledSize();
- marshalSize += 4; // requestID
-
- return marshalSize;
-}
-
-
-/** Setter for {@link AcknowledgeRPdu#acknowledgeFlag}*/
-public AcknowledgeRPdu setAcknowledgeFlag(AcknowledgeAcknowledgeFlag pAcknowledgeFlag)
+
+
+/** Constructor */
+ public AcknowledgeRPdu()
+ {
+ setPduType( DISPDUType.ACKNOWLEDGE_RELIABLE );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += acknowledgeFlag.getMarshalledSize();
+ marshalSize += responseFlag.getMarshalledSize();
+ marshalSize += 4; // requestID
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link AcknowledgeRPdu#acknowledgeFlag}*/
+public AcknowledgeRPdu setAcknowledgeFlag(AcknowledgeAcknowledgeFlag pAcknowledgeFlag)
{
- acknowledgeFlag = pAcknowledgeFlag;
- return this;
-}
-
-/** Getter for {@link AcknowledgeRPdu#acknowledgeFlag}*/
-public AcknowledgeAcknowledgeFlag getAcknowledgeFlag()
+ acknowledgeFlag = pAcknowledgeFlag;
+ return this;
+}
+
+/** Getter for {@link AcknowledgeRPdu#acknowledgeFlag}*/
+public AcknowledgeAcknowledgeFlag getAcknowledgeFlag()
{
return acknowledgeFlag;
-}
-
-/** Setter for {@link AcknowledgeRPdu#responseFlag}*/
-public AcknowledgeRPdu setResponseFlag(AcknowledgeResponseFlag pResponseFlag)
+}
+
+/** Setter for {@link AcknowledgeRPdu#responseFlag}*/
+public AcknowledgeRPdu setResponseFlag(AcknowledgeResponseFlag pResponseFlag)
{
- responseFlag = pResponseFlag;
- return this;
-}
-
-/** Getter for {@link AcknowledgeRPdu#responseFlag}*/
-public AcknowledgeResponseFlag getResponseFlag()
+ responseFlag = pResponseFlag;
+ return this;
+}
+
+/** Getter for {@link AcknowledgeRPdu#responseFlag}*/
+public AcknowledgeResponseFlag getResponseFlag()
{
return responseFlag;
-}
-
-/** Setter for {@link AcknowledgeRPdu#requestID}*/
-public AcknowledgeRPdu setRequestID(int pRequestID)
+}
+
+/** Setter for {@link AcknowledgeRPdu#requestID}*/
+public AcknowledgeRPdu setRequestID(int pRequestID)
{
- requestID = pRequestID;
- return this;
-}
-
-/** Getter for {@link AcknowledgeRPdu#requestID}*/
-public int getRequestID()
+ requestID = pRequestID;
+ return this;
+}
+
+/** Getter for {@link AcknowledgeRPdu#requestID}*/
+public int getRequestID()
{
return requestID;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- acknowledgeFlag.marshal(dos);
- responseFlag.marshal(dos);
- dos.writeInt(requestID);
+ {
+ acknowledgeFlag.marshal(dos);
+ responseFlag.marshal(dos);
+ dos.writeInt(requestID);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- acknowledgeFlag = AcknowledgeAcknowledgeFlag.unmarshalEnum(dis);
- uPosition += acknowledgeFlag.getMarshalledSize();
- responseFlag = AcknowledgeResponseFlag.unmarshalEnum(dis);
- uPosition += responseFlag.getMarshalledSize();
- requestID = dis.readInt();
- uPosition += 4;
+ {
+ acknowledgeFlag = AcknowledgeAcknowledgeFlag.unmarshalEnum(dis);
+ uPosition += acknowledgeFlag.getMarshalledSize();
+ responseFlag = AcknowledgeResponseFlag.unmarshalEnum(dis);
+ uPosition += responseFlag.getMarshalledSize();
+ requestID = dis.readInt();
+ uPosition += 4;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- acknowledgeFlag.marshal(buff);
- responseFlag.marshal(buff);
- buff.putInt( (int)requestID);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ acknowledgeFlag.marshal(buff);
+ responseFlag.marshal(buff);
+ buff.putInt( (int)requestID);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- acknowledgeFlag = AcknowledgeAcknowledgeFlag.unmarshalEnum(buff);
- responseFlag = AcknowledgeResponseFlag.unmarshalEnum(buff);
- requestID = buff.getInt();
- return getMarshalledSize();
+
+ acknowledgeFlag = AcknowledgeAcknowledgeFlag.unmarshalEnum(buff);
+ responseFlag = AcknowledgeResponseFlag.unmarshalEnum(buff);
+ requestID = buff.getInt();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final AcknowledgeRPdu rhs = (AcknowledgeRPdu)obj;
-
- if( ! (acknowledgeFlag == rhs.acknowledgeFlag)) ivarsEqual = false;
- if( ! (responseFlag == rhs.responseFlag)) ivarsEqual = false;
- if( ! (requestID == rhs.requestID)) ivarsEqual = false;
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final AcknowledgeRPdu rhs = (AcknowledgeRPdu)obj;
+
+ if( ! (acknowledgeFlag == rhs.acknowledgeFlag)) ivarsEqual = false;
+ if( ! (responseFlag == rhs.responseFlag)) ivarsEqual = false;
+ if( ! (requestID == rhs.requestID)) ivarsEqual = false;
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" acknowledgeFlag: ").append(acknowledgeFlag).append("\n");
- sb.append(" responseFlag: ").append(responseFlag).append("\n");
- sb.append(" requestID: ").append(requestID).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" acknowledgeFlag: ").append(acknowledgeFlag).append("\n");
+ sb.append(" responseFlag: ").append(responseFlag).append("\n");
+ sb.append(" requestID: ").append(requestID).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/AcknowledgeReliablePdu.java b/src-generated/edu/nps/moves/dis7/AcknowledgeReliablePdu.java
index dcf00d2776e160cfda8e9c5069a74e4725bf049d..48263a58d990f0435a1aefb605882f3778b235e9 100644
--- a/src-generated/edu/nps/moves/dis7/AcknowledgeReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/AcknowledgeReliablePdu.java
@@ -1,17 +1,17 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * more descriptive name for a AcknowledgeRPdu
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class AcknowledgeReliablePdu extends AcknowledgeRPdu
-{}
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * more descriptive name for a AcknowledgeRPdu
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class AcknowledgeReliablePdu extends AcknowledgeRPdu
+{}
diff --git a/src-generated/edu/nps/moves/dis7/AcousticEmitter.java b/src-generated/edu/nps/moves/dis7/AcousticEmitter.java
index 2ac202cac2213e3ac47b05c4a5156daeaebacb01..fffa79ad34b885ba12eb1b8a8b8b7a7c280b99ed 100644
--- a/src-generated/edu/nps/moves/dis7/AcousticEmitter.java
+++ b/src-generated/edu/nps/moves/dis7/AcousticEmitter.java
@@ -1,210 +1,210 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * information about a specific UA emitter. Section 6.2.2.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class AcousticEmitter extends Object implements Serializable
-{
- /** the system for a particular UA emitter, and an enumeration uid 144 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * information about a specific UA emitter. Section 6.2.2.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class AcousticEmitter extends Object implements Serializable
+{
+ /** the system for a particular UA emitter, and an enumeration uid 144 */
protected UAAcousticSystemName acousticSystemName = UAAcousticSystemName.values()[0];
-
- /** The function of the acoustic system uid 145 */
+
+ /** The function of the acoustic system uid 145 */
protected UAAcousticEmitterSystemFunction acousticFunction = UAAcousticEmitterSystemFunction.values()[0];
-
- /** The UA emitter identification number relative to a specific system */
+
+ /** The UA emitter identification number relative to a specific system */
protected byte acousticIDNumber;
-
-
-/** Constructor */
- public AcousticEmitter()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += acousticSystemName.getMarshalledSize();
- marshalSize += acousticFunction.getMarshalledSize();
- marshalSize += 1; // acousticIDNumber
-
- return marshalSize;
-}
-
-
-/** Setter for {@link AcousticEmitter#acousticSystemName}*/
-public AcousticEmitter setAcousticSystemName(UAAcousticSystemName pAcousticSystemName)
+
+
+/** Constructor */
+ public AcousticEmitter()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += acousticSystemName.getMarshalledSize();
+ marshalSize += acousticFunction.getMarshalledSize();
+ marshalSize += 1; // acousticIDNumber
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link AcousticEmitter#acousticSystemName}*/
+public AcousticEmitter setAcousticSystemName(UAAcousticSystemName pAcousticSystemName)
{
- acousticSystemName = pAcousticSystemName;
- return this;
-}
-
-/** Getter for {@link AcousticEmitter#acousticSystemName}*/
-public UAAcousticSystemName getAcousticSystemName()
+ acousticSystemName = pAcousticSystemName;
+ return this;
+}
+
+/** Getter for {@link AcousticEmitter#acousticSystemName}*/
+public UAAcousticSystemName getAcousticSystemName()
{
return acousticSystemName;
-}
-
-/** Setter for {@link AcousticEmitter#acousticFunction}*/
-public AcousticEmitter setAcousticFunction(UAAcousticEmitterSystemFunction pAcousticFunction)
+}
+
+/** Setter for {@link AcousticEmitter#acousticFunction}*/
+public AcousticEmitter setAcousticFunction(UAAcousticEmitterSystemFunction pAcousticFunction)
{
- acousticFunction = pAcousticFunction;
- return this;
-}
-
-/** Getter for {@link AcousticEmitter#acousticFunction}*/
-public UAAcousticEmitterSystemFunction getAcousticFunction()
+ acousticFunction = pAcousticFunction;
+ return this;
+}
+
+/** Getter for {@link AcousticEmitter#acousticFunction}*/
+public UAAcousticEmitterSystemFunction getAcousticFunction()
{
return acousticFunction;
-}
-
-/** Setter for {@link AcousticEmitter#acousticIDNumber}*/
-public AcousticEmitter setAcousticIDNumber(byte pAcousticIDNumber)
+}
+
+/** Setter for {@link AcousticEmitter#acousticIDNumber}*/
+public AcousticEmitter setAcousticIDNumber(byte pAcousticIDNumber)
{
- acousticIDNumber = pAcousticIDNumber;
- return this;
-}
-
-/** Getter for {@link AcousticEmitter#acousticIDNumber}*/
-public byte getAcousticIDNumber()
+ acousticIDNumber = pAcousticIDNumber;
+ return this;
+}
+
+/** Getter for {@link AcousticEmitter#acousticIDNumber}*/
+public byte getAcousticIDNumber()
{
return acousticIDNumber;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- acousticSystemName.marshal(dos);
- acousticFunction.marshal(dos);
- dos.writeByte(acousticIDNumber);
+ {
+ acousticSystemName.marshal(dos);
+ acousticFunction.marshal(dos);
+ dos.writeByte(acousticIDNumber);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- acousticSystemName = UAAcousticSystemName.unmarshalEnum(dis);
- uPosition += acousticSystemName.getMarshalledSize();
- acousticFunction = UAAcousticEmitterSystemFunction.unmarshalEnum(dis);
- uPosition += acousticFunction.getMarshalledSize();
- acousticIDNumber = (byte)dis.readUnsignedByte();
- uPosition += 1;
+ {
+ acousticSystemName = UAAcousticSystemName.unmarshalEnum(dis);
+ uPosition += acousticSystemName.getMarshalledSize();
+ acousticFunction = UAAcousticEmitterSystemFunction.unmarshalEnum(dis);
+ uPosition += acousticFunction.getMarshalledSize();
+ acousticIDNumber = (byte)dis.readUnsignedByte();
+ uPosition += 1;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- acousticSystemName.marshal(buff);
- acousticFunction.marshal(buff);
- buff.put( (byte)acousticIDNumber);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- acousticSystemName = UAAcousticSystemName.unmarshalEnum(buff);
- acousticFunction = UAAcousticEmitterSystemFunction.unmarshalEnum(buff);
- acousticIDNumber = (byte)(buff.get() & 0xFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ acousticSystemName.marshal(buff);
+ acousticFunction.marshal(buff);
+ buff.put( (byte)acousticIDNumber);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ acousticSystemName = UAAcousticSystemName.unmarshalEnum(buff);
+ acousticFunction = UAAcousticEmitterSystemFunction.unmarshalEnum(buff);
+ acousticIDNumber = (byte)(buff.get() & 0xFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final AcousticEmitter rhs = (AcousticEmitter)obj;
-
- if( ! (acousticSystemName == rhs.acousticSystemName)) ivarsEqual = false;
- if( ! (acousticFunction == rhs.acousticFunction)) ivarsEqual = false;
- if( ! (acousticIDNumber == rhs.acousticIDNumber)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final AcousticEmitter rhs = (AcousticEmitter)obj;
+
+ if( ! (acousticSystemName == rhs.acousticSystemName)) ivarsEqual = false;
+ if( ! (acousticFunction == rhs.acousticFunction)) ivarsEqual = false;
+ if( ! (acousticIDNumber == rhs.acousticIDNumber)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" acousticSystemName: ").append(acousticSystemName).append("\n");
- sb.append(" acousticFunction: ").append(acousticFunction).append("\n");
- sb.append(" acousticIDNumber: ").append(acousticIDNumber).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" acousticSystemName: ").append(acousticSystemName).append("\n");
+ sb.append(" acousticFunction: ").append(acousticFunction).append("\n");
+ sb.append(" acousticIDNumber: ").append(acousticIDNumber).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ActionRequestPdu.java b/src-generated/edu/nps/moves/dis7/ActionRequestPdu.java
index 8b909b5efa0cc7122c01296975452c2231dfa3b7..a2c85f413ca0f4061d6008448e2cab151f93530b 100644
--- a/src-generated/edu/nps/moves/dis7/ActionRequestPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ActionRequestPdu.java
@@ -1,317 +1,317 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 7.5.7 A request from an SM to a managed entity to perform a specified action. See 5.6.5.7
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class ActionRequestPdu extends SimulationManagementFamilyPdu implements Serializable
-{
- /** identifies the request being made by the simulation manager */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 7.5.7 A request from an SM to a managed entity to perform a specified action. See 5.6.5.7
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class ActionRequestPdu extends SimulationManagementFamilyPdu implements Serializable
+{
+ /** identifies the request being made by the simulation manager */
protected int requestID;
-
- /** identifies the particular action being requested(see Section 7 of SISO-REF-010). uid 71 */
+
+ /** identifies the particular action being requested(see Section 7 of SISO-REF-010). uid 71 */
protected ActionRequestActionID actionID = ActionRequestActionID.values()[0];
-
- /** Number of fixed datum records */
+
+ /** Number of fixed datum records */
protected int numberOfFixedDatumRecords;
-
- /** Number of variable datum records, handled automatically by marshaller at run time (and not modifiable by end-user programmers) */
+
+ /** Number of variable datum records, handled automatically by marshaller at run time (and not modifiable by end-user programmers) */
protected int numberOfVariableDatumRecords;
-
- /** variable length list of fixed datums */
+
+ /** variable length list of fixed datums */
protected List< FixedDatum > fixedDatums = new ArrayList< FixedDatum >();
-
- /** variable length list of variable length datums */
+
+ /** variable length list of variable length datums */
protected List< VariableDatum > variableDatums = new ArrayList< VariableDatum >();
-
-
-/** Constructor */
- public ActionRequestPdu()
- {
- setPduType( DISPDUType.ACTION_REQUEST );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += 4; // requestID
- marshalSize += actionID.getMarshalledSize();
- marshalSize += 4; // numberOfFixedDatumRecords
- marshalSize += 4; // numberOfVariableDatumRecords
- for(int idx=0; idx < fixedDatums.size(); idx++)
- {
- FixedDatum listElement = fixedDatums.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
- for(int idx=0; idx < variableDatums.size(); idx++)
- {
- VariableDatum listElement = variableDatums.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link ActionRequestPdu#requestID}*/
-public ActionRequestPdu setRequestID(int pRequestID)
+
+
+/** Constructor */
+ public ActionRequestPdu()
+ {
+ setPduType( DISPDUType.ACTION_REQUEST );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += 4; // requestID
+ marshalSize += actionID.getMarshalledSize();
+ marshalSize += 4; // numberOfFixedDatumRecords
+ marshalSize += 4; // numberOfVariableDatumRecords
+ for(int idx=0; idx < fixedDatums.size(); idx++)
+ {
+ FixedDatum listElement = fixedDatums.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+ for(int idx=0; idx < variableDatums.size(); idx++)
+ {
+ VariableDatum listElement = variableDatums.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link ActionRequestPdu#requestID}*/
+public ActionRequestPdu setRequestID(int pRequestID)
{
- requestID = pRequestID;
- return this;
-}
-
-/** Getter for {@link ActionRequestPdu#requestID}*/
-public int getRequestID()
+ requestID = pRequestID;
+ return this;
+}
+
+/** Getter for {@link ActionRequestPdu#requestID}*/
+public int getRequestID()
{
return requestID;
-}
-
-/** Setter for {@link ActionRequestPdu#actionID}*/
-public ActionRequestPdu setActionID(ActionRequestActionID pActionID)
+}
+
+/** Setter for {@link ActionRequestPdu#actionID}*/
+public ActionRequestPdu setActionID(ActionRequestActionID pActionID)
{
- actionID = pActionID;
- return this;
-}
-
-/** Getter for {@link ActionRequestPdu#actionID}*/
-public ActionRequestActionID getActionID()
+ actionID = pActionID;
+ return this;
+}
+
+/** Getter for {@link ActionRequestPdu#actionID}*/
+public ActionRequestActionID getActionID()
{
return actionID;
-}
-
-/** Setter for {@link ActionRequestPdu#fixedDatums}*/
-public ActionRequestPdu setFixedDatums(List<FixedDatum> pFixedDatums)
+}
+
+/** Setter for {@link ActionRequestPdu#fixedDatums}*/
+public ActionRequestPdu setFixedDatums(List<FixedDatum> pFixedDatums)
{
- fixedDatums = pFixedDatums;
- return this;
-}
-
-/** Getter for {@link ActionRequestPdu#fixedDatums}*/
-public List<FixedDatum> getFixedDatums()
+ fixedDatums = pFixedDatums;
+ return this;
+}
+
+/** Getter for {@link ActionRequestPdu#fixedDatums}*/
+public List<FixedDatum> getFixedDatums()
{
return fixedDatums;
-}
-
-/** Setter for {@link ActionRequestPdu#variableDatums}*/
-public ActionRequestPdu setVariableDatums(List<VariableDatum> pVariableDatums)
+}
+
+/** Setter for {@link ActionRequestPdu#variableDatums}*/
+public ActionRequestPdu setVariableDatums(List<VariableDatum> pVariableDatums)
{
- variableDatums = pVariableDatums;
- return this;
-}
-
-/** Getter for {@link ActionRequestPdu#variableDatums}*/
-public List<VariableDatum> getVariableDatums()
+ variableDatums = pVariableDatums;
+ return this;
+}
+
+/** Getter for {@link ActionRequestPdu#variableDatums}*/
+public List<VariableDatum> getVariableDatums()
{
return variableDatums;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- dos.writeInt(requestID);
- actionID.marshal(dos);
- dos.writeInt(fixedDatums.size());
- dos.writeInt(variableDatums.size());
-
- for(int idx = 0; idx < fixedDatums.size(); idx++)
- {
- FixedDatum aFixedDatum = fixedDatums.get(idx);
- aFixedDatum.marshal(dos);
- }
-
-
- for(int idx = 0; idx < variableDatums.size(); idx++)
- {
- VariableDatum aVariableDatum = variableDatums.get(idx);
- aVariableDatum.marshal(dos);
- }
-
+ {
+ dos.writeInt(requestID);
+ actionID.marshal(dos);
+ dos.writeInt(fixedDatums.size());
+ dos.writeInt(variableDatums.size());
+
+ for(int idx = 0; idx < fixedDatums.size(); idx++)
+ {
+ FixedDatum aFixedDatum = fixedDatums.get(idx);
+ aFixedDatum.marshal(dos);
+ }
+
+
+ for(int idx = 0; idx < variableDatums.size(); idx++)
+ {
+ VariableDatum aVariableDatum = variableDatums.get(idx);
+ aVariableDatum.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- requestID = dis.readInt();
- uPosition += 4;
- actionID = ActionRequestActionID.unmarshalEnum(dis);
- uPosition += actionID.getMarshalledSize();
- numberOfFixedDatumRecords = dis.readInt();
- uPosition += 4;
- numberOfVariableDatumRecords = dis.readInt();
- uPosition += 4;
- for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
- {
- FixedDatum anX = new FixedDatum();
- uPosition += anX.unmarshal(dis);
- fixedDatums.add(anX);
- }
-
- for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
- {
- VariableDatum anX = new VariableDatum();
- uPosition += anX.unmarshal(dis);
- variableDatums.add(anX);
- }
-
+ {
+ requestID = dis.readInt();
+ uPosition += 4;
+ actionID = ActionRequestActionID.unmarshalEnum(dis);
+ uPosition += actionID.getMarshalledSize();
+ numberOfFixedDatumRecords = dis.readInt();
+ uPosition += 4;
+ numberOfVariableDatumRecords = dis.readInt();
+ uPosition += 4;
+ for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
+ {
+ FixedDatum anX = new FixedDatum();
+ uPosition += anX.unmarshal(dis);
+ fixedDatums.add(anX);
+ }
+
+ for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
+ {
+ VariableDatum anX = new VariableDatum();
+ uPosition += anX.unmarshal(dis);
+ variableDatums.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- buff.putInt( (int)requestID);
- actionID.marshal(buff);
- buff.putInt( (int)fixedDatums.size());
- buff.putInt( (int)variableDatums.size());
-
- for(int idx = 0; idx < fixedDatums.size(); idx++)
- {
- FixedDatum aFixedDatum = fixedDatums.get(idx);
- aFixedDatum.marshal(buff);
- }
-
-
- for(int idx = 0; idx < variableDatums.size(); idx++)
- {
- VariableDatum aVariableDatum = variableDatums.get(idx);
- aVariableDatum.marshal(buff);
- }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ buff.putInt( (int)requestID);
+ actionID.marshal(buff);
+ buff.putInt( (int)fixedDatums.size());
+ buff.putInt( (int)variableDatums.size());
+
+ for(int idx = 0; idx < fixedDatums.size(); idx++)
+ {
+ FixedDatum aFixedDatum = fixedDatums.get(idx);
+ aFixedDatum.marshal(buff);
+ }
+
+
+ for(int idx = 0; idx < variableDatums.size(); idx++)
+ {
+ VariableDatum aVariableDatum = variableDatums.get(idx);
+ aVariableDatum.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- requestID = buff.getInt();
- actionID = ActionRequestActionID.unmarshalEnum(buff);
- numberOfFixedDatumRecords = buff.getInt();
- numberOfVariableDatumRecords = buff.getInt();
- for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
- {
- FixedDatum anX = new FixedDatum();
- anX.unmarshal(buff);
- fixedDatums.add(anX);
- }
-
- for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
- {
- VariableDatum anX = new VariableDatum();
- anX.unmarshal(buff);
- variableDatums.add(anX);
- }
-
- return getMarshalledSize();
+
+ requestID = buff.getInt();
+ actionID = ActionRequestActionID.unmarshalEnum(buff);
+ numberOfFixedDatumRecords = buff.getInt();
+ numberOfVariableDatumRecords = buff.getInt();
+ for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
+ {
+ FixedDatum anX = new FixedDatum();
+ anX.unmarshal(buff);
+ fixedDatums.add(anX);
+ }
+
+ for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
+ {
+ VariableDatum anX = new VariableDatum();
+ anX.unmarshal(buff);
+ variableDatums.add(anX);
+ }
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final ActionRequestPdu rhs = (ActionRequestPdu)obj;
-
- if( ! (requestID == rhs.requestID)) ivarsEqual = false;
- if( ! (actionID == rhs.actionID)) ivarsEqual = false;
-
- for(int idx = 0; idx < fixedDatums.size(); idx++)
- if( ! ( fixedDatums.get(idx).equals(rhs.fixedDatums.get(idx)))) ivarsEqual = false;
-
-
- for(int idx = 0; idx < variableDatums.size(); idx++)
- if( ! ( variableDatums.get(idx).equals(rhs.variableDatums.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final ActionRequestPdu rhs = (ActionRequestPdu)obj;
+
+ if( ! (requestID == rhs.requestID)) ivarsEqual = false;
+ if( ! (actionID == rhs.actionID)) ivarsEqual = false;
+
+ for(int idx = 0; idx < fixedDatums.size(); idx++)
+ if( ! ( fixedDatums.get(idx).equals(rhs.fixedDatums.get(idx)))) ivarsEqual = false;
+
+
+ for(int idx = 0; idx < variableDatums.size(); idx++)
+ if( ! ( variableDatums.get(idx).equals(rhs.variableDatums.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" requestID: ").append(requestID).append("\n");
- sb.append(" actionID: ").append(actionID).append("\n");
- sb.append(" fixedDatums: ").append("\n");
- fixedDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
- sb.append(" variableDatums: ").append("\n");
- variableDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" requestID: ").append(requestID).append("\n");
+ sb.append(" actionID: ").append(actionID).append("\n");
+ sb.append(" fixedDatums: ").append("\n");
+ fixedDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+ sb.append(" variableDatums: ").append("\n");
+ variableDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ActionRequestRPdu.java b/src-generated/edu/nps/moves/dis7/ActionRequestRPdu.java
index 49a4457888a0748c44ed6c9822cc9bbe4eb237ad..f9ac604b54ee855462362b41c63dcff5b02e5929 100644
--- a/src-generated/edu/nps/moves/dis7/ActionRequestRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ActionRequestRPdu.java
@@ -1,389 +1,389 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.12.4.7 Serves the same function as the Action Request PDU but with the addition of reliability service levels.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class ActionRequestRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
-{
- /** level of reliability service used for this transaction uid 74 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 5.12.4.7 Serves the same function as the Action Request PDU but with the addition of reliability service levels.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class ActionRequestRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
+{
+ /** level of reliability service used for this transaction uid 74 */
protected RequiredReliabilityService requiredReliabilityService = RequiredReliabilityService.values()[0];
-
- /** padding */
+
+ /** padding */
protected byte pad1;
-
- /** padding */
+
+ /** padding */
protected short pad2;
-
- /** request ID */
+
+ /** request ID */
protected int requestID;
-
- /** request ID uid 71 */
+
+ /** request ID uid 71 */
protected ActionRequestActionID actionID = ActionRequestActionID.values()[0];
-
- /** Fixed datum record count */
+
+ /** Fixed datum record count */
protected int numberOfFixedDatumRecords;
-
- /** variable datum record count */
+
+ /** variable datum record count */
protected int numberOfVariableDatumRecords;
-
- /** Fixed datum records */
+
+ /** Fixed datum records */
protected List< FixedDatum > fixedDatumRecords = new ArrayList< FixedDatum >();
-
- /** Variable datum records */
+
+ /** Variable datum records */
protected List< VariableDatum > variableDatumRecords = new ArrayList< VariableDatum >();
-
-
-/** Constructor */
- public ActionRequestRPdu()
- {
- setPduType( DISPDUType.ACTION_REQUEST_RELIABLE );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public ActionRequestRPdu()
+ {
+ setPduType( DISPDUType.ACTION_REQUEST_RELIABLE );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += requiredReliabilityService.getMarshalledSize();
+ marshalSize += 1; // pad1
+ marshalSize += 2; // pad2
+ marshalSize += 4; // requestID
+ marshalSize += actionID.getMarshalledSize();
+ marshalSize += 4; // numberOfFixedDatumRecords
+ marshalSize += 4; // numberOfVariableDatumRecords
+ for(int idx=0; idx < fixedDatumRecords.size(); idx++)
+ {
+ FixedDatum listElement = fixedDatumRecords.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+ for(int idx=0; idx < variableDatumRecords.size(); idx++)
+ {
+ VariableDatum listElement = variableDatumRecords.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link ActionRequestRPdu#requiredReliabilityService}*/
+public ActionRequestRPdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += requiredReliabilityService.getMarshalledSize();
- marshalSize += 1; // pad1
- marshalSize += 2; // pad2
- marshalSize += 4; // requestID
- marshalSize += actionID.getMarshalledSize();
- marshalSize += 4; // numberOfFixedDatumRecords
- marshalSize += 4; // numberOfVariableDatumRecords
- for(int idx=0; idx < fixedDatumRecords.size(); idx++)
- {
- FixedDatum listElement = fixedDatumRecords.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
- for(int idx=0; idx < variableDatumRecords.size(); idx++)
- {
- VariableDatum listElement = variableDatumRecords.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link ActionRequestRPdu#requiredReliabilityService}*/
-public ActionRequestRPdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
-{
- requiredReliabilityService = pRequiredReliabilityService;
- return this;
-}
-
-/** Getter for {@link ActionRequestRPdu#requiredReliabilityService}*/
-public RequiredReliabilityService getRequiredReliabilityService()
+ requiredReliabilityService = pRequiredReliabilityService;
+ return this;
+}
+
+/** Getter for {@link ActionRequestRPdu#requiredReliabilityService}*/
+public RequiredReliabilityService getRequiredReliabilityService()
{
return requiredReliabilityService;
-}
-
-/** Setter for {@link ActionRequestRPdu#pad1}*/
-public ActionRequestRPdu setPad1(byte pPad1)
+}
+
+/** Setter for {@link ActionRequestRPdu#pad1}*/
+public ActionRequestRPdu setPad1(byte pPad1)
{
- pad1 = pPad1;
- return this;
-}
-
-/** Getter for {@link ActionRequestRPdu#pad1}*/
-public byte getPad1()
+ pad1 = pPad1;
+ return this;
+}
+
+/** Getter for {@link ActionRequestRPdu#pad1}*/
+public byte getPad1()
{
return pad1;
-}
-
-/** Setter for {@link ActionRequestRPdu#pad2}*/
-public ActionRequestRPdu setPad2(short pPad2)
+}
+
+/** Setter for {@link ActionRequestRPdu#pad2}*/
+public ActionRequestRPdu setPad2(short pPad2)
{
- pad2 = pPad2;
- return this;
-}
-
-/** Getter for {@link ActionRequestRPdu#pad2}*/
-public short getPad2()
+ pad2 = pPad2;
+ return this;
+}
+
+/** Getter for {@link ActionRequestRPdu#pad2}*/
+public short getPad2()
{
return pad2;
-}
-
-/** Setter for {@link ActionRequestRPdu#requestID}*/
-public ActionRequestRPdu setRequestID(int pRequestID)
+}
+
+/** Setter for {@link ActionRequestRPdu#requestID}*/
+public ActionRequestRPdu setRequestID(int pRequestID)
{
- requestID = pRequestID;
- return this;
-}
-
-/** Getter for {@link ActionRequestRPdu#requestID}*/
-public int getRequestID()
+ requestID = pRequestID;
+ return this;
+}
+
+/** Getter for {@link ActionRequestRPdu#requestID}*/
+public int getRequestID()
{
return requestID;
-}
-
-/** Setter for {@link ActionRequestRPdu#actionID}*/
-public ActionRequestRPdu setActionID(ActionRequestActionID pActionID)
+}
+
+/** Setter for {@link ActionRequestRPdu#actionID}*/
+public ActionRequestRPdu setActionID(ActionRequestActionID pActionID)
{
- actionID = pActionID;
- return this;
-}
-
-/** Getter for {@link ActionRequestRPdu#actionID}*/
-public ActionRequestActionID getActionID()
+ actionID = pActionID;
+ return this;
+}
+
+/** Getter for {@link ActionRequestRPdu#actionID}*/
+public ActionRequestActionID getActionID()
{
return actionID;
-}
-
-/** Setter for {@link ActionRequestRPdu#fixedDatumRecords}*/
-public ActionRequestRPdu setFixedDatumRecords(List<FixedDatum> pFixedDatumRecords)
+}
+
+/** Setter for {@link ActionRequestRPdu#fixedDatumRecords}*/
+public ActionRequestRPdu setFixedDatumRecords(List<FixedDatum> pFixedDatumRecords)
{
- fixedDatumRecords = pFixedDatumRecords;
- return this;
-}
-
-/** Getter for {@link ActionRequestRPdu#fixedDatumRecords}*/
-public List<FixedDatum> getFixedDatumRecords()
+ fixedDatumRecords = pFixedDatumRecords;
+ return this;
+}
+
+/** Getter for {@link ActionRequestRPdu#fixedDatumRecords}*/
+public List<FixedDatum> getFixedDatumRecords()
{
return fixedDatumRecords;
-}
-
-/** Setter for {@link ActionRequestRPdu#variableDatumRecords}*/
-public ActionRequestRPdu setVariableDatumRecords(List<VariableDatum> pVariableDatumRecords)
+}
+
+/** Setter for {@link ActionRequestRPdu#variableDatumRecords}*/
+public ActionRequestRPdu setVariableDatumRecords(List<VariableDatum> pVariableDatumRecords)
{
- variableDatumRecords = pVariableDatumRecords;
- return this;
-}
-
-/** Getter for {@link ActionRequestRPdu#variableDatumRecords}*/
-public List<VariableDatum> getVariableDatumRecords()
+ variableDatumRecords = pVariableDatumRecords;
+ return this;
+}
+
+/** Getter for {@link ActionRequestRPdu#variableDatumRecords}*/
+public List<VariableDatum> getVariableDatumRecords()
{
return variableDatumRecords;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- requiredReliabilityService.marshal(dos);
- dos.writeByte(pad1);
- dos.writeShort(pad2);
- dos.writeInt(requestID);
- actionID.marshal(dos);
- dos.writeInt(fixedDatumRecords.size());
- dos.writeInt(variableDatumRecords.size());
-
- for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
- {
- FixedDatum aFixedDatum = fixedDatumRecords.get(idx);
- aFixedDatum.marshal(dos);
- }
-
-
- for(int idx = 0; idx < variableDatumRecords.size(); idx++)
- {
- VariableDatum aVariableDatum = variableDatumRecords.get(idx);
- aVariableDatum.marshal(dos);
- }
-
+ {
+ requiredReliabilityService.marshal(dos);
+ dos.writeByte(pad1);
+ dos.writeShort(pad2);
+ dos.writeInt(requestID);
+ actionID.marshal(dos);
+ dos.writeInt(fixedDatumRecords.size());
+ dos.writeInt(variableDatumRecords.size());
+
+ for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
+ {
+ FixedDatum aFixedDatum = fixedDatumRecords.get(idx);
+ aFixedDatum.marshal(dos);
+ }
+
+
+ for(int idx = 0; idx < variableDatumRecords.size(); idx++)
+ {
+ VariableDatum aVariableDatum = variableDatumRecords.get(idx);
+ aVariableDatum.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(dis);
- uPosition += requiredReliabilityService.getMarshalledSize();
- pad1 = (byte)dis.readUnsignedByte();
- uPosition += 1;
- pad2 = (short)dis.readUnsignedShort();
- uPosition += 2;
- requestID = dis.readInt();
- uPosition += 4;
- actionID = ActionRequestActionID.unmarshalEnum(dis);
- uPosition += actionID.getMarshalledSize();
- numberOfFixedDatumRecords = dis.readInt();
- uPosition += 4;
- numberOfVariableDatumRecords = dis.readInt();
- uPosition += 4;
- for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
- {
- FixedDatum anX = new FixedDatum();
- uPosition += anX.unmarshal(dis);
- fixedDatumRecords.add(anX);
- }
-
- for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
- {
- VariableDatum anX = new VariableDatum();
- uPosition += anX.unmarshal(dis);
- variableDatumRecords.add(anX);
- }
-
+ {
+ requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(dis);
+ uPosition += requiredReliabilityService.getMarshalledSize();
+ pad1 = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ pad2 = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ requestID = dis.readInt();
+ uPosition += 4;
+ actionID = ActionRequestActionID.unmarshalEnum(dis);
+ uPosition += actionID.getMarshalledSize();
+ numberOfFixedDatumRecords = dis.readInt();
+ uPosition += 4;
+ numberOfVariableDatumRecords = dis.readInt();
+ uPosition += 4;
+ for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
+ {
+ FixedDatum anX = new FixedDatum();
+ uPosition += anX.unmarshal(dis);
+ fixedDatumRecords.add(anX);
+ }
+
+ for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
+ {
+ VariableDatum anX = new VariableDatum();
+ uPosition += anX.unmarshal(dis);
+ variableDatumRecords.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- requiredReliabilityService.marshal(buff);
- buff.put( (byte)pad1);
- buff.putShort( (short)pad2);
- buff.putInt( (int)requestID);
- actionID.marshal(buff);
- buff.putInt( (int)fixedDatumRecords.size());
- buff.putInt( (int)variableDatumRecords.size());
-
- for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
- {
- FixedDatum aFixedDatum = fixedDatumRecords.get(idx);
- aFixedDatum.marshal(buff);
- }
-
-
- for(int idx = 0; idx < variableDatumRecords.size(); idx++)
- {
- VariableDatum aVariableDatum = variableDatumRecords.get(idx);
- aVariableDatum.marshal(buff);
- }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ requiredReliabilityService.marshal(buff);
+ buff.put( (byte)pad1);
+ buff.putShort( (short)pad2);
+ buff.putInt( (int)requestID);
+ actionID.marshal(buff);
+ buff.putInt( (int)fixedDatumRecords.size());
+ buff.putInt( (int)variableDatumRecords.size());
+
+ for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
+ {
+ FixedDatum aFixedDatum = fixedDatumRecords.get(idx);
+ aFixedDatum.marshal(buff);
+ }
+
+
+ for(int idx = 0; idx < variableDatumRecords.size(); idx++)
+ {
+ VariableDatum aVariableDatum = variableDatumRecords.get(idx);
+ aVariableDatum.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(buff);
- pad1 = (byte)(buff.get() & 0xFF);
- pad2 = (short)(buff.getShort() & 0xFFFF);
- requestID = buff.getInt();
- actionID = ActionRequestActionID.unmarshalEnum(buff);
- numberOfFixedDatumRecords = buff.getInt();
- numberOfVariableDatumRecords = buff.getInt();
- for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
- {
- FixedDatum anX = new FixedDatum();
- anX.unmarshal(buff);
- fixedDatumRecords.add(anX);
- }
-
- for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
- {
- VariableDatum anX = new VariableDatum();
- anX.unmarshal(buff);
- variableDatumRecords.add(anX);
- }
-
- return getMarshalledSize();
+
+ requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(buff);
+ pad1 = (byte)(buff.get() & 0xFF);
+ pad2 = (short)(buff.getShort() & 0xFFFF);
+ requestID = buff.getInt();
+ actionID = ActionRequestActionID.unmarshalEnum(buff);
+ numberOfFixedDatumRecords = buff.getInt();
+ numberOfVariableDatumRecords = buff.getInt();
+ for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
+ {
+ FixedDatum anX = new FixedDatum();
+ anX.unmarshal(buff);
+ fixedDatumRecords.add(anX);
+ }
+
+ for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
+ {
+ VariableDatum anX = new VariableDatum();
+ anX.unmarshal(buff);
+ variableDatumRecords.add(anX);
+ }
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final ActionRequestRPdu rhs = (ActionRequestRPdu)obj;
-
- if( ! (requiredReliabilityService == rhs.requiredReliabilityService)) ivarsEqual = false;
- if( ! (pad1 == rhs.pad1)) ivarsEqual = false;
- if( ! (pad2 == rhs.pad2)) ivarsEqual = false;
- if( ! (requestID == rhs.requestID)) ivarsEqual = false;
- if( ! (actionID == rhs.actionID)) ivarsEqual = false;
-
- for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
- if( ! ( fixedDatumRecords.get(idx).equals(rhs.fixedDatumRecords.get(idx)))) ivarsEqual = false;
-
-
- for(int idx = 0; idx < variableDatumRecords.size(); idx++)
- if( ! ( variableDatumRecords.get(idx).equals(rhs.variableDatumRecords.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final ActionRequestRPdu rhs = (ActionRequestRPdu)obj;
+
+ if( ! (requiredReliabilityService == rhs.requiredReliabilityService)) ivarsEqual = false;
+ if( ! (pad1 == rhs.pad1)) ivarsEqual = false;
+ if( ! (pad2 == rhs.pad2)) ivarsEqual = false;
+ if( ! (requestID == rhs.requestID)) ivarsEqual = false;
+ if( ! (actionID == rhs.actionID)) ivarsEqual = false;
+
+ for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
+ if( ! ( fixedDatumRecords.get(idx).equals(rhs.fixedDatumRecords.get(idx)))) ivarsEqual = false;
+
+
+ for(int idx = 0; idx < variableDatumRecords.size(); idx++)
+ if( ! ( variableDatumRecords.get(idx).equals(rhs.variableDatumRecords.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
- sb.append(" pad1: ").append(pad1).append("\n");
- sb.append(" pad2: ").append(pad2).append("\n");
- sb.append(" requestID: ").append(requestID).append("\n");
- sb.append(" actionID: ").append(actionID).append("\n");
- sb.append(" fixedDatumRecords: ").append("\n");
- fixedDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
- sb.append(" variableDatumRecords: ").append("\n");
- variableDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
+ sb.append(" pad1: ").append(pad1).append("\n");
+ sb.append(" pad2: ").append(pad2).append("\n");
+ sb.append(" requestID: ").append(requestID).append("\n");
+ sb.append(" actionID: ").append(actionID).append("\n");
+ sb.append(" fixedDatumRecords: ").append("\n");
+ fixedDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+ sb.append(" variableDatumRecords: ").append("\n");
+ variableDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ActionRequestReliablePdu.java b/src-generated/edu/nps/moves/dis7/ActionRequestReliablePdu.java
index a1d0465733075f5eb3ae871bd9a0e7092e5e46bb..cfc15fd2ca30eac8f4a6e89a62c737510902d86a 100644
--- a/src-generated/edu/nps/moves/dis7/ActionRequestReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/ActionRequestReliablePdu.java
@@ -1,17 +1,17 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * more descriptive name for a ActionRequestRPdu
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class ActionRequestReliablePdu extends ActionRequestRPdu
-{}
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * more descriptive name for a ActionRequestRPdu
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class ActionRequestReliablePdu extends ActionRequestRPdu
+{}
diff --git a/src-generated/edu/nps/moves/dis7/ActionResponsePdu.java b/src-generated/edu/nps/moves/dis7/ActionResponsePdu.java
index 13f3c4a747d38f564bc9efc6965221a8d2485f24..ae9838259ca9101f0f45f9ac9860f8b8832299ba 100644
--- a/src-generated/edu/nps/moves/dis7/ActionResponsePdu.java
+++ b/src-generated/edu/nps/moves/dis7/ActionResponsePdu.java
@@ -1,317 +1,317 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Section 7.5.8. When an entity receives an Action Request PDU, that entity shall acknowledge the receipt of the Action Request PDU with an Action Response PDU. See 5.6.5.8.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class ActionResponsePdu extends SimulationManagementFamilyPdu implements Serializable
-{
- /** Request ID that is unique */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Section 7.5.8. When an entity receives an Action Request PDU, that entity shall acknowledge the receipt of the Action Request PDU with an Action Response PDU. See 5.6.5.8.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class ActionResponsePdu extends SimulationManagementFamilyPdu implements Serializable
+{
+ /** Request ID that is unique */
protected int requestID;
-
- /** Status of response uid 72 */
+
+ /** Status of response uid 72 */
protected ActionResponseRequestStatus requestStatus = ActionResponseRequestStatus.values()[0];
-
- /** Number of fixed datum records */
+
+ /** Number of fixed datum records */
protected int numberOfFixedDatumRecords;
-
- /** Number of variable datum records, handled automatically by marshaller at run time (and not modifiable by end-user programmers) */
+
+ /** Number of variable datum records, handled automatically by marshaller at run time (and not modifiable by end-user programmers) */
protected int numberOfVariableDatumRecords;
-
- /** fixed length list of fixed datums */
+
+ /** fixed length list of fixed datums */
protected List< FixedDatum > fixedDatums = new ArrayList< FixedDatum >();
-
- /** variable length list of variable length datums */
+
+ /** variable length list of variable length datums */
protected List< VariableDatum > variableDatums = new ArrayList< VariableDatum >();
-
-
-/** Constructor */
- public ActionResponsePdu()
- {
- setPduType( DISPDUType.ACTION_RESPONSE );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += 4; // requestID
- marshalSize += requestStatus.getMarshalledSize();
- marshalSize += 4; // numberOfFixedDatumRecords
- marshalSize += 4; // numberOfVariableDatumRecords
- for(int idx=0; idx < fixedDatums.size(); idx++)
- {
- FixedDatum listElement = fixedDatums.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
- for(int idx=0; idx < variableDatums.size(); idx++)
- {
- VariableDatum listElement = variableDatums.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link ActionResponsePdu#requestID}*/
-public ActionResponsePdu setRequestID(int pRequestID)
+
+
+/** Constructor */
+ public ActionResponsePdu()
+ {
+ setPduType( DISPDUType.ACTION_RESPONSE );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += 4; // requestID
+ marshalSize += requestStatus.getMarshalledSize();
+ marshalSize += 4; // numberOfFixedDatumRecords
+ marshalSize += 4; // numberOfVariableDatumRecords
+ for(int idx=0; idx < fixedDatums.size(); idx++)
+ {
+ FixedDatum listElement = fixedDatums.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+ for(int idx=0; idx < variableDatums.size(); idx++)
+ {
+ VariableDatum listElement = variableDatums.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link ActionResponsePdu#requestID}*/
+public ActionResponsePdu setRequestID(int pRequestID)
{
- requestID = pRequestID;
- return this;
-}
-
-/** Getter for {@link ActionResponsePdu#requestID}*/
-public int getRequestID()
+ requestID = pRequestID;
+ return this;
+}
+
+/** Getter for {@link ActionResponsePdu#requestID}*/
+public int getRequestID()
{
return requestID;
-}
-
-/** Setter for {@link ActionResponsePdu#requestStatus}*/
-public ActionResponsePdu setRequestStatus(ActionResponseRequestStatus pRequestStatus)
+}
+
+/** Setter for {@link ActionResponsePdu#requestStatus}*/
+public ActionResponsePdu setRequestStatus(ActionResponseRequestStatus pRequestStatus)
{
- requestStatus = pRequestStatus;
- return this;
-}
-
-/** Getter for {@link ActionResponsePdu#requestStatus}*/
-public ActionResponseRequestStatus getRequestStatus()
+ requestStatus = pRequestStatus;
+ return this;
+}
+
+/** Getter for {@link ActionResponsePdu#requestStatus}*/
+public ActionResponseRequestStatus getRequestStatus()
{
return requestStatus;
-}
-
-/** Setter for {@link ActionResponsePdu#fixedDatums}*/
-public ActionResponsePdu setFixedDatums(List<FixedDatum> pFixedDatums)
+}
+
+/** Setter for {@link ActionResponsePdu#fixedDatums}*/
+public ActionResponsePdu setFixedDatums(List<FixedDatum> pFixedDatums)
{
- fixedDatums = pFixedDatums;
- return this;
-}
-
-/** Getter for {@link ActionResponsePdu#fixedDatums}*/
-public List<FixedDatum> getFixedDatums()
+ fixedDatums = pFixedDatums;
+ return this;
+}
+
+/** Getter for {@link ActionResponsePdu#fixedDatums}*/
+public List<FixedDatum> getFixedDatums()
{
return fixedDatums;
-}
-
-/** Setter for {@link ActionResponsePdu#variableDatums}*/
-public ActionResponsePdu setVariableDatums(List<VariableDatum> pVariableDatums)
+}
+
+/** Setter for {@link ActionResponsePdu#variableDatums}*/
+public ActionResponsePdu setVariableDatums(List<VariableDatum> pVariableDatums)
{
- variableDatums = pVariableDatums;
- return this;
-}
-
-/** Getter for {@link ActionResponsePdu#variableDatums}*/
-public List<VariableDatum> getVariableDatums()
+ variableDatums = pVariableDatums;
+ return this;
+}
+
+/** Getter for {@link ActionResponsePdu#variableDatums}*/
+public List<VariableDatum> getVariableDatums()
{
return variableDatums;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- dos.writeInt(requestID);
- requestStatus.marshal(dos);
- dos.writeInt(fixedDatums.size());
- dos.writeInt(variableDatums.size());
-
- for(int idx = 0; idx < fixedDatums.size(); idx++)
- {
- FixedDatum aFixedDatum = fixedDatums.get(idx);
- aFixedDatum.marshal(dos);
- }
-
-
- for(int idx = 0; idx < variableDatums.size(); idx++)
- {
- VariableDatum aVariableDatum = variableDatums.get(idx);
- aVariableDatum.marshal(dos);
- }
-
+ {
+ dos.writeInt(requestID);
+ requestStatus.marshal(dos);
+ dos.writeInt(fixedDatums.size());
+ dos.writeInt(variableDatums.size());
+
+ for(int idx = 0; idx < fixedDatums.size(); idx++)
+ {
+ FixedDatum aFixedDatum = fixedDatums.get(idx);
+ aFixedDatum.marshal(dos);
+ }
+
+
+ for(int idx = 0; idx < variableDatums.size(); idx++)
+ {
+ VariableDatum aVariableDatum = variableDatums.get(idx);
+ aVariableDatum.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- requestID = dis.readInt();
- uPosition += 4;
- requestStatus = ActionResponseRequestStatus.unmarshalEnum(dis);
- uPosition += requestStatus.getMarshalledSize();
- numberOfFixedDatumRecords = dis.readInt();
- uPosition += 4;
- numberOfVariableDatumRecords = dis.readInt();
- uPosition += 4;
- for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
- {
- FixedDatum anX = new FixedDatum();
- uPosition += anX.unmarshal(dis);
- fixedDatums.add(anX);
- }
-
- for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
- {
- VariableDatum anX = new VariableDatum();
- uPosition += anX.unmarshal(dis);
- variableDatums.add(anX);
- }
-
+ {
+ requestID = dis.readInt();
+ uPosition += 4;
+ requestStatus = ActionResponseRequestStatus.unmarshalEnum(dis);
+ uPosition += requestStatus.getMarshalledSize();
+ numberOfFixedDatumRecords = dis.readInt();
+ uPosition += 4;
+ numberOfVariableDatumRecords = dis.readInt();
+ uPosition += 4;
+ for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
+ {
+ FixedDatum anX = new FixedDatum();
+ uPosition += anX.unmarshal(dis);
+ fixedDatums.add(anX);
+ }
+
+ for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
+ {
+ VariableDatum anX = new VariableDatum();
+ uPosition += anX.unmarshal(dis);
+ variableDatums.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- buff.putInt( (int)requestID);
- requestStatus.marshal(buff);
- buff.putInt( (int)fixedDatums.size());
- buff.putInt( (int)variableDatums.size());
-
- for(int idx = 0; idx < fixedDatums.size(); idx++)
- {
- FixedDatum aFixedDatum = fixedDatums.get(idx);
- aFixedDatum.marshal(buff);
- }
-
-
- for(int idx = 0; idx < variableDatums.size(); idx++)
- {
- VariableDatum aVariableDatum = variableDatums.get(idx);
- aVariableDatum.marshal(buff);
- }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ buff.putInt( (int)requestID);
+ requestStatus.marshal(buff);
+ buff.putInt( (int)fixedDatums.size());
+ buff.putInt( (int)variableDatums.size());
+
+ for(int idx = 0; idx < fixedDatums.size(); idx++)
+ {
+ FixedDatum aFixedDatum = fixedDatums.get(idx);
+ aFixedDatum.marshal(buff);
+ }
+
+
+ for(int idx = 0; idx < variableDatums.size(); idx++)
+ {
+ VariableDatum aVariableDatum = variableDatums.get(idx);
+ aVariableDatum.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- requestID = buff.getInt();
- requestStatus = ActionResponseRequestStatus.unmarshalEnum(buff);
- numberOfFixedDatumRecords = buff.getInt();
- numberOfVariableDatumRecords = buff.getInt();
- for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
- {
- FixedDatum anX = new FixedDatum();
- anX.unmarshal(buff);
- fixedDatums.add(anX);
- }
-
- for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
- {
- VariableDatum anX = new VariableDatum();
- anX.unmarshal(buff);
- variableDatums.add(anX);
- }
-
- return getMarshalledSize();
+
+ requestID = buff.getInt();
+ requestStatus = ActionResponseRequestStatus.unmarshalEnum(buff);
+ numberOfFixedDatumRecords = buff.getInt();
+ numberOfVariableDatumRecords = buff.getInt();
+ for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
+ {
+ FixedDatum anX = new FixedDatum();
+ anX.unmarshal(buff);
+ fixedDatums.add(anX);
+ }
+
+ for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
+ {
+ VariableDatum anX = new VariableDatum();
+ anX.unmarshal(buff);
+ variableDatums.add(anX);
+ }
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final ActionResponsePdu rhs = (ActionResponsePdu)obj;
-
- if( ! (requestID == rhs.requestID)) ivarsEqual = false;
- if( ! (requestStatus == rhs.requestStatus)) ivarsEqual = false;
-
- for(int idx = 0; idx < fixedDatums.size(); idx++)
- if( ! ( fixedDatums.get(idx).equals(rhs.fixedDatums.get(idx)))) ivarsEqual = false;
-
-
- for(int idx = 0; idx < variableDatums.size(); idx++)
- if( ! ( variableDatums.get(idx).equals(rhs.variableDatums.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final ActionResponsePdu rhs = (ActionResponsePdu)obj;
+
+ if( ! (requestID == rhs.requestID)) ivarsEqual = false;
+ if( ! (requestStatus == rhs.requestStatus)) ivarsEqual = false;
+
+ for(int idx = 0; idx < fixedDatums.size(); idx++)
+ if( ! ( fixedDatums.get(idx).equals(rhs.fixedDatums.get(idx)))) ivarsEqual = false;
+
+
+ for(int idx = 0; idx < variableDatums.size(); idx++)
+ if( ! ( variableDatums.get(idx).equals(rhs.variableDatums.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" requestID: ").append(requestID).append("\n");
- sb.append(" requestStatus: ").append(requestStatus).append("\n");
- sb.append(" fixedDatums: ").append("\n");
- fixedDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
- sb.append(" variableDatums: ").append("\n");
- variableDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" requestID: ").append(requestID).append("\n");
+ sb.append(" requestStatus: ").append(requestStatus).append("\n");
+ sb.append(" fixedDatums: ").append("\n");
+ fixedDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+ sb.append(" variableDatums: ").append("\n");
+ variableDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ActionResponseRPdu.java b/src-generated/edu/nps/moves/dis7/ActionResponseRPdu.java
index 4a6046460ab67d55e0081ce44ee022b537ce7c10..82098f5cff9b8326ffe916a9af3de4eb29c9cce2 100644
--- a/src-generated/edu/nps/moves/dis7/ActionResponseRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ActionResponseRPdu.java
@@ -1,317 +1,317 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.12.4.8 Serves the same function as the Action Response PDU (see 5.6.5.8.1) but is used to acknowledge the receipt of an Action Request-R PDU.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class ActionResponseRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
-{
- /** request ID */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 5.12.4.8 Serves the same function as the Action Response PDU (see 5.6.5.8.1) but is used to acknowledge the receipt of an Action Request-R PDU.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class ActionResponseRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
+{
+ /** request ID */
protected int requestID;
-
- /** status of response uid 72 */
+
+ /** status of response uid 72 */
protected ActionResponseRequestStatus responseStatus = ActionResponseRequestStatus.values()[0];
-
- /** Fixed datum record count */
+
+ /** Fixed datum record count */
protected int numberOfFixedDatumRecords;
-
- /** variable datum record count */
+
+ /** variable datum record count */
protected int numberOfVariableDatumRecords;
-
- /** Fixed datum records */
+
+ /** Fixed datum records */
protected List< FixedDatum > fixedDatumRecords = new ArrayList< FixedDatum >();
-
- /** Variable datum records */
+
+ /** Variable datum records */
protected List< VariableDatum > variableDatumRecords = new ArrayList< VariableDatum >();
-
-
-/** Constructor */
- public ActionResponseRPdu()
- {
- setPduType( DISPDUType.ACTION_RESPONSE_RELIABLE );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += 4; // requestID
- marshalSize += responseStatus.getMarshalledSize();
- marshalSize += 4; // numberOfFixedDatumRecords
- marshalSize += 4; // numberOfVariableDatumRecords
- for(int idx=0; idx < fixedDatumRecords.size(); idx++)
- {
- FixedDatum listElement = fixedDatumRecords.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
- for(int idx=0; idx < variableDatumRecords.size(); idx++)
- {
- VariableDatum listElement = variableDatumRecords.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link ActionResponseRPdu#requestID}*/
-public ActionResponseRPdu setRequestID(int pRequestID)
+
+
+/** Constructor */
+ public ActionResponseRPdu()
+ {
+ setPduType( DISPDUType.ACTION_RESPONSE_RELIABLE );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += 4; // requestID
+ marshalSize += responseStatus.getMarshalledSize();
+ marshalSize += 4; // numberOfFixedDatumRecords
+ marshalSize += 4; // numberOfVariableDatumRecords
+ for(int idx=0; idx < fixedDatumRecords.size(); idx++)
+ {
+ FixedDatum listElement = fixedDatumRecords.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+ for(int idx=0; idx < variableDatumRecords.size(); idx++)
+ {
+ VariableDatum listElement = variableDatumRecords.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link ActionResponseRPdu#requestID}*/
+public ActionResponseRPdu setRequestID(int pRequestID)
{
- requestID = pRequestID;
- return this;
-}
-
-/** Getter for {@link ActionResponseRPdu#requestID}*/
-public int getRequestID()
+ requestID = pRequestID;
+ return this;
+}
+
+/** Getter for {@link ActionResponseRPdu#requestID}*/
+public int getRequestID()
{
return requestID;
-}
-
-/** Setter for {@link ActionResponseRPdu#responseStatus}*/
-public ActionResponseRPdu setResponseStatus(ActionResponseRequestStatus pResponseStatus)
+}
+
+/** Setter for {@link ActionResponseRPdu#responseStatus}*/
+public ActionResponseRPdu setResponseStatus(ActionResponseRequestStatus pResponseStatus)
{
- responseStatus = pResponseStatus;
- return this;
-}
-
-/** Getter for {@link ActionResponseRPdu#responseStatus}*/
-public ActionResponseRequestStatus getResponseStatus()
+ responseStatus = pResponseStatus;
+ return this;
+}
+
+/** Getter for {@link ActionResponseRPdu#responseStatus}*/
+public ActionResponseRequestStatus getResponseStatus()
{
return responseStatus;
-}
-
-/** Setter for {@link ActionResponseRPdu#fixedDatumRecords}*/
-public ActionResponseRPdu setFixedDatumRecords(List<FixedDatum> pFixedDatumRecords)
+}
+
+/** Setter for {@link ActionResponseRPdu#fixedDatumRecords}*/
+public ActionResponseRPdu setFixedDatumRecords(List<FixedDatum> pFixedDatumRecords)
{
- fixedDatumRecords = pFixedDatumRecords;
- return this;
-}
-
-/** Getter for {@link ActionResponseRPdu#fixedDatumRecords}*/
-public List<FixedDatum> getFixedDatumRecords()
+ fixedDatumRecords = pFixedDatumRecords;
+ return this;
+}
+
+/** Getter for {@link ActionResponseRPdu#fixedDatumRecords}*/
+public List<FixedDatum> getFixedDatumRecords()
{
return fixedDatumRecords;
-}
-
-/** Setter for {@link ActionResponseRPdu#variableDatumRecords}*/
-public ActionResponseRPdu setVariableDatumRecords(List<VariableDatum> pVariableDatumRecords)
+}
+
+/** Setter for {@link ActionResponseRPdu#variableDatumRecords}*/
+public ActionResponseRPdu setVariableDatumRecords(List<VariableDatum> pVariableDatumRecords)
{
- variableDatumRecords = pVariableDatumRecords;
- return this;
-}
-
-/** Getter for {@link ActionResponseRPdu#variableDatumRecords}*/
-public List<VariableDatum> getVariableDatumRecords()
+ variableDatumRecords = pVariableDatumRecords;
+ return this;
+}
+
+/** Getter for {@link ActionResponseRPdu#variableDatumRecords}*/
+public List<VariableDatum> getVariableDatumRecords()
{
return variableDatumRecords;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- dos.writeInt(requestID);
- responseStatus.marshal(dos);
- dos.writeInt(fixedDatumRecords.size());
- dos.writeInt(variableDatumRecords.size());
-
- for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
- {
- FixedDatum aFixedDatum = fixedDatumRecords.get(idx);
- aFixedDatum.marshal(dos);
- }
-
-
- for(int idx = 0; idx < variableDatumRecords.size(); idx++)
- {
- VariableDatum aVariableDatum = variableDatumRecords.get(idx);
- aVariableDatum.marshal(dos);
- }
-
+ {
+ dos.writeInt(requestID);
+ responseStatus.marshal(dos);
+ dos.writeInt(fixedDatumRecords.size());
+ dos.writeInt(variableDatumRecords.size());
+
+ for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
+ {
+ FixedDatum aFixedDatum = fixedDatumRecords.get(idx);
+ aFixedDatum.marshal(dos);
+ }
+
+
+ for(int idx = 0; idx < variableDatumRecords.size(); idx++)
+ {
+ VariableDatum aVariableDatum = variableDatumRecords.get(idx);
+ aVariableDatum.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- requestID = dis.readInt();
- uPosition += 4;
- responseStatus = ActionResponseRequestStatus.unmarshalEnum(dis);
- uPosition += responseStatus.getMarshalledSize();
- numberOfFixedDatumRecords = dis.readInt();
- uPosition += 4;
- numberOfVariableDatumRecords = dis.readInt();
- uPosition += 4;
- for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
- {
- FixedDatum anX = new FixedDatum();
- uPosition += anX.unmarshal(dis);
- fixedDatumRecords.add(anX);
- }
-
- for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
- {
- VariableDatum anX = new VariableDatum();
- uPosition += anX.unmarshal(dis);
- variableDatumRecords.add(anX);
- }
-
+ {
+ requestID = dis.readInt();
+ uPosition += 4;
+ responseStatus = ActionResponseRequestStatus.unmarshalEnum(dis);
+ uPosition += responseStatus.getMarshalledSize();
+ numberOfFixedDatumRecords = dis.readInt();
+ uPosition += 4;
+ numberOfVariableDatumRecords = dis.readInt();
+ uPosition += 4;
+ for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
+ {
+ FixedDatum anX = new FixedDatum();
+ uPosition += anX.unmarshal(dis);
+ fixedDatumRecords.add(anX);
+ }
+
+ for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
+ {
+ VariableDatum anX = new VariableDatum();
+ uPosition += anX.unmarshal(dis);
+ variableDatumRecords.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- buff.putInt( (int)requestID);
- responseStatus.marshal(buff);
- buff.putInt( (int)fixedDatumRecords.size());
- buff.putInt( (int)variableDatumRecords.size());
-
- for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
- {
- FixedDatum aFixedDatum = fixedDatumRecords.get(idx);
- aFixedDatum.marshal(buff);
- }
-
-
- for(int idx = 0; idx < variableDatumRecords.size(); idx++)
- {
- VariableDatum aVariableDatum = variableDatumRecords.get(idx);
- aVariableDatum.marshal(buff);
- }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ buff.putInt( (int)requestID);
+ responseStatus.marshal(buff);
+ buff.putInt( (int)fixedDatumRecords.size());
+ buff.putInt( (int)variableDatumRecords.size());
+
+ for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
+ {
+ FixedDatum aFixedDatum = fixedDatumRecords.get(idx);
+ aFixedDatum.marshal(buff);
+ }
+
+
+ for(int idx = 0; idx < variableDatumRecords.size(); idx++)
+ {
+ VariableDatum aVariableDatum = variableDatumRecords.get(idx);
+ aVariableDatum.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- requestID = buff.getInt();
- responseStatus = ActionResponseRequestStatus.unmarshalEnum(buff);
- numberOfFixedDatumRecords = buff.getInt();
- numberOfVariableDatumRecords = buff.getInt();
- for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
- {
- FixedDatum anX = new FixedDatum();
- anX.unmarshal(buff);
- fixedDatumRecords.add(anX);
- }
-
- for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
- {
- VariableDatum anX = new VariableDatum();
- anX.unmarshal(buff);
- variableDatumRecords.add(anX);
- }
-
- return getMarshalledSize();
+
+ requestID = buff.getInt();
+ responseStatus = ActionResponseRequestStatus.unmarshalEnum(buff);
+ numberOfFixedDatumRecords = buff.getInt();
+ numberOfVariableDatumRecords = buff.getInt();
+ for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
+ {
+ FixedDatum anX = new FixedDatum();
+ anX.unmarshal(buff);
+ fixedDatumRecords.add(anX);
+ }
+
+ for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
+ {
+ VariableDatum anX = new VariableDatum();
+ anX.unmarshal(buff);
+ variableDatumRecords.add(anX);
+ }
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final ActionResponseRPdu rhs = (ActionResponseRPdu)obj;
-
- if( ! (requestID == rhs.requestID)) ivarsEqual = false;
- if( ! (responseStatus == rhs.responseStatus)) ivarsEqual = false;
-
- for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
- if( ! ( fixedDatumRecords.get(idx).equals(rhs.fixedDatumRecords.get(idx)))) ivarsEqual = false;
-
-
- for(int idx = 0; idx < variableDatumRecords.size(); idx++)
- if( ! ( variableDatumRecords.get(idx).equals(rhs.variableDatumRecords.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final ActionResponseRPdu rhs = (ActionResponseRPdu)obj;
+
+ if( ! (requestID == rhs.requestID)) ivarsEqual = false;
+ if( ! (responseStatus == rhs.responseStatus)) ivarsEqual = false;
+
+ for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
+ if( ! ( fixedDatumRecords.get(idx).equals(rhs.fixedDatumRecords.get(idx)))) ivarsEqual = false;
+
+
+ for(int idx = 0; idx < variableDatumRecords.size(); idx++)
+ if( ! ( variableDatumRecords.get(idx).equals(rhs.variableDatumRecords.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" requestID: ").append(requestID).append("\n");
- sb.append(" responseStatus: ").append(responseStatus).append("\n");
- sb.append(" fixedDatumRecords: ").append("\n");
- fixedDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
- sb.append(" variableDatumRecords: ").append("\n");
- variableDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" requestID: ").append(requestID).append("\n");
+ sb.append(" responseStatus: ").append(responseStatus).append("\n");
+ sb.append(" fixedDatumRecords: ").append("\n");
+ fixedDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+ sb.append(" variableDatumRecords: ").append("\n");
+ variableDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ActionResponseReliablePdu.java b/src-generated/edu/nps/moves/dis7/ActionResponseReliablePdu.java
index bc892f2835ba0641853c113e06d2f11ef32d6825..7ba70b38c8a36107bc2302cfd8312fc5e1f383c6 100644
--- a/src-generated/edu/nps/moves/dis7/ActionResponseReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/ActionResponseReliablePdu.java
@@ -1,17 +1,17 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * more descriptive name for a ActionResponseRPdu
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class ActionResponseReliablePdu extends ActionResponseRPdu
-{}
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * more descriptive name for a ActionResponseRPdu
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class ActionResponseReliablePdu extends ActionResponseRPdu
+{}
diff --git a/src-generated/edu/nps/moves/dis7/AggregateIdentifier.java b/src-generated/edu/nps/moves/dis7/AggregateIdentifier.java
index 9ed0a92c97fc69ff0050f4d5073a570e9001eed2..55d3342bd93fc4aa3adaa0f80959075a709cab54 100644
--- a/src-generated/edu/nps/moves/dis7/AggregateIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/AggregateIdentifier.java
@@ -1,185 +1,185 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * The unique designation of each aggregate in an exercise is specified by an aggregate identifier record. The aggregate ID is not an entity and shall not be treated as such. Section 6.2.3.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class AggregateIdentifier extends Object implements Serializable
-{
- /** Simulation address, ie site and application, the first two fields of the entity ID */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * The unique designation of each aggregate in an exercise is specified by an aggregate identifier record. The aggregate ID is not an entity and shall not be treated as such. Section 6.2.3.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class AggregateIdentifier extends Object implements Serializable
+{
+ /** Simulation address, ie site and application, the first two fields of the entity ID */
protected SimulationAddress simulationAddress = new SimulationAddress();
-
- /** the aggregate ID */
+
+ /** the aggregate ID */
protected short aggregateID;
-
-
-/** Constructor */
- public AggregateIdentifier()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += simulationAddress.getMarshalledSize();
- marshalSize += 2; // aggregateID
-
- return marshalSize;
-}
-
-
-/** Setter for {@link AggregateIdentifier#simulationAddress}*/
-public AggregateIdentifier setSimulationAddress(SimulationAddress pSimulationAddress)
+
+
+/** Constructor */
+ public AggregateIdentifier()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += simulationAddress.getMarshalledSize();
+ marshalSize += 2; // aggregateID
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link AggregateIdentifier#simulationAddress}*/
+public AggregateIdentifier setSimulationAddress(SimulationAddress pSimulationAddress)
{
- simulationAddress = pSimulationAddress;
- return this;
-}
-
-/** Getter for {@link AggregateIdentifier#simulationAddress}*/
-public SimulationAddress getSimulationAddress()
+ simulationAddress = pSimulationAddress;
+ return this;
+}
+
+/** Getter for {@link AggregateIdentifier#simulationAddress}*/
+public SimulationAddress getSimulationAddress()
{
return simulationAddress;
-}
-
-/** Setter for {@link AggregateIdentifier#aggregateID}*/
-public AggregateIdentifier setAggregateID(short pAggregateID)
+}
+
+/** Setter for {@link AggregateIdentifier#aggregateID}*/
+public AggregateIdentifier setAggregateID(short pAggregateID)
{
- aggregateID = pAggregateID;
- return this;
-}
-
-/** Getter for {@link AggregateIdentifier#aggregateID}*/
-public short getAggregateID()
+ aggregateID = pAggregateID;
+ return this;
+}
+
+/** Getter for {@link AggregateIdentifier#aggregateID}*/
+public short getAggregateID()
{
return aggregateID;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- simulationAddress.marshal(dos);
- dos.writeShort(aggregateID);
+ {
+ simulationAddress.marshal(dos);
+ dos.writeShort(aggregateID);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- uPosition += simulationAddress.unmarshal(dis);
- aggregateID = (short)dis.readUnsignedShort();
- uPosition += 2;
+ {
+ uPosition += simulationAddress.unmarshal(dis);
+ aggregateID = (short)dis.readUnsignedShort();
+ uPosition += 2;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- simulationAddress.marshal(buff);
- buff.putShort( (short)aggregateID);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- simulationAddress.unmarshal(buff);
- aggregateID = (short)(buff.getShort() & 0xFFFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ simulationAddress.marshal(buff);
+ buff.putShort( (short)aggregateID);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ simulationAddress.unmarshal(buff);
+ aggregateID = (short)(buff.getShort() & 0xFFFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final AggregateIdentifier rhs = (AggregateIdentifier)obj;
-
- if( ! (simulationAddress.equals( rhs.simulationAddress) )) ivarsEqual = false;
- if( ! (aggregateID == rhs.aggregateID)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final AggregateIdentifier rhs = (AggregateIdentifier)obj;
+
+ if( ! (simulationAddress.equals( rhs.simulationAddress) )) ivarsEqual = false;
+ if( ! (aggregateID == rhs.aggregateID)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
- sb.append(" aggregateID: ").append(aggregateID).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
+ sb.append(" aggregateID: ").append(aggregateID).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/AggregateMarking.java b/src-generated/edu/nps/moves/dis7/AggregateMarking.java
index 78743f8630b0e246a78f995140c0bb4cc49da2cb..96814e86feb3976671c6daad6e8e93225620bea4 100644
--- a/src-generated/edu/nps/moves/dis7/AggregateMarking.java
+++ b/src-generated/edu/nps/moves/dis7/AggregateMarking.java
@@ -1,200 +1,200 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Specifies the character set used in the first byte, followed by up to 31 characters of text data. Section 6.2.4.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class AggregateMarking extends Object implements Serializable
-{
- /** The character set uid 45 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Specifies the character set used in the first byte, followed by up to 31 characters of text data. Section 6.2.4.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class AggregateMarking extends Object implements Serializable
+{
+ /** The character set uid 45 */
protected EntityMarkingCharacterSet characterSet = EntityMarkingCharacterSet.values()[0];
-
- /** The characters */
+
+ /** The characters */
protected byte[] characters = new byte[31];
-
-
-/** Constructor */
- public AggregateMarking()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += characterSet.getMarshalledSize();
- marshalSize += characters.length * 1;
-
- return marshalSize;
-}
-
-
-/** Setter for {@link AggregateMarking#characterSet}*/
-public AggregateMarking setCharacterSet(EntityMarkingCharacterSet pCharacterSet)
+
+
+/** Constructor */
+ public AggregateMarking()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += characterSet.getMarshalledSize();
+ marshalSize += characters.length * 1;
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link AggregateMarking#characterSet}*/
+public AggregateMarking setCharacterSet(EntityMarkingCharacterSet pCharacterSet)
{
- characterSet = pCharacterSet;
- return this;
-}
-
-/** Getter for {@link AggregateMarking#characterSet}*/
-public EntityMarkingCharacterSet getCharacterSet()
+ characterSet = pCharacterSet;
+ return this;
+}
+
+/** Getter for {@link AggregateMarking#characterSet}*/
+public EntityMarkingCharacterSet getCharacterSet()
{
return characterSet;
-}
-
-/** Setter for {@link AggregateMarking#characters}*/
-public AggregateMarking setCharacters(byte[] pCharacters)
+}
+
+/** Setter for {@link AggregateMarking#characters}*/
+public AggregateMarking setCharacters(byte[] pCharacters)
{
- characters = pCharacters;
- return this;
-}
-
-/** Getter for {@link AggregateMarking#characters}*/
-public byte[] getCharacters()
+ characters = pCharacters;
+ return this;
+}
+
+/** Getter for {@link AggregateMarking#characters}*/
+public byte[] getCharacters()
{
return characters;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- characterSet.marshal(dos);
-
- for(int idx = 0; idx < characters.length; idx++)
- dos.writeByte(characters[idx]);
-
+ {
+ characterSet.marshal(dos);
+
+ for(int idx = 0; idx < characters.length; idx++)
+ dos.writeByte(characters[idx]);
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- characterSet = EntityMarkingCharacterSet.unmarshalEnum(dis);
- uPosition += characterSet.getMarshalledSize();
- for(int idx = 0; idx < characters.length; idx++)
- characters[idx] = dis.readByte();
- uPosition += (characters.length * 1);
+ {
+ characterSet = EntityMarkingCharacterSet.unmarshalEnum(dis);
+ uPosition += characterSet.getMarshalledSize();
+ for(int idx = 0; idx < characters.length; idx++)
+ characters[idx] = dis.readByte();
+ uPosition += (characters.length * 1);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- characterSet.marshal(buff);
-
- for(int idx = 0; idx < characters.length; idx++)
- buff.put((byte)characters[idx]);
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- characterSet = EntityMarkingCharacterSet.unmarshalEnum(buff);
- for(int idx = 0; idx < characters.length; idx++)
- characters[idx] = buff.get();
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ characterSet.marshal(buff);
+
+ for(int idx = 0; idx < characters.length; idx++)
+ buff.put((byte)characters[idx]);
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ characterSet = EntityMarkingCharacterSet.unmarshalEnum(buff);
+ for(int idx = 0; idx < characters.length; idx++)
+ characters[idx] = buff.get();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final AggregateMarking rhs = (AggregateMarking)obj;
-
- if( ! (characterSet == rhs.characterSet)) ivarsEqual = false;
-
- for(int idx = 0; idx < 31; idx++)
- {
- if(!(characters[idx] == rhs.characters[idx])) ivarsEqual = false;
- }
-
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final AggregateMarking rhs = (AggregateMarking)obj;
+
+ if( ! (characterSet == rhs.characterSet)) ivarsEqual = false;
+
+ for(int idx = 0; idx < 31; idx++)
+ {
+ if(!(characters[idx] == rhs.characters[idx])) ivarsEqual = false;
+ }
+
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" characterSet: ").append(characterSet).append("\n");
- sb.append(" characters: ").append("\n");
- sb.append(Arrays.toString(characters)).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" characterSet: ").append(characterSet).append("\n");
+ sb.append(" characters: ").append("\n");
+ sb.append(Arrays.toString(characters)).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/AggregateStatePdu.java b/src-generated/edu/nps/moves/dis7/AggregateStatePdu.java
index bda5e8cbb53c5a4bfa29ca0349425259f3a296d4..86fb388750eb294d4bab1381238174516f9dd4fc 100644
--- a/src-generated/edu/nps/moves/dis7/AggregateStatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/AggregateStatePdu.java
@@ -1,703 +1,703 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.9.2.2 The Aggregate State PDU shall be used to communicate the state and other pertinent information about an aggregated unit.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class AggregateStatePdu extends EntityManagementFamilyPdu implements Serializable
-{
- /** ID of aggregated entities */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 5.9.2.2 The Aggregate State PDU shall be used to communicate the state and other pertinent information about an aggregated unit.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class AggregateStatePdu extends EntityManagementFamilyPdu implements Serializable
+{
+ /** ID of aggregated entities */
protected AggregateIdentifier aggregateID = new AggregateIdentifier();
-
- /** force ID uid 6 */
+
+ /** force ID uid 6 */
protected ForceID forceID = ForceID.values()[0];
-
- /** state of aggregate uid 204 */
+
+ /** state of aggregate uid 204 */
protected AggregateStateAggregateState aggregateState = AggregateStateAggregateState.values()[0];
-
- /** entity type of the aggregated entities */
+
+ /** entity type of the aggregated entities */
protected AggregateType aggregateType = new AggregateType();
-
- /** formation of aggregated entities uid 205 */
+
+ /** formation of aggregated entities uid 205 */
protected AggregateStateFormation formation = AggregateStateFormation.values()[0];
-
- /** marking for aggregate; first char is charset type, rest is char data */
+
+ /** marking for aggregate; first char is charset type, rest is char data */
protected AggregateMarking aggregateMarking = new AggregateMarking();
-
- /** dimensions of bounding box for the aggregated entities, origin at the center of mass */
+
+ /** dimensions of bounding box for the aggregated entities, origin at the center of mass */
protected Vector3Float dimensions = new Vector3Float();
-
- /** orientation of the bounding box */
+
+ /** orientation of the bounding box */
protected Vector3Float orientation = new Vector3Float();
-
- /** center of mass of the aggregation */
+
+ /** center of mass of the aggregation */
protected Vector3Double centerOfMass = new Vector3Double();
-
- /** velocity of aggregation */
+
+ /** velocity of aggregation */
protected Vector3Float velocity = new Vector3Float();
-
- /** number of aggregates */
+
+ /** number of aggregates */
protected short numberOfDisAggregates;
-
- /** number of entities */
+
+ /** number of entities */
protected short numberOfDisEntities;
-
- /** number of silent aggregate types */
+
+ /** number of silent aggregate types */
protected short numberOfSilentAggregateTypes;
-
- /** Number of silent entity types, handled automatically by marshaller at run time (and not modifiable by end-user programmers) */
+
+ /** Number of silent entity types, handled automatically by marshaller at run time (and not modifiable by end-user programmers) */
protected short numberOfSilentEntityTypes;
-
- /** aggregates list */
+
+ /** aggregates list */
protected List< AggregateIdentifier > aggregateIDList = new ArrayList< AggregateIdentifier >();
-
- /** entity ID list */
+
+ /** entity ID list */
protected List< EntityID > entityIDList = new ArrayList< EntityID >();
-
+
private byte[] padTo32 = new byte[0]; // pad to 32-bit boundary
-
- /** silent entity types */
+
+ /** silent entity types */
protected List< EntityType > silentAggregateSystemList = new ArrayList< EntityType >();
-
- /** silent entity types */
+
+ /** silent entity types */
protected List< EntityType > silentEntitySystemList = new ArrayList< EntityType >();
-
- /** Number of variable datum records, handled automatically by marshaller at run time (and not modifiable by end-user programmers) */
+
+ /** Number of variable datum records, handled automatically by marshaller at run time (and not modifiable by end-user programmers) */
protected int numberOfVariableDatumRecords;
-
- /** variableDatums */
+
+ /** variableDatums */
protected List< VariableDatum > variableDatumList = new ArrayList< VariableDatum >();
-
-
-/** Constructor */
- public AggregateStatePdu()
- {
- setPduType( DISPDUType.AGGREGATE_STATE );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += aggregateID.getMarshalledSize();
- marshalSize += forceID.getMarshalledSize();
- marshalSize += aggregateState.getMarshalledSize();
- marshalSize += aggregateType.getMarshalledSize();
- marshalSize += formation.getMarshalledSize();
- marshalSize += aggregateMarking.getMarshalledSize();
- marshalSize += dimensions.getMarshalledSize();
- marshalSize += orientation.getMarshalledSize();
- marshalSize += centerOfMass.getMarshalledSize();
- marshalSize += velocity.getMarshalledSize();
- marshalSize += 2; // numberOfDisAggregates
- marshalSize += 2; // numberOfDisEntities
- marshalSize += 2; // numberOfSilentAggregateTypes
- marshalSize += 2; // numberOfSilentEntityTypes
- for(int idx=0; idx < aggregateIDList.size(); idx++)
- {
- AggregateIdentifier listElement = aggregateIDList.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
- for(int idx=0; idx < entityIDList.size(); idx++)
- {
- EntityID listElement = entityIDList.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
- marshalSize += padTo32.length;
- for(int idx=0; idx < silentAggregateSystemList.size(); idx++)
- {
- EntityType listElement = silentAggregateSystemList.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
- for(int idx=0; idx < silentEntitySystemList.size(); idx++)
- {
- EntityType listElement = silentEntitySystemList.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
- marshalSize += 4; // numberOfVariableDatumRecords
- for(int idx=0; idx < variableDatumList.size(); idx++)
- {
- VariableDatum listElement = variableDatumList.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link AggregateStatePdu#aggregateID}*/
-public AggregateStatePdu setAggregateID(AggregateIdentifier pAggregateID)
-{
- aggregateID = pAggregateID;
- return this;
-}
-
-/** Getter for {@link AggregateStatePdu#aggregateID}*/
-public AggregateIdentifier getAggregateID()
+
+
+/** Constructor */
+ public AggregateStatePdu()
+ {
+ setPduType( DISPDUType.AGGREGATE_STATE );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += aggregateID.getMarshalledSize();
+ marshalSize += forceID.getMarshalledSize();
+ marshalSize += aggregateState.getMarshalledSize();
+ marshalSize += aggregateType.getMarshalledSize();
+ marshalSize += formation.getMarshalledSize();
+ marshalSize += aggregateMarking.getMarshalledSize();
+ marshalSize += dimensions.getMarshalledSize();
+ marshalSize += orientation.getMarshalledSize();
+ marshalSize += centerOfMass.getMarshalledSize();
+ marshalSize += velocity.getMarshalledSize();
+ marshalSize += 2; // numberOfDisAggregates
+ marshalSize += 2; // numberOfDisEntities
+ marshalSize += 2; // numberOfSilentAggregateTypes
+ marshalSize += 2; // numberOfSilentEntityTypes
+ for(int idx=0; idx < aggregateIDList.size(); idx++)
+ {
+ AggregateIdentifier listElement = aggregateIDList.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+ for(int idx=0; idx < entityIDList.size(); idx++)
+ {
+ EntityID listElement = entityIDList.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+ marshalSize += padTo32.length;
+ for(int idx=0; idx < silentAggregateSystemList.size(); idx++)
+ {
+ EntityType listElement = silentAggregateSystemList.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+ for(int idx=0; idx < silentEntitySystemList.size(); idx++)
+ {
+ EntityType listElement = silentEntitySystemList.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+ marshalSize += 4; // numberOfVariableDatumRecords
+ for(int idx=0; idx < variableDatumList.size(); idx++)
+ {
+ VariableDatum listElement = variableDatumList.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link AggregateStatePdu#aggregateID}*/
+public AggregateStatePdu setAggregateID(AggregateIdentifier pAggregateID)
+{
+ aggregateID = pAggregateID;
+ return this;
+}
+
+/** Getter for {@link AggregateStatePdu#aggregateID}*/
+public AggregateIdentifier getAggregateID()
{
return aggregateID;
-}
-
-/** Setter for {@link AggregateStatePdu#forceID}*/
-public AggregateStatePdu setForceID(ForceID pForceID)
-{
- forceID = pForceID;
- return this;
-}
-
-/** Getter for {@link AggregateStatePdu#forceID}*/
-public ForceID getForceID()
+}
+
+/** Setter for {@link AggregateStatePdu#forceID}*/
+public AggregateStatePdu setForceID(ForceID pForceID)
+{
+ forceID = pForceID;
+ return this;
+}
+
+/** Getter for {@link AggregateStatePdu#forceID}*/
+public ForceID getForceID()
{
return forceID;
-}
-
-/** Setter for {@link AggregateStatePdu#aggregateState}*/
-public AggregateStatePdu setAggregateState(AggregateStateAggregateState pAggregateState)
-{
- aggregateState = pAggregateState;
- return this;
-}
-
-/** Getter for {@link AggregateStatePdu#aggregateState}*/
-public AggregateStateAggregateState getAggregateState()
+}
+
+/** Setter for {@link AggregateStatePdu#aggregateState}*/
+public AggregateStatePdu setAggregateState(AggregateStateAggregateState pAggregateState)
+{
+ aggregateState = pAggregateState;
+ return this;
+}
+
+/** Getter for {@link AggregateStatePdu#aggregateState}*/
+public AggregateStateAggregateState getAggregateState()
{
return aggregateState;
-}
-
-/** Setter for {@link AggregateStatePdu#aggregateType}*/
-public AggregateStatePdu setAggregateType(AggregateType pAggregateType)
-{
- aggregateType = pAggregateType;
- return this;
-}
-
-/** Getter for {@link AggregateStatePdu#aggregateType}*/
-public AggregateType getAggregateType()
+}
+
+/** Setter for {@link AggregateStatePdu#aggregateType}*/
+public AggregateStatePdu setAggregateType(AggregateType pAggregateType)
+{
+ aggregateType = pAggregateType;
+ return this;
+}
+
+/** Getter for {@link AggregateStatePdu#aggregateType}*/
+public AggregateType getAggregateType()
{
return aggregateType;
-}
-
-/** Setter for {@link AggregateStatePdu#formation}*/
-public AggregateStatePdu setFormation(AggregateStateFormation pFormation)
-{
- formation = pFormation;
- return this;
-}
-
-/** Getter for {@link AggregateStatePdu#formation}*/
-public AggregateStateFormation getFormation()
+}
+
+/** Setter for {@link AggregateStatePdu#formation}*/
+public AggregateStatePdu setFormation(AggregateStateFormation pFormation)
+{
+ formation = pFormation;
+ return this;
+}
+
+/** Getter for {@link AggregateStatePdu#formation}*/
+public AggregateStateFormation getFormation()
{
return formation;
-}
-
-/** Setter for {@link AggregateStatePdu#aggregateMarking}*/
-public AggregateStatePdu setAggregateMarking(AggregateMarking pAggregateMarking)
-{
- aggregateMarking = pAggregateMarking;
- return this;
-}
-
-/** Getter for {@link AggregateStatePdu#aggregateMarking}*/
-public AggregateMarking getAggregateMarking()
+}
+
+/** Setter for {@link AggregateStatePdu#aggregateMarking}*/
+public AggregateStatePdu setAggregateMarking(AggregateMarking pAggregateMarking)
+{
+ aggregateMarking = pAggregateMarking;
+ return this;
+}
+
+/** Getter for {@link AggregateStatePdu#aggregateMarking}*/
+public AggregateMarking getAggregateMarking()
{
return aggregateMarking;
-}
-
-/** Setter for {@link AggregateStatePdu#dimensions}*/
-public AggregateStatePdu setDimensions(Vector3Float pDimensions)
-{
- dimensions = pDimensions;
- return this;
-}
-
-/** Getter for {@link AggregateStatePdu#dimensions}*/
-public Vector3Float getDimensions()
+}
+
+/** Setter for {@link AggregateStatePdu#dimensions}*/
+public AggregateStatePdu setDimensions(Vector3Float pDimensions)
+{
+ dimensions = pDimensions;
+ return this;
+}
+
+/** Getter for {@link AggregateStatePdu#dimensions}*/
+public Vector3Float getDimensions()
{
return dimensions;
-}
-
-/** Setter for {@link AggregateStatePdu#orientation}*/
-public AggregateStatePdu setOrientation(Vector3Float pOrientation)
-{
- orientation = pOrientation;
- return this;
-}
-
-/** Getter for {@link AggregateStatePdu#orientation}*/
-public Vector3Float getOrientation()
+}
+
+/** Setter for {@link AggregateStatePdu#orientation}*/
+public AggregateStatePdu setOrientation(Vector3Float pOrientation)
+{
+ orientation = pOrientation;
+ return this;
+}
+
+/** Getter for {@link AggregateStatePdu#orientation}*/
+public Vector3Float getOrientation()
{
return orientation;
-}
-
-/** Setter for {@link AggregateStatePdu#centerOfMass}*/
-public AggregateStatePdu setCenterOfMass(Vector3Double pCenterOfMass)
-{
- centerOfMass = pCenterOfMass;
- return this;
-}
-
-/** Getter for {@link AggregateStatePdu#centerOfMass}*/
-public Vector3Double getCenterOfMass()
+}
+
+/** Setter for {@link AggregateStatePdu#centerOfMass}*/
+public AggregateStatePdu setCenterOfMass(Vector3Double pCenterOfMass)
+{
+ centerOfMass = pCenterOfMass;
+ return this;
+}
+
+/** Getter for {@link AggregateStatePdu#centerOfMass}*/
+public Vector3Double getCenterOfMass()
{
return centerOfMass;
-}
-
-/** Setter for {@link AggregateStatePdu#velocity}*/
-public AggregateStatePdu setVelocity(Vector3Float pVelocity)
-{
- velocity = pVelocity;
- return this;
-}
-
-/** Getter for {@link AggregateStatePdu#velocity}*/
-public Vector3Float getVelocity()
+}
+
+/** Setter for {@link AggregateStatePdu#velocity}*/
+public AggregateStatePdu setVelocity(Vector3Float pVelocity)
+{
+ velocity = pVelocity;
+ return this;
+}
+
+/** Getter for {@link AggregateStatePdu#velocity}*/
+public Vector3Float getVelocity()
{
return velocity;
-}
-
-/** Setter for {@link AggregateStatePdu#aggregateIDList}*/
-public AggregateStatePdu setAggregateIDList(List<AggregateIdentifier> pAggregateIDList)
-{
- aggregateIDList = pAggregateIDList;
- return this;
-}
-
-/** Getter for {@link AggregateStatePdu#aggregateIDList}*/
-public List<AggregateIdentifier> getAggregateIDList()
+}
+
+/** Setter for {@link AggregateStatePdu#aggregateIDList}*/
+public AggregateStatePdu setAggregateIDList(List<AggregateIdentifier> pAggregateIDList)
+{
+ aggregateIDList = pAggregateIDList;
+ return this;
+}
+
+/** Getter for {@link AggregateStatePdu#aggregateIDList}*/
+public List<AggregateIdentifier> getAggregateIDList()
{
return aggregateIDList;
-}
-
-/** Setter for {@link AggregateStatePdu#entityIDList}*/
-public AggregateStatePdu setEntityIDList(List<EntityID> pEntityIDList)
-{
- entityIDList = pEntityIDList;
- return this;
-}
-
-/** Getter for {@link AggregateStatePdu#entityIDList}*/
-public List<EntityID> getEntityIDList()
+}
+
+/** Setter for {@link AggregateStatePdu#entityIDList}*/
+public AggregateStatePdu setEntityIDList(List<EntityID> pEntityIDList)
+{
+ entityIDList = pEntityIDList;
+ return this;
+}
+
+/** Getter for {@link AggregateStatePdu#entityIDList}*/
+public List<EntityID> getEntityIDList()
{
return entityIDList;
-}
-
-/** Setter for {@link AggregateStatePdu#silentAggregateSystemList}*/
-public AggregateStatePdu setSilentAggregateSystemList(List<EntityType> pSilentAggregateSystemList)
-{
- silentAggregateSystemList = pSilentAggregateSystemList;
- return this;
-}
-
-/** Getter for {@link AggregateStatePdu#silentAggregateSystemList}*/
-public List<EntityType> getSilentAggregateSystemList()
+}
+
+/** Setter for {@link AggregateStatePdu#silentAggregateSystemList}*/
+public AggregateStatePdu setSilentAggregateSystemList(List<EntityType> pSilentAggregateSystemList)
+{
+ silentAggregateSystemList = pSilentAggregateSystemList;
+ return this;
+}
+
+/** Getter for {@link AggregateStatePdu#silentAggregateSystemList}*/
+public List<EntityType> getSilentAggregateSystemList()
{
return silentAggregateSystemList;
-}
-
-/** Setter for {@link AggregateStatePdu#silentEntitySystemList}*/
-public AggregateStatePdu setSilentEntitySystemList(List<EntityType> pSilentEntitySystemList)
-{
- silentEntitySystemList = pSilentEntitySystemList;
- return this;
-}
-
-/** Getter for {@link AggregateStatePdu#silentEntitySystemList}*/
-public List<EntityType> getSilentEntitySystemList()
+}
+
+/** Setter for {@link AggregateStatePdu#silentEntitySystemList}*/
+public AggregateStatePdu setSilentEntitySystemList(List<EntityType> pSilentEntitySystemList)
+{
+ silentEntitySystemList = pSilentEntitySystemList;
+ return this;
+}
+
+/** Getter for {@link AggregateStatePdu#silentEntitySystemList}*/
+public List<EntityType> getSilentEntitySystemList()
{
return silentEntitySystemList;
-}
-
-/** Setter for {@link AggregateStatePdu#variableDatumList}*/
-public AggregateStatePdu setVariableDatumList(List<VariableDatum> pVariableDatumList)
-{
- variableDatumList = pVariableDatumList;
- return this;
-}
-
-/** Getter for {@link AggregateStatePdu#variableDatumList}*/
-public List<VariableDatum> getVariableDatumList()
+}
+
+/** Setter for {@link AggregateStatePdu#variableDatumList}*/
+public AggregateStatePdu setVariableDatumList(List<VariableDatum> pVariableDatumList)
+{
+ variableDatumList = pVariableDatumList;
+ return this;
+}
+
+/** Getter for {@link AggregateStatePdu#variableDatumList}*/
+public List<VariableDatum> getVariableDatumList()
{
return variableDatumList;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- aggregateID.marshal(dos);
- forceID.marshal(dos);
- aggregateState.marshal(dos);
- aggregateType.marshal(dos);
- formation.marshal(dos);
- aggregateMarking.marshal(dos);
- dimensions.marshal(dos);
- orientation.marshal(dos);
- centerOfMass.marshal(dos);
- velocity.marshal(dos);
- dos.writeShort(aggregateIDList.size());
- dos.writeShort(entityIDList.size());
- dos.writeShort(silentAggregateSystemList.size());
- dos.writeShort(silentEntitySystemList.size());
-
- for(int idx = 0; idx < aggregateIDList.size(); idx++)
- {
- AggregateIdentifier aAggregateIdentifier = aggregateIDList.get(idx);
- aAggregateIdentifier.marshal(dos);
- }
-
-
- for(int idx = 0; idx < entityIDList.size(); idx++)
- {
- EntityID aEntityID = entityIDList.get(idx);
- aEntityID.marshal(dos);
- }
-
- padTo32 = new byte[Align.to32bits(dos)];
-
- for(int idx = 0; idx < silentAggregateSystemList.size(); idx++)
- {
- EntityType aEntityType = silentAggregateSystemList.get(idx);
- aEntityType.marshal(dos);
- }
-
-
- for(int idx = 0; idx < silentEntitySystemList.size(); idx++)
- {
- EntityType aEntityType = silentEntitySystemList.get(idx);
- aEntityType.marshal(dos);
- }
-
- dos.writeInt(variableDatumList.size());
-
- for(int idx = 0; idx < variableDatumList.size(); idx++)
- {
- VariableDatum aVariableDatum = variableDatumList.get(idx);
- aVariableDatum.marshal(dos);
- }
-
+ {
+ aggregateID.marshal(dos);
+ forceID.marshal(dos);
+ aggregateState.marshal(dos);
+ aggregateType.marshal(dos);
+ formation.marshal(dos);
+ aggregateMarking.marshal(dos);
+ dimensions.marshal(dos);
+ orientation.marshal(dos);
+ centerOfMass.marshal(dos);
+ velocity.marshal(dos);
+ dos.writeShort(aggregateIDList.size());
+ dos.writeShort(entityIDList.size());
+ dos.writeShort(silentAggregateSystemList.size());
+ dos.writeShort(silentEntitySystemList.size());
+
+ for(int idx = 0; idx < aggregateIDList.size(); idx++)
+ {
+ AggregateIdentifier aAggregateIdentifier = aggregateIDList.get(idx);
+ aAggregateIdentifier.marshal(dos);
+ }
+
+
+ for(int idx = 0; idx < entityIDList.size(); idx++)
+ {
+ EntityID aEntityID = entityIDList.get(idx);
+ aEntityID.marshal(dos);
+ }
+
+ padTo32 = new byte[Align.to32bits(dos)];
+
+ for(int idx = 0; idx < silentAggregateSystemList.size(); idx++)
+ {
+ EntityType aEntityType = silentAggregateSystemList.get(idx);
+ aEntityType.marshal(dos);
+ }
+
+
+ for(int idx = 0; idx < silentEntitySystemList.size(); idx++)
+ {
+ EntityType aEntityType = silentEntitySystemList.get(idx);
+ aEntityType.marshal(dos);
+ }
+
+ dos.writeInt(variableDatumList.size());
+
+ for(int idx = 0; idx < variableDatumList.size(); idx++)
+ {
+ VariableDatum aVariableDatum = variableDatumList.get(idx);
+ aVariableDatum.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += aggregateID.unmarshal(dis);
- forceID = ForceID.unmarshalEnum(dis);
- uPosition += forceID.getMarshalledSize();
- aggregateState = AggregateStateAggregateState.unmarshalEnum(dis);
- uPosition += aggregateState.getMarshalledSize();
- uPosition += aggregateType.unmarshal(dis);
- formation = AggregateStateFormation.unmarshalEnum(dis);
- uPosition += formation.getMarshalledSize();
- uPosition += aggregateMarking.unmarshal(dis);
- uPosition += dimensions.unmarshal(dis);
- uPosition += orientation.unmarshal(dis);
- uPosition += centerOfMass.unmarshal(dis);
- uPosition += velocity.unmarshal(dis);
- numberOfDisAggregates = (short)dis.readUnsignedShort();
- uPosition += 2;
- numberOfDisEntities = (short)dis.readUnsignedShort();
- uPosition += 2;
- numberOfSilentAggregateTypes = (short)dis.readUnsignedShort();
- uPosition += 2;
- numberOfSilentEntityTypes = (short)dis.readUnsignedShort();
- uPosition += 2;
- for(int idx = 0; idx < numberOfDisAggregates; idx++)
- {
- AggregateIdentifier anX = new AggregateIdentifier();
- uPosition += anX.unmarshal(dis);
- aggregateIDList.add(anX);
- }
-
- for(int idx = 0; idx < numberOfDisEntities; idx++)
- {
- EntityID anX = new EntityID();
- uPosition += anX.unmarshal(dis);
- entityIDList.add(anX);
- }
-
- padTo32 = new byte[Align.from32bits(uPosition,dis)];
- uPosition += padTo32.length;
- for(int idx = 0; idx < numberOfSilentAggregateTypes; idx++)
- {
- EntityType anX = new EntityType();
- uPosition += anX.unmarshal(dis);
- silentAggregateSystemList.add(anX);
- }
-
- for(int idx = 0; idx < numberOfSilentEntityTypes; idx++)
- {
- EntityType anX = new EntityType();
- uPosition += anX.unmarshal(dis);
- silentEntitySystemList.add(anX);
- }
-
- numberOfVariableDatumRecords = dis.readInt();
- uPosition += 4;
- for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
- {
- VariableDatum anX = new VariableDatum();
- uPosition += anX.unmarshal(dis);
- variableDatumList.add(anX);
- }
-
+ {
+ uPosition += aggregateID.unmarshal(dis);
+ forceID = ForceID.unmarshalEnum(dis);
+ uPosition += forceID.getMarshalledSize();
+ aggregateState = AggregateStateAggregateState.unmarshalEnum(dis);
+ uPosition += aggregateState.getMarshalledSize();
+ uPosition += aggregateType.unmarshal(dis);
+ formation = AggregateStateFormation.unmarshalEnum(dis);
+ uPosition += formation.getMarshalledSize();
+ uPosition += aggregateMarking.unmarshal(dis);
+ uPosition += dimensions.unmarshal(dis);
+ uPosition += orientation.unmarshal(dis);
+ uPosition += centerOfMass.unmarshal(dis);
+ uPosition += velocity.unmarshal(dis);
+ numberOfDisAggregates = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ numberOfDisEntities = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ numberOfSilentAggregateTypes = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ numberOfSilentEntityTypes = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ for(int idx = 0; idx < numberOfDisAggregates; idx++)
+ {
+ AggregateIdentifier anX = new AggregateIdentifier();
+ uPosition += anX.unmarshal(dis);
+ aggregateIDList.add(anX);
+ }
+
+ for(int idx = 0; idx < numberOfDisEntities; idx++)
+ {
+ EntityID anX = new EntityID();
+ uPosition += anX.unmarshal(dis);
+ entityIDList.add(anX);
+ }
+
+ padTo32 = new byte[Align.from32bits(uPosition,dis)];
+ uPosition += padTo32.length;
+ for(int idx = 0; idx < numberOfSilentAggregateTypes; idx++)
+ {
+ EntityType anX = new EntityType();
+ uPosition += anX.unmarshal(dis);
+ silentAggregateSystemList.add(anX);
+ }
+
+ for(int idx = 0; idx < numberOfSilentEntityTypes; idx++)
+ {
+ EntityType anX = new EntityType();
+ uPosition += anX.unmarshal(dis);
+ silentEntitySystemList.add(anX);
+ }
+
+ numberOfVariableDatumRecords = dis.readInt();
+ uPosition += 4;
+ for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
+ {
+ VariableDatum anX = new VariableDatum();
+ uPosition += anX.unmarshal(dis);
+ variableDatumList.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- aggregateID.marshal(buff);
- forceID.marshal(buff);
- aggregateState.marshal(buff);
- aggregateType.marshal(buff);
- formation.marshal(buff);
- aggregateMarking.marshal(buff);
- dimensions.marshal(buff);
- orientation.marshal(buff);
- centerOfMass.marshal(buff);
- velocity.marshal(buff);
- buff.putShort( (short)aggregateIDList.size());
- buff.putShort( (short)entityIDList.size());
- buff.putShort( (short)silentAggregateSystemList.size());
- buff.putShort( (short)silentEntitySystemList.size());
-
- for(int idx = 0; idx < aggregateIDList.size(); idx++)
- {
- AggregateIdentifier aAggregateIdentifier = aggregateIDList.get(idx);
- aAggregateIdentifier.marshal(buff);
- }
-
-
- for(int idx = 0; idx < entityIDList.size(); idx++)
- {
- EntityID aEntityID = entityIDList.get(idx);
- aEntityID.marshal(buff);
- }
-
- padTo32 = new byte[Align.to32bits(buff)];
-
- for(int idx = 0; idx < silentAggregateSystemList.size(); idx++)
- {
- EntityType aEntityType = silentAggregateSystemList.get(idx);
- aEntityType.marshal(buff);
- }
-
-
- for(int idx = 0; idx < silentEntitySystemList.size(); idx++)
- {
- EntityType aEntityType = silentEntitySystemList.get(idx);
- aEntityType.marshal(buff);
- }
-
- buff.putInt( (int)variableDatumList.size());
-
- for(int idx = 0; idx < variableDatumList.size(); idx++)
- {
- VariableDatum aVariableDatum = variableDatumList.get(idx);
- aVariableDatum.marshal(buff);
- }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+ }
+ return getMarshalledSize();
+}
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ aggregateID.marshal(buff);
+ forceID.marshal(buff);
+ aggregateState.marshal(buff);
+ aggregateType.marshal(buff);
+ formation.marshal(buff);
+ aggregateMarking.marshal(buff);
+ dimensions.marshal(buff);
+ orientation.marshal(buff);
+ centerOfMass.marshal(buff);
+ velocity.marshal(buff);
+ buff.putShort( (short)aggregateIDList.size());
+ buff.putShort( (short)entityIDList.size());
+ buff.putShort( (short)silentAggregateSystemList.size());
+ buff.putShort( (short)silentEntitySystemList.size());
+
+ for(int idx = 0; idx < aggregateIDList.size(); idx++)
+ {
+ AggregateIdentifier aAggregateIdentifier = aggregateIDList.get(idx);
+ aAggregateIdentifier.marshal(buff);
+ }
+
+
+ for(int idx = 0; idx < entityIDList.size(); idx++)
+ {
+ EntityID aEntityID = entityIDList.get(idx);
+ aEntityID.marshal(buff);
+ }
+
+ padTo32 = new byte[Align.to32bits(buff)];
+
+ for(int idx = 0; idx < silentAggregateSystemList.size(); idx++)
+ {
+ EntityType aEntityType = silentAggregateSystemList.get(idx);
+ aEntityType.marshal(buff);
+ }
+
+
+ for(int idx = 0; idx < silentEntitySystemList.size(); idx++)
+ {
+ EntityType aEntityType = silentEntitySystemList.get(idx);
+ aEntityType.marshal(buff);
+ }
+
+ buff.putInt( (int)variableDatumList.size());
+
+ for(int idx = 0; idx < variableDatumList.size(); idx++)
+ {
+ VariableDatum aVariableDatum = variableDatumList.get(idx);
+ aVariableDatum.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- aggregateID.unmarshal(buff);
- forceID = ForceID.unmarshalEnum(buff);
- aggregateState = AggregateStateAggregateState.unmarshalEnum(buff);
- aggregateType.unmarshal(buff);
- formation = AggregateStateFormation.unmarshalEnum(buff);
- aggregateMarking.unmarshal(buff);
- dimensions.unmarshal(buff);
- orientation.unmarshal(buff);
- centerOfMass.unmarshal(buff);
- velocity.unmarshal(buff);
- numberOfDisAggregates = (short)(buff.getShort() & 0xFFFF);
- numberOfDisEntities = (short)(buff.getShort() & 0xFFFF);
- numberOfSilentAggregateTypes = (short)(buff.getShort() & 0xFFFF);
- numberOfSilentEntityTypes = (short)(buff.getShort() & 0xFFFF);
- for(int idx = 0; idx < numberOfDisAggregates; idx++)
- {
- AggregateIdentifier anX = new AggregateIdentifier();
- anX.unmarshal(buff);
- aggregateIDList.add(anX);
- }
-
- for(int idx = 0; idx < numberOfDisEntities; idx++)
- {
- EntityID anX = new EntityID();
- anX.unmarshal(buff);
- entityIDList.add(anX);
- }
-
- padTo32 = new byte[Align.from32bits(buff)];
- for(int idx = 0; idx < numberOfSilentAggregateTypes; idx++)
- {
- EntityType anX = new EntityType();
- anX.unmarshal(buff);
- silentAggregateSystemList.add(anX);
- }
-
- for(int idx = 0; idx < numberOfSilentEntityTypes; idx++)
- {
- EntityType anX = new EntityType();
- anX.unmarshal(buff);
- silentEntitySystemList.add(anX);
- }
-
- numberOfVariableDatumRecords = buff.getInt();
- for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
- {
- VariableDatum anX = new VariableDatum();
- anX.unmarshal(buff);
- variableDatumList.add(anX);
- }
-
- return getMarshalledSize();
-}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final AggregateStatePdu rhs = (AggregateStatePdu)obj;
-
- if( ! (aggregateID.equals( rhs.aggregateID) )) ivarsEqual = false;
- if( ! (forceID == rhs.forceID)) ivarsEqual = false;
- if( ! (aggregateState == rhs.aggregateState)) ivarsEqual = false;
- if( ! (aggregateType.equals( rhs.aggregateType) )) ivarsEqual = false;
- if( ! (formation == rhs.formation)) ivarsEqual = false;
- if( ! (aggregateMarking.equals( rhs.aggregateMarking) )) ivarsEqual = false;
- if( ! (dimensions.equals( rhs.dimensions) )) ivarsEqual = false;
- if( ! (orientation.equals( rhs.orientation) )) ivarsEqual = false;
- if( ! (centerOfMass.equals( rhs.centerOfMass) )) ivarsEqual = false;
- if( ! (velocity.equals( rhs.velocity) )) ivarsEqual = false;
-
- for(int idx = 0; idx < aggregateIDList.size(); idx++)
- if( ! ( aggregateIDList.get(idx).equals(rhs.aggregateIDList.get(idx)))) ivarsEqual = false;
-
-
- for(int idx = 0; idx < entityIDList.size(); idx++)
- if( ! ( entityIDList.get(idx).equals(rhs.entityIDList.get(idx)))) ivarsEqual = false;
-
-
- for(int idx = 0; idx < silentAggregateSystemList.size(); idx++)
- if( ! ( silentAggregateSystemList.get(idx).equals(rhs.silentAggregateSystemList.get(idx)))) ivarsEqual = false;
-
-
- for(int idx = 0; idx < silentEntitySystemList.size(); idx++)
- if( ! ( silentEntitySystemList.get(idx).equals(rhs.silentEntitySystemList.get(idx)))) ivarsEqual = false;
-
-
- for(int idx = 0; idx < variableDatumList.size(); idx++)
- if( ! ( variableDatumList.get(idx).equals(rhs.variableDatumList.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ aggregateID.unmarshal(buff);
+ forceID = ForceID.unmarshalEnum(buff);
+ aggregateState = AggregateStateAggregateState.unmarshalEnum(buff);
+ aggregateType.unmarshal(buff);
+ formation = AggregateStateFormation.unmarshalEnum(buff);
+ aggregateMarking.unmarshal(buff);
+ dimensions.unmarshal(buff);
+ orientation.unmarshal(buff);
+ centerOfMass.unmarshal(buff);
+ velocity.unmarshal(buff);
+ numberOfDisAggregates = (short)(buff.getShort() & 0xFFFF);
+ numberOfDisEntities = (short)(buff.getShort() & 0xFFFF);
+ numberOfSilentAggregateTypes = (short)(buff.getShort() & 0xFFFF);
+ numberOfSilentEntityTypes = (short)(buff.getShort() & 0xFFFF);
+ for(int idx = 0; idx < numberOfDisAggregates; idx++)
+ {
+ AggregateIdentifier anX = new AggregateIdentifier();
+ anX.unmarshal(buff);
+ aggregateIDList.add(anX);
+ }
+
+ for(int idx = 0; idx < numberOfDisEntities; idx++)
+ {
+ EntityID anX = new EntityID();
+ anX.unmarshal(buff);
+ entityIDList.add(anX);
+ }
+
+ padTo32 = new byte[Align.from32bits(buff)];
+ for(int idx = 0; idx < numberOfSilentAggregateTypes; idx++)
+ {
+ EntityType anX = new EntityType();
+ anX.unmarshal(buff);
+ silentAggregateSystemList.add(anX);
+ }
+
+ for(int idx = 0; idx < numberOfSilentEntityTypes; idx++)
+ {
+ EntityType anX = new EntityType();
+ anX.unmarshal(buff);
+ silentEntitySystemList.add(anX);
+ }
+
+ numberOfVariableDatumRecords = buff.getInt();
+ for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
+ {
+ VariableDatum anX = new VariableDatum();
+ anX.unmarshal(buff);
+ variableDatumList.add(anX);
+ }
+
+ return getMarshalledSize();
+}
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final AggregateStatePdu rhs = (AggregateStatePdu)obj;
+
+ if( ! (aggregateID.equals( rhs.aggregateID) )) ivarsEqual = false;
+ if( ! (forceID == rhs.forceID)) ivarsEqual = false;
+ if( ! (aggregateState == rhs.aggregateState)) ivarsEqual = false;
+ if( ! (aggregateType.equals( rhs.aggregateType) )) ivarsEqual = false;
+ if( ! (formation == rhs.formation)) ivarsEqual = false;
+ if( ! (aggregateMarking.equals( rhs.aggregateMarking) )) ivarsEqual = false;
+ if( ! (dimensions.equals( rhs.dimensions) )) ivarsEqual = false;
+ if( ! (orientation.equals( rhs.orientation) )) ivarsEqual = false;
+ if( ! (centerOfMass.equals( rhs.centerOfMass) )) ivarsEqual = false;
+ if( ! (velocity.equals( rhs.velocity) )) ivarsEqual = false;
+
+ for(int idx = 0; idx < aggregateIDList.size(); idx++)
+ if( ! ( aggregateIDList.get(idx).equals(rhs.aggregateIDList.get(idx)))) ivarsEqual = false;
+
+
+ for(int idx = 0; idx < entityIDList.size(); idx++)
+ if( ! ( entityIDList.get(idx).equals(rhs.entityIDList.get(idx)))) ivarsEqual = false;
+
+
+ for(int idx = 0; idx < silentAggregateSystemList.size(); idx++)
+ if( ! ( silentAggregateSystemList.get(idx).equals(rhs.silentAggregateSystemList.get(idx)))) ivarsEqual = false;
+
+
+ for(int idx = 0; idx < silentEntitySystemList.size(); idx++)
+ if( ! ( silentEntitySystemList.get(idx).equals(rhs.silentEntitySystemList.get(idx)))) ivarsEqual = false;
+
+
+ for(int idx = 0; idx < variableDatumList.size(); idx++)
+ if( ! ( variableDatumList.get(idx).equals(rhs.variableDatumList.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" aggregateID: ").append(aggregateID).append("\n");
- sb.append(" forceID: ").append(forceID).append("\n");
- sb.append(" aggregateState: ").append(aggregateState).append("\n");
- sb.append(" aggregateType: ").append(aggregateType).append("\n");
- sb.append(" formation: ").append(formation).append("\n");
- sb.append(" aggregateMarking: ").append(aggregateMarking).append("\n");
- sb.append(" dimensions: ").append(dimensions).append("\n");
- sb.append(" orientation: ").append(orientation).append("\n");
- sb.append(" centerOfMass: ").append(centerOfMass).append("\n");
- sb.append(" velocity: ").append(velocity).append("\n");
- sb.append(" padTo32: ").append(padTo32).append("\n");
- sb.append(" aggregateIDList: ").append("\n");
- aggregateIDList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
- sb.append(" entityIDList: ").append("\n");
- entityIDList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
- sb.append(" silentAggregateSystemList: ").append("\n");
- silentAggregateSystemList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
- sb.append(" silentEntitySystemList: ").append("\n");
- silentEntitySystemList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
- sb.append(" variableDatumList: ").append("\n");
- variableDatumList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" aggregateID: ").append(aggregateID).append("\n");
+ sb.append(" forceID: ").append(forceID).append("\n");
+ sb.append(" aggregateState: ").append(aggregateState).append("\n");
+ sb.append(" aggregateType: ").append(aggregateType).append("\n");
+ sb.append(" formation: ").append(formation).append("\n");
+ sb.append(" aggregateMarking: ").append(aggregateMarking).append("\n");
+ sb.append(" dimensions: ").append(dimensions).append("\n");
+ sb.append(" orientation: ").append(orientation).append("\n");
+ sb.append(" centerOfMass: ").append(centerOfMass).append("\n");
+ sb.append(" velocity: ").append(velocity).append("\n");
+ sb.append(" padTo32: ").append(padTo32).append("\n");
+ sb.append(" aggregateIDList: ").append("\n");
+ aggregateIDList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+ sb.append(" entityIDList: ").append("\n");
+ entityIDList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+ sb.append(" silentAggregateSystemList: ").append("\n");
+ silentAggregateSystemList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+ sb.append(" silentEntitySystemList: ").append("\n");
+ silentEntitySystemList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+ sb.append(" variableDatumList: ").append("\n");
+ variableDatumList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/AggregateType.java b/src-generated/edu/nps/moves/dis7/AggregateType.java
index ed7c26dcb6d6720347ddbabc3ea6096bf9e8b637..de474cb759d240eba3b2f6c384271668134e3a63 100644
--- a/src-generated/edu/nps/moves/dis7/AggregateType.java
+++ b/src-generated/edu/nps/moves/dis7/AggregateType.java
@@ -1,305 +1,305 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Identifies the type and organization of an aggregate. Section 6.2.5
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class AggregateType extends Object implements Serializable
-{
- /** Grouping criterion used to group the aggregate. Enumeration from EBV document uid 206 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Identifies the type and organization of an aggregate. Section 6.2.5
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class AggregateType extends Object implements Serializable
+{
+ /** Grouping criterion used to group the aggregate. Enumeration from EBV document uid 206 */
protected AggregateStateAggregateKind aggregateKind = AggregateStateAggregateKind.values()[0];
-
- /** Domain of entity (air, surface, subsurface, space, etc) Zero means domain does not apply. uid 8 */
+
+ /** Domain of entity (air, surface, subsurface, space, etc) Zero means domain does not apply. uid 8 */
protected PlatformDomain domain = PlatformDomain.values()[0];
-
- /** country to which the design of the entity is attributed uid 29 */
+
+ /** country to which the design of the entity is attributed uid 29 */
protected Country country = Country.values()[0];
-
- /** category of entity */
+
+ /** category of entity */
protected byte category;
-
- /** subcategory of entity uid 208 */
+
+ /** subcategory of entity uid 208 */
protected AggregateStateSubcategory subcategory = AggregateStateSubcategory.values()[0];
-
- /** specific info based on subcategory field. specific is a reserved word in sql. uid 209 */
+
+ /** specific info based on subcategory field. specific is a reserved word in sql. uid 209 */
protected AggregateStateSpecific specificInfo = AggregateStateSpecific.values()[0];
-
+
protected byte extra;
-
-
-/** Constructor */
- public AggregateType()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += aggregateKind.getMarshalledSize();
- marshalSize += domain.getMarshalledSize();
- marshalSize += country.getMarshalledSize();
- marshalSize += 1; // category
- marshalSize += subcategory.getMarshalledSize();
- marshalSize += specificInfo.getMarshalledSize();
- marshalSize += 1; // extra
-
- return marshalSize;
-}
-
-
-/** Setter for {@link AggregateType#aggregateKind}*/
-public AggregateType setAggregateKind(AggregateStateAggregateKind pAggregateKind)
+
+
+/** Constructor */
+ public AggregateType()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += aggregateKind.getMarshalledSize();
+ marshalSize += domain.getMarshalledSize();
+ marshalSize += country.getMarshalledSize();
+ marshalSize += 1; // category
+ marshalSize += subcategory.getMarshalledSize();
+ marshalSize += specificInfo.getMarshalledSize();
+ marshalSize += 1; // extra
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link AggregateType#aggregateKind}*/
+public AggregateType setAggregateKind(AggregateStateAggregateKind pAggregateKind)
{
- aggregateKind = pAggregateKind;
- return this;
-}
-
-/** Getter for {@link AggregateType#aggregateKind}*/
-public AggregateStateAggregateKind getAggregateKind()
+ aggregateKind = pAggregateKind;
+ return this;
+}
+
+/** Getter for {@link AggregateType#aggregateKind}*/
+public AggregateStateAggregateKind getAggregateKind()
{
return aggregateKind;
-}
-
-/** Setter for {@link AggregateType#domain}*/
-public AggregateType setDomain(PlatformDomain pDomain)
+}
+
+/** Setter for {@link AggregateType#domain}*/
+public AggregateType setDomain(PlatformDomain pDomain)
{
- domain = pDomain;
- return this;
-}
-
-/** Getter for {@link AggregateType#domain}*/
-public PlatformDomain getDomain()
+ domain = pDomain;
+ return this;
+}
+
+/** Getter for {@link AggregateType#domain}*/
+public PlatformDomain getDomain()
{
return domain;
-}
-
-/** Setter for {@link AggregateType#country}*/
-public AggregateType setCountry(Country pCountry)
+}
+
+/** Setter for {@link AggregateType#country}*/
+public AggregateType setCountry(Country pCountry)
{
- country = pCountry;
- return this;
-}
-
-/** Getter for {@link AggregateType#country}*/
-public Country getCountry()
+ country = pCountry;
+ return this;
+}
+
+/** Getter for {@link AggregateType#country}*/
+public Country getCountry()
{
return country;
-}
-
-/** Setter for {@link AggregateType#category}*/
-public AggregateType setCategory(byte pCategory)
+}
+
+/** Setter for {@link AggregateType#category}*/
+public AggregateType setCategory(byte pCategory)
{
- category = pCategory;
- return this;
-}
-
-/** Getter for {@link AggregateType#category}*/
-public byte getCategory()
+ category = pCategory;
+ return this;
+}
+
+/** Getter for {@link AggregateType#category}*/
+public byte getCategory()
{
return category;
-}
-
-/** Setter for {@link AggregateType#subcategory}*/
-public AggregateType setSubcategory(AggregateStateSubcategory pSubcategory)
+}
+
+/** Setter for {@link AggregateType#subcategory}*/
+public AggregateType setSubcategory(AggregateStateSubcategory pSubcategory)
{
- subcategory = pSubcategory;
- return this;
-}
-
-/** Getter for {@link AggregateType#subcategory}*/
-public AggregateStateSubcategory getSubcategory()
+ subcategory = pSubcategory;
+ return this;
+}
+
+/** Getter for {@link AggregateType#subcategory}*/
+public AggregateStateSubcategory getSubcategory()
{
return subcategory;
-}
-
-/** Setter for {@link AggregateType#specificInfo}*/
-public AggregateType setSpecificInfo(AggregateStateSpecific pSpecificInfo)
+}
+
+/** Setter for {@link AggregateType#specificInfo}*/
+public AggregateType setSpecificInfo(AggregateStateSpecific pSpecificInfo)
{
- specificInfo = pSpecificInfo;
- return this;
-}
-
-/** Getter for {@link AggregateType#specificInfo}*/
-public AggregateStateSpecific getSpecificInfo()
+ specificInfo = pSpecificInfo;
+ return this;
+}
+
+/** Getter for {@link AggregateType#specificInfo}*/
+public AggregateStateSpecific getSpecificInfo()
{
return specificInfo;
-}
-
-/** Setter for {@link AggregateType#extra}*/
-public AggregateType setExtra(byte pExtra)
+}
+
+/** Setter for {@link AggregateType#extra}*/
+public AggregateType setExtra(byte pExtra)
{
- extra = pExtra;
- return this;
-}
-
-/** Getter for {@link AggregateType#extra}*/
-public byte getExtra()
+ extra = pExtra;
+ return this;
+}
+
+/** Getter for {@link AggregateType#extra}*/
+public byte getExtra()
{
return extra;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- aggregateKind.marshal(dos);
- domain.marshal(dos);
- country.marshal(dos);
- dos.writeByte(category);
- subcategory.marshal(dos);
- specificInfo.marshal(dos);
- dos.writeByte(extra);
+ {
+ aggregateKind.marshal(dos);
+ domain.marshal(dos);
+ country.marshal(dos);
+ dos.writeByte(category);
+ subcategory.marshal(dos);
+ specificInfo.marshal(dos);
+ dos.writeByte(extra);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- aggregateKind = AggregateStateAggregateKind.unmarshalEnum(dis);
- uPosition += aggregateKind.getMarshalledSize();
- domain = PlatformDomain.unmarshalEnum(dis);
- uPosition += domain.getMarshalledSize();
- country = Country.unmarshalEnum(dis);
- uPosition += country.getMarshalledSize();
- category = (byte)dis.readUnsignedByte();
- uPosition += 1;
- subcategory = AggregateStateSubcategory.unmarshalEnum(dis);
- uPosition += subcategory.getMarshalledSize();
- specificInfo = AggregateStateSpecific.unmarshalEnum(dis);
- uPosition += specificInfo.getMarshalledSize();
- extra = (byte)dis.readUnsignedByte();
- uPosition += 1;
+ {
+ aggregateKind = AggregateStateAggregateKind.unmarshalEnum(dis);
+ uPosition += aggregateKind.getMarshalledSize();
+ domain = PlatformDomain.unmarshalEnum(dis);
+ uPosition += domain.getMarshalledSize();
+ country = Country.unmarshalEnum(dis);
+ uPosition += country.getMarshalledSize();
+ category = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ subcategory = AggregateStateSubcategory.unmarshalEnum(dis);
+ uPosition += subcategory.getMarshalledSize();
+ specificInfo = AggregateStateSpecific.unmarshalEnum(dis);
+ uPosition += specificInfo.getMarshalledSize();
+ extra = (byte)dis.readUnsignedByte();
+ uPosition += 1;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- aggregateKind.marshal(buff);
- domain.marshal(buff);
- country.marshal(buff);
- buff.put( (byte)category);
- subcategory.marshal(buff);
- specificInfo.marshal(buff);
- buff.put( (byte)extra);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- aggregateKind = AggregateStateAggregateKind.unmarshalEnum(buff);
- domain = PlatformDomain.unmarshalEnum(buff);
- country = Country.unmarshalEnum(buff);
- category = (byte)(buff.get() & 0xFF);
- subcategory = AggregateStateSubcategory.unmarshalEnum(buff);
- specificInfo = AggregateStateSpecific.unmarshalEnum(buff);
- extra = (byte)(buff.get() & 0xFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ aggregateKind.marshal(buff);
+ domain.marshal(buff);
+ country.marshal(buff);
+ buff.put( (byte)category);
+ subcategory.marshal(buff);
+ specificInfo.marshal(buff);
+ buff.put( (byte)extra);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ aggregateKind = AggregateStateAggregateKind.unmarshalEnum(buff);
+ domain = PlatformDomain.unmarshalEnum(buff);
+ country = Country.unmarshalEnum(buff);
+ category = (byte)(buff.get() & 0xFF);
+ subcategory = AggregateStateSubcategory.unmarshalEnum(buff);
+ specificInfo = AggregateStateSpecific.unmarshalEnum(buff);
+ extra = (byte)(buff.get() & 0xFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final AggregateType rhs = (AggregateType)obj;
-
- if( ! (aggregateKind == rhs.aggregateKind)) ivarsEqual = false;
- if( ! (domain == rhs.domain)) ivarsEqual = false;
- if( ! (country == rhs.country)) ivarsEqual = false;
- if( ! (category == rhs.category)) ivarsEqual = false;
- if( ! (subcategory == rhs.subcategory)) ivarsEqual = false;
- if( ! (specificInfo == rhs.specificInfo)) ivarsEqual = false;
- if( ! (extra == rhs.extra)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final AggregateType rhs = (AggregateType)obj;
+
+ if( ! (aggregateKind == rhs.aggregateKind)) ivarsEqual = false;
+ if( ! (domain == rhs.domain)) ivarsEqual = false;
+ if( ! (country == rhs.country)) ivarsEqual = false;
+ if( ! (category == rhs.category)) ivarsEqual = false;
+ if( ! (subcategory == rhs.subcategory)) ivarsEqual = false;
+ if( ! (specificInfo == rhs.specificInfo)) ivarsEqual = false;
+ if( ! (extra == rhs.extra)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" aggregateKind: ").append(aggregateKind).append("\n");
- sb.append(" domain: ").append(domain).append("\n");
- sb.append(" country: ").append(country).append("\n");
- sb.append(" category: ").append(category).append("\n");
- sb.append(" subcategory: ").append(subcategory).append("\n");
- sb.append(" specificInfo: ").append(specificInfo).append("\n");
- sb.append(" extra: ").append(extra).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" aggregateKind: ").append(aggregateKind).append("\n");
+ sb.append(" domain: ").append(domain).append("\n");
+ sb.append(" country: ").append(country).append("\n");
+ sb.append(" category: ").append(category).append("\n");
+ sb.append(" subcategory: ").append(subcategory).append("\n");
+ sb.append(" specificInfo: ").append(specificInfo).append("\n");
+ sb.append(" extra: ").append(extra).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/AngleDeception.java b/src-generated/edu/nps/moves/dis7/AngleDeception.java
index 0fba4f739e17ce018f17482e40d375ec77c3326c..f97e7060bef26f132ac86e5557fc5a766508bd1a 100644
--- a/src-generated/edu/nps/moves/dis7/AngleDeception.java
+++ b/src-generated/edu/nps/moves/dis7/AngleDeception.java
@@ -1,507 +1,507 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * The Angle Deception attribute record may be used to communicate discrete values that are associated with angle deception jamming that cannot be referenced to an emitter mode. The values provided in the record records (provided in the associated Electromagnetic Emission PDU). (The victim radar beams are those that are targeted by the jammer.) Section 6.2.21.2.2
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class AngleDeception extends Object implements Serializable
-{
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * The Angle Deception attribute record may be used to communicate discrete values that are associated with angle deception jamming that cannot be referenced to an emitter mode. The values provided in the record records (provided in the associated Electromagnetic Emission PDU). (The victim radar beams are those that are targeted by the jammer.) Section 6.2.21.2.2
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class AngleDeception extends Object implements Serializable
+{
protected int recordType = (int)3501;
-
+
protected short recordLength = (short)48;
-
+
protected short padding = (short)0;
-
+
protected byte emitterNumber;
-
+
protected byte beamNumber;
-
- /** uid 300 */
+
+ /** uid 300 */
protected EEAttributeStateIndicator stateIndicator = EEAttributeStateIndicator.values()[0];
-
+
protected byte padding2 = (byte)0;
-
+
protected float azimuthOffset;
-
+
protected float azimuthWidth;
-
+
protected float azimuthPullRate;
-
+
protected float azimuthPullAcceleration;
-
+
protected float elevationOffset;
-
+
protected float elevationWidth;
-
+
protected float elevationPullRate;
-
+
protected float elevationPullAcceleration;
-
+
protected int padding3 = (int)0;
-
-
-/** Constructor */
- public AngleDeception()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += 4; // recordType
- marshalSize += 2; // recordLength
- marshalSize += 2; // padding
- marshalSize += 1; // emitterNumber
- marshalSize += 1; // beamNumber
- marshalSize += stateIndicator.getMarshalledSize();
- marshalSize += 1; // padding2
- marshalSize += 4; // azimuthOffset
- marshalSize += 4; // azimuthWidth
- marshalSize += 4; // azimuthPullRate
- marshalSize += 4; // azimuthPullAcceleration
- marshalSize += 4; // elevationOffset
- marshalSize += 4; // elevationWidth
- marshalSize += 4; // elevationPullRate
- marshalSize += 4; // elevationPullAcceleration
- marshalSize += 4; // padding3
-
- return marshalSize;
-}
-
-
-/** Setter for {@link AngleDeception#recordType}*/
-public AngleDeception setRecordType(int pRecordType)
-{
- recordType = pRecordType;
- return this;
-}
-
-/** Getter for {@link AngleDeception#recordType}*/
-public int getRecordType()
+
+
+/** Constructor */
+ public AngleDeception()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 4; // recordType
+ marshalSize += 2; // recordLength
+ marshalSize += 2; // padding
+ marshalSize += 1; // emitterNumber
+ marshalSize += 1; // beamNumber
+ marshalSize += stateIndicator.getMarshalledSize();
+ marshalSize += 1; // padding2
+ marshalSize += 4; // azimuthOffset
+ marshalSize += 4; // azimuthWidth
+ marshalSize += 4; // azimuthPullRate
+ marshalSize += 4; // azimuthPullAcceleration
+ marshalSize += 4; // elevationOffset
+ marshalSize += 4; // elevationWidth
+ marshalSize += 4; // elevationPullRate
+ marshalSize += 4; // elevationPullAcceleration
+ marshalSize += 4; // padding3
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link AngleDeception#recordType}*/
+public AngleDeception setRecordType(int pRecordType)
+{
+ recordType = pRecordType;
+ return this;
+}
+
+/** Getter for {@link AngleDeception#recordType}*/
+public int getRecordType()
{
return recordType;
-}
-
-/** Setter for {@link AngleDeception#recordLength}*/
-public AngleDeception setRecordLength(short pRecordLength)
-{
- recordLength = pRecordLength;
- return this;
-}
-
-/** Getter for {@link AngleDeception#recordLength}*/
-public short getRecordLength()
+}
+
+/** Setter for {@link AngleDeception#recordLength}*/
+public AngleDeception setRecordLength(short pRecordLength)
+{
+ recordLength = pRecordLength;
+ return this;
+}
+
+/** Getter for {@link AngleDeception#recordLength}*/
+public short getRecordLength()
{
return recordLength;
-}
-
-/** Setter for {@link AngleDeception#padding}*/
-public AngleDeception setPadding(short pPadding)
-{
- padding = pPadding;
- return this;
-}
-
-/** Getter for {@link AngleDeception#padding}*/
-public short getPadding()
+}
+
+/** Setter for {@link AngleDeception#padding}*/
+public AngleDeception setPadding(short pPadding)
+{
+ padding = pPadding;
+ return this;
+}
+
+/** Getter for {@link AngleDeception#padding}*/
+public short getPadding()
{
return padding;
-}
-
-/** Setter for {@link AngleDeception#emitterNumber}*/
-public AngleDeception setEmitterNumber(byte pEmitterNumber)
-{
- emitterNumber = pEmitterNumber;
- return this;
-}
-
-/** Getter for {@link AngleDeception#emitterNumber}*/
-public byte getEmitterNumber()
+}
+
+/** Setter for {@link AngleDeception#emitterNumber}*/
+public AngleDeception setEmitterNumber(byte pEmitterNumber)
+{
+ emitterNumber = pEmitterNumber;
+ return this;
+}
+
+/** Getter for {@link AngleDeception#emitterNumber}*/
+public byte getEmitterNumber()
{
return emitterNumber;
-}
-
-/** Setter for {@link AngleDeception#beamNumber}*/
-public AngleDeception setBeamNumber(byte pBeamNumber)
-{
- beamNumber = pBeamNumber;
- return this;
-}
-
-/** Getter for {@link AngleDeception#beamNumber}*/
-public byte getBeamNumber()
+}
+
+/** Setter for {@link AngleDeception#beamNumber}*/
+public AngleDeception setBeamNumber(byte pBeamNumber)
+{
+ beamNumber = pBeamNumber;
+ return this;
+}
+
+/** Getter for {@link AngleDeception#beamNumber}*/
+public byte getBeamNumber()
{
return beamNumber;
-}
-
-/** Setter for {@link AngleDeception#stateIndicator}*/
-public AngleDeception setStateIndicator(EEAttributeStateIndicator pStateIndicator)
-{
- stateIndicator = pStateIndicator;
- return this;
-}
-
-/** Getter for {@link AngleDeception#stateIndicator}*/
-public EEAttributeStateIndicator getStateIndicator()
+}
+
+/** Setter for {@link AngleDeception#stateIndicator}*/
+public AngleDeception setStateIndicator(EEAttributeStateIndicator pStateIndicator)
+{
+ stateIndicator = pStateIndicator;
+ return this;
+}
+
+/** Getter for {@link AngleDeception#stateIndicator}*/
+public EEAttributeStateIndicator getStateIndicator()
{
return stateIndicator;
-}
-
-/** Setter for {@link AngleDeception#padding2}*/
-public AngleDeception setPadding2(byte pPadding2)
-{
- padding2 = pPadding2;
- return this;
-}
-
-/** Getter for {@link AngleDeception#padding2}*/
-public byte getPadding2()
+}
+
+/** Setter for {@link AngleDeception#padding2}*/
+public AngleDeception setPadding2(byte pPadding2)
+{
+ padding2 = pPadding2;
+ return this;
+}
+
+/** Getter for {@link AngleDeception#padding2}*/
+public byte getPadding2()
{
return padding2;
-}
-
-/** Setter for {@link AngleDeception#azimuthOffset}*/
-public AngleDeception setAzimuthOffset(float pAzimuthOffset)
-{
- azimuthOffset = pAzimuthOffset;
- return this;
-}
-
-/** Getter for {@link AngleDeception#azimuthOffset}*/
-public float getAzimuthOffset()
+}
+
+/** Setter for {@link AngleDeception#azimuthOffset}*/
+public AngleDeception setAzimuthOffset(float pAzimuthOffset)
+{
+ azimuthOffset = pAzimuthOffset;
+ return this;
+}
+
+/** Getter for {@link AngleDeception#azimuthOffset}*/
+public float getAzimuthOffset()
{
return azimuthOffset;
-}
-
-/** Setter for {@link AngleDeception#azimuthWidth}*/
-public AngleDeception setAzimuthWidth(float pAzimuthWidth)
-{
- azimuthWidth = pAzimuthWidth;
- return this;
-}
-
-/** Getter for {@link AngleDeception#azimuthWidth}*/
-public float getAzimuthWidth()
+}
+
+/** Setter for {@link AngleDeception#azimuthWidth}*/
+public AngleDeception setAzimuthWidth(float pAzimuthWidth)
+{
+ azimuthWidth = pAzimuthWidth;
+ return this;
+}
+
+/** Getter for {@link AngleDeception#azimuthWidth}*/
+public float getAzimuthWidth()
{
return azimuthWidth;
-}
-
-/** Setter for {@link AngleDeception#azimuthPullRate}*/
-public AngleDeception setAzimuthPullRate(float pAzimuthPullRate)
-{
- azimuthPullRate = pAzimuthPullRate;
- return this;
-}
-
-/** Getter for {@link AngleDeception#azimuthPullRate}*/
-public float getAzimuthPullRate()
+}
+
+/** Setter for {@link AngleDeception#azimuthPullRate}*/
+public AngleDeception setAzimuthPullRate(float pAzimuthPullRate)
+{
+ azimuthPullRate = pAzimuthPullRate;
+ return this;
+}
+
+/** Getter for {@link AngleDeception#azimuthPullRate}*/
+public float getAzimuthPullRate()
{
return azimuthPullRate;
-}
-
-/** Setter for {@link AngleDeception#azimuthPullAcceleration}*/
-public AngleDeception setAzimuthPullAcceleration(float pAzimuthPullAcceleration)
-{
- azimuthPullAcceleration = pAzimuthPullAcceleration;
- return this;
-}
-
-/** Getter for {@link AngleDeception#azimuthPullAcceleration}*/
-public float getAzimuthPullAcceleration()
+}
+
+/** Setter for {@link AngleDeception#azimuthPullAcceleration}*/
+public AngleDeception setAzimuthPullAcceleration(float pAzimuthPullAcceleration)
+{
+ azimuthPullAcceleration = pAzimuthPullAcceleration;
+ return this;
+}
+
+/** Getter for {@link AngleDeception#azimuthPullAcceleration}*/
+public float getAzimuthPullAcceleration()
{
return azimuthPullAcceleration;
-}
-
-/** Setter for {@link AngleDeception#elevationOffset}*/
-public AngleDeception setElevationOffset(float pElevationOffset)
-{
- elevationOffset = pElevationOffset;
- return this;
-}
-
-/** Getter for {@link AngleDeception#elevationOffset}*/
-public float getElevationOffset()
+}
+
+/** Setter for {@link AngleDeception#elevationOffset}*/
+public AngleDeception setElevationOffset(float pElevationOffset)
+{
+ elevationOffset = pElevationOffset;
+ return this;
+}
+
+/** Getter for {@link AngleDeception#elevationOffset}*/
+public float getElevationOffset()
{
return elevationOffset;
-}
-
-/** Setter for {@link AngleDeception#elevationWidth}*/
-public AngleDeception setElevationWidth(float pElevationWidth)
-{
- elevationWidth = pElevationWidth;
- return this;
-}
-
-/** Getter for {@link AngleDeception#elevationWidth}*/
-public float getElevationWidth()
+}
+
+/** Setter for {@link AngleDeception#elevationWidth}*/
+public AngleDeception setElevationWidth(float pElevationWidth)
+{
+ elevationWidth = pElevationWidth;
+ return this;
+}
+
+/** Getter for {@link AngleDeception#elevationWidth}*/
+public float getElevationWidth()
{
return elevationWidth;
-}
-
-/** Setter for {@link AngleDeception#elevationPullRate}*/
-public AngleDeception setElevationPullRate(float pElevationPullRate)
-{
- elevationPullRate = pElevationPullRate;
- return this;
-}
-
-/** Getter for {@link AngleDeception#elevationPullRate}*/
-public float getElevationPullRate()
+}
+
+/** Setter for {@link AngleDeception#elevationPullRate}*/
+public AngleDeception setElevationPullRate(float pElevationPullRate)
+{
+ elevationPullRate = pElevationPullRate;
+ return this;
+}
+
+/** Getter for {@link AngleDeception#elevationPullRate}*/
+public float getElevationPullRate()
{
return elevationPullRate;
-}
-
-/** Setter for {@link AngleDeception#elevationPullAcceleration}*/
-public AngleDeception setElevationPullAcceleration(float pElevationPullAcceleration)
-{
- elevationPullAcceleration = pElevationPullAcceleration;
- return this;
-}
-
-/** Getter for {@link AngleDeception#elevationPullAcceleration}*/
-public float getElevationPullAcceleration()
+}
+
+/** Setter for {@link AngleDeception#elevationPullAcceleration}*/
+public AngleDeception setElevationPullAcceleration(float pElevationPullAcceleration)
+{
+ elevationPullAcceleration = pElevationPullAcceleration;
+ return this;
+}
+
+/** Getter for {@link AngleDeception#elevationPullAcceleration}*/
+public float getElevationPullAcceleration()
{
return elevationPullAcceleration;
-}
-
-/** Setter for {@link AngleDeception#padding3}*/
-public AngleDeception setPadding3(int pPadding3)
-{
- padding3 = pPadding3;
- return this;
-}
-
-/** Getter for {@link AngleDeception#padding3}*/
-public int getPadding3()
+}
+
+/** Setter for {@link AngleDeception#padding3}*/
+public AngleDeception setPadding3(int pPadding3)
+{
+ padding3 = pPadding3;
+ return this;
+}
+
+/** Getter for {@link AngleDeception#padding3}*/
+public int getPadding3()
{
return padding3;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeInt(recordType);
- dos.writeShort(recordLength);
- dos.writeShort(padding);
- dos.writeByte(emitterNumber);
- dos.writeByte(beamNumber);
- stateIndicator.marshal(dos);
- dos.writeByte(padding2);
- dos.writeFloat(azimuthOffset);
- dos.writeFloat(azimuthWidth);
- dos.writeFloat(azimuthPullRate);
- dos.writeFloat(azimuthPullAcceleration);
- dos.writeFloat(elevationOffset);
- dos.writeFloat(elevationWidth);
- dos.writeFloat(elevationPullRate);
- dos.writeFloat(elevationPullAcceleration);
- dos.writeInt(padding3);
+ {
+ dos.writeInt(recordType);
+ dos.writeShort(recordLength);
+ dos.writeShort(padding);
+ dos.writeByte(emitterNumber);
+ dos.writeByte(beamNumber);
+ stateIndicator.marshal(dos);
+ dos.writeByte(padding2);
+ dos.writeFloat(azimuthOffset);
+ dos.writeFloat(azimuthWidth);
+ dos.writeFloat(azimuthPullRate);
+ dos.writeFloat(azimuthPullAcceleration);
+ dos.writeFloat(elevationOffset);
+ dos.writeFloat(elevationWidth);
+ dos.writeFloat(elevationPullRate);
+ dos.writeFloat(elevationPullAcceleration);
+ dos.writeInt(padding3);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- recordType = dis.readInt();
- uPosition += 4;
- recordLength = (short)dis.readUnsignedShort();
- uPosition += 2;
- padding = (short)dis.readUnsignedShort();
- uPosition += 2;
- emitterNumber = (byte)dis.readUnsignedByte();
- uPosition += 1;
- beamNumber = (byte)dis.readUnsignedByte();
- uPosition += 1;
- stateIndicator = EEAttributeStateIndicator.unmarshalEnum(dis);
- uPosition += stateIndicator.getMarshalledSize();
- padding2 = (byte)dis.readUnsignedByte();
- uPosition += 1;
- azimuthOffset = dis.readFloat();
- uPosition += 4;
- azimuthWidth = dis.readFloat();
- uPosition += 4;
- azimuthPullRate = dis.readFloat();
- uPosition += 4;
- azimuthPullAcceleration = dis.readFloat();
- uPosition += 4;
- elevationOffset = dis.readFloat();
- uPosition += 4;
- elevationWidth = dis.readFloat();
- uPosition += 4;
- elevationPullRate = dis.readFloat();
- uPosition += 4;
- elevationPullAcceleration = dis.readFloat();
- uPosition += 4;
- padding3 = dis.readInt();
- uPosition += 4;
+ {
+ recordType = dis.readInt();
+ uPosition += 4;
+ recordLength = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ padding = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ emitterNumber = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ beamNumber = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ stateIndicator = EEAttributeStateIndicator.unmarshalEnum(dis);
+ uPosition += stateIndicator.getMarshalledSize();
+ padding2 = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ azimuthOffset = dis.readFloat();
+ uPosition += 4;
+ azimuthWidth = dis.readFloat();
+ uPosition += 4;
+ azimuthPullRate = dis.readFloat();
+ uPosition += 4;
+ azimuthPullAcceleration = dis.readFloat();
+ uPosition += 4;
+ elevationOffset = dis.readFloat();
+ uPosition += 4;
+ elevationWidth = dis.readFloat();
+ uPosition += 4;
+ elevationPullRate = dis.readFloat();
+ uPosition += 4;
+ elevationPullAcceleration = dis.readFloat();
+ uPosition += 4;
+ padding3 = dis.readInt();
+ uPosition += 4;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putInt( (int)recordType);
- buff.putShort( (short)recordLength);
- buff.putShort( (short)padding);
- buff.put( (byte)emitterNumber);
- buff.put( (byte)beamNumber);
- stateIndicator.marshal(buff);
- buff.put( (byte)padding2);
- buff.putFloat( (float)azimuthOffset);
- buff.putFloat( (float)azimuthWidth);
- buff.putFloat( (float)azimuthPullRate);
- buff.putFloat( (float)azimuthPullAcceleration);
- buff.putFloat( (float)elevationOffset);
- buff.putFloat( (float)elevationWidth);
- buff.putFloat( (float)elevationPullRate);
- buff.putFloat( (float)elevationPullAcceleration);
- buff.putInt( (int)padding3);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- recordType = buff.getInt();
- recordLength = (short)(buff.getShort() & 0xFFFF);
- padding = (short)(buff.getShort() & 0xFFFF);
- emitterNumber = (byte)(buff.get() & 0xFF);
- beamNumber = (byte)(buff.get() & 0xFF);
- stateIndicator = EEAttributeStateIndicator.unmarshalEnum(buff);
- padding2 = (byte)(buff.get() & 0xFF);
- azimuthOffset = buff.getFloat();
- azimuthWidth = buff.getFloat();
- azimuthPullRate = buff.getFloat();
- azimuthPullAcceleration = buff.getFloat();
- elevationOffset = buff.getFloat();
- elevationWidth = buff.getFloat();
- elevationPullRate = buff.getFloat();
- elevationPullAcceleration = buff.getFloat();
- padding3 = buff.getInt();
- return getMarshalledSize();
-}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final AngleDeception rhs = (AngleDeception)obj;
-
- if( ! (recordType == rhs.recordType)) ivarsEqual = false;
- if( ! (recordLength == rhs.recordLength)) ivarsEqual = false;
- if( ! (padding == rhs.padding)) ivarsEqual = false;
- if( ! (emitterNumber == rhs.emitterNumber)) ivarsEqual = false;
- if( ! (beamNumber == rhs.beamNumber)) ivarsEqual = false;
- if( ! (stateIndicator == rhs.stateIndicator)) ivarsEqual = false;
- if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
- if( ! (azimuthOffset == rhs.azimuthOffset)) ivarsEqual = false;
- if( ! (azimuthWidth == rhs.azimuthWidth)) ivarsEqual = false;
- if( ! (azimuthPullRate == rhs.azimuthPullRate)) ivarsEqual = false;
- if( ! (azimuthPullAcceleration == rhs.azimuthPullAcceleration)) ivarsEqual = false;
- if( ! (elevationOffset == rhs.elevationOffset)) ivarsEqual = false;
- if( ! (elevationWidth == rhs.elevationWidth)) ivarsEqual = false;
- if( ! (elevationPullRate == rhs.elevationPullRate)) ivarsEqual = false;
- if( ! (elevationPullAcceleration == rhs.elevationPullAcceleration)) ivarsEqual = false;
- if( ! (padding3 == rhs.padding3)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+ }
+ return getMarshalledSize();
+}
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putInt( (int)recordType);
+ buff.putShort( (short)recordLength);
+ buff.putShort( (short)padding);
+ buff.put( (byte)emitterNumber);
+ buff.put( (byte)beamNumber);
+ stateIndicator.marshal(buff);
+ buff.put( (byte)padding2);
+ buff.putFloat( (float)azimuthOffset);
+ buff.putFloat( (float)azimuthWidth);
+ buff.putFloat( (float)azimuthPullRate);
+ buff.putFloat( (float)azimuthPullAcceleration);
+ buff.putFloat( (float)elevationOffset);
+ buff.putFloat( (float)elevationWidth);
+ buff.putFloat( (float)elevationPullRate);
+ buff.putFloat( (float)elevationPullAcceleration);
+ buff.putInt( (int)padding3);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ recordType = buff.getInt();
+ recordLength = (short)(buff.getShort() & 0xFFFF);
+ padding = (short)(buff.getShort() & 0xFFFF);
+ emitterNumber = (byte)(buff.get() & 0xFF);
+ beamNumber = (byte)(buff.get() & 0xFF);
+ stateIndicator = EEAttributeStateIndicator.unmarshalEnum(buff);
+ padding2 = (byte)(buff.get() & 0xFF);
+ azimuthOffset = buff.getFloat();
+ azimuthWidth = buff.getFloat();
+ azimuthPullRate = buff.getFloat();
+ azimuthPullAcceleration = buff.getFloat();
+ elevationOffset = buff.getFloat();
+ elevationWidth = buff.getFloat();
+ elevationPullRate = buff.getFloat();
+ elevationPullAcceleration = buff.getFloat();
+ padding3 = buff.getInt();
+ return getMarshalledSize();
+}
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final AngleDeception rhs = (AngleDeception)obj;
+
+ if( ! (recordType == rhs.recordType)) ivarsEqual = false;
+ if( ! (recordLength == rhs.recordLength)) ivarsEqual = false;
+ if( ! (padding == rhs.padding)) ivarsEqual = false;
+ if( ! (emitterNumber == rhs.emitterNumber)) ivarsEqual = false;
+ if( ! (beamNumber == rhs.beamNumber)) ivarsEqual = false;
+ if( ! (stateIndicator == rhs.stateIndicator)) ivarsEqual = false;
+ if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
+ if( ! (azimuthOffset == rhs.azimuthOffset)) ivarsEqual = false;
+ if( ! (azimuthWidth == rhs.azimuthWidth)) ivarsEqual = false;
+ if( ! (azimuthPullRate == rhs.azimuthPullRate)) ivarsEqual = false;
+ if( ! (azimuthPullAcceleration == rhs.azimuthPullAcceleration)) ivarsEqual = false;
+ if( ! (elevationOffset == rhs.elevationOffset)) ivarsEqual = false;
+ if( ! (elevationWidth == rhs.elevationWidth)) ivarsEqual = false;
+ if( ! (elevationPullRate == rhs.elevationPullRate)) ivarsEqual = false;
+ if( ! (elevationPullAcceleration == rhs.elevationPullAcceleration)) ivarsEqual = false;
+ if( ! (padding3 == rhs.padding3)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" recordType: ").append(recordType).append("\n");
- sb.append(" recordLength: ").append(recordLength).append("\n");
- sb.append(" padding: ").append(padding).append("\n");
- sb.append(" emitterNumber: ").append(emitterNumber).append("\n");
- sb.append(" beamNumber: ").append(beamNumber).append("\n");
- sb.append(" stateIndicator: ").append(stateIndicator).append("\n");
- sb.append(" padding2: ").append(padding2).append("\n");
- sb.append(" azimuthOffset: ").append(azimuthOffset).append("\n");
- sb.append(" azimuthWidth: ").append(azimuthWidth).append("\n");
- sb.append(" azimuthPullRate: ").append(azimuthPullRate).append("\n");
- sb.append(" azimuthPullAcceleration: ").append(azimuthPullAcceleration).append("\n");
- sb.append(" elevationOffset: ").append(elevationOffset).append("\n");
- sb.append(" elevationWidth: ").append(elevationWidth).append("\n");
- sb.append(" elevationPullRate: ").append(elevationPullRate).append("\n");
- sb.append(" elevationPullAcceleration: ").append(elevationPullAcceleration).append("\n");
- sb.append(" padding3: ").append(padding3).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" recordType: ").append(recordType).append("\n");
+ sb.append(" recordLength: ").append(recordLength).append("\n");
+ sb.append(" padding: ").append(padding).append("\n");
+ sb.append(" emitterNumber: ").append(emitterNumber).append("\n");
+ sb.append(" beamNumber: ").append(beamNumber).append("\n");
+ sb.append(" stateIndicator: ").append(stateIndicator).append("\n");
+ sb.append(" padding2: ").append(padding2).append("\n");
+ sb.append(" azimuthOffset: ").append(azimuthOffset).append("\n");
+ sb.append(" azimuthWidth: ").append(azimuthWidth).append("\n");
+ sb.append(" azimuthPullRate: ").append(azimuthPullRate).append("\n");
+ sb.append(" azimuthPullAcceleration: ").append(azimuthPullAcceleration).append("\n");
+ sb.append(" elevationOffset: ").append(elevationOffset).append("\n");
+ sb.append(" elevationWidth: ").append(elevationWidth).append("\n");
+ sb.append(" elevationPullRate: ").append(elevationPullRate).append("\n");
+ sb.append(" elevationPullAcceleration: ").append(elevationPullAcceleration).append("\n");
+ sb.append(" padding3: ").append(padding3).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/AngularVelocityVector.java b/src-generated/edu/nps/moves/dis7/AngularVelocityVector.java
index 51b61b7264b1754b327374d9310fb2eebeabc04a..d885fddcb272a9913258770d36aeef78a61235fc 100644
--- a/src-generated/edu/nps/moves/dis7/AngularVelocityVector.java
+++ b/src-generated/edu/nps/moves/dis7/AngularVelocityVector.java
@@ -1,210 +1,210 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Angular velocity measured in radians per second out each of the entity's own coordinate axes. Order of measurement is angular velocity around the x, y, and z axis of the entity. The positive direction is determined by the right hand rule. Section 6.2.7
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class AngularVelocityVector extends Object implements Serializable
-{
- /** velocity about the x axis */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Angular velocity measured in radians per second out each of the entity's own coordinate axes. Order of measurement is angular velocity around the x, y, and z axis of the entity. The positive direction is determined by the right hand rule. Section 6.2.7
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class AngularVelocityVector extends Object implements Serializable
+{
+ /** velocity about the x axis */
protected float x = (float)0;
-
- /** velocity about the y axis */
+
+ /** velocity about the y axis */
protected float y = (float)0;
-
- /** velocity about the zaxis */
+
+ /** velocity about the zaxis */
protected float z = (float)0;
-
-
-/** Constructor */
- public AngularVelocityVector()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += 4; // x
- marshalSize += 4; // y
- marshalSize += 4; // z
-
- return marshalSize;
-}
-
-
-/** Setter for {@link AngularVelocityVector#x}*/
-public AngularVelocityVector setX(float pX)
+
+
+/** Constructor */
+ public AngularVelocityVector()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 4; // x
+ marshalSize += 4; // y
+ marshalSize += 4; // z
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link AngularVelocityVector#x}*/
+public AngularVelocityVector setX(float pX)
{
- x = pX;
- return this;
-}
-
-/** Getter for {@link AngularVelocityVector#x}*/
-public float getX()
+ x = pX;
+ return this;
+}
+
+/** Getter for {@link AngularVelocityVector#x}*/
+public float getX()
{
return x;
-}
-
-/** Setter for {@link AngularVelocityVector#y}*/
-public AngularVelocityVector setY(float pY)
+}
+
+/** Setter for {@link AngularVelocityVector#y}*/
+public AngularVelocityVector setY(float pY)
{
- y = pY;
- return this;
-}
-
-/** Getter for {@link AngularVelocityVector#y}*/
-public float getY()
+ y = pY;
+ return this;
+}
+
+/** Getter for {@link AngularVelocityVector#y}*/
+public float getY()
{
return y;
-}
-
-/** Setter for {@link AngularVelocityVector#z}*/
-public AngularVelocityVector setZ(float pZ)
+}
+
+/** Setter for {@link AngularVelocityVector#z}*/
+public AngularVelocityVector setZ(float pZ)
{
- z = pZ;
- return this;
-}
-
-/** Getter for {@link AngularVelocityVector#z}*/
-public float getZ()
+ z = pZ;
+ return this;
+}
+
+/** Getter for {@link AngularVelocityVector#z}*/
+public float getZ()
{
return z;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeFloat(x);
- dos.writeFloat(y);
- dos.writeFloat(z);
+ {
+ dos.writeFloat(x);
+ dos.writeFloat(y);
+ dos.writeFloat(z);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- x = dis.readFloat();
- uPosition += 4;
- y = dis.readFloat();
- uPosition += 4;
- z = dis.readFloat();
- uPosition += 4;
+ {
+ x = dis.readFloat();
+ uPosition += 4;
+ y = dis.readFloat();
+ uPosition += 4;
+ z = dis.readFloat();
+ uPosition += 4;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putFloat( (float)x);
- buff.putFloat( (float)y);
- buff.putFloat( (float)z);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- x = buff.getFloat();
- y = buff.getFloat();
- z = buff.getFloat();
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putFloat( (float)x);
+ buff.putFloat( (float)y);
+ buff.putFloat( (float)z);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ x = buff.getFloat();
+ y = buff.getFloat();
+ z = buff.getFloat();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final AngularVelocityVector rhs = (AngularVelocityVector)obj;
-
- if( ! (x == rhs.x)) ivarsEqual = false;
- if( ! (y == rhs.y)) ivarsEqual = false;
- if( ! (z == rhs.z)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final AngularVelocityVector rhs = (AngularVelocityVector)obj;
+
+ if( ! (x == rhs.x)) ivarsEqual = false;
+ if( ! (y == rhs.y)) ivarsEqual = false;
+ if( ! (z == rhs.z)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" x: ").append(x).append("\n");
- sb.append(" y: ").append(y).append("\n");
- sb.append(" z: ").append(z).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" x: ").append(x).append("\n");
+ sb.append(" y: ").append(y).append("\n");
+ sb.append(" z: ").append(z).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/AntennaLocation.java b/src-generated/edu/nps/moves/dis7/AntennaLocation.java
index 8540a61c2ca8ca0afd26dd7f6e46e4e356a3c220..010b61d67c3914f0598b7e6115aa6c5618c31851 100644
--- a/src-generated/edu/nps/moves/dis7/AntennaLocation.java
+++ b/src-generated/edu/nps/moves/dis7/AntennaLocation.java
@@ -1,184 +1,184 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Location of the radiating portion of the antenna, specified in world coordinates and entity coordinates. Section 6.2.8
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class AntennaLocation extends Object implements Serializable
-{
- /** Location of the radiating portion of the antenna in world coordinates */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Location of the radiating portion of the antenna, specified in world coordinates and entity coordinates. Section 6.2.8
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class AntennaLocation extends Object implements Serializable
+{
+ /** Location of the radiating portion of the antenna in world coordinates */
protected Vector3Double antennaLocation = new Vector3Double();
-
- /** Location of the radiating portion of the antenna in entity coordinates */
+
+ /** Location of the radiating portion of the antenna in entity coordinates */
protected Vector3Float relativeAntennaLocation = new Vector3Float();
-
-
-/** Constructor */
- public AntennaLocation()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += antennaLocation.getMarshalledSize();
- marshalSize += relativeAntennaLocation.getMarshalledSize();
-
- return marshalSize;
-}
-
-
-/** Setter for {@link AntennaLocation#antennaLocation}*/
-public AntennaLocation setAntennaLocation(Vector3Double pAntennaLocation)
+
+
+/** Constructor */
+ public AntennaLocation()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += antennaLocation.getMarshalledSize();
+ marshalSize += relativeAntennaLocation.getMarshalledSize();
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link AntennaLocation#antennaLocation}*/
+public AntennaLocation setAntennaLocation(Vector3Double pAntennaLocation)
{
- antennaLocation = pAntennaLocation;
- return this;
-}
-
-/** Getter for {@link AntennaLocation#antennaLocation}*/
-public Vector3Double getAntennaLocation()
+ antennaLocation = pAntennaLocation;
+ return this;
+}
+
+/** Getter for {@link AntennaLocation#antennaLocation}*/
+public Vector3Double getAntennaLocation()
{
return antennaLocation;
-}
-
-/** Setter for {@link AntennaLocation#relativeAntennaLocation}*/
-public AntennaLocation setRelativeAntennaLocation(Vector3Float pRelativeAntennaLocation)
+}
+
+/** Setter for {@link AntennaLocation#relativeAntennaLocation}*/
+public AntennaLocation setRelativeAntennaLocation(Vector3Float pRelativeAntennaLocation)
{
- relativeAntennaLocation = pRelativeAntennaLocation;
- return this;
-}
-
-/** Getter for {@link AntennaLocation#relativeAntennaLocation}*/
-public Vector3Float getRelativeAntennaLocation()
+ relativeAntennaLocation = pRelativeAntennaLocation;
+ return this;
+}
+
+/** Getter for {@link AntennaLocation#relativeAntennaLocation}*/
+public Vector3Float getRelativeAntennaLocation()
{
return relativeAntennaLocation;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- antennaLocation.marshal(dos);
- relativeAntennaLocation.marshal(dos);
+ {
+ antennaLocation.marshal(dos);
+ relativeAntennaLocation.marshal(dos);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- uPosition += antennaLocation.unmarshal(dis);
- uPosition += relativeAntennaLocation.unmarshal(dis);
+ {
+ uPosition += antennaLocation.unmarshal(dis);
+ uPosition += relativeAntennaLocation.unmarshal(dis);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- antennaLocation.marshal(buff);
- relativeAntennaLocation.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- antennaLocation.unmarshal(buff);
- relativeAntennaLocation.unmarshal(buff);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ antennaLocation.marshal(buff);
+ relativeAntennaLocation.marshal(buff);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ antennaLocation.unmarshal(buff);
+ relativeAntennaLocation.unmarshal(buff);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final AntennaLocation rhs = (AntennaLocation)obj;
-
- if( ! (antennaLocation.equals( rhs.antennaLocation) )) ivarsEqual = false;
- if( ! (relativeAntennaLocation.equals( rhs.relativeAntennaLocation) )) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final AntennaLocation rhs = (AntennaLocation)obj;
+
+ if( ! (antennaLocation.equals( rhs.antennaLocation) )) ivarsEqual = false;
+ if( ! (relativeAntennaLocation.equals( rhs.relativeAntennaLocation) )) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" antennaLocation: ").append(antennaLocation).append("\n");
- sb.append(" relativeAntennaLocation: ").append(relativeAntennaLocation).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" antennaLocation: ").append(antennaLocation).append("\n");
+ sb.append(" relativeAntennaLocation: ").append(relativeAntennaLocation).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/Appearance.java b/src-generated/edu/nps/moves/dis7/Appearance.java
index 265a760b93c63b1ef9f5529773928147458916c8..931697d31e7440e00b904d1005803add878e08b9 100644
--- a/src-generated/edu/nps/moves/dis7/Appearance.java
+++ b/src-generated/edu/nps/moves/dis7/Appearance.java
@@ -1,230 +1,230 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * used in AppearancePdu
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class Appearance extends Object implements Serializable
-{
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * used in AppearancePdu
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class Appearance extends Object implements Serializable
+{
protected int visual;
-
+
protected int ir;
-
+
protected int em;
-
+
protected int audio;
-
-
-/** Constructor */
- public Appearance()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public Appearance()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 4; // visual
+ marshalSize += 4; // ir
+ marshalSize += 4; // em
+ marshalSize += 4; // audio
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link Appearance#visual}*/
+public Appearance setVisual(int pVisual)
{
- int marshalSize = 0;
-
- marshalSize += 4; // visual
- marshalSize += 4; // ir
- marshalSize += 4; // em
- marshalSize += 4; // audio
-
- return marshalSize;
-}
-
-
-/** Setter for {@link Appearance#visual}*/
-public Appearance setVisual(int pVisual)
-{
- visual = pVisual;
- return this;
-}
-
-/** Getter for {@link Appearance#visual}*/
-public int getVisual()
+ visual = pVisual;
+ return this;
+}
+
+/** Getter for {@link Appearance#visual}*/
+public int getVisual()
{
return visual;
-}
-
-/** Setter for {@link Appearance#ir}*/
-public Appearance setIr(int pIr)
+}
+
+/** Setter for {@link Appearance#ir}*/
+public Appearance setIr(int pIr)
{
- ir = pIr;
- return this;
-}
-
-/** Getter for {@link Appearance#ir}*/
-public int getIr()
+ ir = pIr;
+ return this;
+}
+
+/** Getter for {@link Appearance#ir}*/
+public int getIr()
{
return ir;
-}
-
-/** Setter for {@link Appearance#em}*/
-public Appearance setEm(int pEm)
+}
+
+/** Setter for {@link Appearance#em}*/
+public Appearance setEm(int pEm)
{
- em = pEm;
- return this;
-}
-
-/** Getter for {@link Appearance#em}*/
-public int getEm()
+ em = pEm;
+ return this;
+}
+
+/** Getter for {@link Appearance#em}*/
+public int getEm()
{
return em;
-}
-
-/** Setter for {@link Appearance#audio}*/
-public Appearance setAudio(int pAudio)
+}
+
+/** Setter for {@link Appearance#audio}*/
+public Appearance setAudio(int pAudio)
{
- audio = pAudio;
- return this;
-}
-
-/** Getter for {@link Appearance#audio}*/
-public int getAudio()
+ audio = pAudio;
+ return this;
+}
+
+/** Getter for {@link Appearance#audio}*/
+public int getAudio()
{
return audio;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeInt(visual);
- dos.writeInt(ir);
- dos.writeInt(em);
- dos.writeInt(audio);
+ {
+ dos.writeInt(visual);
+ dos.writeInt(ir);
+ dos.writeInt(em);
+ dos.writeInt(audio);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- visual = dis.readInt();
- uPosition += 4;
- ir = dis.readInt();
- uPosition += 4;
- em = dis.readInt();
- uPosition += 4;
- audio = dis.readInt();
- uPosition += 4;
+ {
+ visual = dis.readInt();
+ uPosition += 4;
+ ir = dis.readInt();
+ uPosition += 4;
+ em = dis.readInt();
+ uPosition += 4;
+ audio = dis.readInt();
+ uPosition += 4;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putInt( (int)visual);
- buff.putInt( (int)ir);
- buff.putInt( (int)em);
- buff.putInt( (int)audio);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- visual = buff.getInt();
- ir = buff.getInt();
- em = buff.getInt();
- audio = buff.getInt();
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putInt( (int)visual);
+ buff.putInt( (int)ir);
+ buff.putInt( (int)em);
+ buff.putInt( (int)audio);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ visual = buff.getInt();
+ ir = buff.getInt();
+ em = buff.getInt();
+ audio = buff.getInt();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final Appearance rhs = (Appearance)obj;
-
- if( ! (visual == rhs.visual)) ivarsEqual = false;
- if( ! (ir == rhs.ir)) ivarsEqual = false;
- if( ! (em == rhs.em)) ivarsEqual = false;
- if( ! (audio == rhs.audio)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final Appearance rhs = (Appearance)obj;
+
+ if( ! (visual == rhs.visual)) ivarsEqual = false;
+ if( ! (ir == rhs.ir)) ivarsEqual = false;
+ if( ! (em == rhs.em)) ivarsEqual = false;
+ if( ! (audio == rhs.audio)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" visual: ").append(visual).append("\n");
- sb.append(" ir: ").append(ir).append("\n");
- sb.append(" em: ").append(em).append("\n");
- sb.append(" audio: ").append(audio).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" visual: ").append(visual).append("\n");
+ sb.append(" ir: ").append(ir).append("\n");
+ sb.append(" em: ").append(em).append("\n");
+ sb.append(" audio: ").append(audio).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/AppearancePdu.java b/src-generated/edu/nps/moves/dis7/AppearancePdu.java
index 28b1f15d4bf488482fdce860d39220169c431472..04e3cdfa56a3c50b398c38971374c9411b3a7266 100644
--- a/src-generated/edu/nps/moves/dis7/AppearancePdu.java
+++ b/src-generated/edu/nps/moves/dis7/AppearancePdu.java
@@ -1,321 +1,321 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 9.4.3 Communicate information about the appearance of a live entity.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class AppearancePdu extends LiveEntityFamilyPdu implements Serializable
-{
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 9.4.3 Communicate information about the appearance of a live entity.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class AppearancePdu extends LiveEntityFamilyPdu implements Serializable
+{
protected EntityID liveEntityId = new EntityID();
-
- /** 16-bit bit field */
+
+ /** 16-bit bit field */
protected short appearanceFlags;
-
- /** uid 6 */
+
+ /** uid 6 */
protected ForceID forceId = ForceID.values()[0];
-
+
protected EntityType entityType = new EntityType();
-
+
protected EntityType alternateEntityType = new EntityType();
-
+
protected EntityMarking entityMarking = new EntityMarking();
-
+
protected EntityCapabilities capabilities = new LandPlatformCapabilities();
-
+
protected Appearance appearanceFields = new Appearance();
-
-
-/** Constructor */
- public AppearancePdu()
- {
- setPduType( DISPDUType.APPEARANCE );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public AppearancePdu()
+ {
+ setPduType( DISPDUType.APPEARANCE );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += liveEntityId.getMarshalledSize();
+ marshalSize += 2; // appearanceFlags
+ marshalSize += forceId.getMarshalledSize();
+ marshalSize += entityType.getMarshalledSize();
+ marshalSize += alternateEntityType.getMarshalledSize();
+ marshalSize += entityMarking.getMarshalledSize();
+ marshalSize += capabilities.getMarshalledSize();
+ marshalSize += appearanceFields.getMarshalledSize();
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link AppearancePdu#liveEntityId}*/
+public AppearancePdu setLiveEntityId(EntityID pLiveEntityId)
{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += liveEntityId.getMarshalledSize();
- marshalSize += 2; // appearanceFlags
- marshalSize += forceId.getMarshalledSize();
- marshalSize += entityType.getMarshalledSize();
- marshalSize += alternateEntityType.getMarshalledSize();
- marshalSize += entityMarking.getMarshalledSize();
- marshalSize += capabilities.getMarshalledSize();
- marshalSize += appearanceFields.getMarshalledSize();
-
- return marshalSize;
-}
-
-
-/** Setter for {@link AppearancePdu#liveEntityId}*/
-public AppearancePdu setLiveEntityId(EntityID pLiveEntityId)
-{
- liveEntityId = pLiveEntityId;
- return this;
-}
-
-/** Getter for {@link AppearancePdu#liveEntityId}*/
-public EntityID getLiveEntityId()
+ liveEntityId = pLiveEntityId;
+ return this;
+}
+
+/** Getter for {@link AppearancePdu#liveEntityId}*/
+public EntityID getLiveEntityId()
{
return liveEntityId;
-}
-
-/** Setter for {@link AppearancePdu#appearanceFlags}*/
-public AppearancePdu setAppearanceFlags(short pAppearanceFlags)
+}
+
+/** Setter for {@link AppearancePdu#appearanceFlags}*/
+public AppearancePdu setAppearanceFlags(short pAppearanceFlags)
{
- appearanceFlags = pAppearanceFlags;
- return this;
-}
-
-/** Getter for {@link AppearancePdu#appearanceFlags}*/
-public short getAppearanceFlags()
+ appearanceFlags = pAppearanceFlags;
+ return this;
+}
+
+/** Getter for {@link AppearancePdu#appearanceFlags}*/
+public short getAppearanceFlags()
{
return appearanceFlags;
-}
-
-/** Setter for {@link AppearancePdu#forceId}*/
-public AppearancePdu setForceId(ForceID pForceId)
+}
+
+/** Setter for {@link AppearancePdu#forceId}*/
+public AppearancePdu setForceId(ForceID pForceId)
{
- forceId = pForceId;
- return this;
-}
-
-/** Getter for {@link AppearancePdu#forceId}*/
-public ForceID getForceId()
+ forceId = pForceId;
+ return this;
+}
+
+/** Getter for {@link AppearancePdu#forceId}*/
+public ForceID getForceId()
{
return forceId;
-}
-
-/** Setter for {@link AppearancePdu#entityType}*/
-public AppearancePdu setEntityType(EntityType pEntityType)
+}
+
+/** Setter for {@link AppearancePdu#entityType}*/
+public AppearancePdu setEntityType(EntityType pEntityType)
{
- entityType = pEntityType;
- return this;
-}
-
-/** Getter for {@link AppearancePdu#entityType}*/
-public EntityType getEntityType()
+ entityType = pEntityType;
+ return this;
+}
+
+/** Getter for {@link AppearancePdu#entityType}*/
+public EntityType getEntityType()
{
return entityType;
-}
-
-/** Setter for {@link AppearancePdu#alternateEntityType}*/
-public AppearancePdu setAlternateEntityType(EntityType pAlternateEntityType)
+}
+
+/** Setter for {@link AppearancePdu#alternateEntityType}*/
+public AppearancePdu setAlternateEntityType(EntityType pAlternateEntityType)
{
- alternateEntityType = pAlternateEntityType;
- return this;
-}
-
-/** Getter for {@link AppearancePdu#alternateEntityType}*/
-public EntityType getAlternateEntityType()
+ alternateEntityType = pAlternateEntityType;
+ return this;
+}
+
+/** Getter for {@link AppearancePdu#alternateEntityType}*/
+public EntityType getAlternateEntityType()
{
return alternateEntityType;
-}
-
-/** Setter for {@link AppearancePdu#entityMarking}*/
-public AppearancePdu setEntityMarking(EntityMarking pEntityMarking)
+}
+
+/** Setter for {@link AppearancePdu#entityMarking}*/
+public AppearancePdu setEntityMarking(EntityMarking pEntityMarking)
{
- entityMarking = pEntityMarking;
- return this;
-}
-
-/** Getter for {@link AppearancePdu#entityMarking}*/
-public EntityMarking getEntityMarking()
+ entityMarking = pEntityMarking;
+ return this;
+}
+
+/** Getter for {@link AppearancePdu#entityMarking}*/
+public EntityMarking getEntityMarking()
{
return entityMarking;
-}
-
-/** Setter for {@link AppearancePdu#capabilities}*/
-public AppearancePdu setCapabilities(EntityCapabilities pCapabilities)
+}
+
+/** Setter for {@link AppearancePdu#capabilities}*/
+public AppearancePdu setCapabilities(EntityCapabilities pCapabilities)
{
- capabilities = pCapabilities;
- return this;
-}
-
-/** Getter for {@link AppearancePdu#capabilities}*/
-public EntityCapabilities getCapabilities()
+ capabilities = pCapabilities;
+ return this;
+}
+
+/** Getter for {@link AppearancePdu#capabilities}*/
+public EntityCapabilities getCapabilities()
{
return capabilities;
-}
-
-/** Setter for {@link AppearancePdu#appearanceFields}*/
-public AppearancePdu setAppearanceFields(Appearance pAppearanceFields)
+}
+
+/** Setter for {@link AppearancePdu#appearanceFields}*/
+public AppearancePdu setAppearanceFields(Appearance pAppearanceFields)
{
- appearanceFields = pAppearanceFields;
- return this;
-}
-
-/** Getter for {@link AppearancePdu#appearanceFields}*/
-public Appearance getAppearanceFields()
+ appearanceFields = pAppearanceFields;
+ return this;
+}
+
+/** Getter for {@link AppearancePdu#appearanceFields}*/
+public Appearance getAppearanceFields()
{
return appearanceFields;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- liveEntityId.marshal(dos);
- dos.writeShort(appearanceFlags);
- forceId.marshal(dos);
- entityType.marshal(dos);
- alternateEntityType.marshal(dos);
- entityMarking.marshal(dos);
- capabilities.marshal(dos);
- appearanceFields.marshal(dos);
+ {
+ liveEntityId.marshal(dos);
+ dos.writeShort(appearanceFlags);
+ forceId.marshal(dos);
+ entityType.marshal(dos);
+ alternateEntityType.marshal(dos);
+ entityMarking.marshal(dos);
+ capabilities.marshal(dos);
+ appearanceFields.marshal(dos);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += liveEntityId.unmarshal(dis);
- appearanceFlags = (short)dis.readUnsignedShort();
- uPosition += 2;
- forceId = ForceID.unmarshalEnum(dis);
- uPosition += forceId.getMarshalledSize();
- uPosition += entityType.unmarshal(dis);
- uPosition += alternateEntityType.unmarshal(dis);
- uPosition += entityMarking.unmarshal(dis);
- uPosition += capabilities.unmarshal(dis);
- uPosition += appearanceFields.unmarshal(dis);
+ {
+ uPosition += liveEntityId.unmarshal(dis);
+ appearanceFlags = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ forceId = ForceID.unmarshalEnum(dis);
+ uPosition += forceId.getMarshalledSize();
+ uPosition += entityType.unmarshal(dis);
+ uPosition += alternateEntityType.unmarshal(dis);
+ uPosition += entityMarking.unmarshal(dis);
+ uPosition += capabilities.unmarshal(dis);
+ uPosition += appearanceFields.unmarshal(dis);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- liveEntityId.marshal(buff);
- buff.putShort( (short)appearanceFlags);
- forceId.marshal(buff);
- entityType.marshal(buff);
- alternateEntityType.marshal(buff);
- entityMarking.marshal(buff);
- capabilities.marshal(buff);
- appearanceFields.marshal(buff);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ liveEntityId.marshal(buff);
+ buff.putShort( (short)appearanceFlags);
+ forceId.marshal(buff);
+ entityType.marshal(buff);
+ alternateEntityType.marshal(buff);
+ entityMarking.marshal(buff);
+ capabilities.marshal(buff);
+ appearanceFields.marshal(buff);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- liveEntityId.unmarshal(buff);
- appearanceFlags = (short)(buff.getShort() & 0xFFFF);
- forceId = ForceID.unmarshalEnum(buff);
- entityType.unmarshal(buff);
- alternateEntityType.unmarshal(buff);
- entityMarking.unmarshal(buff);
- capabilities.unmarshal(buff);
- appearanceFields.unmarshal(buff);
- return getMarshalledSize();
+
+ liveEntityId.unmarshal(buff);
+ appearanceFlags = (short)(buff.getShort() & 0xFFFF);
+ forceId = ForceID.unmarshalEnum(buff);
+ entityType.unmarshal(buff);
+ alternateEntityType.unmarshal(buff);
+ entityMarking.unmarshal(buff);
+ capabilities.unmarshal(buff);
+ appearanceFields.unmarshal(buff);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final AppearancePdu rhs = (AppearancePdu)obj;
-
- if( ! (liveEntityId.equals( rhs.liveEntityId) )) ivarsEqual = false;
- if( ! (appearanceFlags == rhs.appearanceFlags)) ivarsEqual = false;
- if( ! (forceId == rhs.forceId)) ivarsEqual = false;
- if( ! (entityType.equals( rhs.entityType) )) ivarsEqual = false;
- if( ! (alternateEntityType.equals( rhs.alternateEntityType) )) ivarsEqual = false;
- if( ! (entityMarking.equals( rhs.entityMarking) )) ivarsEqual = false;
- if( ! (capabilities.equals( rhs.capabilities) )) ivarsEqual = false;
- if( ! (appearanceFields.equals( rhs.appearanceFields) )) ivarsEqual = false;
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final AppearancePdu rhs = (AppearancePdu)obj;
+
+ if( ! (liveEntityId.equals( rhs.liveEntityId) )) ivarsEqual = false;
+ if( ! (appearanceFlags == rhs.appearanceFlags)) ivarsEqual = false;
+ if( ! (forceId == rhs.forceId)) ivarsEqual = false;
+ if( ! (entityType.equals( rhs.entityType) )) ivarsEqual = false;
+ if( ! (alternateEntityType.equals( rhs.alternateEntityType) )) ivarsEqual = false;
+ if( ! (entityMarking.equals( rhs.entityMarking) )) ivarsEqual = false;
+ if( ! (capabilities.equals( rhs.capabilities) )) ivarsEqual = false;
+ if( ! (appearanceFields.equals( rhs.appearanceFields) )) ivarsEqual = false;
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" liveEntityId: ").append(liveEntityId).append("\n");
- sb.append(" appearanceFlags: ").append(appearanceFlags).append("\n");
- sb.append(" forceId: ").append(forceId).append("\n");
- sb.append(" entityType: ").append(entityType).append("\n");
- sb.append(" alternateEntityType: ").append(alternateEntityType).append("\n");
- sb.append(" entityMarking: ").append(entityMarking).append("\n");
- sb.append(" capabilities: ").append(capabilities).append("\n");
- sb.append(" appearanceFields: ").append(appearanceFields).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" liveEntityId: ").append(liveEntityId).append("\n");
+ sb.append(" appearanceFlags: ").append(appearanceFlags).append("\n");
+ sb.append(" forceId: ").append(forceId).append("\n");
+ sb.append(" entityType: ").append(entityType).append("\n");
+ sb.append(" alternateEntityType: ").append(alternateEntityType).append("\n");
+ sb.append(" entityMarking: ").append(entityMarking).append("\n");
+ sb.append(" capabilities: ").append(capabilities).append("\n");
+ sb.append(" appearanceFields: ").append(appearanceFields).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ArealObjectStatePdu.java b/src-generated/edu/nps/moves/dis7/ArealObjectStatePdu.java
index 3d00c27148fb1f7e0f2bdad66aec04567cff6f19..8cbd0a63a39ebcb19481dbc508e5b76f8abddafb 100644
--- a/src-generated/edu/nps/moves/dis7/ArealObjectStatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/ArealObjectStatePdu.java
@@ -1,439 +1,439 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 7.10.6 Used to communicate detailed information about the addition/modification of a synthetic environment object that is geometrically anchored to the terrain with a set of three or more points that come to a closure.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class ArealObjectStatePdu extends SyntheticEnvironmentFamilyPdu implements Serializable
-{
- /** Object in synthetic environment */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 7.10.6 Used to communicate detailed information about the addition/modification of a synthetic environment object that is geometrically anchored to the terrain with a set of three or more points that come to a closure.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class ArealObjectStatePdu extends SyntheticEnvironmentFamilyPdu implements Serializable
+{
+ /** Object in synthetic environment */
protected ObjectIdentifier objectID = new ObjectIdentifier();
-
- /** Object with which this point object is associated */
+
+ /** Object with which this point object is associated */
protected ObjectIdentifier referencedObjectID = new ObjectIdentifier();
-
- /** unique update number of each state transition of an object */
+
+ /** unique update number of each state transition of an object */
protected short updateNumber;
-
- /** force ID uid 6 */
+
+ /** force ID uid 6 */
protected ForceID forceID = ForceID.values()[0];
-
- /** modifications enumeration uid 242 */
+
+ /** modifications enumeration uid 242 */
protected ObjectStateModificationArealObject modifications = new ObjectStateModificationArealObject();
-
- /** Object type */
+
+ /** Object type */
protected ObjectType objectType = new ObjectType();
-
- /** Object appearance */
+
+ /** Object appearance */
protected int specificObjectAppearance;
-
- /** Object appearance */
+
+ /** Object appearance */
protected short generalObjectAppearance;
-
- /** Number of points */
+
+ /** Number of points */
protected short numberOfPoints;
-
- /** requesterID */
+
+ /** requesterID */
protected SimulationAddress requesterID = new SimulationAddress();
-
- /** receiver ID */
+
+ /** receiver ID */
protected SimulationAddress receivingID = new SimulationAddress();
-
- /** location of object */
+
+ /** location of object */
protected List< Vector3Double > objectLocation = new ArrayList< Vector3Double >();
-
-
-/** Constructor */
- public ArealObjectStatePdu()
- {
- setPduType( DISPDUType.AREAL_OBJECT_STATE );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += objectID.getMarshalledSize();
- marshalSize += referencedObjectID.getMarshalledSize();
- marshalSize += 2; // updateNumber
- marshalSize += forceID.getMarshalledSize();
- marshalSize += modifications.getMarshalledSize();
- marshalSize += objectType.getMarshalledSize();
- marshalSize += 4; // specificObjectAppearance
- marshalSize += 2; // generalObjectAppearance
- marshalSize += 2; // numberOfPoints
- marshalSize += requesterID.getMarshalledSize();
- marshalSize += receivingID.getMarshalledSize();
- for(int idx=0; idx < objectLocation.size(); idx++)
- {
- Vector3Double listElement = objectLocation.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link ArealObjectStatePdu#objectID}*/
-public ArealObjectStatePdu setObjectID(ObjectIdentifier pObjectID)
+
+
+/** Constructor */
+ public ArealObjectStatePdu()
+ {
+ setPduType( DISPDUType.AREAL_OBJECT_STATE );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += objectID.getMarshalledSize();
+ marshalSize += referencedObjectID.getMarshalledSize();
+ marshalSize += 2; // updateNumber
+ marshalSize += forceID.getMarshalledSize();
+ marshalSize += modifications.getMarshalledSize();
+ marshalSize += objectType.getMarshalledSize();
+ marshalSize += 4; // specificObjectAppearance
+ marshalSize += 2; // generalObjectAppearance
+ marshalSize += 2; // numberOfPoints
+ marshalSize += requesterID.getMarshalledSize();
+ marshalSize += receivingID.getMarshalledSize();
+ for(int idx=0; idx < objectLocation.size(); idx++)
+ {
+ Vector3Double listElement = objectLocation.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link ArealObjectStatePdu#objectID}*/
+public ArealObjectStatePdu setObjectID(ObjectIdentifier pObjectID)
{
- objectID = pObjectID;
- return this;
-}
-
-/** Getter for {@link ArealObjectStatePdu#objectID}*/
-public ObjectIdentifier getObjectID()
+ objectID = pObjectID;
+ return this;
+}
+
+/** Getter for {@link ArealObjectStatePdu#objectID}*/
+public ObjectIdentifier getObjectID()
{
return objectID;
-}
-
-/** Setter for {@link ArealObjectStatePdu#referencedObjectID}*/
-public ArealObjectStatePdu setReferencedObjectID(ObjectIdentifier pReferencedObjectID)
+}
+
+/** Setter for {@link ArealObjectStatePdu#referencedObjectID}*/
+public ArealObjectStatePdu setReferencedObjectID(ObjectIdentifier pReferencedObjectID)
{
- referencedObjectID = pReferencedObjectID;
- return this;
-}
-
-/** Getter for {@link ArealObjectStatePdu#referencedObjectID}*/
-public ObjectIdentifier getReferencedObjectID()
+ referencedObjectID = pReferencedObjectID;
+ return this;
+}
+
+/** Getter for {@link ArealObjectStatePdu#referencedObjectID}*/
+public ObjectIdentifier getReferencedObjectID()
{
return referencedObjectID;
-}
-
-/** Setter for {@link ArealObjectStatePdu#updateNumber}*/
-public ArealObjectStatePdu setUpdateNumber(short pUpdateNumber)
+}
+
+/** Setter for {@link ArealObjectStatePdu#updateNumber}*/
+public ArealObjectStatePdu setUpdateNumber(short pUpdateNumber)
{
- updateNumber = pUpdateNumber;
- return this;
-}
-
-/** Getter for {@link ArealObjectStatePdu#updateNumber}*/
-public short getUpdateNumber()
+ updateNumber = pUpdateNumber;
+ return this;
+}
+
+/** Getter for {@link ArealObjectStatePdu#updateNumber}*/
+public short getUpdateNumber()
{
return updateNumber;
-}
-
-/** Setter for {@link ArealObjectStatePdu#forceID}*/
-public ArealObjectStatePdu setForceID(ForceID pForceID)
+}
+
+/** Setter for {@link ArealObjectStatePdu#forceID}*/
+public ArealObjectStatePdu setForceID(ForceID pForceID)
{
- forceID = pForceID;
- return this;
-}
-
-/** Getter for {@link ArealObjectStatePdu#forceID}*/
-public ForceID getForceID()
+ forceID = pForceID;
+ return this;
+}
+
+/** Getter for {@link ArealObjectStatePdu#forceID}*/
+public ForceID getForceID()
{
return forceID;
-}
-
-/** Setter for {@link ArealObjectStatePdu#modifications}*/
-public ArealObjectStatePdu setModifications(ObjectStateModificationArealObject pModifications)
+}
+
+/** Setter for {@link ArealObjectStatePdu#modifications}*/
+public ArealObjectStatePdu setModifications(ObjectStateModificationArealObject pModifications)
{
- modifications = pModifications;
- return this;
-}
-
-/** Setter for {@link ArealObjectStatePdu#modifications}*/
-public ObjectStateModificationArealObject getModifications()
+ modifications = pModifications;
+ return this;
+}
+
+/** Setter for {@link ArealObjectStatePdu#modifications}*/
+public ObjectStateModificationArealObject getModifications()
{
return modifications;
-}
-
-/** Setter for {@link ArealObjectStatePdu#objectType}*/
-public ArealObjectStatePdu setObjectType(ObjectType pObjectType)
+}
+
+/** Setter for {@link ArealObjectStatePdu#objectType}*/
+public ArealObjectStatePdu setObjectType(ObjectType pObjectType)
{
- objectType = pObjectType;
- return this;
-}
-
-/** Getter for {@link ArealObjectStatePdu#objectType}*/
-public ObjectType getObjectType()
+ objectType = pObjectType;
+ return this;
+}
+
+/** Getter for {@link ArealObjectStatePdu#objectType}*/
+public ObjectType getObjectType()
{
return objectType;
-}
-
-/** Setter for {@link ArealObjectStatePdu#specificObjectAppearance}*/
-public ArealObjectStatePdu setSpecificObjectAppearance(int pSpecificObjectAppearance)
+}
+
+/** Setter for {@link ArealObjectStatePdu#specificObjectAppearance}*/
+public ArealObjectStatePdu setSpecificObjectAppearance(int pSpecificObjectAppearance)
{
- specificObjectAppearance = pSpecificObjectAppearance;
- return this;
-}
-
-/** Getter for {@link ArealObjectStatePdu#specificObjectAppearance}*/
-public int getSpecificObjectAppearance()
+ specificObjectAppearance = pSpecificObjectAppearance;
+ return this;
+}
+
+/** Getter for {@link ArealObjectStatePdu#specificObjectAppearance}*/
+public int getSpecificObjectAppearance()
{
return specificObjectAppearance;
-}
-
-/** Setter for {@link ArealObjectStatePdu#generalObjectAppearance}*/
-public ArealObjectStatePdu setGeneralObjectAppearance(short pGeneralObjectAppearance)
+}
+
+/** Setter for {@link ArealObjectStatePdu#generalObjectAppearance}*/
+public ArealObjectStatePdu setGeneralObjectAppearance(short pGeneralObjectAppearance)
{
- generalObjectAppearance = pGeneralObjectAppearance;
- return this;
-}
-
-/** Getter for {@link ArealObjectStatePdu#generalObjectAppearance}*/
-public short getGeneralObjectAppearance()
+ generalObjectAppearance = pGeneralObjectAppearance;
+ return this;
+}
+
+/** Getter for {@link ArealObjectStatePdu#generalObjectAppearance}*/
+public short getGeneralObjectAppearance()
{
return generalObjectAppearance;
-}
-
-/** Setter for {@link ArealObjectStatePdu#requesterID}*/
-public ArealObjectStatePdu setRequesterID(SimulationAddress pRequesterID)
+}
+
+/** Setter for {@link ArealObjectStatePdu#requesterID}*/
+public ArealObjectStatePdu setRequesterID(SimulationAddress pRequesterID)
{
- requesterID = pRequesterID;
- return this;
-}
-
-/** Getter for {@link ArealObjectStatePdu#requesterID}*/
-public SimulationAddress getRequesterID()
+ requesterID = pRequesterID;
+ return this;
+}
+
+/** Getter for {@link ArealObjectStatePdu#requesterID}*/
+public SimulationAddress getRequesterID()
{
return requesterID;
-}
-
-/** Setter for {@link ArealObjectStatePdu#receivingID}*/
-public ArealObjectStatePdu setReceivingID(SimulationAddress pReceivingID)
+}
+
+/** Setter for {@link ArealObjectStatePdu#receivingID}*/
+public ArealObjectStatePdu setReceivingID(SimulationAddress pReceivingID)
{
- receivingID = pReceivingID;
- return this;
-}
-
-/** Getter for {@link ArealObjectStatePdu#receivingID}*/
-public SimulationAddress getReceivingID()
+ receivingID = pReceivingID;
+ return this;
+}
+
+/** Getter for {@link ArealObjectStatePdu#receivingID}*/
+public SimulationAddress getReceivingID()
{
return receivingID;
-}
-
-/** Setter for {@link ArealObjectStatePdu#objectLocation}*/
-public ArealObjectStatePdu setObjectLocation(List<Vector3Double> pObjectLocation)
+}
+
+/** Setter for {@link ArealObjectStatePdu#objectLocation}*/
+public ArealObjectStatePdu setObjectLocation(List<Vector3Double> pObjectLocation)
{
- objectLocation = pObjectLocation;
- return this;
-}
-
-/** Getter for {@link ArealObjectStatePdu#objectLocation}*/
-public List<Vector3Double> getObjectLocation()
+ objectLocation = pObjectLocation;
+ return this;
+}
+
+/** Getter for {@link ArealObjectStatePdu#objectLocation}*/
+public List<Vector3Double> getObjectLocation()
{
return objectLocation;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- objectID.marshal(dos);
- referencedObjectID.marshal(dos);
- dos.writeShort(updateNumber);
- forceID.marshal(dos);
- modifications.marshal(dos);
- objectType.marshal(dos);
- dos.writeInt(specificObjectAppearance);
- dos.writeShort(generalObjectAppearance);
- dos.writeShort(objectLocation.size());
- requesterID.marshal(dos);
- receivingID.marshal(dos);
-
- for(int idx = 0; idx < objectLocation.size(); idx++)
- {
- Vector3Double aVector3Double = objectLocation.get(idx);
- aVector3Double.marshal(dos);
- }
-
+ {
+ objectID.marshal(dos);
+ referencedObjectID.marshal(dos);
+ dos.writeShort(updateNumber);
+ forceID.marshal(dos);
+ modifications.marshal(dos);
+ objectType.marshal(dos);
+ dos.writeInt(specificObjectAppearance);
+ dos.writeShort(generalObjectAppearance);
+ dos.writeShort(objectLocation.size());
+ requesterID.marshal(dos);
+ receivingID.marshal(dos);
+
+ for(int idx = 0; idx < objectLocation.size(); idx++)
+ {
+ Vector3Double aVector3Double = objectLocation.get(idx);
+ aVector3Double.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += objectID.unmarshal(dis);
- uPosition += referencedObjectID.unmarshal(dis);
- updateNumber = (short)dis.readUnsignedShort();
- uPosition += 2;
- forceID = ForceID.unmarshalEnum(dis);
- uPosition += forceID.getMarshalledSize();
- uPosition += modifications.unmarshal(dis);
- uPosition += objectType.unmarshal(dis);
- specificObjectAppearance = dis.readInt();
- uPosition += 4;
- generalObjectAppearance = (short)dis.readUnsignedShort();
- uPosition += 2;
- numberOfPoints = (short)dis.readUnsignedShort();
- uPosition += 2;
- uPosition += requesterID.unmarshal(dis);
- uPosition += receivingID.unmarshal(dis);
- for(int idx = 0; idx < numberOfPoints; idx++)
- {
- Vector3Double anX = new Vector3Double();
- uPosition += anX.unmarshal(dis);
- objectLocation.add(anX);
- }
-
+ {
+ uPosition += objectID.unmarshal(dis);
+ uPosition += referencedObjectID.unmarshal(dis);
+ updateNumber = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ forceID = ForceID.unmarshalEnum(dis);
+ uPosition += forceID.getMarshalledSize();
+ uPosition += modifications.unmarshal(dis);
+ uPosition += objectType.unmarshal(dis);
+ specificObjectAppearance = dis.readInt();
+ uPosition += 4;
+ generalObjectAppearance = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ numberOfPoints = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ uPosition += requesterID.unmarshal(dis);
+ uPosition += receivingID.unmarshal(dis);
+ for(int idx = 0; idx < numberOfPoints; idx++)
+ {
+ Vector3Double anX = new Vector3Double();
+ uPosition += anX.unmarshal(dis);
+ objectLocation.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- objectID.marshal(buff);
- referencedObjectID.marshal(buff);
- buff.putShort( (short)updateNumber);
- forceID.marshal(buff);
- modifications.marshal(buff);
- objectType.marshal(buff);
- buff.putInt( (int)specificObjectAppearance);
- buff.putShort( (short)generalObjectAppearance);
- buff.putShort( (short)objectLocation.size());
- requesterID.marshal(buff);
- receivingID.marshal(buff);
-
- for(int idx = 0; idx < objectLocation.size(); idx++)
- {
- Vector3Double aVector3Double = objectLocation.get(idx);
- aVector3Double.marshal(buff);
- }
-
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ objectID.marshal(buff);
+ referencedObjectID.marshal(buff);
+ buff.putShort( (short)updateNumber);
+ forceID.marshal(buff);
+ modifications.marshal(buff);
+ objectType.marshal(buff);
+ buff.putInt( (int)specificObjectAppearance);
+ buff.putShort( (short)generalObjectAppearance);
+ buff.putShort( (short)objectLocation.size());
+ requesterID.marshal(buff);
+ receivingID.marshal(buff);
+
+ for(int idx = 0; idx < objectLocation.size(); idx++)
+ {
+ Vector3Double aVector3Double = objectLocation.get(idx);
+ aVector3Double.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- objectID.unmarshal(buff);
- referencedObjectID.unmarshal(buff);
- updateNumber = (short)(buff.getShort() & 0xFFFF);
- forceID = ForceID.unmarshalEnum(buff);
- modifications.unmarshal(buff);
- objectType.unmarshal(buff);
- specificObjectAppearance = buff.getInt();
- generalObjectAppearance = (short)(buff.getShort() & 0xFFFF);
- numberOfPoints = (short)(buff.getShort() & 0xFFFF);
- requesterID.unmarshal(buff);
- receivingID.unmarshal(buff);
- for(int idx = 0; idx < numberOfPoints; idx++)
- {
- Vector3Double anX = new Vector3Double();
- anX.unmarshal(buff);
- objectLocation.add(anX);
- }
-
- return getMarshalledSize();
+
+ objectID.unmarshal(buff);
+ referencedObjectID.unmarshal(buff);
+ updateNumber = (short)(buff.getShort() & 0xFFFF);
+ forceID = ForceID.unmarshalEnum(buff);
+ modifications.unmarshal(buff);
+ objectType.unmarshal(buff);
+ specificObjectAppearance = buff.getInt();
+ generalObjectAppearance = (short)(buff.getShort() & 0xFFFF);
+ numberOfPoints = (short)(buff.getShort() & 0xFFFF);
+ requesterID.unmarshal(buff);
+ receivingID.unmarshal(buff);
+ for(int idx = 0; idx < numberOfPoints; idx++)
+ {
+ Vector3Double anX = new Vector3Double();
+ anX.unmarshal(buff);
+ objectLocation.add(anX);
+ }
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final ArealObjectStatePdu rhs = (ArealObjectStatePdu)obj;
-
- if( ! (objectID.equals( rhs.objectID) )) ivarsEqual = false;
- if( ! (referencedObjectID.equals( rhs.referencedObjectID) )) ivarsEqual = false;
- if( ! (updateNumber == rhs.updateNumber)) ivarsEqual = false;
- if( ! (forceID == rhs.forceID)) ivarsEqual = false;
- if( ! (modifications.equals( rhs.modifications) )) ivarsEqual = false;
- if( ! (objectType.equals( rhs.objectType) )) ivarsEqual = false;
- if( ! (specificObjectAppearance == rhs.specificObjectAppearance)) ivarsEqual = false;
- if( ! (generalObjectAppearance == rhs.generalObjectAppearance)) ivarsEqual = false;
- if( ! (requesterID.equals( rhs.requesterID) )) ivarsEqual = false;
- if( ! (receivingID.equals( rhs.receivingID) )) ivarsEqual = false;
-
- for(int idx = 0; idx < objectLocation.size(); idx++)
- if( ! ( objectLocation.get(idx).equals(rhs.objectLocation.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final ArealObjectStatePdu rhs = (ArealObjectStatePdu)obj;
+
+ if( ! (objectID.equals( rhs.objectID) )) ivarsEqual = false;
+ if( ! (referencedObjectID.equals( rhs.referencedObjectID) )) ivarsEqual = false;
+ if( ! (updateNumber == rhs.updateNumber)) ivarsEqual = false;
+ if( ! (forceID == rhs.forceID)) ivarsEqual = false;
+ if( ! (modifications.equals( rhs.modifications) )) ivarsEqual = false;
+ if( ! (objectType.equals( rhs.objectType) )) ivarsEqual = false;
+ if( ! (specificObjectAppearance == rhs.specificObjectAppearance)) ivarsEqual = false;
+ if( ! (generalObjectAppearance == rhs.generalObjectAppearance)) ivarsEqual = false;
+ if( ! (requesterID.equals( rhs.requesterID) )) ivarsEqual = false;
+ if( ! (receivingID.equals( rhs.receivingID) )) ivarsEqual = false;
+
+ for(int idx = 0; idx < objectLocation.size(); idx++)
+ if( ! ( objectLocation.get(idx).equals(rhs.objectLocation.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" objectID: ").append(objectID).append("\n");
- sb.append(" referencedObjectID: ").append(referencedObjectID).append("\n");
- sb.append(" updateNumber: ").append(updateNumber).append("\n");
- sb.append(" forceID: ").append(forceID).append("\n");
- sb.append(" modifications: ").append(modifications).append("\n");
- sb.append(" objectType: ").append(objectType).append("\n");
- sb.append(" specificObjectAppearance: ").append(specificObjectAppearance).append("\n");
- sb.append(" generalObjectAppearance: ").append(generalObjectAppearance).append("\n");
- sb.append(" requesterID: ").append(requesterID).append("\n");
- sb.append(" receivingID: ").append(receivingID).append("\n");
- sb.append(" objectLocation: ").append("\n");
- objectLocation.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" objectID: ").append(objectID).append("\n");
+ sb.append(" referencedObjectID: ").append(referencedObjectID).append("\n");
+ sb.append(" updateNumber: ").append(updateNumber).append("\n");
+ sb.append(" forceID: ").append(forceID).append("\n");
+ sb.append(" modifications: ").append(modifications).append("\n");
+ sb.append(" objectType: ").append(objectType).append("\n");
+ sb.append(" specificObjectAppearance: ").append(specificObjectAppearance).append("\n");
+ sb.append(" generalObjectAppearance: ").append(generalObjectAppearance).append("\n");
+ sb.append(" requesterID: ").append(requesterID).append("\n");
+ sb.append(" receivingID: ").append(receivingID).append("\n");
+ sb.append(" objectLocation: ").append("\n");
+ objectLocation.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ArticulatedPartVP.java b/src-generated/edu/nps/moves/dis7/ArticulatedPartVP.java
index 603a7baaa9e12f07c29e6c317b3344e695f99aad..1d48217722cfe7d03fd86d22d0b4e6f9ebbbd2a9 100644
--- a/src-generated/edu/nps/moves/dis7/ArticulatedPartVP.java
+++ b/src-generated/edu/nps/moves/dis7/ArticulatedPartVP.java
@@ -1,281 +1,281 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * articulated parts for movable parts and a combination of moveable/attached parts of an entity. Section 6.2.94.2
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class ArticulatedPartVP extends Object implements Serializable
-{
- /** the identification of the Variable Parameter record. Enumeration from EBV uid 56 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * articulated parts for movable parts and a combination of moveable/attached parts of an entity. Section 6.2.94.2
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class ArticulatedPartVP extends Object implements Serializable
+{
+ /** the identification of the Variable Parameter record. Enumeration from EBV uid 56 */
protected VariableParameterRecordType recordType = VariableParameterRecordType.ARTICULATED_PART;
-
- /** indicate the change of any parameter for any articulated part. Starts at zero, incremented for each change */
+
+ /** indicate the change of any parameter for any articulated part. Starts at zero, incremented for each change */
protected byte changeIndicator = (byte)0;
-
- /** the identification of the articulated part to which this articulation parameter is attached. This field shall be specified by a 16-bit unsigned integer. This field shall contain the value zero if the articulated part is attached directly to the entity. */
+
+ /** the identification of the articulated part to which this articulation parameter is attached. This field shall be specified by a 16-bit unsigned integer. This field shall contain the value zero if the articulated part is attached directly to the entity. */
protected short partAttachedTo = (short)0;
-
- /** the type of parameter represented, 32 bit enumeration */
+
+ /** the type of parameter represented, 32 bit enumeration */
protected int parameterType;
-
- /** The definition of the 64 bits shall be determined based on the type of parameter specified in the Parameter Type field */
+
+ /** The definition of the 64 bits shall be determined based on the type of parameter specified in the Parameter Type field */
protected float parameterValue;
-
+
protected int padding;
-
-
-/** Constructor */
- public ArticulatedPartVP()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += recordType.getMarshalledSize();
- marshalSize += 1; // changeIndicator
- marshalSize += 2; // partAttachedTo
- marshalSize += 4; // parameterType
- marshalSize += 4; // parameterValue
- marshalSize += 4; // padding
-
- return marshalSize;
-}
-
-
-/** Setter for {@link ArticulatedPartVP#recordType}*/
-public ArticulatedPartVP setRecordType(VariableParameterRecordType pRecordType)
+
+
+/** Constructor */
+ public ArticulatedPartVP()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += recordType.getMarshalledSize();
+ marshalSize += 1; // changeIndicator
+ marshalSize += 2; // partAttachedTo
+ marshalSize += 4; // parameterType
+ marshalSize += 4; // parameterValue
+ marshalSize += 4; // padding
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link ArticulatedPartVP#recordType}*/
+public ArticulatedPartVP setRecordType(VariableParameterRecordType pRecordType)
{
- recordType = pRecordType;
- return this;
-}
-
-/** Getter for {@link ArticulatedPartVP#recordType}*/
-public VariableParameterRecordType getRecordType()
+ recordType = pRecordType;
+ return this;
+}
+
+/** Getter for {@link ArticulatedPartVP#recordType}*/
+public VariableParameterRecordType getRecordType()
{
return recordType;
-}
-
-/** Setter for {@link ArticulatedPartVP#changeIndicator}*/
-public ArticulatedPartVP setChangeIndicator(byte pChangeIndicator)
+}
+
+/** Setter for {@link ArticulatedPartVP#changeIndicator}*/
+public ArticulatedPartVP setChangeIndicator(byte pChangeIndicator)
{
- changeIndicator = pChangeIndicator;
- return this;
-}
-
-/** Getter for {@link ArticulatedPartVP#changeIndicator}*/
-public byte getChangeIndicator()
+ changeIndicator = pChangeIndicator;
+ return this;
+}
+
+/** Getter for {@link ArticulatedPartVP#changeIndicator}*/
+public byte getChangeIndicator()
{
return changeIndicator;
-}
-
-/** Setter for {@link ArticulatedPartVP#partAttachedTo}*/
-public ArticulatedPartVP setPartAttachedTo(short pPartAttachedTo)
+}
+
+/** Setter for {@link ArticulatedPartVP#partAttachedTo}*/
+public ArticulatedPartVP setPartAttachedTo(short pPartAttachedTo)
{
- partAttachedTo = pPartAttachedTo;
- return this;
-}
-
-/** Getter for {@link ArticulatedPartVP#partAttachedTo}*/
-public short getPartAttachedTo()
+ partAttachedTo = pPartAttachedTo;
+ return this;
+}
+
+/** Getter for {@link ArticulatedPartVP#partAttachedTo}*/
+public short getPartAttachedTo()
{
return partAttachedTo;
-}
-
-/** Setter for {@link ArticulatedPartVP#parameterType}*/
-public ArticulatedPartVP setParameterType(int pParameterType)
+}
+
+/** Setter for {@link ArticulatedPartVP#parameterType}*/
+public ArticulatedPartVP setParameterType(int pParameterType)
{
- parameterType = pParameterType;
- return this;
-}
-
-/** Getter for {@link ArticulatedPartVP#parameterType}*/
-public int getParameterType()
+ parameterType = pParameterType;
+ return this;
+}
+
+/** Getter for {@link ArticulatedPartVP#parameterType}*/
+public int getParameterType()
{
return parameterType;
-}
-
-/** Setter for {@link ArticulatedPartVP#parameterValue}*/
-public ArticulatedPartVP setParameterValue(float pParameterValue)
+}
+
+/** Setter for {@link ArticulatedPartVP#parameterValue}*/
+public ArticulatedPartVP setParameterValue(float pParameterValue)
{
- parameterValue = pParameterValue;
- return this;
-}
-
-/** Getter for {@link ArticulatedPartVP#parameterValue}*/
-public float getParameterValue()
+ parameterValue = pParameterValue;
+ return this;
+}
+
+/** Getter for {@link ArticulatedPartVP#parameterValue}*/
+public float getParameterValue()
{
return parameterValue;
-}
-
-/** Setter for {@link ArticulatedPartVP#padding}*/
-public ArticulatedPartVP setPadding(int pPadding)
+}
+
+/** Setter for {@link ArticulatedPartVP#padding}*/
+public ArticulatedPartVP setPadding(int pPadding)
{
- padding = pPadding;
- return this;
-}
-
-/** Getter for {@link ArticulatedPartVP#padding}*/
-public int getPadding()
+ padding = pPadding;
+ return this;
+}
+
+/** Getter for {@link ArticulatedPartVP#padding}*/
+public int getPadding()
{
return padding;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- recordType.marshal(dos);
- dos.writeByte(changeIndicator);
- dos.writeShort(partAttachedTo);
- dos.writeInt(parameterType);
- dos.writeFloat(parameterValue);
- dos.writeInt(padding);
+ {
+ recordType.marshal(dos);
+ dos.writeByte(changeIndicator);
+ dos.writeShort(partAttachedTo);
+ dos.writeInt(parameterType);
+ dos.writeFloat(parameterValue);
+ dos.writeInt(padding);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- recordType = VariableParameterRecordType.unmarshalEnum(dis);
- uPosition += recordType.getMarshalledSize();
- changeIndicator = (byte)dis.readUnsignedByte();
- uPosition += 1;
- partAttachedTo = (short)dis.readUnsignedShort();
- uPosition += 2;
- parameterType = dis.readInt();
- uPosition += 4;
- parameterValue = dis.readFloat();
- uPosition += 4;
- padding = dis.readInt();
- uPosition += 4;
+ {
+ recordType = VariableParameterRecordType.unmarshalEnum(dis);
+ uPosition += recordType.getMarshalledSize();
+ changeIndicator = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ partAttachedTo = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ parameterType = dis.readInt();
+ uPosition += 4;
+ parameterValue = dis.readFloat();
+ uPosition += 4;
+ padding = dis.readInt();
+ uPosition += 4;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- recordType.marshal(buff);
- buff.put( (byte)changeIndicator);
- buff.putShort( (short)partAttachedTo);
- buff.putInt( (int)parameterType);
- buff.putFloat( (float)parameterValue);
- buff.putInt( (int)padding);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- recordType = VariableParameterRecordType.unmarshalEnum(buff);
- changeIndicator = (byte)(buff.get() & 0xFF);
- partAttachedTo = (short)(buff.getShort() & 0xFFFF);
- parameterType = buff.getInt();
- parameterValue = buff.getFloat();
- padding = buff.getInt();
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ recordType.marshal(buff);
+ buff.put( (byte)changeIndicator);
+ buff.putShort( (short)partAttachedTo);
+ buff.putInt( (int)parameterType);
+ buff.putFloat( (float)parameterValue);
+ buff.putInt( (int)padding);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ recordType = VariableParameterRecordType.unmarshalEnum(buff);
+ changeIndicator = (byte)(buff.get() & 0xFF);
+ partAttachedTo = (short)(buff.getShort() & 0xFFFF);
+ parameterType = buff.getInt();
+ parameterValue = buff.getFloat();
+ padding = buff.getInt();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final ArticulatedPartVP rhs = (ArticulatedPartVP)obj;
-
- if( ! (recordType == rhs.recordType)) ivarsEqual = false;
- if( ! (changeIndicator == rhs.changeIndicator)) ivarsEqual = false;
- if( ! (partAttachedTo == rhs.partAttachedTo)) ivarsEqual = false;
- if( ! (parameterType == rhs.parameterType)) ivarsEqual = false;
- if( ! (parameterValue == rhs.parameterValue)) ivarsEqual = false;
- if( ! (padding == rhs.padding)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final ArticulatedPartVP rhs = (ArticulatedPartVP)obj;
+
+ if( ! (recordType == rhs.recordType)) ivarsEqual = false;
+ if( ! (changeIndicator == rhs.changeIndicator)) ivarsEqual = false;
+ if( ! (partAttachedTo == rhs.partAttachedTo)) ivarsEqual = false;
+ if( ! (parameterType == rhs.parameterType)) ivarsEqual = false;
+ if( ! (parameterValue == rhs.parameterValue)) ivarsEqual = false;
+ if( ! (padding == rhs.padding)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" recordType: ").append(recordType).append("\n");
- sb.append(" changeIndicator: ").append(changeIndicator).append("\n");
- sb.append(" partAttachedTo: ").append(partAttachedTo).append("\n");
- sb.append(" parameterType: ").append(parameterType).append("\n");
- sb.append(" parameterValue: ").append(parameterValue).append("\n");
- sb.append(" padding: ").append(padding).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" recordType: ").append(recordType).append("\n");
+ sb.append(" changeIndicator: ").append(changeIndicator).append("\n");
+ sb.append(" partAttachedTo: ").append(partAttachedTo).append("\n");
+ sb.append(" parameterType: ").append(parameterType).append("\n");
+ sb.append(" parameterValue: ").append(parameterValue).append("\n");
+ sb.append(" padding: ").append(padding).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ArticulatedPartsPdu.java b/src-generated/edu/nps/moves/dis7/ArticulatedPartsPdu.java
index 0b0c18e13e8abd1135677f4a6a44205c34440f9a..1f81748c74ef95120573489c544a43b2948c7b0c 100644
--- a/src-generated/edu/nps/moves/dis7/ArticulatedPartsPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ArticulatedPartsPdu.java
@@ -1,225 +1,225 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 9.4.4 Communicate information about an entity’s articulated and attached parts.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class ArticulatedPartsPdu extends LiveEntityFamilyPdu implements Serializable
-{
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 9.4.4 Communicate information about an entity’s articulated and attached parts.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class ArticulatedPartsPdu extends LiveEntityFamilyPdu implements Serializable
+{
protected EntityID liveEntityId = new EntityID();
-
+
protected byte numberOfParameterRecords;
-
+
protected List< VariableParameter > variableParameters = new ArrayList< VariableParameter >();
-
-
-/** Constructor */
- public ArticulatedPartsPdu()
- {
- setPduType( DISPDUType.ARTICULATED_PARTS );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += liveEntityId.getMarshalledSize();
- marshalSize += 1; // numberOfParameterRecords
- for(int idx=0; idx < variableParameters.size(); idx++)
- {
- VariableParameter listElement = variableParameters.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link ArticulatedPartsPdu#liveEntityId}*/
-public ArticulatedPartsPdu setLiveEntityId(EntityID pLiveEntityId)
+
+
+/** Constructor */
+ public ArticulatedPartsPdu()
+ {
+ setPduType( DISPDUType.ARTICULATED_PARTS );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += liveEntityId.getMarshalledSize();
+ marshalSize += 1; // numberOfParameterRecords
+ for(int idx=0; idx < variableParameters.size(); idx++)
+ {
+ VariableParameter listElement = variableParameters.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link ArticulatedPartsPdu#liveEntityId}*/
+public ArticulatedPartsPdu setLiveEntityId(EntityID pLiveEntityId)
{
- liveEntityId = pLiveEntityId;
- return this;
-}
-
-/** Getter for {@link ArticulatedPartsPdu#liveEntityId}*/
-public EntityID getLiveEntityId()
+ liveEntityId = pLiveEntityId;
+ return this;
+}
+
+/** Getter for {@link ArticulatedPartsPdu#liveEntityId}*/
+public EntityID getLiveEntityId()
{
return liveEntityId;
-}
-
-/** Setter for {@link ArticulatedPartsPdu#variableParameters}*/
-public ArticulatedPartsPdu setVariableParameters(List<VariableParameter> pVariableParameters)
+}
+
+/** Setter for {@link ArticulatedPartsPdu#variableParameters}*/
+public ArticulatedPartsPdu setVariableParameters(List<VariableParameter> pVariableParameters)
{
- variableParameters = pVariableParameters;
- return this;
-}
-
-/** Getter for {@link ArticulatedPartsPdu#variableParameters}*/
-public List<VariableParameter> getVariableParameters()
+ variableParameters = pVariableParameters;
+ return this;
+}
+
+/** Getter for {@link ArticulatedPartsPdu#variableParameters}*/
+public List<VariableParameter> getVariableParameters()
{
return variableParameters;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- liveEntityId.marshal(dos);
- dos.writeByte(variableParameters.size());
-
- for(int idx = 0; idx < variableParameters.size(); idx++)
- {
- VariableParameter aVariableParameter = variableParameters.get(idx);
- aVariableParameter.marshal(dos);
- }
-
+ {
+ liveEntityId.marshal(dos);
+ dos.writeByte(variableParameters.size());
+
+ for(int idx = 0; idx < variableParameters.size(); idx++)
+ {
+ VariableParameter aVariableParameter = variableParameters.get(idx);
+ aVariableParameter.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += liveEntityId.unmarshal(dis);
- numberOfParameterRecords = (byte)dis.readUnsignedByte();
- uPosition += 1;
- for(int idx = 0; idx < numberOfParameterRecords; idx++)
- {
- VariableParameter anX = new VariableParameter();
- uPosition += anX.unmarshal(dis);
- variableParameters.add(anX);
- }
-
+ {
+ uPosition += liveEntityId.unmarshal(dis);
+ numberOfParameterRecords = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ for(int idx = 0; idx < numberOfParameterRecords; idx++)
+ {
+ VariableParameter anX = new VariableParameter();
+ uPosition += anX.unmarshal(dis);
+ variableParameters.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- liveEntityId.marshal(buff);
- buff.put( (byte)variableParameters.size());
-
- for(int idx = 0; idx < variableParameters.size(); idx++)
- {
- VariableParameter aVariableParameter = variableParameters.get(idx);
- aVariableParameter.marshal(buff);
- }
-
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ liveEntityId.marshal(buff);
+ buff.put( (byte)variableParameters.size());
+
+ for(int idx = 0; idx < variableParameters.size(); idx++)
+ {
+ VariableParameter aVariableParameter = variableParameters.get(idx);
+ aVariableParameter.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- liveEntityId.unmarshal(buff);
- numberOfParameterRecords = (byte)(buff.get() & 0xFF);
- for(int idx = 0; idx < numberOfParameterRecords; idx++)
- {
- VariableParameter anX = new VariableParameter();
- anX.unmarshal(buff);
- variableParameters.add(anX);
- }
-
- return getMarshalledSize();
+
+ liveEntityId.unmarshal(buff);
+ numberOfParameterRecords = (byte)(buff.get() & 0xFF);
+ for(int idx = 0; idx < numberOfParameterRecords; idx++)
+ {
+ VariableParameter anX = new VariableParameter();
+ anX.unmarshal(buff);
+ variableParameters.add(anX);
+ }
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final ArticulatedPartsPdu rhs = (ArticulatedPartsPdu)obj;
-
- if( ! (liveEntityId.equals( rhs.liveEntityId) )) ivarsEqual = false;
-
- for(int idx = 0; idx < variableParameters.size(); idx++)
- if( ! ( variableParameters.get(idx).equals(rhs.variableParameters.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final ArticulatedPartsPdu rhs = (ArticulatedPartsPdu)obj;
+
+ if( ! (liveEntityId.equals( rhs.liveEntityId) )) ivarsEqual = false;
+
+ for(int idx = 0; idx < variableParameters.size(); idx++)
+ if( ! ( variableParameters.get(idx).equals(rhs.variableParameters.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" liveEntityId: ").append(liveEntityId).append("\n");
- sb.append(" variableParameters: ").append("\n");
- variableParameters.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" liveEntityId: ").append(liveEntityId).append("\n");
+ sb.append(" variableParameters: ").append("\n");
+ variableParameters.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/Association.java b/src-generated/edu/nps/moves/dis7/Association.java
index f28489394d6bfe9171d088d81a234bf1b3a9a611..7271ec296d6125cbe56cc71b5100a78d9270008c 100644
--- a/src-generated/edu/nps/moves/dis7/Association.java
+++ b/src-generated/edu/nps/moves/dis7/Association.java
@@ -1,231 +1,231 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * An entity's associations with other entities and/or locations. For each association, this record shall specify the type of the association, the associated entity's EntityID and/or the associated location's world coordinates. This record may be used (optionally) in a transfer transaction to send internal state data from the divesting simulation to the acquiring simulation (see 5.9.4). This record may also be used for other purposes. Section 6.2.9
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class Association extends Object implements Serializable
-{
- /** 330 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * An entity's associations with other entities and/or locations. For each association, this record shall specify the type of the association, the associated entity's EntityID and/or the associated location's world coordinates. This record may be used (optionally) in a transfer transaction to send internal state data from the divesting simulation to the acquiring simulation (see 5.9.4). This record may also be used for other purposes. Section 6.2.9
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class Association extends Object implements Serializable
+{
+ /** 330 */
protected EntityAssociationAssociationType associationType = EntityAssociationAssociationType.values()[0];
-
+
protected byte padding;
-
- /** identity of associated entity. If none, NO_SPECIFIC_ENTITY */
+
+ /** identity of associated entity. If none, NO_SPECIFIC_ENTITY */
protected EntityIdentifier associatedEntityID = new EntityIdentifier();
-
- /** location, in world coordinates */
+
+ /** location, in world coordinates */
protected Vector3Double associatedLocation = new Vector3Double();
-
-
-/** Constructor */
- public Association()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public Association()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += associationType.getMarshalledSize();
+ marshalSize += 1; // padding
+ marshalSize += associatedEntityID.getMarshalledSize();
+ marshalSize += associatedLocation.getMarshalledSize();
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link Association#associationType}*/
+public Association setAssociationType(EntityAssociationAssociationType pAssociationType)
{
- int marshalSize = 0;
-
- marshalSize += associationType.getMarshalledSize();
- marshalSize += 1; // padding
- marshalSize += associatedEntityID.getMarshalledSize();
- marshalSize += associatedLocation.getMarshalledSize();
-
- return marshalSize;
-}
-
-
-/** Setter for {@link Association#associationType}*/
-public Association setAssociationType(EntityAssociationAssociationType pAssociationType)
-{
- associationType = pAssociationType;
- return this;
-}
-
-/** Getter for {@link Association#associationType}*/
-public EntityAssociationAssociationType getAssociationType()
+ associationType = pAssociationType;
+ return this;
+}
+
+/** Getter for {@link Association#associationType}*/
+public EntityAssociationAssociationType getAssociationType()
{
return associationType;
-}
-
-/** Setter for {@link Association#padding}*/
-public Association setPadding(byte pPadding)
+}
+
+/** Setter for {@link Association#padding}*/
+public Association setPadding(byte pPadding)
{
- padding = pPadding;
- return this;
-}
-
-/** Getter for {@link Association#padding}*/
-public byte getPadding()
+ padding = pPadding;
+ return this;
+}
+
+/** Getter for {@link Association#padding}*/
+public byte getPadding()
{
return padding;
-}
-
-/** Setter for {@link Association#associatedEntityID}*/
-public Association setAssociatedEntityID(EntityIdentifier pAssociatedEntityID)
+}
+
+/** Setter for {@link Association#associatedEntityID}*/
+public Association setAssociatedEntityID(EntityIdentifier pAssociatedEntityID)
{
- associatedEntityID = pAssociatedEntityID;
- return this;
-}
-
-/** Getter for {@link Association#associatedEntityID}*/
-public EntityIdentifier getAssociatedEntityID()
+ associatedEntityID = pAssociatedEntityID;
+ return this;
+}
+
+/** Getter for {@link Association#associatedEntityID}*/
+public EntityIdentifier getAssociatedEntityID()
{
return associatedEntityID;
-}
-
-/** Setter for {@link Association#associatedLocation}*/
-public Association setAssociatedLocation(Vector3Double pAssociatedLocation)
+}
+
+/** Setter for {@link Association#associatedLocation}*/
+public Association setAssociatedLocation(Vector3Double pAssociatedLocation)
{
- associatedLocation = pAssociatedLocation;
- return this;
-}
-
-/** Getter for {@link Association#associatedLocation}*/
-public Vector3Double getAssociatedLocation()
+ associatedLocation = pAssociatedLocation;
+ return this;
+}
+
+/** Getter for {@link Association#associatedLocation}*/
+public Vector3Double getAssociatedLocation()
{
return associatedLocation;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- associationType.marshal(dos);
- dos.writeByte(padding);
- associatedEntityID.marshal(dos);
- associatedLocation.marshal(dos);
+ {
+ associationType.marshal(dos);
+ dos.writeByte(padding);
+ associatedEntityID.marshal(dos);
+ associatedLocation.marshal(dos);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- associationType = EntityAssociationAssociationType.unmarshalEnum(dis);
- uPosition += associationType.getMarshalledSize();
- padding = (byte)dis.readUnsignedByte();
- uPosition += 1;
- uPosition += associatedEntityID.unmarshal(dis);
- uPosition += associatedLocation.unmarshal(dis);
+ {
+ associationType = EntityAssociationAssociationType.unmarshalEnum(dis);
+ uPosition += associationType.getMarshalledSize();
+ padding = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ uPosition += associatedEntityID.unmarshal(dis);
+ uPosition += associatedLocation.unmarshal(dis);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- associationType.marshal(buff);
- buff.put( (byte)padding);
- associatedEntityID.marshal(buff);
- associatedLocation.marshal(buff);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- associationType = EntityAssociationAssociationType.unmarshalEnum(buff);
- padding = (byte)(buff.get() & 0xFF);
- associatedEntityID.unmarshal(buff);
- associatedLocation.unmarshal(buff);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ associationType.marshal(buff);
+ buff.put( (byte)padding);
+ associatedEntityID.marshal(buff);
+ associatedLocation.marshal(buff);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ associationType = EntityAssociationAssociationType.unmarshalEnum(buff);
+ padding = (byte)(buff.get() & 0xFF);
+ associatedEntityID.unmarshal(buff);
+ associatedLocation.unmarshal(buff);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final Association rhs = (Association)obj;
-
- if( ! (associationType == rhs.associationType)) ivarsEqual = false;
- if( ! (padding == rhs.padding)) ivarsEqual = false;
- if( ! (associatedEntityID.equals( rhs.associatedEntityID) )) ivarsEqual = false;
- if( ! (associatedLocation.equals( rhs.associatedLocation) )) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final Association rhs = (Association)obj;
+
+ if( ! (associationType == rhs.associationType)) ivarsEqual = false;
+ if( ! (padding == rhs.padding)) ivarsEqual = false;
+ if( ! (associatedEntityID.equals( rhs.associatedEntityID) )) ivarsEqual = false;
+ if( ! (associatedLocation.equals( rhs.associatedLocation) )) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" associationType: ").append(associationType).append("\n");
- sb.append(" padding: ").append(padding).append("\n");
- sb.append(" associatedEntityID: ").append(associatedEntityID).append("\n");
- sb.append(" associatedLocation: ").append(associatedLocation).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" associationType: ").append(associationType).append("\n");
+ sb.append(" padding: ").append(padding).append("\n");
+ sb.append(" associatedEntityID: ").append(associatedEntityID).append("\n");
+ sb.append(" associatedLocation: ").append(associatedLocation).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/AttachedPartVP.java b/src-generated/edu/nps/moves/dis7/AttachedPartVP.java
index cb3813869b56054d03bc16c055e4637eae374b4b..ba931cf0c7309134999355551f123c433d65bbfa 100644
--- a/src-generated/edu/nps/moves/dis7/AttachedPartVP.java
+++ b/src-generated/edu/nps/moves/dis7/AttachedPartVP.java
@@ -1,257 +1,257 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Removable parts that may be attached to an entity. Section 6.2.93.3
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class AttachedPartVP extends Object implements Serializable
-{
- /** the identification of the Variable Parameter record. Enumeration from EBV uid 56 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Removable parts that may be attached to an entity. Section 6.2.93.3
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class AttachedPartVP extends Object implements Serializable
+{
+ /** the identification of the Variable Parameter record. Enumeration from EBV uid 56 */
protected VariableParameterRecordType recordType = VariableParameterRecordType.ATTACHED_PART;
-
- /** 0 = attached, 1 = detached. See I.2.3.1 for state transition diagram uid 415 */
+
+ /** 0 = attached, 1 = detached. See I.2.3.1 for state transition diagram uid 415 */
protected AttachedPartDetachedIndicator detachedIndicator = AttachedPartDetachedIndicator.values()[0];
-
- /** the identification of the articulated part to which this articulation parameter is attached. This field shall be specified by a 16-bit unsigned integer. This field shall contain the value zero if the articulated part is attached directly to the entity. */
+
+ /** the identification of the articulated part to which this articulation parameter is attached. This field shall be specified by a 16-bit unsigned integer. This field shall contain the value zero if the articulated part is attached directly to the entity. */
protected short partAttachedTo = (short)0;
-
- /** The location or station to which the part is attached uid 57 */
+
+ /** The location or station to which the part is attached uid 57 */
protected AttachedParts parameterType = AttachedParts.values()[0];
-
- /** The definition of the 64 bits shall be determined based on the type of parameter specified in the Parameter Type field */
+
+ /** The definition of the 64 bits shall be determined based on the type of parameter specified in the Parameter Type field */
protected EntityType attachedPartType = new EntityType();
-
-
-/** Constructor */
- public AttachedPartVP()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public AttachedPartVP()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += recordType.getMarshalledSize();
+ marshalSize += detachedIndicator.getMarshalledSize();
+ marshalSize += 2; // partAttachedTo
+ marshalSize += parameterType.getMarshalledSize();
+ marshalSize += attachedPartType.getMarshalledSize();
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link AttachedPartVP#recordType}*/
+public AttachedPartVP setRecordType(VariableParameterRecordType pRecordType)
{
- int marshalSize = 0;
-
- marshalSize += recordType.getMarshalledSize();
- marshalSize += detachedIndicator.getMarshalledSize();
- marshalSize += 2; // partAttachedTo
- marshalSize += parameterType.getMarshalledSize();
- marshalSize += attachedPartType.getMarshalledSize();
-
- return marshalSize;
-}
-
-
-/** Setter for {@link AttachedPartVP#recordType}*/
-public AttachedPartVP setRecordType(VariableParameterRecordType pRecordType)
-{
- recordType = pRecordType;
- return this;
-}
-
-/** Getter for {@link AttachedPartVP#recordType}*/
-public VariableParameterRecordType getRecordType()
+ recordType = pRecordType;
+ return this;
+}
+
+/** Getter for {@link AttachedPartVP#recordType}*/
+public VariableParameterRecordType getRecordType()
{
return recordType;
-}
-
-/** Setter for {@link AttachedPartVP#detachedIndicator}*/
-public AttachedPartVP setDetachedIndicator(AttachedPartDetachedIndicator pDetachedIndicator)
+}
+
+/** Setter for {@link AttachedPartVP#detachedIndicator}*/
+public AttachedPartVP setDetachedIndicator(AttachedPartDetachedIndicator pDetachedIndicator)
{
- detachedIndicator = pDetachedIndicator;
- return this;
-}
-
-/** Getter for {@link AttachedPartVP#detachedIndicator}*/
-public AttachedPartDetachedIndicator getDetachedIndicator()
+ detachedIndicator = pDetachedIndicator;
+ return this;
+}
+
+/** Getter for {@link AttachedPartVP#detachedIndicator}*/
+public AttachedPartDetachedIndicator getDetachedIndicator()
{
return detachedIndicator;
-}
-
-/** Setter for {@link AttachedPartVP#partAttachedTo}*/
-public AttachedPartVP setPartAttachedTo(short pPartAttachedTo)
+}
+
+/** Setter for {@link AttachedPartVP#partAttachedTo}*/
+public AttachedPartVP setPartAttachedTo(short pPartAttachedTo)
{
- partAttachedTo = pPartAttachedTo;
- return this;
-}
-
-/** Getter for {@link AttachedPartVP#partAttachedTo}*/
-public short getPartAttachedTo()
+ partAttachedTo = pPartAttachedTo;
+ return this;
+}
+
+/** Getter for {@link AttachedPartVP#partAttachedTo}*/
+public short getPartAttachedTo()
{
return partAttachedTo;
-}
-
-/** Setter for {@link AttachedPartVP#parameterType}*/
-public AttachedPartVP setParameterType(AttachedParts pParameterType)
+}
+
+/** Setter for {@link AttachedPartVP#parameterType}*/
+public AttachedPartVP setParameterType(AttachedParts pParameterType)
{
- parameterType = pParameterType;
- return this;
-}
-
-/** Getter for {@link AttachedPartVP#parameterType}*/
-public AttachedParts getParameterType()
+ parameterType = pParameterType;
+ return this;
+}
+
+/** Getter for {@link AttachedPartVP#parameterType}*/
+public AttachedParts getParameterType()
{
return parameterType;
-}
-
-/** Setter for {@link AttachedPartVP#attachedPartType}*/
-public AttachedPartVP setAttachedPartType(EntityType pAttachedPartType)
+}
+
+/** Setter for {@link AttachedPartVP#attachedPartType}*/
+public AttachedPartVP setAttachedPartType(EntityType pAttachedPartType)
{
- attachedPartType = pAttachedPartType;
- return this;
-}
-
-/** Getter for {@link AttachedPartVP#attachedPartType}*/
-public EntityType getAttachedPartType()
+ attachedPartType = pAttachedPartType;
+ return this;
+}
+
+/** Getter for {@link AttachedPartVP#attachedPartType}*/
+public EntityType getAttachedPartType()
{
return attachedPartType;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- recordType.marshal(dos);
- detachedIndicator.marshal(dos);
- dos.writeShort(partAttachedTo);
- parameterType.marshal(dos);
- attachedPartType.marshal(dos);
+ {
+ recordType.marshal(dos);
+ detachedIndicator.marshal(dos);
+ dos.writeShort(partAttachedTo);
+ parameterType.marshal(dos);
+ attachedPartType.marshal(dos);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- recordType = VariableParameterRecordType.unmarshalEnum(dis);
- uPosition += recordType.getMarshalledSize();
- detachedIndicator = AttachedPartDetachedIndicator.unmarshalEnum(dis);
- uPosition += detachedIndicator.getMarshalledSize();
- partAttachedTo = (short)dis.readUnsignedShort();
- uPosition += 2;
- parameterType = AttachedParts.unmarshalEnum(dis);
- uPosition += parameterType.getMarshalledSize();
- uPosition += attachedPartType.unmarshal(dis);
+ {
+ recordType = VariableParameterRecordType.unmarshalEnum(dis);
+ uPosition += recordType.getMarshalledSize();
+ detachedIndicator = AttachedPartDetachedIndicator.unmarshalEnum(dis);
+ uPosition += detachedIndicator.getMarshalledSize();
+ partAttachedTo = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ parameterType = AttachedParts.unmarshalEnum(dis);
+ uPosition += parameterType.getMarshalledSize();
+ uPosition += attachedPartType.unmarshal(dis);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- recordType.marshal(buff);
- detachedIndicator.marshal(buff);
- buff.putShort( (short)partAttachedTo);
- parameterType.marshal(buff);
- attachedPartType.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- recordType = VariableParameterRecordType.unmarshalEnum(buff);
- detachedIndicator = AttachedPartDetachedIndicator.unmarshalEnum(buff);
- partAttachedTo = (short)(buff.getShort() & 0xFFFF);
- parameterType = AttachedParts.unmarshalEnum(buff);
- attachedPartType.unmarshal(buff);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ recordType.marshal(buff);
+ detachedIndicator.marshal(buff);
+ buff.putShort( (short)partAttachedTo);
+ parameterType.marshal(buff);
+ attachedPartType.marshal(buff);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ recordType = VariableParameterRecordType.unmarshalEnum(buff);
+ detachedIndicator = AttachedPartDetachedIndicator.unmarshalEnum(buff);
+ partAttachedTo = (short)(buff.getShort() & 0xFFFF);
+ parameterType = AttachedParts.unmarshalEnum(buff);
+ attachedPartType.unmarshal(buff);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final AttachedPartVP rhs = (AttachedPartVP)obj;
-
- if( ! (recordType == rhs.recordType)) ivarsEqual = false;
- if( ! (detachedIndicator == rhs.detachedIndicator)) ivarsEqual = false;
- if( ! (partAttachedTo == rhs.partAttachedTo)) ivarsEqual = false;
- if( ! (parameterType == rhs.parameterType)) ivarsEqual = false;
- if( ! (attachedPartType.equals( rhs.attachedPartType) )) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final AttachedPartVP rhs = (AttachedPartVP)obj;
+
+ if( ! (recordType == rhs.recordType)) ivarsEqual = false;
+ if( ! (detachedIndicator == rhs.detachedIndicator)) ivarsEqual = false;
+ if( ! (partAttachedTo == rhs.partAttachedTo)) ivarsEqual = false;
+ if( ! (parameterType == rhs.parameterType)) ivarsEqual = false;
+ if( ! (attachedPartType.equals( rhs.attachedPartType) )) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" recordType: ").append(recordType).append("\n");
- sb.append(" detachedIndicator: ").append(detachedIndicator).append("\n");
- sb.append(" partAttachedTo: ").append(partAttachedTo).append("\n");
- sb.append(" parameterType: ").append(parameterType).append("\n");
- sb.append(" attachedPartType: ").append(attachedPartType).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" recordType: ").append(recordType).append("\n");
+ sb.append(" detachedIndicator: ").append(detachedIndicator).append("\n");
+ sb.append(" partAttachedTo: ").append(partAttachedTo).append("\n");
+ sb.append(" parameterType: ").append(parameterType).append("\n");
+ sb.append(" attachedPartType: ").append(attachedPartType).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/Attribute.java b/src-generated/edu/nps/moves/dis7/Attribute.java
index e3644dc7081a9056183cf82455cef371e2d00246..1a1ee42e95b78aedcdb4c776c8a40672ae056934 100644
--- a/src-generated/edu/nps/moves/dis7/Attribute.java
+++ b/src-generated/edu/nps/moves/dis7/Attribute.java
@@ -1,215 +1,215 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Used to convey information for one or more attributes. Attributes conform to the standard variable record format of 6.2.82. Section 6.2.10.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class Attribute extends Object implements Serializable
-{
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Used to convey information for one or more attributes. Attributes conform to the standard variable record format of 6.2.82. Section 6.2.10.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class Attribute extends Object implements Serializable
+{
protected int recordType;
-
+
protected short recordLength;
-
+
protected byte[] recordSpecificFields = new byte[0];
-
+
private byte[] padding = new byte[0]; // pad to 64-bit boundary
-
-
-/** Constructor */
- public Attribute()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += 4; // recordType
- marshalSize += 2; // recordLength
- marshalSize += recordSpecificFields.length * 1;
- marshalSize += padding.length;
-
- return marshalSize;
-}
-
-
-/** Setter for {@link Attribute#recordType}*/
-public Attribute setRecordType(int pRecordType)
+
+
+/** Constructor */
+ public Attribute()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 4; // recordType
+ marshalSize += 2; // recordLength
+ marshalSize += recordSpecificFields.length * 1;
+ marshalSize += padding.length;
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link Attribute#recordType}*/
+public Attribute setRecordType(int pRecordType)
{
- recordType = pRecordType;
- return this;
-}
-
-/** Getter for {@link Attribute#recordType}*/
-public int getRecordType()
+ recordType = pRecordType;
+ return this;
+}
+
+/** Getter for {@link Attribute#recordType}*/
+public int getRecordType()
{
return recordType;
-}
-
-/** Setter for {@link Attribute#recordSpecificFields}*/
-public Attribute setRecordSpecificFields(byte[] pRecordSpecificFields)
+}
+
+/** Setter for {@link Attribute#recordSpecificFields}*/
+public Attribute setRecordSpecificFields(byte[] pRecordSpecificFields)
{
- recordSpecificFields = pRecordSpecificFields;
- return this;
-}
-
-/** Getter for {@link Attribute#recordSpecificFields}*/
-public byte[] getRecordSpecificFields()
+ recordSpecificFields = pRecordSpecificFields;
+ return this;
+}
+
+/** Getter for {@link Attribute#recordSpecificFields}*/
+public byte[] getRecordSpecificFields()
{
return recordSpecificFields;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeInt(recordType);
- dos.writeShort(recordSpecificFields.length);
-
- for(int idx = 0; idx < recordSpecificFields.length; idx++)
- dos.writeByte(recordSpecificFields[idx]);
-
- padding = new byte[Align.to64bits(dos)];
+ {
+ dos.writeInt(recordType);
+ dos.writeShort(recordSpecificFields.length);
+
+ for(int idx = 0; idx < recordSpecificFields.length; idx++)
+ dos.writeByte(recordSpecificFields[idx]);
+
+ padding = new byte[Align.to64bits(dos)];
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- recordType = dis.readInt();
- uPosition += 4;
- recordLength = (short)dis.readUnsignedShort();
- uPosition += 2;
- for(int idx = 0; idx < recordSpecificFields.length; idx++)
- recordSpecificFields[idx] = dis.readByte();
- uPosition += (recordSpecificFields.length * 1);
- padding = new byte[Align.from64bits(uPosition,dis)];
- uPosition += padding.length;
+ {
+ recordType = dis.readInt();
+ uPosition += 4;
+ recordLength = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ for(int idx = 0; idx < recordSpecificFields.length; idx++)
+ recordSpecificFields[idx] = dis.readByte();
+ uPosition += (recordSpecificFields.length * 1);
+ padding = new byte[Align.from64bits(uPosition,dis)];
+ uPosition += padding.length;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putInt( (int)recordType);
- buff.putShort( (short)recordSpecificFields.length);
-
- for(int idx = 0; idx < recordSpecificFields.length; idx++)
- buff.put((byte)recordSpecificFields[idx]);
-
- padding = new byte[Align.to64bits(buff)];
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- recordType = buff.getInt();
- recordLength = (short)(buff.getShort() & 0xFFFF);
- for(int idx = 0; idx < recordSpecificFields.length; idx++)
- recordSpecificFields[idx] = buff.get();
- padding = new byte[Align.from64bits(buff)];
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putInt( (int)recordType);
+ buff.putShort( (short)recordSpecificFields.length);
+
+ for(int idx = 0; idx < recordSpecificFields.length; idx++)
+ buff.put((byte)recordSpecificFields[idx]);
+
+ padding = new byte[Align.to64bits(buff)];
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ recordType = buff.getInt();
+ recordLength = (short)(buff.getShort() & 0xFFFF);
+ for(int idx = 0; idx < recordSpecificFields.length; idx++)
+ recordSpecificFields[idx] = buff.get();
+ padding = new byte[Align.from64bits(buff)];
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final Attribute rhs = (Attribute)obj;
-
- if( ! (recordType == rhs.recordType)) ivarsEqual = false;
-
- for(int idx = 0; idx < 0; idx++)
- {
- if(!(recordSpecificFields[idx] == rhs.recordSpecificFields[idx])) ivarsEqual = false;
- }
-
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final Attribute rhs = (Attribute)obj;
+
+ if( ! (recordType == rhs.recordType)) ivarsEqual = false;
+
+ for(int idx = 0; idx < 0; idx++)
+ {
+ if(!(recordSpecificFields[idx] == rhs.recordSpecificFields[idx])) ivarsEqual = false;
+ }
+
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" recordType: ").append(recordType).append("\n");
- sb.append(" recordSpecificFields: ").append("\n");
- sb.append(Arrays.toString(recordSpecificFields)).append("\n");
- sb.append(" padding: ").append(padding).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" recordType: ").append(recordType).append("\n");
+ sb.append(" recordSpecificFields: ").append("\n");
+ sb.append(Arrays.toString(recordSpecificFields)).append("\n");
+ sb.append(" padding: ").append(padding).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/AttributePdu.java b/src-generated/edu/nps/moves/dis7/AttributePdu.java
index 9c0a25d20631f8f10bb23d0538aa636b4427e1ea..787d47881505327b5803da5b6c034c47f37af1a8 100644
--- a/src-generated/edu/nps/moves/dis7/AttributePdu.java
+++ b/src-generated/edu/nps/moves/dis7/AttributePdu.java
@@ -1,395 +1,395 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 7.2.6. Information about individual attributes for a particular entity, other object, or event may be communicated using an Attribute PDU. The Attribute PDU shall not be used to exchange data available in any other PDU except where explicitly mentioned in the PDU issuance instructions within this standard.. See 5.3.6.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class AttributePdu extends EntityInformationFamilyPdu implements Serializable
-{
- /** This field shall identify the simulation issuing the Attribute PDU. It shall be represented by a Simulation Address record (see 6.2.79). */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 7.2.6. Information about individual attributes for a particular entity, other object, or event may be communicated using an Attribute PDU. The Attribute PDU shall not be used to exchange data available in any other PDU except where explicitly mentioned in the PDU issuance instructions within this standard.. See 5.3.6.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class AttributePdu extends EntityInformationFamilyPdu implements Serializable
+{
+ /** This field shall identify the simulation issuing the Attribute PDU. It shall be represented by a Simulation Address record (see 6.2.79). */
protected SimulationAddress originatingSimulationAddress = new SimulationAddress();
-
- /** Padding */
+
+ /** Padding */
protected int padding1;
-
- /** Padding */
+
+ /** Padding */
protected short padding2;
-
- /** This field shall represent the type of the PDU that is being extended or updated, if applicable. It shall be represented by an 8-bit enumeration. uid 4 */
+
+ /** This field shall represent the type of the PDU that is being extended or updated, if applicable. It shall be represented by an 8-bit enumeration. uid 4 */
protected DISPDUType attributeRecordPduType = DISPDUType.values()[0];
-
- /** This field shall indicate the Protocol Version associated with the Attribute Record PDU Type. It shall be represented by an 8-bit enumeration. uid 5 */
+
+ /** This field shall indicate the Protocol Version associated with the Attribute Record PDU Type. It shall be represented by an 8-bit enumeration. uid 5 */
protected DISProtocolFamily attributeRecordProtocolVersion = DISProtocolFamily.values()[0];
-
- /** This field shall contain the Attribute record type of the Attribute records in the PDU if they all have the same Attribute record type. It shall be represented by a 32-bit enumeration. uid 66 */
+
+ /** This field shall contain the Attribute record type of the Attribute records in the PDU if they all have the same Attribute record type. It shall be represented by a 32-bit enumeration. uid 66 */
protected VariableRecordType masterAttributeRecordType = VariableRecordType.values()[0];
-
- /** This field shall identify the action code applicable to this Attribute PDU. The Action Code shall apply to all Attribute records contained in the PDU. It shall be represented by an 8-bit enumeration. uid 295 */
+
+ /** This field shall identify the action code applicable to this Attribute PDU. The Action Code shall apply to all Attribute records contained in the PDU. It shall be represented by an 8-bit enumeration. uid 295 */
protected DISAttributeActionCode actionCode = DISAttributeActionCode.values()[0];
-
- /** Padding */
+
+ /** Padding */
protected byte padding3;
-
- /** This field shall specify the number of Attribute Record Sets that make up the remainder of the PDU. It shall be represented by a 16-bit unsigned integer. */
+
+ /** This field shall specify the number of Attribute Record Sets that make up the remainder of the PDU. It shall be represented by a 16-bit unsigned integer. */
protected short numberAttributeRecordSet;
-
+
protected List< AttributeRecordSet > attributeRecordSets = new ArrayList< AttributeRecordSet >();
-
-
-/** Constructor */
- public AttributePdu()
- {
- setPduType( DISPDUType.ATTRIBUTE );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public AttributePdu()
+ {
+ setPduType( DISPDUType.ATTRIBUTE );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += originatingSimulationAddress.getMarshalledSize();
+ marshalSize += 4; // padding1
+ marshalSize += 2; // padding2
+ marshalSize += attributeRecordPduType.getMarshalledSize();
+ marshalSize += attributeRecordProtocolVersion.getMarshalledSize();
+ marshalSize += masterAttributeRecordType.getMarshalledSize();
+ marshalSize += actionCode.getMarshalledSize();
+ marshalSize += 1; // padding3
+ marshalSize += 2; // numberAttributeRecordSet
+ for(int idx=0; idx < attributeRecordSets.size(); idx++)
+ {
+ AttributeRecordSet listElement = attributeRecordSets.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link AttributePdu#originatingSimulationAddress}*/
+public AttributePdu setOriginatingSimulationAddress(SimulationAddress pOriginatingSimulationAddress)
{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += originatingSimulationAddress.getMarshalledSize();
- marshalSize += 4; // padding1
- marshalSize += 2; // padding2
- marshalSize += attributeRecordPduType.getMarshalledSize();
- marshalSize += attributeRecordProtocolVersion.getMarshalledSize();
- marshalSize += masterAttributeRecordType.getMarshalledSize();
- marshalSize += actionCode.getMarshalledSize();
- marshalSize += 1; // padding3
- marshalSize += 2; // numberAttributeRecordSet
- for(int idx=0; idx < attributeRecordSets.size(); idx++)
- {
- AttributeRecordSet listElement = attributeRecordSets.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link AttributePdu#originatingSimulationAddress}*/
-public AttributePdu setOriginatingSimulationAddress(SimulationAddress pOriginatingSimulationAddress)
-{
- originatingSimulationAddress = pOriginatingSimulationAddress;
- return this;
-}
-
-/** Getter for {@link AttributePdu#originatingSimulationAddress}*/
-public SimulationAddress getOriginatingSimulationAddress()
+ originatingSimulationAddress = pOriginatingSimulationAddress;
+ return this;
+}
+
+/** Getter for {@link AttributePdu#originatingSimulationAddress}*/
+public SimulationAddress getOriginatingSimulationAddress()
{
return originatingSimulationAddress;
-}
-
-/** Setter for {@link AttributePdu#padding1}*/
-public AttributePdu setPadding1(int pPadding1)
+}
+
+/** Setter for {@link AttributePdu#padding1}*/
+public AttributePdu setPadding1(int pPadding1)
{
- padding1 = pPadding1;
- return this;
-}
-
-/** Getter for {@link AttributePdu#padding1}*/
-public int getPadding1()
+ padding1 = pPadding1;
+ return this;
+}
+
+/** Getter for {@link AttributePdu#padding1}*/
+public int getPadding1()
{
return padding1;
-}
-
-/** Setter for {@link AttributePdu#padding2}*/
-public AttributePdu setPadding2(short pPadding2)
+}
+
+/** Setter for {@link AttributePdu#padding2}*/
+public AttributePdu setPadding2(short pPadding2)
{
- padding2 = pPadding2;
- return this;
-}
-
-/** Getter for {@link AttributePdu#padding2}*/
-public short getPadding2()
+ padding2 = pPadding2;
+ return this;
+}
+
+/** Getter for {@link AttributePdu#padding2}*/
+public short getPadding2()
{
return padding2;
-}
-
-/** Setter for {@link AttributePdu#attributeRecordPduType}*/
-public AttributePdu setAttributeRecordPduType(DISPDUType pAttributeRecordPduType)
+}
+
+/** Setter for {@link AttributePdu#attributeRecordPduType}*/
+public AttributePdu setAttributeRecordPduType(DISPDUType pAttributeRecordPduType)
{
- attributeRecordPduType = pAttributeRecordPduType;
- return this;
-}
-
-/** Getter for {@link AttributePdu#attributeRecordPduType}*/
-public DISPDUType getAttributeRecordPduType()
+ attributeRecordPduType = pAttributeRecordPduType;
+ return this;
+}
+
+/** Getter for {@link AttributePdu#attributeRecordPduType}*/
+public DISPDUType getAttributeRecordPduType()
{
return attributeRecordPduType;
-}
-
-/** Setter for {@link AttributePdu#attributeRecordProtocolVersion}*/
-public AttributePdu setAttributeRecordProtocolVersion(DISProtocolFamily pAttributeRecordProtocolVersion)
+}
+
+/** Setter for {@link AttributePdu#attributeRecordProtocolVersion}*/
+public AttributePdu setAttributeRecordProtocolVersion(DISProtocolFamily pAttributeRecordProtocolVersion)
{
- attributeRecordProtocolVersion = pAttributeRecordProtocolVersion;
- return this;
-}
-
-/** Getter for {@link AttributePdu#attributeRecordProtocolVersion}*/
-public DISProtocolFamily getAttributeRecordProtocolVersion()
+ attributeRecordProtocolVersion = pAttributeRecordProtocolVersion;
+ return this;
+}
+
+/** Getter for {@link AttributePdu#attributeRecordProtocolVersion}*/
+public DISProtocolFamily getAttributeRecordProtocolVersion()
{
return attributeRecordProtocolVersion;
-}
-
-/** Setter for {@link AttributePdu#masterAttributeRecordType}*/
-public AttributePdu setMasterAttributeRecordType(VariableRecordType pMasterAttributeRecordType)
+}
+
+/** Setter for {@link AttributePdu#masterAttributeRecordType}*/
+public AttributePdu setMasterAttributeRecordType(VariableRecordType pMasterAttributeRecordType)
{
- masterAttributeRecordType = pMasterAttributeRecordType;
- return this;
-}
-
-/** Getter for {@link AttributePdu#masterAttributeRecordType}*/
-public VariableRecordType getMasterAttributeRecordType()
+ masterAttributeRecordType = pMasterAttributeRecordType;
+ return this;
+}
+
+/** Getter for {@link AttributePdu#masterAttributeRecordType}*/
+public VariableRecordType getMasterAttributeRecordType()
{
return masterAttributeRecordType;
-}
-
-/** Setter for {@link AttributePdu#actionCode}*/
-public AttributePdu setActionCode(DISAttributeActionCode pActionCode)
+}
+
+/** Setter for {@link AttributePdu#actionCode}*/
+public AttributePdu setActionCode(DISAttributeActionCode pActionCode)
{
- actionCode = pActionCode;
- return this;
-}
-
-/** Getter for {@link AttributePdu#actionCode}*/
-public DISAttributeActionCode getActionCode()
+ actionCode = pActionCode;
+ return this;
+}
+
+/** Getter for {@link AttributePdu#actionCode}*/
+public DISAttributeActionCode getActionCode()
{
return actionCode;
-}
-
-/** Setter for {@link AttributePdu#padding3}*/
-public AttributePdu setPadding3(byte pPadding3)
+}
+
+/** Setter for {@link AttributePdu#padding3}*/
+public AttributePdu setPadding3(byte pPadding3)
{
- padding3 = pPadding3;
- return this;
-}
-
-/** Getter for {@link AttributePdu#padding3}*/
-public byte getPadding3()
+ padding3 = pPadding3;
+ return this;
+}
+
+/** Getter for {@link AttributePdu#padding3}*/
+public byte getPadding3()
{
return padding3;
-}
-
-/** Setter for {@link AttributePdu#attributeRecordSets}*/
-public AttributePdu setAttributeRecordSets(List<AttributeRecordSet> pAttributeRecordSets)
+}
+
+/** Setter for {@link AttributePdu#attributeRecordSets}*/
+public AttributePdu setAttributeRecordSets(List<AttributeRecordSet> pAttributeRecordSets)
{
- attributeRecordSets = pAttributeRecordSets;
- return this;
-}
-
-/** Getter for {@link AttributePdu#attributeRecordSets}*/
-public List<AttributeRecordSet> getAttributeRecordSets()
+ attributeRecordSets = pAttributeRecordSets;
+ return this;
+}
+
+/** Getter for {@link AttributePdu#attributeRecordSets}*/
+public List<AttributeRecordSet> getAttributeRecordSets()
{
return attributeRecordSets;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- originatingSimulationAddress.marshal(dos);
- dos.writeInt(padding1);
- dos.writeShort(padding2);
- attributeRecordPduType.marshal(dos);
- attributeRecordProtocolVersion.marshal(dos);
- masterAttributeRecordType.marshal(dos);
- actionCode.marshal(dos);
- dos.writeByte(padding3);
- dos.writeShort(attributeRecordSets.size());
-
- for(int idx = 0; idx < attributeRecordSets.size(); idx++)
- {
- AttributeRecordSet aAttributeRecordSet = attributeRecordSets.get(idx);
- aAttributeRecordSet.marshal(dos);
- }
-
+ {
+ originatingSimulationAddress.marshal(dos);
+ dos.writeInt(padding1);
+ dos.writeShort(padding2);
+ attributeRecordPduType.marshal(dos);
+ attributeRecordProtocolVersion.marshal(dos);
+ masterAttributeRecordType.marshal(dos);
+ actionCode.marshal(dos);
+ dos.writeByte(padding3);
+ dos.writeShort(attributeRecordSets.size());
+
+ for(int idx = 0; idx < attributeRecordSets.size(); idx++)
+ {
+ AttributeRecordSet aAttributeRecordSet = attributeRecordSets.get(idx);
+ aAttributeRecordSet.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += originatingSimulationAddress.unmarshal(dis);
- padding1 = dis.readInt();
- uPosition += 4;
- padding2 = dis.readShort();
- uPosition += 4;
- attributeRecordPduType = DISPDUType.unmarshalEnum(dis);
- uPosition += attributeRecordPduType.getMarshalledSize();
- attributeRecordProtocolVersion = DISProtocolFamily.unmarshalEnum(dis);
- uPosition += attributeRecordProtocolVersion.getMarshalledSize();
- masterAttributeRecordType = VariableRecordType.unmarshalEnum(dis);
- uPosition += masterAttributeRecordType.getMarshalledSize();
- actionCode = DISAttributeActionCode.unmarshalEnum(dis);
- uPosition += actionCode.getMarshalledSize();
- padding3 = (byte)dis.readUnsignedByte();
- uPosition += 1;
- numberAttributeRecordSet = (short)dis.readUnsignedShort();
- uPosition += 2;
- for(int idx = 0; idx < numberAttributeRecordSet; idx++)
- {
- AttributeRecordSet anX = new AttributeRecordSet();
- uPosition += anX.unmarshal(dis);
- attributeRecordSets.add(anX);
- }
-
+ {
+ uPosition += originatingSimulationAddress.unmarshal(dis);
+ padding1 = dis.readInt();
+ uPosition += 4;
+ padding2 = dis.readShort();
+ uPosition += 4;
+ attributeRecordPduType = DISPDUType.unmarshalEnum(dis);
+ uPosition += attributeRecordPduType.getMarshalledSize();
+ attributeRecordProtocolVersion = DISProtocolFamily.unmarshalEnum(dis);
+ uPosition += attributeRecordProtocolVersion.getMarshalledSize();
+ masterAttributeRecordType = VariableRecordType.unmarshalEnum(dis);
+ uPosition += masterAttributeRecordType.getMarshalledSize();
+ actionCode = DISAttributeActionCode.unmarshalEnum(dis);
+ uPosition += actionCode.getMarshalledSize();
+ padding3 = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ numberAttributeRecordSet = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ for(int idx = 0; idx < numberAttributeRecordSet; idx++)
+ {
+ AttributeRecordSet anX = new AttributeRecordSet();
+ uPosition += anX.unmarshal(dis);
+ attributeRecordSets.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- originatingSimulationAddress.marshal(buff);
- buff.putInt( (int)padding1);
- buff.putShort( (short)padding2);
- attributeRecordPduType.marshal(buff);
- attributeRecordProtocolVersion.marshal(buff);
- masterAttributeRecordType.marshal(buff);
- actionCode.marshal(buff);
- buff.put( (byte)padding3);
- buff.putShort( (short)attributeRecordSets.size());
-
- for(int idx = 0; idx < attributeRecordSets.size(); idx++)
- {
- AttributeRecordSet aAttributeRecordSet = attributeRecordSets.get(idx);
- aAttributeRecordSet.marshal(buff);
- }
-
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ originatingSimulationAddress.marshal(buff);
+ buff.putInt( (int)padding1);
+ buff.putShort( (short)padding2);
+ attributeRecordPduType.marshal(buff);
+ attributeRecordProtocolVersion.marshal(buff);
+ masterAttributeRecordType.marshal(buff);
+ actionCode.marshal(buff);
+ buff.put( (byte)padding3);
+ buff.putShort( (short)attributeRecordSets.size());
+
+ for(int idx = 0; idx < attributeRecordSets.size(); idx++)
+ {
+ AttributeRecordSet aAttributeRecordSet = attributeRecordSets.get(idx);
+ aAttributeRecordSet.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- originatingSimulationAddress.unmarshal(buff);
- padding1 = buff.getInt();
- padding2 = buff.getShort();
- attributeRecordPduType = DISPDUType.unmarshalEnum(buff);
- attributeRecordProtocolVersion = DISProtocolFamily.unmarshalEnum(buff);
- masterAttributeRecordType = VariableRecordType.unmarshalEnum(buff);
- actionCode = DISAttributeActionCode.unmarshalEnum(buff);
- padding3 = (byte)(buff.get() & 0xFF);
- numberAttributeRecordSet = (short)(buff.getShort() & 0xFFFF);
- for(int idx = 0; idx < numberAttributeRecordSet; idx++)
- {
- AttributeRecordSet anX = new AttributeRecordSet();
- anX.unmarshal(buff);
- attributeRecordSets.add(anX);
- }
-
- return getMarshalledSize();
+
+ originatingSimulationAddress.unmarshal(buff);
+ padding1 = buff.getInt();
+ padding2 = buff.getShort();
+ attributeRecordPduType = DISPDUType.unmarshalEnum(buff);
+ attributeRecordProtocolVersion = DISProtocolFamily.unmarshalEnum(buff);
+ masterAttributeRecordType = VariableRecordType.unmarshalEnum(buff);
+ actionCode = DISAttributeActionCode.unmarshalEnum(buff);
+ padding3 = (byte)(buff.get() & 0xFF);
+ numberAttributeRecordSet = (short)(buff.getShort() & 0xFFFF);
+ for(int idx = 0; idx < numberAttributeRecordSet; idx++)
+ {
+ AttributeRecordSet anX = new AttributeRecordSet();
+ anX.unmarshal(buff);
+ attributeRecordSets.add(anX);
+ }
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final AttributePdu rhs = (AttributePdu)obj;
-
- if( ! (originatingSimulationAddress.equals( rhs.originatingSimulationAddress) )) ivarsEqual = false;
- if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
- if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
- if( ! (attributeRecordPduType == rhs.attributeRecordPduType)) ivarsEqual = false;
- if( ! (attributeRecordProtocolVersion == rhs.attributeRecordProtocolVersion)) ivarsEqual = false;
- if( ! (masterAttributeRecordType == rhs.masterAttributeRecordType)) ivarsEqual = false;
- if( ! (actionCode == rhs.actionCode)) ivarsEqual = false;
- if( ! (padding3 == rhs.padding3)) ivarsEqual = false;
-
- for(int idx = 0; idx < attributeRecordSets.size(); idx++)
- if( ! ( attributeRecordSets.get(idx).equals(rhs.attributeRecordSets.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final AttributePdu rhs = (AttributePdu)obj;
+
+ if( ! (originatingSimulationAddress.equals( rhs.originatingSimulationAddress) )) ivarsEqual = false;
+ if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
+ if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
+ if( ! (attributeRecordPduType == rhs.attributeRecordPduType)) ivarsEqual = false;
+ if( ! (attributeRecordProtocolVersion == rhs.attributeRecordProtocolVersion)) ivarsEqual = false;
+ if( ! (masterAttributeRecordType == rhs.masterAttributeRecordType)) ivarsEqual = false;
+ if( ! (actionCode == rhs.actionCode)) ivarsEqual = false;
+ if( ! (padding3 == rhs.padding3)) ivarsEqual = false;
+
+ for(int idx = 0; idx < attributeRecordSets.size(); idx++)
+ if( ! ( attributeRecordSets.get(idx).equals(rhs.attributeRecordSets.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" originatingSimulationAddress: ").append(originatingSimulationAddress).append("\n");
- sb.append(" padding1: ").append(padding1).append("\n");
- sb.append(" padding2: ").append(padding2).append("\n");
- sb.append(" attributeRecordPduType: ").append(attributeRecordPduType).append("\n");
- sb.append(" attributeRecordProtocolVersion: ").append(attributeRecordProtocolVersion).append("\n");
- sb.append(" masterAttributeRecordType: ").append(masterAttributeRecordType).append("\n");
- sb.append(" actionCode: ").append(actionCode).append("\n");
- sb.append(" padding3: ").append(padding3).append("\n");
- sb.append(" attributeRecordSets: ").append("\n");
- attributeRecordSets.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" originatingSimulationAddress: ").append(originatingSimulationAddress).append("\n");
+ sb.append(" padding1: ").append(padding1).append("\n");
+ sb.append(" padding2: ").append(padding2).append("\n");
+ sb.append(" attributeRecordPduType: ").append(attributeRecordPduType).append("\n");
+ sb.append(" attributeRecordProtocolVersion: ").append(attributeRecordProtocolVersion).append("\n");
+ sb.append(" masterAttributeRecordType: ").append(masterAttributeRecordType).append("\n");
+ sb.append(" actionCode: ").append(actionCode).append("\n");
+ sb.append(" padding3: ").append(padding3).append("\n");
+ sb.append(" attributeRecordSets: ").append("\n");
+ attributeRecordSets.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/AttributeRecordSet.java b/src-generated/edu/nps/moves/dis7/AttributeRecordSet.java
index 739df9a313122c72d0f45ac3d19c8c36c9ed595a..c4e32f3fc34c5414eb6cde316885f522c9dc68f0 100644
--- a/src-generated/edu/nps/moves/dis7/AttributeRecordSet.java
+++ b/src-generated/edu/nps/moves/dis7/AttributeRecordSet.java
@@ -1,221 +1,221 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class AttributeRecordSet extends Object implements Serializable
-{
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class AttributeRecordSet extends Object implements Serializable
+{
protected EntityID entityId = new EntityID();
-
+
protected short numberOfAttributeRecords;
-
+
protected List< Attribute > attributeRecords = new ArrayList< Attribute >();
-
-
-/** Constructor */
- public AttributeRecordSet()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += entityId.getMarshalledSize();
- marshalSize += 2; // numberOfAttributeRecords
- for(int idx=0; idx < attributeRecords.size(); idx++)
- {
- Attribute listElement = attributeRecords.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link AttributeRecordSet#entityId}*/
-public AttributeRecordSet setEntityId(EntityID pEntityId)
+
+
+/** Constructor */
+ public AttributeRecordSet()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += entityId.getMarshalledSize();
+ marshalSize += 2; // numberOfAttributeRecords
+ for(int idx=0; idx < attributeRecords.size(); idx++)
+ {
+ Attribute listElement = attributeRecords.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link AttributeRecordSet#entityId}*/
+public AttributeRecordSet setEntityId(EntityID pEntityId)
{
- entityId = pEntityId;
- return this;
-}
-
-/** Getter for {@link AttributeRecordSet#entityId}*/
-public EntityID getEntityId()
+ entityId = pEntityId;
+ return this;
+}
+
+/** Getter for {@link AttributeRecordSet#entityId}*/
+public EntityID getEntityId()
{
return entityId;
-}
-
-/** Setter for {@link AttributeRecordSet#attributeRecords}*/
-public AttributeRecordSet setAttributeRecords(List<Attribute> pAttributeRecords)
+}
+
+/** Setter for {@link AttributeRecordSet#attributeRecords}*/
+public AttributeRecordSet setAttributeRecords(List<Attribute> pAttributeRecords)
{
- attributeRecords = pAttributeRecords;
- return this;
-}
-
-/** Getter for {@link AttributeRecordSet#attributeRecords}*/
-public List<Attribute> getAttributeRecords()
+ attributeRecords = pAttributeRecords;
+ return this;
+}
+
+/** Getter for {@link AttributeRecordSet#attributeRecords}*/
+public List<Attribute> getAttributeRecords()
{
return attributeRecords;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- entityId.marshal(dos);
- dos.writeShort(attributeRecords.size());
-
- for(int idx = 0; idx < attributeRecords.size(); idx++)
- {
- Attribute aAttribute = attributeRecords.get(idx);
- aAttribute.marshal(dos);
- }
-
+ {
+ entityId.marshal(dos);
+ dos.writeShort(attributeRecords.size());
+
+ for(int idx = 0; idx < attributeRecords.size(); idx++)
+ {
+ Attribute aAttribute = attributeRecords.get(idx);
+ aAttribute.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- uPosition += entityId.unmarshal(dis);
- numberOfAttributeRecords = (short)dis.readUnsignedShort();
- uPosition += 2;
- for(int idx = 0; idx < numberOfAttributeRecords; idx++)
- {
- Attribute anX = new Attribute();
- uPosition += anX.unmarshal(dis);
- attributeRecords.add(anX);
- }
-
+ {
+ uPosition += entityId.unmarshal(dis);
+ numberOfAttributeRecords = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ for(int idx = 0; idx < numberOfAttributeRecords; idx++)
+ {
+ Attribute anX = new Attribute();
+ uPosition += anX.unmarshal(dis);
+ attributeRecords.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- entityId.marshal(buff);
- buff.putShort( (short)attributeRecords.size());
-
- for(int idx = 0; idx < attributeRecords.size(); idx++)
- {
- Attribute aAttribute = attributeRecords.get(idx);
- aAttribute.marshal(buff);
- }
-
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- entityId.unmarshal(buff);
- numberOfAttributeRecords = (short)(buff.getShort() & 0xFFFF);
- for(int idx = 0; idx < numberOfAttributeRecords; idx++)
- {
- Attribute anX = new Attribute();
- anX.unmarshal(buff);
- attributeRecords.add(anX);
- }
-
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ entityId.marshal(buff);
+ buff.putShort( (short)attributeRecords.size());
+
+ for(int idx = 0; idx < attributeRecords.size(); idx++)
+ {
+ Attribute aAttribute = attributeRecords.get(idx);
+ aAttribute.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ entityId.unmarshal(buff);
+ numberOfAttributeRecords = (short)(buff.getShort() & 0xFFFF);
+ for(int idx = 0; idx < numberOfAttributeRecords; idx++)
+ {
+ Attribute anX = new Attribute();
+ anX.unmarshal(buff);
+ attributeRecords.add(anX);
+ }
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final AttributeRecordSet rhs = (AttributeRecordSet)obj;
-
- if( ! (entityId.equals( rhs.entityId) )) ivarsEqual = false;
-
- for(int idx = 0; idx < attributeRecords.size(); idx++)
- if( ! ( attributeRecords.get(idx).equals(rhs.attributeRecords.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final AttributeRecordSet rhs = (AttributeRecordSet)obj;
+
+ if( ! (entityId.equals( rhs.entityId) )) ivarsEqual = false;
+
+ for(int idx = 0; idx < attributeRecords.size(); idx++)
+ if( ! ( attributeRecords.get(idx).equals(rhs.attributeRecords.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" entityId: ").append(entityId).append("\n");
- sb.append(" attributeRecords: ").append("\n");
- attributeRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" entityId: ").append(entityId).append("\n");
+ sb.append(" attributeRecords: ").append("\n");
+ attributeRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/BeamAntennaPattern.java b/src-generated/edu/nps/moves/dis7/BeamAntennaPattern.java
index 3690f14a82e42a4256a790faa1824d15f93e9314..75ce5797d2508fe6c8c343072a3cf4a6d42a2358 100644
--- a/src-generated/edu/nps/moves/dis7/BeamAntennaPattern.java
+++ b/src-generated/edu/nps/moves/dis7/BeamAntennaPattern.java
@@ -1,373 +1,373 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Used when the antenna pattern type field has a value of 1. Specifies the direction, pattern, and polarization of radiation from an antenna. Section 6.2.9.2
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class BeamAntennaPattern extends Object implements Serializable
-{
- /** The rotation that transforms the reference coordinate sytem into the beam coordinate system. Either world coordinates or entity coordinates may be used as the reference coordinate system, as specified by the reference system field of the antenna pattern record. */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Used when the antenna pattern type field has a value of 1. Specifies the direction, pattern, and polarization of radiation from an antenna. Section 6.2.9.2
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class BeamAntennaPattern extends Object implements Serializable
+{
+ /** The rotation that transforms the reference coordinate sytem into the beam coordinate system. Either world coordinates or entity coordinates may be used as the reference coordinate system, as specified by the reference system field of the antenna pattern record. */
protected EulerAngles beamDirection = new EulerAngles();
-
+
protected float azimuthBeamwidth = (float)0;
-
+
protected float elevationBeamwidth = (float)0;
-
- /** uid 168 */
+
+ /** uid 168 */
protected TransmitterAntennaPatternReferenceSystem referenceSystem = TransmitterAntennaPatternReferenceSystem.values()[0];
-
+
protected byte padding1 = (byte)0;
-
+
protected short padding2 = (short)0;
-
- /** This field shall specify the magnitude of the Z-component (in beam coordinates) of the Electrical field at some arbitrary single point in the main beam and in the far field of the antenna. */
+
+ /** This field shall specify the magnitude of the Z-component (in beam coordinates) of the Electrical field at some arbitrary single point in the main beam and in the far field of the antenna. */
protected float ez = (float)0.0;
-
- /** This field shall specify the magnitude of the X-component (in beam coordinates) of the Electri- cal field at some arbitrary single point in the main beam and in the far field of the antenna. */
+
+ /** This field shall specify the magnitude of the X-component (in beam coordinates) of the Electri- cal field at some arbitrary single point in the main beam and in the far field of the antenna. */
protected float ex = (float)0.0;
-
- /** This field shall specify the phase angle between EZ and EX in radians. If fully omni-direc- tional antenna is modeled using beam pattern type one, the omni-directional antenna shall be repre- sented by beam direction Euler angles psi, theta, and phi of zero, an azimuth beamwidth of 2PI, and an elevation beamwidth of PI */
+
+ /** This field shall specify the phase angle between EZ and EX in radians. If fully omni-direc- tional antenna is modeled using beam pattern type one, the omni-directional antenna shall be repre- sented by beam direction Euler angles psi, theta, and phi of zero, an azimuth beamwidth of 2PI, and an elevation beamwidth of PI */
protected float phase = (float)0.0;
-
- /** padding */
+
+ /** padding */
protected int padding3 = (int)0;
-
-
-/** Constructor */
- public BeamAntennaPattern()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public BeamAntennaPattern()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += beamDirection.getMarshalledSize();
+ marshalSize += 4; // azimuthBeamwidth
+ marshalSize += 4; // elevationBeamwidth
+ marshalSize += referenceSystem.getMarshalledSize();
+ marshalSize += 1; // padding1
+ marshalSize += 2; // padding2
+ marshalSize += 4; // ez
+ marshalSize += 4; // ex
+ marshalSize += 4; // phase
+ marshalSize += 4; // padding3
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link BeamAntennaPattern#beamDirection}*/
+public BeamAntennaPattern setBeamDirection(EulerAngles pBeamDirection)
{
- int marshalSize = 0;
-
- marshalSize += beamDirection.getMarshalledSize();
- marshalSize += 4; // azimuthBeamwidth
- marshalSize += 4; // elevationBeamwidth
- marshalSize += referenceSystem.getMarshalledSize();
- marshalSize += 1; // padding1
- marshalSize += 2; // padding2
- marshalSize += 4; // ez
- marshalSize += 4; // ex
- marshalSize += 4; // phase
- marshalSize += 4; // padding3
-
- return marshalSize;
-}
-
-
-/** Setter for {@link BeamAntennaPattern#beamDirection}*/
-public BeamAntennaPattern setBeamDirection(EulerAngles pBeamDirection)
-{
- beamDirection = pBeamDirection;
- return this;
-}
-
-/** Getter for {@link BeamAntennaPattern#beamDirection}*/
-public EulerAngles getBeamDirection()
+ beamDirection = pBeamDirection;
+ return this;
+}
+
+/** Getter for {@link BeamAntennaPattern#beamDirection}*/
+public EulerAngles getBeamDirection()
{
return beamDirection;
-}
-
-/** Setter for {@link BeamAntennaPattern#azimuthBeamwidth}*/
-public BeamAntennaPattern setAzimuthBeamwidth(float pAzimuthBeamwidth)
+}
+
+/** Setter for {@link BeamAntennaPattern#azimuthBeamwidth}*/
+public BeamAntennaPattern setAzimuthBeamwidth(float pAzimuthBeamwidth)
{
- azimuthBeamwidth = pAzimuthBeamwidth;
- return this;
-}
-
-/** Getter for {@link BeamAntennaPattern#azimuthBeamwidth}*/
-public float getAzimuthBeamwidth()
+ azimuthBeamwidth = pAzimuthBeamwidth;
+ return this;
+}
+
+/** Getter for {@link BeamAntennaPattern#azimuthBeamwidth}*/
+public float getAzimuthBeamwidth()
{
return azimuthBeamwidth;
-}
-
-/** Setter for {@link BeamAntennaPattern#elevationBeamwidth}*/
-public BeamAntennaPattern setElevationBeamwidth(float pElevationBeamwidth)
+}
+
+/** Setter for {@link BeamAntennaPattern#elevationBeamwidth}*/
+public BeamAntennaPattern setElevationBeamwidth(float pElevationBeamwidth)
{
- elevationBeamwidth = pElevationBeamwidth;
- return this;
-}
-
-/** Getter for {@link BeamAntennaPattern#elevationBeamwidth}*/
-public float getElevationBeamwidth()
+ elevationBeamwidth = pElevationBeamwidth;
+ return this;
+}
+
+/** Getter for {@link BeamAntennaPattern#elevationBeamwidth}*/
+public float getElevationBeamwidth()
{
return elevationBeamwidth;
-}
-
-/** Setter for {@link BeamAntennaPattern#referenceSystem}*/
-public BeamAntennaPattern setReferenceSystem(TransmitterAntennaPatternReferenceSystem pReferenceSystem)
+}
+
+/** Setter for {@link BeamAntennaPattern#referenceSystem}*/
+public BeamAntennaPattern setReferenceSystem(TransmitterAntennaPatternReferenceSystem pReferenceSystem)
{
- referenceSystem = pReferenceSystem;
- return this;
-}
-
-/** Getter for {@link BeamAntennaPattern#referenceSystem}*/
-public TransmitterAntennaPatternReferenceSystem getReferenceSystem()
+ referenceSystem = pReferenceSystem;
+ return this;
+}
+
+/** Getter for {@link BeamAntennaPattern#referenceSystem}*/
+public TransmitterAntennaPatternReferenceSystem getReferenceSystem()
{
return referenceSystem;
-}
-
-/** Setter for {@link BeamAntennaPattern#padding1}*/
-public BeamAntennaPattern setPadding1(byte pPadding1)
+}
+
+/** Setter for {@link BeamAntennaPattern#padding1}*/
+public BeamAntennaPattern setPadding1(byte pPadding1)
{
- padding1 = pPadding1;
- return this;
-}
-
-/** Getter for {@link BeamAntennaPattern#padding1}*/
-public byte getPadding1()
+ padding1 = pPadding1;
+ return this;
+}
+
+/** Getter for {@link BeamAntennaPattern#padding1}*/
+public byte getPadding1()
{
return padding1;
-}
-
-/** Setter for {@link BeamAntennaPattern#padding2}*/
-public BeamAntennaPattern setPadding2(short pPadding2)
+}
+
+/** Setter for {@link BeamAntennaPattern#padding2}*/
+public BeamAntennaPattern setPadding2(short pPadding2)
{
- padding2 = pPadding2;
- return this;
-}
-
-/** Getter for {@link BeamAntennaPattern#padding2}*/
-public short getPadding2()
+ padding2 = pPadding2;
+ return this;
+}
+
+/** Getter for {@link BeamAntennaPattern#padding2}*/
+public short getPadding2()
{
return padding2;
-}
-
-/** Setter for {@link BeamAntennaPattern#ez}*/
-public BeamAntennaPattern setEz(float pEz)
+}
+
+/** Setter for {@link BeamAntennaPattern#ez}*/
+public BeamAntennaPattern setEz(float pEz)
{
- ez = pEz;
- return this;
-}
-
-/** Getter for {@link BeamAntennaPattern#ez}*/
-public float getEz()
+ ez = pEz;
+ return this;
+}
+
+/** Getter for {@link BeamAntennaPattern#ez}*/
+public float getEz()
{
return ez;
-}
-
-/** Setter for {@link BeamAntennaPattern#ex}*/
-public BeamAntennaPattern setEx(float pEx)
+}
+
+/** Setter for {@link BeamAntennaPattern#ex}*/
+public BeamAntennaPattern setEx(float pEx)
{
- ex = pEx;
- return this;
-}
-
-/** Getter for {@link BeamAntennaPattern#ex}*/
-public float getEx()
+ ex = pEx;
+ return this;
+}
+
+/** Getter for {@link BeamAntennaPattern#ex}*/
+public float getEx()
{
return ex;
-}
-
-/** Setter for {@link BeamAntennaPattern#phase}*/
-public BeamAntennaPattern setPhase(float pPhase)
+}
+
+/** Setter for {@link BeamAntennaPattern#phase}*/
+public BeamAntennaPattern setPhase(float pPhase)
{
- phase = pPhase;
- return this;
-}
-
-/** Getter for {@link BeamAntennaPattern#phase}*/
-public float getPhase()
+ phase = pPhase;
+ return this;
+}
+
+/** Getter for {@link BeamAntennaPattern#phase}*/
+public float getPhase()
{
return phase;
-}
-
-/** Setter for {@link BeamAntennaPattern#padding3}*/
-public BeamAntennaPattern setPadding3(int pPadding3)
+}
+
+/** Setter for {@link BeamAntennaPattern#padding3}*/
+public BeamAntennaPattern setPadding3(int pPadding3)
{
- padding3 = pPadding3;
- return this;
-}
-
-/** Getter for {@link BeamAntennaPattern#padding3}*/
-public int getPadding3()
+ padding3 = pPadding3;
+ return this;
+}
+
+/** Getter for {@link BeamAntennaPattern#padding3}*/
+public int getPadding3()
{
return padding3;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- beamDirection.marshal(dos);
- dos.writeFloat(azimuthBeamwidth);
- dos.writeFloat(elevationBeamwidth);
- referenceSystem.marshal(dos);
- dos.writeByte(padding1);
- dos.writeShort(padding2);
- dos.writeFloat(ez);
- dos.writeFloat(ex);
- dos.writeFloat(phase);
- dos.writeInt(padding3);
+ {
+ beamDirection.marshal(dos);
+ dos.writeFloat(azimuthBeamwidth);
+ dos.writeFloat(elevationBeamwidth);
+ referenceSystem.marshal(dos);
+ dos.writeByte(padding1);
+ dos.writeShort(padding2);
+ dos.writeFloat(ez);
+ dos.writeFloat(ex);
+ dos.writeFloat(phase);
+ dos.writeInt(padding3);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- uPosition += beamDirection.unmarshal(dis);
- azimuthBeamwidth = dis.readFloat();
- uPosition += 4;
- elevationBeamwidth = dis.readFloat();
- uPosition += 4;
- referenceSystem = TransmitterAntennaPatternReferenceSystem.unmarshalEnum(dis);
- uPosition += referenceSystem.getMarshalledSize();
- padding1 = (byte)dis.readUnsignedByte();
- uPosition += 1;
- padding2 = (short)dis.readUnsignedShort();
- uPosition += 2;
- ez = dis.readFloat();
- uPosition += 4;
- ex = dis.readFloat();
- uPosition += 4;
- phase = dis.readFloat();
- uPosition += 4;
- padding3 = dis.readInt();
- uPosition += 4;
+ {
+ uPosition += beamDirection.unmarshal(dis);
+ azimuthBeamwidth = dis.readFloat();
+ uPosition += 4;
+ elevationBeamwidth = dis.readFloat();
+ uPosition += 4;
+ referenceSystem = TransmitterAntennaPatternReferenceSystem.unmarshalEnum(dis);
+ uPosition += referenceSystem.getMarshalledSize();
+ padding1 = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ padding2 = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ ez = dis.readFloat();
+ uPosition += 4;
+ ex = dis.readFloat();
+ uPosition += 4;
+ phase = dis.readFloat();
+ uPosition += 4;
+ padding3 = dis.readInt();
+ uPosition += 4;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- beamDirection.marshal(buff);
- buff.putFloat( (float)azimuthBeamwidth);
- buff.putFloat( (float)elevationBeamwidth);
- referenceSystem.marshal(buff);
- buff.put( (byte)padding1);
- buff.putShort( (short)padding2);
- buff.putFloat( (float)ez);
- buff.putFloat( (float)ex);
- buff.putFloat( (float)phase);
- buff.putInt( (int)padding3);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- beamDirection.unmarshal(buff);
- azimuthBeamwidth = buff.getFloat();
- elevationBeamwidth = buff.getFloat();
- referenceSystem = TransmitterAntennaPatternReferenceSystem.unmarshalEnum(buff);
- padding1 = (byte)(buff.get() & 0xFF);
- padding2 = (short)(buff.getShort() & 0xFFFF);
- ez = buff.getFloat();
- ex = buff.getFloat();
- phase = buff.getFloat();
- padding3 = buff.getInt();
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ beamDirection.marshal(buff);
+ buff.putFloat( (float)azimuthBeamwidth);
+ buff.putFloat( (float)elevationBeamwidth);
+ referenceSystem.marshal(buff);
+ buff.put( (byte)padding1);
+ buff.putShort( (short)padding2);
+ buff.putFloat( (float)ez);
+ buff.putFloat( (float)ex);
+ buff.putFloat( (float)phase);
+ buff.putInt( (int)padding3);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ beamDirection.unmarshal(buff);
+ azimuthBeamwidth = buff.getFloat();
+ elevationBeamwidth = buff.getFloat();
+ referenceSystem = TransmitterAntennaPatternReferenceSystem.unmarshalEnum(buff);
+ padding1 = (byte)(buff.get() & 0xFF);
+ padding2 = (short)(buff.getShort() & 0xFFFF);
+ ez = buff.getFloat();
+ ex = buff.getFloat();
+ phase = buff.getFloat();
+ padding3 = buff.getInt();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final BeamAntennaPattern rhs = (BeamAntennaPattern)obj;
-
- if( ! (beamDirection.equals( rhs.beamDirection) )) ivarsEqual = false;
- if( ! (azimuthBeamwidth == rhs.azimuthBeamwidth)) ivarsEqual = false;
- if( ! (elevationBeamwidth == rhs.elevationBeamwidth)) ivarsEqual = false;
- if( ! (referenceSystem == rhs.referenceSystem)) ivarsEqual = false;
- if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
- if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
- if( ! (ez == rhs.ez)) ivarsEqual = false;
- if( ! (ex == rhs.ex)) ivarsEqual = false;
- if( ! (phase == rhs.phase)) ivarsEqual = false;
- if( ! (padding3 == rhs.padding3)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final BeamAntennaPattern rhs = (BeamAntennaPattern)obj;
+
+ if( ! (beamDirection.equals( rhs.beamDirection) )) ivarsEqual = false;
+ if( ! (azimuthBeamwidth == rhs.azimuthBeamwidth)) ivarsEqual = false;
+ if( ! (elevationBeamwidth == rhs.elevationBeamwidth)) ivarsEqual = false;
+ if( ! (referenceSystem == rhs.referenceSystem)) ivarsEqual = false;
+ if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
+ if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
+ if( ! (ez == rhs.ez)) ivarsEqual = false;
+ if( ! (ex == rhs.ex)) ivarsEqual = false;
+ if( ! (phase == rhs.phase)) ivarsEqual = false;
+ if( ! (padding3 == rhs.padding3)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" beamDirection: ").append(beamDirection).append("\n");
- sb.append(" azimuthBeamwidth: ").append(azimuthBeamwidth).append("\n");
- sb.append(" elevationBeamwidth: ").append(elevationBeamwidth).append("\n");
- sb.append(" referenceSystem: ").append(referenceSystem).append("\n");
- sb.append(" padding1: ").append(padding1).append("\n");
- sb.append(" padding2: ").append(padding2).append("\n");
- sb.append(" ez: ").append(ez).append("\n");
- sb.append(" ex: ").append(ex).append("\n");
- sb.append(" phase: ").append(phase).append("\n");
- sb.append(" padding3: ").append(padding3).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" beamDirection: ").append(beamDirection).append("\n");
+ sb.append(" azimuthBeamwidth: ").append(azimuthBeamwidth).append("\n");
+ sb.append(" elevationBeamwidth: ").append(elevationBeamwidth).append("\n");
+ sb.append(" referenceSystem: ").append(referenceSystem).append("\n");
+ sb.append(" padding1: ").append(padding1).append("\n");
+ sb.append(" padding2: ").append(padding2).append("\n");
+ sb.append(" ez: ").append(ez).append("\n");
+ sb.append(" ex: ").append(ex).append("\n");
+ sb.append(" phase: ").append(phase).append("\n");
+ sb.append(" padding3: ").append(padding3).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/BeamData.java b/src-generated/edu/nps/moves/dis7/BeamData.java
index 7bbc6cc9facc6e5af00a2e4aef43d9dc0b53ac89..f22b6cf35e2e59ad9025c3dfa02d7d26fe5054cc 100644
--- a/src-generated/edu/nps/moves/dis7/BeamData.java
+++ b/src-generated/edu/nps/moves/dis7/BeamData.java
@@ -1,258 +1,258 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Describes the scan volue of an emitter beam. Section 6.2.11.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class BeamData extends Object implements Serializable
-{
- /** Specifies the beam azimuth an elevation centers and corresponding half-angles to describe the scan volume */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Describes the scan volue of an emitter beam. Section 6.2.11.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class BeamData extends Object implements Serializable
+{
+ /** Specifies the beam azimuth an elevation centers and corresponding half-angles to describe the scan volume */
protected float beamAzimuthCenter;
-
- /** Specifies the beam azimuth sweep to determine scan volume */
+
+ /** Specifies the beam azimuth sweep to determine scan volume */
protected float beamAzimuthSweep;
-
- /** Specifies the beam elevation center to determine scan volume */
+
+ /** Specifies the beam elevation center to determine scan volume */
protected float beamElevationCenter;
-
- /** Specifies the beam elevation sweep to determine scan volume */
+
+ /** Specifies the beam elevation sweep to determine scan volume */
protected float beamElevationSweep;
-
- /** allows receiver to synchronize its regenerated scan pattern to that of the emmitter. Specifies the percentage of time a scan is through its pattern from its origion. */
+
+ /** allows receiver to synchronize its regenerated scan pattern to that of the emmitter. Specifies the percentage of time a scan is through its pattern from its origion. */
protected float beamSweepSync;
-
-
-/** Constructor */
- public BeamData()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public BeamData()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 4; // beamAzimuthCenter
+ marshalSize += 4; // beamAzimuthSweep
+ marshalSize += 4; // beamElevationCenter
+ marshalSize += 4; // beamElevationSweep
+ marshalSize += 4; // beamSweepSync
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link BeamData#beamAzimuthCenter}*/
+public BeamData setBeamAzimuthCenter(float pBeamAzimuthCenter)
{
- int marshalSize = 0;
-
- marshalSize += 4; // beamAzimuthCenter
- marshalSize += 4; // beamAzimuthSweep
- marshalSize += 4; // beamElevationCenter
- marshalSize += 4; // beamElevationSweep
- marshalSize += 4; // beamSweepSync
-
- return marshalSize;
-}
-
-
-/** Setter for {@link BeamData#beamAzimuthCenter}*/
-public BeamData setBeamAzimuthCenter(float pBeamAzimuthCenter)
-{
- beamAzimuthCenter = pBeamAzimuthCenter;
- return this;
-}
-
-/** Getter for {@link BeamData#beamAzimuthCenter}*/
-public float getBeamAzimuthCenter()
+ beamAzimuthCenter = pBeamAzimuthCenter;
+ return this;
+}
+
+/** Getter for {@link BeamData#beamAzimuthCenter}*/
+public float getBeamAzimuthCenter()
{
return beamAzimuthCenter;
-}
-
-/** Setter for {@link BeamData#beamAzimuthSweep}*/
-public BeamData setBeamAzimuthSweep(float pBeamAzimuthSweep)
+}
+
+/** Setter for {@link BeamData#beamAzimuthSweep}*/
+public BeamData setBeamAzimuthSweep(float pBeamAzimuthSweep)
{
- beamAzimuthSweep = pBeamAzimuthSweep;
- return this;
-}
-
-/** Getter for {@link BeamData#beamAzimuthSweep}*/
-public float getBeamAzimuthSweep()
+ beamAzimuthSweep = pBeamAzimuthSweep;
+ return this;
+}
+
+/** Getter for {@link BeamData#beamAzimuthSweep}*/
+public float getBeamAzimuthSweep()
{
return beamAzimuthSweep;
-}
-
-/** Setter for {@link BeamData#beamElevationCenter}*/
-public BeamData setBeamElevationCenter(float pBeamElevationCenter)
+}
+
+/** Setter for {@link BeamData#beamElevationCenter}*/
+public BeamData setBeamElevationCenter(float pBeamElevationCenter)
{
- beamElevationCenter = pBeamElevationCenter;
- return this;
-}
-
-/** Getter for {@link BeamData#beamElevationCenter}*/
-public float getBeamElevationCenter()
+ beamElevationCenter = pBeamElevationCenter;
+ return this;
+}
+
+/** Getter for {@link BeamData#beamElevationCenter}*/
+public float getBeamElevationCenter()
{
return beamElevationCenter;
-}
-
-/** Setter for {@link BeamData#beamElevationSweep}*/
-public BeamData setBeamElevationSweep(float pBeamElevationSweep)
+}
+
+/** Setter for {@link BeamData#beamElevationSweep}*/
+public BeamData setBeamElevationSweep(float pBeamElevationSweep)
{
- beamElevationSweep = pBeamElevationSweep;
- return this;
-}
-
-/** Getter for {@link BeamData#beamElevationSweep}*/
-public float getBeamElevationSweep()
+ beamElevationSweep = pBeamElevationSweep;
+ return this;
+}
+
+/** Getter for {@link BeamData#beamElevationSweep}*/
+public float getBeamElevationSweep()
{
return beamElevationSweep;
-}
-
-/** Setter for {@link BeamData#beamSweepSync}*/
-public BeamData setBeamSweepSync(float pBeamSweepSync)
+}
+
+/** Setter for {@link BeamData#beamSweepSync}*/
+public BeamData setBeamSweepSync(float pBeamSweepSync)
{
- beamSweepSync = pBeamSweepSync;
- return this;
-}
-
-/** Getter for {@link BeamData#beamSweepSync}*/
-public float getBeamSweepSync()
+ beamSweepSync = pBeamSweepSync;
+ return this;
+}
+
+/** Getter for {@link BeamData#beamSweepSync}*/
+public float getBeamSweepSync()
{
return beamSweepSync;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeFloat(beamAzimuthCenter);
- dos.writeFloat(beamAzimuthSweep);
- dos.writeFloat(beamElevationCenter);
- dos.writeFloat(beamElevationSweep);
- dos.writeFloat(beamSweepSync);
+ {
+ dos.writeFloat(beamAzimuthCenter);
+ dos.writeFloat(beamAzimuthSweep);
+ dos.writeFloat(beamElevationCenter);
+ dos.writeFloat(beamElevationSweep);
+ dos.writeFloat(beamSweepSync);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- beamAzimuthCenter = dis.readFloat();
- uPosition += 4;
- beamAzimuthSweep = dis.readFloat();
- uPosition += 4;
- beamElevationCenter = dis.readFloat();
- uPosition += 4;
- beamElevationSweep = dis.readFloat();
- uPosition += 4;
- beamSweepSync = dis.readFloat();
- uPosition += 4;
+ {
+ beamAzimuthCenter = dis.readFloat();
+ uPosition += 4;
+ beamAzimuthSweep = dis.readFloat();
+ uPosition += 4;
+ beamElevationCenter = dis.readFloat();
+ uPosition += 4;
+ beamElevationSweep = dis.readFloat();
+ uPosition += 4;
+ beamSweepSync = dis.readFloat();
+ uPosition += 4;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putFloat( (float)beamAzimuthCenter);
- buff.putFloat( (float)beamAzimuthSweep);
- buff.putFloat( (float)beamElevationCenter);
- buff.putFloat( (float)beamElevationSweep);
- buff.putFloat( (float)beamSweepSync);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- beamAzimuthCenter = buff.getFloat();
- beamAzimuthSweep = buff.getFloat();
- beamElevationCenter = buff.getFloat();
- beamElevationSweep = buff.getFloat();
- beamSweepSync = buff.getFloat();
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putFloat( (float)beamAzimuthCenter);
+ buff.putFloat( (float)beamAzimuthSweep);
+ buff.putFloat( (float)beamElevationCenter);
+ buff.putFloat( (float)beamElevationSweep);
+ buff.putFloat( (float)beamSweepSync);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ beamAzimuthCenter = buff.getFloat();
+ beamAzimuthSweep = buff.getFloat();
+ beamElevationCenter = buff.getFloat();
+ beamElevationSweep = buff.getFloat();
+ beamSweepSync = buff.getFloat();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final BeamData rhs = (BeamData)obj;
-
- if( ! (beamAzimuthCenter == rhs.beamAzimuthCenter)) ivarsEqual = false;
- if( ! (beamAzimuthSweep == rhs.beamAzimuthSweep)) ivarsEqual = false;
- if( ! (beamElevationCenter == rhs.beamElevationCenter)) ivarsEqual = false;
- if( ! (beamElevationSweep == rhs.beamElevationSweep)) ivarsEqual = false;
- if( ! (beamSweepSync == rhs.beamSweepSync)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final BeamData rhs = (BeamData)obj;
+
+ if( ! (beamAzimuthCenter == rhs.beamAzimuthCenter)) ivarsEqual = false;
+ if( ! (beamAzimuthSweep == rhs.beamAzimuthSweep)) ivarsEqual = false;
+ if( ! (beamElevationCenter == rhs.beamElevationCenter)) ivarsEqual = false;
+ if( ! (beamElevationSweep == rhs.beamElevationSweep)) ivarsEqual = false;
+ if( ! (beamSweepSync == rhs.beamSweepSync)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" beamAzimuthCenter: ").append(beamAzimuthCenter).append("\n");
- sb.append(" beamAzimuthSweep: ").append(beamAzimuthSweep).append("\n");
- sb.append(" beamElevationCenter: ").append(beamElevationCenter).append("\n");
- sb.append(" beamElevationSweep: ").append(beamElevationSweep).append("\n");
- sb.append(" beamSweepSync: ").append(beamSweepSync).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" beamAzimuthCenter: ").append(beamAzimuthCenter).append("\n");
+ sb.append(" beamAzimuthSweep: ").append(beamAzimuthSweep).append("\n");
+ sb.append(" beamElevationCenter: ").append(beamElevationCenter).append("\n");
+ sb.append(" beamElevationSweep: ").append(beamElevationSweep).append("\n");
+ sb.append(" beamSweepSync: ").append(beamSweepSync).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/BeamStatus.java b/src-generated/edu/nps/moves/dis7/BeamStatus.java
index 486b290a1f4e39dbbd9dbfc1a6639c6d9d7aab52..ac5d3de9ae11645762ab553160b20b43cbd3eeff 100644
--- a/src-generated/edu/nps/moves/dis7/BeamStatus.java
+++ b/src-generated/edu/nps/moves/dis7/BeamStatus.java
@@ -1,162 +1,162 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Information related to the status of a beam. This is contained in the beam status field of the electromagnitec emission PDU. The first bit determines whether the beam is active (0) or deactivated (1). Section 6.2.12.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class BeamStatus extends Object implements Serializable
-{
- /** First bit zero means beam is active, first bit = 1 means deactivated. The rest is padding. 318 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Information related to the status of a beam. This is contained in the beam status field of the electromagnitec emission PDU. The first bit determines whether the beam is active (0) or deactivated (1). Section 6.2.12.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class BeamStatus extends Object implements Serializable
+{
+ /** First bit zero means beam is active, first bit = 1 means deactivated. The rest is padding. 318 */
protected BeamStatusBeamState beamState = BeamStatusBeamState.values()[0];
-
-
-/** Constructor */
- public BeamStatus()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public BeamStatus()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += beamState.getMarshalledSize();
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link BeamStatus#beamState}*/
+public BeamStatus setBeamState(BeamStatusBeamState pBeamState)
{
- int marshalSize = 0;
-
- marshalSize += beamState.getMarshalledSize();
-
- return marshalSize;
-}
-
-
-/** Setter for {@link BeamStatus#beamState}*/
-public BeamStatus setBeamState(BeamStatusBeamState pBeamState)
-{
- beamState = pBeamState;
- return this;
-}
-
-/** Getter for {@link BeamStatus#beamState}*/
-public BeamStatusBeamState getBeamState()
+ beamState = pBeamState;
+ return this;
+}
+
+/** Getter for {@link BeamStatus#beamState}*/
+public BeamStatusBeamState getBeamState()
{
return beamState;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- beamState.marshal(dos);
+ {
+ beamState.marshal(dos);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- beamState = BeamStatusBeamState.unmarshalEnum(dis);
- uPosition += beamState.getMarshalledSize();
+ {
+ beamState = BeamStatusBeamState.unmarshalEnum(dis);
+ uPosition += beamState.getMarshalledSize();
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- beamState.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- beamState = BeamStatusBeamState.unmarshalEnum(buff);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ beamState.marshal(buff);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ beamState = BeamStatusBeamState.unmarshalEnum(buff);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final BeamStatus rhs = (BeamStatus)obj;
-
- if( ! (beamState == rhs.beamState)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final BeamStatus rhs = (BeamStatus)obj;
+
+ if( ! (beamState == rhs.beamState)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" beamState: ").append(beamState).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" beamState: ").append(beamState).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/BlankingSector.java b/src-generated/edu/nps/moves/dis7/BlankingSector.java
index fdd1a6c30f6fa0d7ba61bc82c68c32a1e0064466..e29f37850ee2720db45d36c7a749d63aca804eef 100644
--- a/src-generated/edu/nps/moves/dis7/BlankingSector.java
+++ b/src-generated/edu/nps/moves/dis7/BlankingSector.java
@@ -1,438 +1,438 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * The Blanking Sector attribute record may be used to convey persistent areas within a scan volume where emitter power for a specific active emitter beam is reduced to an insignificant value. Section 6.2.21.2
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class BlankingSector extends Object implements Serializable
-{
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * The Blanking Sector attribute record may be used to convey persistent areas within a scan volume where emitter power for a specific active emitter beam is reduced to an insignificant value. Section 6.2.21.2
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class BlankingSector extends Object implements Serializable
+{
protected int recordType = (int)3500;
-
+
protected short recordLength = (short)40;
-
+
protected short padding = (short)0;
-
+
protected byte emitterNumber;
-
+
protected byte beamNumber;
-
- /** uid 300 */
+
+ /** uid 300 */
protected EEAttributeStateIndicator stateIndicator = EEAttributeStateIndicator.values()[0];
-
+
protected byte padding2 = (byte)0;
-
+
protected float leftAzimuth;
-
+
protected float rightAzimuth;
-
+
protected float lowerElevation;
-
+
protected float upperElevation;
-
+
protected float residualPower;
-
+
protected long padding3 = (long)0;
-
-
-/** Constructor */
- public BlankingSector()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += 4; // recordType
- marshalSize += 2; // recordLength
- marshalSize += 2; // padding
- marshalSize += 1; // emitterNumber
- marshalSize += 1; // beamNumber
- marshalSize += stateIndicator.getMarshalledSize();
- marshalSize += 1; // padding2
- marshalSize += 4; // leftAzimuth
- marshalSize += 4; // rightAzimuth
- marshalSize += 4; // lowerElevation
- marshalSize += 4; // upperElevation
- marshalSize += 4; // residualPower
- marshalSize += 8; // padding3
-
- return marshalSize;
-}
-
-
-/** Setter for {@link BlankingSector#recordType}*/
-public BlankingSector setRecordType(int pRecordType)
-{
- recordType = pRecordType;
- return this;
-}
-
-/** Getter for {@link BlankingSector#recordType}*/
-public int getRecordType()
+
+
+/** Constructor */
+ public BlankingSector()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 4; // recordType
+ marshalSize += 2; // recordLength
+ marshalSize += 2; // padding
+ marshalSize += 1; // emitterNumber
+ marshalSize += 1; // beamNumber
+ marshalSize += stateIndicator.getMarshalledSize();
+ marshalSize += 1; // padding2
+ marshalSize += 4; // leftAzimuth
+ marshalSize += 4; // rightAzimuth
+ marshalSize += 4; // lowerElevation
+ marshalSize += 4; // upperElevation
+ marshalSize += 4; // residualPower
+ marshalSize += 8; // padding3
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link BlankingSector#recordType}*/
+public BlankingSector setRecordType(int pRecordType)
+{
+ recordType = pRecordType;
+ return this;
+}
+
+/** Getter for {@link BlankingSector#recordType}*/
+public int getRecordType()
{
return recordType;
-}
-
-/** Setter for {@link BlankingSector#recordLength}*/
-public BlankingSector setRecordLength(short pRecordLength)
-{
- recordLength = pRecordLength;
- return this;
-}
-
-/** Getter for {@link BlankingSector#recordLength}*/
-public short getRecordLength()
+}
+
+/** Setter for {@link BlankingSector#recordLength}*/
+public BlankingSector setRecordLength(short pRecordLength)
+{
+ recordLength = pRecordLength;
+ return this;
+}
+
+/** Getter for {@link BlankingSector#recordLength}*/
+public short getRecordLength()
{
return recordLength;
-}
-
-/** Setter for {@link BlankingSector#padding}*/
-public BlankingSector setPadding(short pPadding)
-{
- padding = pPadding;
- return this;
-}
-
-/** Getter for {@link BlankingSector#padding}*/
-public short getPadding()
+}
+
+/** Setter for {@link BlankingSector#padding}*/
+public BlankingSector setPadding(short pPadding)
+{
+ padding = pPadding;
+ return this;
+}
+
+/** Getter for {@link BlankingSector#padding}*/
+public short getPadding()
{
return padding;
-}
-
-/** Setter for {@link BlankingSector#emitterNumber}*/
-public BlankingSector setEmitterNumber(byte pEmitterNumber)
-{
- emitterNumber = pEmitterNumber;
- return this;
-}
-
-/** Getter for {@link BlankingSector#emitterNumber}*/
-public byte getEmitterNumber()
+}
+
+/** Setter for {@link BlankingSector#emitterNumber}*/
+public BlankingSector setEmitterNumber(byte pEmitterNumber)
+{
+ emitterNumber = pEmitterNumber;
+ return this;
+}
+
+/** Getter for {@link BlankingSector#emitterNumber}*/
+public byte getEmitterNumber()
{
return emitterNumber;
-}
-
-/** Setter for {@link BlankingSector#beamNumber}*/
-public BlankingSector setBeamNumber(byte pBeamNumber)
-{
- beamNumber = pBeamNumber;
- return this;
-}
-
-/** Getter for {@link BlankingSector#beamNumber}*/
-public byte getBeamNumber()
+}
+
+/** Setter for {@link BlankingSector#beamNumber}*/
+public BlankingSector setBeamNumber(byte pBeamNumber)
+{
+ beamNumber = pBeamNumber;
+ return this;
+}
+
+/** Getter for {@link BlankingSector#beamNumber}*/
+public byte getBeamNumber()
{
return beamNumber;
-}
-
-/** Setter for {@link BlankingSector#stateIndicator}*/
-public BlankingSector setStateIndicator(EEAttributeStateIndicator pStateIndicator)
-{
- stateIndicator = pStateIndicator;
- return this;
-}
-
-/** Getter for {@link BlankingSector#stateIndicator}*/
-public EEAttributeStateIndicator getStateIndicator()
+}
+
+/** Setter for {@link BlankingSector#stateIndicator}*/
+public BlankingSector setStateIndicator(EEAttributeStateIndicator pStateIndicator)
+{
+ stateIndicator = pStateIndicator;
+ return this;
+}
+
+/** Getter for {@link BlankingSector#stateIndicator}*/
+public EEAttributeStateIndicator getStateIndicator()
{
return stateIndicator;
-}
-
-/** Setter for {@link BlankingSector#padding2}*/
-public BlankingSector setPadding2(byte pPadding2)
-{
- padding2 = pPadding2;
- return this;
-}
-
-/** Getter for {@link BlankingSector#padding2}*/
-public byte getPadding2()
+}
+
+/** Setter for {@link BlankingSector#padding2}*/
+public BlankingSector setPadding2(byte pPadding2)
+{
+ padding2 = pPadding2;
+ return this;
+}
+
+/** Getter for {@link BlankingSector#padding2}*/
+public byte getPadding2()
{
return padding2;
-}
-
-/** Setter for {@link BlankingSector#leftAzimuth}*/
-public BlankingSector setLeftAzimuth(float pLeftAzimuth)
-{
- leftAzimuth = pLeftAzimuth;
- return this;
-}
-
-/** Getter for {@link BlankingSector#leftAzimuth}*/
-public float getLeftAzimuth()
+}
+
+/** Setter for {@link BlankingSector#leftAzimuth}*/
+public BlankingSector setLeftAzimuth(float pLeftAzimuth)
+{
+ leftAzimuth = pLeftAzimuth;
+ return this;
+}
+
+/** Getter for {@link BlankingSector#leftAzimuth}*/
+public float getLeftAzimuth()
{
return leftAzimuth;
-}
-
-/** Setter for {@link BlankingSector#rightAzimuth}*/
-public BlankingSector setRightAzimuth(float pRightAzimuth)
-{
- rightAzimuth = pRightAzimuth;
- return this;
-}
-
-/** Getter for {@link BlankingSector#rightAzimuth}*/
-public float getRightAzimuth()
+}
+
+/** Setter for {@link BlankingSector#rightAzimuth}*/
+public BlankingSector setRightAzimuth(float pRightAzimuth)
+{
+ rightAzimuth = pRightAzimuth;
+ return this;
+}
+
+/** Getter for {@link BlankingSector#rightAzimuth}*/
+public float getRightAzimuth()
{
return rightAzimuth;
-}
-
-/** Setter for {@link BlankingSector#lowerElevation}*/
-public BlankingSector setLowerElevation(float pLowerElevation)
-{
- lowerElevation = pLowerElevation;
- return this;
-}
-
-/** Getter for {@link BlankingSector#lowerElevation}*/
-public float getLowerElevation()
+}
+
+/** Setter for {@link BlankingSector#lowerElevation}*/
+public BlankingSector setLowerElevation(float pLowerElevation)
+{
+ lowerElevation = pLowerElevation;
+ return this;
+}
+
+/** Getter for {@link BlankingSector#lowerElevation}*/
+public float getLowerElevation()
{
return lowerElevation;
-}
-
-/** Setter for {@link BlankingSector#upperElevation}*/
-public BlankingSector setUpperElevation(float pUpperElevation)
-{
- upperElevation = pUpperElevation;
- return this;
-}
-
-/** Getter for {@link BlankingSector#upperElevation}*/
-public float getUpperElevation()
+}
+
+/** Setter for {@link BlankingSector#upperElevation}*/
+public BlankingSector setUpperElevation(float pUpperElevation)
+{
+ upperElevation = pUpperElevation;
+ return this;
+}
+
+/** Getter for {@link BlankingSector#upperElevation}*/
+public float getUpperElevation()
{
return upperElevation;
-}
-
-/** Setter for {@link BlankingSector#residualPower}*/
-public BlankingSector setResidualPower(float pResidualPower)
-{
- residualPower = pResidualPower;
- return this;
-}
-
-/** Getter for {@link BlankingSector#residualPower}*/
-public float getResidualPower()
+}
+
+/** Setter for {@link BlankingSector#residualPower}*/
+public BlankingSector setResidualPower(float pResidualPower)
+{
+ residualPower = pResidualPower;
+ return this;
+}
+
+/** Getter for {@link BlankingSector#residualPower}*/
+public float getResidualPower()
{
return residualPower;
-}
-
-/** Setter for {@link BlankingSector#padding3}*/
-public BlankingSector setPadding3(long pPadding3)
-{
- padding3 = pPadding3;
- return this;
-}
-
-/** Getter for {@link BlankingSector#padding3}*/
-public long getPadding3()
+}
+
+/** Setter for {@link BlankingSector#padding3}*/
+public BlankingSector setPadding3(long pPadding3)
+{
+ padding3 = pPadding3;
+ return this;
+}
+
+/** Getter for {@link BlankingSector#padding3}*/
+public long getPadding3()
{
return padding3;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeInt(recordType);
- dos.writeShort(recordLength);
- dos.writeShort(padding);
- dos.writeByte(emitterNumber);
- dos.writeByte(beamNumber);
- stateIndicator.marshal(dos);
- dos.writeByte(padding2);
- dos.writeFloat(leftAzimuth);
- dos.writeFloat(rightAzimuth);
- dos.writeFloat(lowerElevation);
- dos.writeFloat(upperElevation);
- dos.writeFloat(residualPower);
- dos.writeLong(padding3);
+ {
+ dos.writeInt(recordType);
+ dos.writeShort(recordLength);
+ dos.writeShort(padding);
+ dos.writeByte(emitterNumber);
+ dos.writeByte(beamNumber);
+ stateIndicator.marshal(dos);
+ dos.writeByte(padding2);
+ dos.writeFloat(leftAzimuth);
+ dos.writeFloat(rightAzimuth);
+ dos.writeFloat(lowerElevation);
+ dos.writeFloat(upperElevation);
+ dos.writeFloat(residualPower);
+ dos.writeLong(padding3);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- recordType = dis.readInt();
- uPosition += 4;
- recordLength = (short)dis.readUnsignedShort();
- uPosition += 2;
- padding = (short)dis.readUnsignedShort();
- uPosition += 2;
- emitterNumber = (byte)dis.readUnsignedByte();
- uPosition += 1;
- beamNumber = (byte)dis.readUnsignedByte();
- uPosition += 1;
- stateIndicator = EEAttributeStateIndicator.unmarshalEnum(dis);
- uPosition += stateIndicator.getMarshalledSize();
- padding2 = (byte)dis.readUnsignedByte();
- uPosition += 1;
- leftAzimuth = dis.readFloat();
- uPosition += 4;
- rightAzimuth = dis.readFloat();
- uPosition += 4;
- lowerElevation = dis.readFloat();
- uPosition += 4;
- upperElevation = dis.readFloat();
- uPosition += 4;
- residualPower = dis.readFloat();
- uPosition += 4;
- padding3 = dis.readLong();
- uPosition += 4;
+ {
+ recordType = dis.readInt();
+ uPosition += 4;
+ recordLength = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ padding = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ emitterNumber = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ beamNumber = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ stateIndicator = EEAttributeStateIndicator.unmarshalEnum(dis);
+ uPosition += stateIndicator.getMarshalledSize();
+ padding2 = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ leftAzimuth = dis.readFloat();
+ uPosition += 4;
+ rightAzimuth = dis.readFloat();
+ uPosition += 4;
+ lowerElevation = dis.readFloat();
+ uPosition += 4;
+ upperElevation = dis.readFloat();
+ uPosition += 4;
+ residualPower = dis.readFloat();
+ uPosition += 4;
+ padding3 = dis.readLong();
+ uPosition += 4;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putInt( (int)recordType);
- buff.putShort( (short)recordLength);
- buff.putShort( (short)padding);
- buff.put( (byte)emitterNumber);
- buff.put( (byte)beamNumber);
- stateIndicator.marshal(buff);
- buff.put( (byte)padding2);
- buff.putFloat( (float)leftAzimuth);
- buff.putFloat( (float)rightAzimuth);
- buff.putFloat( (float)lowerElevation);
- buff.putFloat( (float)upperElevation);
- buff.putFloat( (float)residualPower);
- buff.putLong( (long)padding3);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- recordType = buff.getInt();
- recordLength = (short)(buff.getShort() & 0xFFFF);
- padding = (short)(buff.getShort() & 0xFFFF);
- emitterNumber = (byte)(buff.get() & 0xFF);
- beamNumber = (byte)(buff.get() & 0xFF);
- stateIndicator = EEAttributeStateIndicator.unmarshalEnum(buff);
- padding2 = (byte)(buff.get() & 0xFF);
- leftAzimuth = buff.getFloat();
- rightAzimuth = buff.getFloat();
- lowerElevation = buff.getFloat();
- upperElevation = buff.getFloat();
- residualPower = buff.getFloat();
- padding3 = buff.getLong();
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putInt( (int)recordType);
+ buff.putShort( (short)recordLength);
+ buff.putShort( (short)padding);
+ buff.put( (byte)emitterNumber);
+ buff.put( (byte)beamNumber);
+ stateIndicator.marshal(buff);
+ buff.put( (byte)padding2);
+ buff.putFloat( (float)leftAzimuth);
+ buff.putFloat( (float)rightAzimuth);
+ buff.putFloat( (float)lowerElevation);
+ buff.putFloat( (float)upperElevation);
+ buff.putFloat( (float)residualPower);
+ buff.putLong( (long)padding3);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ recordType = buff.getInt();
+ recordLength = (short)(buff.getShort() & 0xFFFF);
+ padding = (short)(buff.getShort() & 0xFFFF);
+ emitterNumber = (byte)(buff.get() & 0xFF);
+ beamNumber = (byte)(buff.get() & 0xFF);
+ stateIndicator = EEAttributeStateIndicator.unmarshalEnum(buff);
+ padding2 = (byte)(buff.get() & 0xFF);
+ leftAzimuth = buff.getFloat();
+ rightAzimuth = buff.getFloat();
+ lowerElevation = buff.getFloat();
+ upperElevation = buff.getFloat();
+ residualPower = buff.getFloat();
+ padding3 = buff.getLong();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final BlankingSector rhs = (BlankingSector)obj;
-
- if( ! (recordType == rhs.recordType)) ivarsEqual = false;
- if( ! (recordLength == rhs.recordLength)) ivarsEqual = false;
- if( ! (padding == rhs.padding)) ivarsEqual = false;
- if( ! (emitterNumber == rhs.emitterNumber)) ivarsEqual = false;
- if( ! (beamNumber == rhs.beamNumber)) ivarsEqual = false;
- if( ! (stateIndicator == rhs.stateIndicator)) ivarsEqual = false;
- if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
- if( ! (leftAzimuth == rhs.leftAzimuth)) ivarsEqual = false;
- if( ! (rightAzimuth == rhs.rightAzimuth)) ivarsEqual = false;
- if( ! (lowerElevation == rhs.lowerElevation)) ivarsEqual = false;
- if( ! (upperElevation == rhs.upperElevation)) ivarsEqual = false;
- if( ! (residualPower == rhs.residualPower)) ivarsEqual = false;
- if( ! (padding3 == rhs.padding3)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final BlankingSector rhs = (BlankingSector)obj;
+
+ if( ! (recordType == rhs.recordType)) ivarsEqual = false;
+ if( ! (recordLength == rhs.recordLength)) ivarsEqual = false;
+ if( ! (padding == rhs.padding)) ivarsEqual = false;
+ if( ! (emitterNumber == rhs.emitterNumber)) ivarsEqual = false;
+ if( ! (beamNumber == rhs.beamNumber)) ivarsEqual = false;
+ if( ! (stateIndicator == rhs.stateIndicator)) ivarsEqual = false;
+ if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
+ if( ! (leftAzimuth == rhs.leftAzimuth)) ivarsEqual = false;
+ if( ! (rightAzimuth == rhs.rightAzimuth)) ivarsEqual = false;
+ if( ! (lowerElevation == rhs.lowerElevation)) ivarsEqual = false;
+ if( ! (upperElevation == rhs.upperElevation)) ivarsEqual = false;
+ if( ! (residualPower == rhs.residualPower)) ivarsEqual = false;
+ if( ! (padding3 == rhs.padding3)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" recordType: ").append(recordType).append("\n");
- sb.append(" recordLength: ").append(recordLength).append("\n");
- sb.append(" padding: ").append(padding).append("\n");
- sb.append(" emitterNumber: ").append(emitterNumber).append("\n");
- sb.append(" beamNumber: ").append(beamNumber).append("\n");
- sb.append(" stateIndicator: ").append(stateIndicator).append("\n");
- sb.append(" padding2: ").append(padding2).append("\n");
- sb.append(" leftAzimuth: ").append(leftAzimuth).append("\n");
- sb.append(" rightAzimuth: ").append(rightAzimuth).append("\n");
- sb.append(" lowerElevation: ").append(lowerElevation).append("\n");
- sb.append(" upperElevation: ").append(upperElevation).append("\n");
- sb.append(" residualPower: ").append(residualPower).append("\n");
- sb.append(" padding3: ").append(padding3).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" recordType: ").append(recordType).append("\n");
+ sb.append(" recordLength: ").append(recordLength).append("\n");
+ sb.append(" padding: ").append(padding).append("\n");
+ sb.append(" emitterNumber: ").append(emitterNumber).append("\n");
+ sb.append(" beamNumber: ").append(beamNumber).append("\n");
+ sb.append(" stateIndicator: ").append(stateIndicator).append("\n");
+ sb.append(" padding2: ").append(padding2).append("\n");
+ sb.append(" leftAzimuth: ").append(leftAzimuth).append("\n");
+ sb.append(" rightAzimuth: ").append(rightAzimuth).append("\n");
+ sb.append(" lowerElevation: ").append(lowerElevation).append("\n");
+ sb.append(" upperElevation: ").append(upperElevation).append("\n");
+ sb.append(" residualPower: ").append(residualPower).append("\n");
+ sb.append(" padding3: ").append(padding3).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ChangeOptions.java b/src-generated/edu/nps/moves/dis7/ChangeOptions.java
index 60524fe4377a416d2ab83d478af2f39083affe2b..ab93a6430f78bda04f961d0b27e069aacfc11c88 100644
--- a/src-generated/edu/nps/moves/dis7/ChangeOptions.java
+++ b/src-generated/edu/nps/moves/dis7/ChangeOptions.java
@@ -1,161 +1,161 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * This is a bitfield . See section 6.2.13 aka B.2.41
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class ChangeOptions extends Object implements Serializable
-{
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * This is a bitfield . See section 6.2.13 aka B.2.41
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class ChangeOptions extends Object implements Serializable
+{
protected byte value;
-
-
-/** Constructor */
- public ChangeOptions()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public ChangeOptions()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 1; // value
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link ChangeOptions#value}*/
+public ChangeOptions setValue(byte pValue)
{
- int marshalSize = 0;
-
- marshalSize += 1; // value
-
- return marshalSize;
-}
-
-
-/** Setter for {@link ChangeOptions#value}*/
-public ChangeOptions setValue(byte pValue)
-{
- value = pValue;
- return this;
-}
-
-/** Getter for {@link ChangeOptions#value}*/
-public byte getValue()
+ value = pValue;
+ return this;
+}
+
+/** Getter for {@link ChangeOptions#value}*/
+public byte getValue()
{
return value;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeByte(value);
+ {
+ dos.writeByte(value);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- value = (byte)dis.readUnsignedByte();
- uPosition += 1;
+ {
+ value = (byte)dis.readUnsignedByte();
+ uPosition += 1;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.put( (byte)value);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- value = (byte)(buff.get() & 0xFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.put( (byte)value);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ value = (byte)(buff.get() & 0xFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final ChangeOptions rhs = (ChangeOptions)obj;
-
- if( ! (value == rhs.value)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final ChangeOptions rhs = (ChangeOptions)obj;
+
+ if( ! (value == rhs.value)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" value: ").append(value).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" value: ").append(value).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ClockTime.java b/src-generated/edu/nps/moves/dis7/ClockTime.java
index 380dc66e9a8fa790325db6076a5b8d9f34de6226..bab00ddf0a2f225ff9329c2f13e5a0a3cc09b190 100644
--- a/src-generated/edu/nps/moves/dis7/ClockTime.java
+++ b/src-generated/edu/nps/moves/dis7/ClockTime.java
@@ -1,186 +1,186 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Time measurements that exceed one hour are represented by this record. The first field is the hours since the unix epoch (Jan 1 1970, used by most Unix systems and java) and the second field the timestamp units since the top of the hour. Section 6.2.14
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class ClockTime extends Object implements Serializable
-{
- /** Hours in UTC */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Time measurements that exceed one hour are represented by this record. The first field is the hours since the unix epoch (Jan 1 1970, used by most Unix systems and java) and the second field the timestamp units since the top of the hour. Section 6.2.14
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class ClockTime extends Object implements Serializable
+{
+ /** Hours in UTC */
protected int hour;
-
- /** Time past the hour */
+
+ /** Time past the hour */
protected int timePastHour;
-
-
-/** Constructor */
- public ClockTime()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += 4; // hour
- marshalSize += 4; // timePastHour
-
- return marshalSize;
-}
-
-
-/** Setter for {@link ClockTime#hour}*/
-public ClockTime setHour(int pHour)
+
+
+/** Constructor */
+ public ClockTime()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 4; // hour
+ marshalSize += 4; // timePastHour
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link ClockTime#hour}*/
+public ClockTime setHour(int pHour)
{
- hour = pHour;
- return this;
-}
-
-/** Getter for {@link ClockTime#hour}*/
-public int getHour()
+ hour = pHour;
+ return this;
+}
+
+/** Getter for {@link ClockTime#hour}*/
+public int getHour()
{
return hour;
-}
-
-/** Setter for {@link ClockTime#timePastHour}*/
-public ClockTime setTimePastHour(int pTimePastHour)
+}
+
+/** Setter for {@link ClockTime#timePastHour}*/
+public ClockTime setTimePastHour(int pTimePastHour)
{
- timePastHour = pTimePastHour;
- return this;
-}
-
-/** Getter for {@link ClockTime#timePastHour}*/
-public int getTimePastHour()
+ timePastHour = pTimePastHour;
+ return this;
+}
+
+/** Getter for {@link ClockTime#timePastHour}*/
+public int getTimePastHour()
{
return timePastHour;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeInt(hour);
- dos.writeInt(timePastHour);
+ {
+ dos.writeInt(hour);
+ dos.writeInt(timePastHour);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- hour = dis.readInt();
- uPosition += 4;
- timePastHour = dis.readInt();
- uPosition += 4;
+ {
+ hour = dis.readInt();
+ uPosition += 4;
+ timePastHour = dis.readInt();
+ uPosition += 4;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putInt( (int)hour);
- buff.putInt( (int)timePastHour);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- hour = buff.getInt();
- timePastHour = buff.getInt();
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putInt( (int)hour);
+ buff.putInt( (int)timePastHour);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ hour = buff.getInt();
+ timePastHour = buff.getInt();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final ClockTime rhs = (ClockTime)obj;
-
- if( ! (hour == rhs.hour)) ivarsEqual = false;
- if( ! (timePastHour == rhs.timePastHour)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final ClockTime rhs = (ClockTime)obj;
+
+ if( ! (hour == rhs.hour)) ivarsEqual = false;
+ if( ! (timePastHour == rhs.timePastHour)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" hour: ").append(hour).append("\n");
- sb.append(" timePastHour: ").append(timePastHour).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" hour: ").append(hour).append("\n");
+ sb.append(" timePastHour: ").append(timePastHour).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/CollisionElasticPdu.java b/src-generated/edu/nps/moves/dis7/CollisionElasticPdu.java
index f127d06c86f67354aaf31a69597300dbe4a87883..adbb30e4813635cc50ad59267d39e1fe04f1aaf5 100644
--- a/src-generated/edu/nps/moves/dis7/CollisionElasticPdu.java
+++ b/src-generated/edu/nps/moves/dis7/CollisionElasticPdu.java
@@ -1,495 +1,495 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 7.2.4 Information about elastic collisions in a DIS exercise shall be communicated using a Collision-Elastic PDU. See 5.3.4.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class CollisionElasticPdu extends EntityInformationFamilyPdu implements Serializable
-{
- /** This field shall identify the entity that is issuing the PDU and shall be represented by an Entity Identifier record (see 6.2.28) */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 7.2.4 Information about elastic collisions in a DIS exercise shall be communicated using a Collision-Elastic PDU. See 5.3.4.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class CollisionElasticPdu extends EntityInformationFamilyPdu implements Serializable
+{
+ /** This field shall identify the entity that is issuing the PDU and shall be represented by an Entity Identifier record (see 6.2.28) */
protected EntityID issuingEntityID = new EntityID();
-
- /** This field shall identify the entity that has collided with the issuing entity. This field shall be a valid identifier of an entity or server capable of responding to the receipt of this Collision-Elastic PDU. This field shall be represented by an Entity Identifier record (see 6.2.28). */
+
+ /** This field shall identify the entity that has collided with the issuing entity. This field shall be a valid identifier of an entity or server capable of responding to the receipt of this Collision-Elastic PDU. This field shall be represented by an Entity Identifier record (see 6.2.28). */
protected EntityID collidingEntityID = new EntityID();
-
- /** This field shall contain an identification generated by the issuing simulation application to associate related collision events. This field shall be represented by an Event Identifier record (see 6.2.34). */
+
+ /** This field shall contain an identification generated by the issuing simulation application to associate related collision events. This field shall be represented by an Event Identifier record (see 6.2.34). */
protected EventIdentifier collisionEventID = new EventIdentifier();
-
- /** some padding */
+
+ /** some padding */
protected short pad = (short)0;
-
- /** This field shall contain the velocity at the time the collision is detected at the point the collision is detected. The velocity shall be represented in world coordinates. This field shall be represented by the Linear Velocity Vector record [see 6.2.95 item c)] */
+
+ /** This field shall contain the velocity at the time the collision is detected at the point the collision is detected. The velocity shall be represented in world coordinates. This field shall be represented by the Linear Velocity Vector record [see 6.2.95 item c)] */
protected Vector3Float contactVelocity = new Vector3Float();
-
- /** This field shall contain the mass of the issuing entity and shall be represented by a 32-bit floating point number representing kilograms */
+
+ /** This field shall contain the mass of the issuing entity and shall be represented by a 32-bit floating point number representing kilograms */
protected float mass;
-
- /** This field shall specify the location of the collision with respect to the entity with which the issuing entity collided. This field shall be represented by an Entity Coordinate Vector record [see 6.2.95 item a)]. */
+
+ /** This field shall specify the location of the collision with respect to the entity with which the issuing entity collided. This field shall be represented by an Entity Coordinate Vector record [see 6.2.95 item a)]. */
protected Vector3Float locationOfImpact = new Vector3Float();
-
- /** These six records represent the six independent components of a positive semi-definite matrix formed by pre-multiplying and post-multiplying the tensor of inertia, by the anti-symmetric matrix generated by the moment arm, and shall be represented by 32-bit floating point numbers (see 5.3.4.4) */
+
+ /** These six records represent the six independent components of a positive semi-definite matrix formed by pre-multiplying and post-multiplying the tensor of inertia, by the anti-symmetric matrix generated by the moment arm, and shall be represented by 32-bit floating point numbers (see 5.3.4.4) */
protected float collisionIntermediateResultXX;
-
- /** tensor values */
+
+ /** tensor values */
protected float collisionIntermediateResultXY;
-
- /** tensor values */
+
+ /** tensor values */
protected float collisionIntermediateResultXZ;
-
- /** tensor values */
+
+ /** tensor values */
protected float collisionIntermediateResultYY;
-
- /** tensor values */
+
+ /** tensor values */
protected float collisionIntermediateResultYZ;
-
- /** tensor values */
+
+ /** tensor values */
protected float collisionIntermediateResultZZ;
-
- /** This record shall represent the normal vector to the surface at the point of collision detection. The surface normal shall be represented in world coordinates. This field shall be represented by an Entity Coordinate Vector record [see 6.2.95 item a)]. */
+
+ /** This record shall represent the normal vector to the surface at the point of collision detection. The surface normal shall be represented in world coordinates. This field shall be represented by an Entity Coordinate Vector record [see 6.2.95 item a)]. */
protected Vector3Float unitSurfaceNormal = new Vector3Float();
-
- /** This field shall represent the degree to which energy is conserved in a collision and shall be represented by a 32-bit floating point number. In addition, it represents a free parameter by which simulation application developers may "tune" their collision interactions. */
+
+ /** This field shall represent the degree to which energy is conserved in a collision and shall be represented by a 32-bit floating point number. In addition, it represents a free parameter by which simulation application developers may "tune" their collision interactions. */
protected float coefficientOfRestitution;
-
-
-/** Constructor */
- public CollisionElasticPdu()
- {
- setPduType( DISPDUType.COLLISION_ELASTIC );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += issuingEntityID.getMarshalledSize();
- marshalSize += collidingEntityID.getMarshalledSize();
- marshalSize += collisionEventID.getMarshalledSize();
- marshalSize += 2; // pad
- marshalSize += contactVelocity.getMarshalledSize();
- marshalSize += 4; // mass
- marshalSize += locationOfImpact.getMarshalledSize();
- marshalSize += 4; // collisionIntermediateResultXX
- marshalSize += 4; // collisionIntermediateResultXY
- marshalSize += 4; // collisionIntermediateResultXZ
- marshalSize += 4; // collisionIntermediateResultYY
- marshalSize += 4; // collisionIntermediateResultYZ
- marshalSize += 4; // collisionIntermediateResultZZ
- marshalSize += unitSurfaceNormal.getMarshalledSize();
- marshalSize += 4; // coefficientOfRestitution
-
- return marshalSize;
-}
-
-
-/** Setter for {@link CollisionElasticPdu#issuingEntityID}*/
-public CollisionElasticPdu setIssuingEntityID(EntityID pIssuingEntityID)
-{
- issuingEntityID = pIssuingEntityID;
- return this;
-}
-
-/** Getter for {@link CollisionElasticPdu#issuingEntityID}*/
-public EntityID getIssuingEntityID()
+
+
+/** Constructor */
+ public CollisionElasticPdu()
+ {
+ setPduType( DISPDUType.COLLISION_ELASTIC );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += issuingEntityID.getMarshalledSize();
+ marshalSize += collidingEntityID.getMarshalledSize();
+ marshalSize += collisionEventID.getMarshalledSize();
+ marshalSize += 2; // pad
+ marshalSize += contactVelocity.getMarshalledSize();
+ marshalSize += 4; // mass
+ marshalSize += locationOfImpact.getMarshalledSize();
+ marshalSize += 4; // collisionIntermediateResultXX
+ marshalSize += 4; // collisionIntermediateResultXY
+ marshalSize += 4; // collisionIntermediateResultXZ
+ marshalSize += 4; // collisionIntermediateResultYY
+ marshalSize += 4; // collisionIntermediateResultYZ
+ marshalSize += 4; // collisionIntermediateResultZZ
+ marshalSize += unitSurfaceNormal.getMarshalledSize();
+ marshalSize += 4; // coefficientOfRestitution
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link CollisionElasticPdu#issuingEntityID}*/
+public CollisionElasticPdu setIssuingEntityID(EntityID pIssuingEntityID)
+{
+ issuingEntityID = pIssuingEntityID;
+ return this;
+}
+
+/** Getter for {@link CollisionElasticPdu#issuingEntityID}*/
+public EntityID getIssuingEntityID()
{
return issuingEntityID;
-}
-
-/** Setter for {@link CollisionElasticPdu#collidingEntityID}*/
-public CollisionElasticPdu setCollidingEntityID(EntityID pCollidingEntityID)
-{
- collidingEntityID = pCollidingEntityID;
- return this;
-}
-
-/** Getter for {@link CollisionElasticPdu#collidingEntityID}*/
-public EntityID getCollidingEntityID()
+}
+
+/** Setter for {@link CollisionElasticPdu#collidingEntityID}*/
+public CollisionElasticPdu setCollidingEntityID(EntityID pCollidingEntityID)
+{
+ collidingEntityID = pCollidingEntityID;
+ return this;
+}
+
+/** Getter for {@link CollisionElasticPdu#collidingEntityID}*/
+public EntityID getCollidingEntityID()
{
return collidingEntityID;
-}
-
-/** Setter for {@link CollisionElasticPdu#collisionEventID}*/
-public CollisionElasticPdu setCollisionEventID(EventIdentifier pCollisionEventID)
-{
- collisionEventID = pCollisionEventID;
- return this;
-}
-
-/** Getter for {@link CollisionElasticPdu#collisionEventID}*/
-public EventIdentifier getCollisionEventID()
+}
+
+/** Setter for {@link CollisionElasticPdu#collisionEventID}*/
+public CollisionElasticPdu setCollisionEventID(EventIdentifier pCollisionEventID)
+{
+ collisionEventID = pCollisionEventID;
+ return this;
+}
+
+/** Getter for {@link CollisionElasticPdu#collisionEventID}*/
+public EventIdentifier getCollisionEventID()
{
return collisionEventID;
-}
-
-/** Setter for {@link CollisionElasticPdu#pad}*/
-public CollisionElasticPdu setPad(short pPad)
-{
- pad = pPad;
- return this;
-}
-
-/** Getter for {@link CollisionElasticPdu#pad}*/
-public short getPad()
+}
+
+/** Setter for {@link CollisionElasticPdu#pad}*/
+public CollisionElasticPdu setPad(short pPad)
+{
+ pad = pPad;
+ return this;
+}
+
+/** Getter for {@link CollisionElasticPdu#pad}*/
+public short getPad()
{
return pad;
-}
-
-/** Setter for {@link CollisionElasticPdu#contactVelocity}*/
-public CollisionElasticPdu setContactVelocity(Vector3Float pContactVelocity)
-{
- contactVelocity = pContactVelocity;
- return this;
-}
-
-/** Getter for {@link CollisionElasticPdu#contactVelocity}*/
-public Vector3Float getContactVelocity()
+}
+
+/** Setter for {@link CollisionElasticPdu#contactVelocity}*/
+public CollisionElasticPdu setContactVelocity(Vector3Float pContactVelocity)
+{
+ contactVelocity = pContactVelocity;
+ return this;
+}
+
+/** Getter for {@link CollisionElasticPdu#contactVelocity}*/
+public Vector3Float getContactVelocity()
{
return contactVelocity;
-}
-
-/** Setter for {@link CollisionElasticPdu#mass}*/
-public CollisionElasticPdu setMass(float pMass)
-{
- mass = pMass;
- return this;
-}
-
-/** Getter for {@link CollisionElasticPdu#mass}*/
-public float getMass()
+}
+
+/** Setter for {@link CollisionElasticPdu#mass}*/
+public CollisionElasticPdu setMass(float pMass)
+{
+ mass = pMass;
+ return this;
+}
+
+/** Getter for {@link CollisionElasticPdu#mass}*/
+public float getMass()
{
return mass;
-}
-
-/** Setter for {@link CollisionElasticPdu#locationOfImpact}*/
-public CollisionElasticPdu setLocationOfImpact(Vector3Float pLocationOfImpact)
-{
- locationOfImpact = pLocationOfImpact;
- return this;
-}
-
-/** Getter for {@link CollisionElasticPdu#locationOfImpact}*/
-public Vector3Float getLocationOfImpact()
+}
+
+/** Setter for {@link CollisionElasticPdu#locationOfImpact}*/
+public CollisionElasticPdu setLocationOfImpact(Vector3Float pLocationOfImpact)
+{
+ locationOfImpact = pLocationOfImpact;
+ return this;
+}
+
+/** Getter for {@link CollisionElasticPdu#locationOfImpact}*/
+public Vector3Float getLocationOfImpact()
{
return locationOfImpact;
-}
-
-/** Setter for {@link CollisionElasticPdu#collisionIntermediateResultXX}*/
-public CollisionElasticPdu setCollisionIntermediateResultXX(float pCollisionIntermediateResultXX)
-{
- collisionIntermediateResultXX = pCollisionIntermediateResultXX;
- return this;
-}
-
-/** Getter for {@link CollisionElasticPdu#collisionIntermediateResultXX}*/
-public float getCollisionIntermediateResultXX()
+}
+
+/** Setter for {@link CollisionElasticPdu#collisionIntermediateResultXX}*/
+public CollisionElasticPdu setCollisionIntermediateResultXX(float pCollisionIntermediateResultXX)
+{
+ collisionIntermediateResultXX = pCollisionIntermediateResultXX;
+ return this;
+}
+
+/** Getter for {@link CollisionElasticPdu#collisionIntermediateResultXX}*/
+public float getCollisionIntermediateResultXX()
{
return collisionIntermediateResultXX;
-}
-
-/** Setter for {@link CollisionElasticPdu#collisionIntermediateResultXY}*/
-public CollisionElasticPdu setCollisionIntermediateResultXY(float pCollisionIntermediateResultXY)
-{
- collisionIntermediateResultXY = pCollisionIntermediateResultXY;
- return this;
-}
-
-/** Getter for {@link CollisionElasticPdu#collisionIntermediateResultXY}*/
-public float getCollisionIntermediateResultXY()
+}
+
+/** Setter for {@link CollisionElasticPdu#collisionIntermediateResultXY}*/
+public CollisionElasticPdu setCollisionIntermediateResultXY(float pCollisionIntermediateResultXY)
+{
+ collisionIntermediateResultXY = pCollisionIntermediateResultXY;
+ return this;
+}
+
+/** Getter for {@link CollisionElasticPdu#collisionIntermediateResultXY}*/
+public float getCollisionIntermediateResultXY()
{
return collisionIntermediateResultXY;
-}
-
-/** Setter for {@link CollisionElasticPdu#collisionIntermediateResultXZ}*/
-public CollisionElasticPdu setCollisionIntermediateResultXZ(float pCollisionIntermediateResultXZ)
-{
- collisionIntermediateResultXZ = pCollisionIntermediateResultXZ;
- return this;
-}
-
-/** Getter for {@link CollisionElasticPdu#collisionIntermediateResultXZ}*/
-public float getCollisionIntermediateResultXZ()
+}
+
+/** Setter for {@link CollisionElasticPdu#collisionIntermediateResultXZ}*/
+public CollisionElasticPdu setCollisionIntermediateResultXZ(float pCollisionIntermediateResultXZ)
+{
+ collisionIntermediateResultXZ = pCollisionIntermediateResultXZ;
+ return this;
+}
+
+/** Getter for {@link CollisionElasticPdu#collisionIntermediateResultXZ}*/
+public float getCollisionIntermediateResultXZ()
{
return collisionIntermediateResultXZ;
-}
-
-/** Setter for {@link CollisionElasticPdu#collisionIntermediateResultYY}*/
-public CollisionElasticPdu setCollisionIntermediateResultYY(float pCollisionIntermediateResultYY)
-{
- collisionIntermediateResultYY = pCollisionIntermediateResultYY;
- return this;
-}
-
-/** Getter for {@link CollisionElasticPdu#collisionIntermediateResultYY}*/
-public float getCollisionIntermediateResultYY()
+}
+
+/** Setter for {@link CollisionElasticPdu#collisionIntermediateResultYY}*/
+public CollisionElasticPdu setCollisionIntermediateResultYY(float pCollisionIntermediateResultYY)
+{
+ collisionIntermediateResultYY = pCollisionIntermediateResultYY;
+ return this;
+}
+
+/** Getter for {@link CollisionElasticPdu#collisionIntermediateResultYY}*/
+public float getCollisionIntermediateResultYY()
{
return collisionIntermediateResultYY;
-}
-
-/** Setter for {@link CollisionElasticPdu#collisionIntermediateResultYZ}*/
-public CollisionElasticPdu setCollisionIntermediateResultYZ(float pCollisionIntermediateResultYZ)
-{
- collisionIntermediateResultYZ = pCollisionIntermediateResultYZ;
- return this;
-}
-
-/** Getter for {@link CollisionElasticPdu#collisionIntermediateResultYZ}*/
-public float getCollisionIntermediateResultYZ()
+}
+
+/** Setter for {@link CollisionElasticPdu#collisionIntermediateResultYZ}*/
+public CollisionElasticPdu setCollisionIntermediateResultYZ(float pCollisionIntermediateResultYZ)
+{
+ collisionIntermediateResultYZ = pCollisionIntermediateResultYZ;
+ return this;
+}
+
+/** Getter for {@link CollisionElasticPdu#collisionIntermediateResultYZ}*/
+public float getCollisionIntermediateResultYZ()
{
return collisionIntermediateResultYZ;
-}
-
-/** Setter for {@link CollisionElasticPdu#collisionIntermediateResultZZ}*/
-public CollisionElasticPdu setCollisionIntermediateResultZZ(float pCollisionIntermediateResultZZ)
-{
- collisionIntermediateResultZZ = pCollisionIntermediateResultZZ;
- return this;
-}
-
-/** Getter for {@link CollisionElasticPdu#collisionIntermediateResultZZ}*/
-public float getCollisionIntermediateResultZZ()
+}
+
+/** Setter for {@link CollisionElasticPdu#collisionIntermediateResultZZ}*/
+public CollisionElasticPdu setCollisionIntermediateResultZZ(float pCollisionIntermediateResultZZ)
+{
+ collisionIntermediateResultZZ = pCollisionIntermediateResultZZ;
+ return this;
+}
+
+/** Getter for {@link CollisionElasticPdu#collisionIntermediateResultZZ}*/
+public float getCollisionIntermediateResultZZ()
{
return collisionIntermediateResultZZ;
-}
-
-/** Setter for {@link CollisionElasticPdu#unitSurfaceNormal}*/
-public CollisionElasticPdu setUnitSurfaceNormal(Vector3Float pUnitSurfaceNormal)
-{
- unitSurfaceNormal = pUnitSurfaceNormal;
- return this;
-}
-
-/** Getter for {@link CollisionElasticPdu#unitSurfaceNormal}*/
-public Vector3Float getUnitSurfaceNormal()
+}
+
+/** Setter for {@link CollisionElasticPdu#unitSurfaceNormal}*/
+public CollisionElasticPdu setUnitSurfaceNormal(Vector3Float pUnitSurfaceNormal)
+{
+ unitSurfaceNormal = pUnitSurfaceNormal;
+ return this;
+}
+
+/** Getter for {@link CollisionElasticPdu#unitSurfaceNormal}*/
+public Vector3Float getUnitSurfaceNormal()
{
return unitSurfaceNormal;
-}
-
-/** Setter for {@link CollisionElasticPdu#coefficientOfRestitution}*/
-public CollisionElasticPdu setCoefficientOfRestitution(float pCoefficientOfRestitution)
-{
- coefficientOfRestitution = pCoefficientOfRestitution;
- return this;
-}
-
-/** Getter for {@link CollisionElasticPdu#coefficientOfRestitution}*/
-public float getCoefficientOfRestitution()
+}
+
+/** Setter for {@link CollisionElasticPdu#coefficientOfRestitution}*/
+public CollisionElasticPdu setCoefficientOfRestitution(float pCoefficientOfRestitution)
+{
+ coefficientOfRestitution = pCoefficientOfRestitution;
+ return this;
+}
+
+/** Getter for {@link CollisionElasticPdu#coefficientOfRestitution}*/
+public float getCoefficientOfRestitution()
{
return coefficientOfRestitution;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- issuingEntityID.marshal(dos);
- collidingEntityID.marshal(dos);
- collisionEventID.marshal(dos);
- dos.writeShort(pad);
- contactVelocity.marshal(dos);
- dos.writeFloat(mass);
- locationOfImpact.marshal(dos);
- dos.writeFloat(collisionIntermediateResultXX);
- dos.writeFloat(collisionIntermediateResultXY);
- dos.writeFloat(collisionIntermediateResultXZ);
- dos.writeFloat(collisionIntermediateResultYY);
- dos.writeFloat(collisionIntermediateResultYZ);
- dos.writeFloat(collisionIntermediateResultZZ);
- unitSurfaceNormal.marshal(dos);
- dos.writeFloat(coefficientOfRestitution);
+ {
+ issuingEntityID.marshal(dos);
+ collidingEntityID.marshal(dos);
+ collisionEventID.marshal(dos);
+ dos.writeShort(pad);
+ contactVelocity.marshal(dos);
+ dos.writeFloat(mass);
+ locationOfImpact.marshal(dos);
+ dos.writeFloat(collisionIntermediateResultXX);
+ dos.writeFloat(collisionIntermediateResultXY);
+ dos.writeFloat(collisionIntermediateResultXZ);
+ dos.writeFloat(collisionIntermediateResultYY);
+ dos.writeFloat(collisionIntermediateResultYZ);
+ dos.writeFloat(collisionIntermediateResultZZ);
+ unitSurfaceNormal.marshal(dos);
+ dos.writeFloat(coefficientOfRestitution);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += issuingEntityID.unmarshal(dis);
- uPosition += collidingEntityID.unmarshal(dis);
- uPosition += collisionEventID.unmarshal(dis);
- pad = (short)dis.readUnsignedShort();
- uPosition += 2;
- uPosition += contactVelocity.unmarshal(dis);
- mass = dis.readFloat();
- uPosition += 4;
- uPosition += locationOfImpact.unmarshal(dis);
- collisionIntermediateResultXX = dis.readFloat();
- uPosition += 4;
- collisionIntermediateResultXY = dis.readFloat();
- uPosition += 4;
- collisionIntermediateResultXZ = dis.readFloat();
- uPosition += 4;
- collisionIntermediateResultYY = dis.readFloat();
- uPosition += 4;
- collisionIntermediateResultYZ = dis.readFloat();
- uPosition += 4;
- collisionIntermediateResultZZ = dis.readFloat();
- uPosition += 4;
- uPosition += unitSurfaceNormal.unmarshal(dis);
- coefficientOfRestitution = dis.readFloat();
- uPosition += 4;
+ {
+ uPosition += issuingEntityID.unmarshal(dis);
+ uPosition += collidingEntityID.unmarshal(dis);
+ uPosition += collisionEventID.unmarshal(dis);
+ pad = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ uPosition += contactVelocity.unmarshal(dis);
+ mass = dis.readFloat();
+ uPosition += 4;
+ uPosition += locationOfImpact.unmarshal(dis);
+ collisionIntermediateResultXX = dis.readFloat();
+ uPosition += 4;
+ collisionIntermediateResultXY = dis.readFloat();
+ uPosition += 4;
+ collisionIntermediateResultXZ = dis.readFloat();
+ uPosition += 4;
+ collisionIntermediateResultYY = dis.readFloat();
+ uPosition += 4;
+ collisionIntermediateResultYZ = dis.readFloat();
+ uPosition += 4;
+ collisionIntermediateResultZZ = dis.readFloat();
+ uPosition += 4;
+ uPosition += unitSurfaceNormal.unmarshal(dis);
+ coefficientOfRestitution = dis.readFloat();
+ uPosition += 4;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- issuingEntityID.marshal(buff);
- collidingEntityID.marshal(buff);
- collisionEventID.marshal(buff);
- buff.putShort( (short)pad);
- contactVelocity.marshal(buff);
- buff.putFloat( (float)mass);
- locationOfImpact.marshal(buff);
- buff.putFloat( (float)collisionIntermediateResultXX);
- buff.putFloat( (float)collisionIntermediateResultXY);
- buff.putFloat( (float)collisionIntermediateResultXZ);
- buff.putFloat( (float)collisionIntermediateResultYY);
- buff.putFloat( (float)collisionIntermediateResultYZ);
- buff.putFloat( (float)collisionIntermediateResultZZ);
- unitSurfaceNormal.marshal(buff);
- buff.putFloat( (float)coefficientOfRestitution);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+ }
+ return getMarshalledSize();
+}
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ issuingEntityID.marshal(buff);
+ collidingEntityID.marshal(buff);
+ collisionEventID.marshal(buff);
+ buff.putShort( (short)pad);
+ contactVelocity.marshal(buff);
+ buff.putFloat( (float)mass);
+ locationOfImpact.marshal(buff);
+ buff.putFloat( (float)collisionIntermediateResultXX);
+ buff.putFloat( (float)collisionIntermediateResultXY);
+ buff.putFloat( (float)collisionIntermediateResultXZ);
+ buff.putFloat( (float)collisionIntermediateResultYY);
+ buff.putFloat( (float)collisionIntermediateResultYZ);
+ buff.putFloat( (float)collisionIntermediateResultZZ);
+ unitSurfaceNormal.marshal(buff);
+ buff.putFloat( (float)coefficientOfRestitution);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- issuingEntityID.unmarshal(buff);
- collidingEntityID.unmarshal(buff);
- collisionEventID.unmarshal(buff);
- pad = (short)(buff.getShort() & 0xFFFF);
- contactVelocity.unmarshal(buff);
- mass = buff.getFloat();
- locationOfImpact.unmarshal(buff);
- collisionIntermediateResultXX = buff.getFloat();
- collisionIntermediateResultXY = buff.getFloat();
- collisionIntermediateResultXZ = buff.getFloat();
- collisionIntermediateResultYY = buff.getFloat();
- collisionIntermediateResultYZ = buff.getFloat();
- collisionIntermediateResultZZ = buff.getFloat();
- unitSurfaceNormal.unmarshal(buff);
- coefficientOfRestitution = buff.getFloat();
- return getMarshalledSize();
-}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final CollisionElasticPdu rhs = (CollisionElasticPdu)obj;
-
- if( ! (issuingEntityID.equals( rhs.issuingEntityID) )) ivarsEqual = false;
- if( ! (collidingEntityID.equals( rhs.collidingEntityID) )) ivarsEqual = false;
- if( ! (collisionEventID.equals( rhs.collisionEventID) )) ivarsEqual = false;
- if( ! (pad == rhs.pad)) ivarsEqual = false;
- if( ! (contactVelocity.equals( rhs.contactVelocity) )) ivarsEqual = false;
- if( ! (mass == rhs.mass)) ivarsEqual = false;
- if( ! (locationOfImpact.equals( rhs.locationOfImpact) )) ivarsEqual = false;
- if( ! (collisionIntermediateResultXX == rhs.collisionIntermediateResultXX)) ivarsEqual = false;
- if( ! (collisionIntermediateResultXY == rhs.collisionIntermediateResultXY)) ivarsEqual = false;
- if( ! (collisionIntermediateResultXZ == rhs.collisionIntermediateResultXZ)) ivarsEqual = false;
- if( ! (collisionIntermediateResultYY == rhs.collisionIntermediateResultYY)) ivarsEqual = false;
- if( ! (collisionIntermediateResultYZ == rhs.collisionIntermediateResultYZ)) ivarsEqual = false;
- if( ! (collisionIntermediateResultZZ == rhs.collisionIntermediateResultZZ)) ivarsEqual = false;
- if( ! (unitSurfaceNormal.equals( rhs.unitSurfaceNormal) )) ivarsEqual = false;
- if( ! (coefficientOfRestitution == rhs.coefficientOfRestitution)) ivarsEqual = false;
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ issuingEntityID.unmarshal(buff);
+ collidingEntityID.unmarshal(buff);
+ collisionEventID.unmarshal(buff);
+ pad = (short)(buff.getShort() & 0xFFFF);
+ contactVelocity.unmarshal(buff);
+ mass = buff.getFloat();
+ locationOfImpact.unmarshal(buff);
+ collisionIntermediateResultXX = buff.getFloat();
+ collisionIntermediateResultXY = buff.getFloat();
+ collisionIntermediateResultXZ = buff.getFloat();
+ collisionIntermediateResultYY = buff.getFloat();
+ collisionIntermediateResultYZ = buff.getFloat();
+ collisionIntermediateResultZZ = buff.getFloat();
+ unitSurfaceNormal.unmarshal(buff);
+ coefficientOfRestitution = buff.getFloat();
+ return getMarshalledSize();
+}
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final CollisionElasticPdu rhs = (CollisionElasticPdu)obj;
+
+ if( ! (issuingEntityID.equals( rhs.issuingEntityID) )) ivarsEqual = false;
+ if( ! (collidingEntityID.equals( rhs.collidingEntityID) )) ivarsEqual = false;
+ if( ! (collisionEventID.equals( rhs.collisionEventID) )) ivarsEqual = false;
+ if( ! (pad == rhs.pad)) ivarsEqual = false;
+ if( ! (contactVelocity.equals( rhs.contactVelocity) )) ivarsEqual = false;
+ if( ! (mass == rhs.mass)) ivarsEqual = false;
+ if( ! (locationOfImpact.equals( rhs.locationOfImpact) )) ivarsEqual = false;
+ if( ! (collisionIntermediateResultXX == rhs.collisionIntermediateResultXX)) ivarsEqual = false;
+ if( ! (collisionIntermediateResultXY == rhs.collisionIntermediateResultXY)) ivarsEqual = false;
+ if( ! (collisionIntermediateResultXZ == rhs.collisionIntermediateResultXZ)) ivarsEqual = false;
+ if( ! (collisionIntermediateResultYY == rhs.collisionIntermediateResultYY)) ivarsEqual = false;
+ if( ! (collisionIntermediateResultYZ == rhs.collisionIntermediateResultYZ)) ivarsEqual = false;
+ if( ! (collisionIntermediateResultZZ == rhs.collisionIntermediateResultZZ)) ivarsEqual = false;
+ if( ! (unitSurfaceNormal.equals( rhs.unitSurfaceNormal) )) ivarsEqual = false;
+ if( ! (coefficientOfRestitution == rhs.coefficientOfRestitution)) ivarsEqual = false;
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" issuingEntityID: ").append(issuingEntityID).append("\n");
- sb.append(" collidingEntityID: ").append(collidingEntityID).append("\n");
- sb.append(" collisionEventID: ").append(collisionEventID).append("\n");
- sb.append(" pad: ").append(pad).append("\n");
- sb.append(" contactVelocity: ").append(contactVelocity).append("\n");
- sb.append(" mass: ").append(mass).append("\n");
- sb.append(" locationOfImpact: ").append(locationOfImpact).append("\n");
- sb.append(" collisionIntermediateResultXX: ").append(collisionIntermediateResultXX).append("\n");
- sb.append(" collisionIntermediateResultXY: ").append(collisionIntermediateResultXY).append("\n");
- sb.append(" collisionIntermediateResultXZ: ").append(collisionIntermediateResultXZ).append("\n");
- sb.append(" collisionIntermediateResultYY: ").append(collisionIntermediateResultYY).append("\n");
- sb.append(" collisionIntermediateResultYZ: ").append(collisionIntermediateResultYZ).append("\n");
- sb.append(" collisionIntermediateResultZZ: ").append(collisionIntermediateResultZZ).append("\n");
- sb.append(" unitSurfaceNormal: ").append(unitSurfaceNormal).append("\n");
- sb.append(" coefficientOfRestitution: ").append(coefficientOfRestitution).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" issuingEntityID: ").append(issuingEntityID).append("\n");
+ sb.append(" collidingEntityID: ").append(collidingEntityID).append("\n");
+ sb.append(" collisionEventID: ").append(collisionEventID).append("\n");
+ sb.append(" pad: ").append(pad).append("\n");
+ sb.append(" contactVelocity: ").append(contactVelocity).append("\n");
+ sb.append(" mass: ").append(mass).append("\n");
+ sb.append(" locationOfImpact: ").append(locationOfImpact).append("\n");
+ sb.append(" collisionIntermediateResultXX: ").append(collisionIntermediateResultXX).append("\n");
+ sb.append(" collisionIntermediateResultXY: ").append(collisionIntermediateResultXY).append("\n");
+ sb.append(" collisionIntermediateResultXZ: ").append(collisionIntermediateResultXZ).append("\n");
+ sb.append(" collisionIntermediateResultYY: ").append(collisionIntermediateResultYY).append("\n");
+ sb.append(" collisionIntermediateResultYZ: ").append(collisionIntermediateResultYZ).append("\n");
+ sb.append(" collisionIntermediateResultZZ: ").append(collisionIntermediateResultZZ).append("\n");
+ sb.append(" unitSurfaceNormal: ").append(unitSurfaceNormal).append("\n");
+ sb.append(" coefficientOfRestitution: ").append(coefficientOfRestitution).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/CollisionPdu.java b/src-generated/edu/nps/moves/dis7/CollisionPdu.java
index d9602c9b70fbd6f1fb9415a142232365a803913b..388242bb09a3214fd705f6794bda5f1c5404c455 100644
--- a/src-generated/edu/nps/moves/dis7/CollisionPdu.java
+++ b/src-generated/edu/nps/moves/dis7/CollisionPdu.java
@@ -1,328 +1,328 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 7.2.3 Collisions between entities shall be communicated by issuing a Collision PDU. See 5.3.3.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class CollisionPdu extends EntityInformationFamilyPdu implements Serializable
-{
- /** This field shall identify the entity that is issuing the PDU, and shall be represented by an Entity Identifier record (see 6.2.28). */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 7.2.3 Collisions between entities shall be communicated by issuing a Collision PDU. See 5.3.3.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class CollisionPdu extends EntityInformationFamilyPdu implements Serializable
+{
+ /** This field shall identify the entity that is issuing the PDU, and shall be represented by an Entity Identifier record (see 6.2.28). */
protected EntityID issuingEntityID = new EntityID();
-
- /** This field shall identify the entity that has collided with the issuing entity (see 5.3.3.4). This field shall be represented by an Entity Identifier record (see 6.2.28). */
+
+ /** This field shall identify the entity that has collided with the issuing entity (see 5.3.3.4). This field shall be represented by an Entity Identifier record (see 6.2.28). */
protected EntityID collidingEntityID = new EntityID();
-
- /** This field shall contain an identification generated by the issuing simulation application to associate related collision events. This field shall be represented by an Event Identifier record (see 6.2.34). */
+
+ /** This field shall contain an identification generated by the issuing simulation application to associate related collision events. This field shall be represented by an Event Identifier record (see 6.2.34). */
protected EventIdentifier eventID = new EventIdentifier();
-
- /** This field shall identify the type of collision. The Collision Type field shall be represented by an 8-bit record of enumerations uid 189 */
+
+ /** This field shall identify the type of collision. The Collision Type field shall be represented by an 8-bit record of enumerations uid 189 */
protected CollisionType collisionType = CollisionType.values()[0];
-
- /** some padding */
+
+ /** some padding */
protected byte pad = (byte)0;
-
- /** This field shall contain the velocity (at the time the collision is detected) of the issuing entity. The velocity shall be represented in world coordinates. This field shall be represented by the Linear Velocity Vector record [see 6.2.95 item c)]. */
+
+ /** This field shall contain the velocity (at the time the collision is detected) of the issuing entity. The velocity shall be represented in world coordinates. This field shall be represented by the Linear Velocity Vector record [see 6.2.95 item c)]. */
protected Vector3Float velocity = new Vector3Float();
-
- /** This field shall contain the mass of the issuing entity, and shall be represented by a 32-bit floating point number representing kilograms. */
+
+ /** This field shall contain the mass of the issuing entity, and shall be represented by a 32-bit floating point number representing kilograms. */
protected float mass;
-
- /** This field shall specify the location of the collision with respect to the entity with which the issuing entity collided. The Location field shall be represented by an Entity Coordinate Vector record [see 6.2.95 item a)]. */
+
+ /** This field shall specify the location of the collision with respect to the entity with which the issuing entity collided. The Location field shall be represented by an Entity Coordinate Vector record [see 6.2.95 item a)]. */
protected Vector3Float location = new Vector3Float();
-
-
-/** Constructor */
- public CollisionPdu()
- {
- setPduType( DISPDUType.COLLISION );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public CollisionPdu()
+ {
+ setPduType( DISPDUType.COLLISION );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += issuingEntityID.getMarshalledSize();
+ marshalSize += collidingEntityID.getMarshalledSize();
+ marshalSize += eventID.getMarshalledSize();
+ marshalSize += collisionType.getMarshalledSize();
+ marshalSize += 1; // pad
+ marshalSize += velocity.getMarshalledSize();
+ marshalSize += 4; // mass
+ marshalSize += location.getMarshalledSize();
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link CollisionPdu#issuingEntityID}*/
+public CollisionPdu setIssuingEntityID(EntityID pIssuingEntityID)
{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += issuingEntityID.getMarshalledSize();
- marshalSize += collidingEntityID.getMarshalledSize();
- marshalSize += eventID.getMarshalledSize();
- marshalSize += collisionType.getMarshalledSize();
- marshalSize += 1; // pad
- marshalSize += velocity.getMarshalledSize();
- marshalSize += 4; // mass
- marshalSize += location.getMarshalledSize();
-
- return marshalSize;
-}
-
-
-/** Setter for {@link CollisionPdu#issuingEntityID}*/
-public CollisionPdu setIssuingEntityID(EntityID pIssuingEntityID)
-{
- issuingEntityID = pIssuingEntityID;
- return this;
-}
-
-/** Getter for {@link CollisionPdu#issuingEntityID}*/
-public EntityID getIssuingEntityID()
+ issuingEntityID = pIssuingEntityID;
+ return this;
+}
+
+/** Getter for {@link CollisionPdu#issuingEntityID}*/
+public EntityID getIssuingEntityID()
{
return issuingEntityID;
-}
-
-/** Setter for {@link CollisionPdu#collidingEntityID}*/
-public CollisionPdu setCollidingEntityID(EntityID pCollidingEntityID)
+}
+
+/** Setter for {@link CollisionPdu#collidingEntityID}*/
+public CollisionPdu setCollidingEntityID(EntityID pCollidingEntityID)
{
- collidingEntityID = pCollidingEntityID;
- return this;
-}
-
-/** Getter for {@link CollisionPdu#collidingEntityID}*/
-public EntityID getCollidingEntityID()
+ collidingEntityID = pCollidingEntityID;
+ return this;
+}
+
+/** Getter for {@link CollisionPdu#collidingEntityID}*/
+public EntityID getCollidingEntityID()
{
return collidingEntityID;
-}
-
-/** Setter for {@link CollisionPdu#eventID}*/
-public CollisionPdu setEventID(EventIdentifier pEventID)
+}
+
+/** Setter for {@link CollisionPdu#eventID}*/
+public CollisionPdu setEventID(EventIdentifier pEventID)
{
- eventID = pEventID;
- return this;
-}
-
-/** Getter for {@link CollisionPdu#eventID}*/
-public EventIdentifier getEventID()
+ eventID = pEventID;
+ return this;
+}
+
+/** Getter for {@link CollisionPdu#eventID}*/
+public EventIdentifier getEventID()
{
return eventID;
-}
-
-/** Setter for {@link CollisionPdu#collisionType}*/
-public CollisionPdu setCollisionType(CollisionType pCollisionType)
+}
+
+/** Setter for {@link CollisionPdu#collisionType}*/
+public CollisionPdu setCollisionType(CollisionType pCollisionType)
{
- collisionType = pCollisionType;
- return this;
-}
-
-/** Getter for {@link CollisionPdu#collisionType}*/
-public CollisionType getCollisionType()
+ collisionType = pCollisionType;
+ return this;
+}
+
+/** Getter for {@link CollisionPdu#collisionType}*/
+public CollisionType getCollisionType()
{
return collisionType;
-}
-
-/** Setter for {@link CollisionPdu#pad}*/
-public CollisionPdu setPad(byte pPad)
+}
+
+/** Setter for {@link CollisionPdu#pad}*/
+public CollisionPdu setPad(byte pPad)
{
- pad = pPad;
- return this;
-}
-
-/** Getter for {@link CollisionPdu#pad}*/
-public byte getPad()
+ pad = pPad;
+ return this;
+}
+
+/** Getter for {@link CollisionPdu#pad}*/
+public byte getPad()
{
return pad;
-}
-
-/** Setter for {@link CollisionPdu#velocity}*/
-public CollisionPdu setVelocity(Vector3Float pVelocity)
+}
+
+/** Setter for {@link CollisionPdu#velocity}*/
+public CollisionPdu setVelocity(Vector3Float pVelocity)
{
- velocity = pVelocity;
- return this;
-}
-
-/** Getter for {@link CollisionPdu#velocity}*/
-public Vector3Float getVelocity()
+ velocity = pVelocity;
+ return this;
+}
+
+/** Getter for {@link CollisionPdu#velocity}*/
+public Vector3Float getVelocity()
{
return velocity;
-}
-
-/** Setter for {@link CollisionPdu#mass}*/
-public CollisionPdu setMass(float pMass)
+}
+
+/** Setter for {@link CollisionPdu#mass}*/
+public CollisionPdu setMass(float pMass)
{
- mass = pMass;
- return this;
-}
-
-/** Getter for {@link CollisionPdu#mass}*/
-public float getMass()
+ mass = pMass;
+ return this;
+}
+
+/** Getter for {@link CollisionPdu#mass}*/
+public float getMass()
{
return mass;
-}
-
-/** Setter for {@link CollisionPdu#location}*/
-public CollisionPdu setLocation(Vector3Float pLocation)
+}
+
+/** Setter for {@link CollisionPdu#location}*/
+public CollisionPdu setLocation(Vector3Float pLocation)
{
- location = pLocation;
- return this;
-}
-
-/** Getter for {@link CollisionPdu#location}*/
-public Vector3Float getLocation()
+ location = pLocation;
+ return this;
+}
+
+/** Getter for {@link CollisionPdu#location}*/
+public Vector3Float getLocation()
{
return location;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- issuingEntityID.marshal(dos);
- collidingEntityID.marshal(dos);
- eventID.marshal(dos);
- collisionType.marshal(dos);
- dos.writeByte(pad);
- velocity.marshal(dos);
- dos.writeFloat(mass);
- location.marshal(dos);
+ {
+ issuingEntityID.marshal(dos);
+ collidingEntityID.marshal(dos);
+ eventID.marshal(dos);
+ collisionType.marshal(dos);
+ dos.writeByte(pad);
+ velocity.marshal(dos);
+ dos.writeFloat(mass);
+ location.marshal(dos);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += issuingEntityID.unmarshal(dis);
- uPosition += collidingEntityID.unmarshal(dis);
- uPosition += eventID.unmarshal(dis);
- collisionType = CollisionType.unmarshalEnum(dis);
- uPosition += collisionType.getMarshalledSize();
- pad = (byte)dis.readUnsignedByte();
- uPosition += 1;
- uPosition += velocity.unmarshal(dis);
- mass = dis.readFloat();
- uPosition += 4;
- uPosition += location.unmarshal(dis);
+ {
+ uPosition += issuingEntityID.unmarshal(dis);
+ uPosition += collidingEntityID.unmarshal(dis);
+ uPosition += eventID.unmarshal(dis);
+ collisionType = CollisionType.unmarshalEnum(dis);
+ uPosition += collisionType.getMarshalledSize();
+ pad = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ uPosition += velocity.unmarshal(dis);
+ mass = dis.readFloat();
+ uPosition += 4;
+ uPosition += location.unmarshal(dis);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- issuingEntityID.marshal(buff);
- collidingEntityID.marshal(buff);
- eventID.marshal(buff);
- collisionType.marshal(buff);
- buff.put( (byte)pad);
- velocity.marshal(buff);
- buff.putFloat( (float)mass);
- location.marshal(buff);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ issuingEntityID.marshal(buff);
+ collidingEntityID.marshal(buff);
+ eventID.marshal(buff);
+ collisionType.marshal(buff);
+ buff.put( (byte)pad);
+ velocity.marshal(buff);
+ buff.putFloat( (float)mass);
+ location.marshal(buff);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- issuingEntityID.unmarshal(buff);
- collidingEntityID.unmarshal(buff);
- eventID.unmarshal(buff);
- collisionType = CollisionType.unmarshalEnum(buff);
- pad = (byte)(buff.get() & 0xFF);
- velocity.unmarshal(buff);
- mass = buff.getFloat();
- location.unmarshal(buff);
- return getMarshalledSize();
+
+ issuingEntityID.unmarshal(buff);
+ collidingEntityID.unmarshal(buff);
+ eventID.unmarshal(buff);
+ collisionType = CollisionType.unmarshalEnum(buff);
+ pad = (byte)(buff.get() & 0xFF);
+ velocity.unmarshal(buff);
+ mass = buff.getFloat();
+ location.unmarshal(buff);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final CollisionPdu rhs = (CollisionPdu)obj;
-
- if( ! (issuingEntityID.equals( rhs.issuingEntityID) )) ivarsEqual = false;
- if( ! (collidingEntityID.equals( rhs.collidingEntityID) )) ivarsEqual = false;
- if( ! (eventID.equals( rhs.eventID) )) ivarsEqual = false;
- if( ! (collisionType == rhs.collisionType)) ivarsEqual = false;
- if( ! (pad == rhs.pad)) ivarsEqual = false;
- if( ! (velocity.equals( rhs.velocity) )) ivarsEqual = false;
- if( ! (mass == rhs.mass)) ivarsEqual = false;
- if( ! (location.equals( rhs.location) )) ivarsEqual = false;
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final CollisionPdu rhs = (CollisionPdu)obj;
+
+ if( ! (issuingEntityID.equals( rhs.issuingEntityID) )) ivarsEqual = false;
+ if( ! (collidingEntityID.equals( rhs.collidingEntityID) )) ivarsEqual = false;
+ if( ! (eventID.equals( rhs.eventID) )) ivarsEqual = false;
+ if( ! (collisionType == rhs.collisionType)) ivarsEqual = false;
+ if( ! (pad == rhs.pad)) ivarsEqual = false;
+ if( ! (velocity.equals( rhs.velocity) )) ivarsEqual = false;
+ if( ! (mass == rhs.mass)) ivarsEqual = false;
+ if( ! (location.equals( rhs.location) )) ivarsEqual = false;
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" issuingEntityID: ").append(issuingEntityID).append("\n");
- sb.append(" collidingEntityID: ").append(collidingEntityID).append("\n");
- sb.append(" eventID: ").append(eventID).append("\n");
- sb.append(" collisionType: ").append(collisionType).append("\n");
- sb.append(" pad: ").append(pad).append("\n");
- sb.append(" velocity: ").append(velocity).append("\n");
- sb.append(" mass: ").append(mass).append("\n");
- sb.append(" location: ").append(location).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" issuingEntityID: ").append(issuingEntityID).append("\n");
+ sb.append(" collidingEntityID: ").append(collidingEntityID).append("\n");
+ sb.append(" eventID: ").append(eventID).append("\n");
+ sb.append(" collisionType: ").append(collisionType).append("\n");
+ sb.append(" pad: ").append(pad).append("\n");
+ sb.append(" velocity: ").append(velocity).append("\n");
+ sb.append(" mass: ").append(mass).append("\n");
+ sb.append(" location: ").append(location).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/CommentPdu.java b/src-generated/edu/nps/moves/dis7/CommentPdu.java
index 64ba26f55e1395363cb25c661abb15af98763d75..03b1061035efbb949188323b325b7b72a0b18766 100644
--- a/src-generated/edu/nps/moves/dis7/CommentPdu.java
+++ b/src-generated/edu/nps/moves/dis7/CommentPdu.java
@@ -1,214 +1,214 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 7.5.13 Used to enter arbitrary messages (character strings, for example). See 5.6.5.13
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class CommentPdu extends SimulationManagementFamilyPdu implements Serializable
-{
- /** Number of fixed datum records, not used in this Pdu */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 7.5.13 Used to enter arbitrary messages (character strings, for example). See 5.6.5.13
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class CommentPdu extends SimulationManagementFamilyPdu implements Serializable
+{
+ /** Number of fixed datum records, not used in this Pdu */
protected int numberOfFixedDatumRecords;
-
- /** Number of variable datum records, handled automatically by marshaller at run time (and not modifiable by end-user programmers) */
+
+ /** Number of variable datum records, handled automatically by marshaller at run time (and not modifiable by end-user programmers) */
protected int numberOfVariableDatumRecords;
-
- /** variable length list of variable length datums */
+
+ /** variable length list of variable length datums */
protected List< VariableDatum > variableDatums = new ArrayList< VariableDatum >();
-
-
-/** Constructor */
- public CommentPdu()
- {
- setPduType( DISPDUType.COMMENT );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += 4; // numberOfFixedDatumRecords
- marshalSize += 4; // numberOfVariableDatumRecords
- for(int idx=0; idx < variableDatums.size(); idx++)
- {
- VariableDatum listElement = variableDatums.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link CommentPdu#variableDatums}*/
-public CommentPdu setVariableDatums(List<VariableDatum> pVariableDatums)
+
+
+/** Constructor */
+ public CommentPdu()
+ {
+ setPduType( DISPDUType.COMMENT );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += 4; // numberOfFixedDatumRecords
+ marshalSize += 4; // numberOfVariableDatumRecords
+ for(int idx=0; idx < variableDatums.size(); idx++)
+ {
+ VariableDatum listElement = variableDatums.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link CommentPdu#variableDatums}*/
+public CommentPdu setVariableDatums(List<VariableDatum> pVariableDatums)
{
- variableDatums = pVariableDatums;
- return this;
-}
-
-/** Getter for {@link CommentPdu#variableDatums}*/
-public List<VariableDatum> getVariableDatums()
+ variableDatums = pVariableDatums;
+ return this;
+}
+
+/** Getter for {@link CommentPdu#variableDatums}*/
+public List<VariableDatum> getVariableDatums()
{
return variableDatums;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- dos.writeInt(numberOfFixedDatumRecords);
- dos.writeInt(variableDatums.size());
-
- for(int idx = 0; idx < variableDatums.size(); idx++)
- {
- VariableDatum aVariableDatum = variableDatums.get(idx);
- aVariableDatum.marshal(dos);
- }
-
+ {
+ dos.writeInt(numberOfFixedDatumRecords);
+ dos.writeInt(variableDatums.size());
+
+ for(int idx = 0; idx < variableDatums.size(); idx++)
+ {
+ VariableDatum aVariableDatum = variableDatums.get(idx);
+ aVariableDatum.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- numberOfFixedDatumRecords = dis.readInt();
- uPosition += 4;
- numberOfVariableDatumRecords = dis.readInt();
- uPosition += 4;
- for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
- {
- VariableDatum anX = new VariableDatum();
- uPosition += anX.unmarshal(dis);
- variableDatums.add(anX);
- }
-
+ {
+ numberOfFixedDatumRecords = dis.readInt();
+ uPosition += 4;
+ numberOfVariableDatumRecords = dis.readInt();
+ uPosition += 4;
+ for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
+ {
+ VariableDatum anX = new VariableDatum();
+ uPosition += anX.unmarshal(dis);
+ variableDatums.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- buff.putInt( (int)numberOfFixedDatumRecords);
- buff.putInt( (int)variableDatums.size());
-
- for(int idx = 0; idx < variableDatums.size(); idx++)
- {
- VariableDatum aVariableDatum = variableDatums.get(idx);
- aVariableDatum.marshal(buff);
- }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ buff.putInt( (int)numberOfFixedDatumRecords);
+ buff.putInt( (int)variableDatums.size());
+
+ for(int idx = 0; idx < variableDatums.size(); idx++)
+ {
+ VariableDatum aVariableDatum = variableDatums.get(idx);
+ aVariableDatum.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- numberOfFixedDatumRecords = buff.getInt();
- numberOfVariableDatumRecords = buff.getInt();
- for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
- {
- VariableDatum anX = new VariableDatum();
- anX.unmarshal(buff);
- variableDatums.add(anX);
- }
-
- return getMarshalledSize();
+
+ numberOfFixedDatumRecords = buff.getInt();
+ numberOfVariableDatumRecords = buff.getInt();
+ for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
+ {
+ VariableDatum anX = new VariableDatum();
+ anX.unmarshal(buff);
+ variableDatums.add(anX);
+ }
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final CommentPdu rhs = (CommentPdu)obj;
-
-
- for(int idx = 0; idx < variableDatums.size(); idx++)
- if( ! ( variableDatums.get(idx).equals(rhs.variableDatums.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final CommentPdu rhs = (CommentPdu)obj;
+
+
+ for(int idx = 0; idx < variableDatums.size(); idx++)
+ if( ! ( variableDatums.get(idx).equals(rhs.variableDatums.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" variableDatums: ").append("\n");
- variableDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" variableDatums: ").append("\n");
+ variableDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/CommentRPdu.java b/src-generated/edu/nps/moves/dis7/CommentRPdu.java
index 8c15cb3dc6985ce451485a29a7e5fd27f6bd6942..9ccfddce6a16b661cf78c77bf76adc7f3a95a60a 100644
--- a/src-generated/edu/nps/moves/dis7/CommentRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/CommentRPdu.java
@@ -1,214 +1,214 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.12.4.13 Serves the same function as the Comment PDU.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class CommentRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
-{
- /** Fixed datum record count, not used in this Pdu */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 5.12.4.13 Serves the same function as the Comment PDU.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class CommentRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
+{
+ /** Fixed datum record count, not used in this Pdu */
protected int numberOfFixedDatumRecords;
-
- /** variable datum record count */
+
+ /** variable datum record count */
protected int numberOfVariableDatumRecords;
-
- /** Variable datum records */
+
+ /** Variable datum records */
protected List< VariableDatum > variableDatumRecords = new ArrayList< VariableDatum >();
-
-
-/** Constructor */
- public CommentRPdu()
- {
- setPduType( DISPDUType.COMMENT_RELIABLE );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += 4; // numberOfFixedDatumRecords
- marshalSize += 4; // numberOfVariableDatumRecords
- for(int idx=0; idx < variableDatumRecords.size(); idx++)
- {
- VariableDatum listElement = variableDatumRecords.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link CommentRPdu#variableDatumRecords}*/
-public CommentRPdu setVariableDatumRecords(List<VariableDatum> pVariableDatumRecords)
+
+
+/** Constructor */
+ public CommentRPdu()
+ {
+ setPduType( DISPDUType.COMMENT_RELIABLE );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += 4; // numberOfFixedDatumRecords
+ marshalSize += 4; // numberOfVariableDatumRecords
+ for(int idx=0; idx < variableDatumRecords.size(); idx++)
+ {
+ VariableDatum listElement = variableDatumRecords.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link CommentRPdu#variableDatumRecords}*/
+public CommentRPdu setVariableDatumRecords(List<VariableDatum> pVariableDatumRecords)
{
- variableDatumRecords = pVariableDatumRecords;
- return this;
-}
-
-/** Getter for {@link CommentRPdu#variableDatumRecords}*/
-public List<VariableDatum> getVariableDatumRecords()
+ variableDatumRecords = pVariableDatumRecords;
+ return this;
+}
+
+/** Getter for {@link CommentRPdu#variableDatumRecords}*/
+public List<VariableDatum> getVariableDatumRecords()
{
return variableDatumRecords;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- dos.writeInt(numberOfFixedDatumRecords);
- dos.writeInt(variableDatumRecords.size());
-
- for(int idx = 0; idx < variableDatumRecords.size(); idx++)
- {
- VariableDatum aVariableDatum = variableDatumRecords.get(idx);
- aVariableDatum.marshal(dos);
- }
-
+ {
+ dos.writeInt(numberOfFixedDatumRecords);
+ dos.writeInt(variableDatumRecords.size());
+
+ for(int idx = 0; idx < variableDatumRecords.size(); idx++)
+ {
+ VariableDatum aVariableDatum = variableDatumRecords.get(idx);
+ aVariableDatum.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- numberOfFixedDatumRecords = dis.readInt();
- uPosition += 4;
- numberOfVariableDatumRecords = dis.readInt();
- uPosition += 4;
- for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
- {
- VariableDatum anX = new VariableDatum();
- uPosition += anX.unmarshal(dis);
- variableDatumRecords.add(anX);
- }
-
+ {
+ numberOfFixedDatumRecords = dis.readInt();
+ uPosition += 4;
+ numberOfVariableDatumRecords = dis.readInt();
+ uPosition += 4;
+ for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
+ {
+ VariableDatum anX = new VariableDatum();
+ uPosition += anX.unmarshal(dis);
+ variableDatumRecords.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- buff.putInt( (int)numberOfFixedDatumRecords);
- buff.putInt( (int)variableDatumRecords.size());
-
- for(int idx = 0; idx < variableDatumRecords.size(); idx++)
- {
- VariableDatum aVariableDatum = variableDatumRecords.get(idx);
- aVariableDatum.marshal(buff);
- }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ buff.putInt( (int)numberOfFixedDatumRecords);
+ buff.putInt( (int)variableDatumRecords.size());
+
+ for(int idx = 0; idx < variableDatumRecords.size(); idx++)
+ {
+ VariableDatum aVariableDatum = variableDatumRecords.get(idx);
+ aVariableDatum.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- numberOfFixedDatumRecords = buff.getInt();
- numberOfVariableDatumRecords = buff.getInt();
- for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
- {
- VariableDatum anX = new VariableDatum();
- anX.unmarshal(buff);
- variableDatumRecords.add(anX);
- }
-
- return getMarshalledSize();
+
+ numberOfFixedDatumRecords = buff.getInt();
+ numberOfVariableDatumRecords = buff.getInt();
+ for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
+ {
+ VariableDatum anX = new VariableDatum();
+ anX.unmarshal(buff);
+ variableDatumRecords.add(anX);
+ }
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final CommentRPdu rhs = (CommentRPdu)obj;
-
-
- for(int idx = 0; idx < variableDatumRecords.size(); idx++)
- if( ! ( variableDatumRecords.get(idx).equals(rhs.variableDatumRecords.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final CommentRPdu rhs = (CommentRPdu)obj;
+
+
+ for(int idx = 0; idx < variableDatumRecords.size(); idx++)
+ if( ! ( variableDatumRecords.get(idx).equals(rhs.variableDatumRecords.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" variableDatumRecords: ").append("\n");
- variableDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" variableDatumRecords: ").append("\n");
+ variableDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/CommentReliablePdu.java b/src-generated/edu/nps/moves/dis7/CommentReliablePdu.java
index 2436de28157a57044b8559cff02c58aa5569f33c..3c27f85b5ebcc217773ed283d97a1b2a042af4df 100644
--- a/src-generated/edu/nps/moves/dis7/CommentReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/CommentReliablePdu.java
@@ -1,17 +1,17 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * more descriptive name for a CommentRPdu
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class CommentReliablePdu extends CommentRPdu
-{}
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * more descriptive name for a CommentRPdu
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class CommentReliablePdu extends CommentRPdu
+{}
diff --git a/src-generated/edu/nps/moves/dis7/CommunicationsNodeID.java b/src-generated/edu/nps/moves/dis7/CommunicationsNodeID.java
index d4b48880d9a986b74ade2737980e1551485f0721..1cc818f7ec3c95521ab231acfee2431b9c4be886 100644
--- a/src-generated/edu/nps/moves/dis7/CommunicationsNodeID.java
+++ b/src-generated/edu/nps/moves/dis7/CommunicationsNodeID.java
@@ -1,183 +1,183 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Identity of a communications node. Section 6.2.48.4
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class CommunicationsNodeID extends Object implements Serializable
-{
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Identity of a communications node. Section 6.2.48.4
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class CommunicationsNodeID extends Object implements Serializable
+{
protected EntityID entityID = new EntityID();
-
+
protected short elementID;
-
-
-/** Constructor */
- public CommunicationsNodeID()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += entityID.getMarshalledSize();
- marshalSize += 2; // elementID
-
- return marshalSize;
-}
-
-
-/** Setter for {@link CommunicationsNodeID#entityID}*/
-public CommunicationsNodeID setEntityID(EntityID pEntityID)
+
+
+/** Constructor */
+ public CommunicationsNodeID()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += entityID.getMarshalledSize();
+ marshalSize += 2; // elementID
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link CommunicationsNodeID#entityID}*/
+public CommunicationsNodeID setEntityID(EntityID pEntityID)
{
- entityID = pEntityID;
- return this;
-}
-
-/** Getter for {@link CommunicationsNodeID#entityID}*/
-public EntityID getEntityID()
+ entityID = pEntityID;
+ return this;
+}
+
+/** Getter for {@link CommunicationsNodeID#entityID}*/
+public EntityID getEntityID()
{
return entityID;
-}
-
-/** Setter for {@link CommunicationsNodeID#elementID}*/
-public CommunicationsNodeID setElementID(short pElementID)
+}
+
+/** Setter for {@link CommunicationsNodeID#elementID}*/
+public CommunicationsNodeID setElementID(short pElementID)
{
- elementID = pElementID;
- return this;
-}
-
-/** Getter for {@link CommunicationsNodeID#elementID}*/
-public short getElementID()
+ elementID = pElementID;
+ return this;
+}
+
+/** Getter for {@link CommunicationsNodeID#elementID}*/
+public short getElementID()
{
return elementID;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- entityID.marshal(dos);
- dos.writeShort(elementID);
+ {
+ entityID.marshal(dos);
+ dos.writeShort(elementID);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- uPosition += entityID.unmarshal(dis);
- elementID = (short)dis.readUnsignedShort();
- uPosition += 2;
+ {
+ uPosition += entityID.unmarshal(dis);
+ elementID = (short)dis.readUnsignedShort();
+ uPosition += 2;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- entityID.marshal(buff);
- buff.putShort( (short)elementID);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- entityID.unmarshal(buff);
- elementID = (short)(buff.getShort() & 0xFFFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ entityID.marshal(buff);
+ buff.putShort( (short)elementID);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ entityID.unmarshal(buff);
+ elementID = (short)(buff.getShort() & 0xFFFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final CommunicationsNodeID rhs = (CommunicationsNodeID)obj;
-
- if( ! (entityID.equals( rhs.entityID) )) ivarsEqual = false;
- if( ! (elementID == rhs.elementID)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final CommunicationsNodeID rhs = (CommunicationsNodeID)obj;
+
+ if( ! (entityID.equals( rhs.entityID) )) ivarsEqual = false;
+ if( ! (elementID == rhs.elementID)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" entityID: ").append(entityID).append("\n");
- sb.append(" elementID: ").append(elementID).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" entityID: ").append(entityID).append("\n");
+ sb.append(" elementID: ").append(elementID).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/CreateEntityPdu.java b/src-generated/edu/nps/moves/dis7/CreateEntityPdu.java
index 38d6b5d3e1679df19d046779e37cda79835ebb89..4db1682bf4beb028f34d1ff00cb3017f09276e57 100644
--- a/src-generated/edu/nps/moves/dis7/CreateEntityPdu.java
+++ b/src-generated/edu/nps/moves/dis7/CreateEntityPdu.java
@@ -1,165 +1,165 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Section 7.5.2. Create a new entity. See 5.6.5.2.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class CreateEntityPdu extends SimulationManagementFamilyPdu implements Serializable
-{
- /** Identifier for the request. See 6.2.75 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Section 7.5.2. Create a new entity. See 5.6.5.2.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class CreateEntityPdu extends SimulationManagementFamilyPdu implements Serializable
+{
+ /** Identifier for the request. See 6.2.75 */
protected int requestID;
-
-
-/** Constructor */
- public CreateEntityPdu()
- {
- setPduType( DISPDUType.CREATE_ENTITY );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public CreateEntityPdu()
+ {
+ setPduType( DISPDUType.CREATE_ENTITY );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += 4; // requestID
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link CreateEntityPdu#requestID}*/
+public CreateEntityPdu setRequestID(int pRequestID)
{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += 4; // requestID
-
- return marshalSize;
-}
-
-
-/** Setter for {@link CreateEntityPdu#requestID}*/
-public CreateEntityPdu setRequestID(int pRequestID)
-{
- requestID = pRequestID;
- return this;
-}
-
-/** Getter for {@link CreateEntityPdu#requestID}*/
-public int getRequestID()
+ requestID = pRequestID;
+ return this;
+}
+
+/** Getter for {@link CreateEntityPdu#requestID}*/
+public int getRequestID()
{
return requestID;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- dos.writeInt(requestID);
+ {
+ dos.writeInt(requestID);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- requestID = dis.readInt();
- uPosition += 4;
+ {
+ requestID = dis.readInt();
+ uPosition += 4;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- buff.putInt( (int)requestID);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ buff.putInt( (int)requestID);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- requestID = buff.getInt();
- return getMarshalledSize();
+
+ requestID = buff.getInt();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final CreateEntityPdu rhs = (CreateEntityPdu)obj;
-
- if( ! (requestID == rhs.requestID)) ivarsEqual = false;
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final CreateEntityPdu rhs = (CreateEntityPdu)obj;
+
+ if( ! (requestID == rhs.requestID)) ivarsEqual = false;
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" requestID: ").append(requestID).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" requestID: ").append(requestID).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/CreateEntityRPdu.java b/src-generated/edu/nps/moves/dis7/CreateEntityRPdu.java
index 024387ea6a7802ba0e2b3263a15d8f8722f601bc..ccf13a899c4632fa907284aa95148c7e0aa45579 100644
--- a/src-generated/edu/nps/moves/dis7/CreateEntityRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/CreateEntityRPdu.java
@@ -1,235 +1,235 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.12.4.2 Serves the same function as the Create Entity PDU but with the addition of reliability service levels.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class CreateEntityRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
-{
- /** level of reliability service used for this transaction uid 74 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 5.12.4.2 Serves the same function as the Create Entity PDU but with the addition of reliability service levels.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class CreateEntityRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
+{
+ /** level of reliability service used for this transaction uid 74 */
protected RequiredReliabilityService requiredReliabilityService = RequiredReliabilityService.values()[0];
-
+
protected byte pad1;
-
+
protected short pad2;
-
- /** Request ID */
+
+ /** Request ID */
protected int requestID;
-
-
-/** Constructor */
- public CreateEntityRPdu()
- {
- setPduType( DISPDUType.CREATE_ENTITY_RELIABLE );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public CreateEntityRPdu()
+ {
+ setPduType( DISPDUType.CREATE_ENTITY_RELIABLE );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += requiredReliabilityService.getMarshalledSize();
+ marshalSize += 1; // pad1
+ marshalSize += 2; // pad2
+ marshalSize += 4; // requestID
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link CreateEntityRPdu#requiredReliabilityService}*/
+public CreateEntityRPdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += requiredReliabilityService.getMarshalledSize();
- marshalSize += 1; // pad1
- marshalSize += 2; // pad2
- marshalSize += 4; // requestID
-
- return marshalSize;
-}
-
-
-/** Setter for {@link CreateEntityRPdu#requiredReliabilityService}*/
-public CreateEntityRPdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
-{
- requiredReliabilityService = pRequiredReliabilityService;
- return this;
-}
-
-/** Getter for {@link CreateEntityRPdu#requiredReliabilityService}*/
-public RequiredReliabilityService getRequiredReliabilityService()
+ requiredReliabilityService = pRequiredReliabilityService;
+ return this;
+}
+
+/** Getter for {@link CreateEntityRPdu#requiredReliabilityService}*/
+public RequiredReliabilityService getRequiredReliabilityService()
{
return requiredReliabilityService;
-}
-
-/** Setter for {@link CreateEntityRPdu#pad1}*/
-public CreateEntityRPdu setPad1(byte pPad1)
+}
+
+/** Setter for {@link CreateEntityRPdu#pad1}*/
+public CreateEntityRPdu setPad1(byte pPad1)
{
- pad1 = pPad1;
- return this;
-}
-
-/** Getter for {@link CreateEntityRPdu#pad1}*/
-public byte getPad1()
+ pad1 = pPad1;
+ return this;
+}
+
+/** Getter for {@link CreateEntityRPdu#pad1}*/
+public byte getPad1()
{
return pad1;
-}
-
-/** Setter for {@link CreateEntityRPdu#pad2}*/
-public CreateEntityRPdu setPad2(short pPad2)
+}
+
+/** Setter for {@link CreateEntityRPdu#pad2}*/
+public CreateEntityRPdu setPad2(short pPad2)
{
- pad2 = pPad2;
- return this;
-}
-
-/** Getter for {@link CreateEntityRPdu#pad2}*/
-public short getPad2()
+ pad2 = pPad2;
+ return this;
+}
+
+/** Getter for {@link CreateEntityRPdu#pad2}*/
+public short getPad2()
{
return pad2;
-}
-
-/** Setter for {@link CreateEntityRPdu#requestID}*/
-public CreateEntityRPdu setRequestID(int pRequestID)
+}
+
+/** Setter for {@link CreateEntityRPdu#requestID}*/
+public CreateEntityRPdu setRequestID(int pRequestID)
{
- requestID = pRequestID;
- return this;
-}
-
-/** Getter for {@link CreateEntityRPdu#requestID}*/
-public int getRequestID()
+ requestID = pRequestID;
+ return this;
+}
+
+/** Getter for {@link CreateEntityRPdu#requestID}*/
+public int getRequestID()
{
return requestID;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- requiredReliabilityService.marshal(dos);
- dos.writeByte(pad1);
- dos.writeShort(pad2);
- dos.writeInt(requestID);
+ {
+ requiredReliabilityService.marshal(dos);
+ dos.writeByte(pad1);
+ dos.writeShort(pad2);
+ dos.writeInt(requestID);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(dis);
- uPosition += requiredReliabilityService.getMarshalledSize();
- pad1 = (byte)dis.readUnsignedByte();
- uPosition += 1;
- pad2 = (short)dis.readUnsignedShort();
- uPosition += 2;
- requestID = dis.readInt();
- uPosition += 4;
+ {
+ requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(dis);
+ uPosition += requiredReliabilityService.getMarshalledSize();
+ pad1 = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ pad2 = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ requestID = dis.readInt();
+ uPosition += 4;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- requiredReliabilityService.marshal(buff);
- buff.put( (byte)pad1);
- buff.putShort( (short)pad2);
- buff.putInt( (int)requestID);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ requiredReliabilityService.marshal(buff);
+ buff.put( (byte)pad1);
+ buff.putShort( (short)pad2);
+ buff.putInt( (int)requestID);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(buff);
- pad1 = (byte)(buff.get() & 0xFF);
- pad2 = (short)(buff.getShort() & 0xFFFF);
- requestID = buff.getInt();
- return getMarshalledSize();
+
+ requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(buff);
+ pad1 = (byte)(buff.get() & 0xFF);
+ pad2 = (short)(buff.getShort() & 0xFFFF);
+ requestID = buff.getInt();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final CreateEntityRPdu rhs = (CreateEntityRPdu)obj;
-
- if( ! (requiredReliabilityService == rhs.requiredReliabilityService)) ivarsEqual = false;
- if( ! (pad1 == rhs.pad1)) ivarsEqual = false;
- if( ! (pad2 == rhs.pad2)) ivarsEqual = false;
- if( ! (requestID == rhs.requestID)) ivarsEqual = false;
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final CreateEntityRPdu rhs = (CreateEntityRPdu)obj;
+
+ if( ! (requiredReliabilityService == rhs.requiredReliabilityService)) ivarsEqual = false;
+ if( ! (pad1 == rhs.pad1)) ivarsEqual = false;
+ if( ! (pad2 == rhs.pad2)) ivarsEqual = false;
+ if( ! (requestID == rhs.requestID)) ivarsEqual = false;
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
- sb.append(" pad1: ").append(pad1).append("\n");
- sb.append(" pad2: ").append(pad2).append("\n");
- sb.append(" requestID: ").append(requestID).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
+ sb.append(" pad1: ").append(pad1).append("\n");
+ sb.append(" pad2: ").append(pad2).append("\n");
+ sb.append(" requestID: ").append(requestID).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/CreateEntityReliablePdu.java b/src-generated/edu/nps/moves/dis7/CreateEntityReliablePdu.java
index 4d7d7464e1239f3ffcfa4b45a888faef6b0340ba..7f961af72c67fe1c83b4d34a5f8bc18141012c9b 100644
--- a/src-generated/edu/nps/moves/dis7/CreateEntityReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/CreateEntityReliablePdu.java
@@ -1,17 +1,17 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * more descriptive name for a CreateEntityRPdu
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class CreateEntityReliablePdu extends CreateEntityRPdu
-{}
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * more descriptive name for a CreateEntityRPdu
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class CreateEntityReliablePdu extends CreateEntityRPdu
+{}
diff --git a/src-generated/edu/nps/moves/dis7/DataFilterRecord.java b/src-generated/edu/nps/moves/dis7/DataFilterRecord.java
index ad92d3a147907f01f47888164015ace3ca5e6ccf..f98e961fec853fcd1d99ca0b5641121739b45e5f 100644
--- a/src-generated/edu/nps/moves/dis7/DataFilterRecord.java
+++ b/src-generated/edu/nps/moves/dis7/DataFilterRecord.java
@@ -1,23 +1,23 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * identify which of the optional data fields are contained in the Minefield Data PDU or requested in the Minefield Query PDU. This is a 32-bit record. For each field, true denotes that the data is requested or present and false denotes that the data is neither requested nor present. Section 6.2.16
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class DataFilterRecord extends Object implements Serializable
-{
- /** Bitflags field */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * identify which of the optional data fields are contained in the Minefield Data PDU or requested in the Minefield Query PDU. This is a 32-bit record. For each field, true denotes that the data is requested or present and false denotes that the data is neither requested nor present. Section 6.2.16
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class DataFilterRecord extends Object implements Serializable
+{
+ /** Bitflags field */
protected int bitFlags;
-
+
public static int GROUND_BURIAL_DEPTH_OFFSET_BIT = 0;
public static int WATER_BURIAL_DEPTH_OFFSET_BIT = 1;
public static int SNOW_BURIAL_DEPTH_OFFSET_BIT = 2;
@@ -29,156 +29,156 @@ public class DataFilterRecord extends Object implements Serializable
public static int FUSING_BIT = 8;
public static int SCALAR_DETECTION_COEFFICIENT_BIT = 9;
public static int PAINT_SCHEME_BIT = 10;
-
-/** Constructor */
- public DataFilterRecord()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+/** Constructor */
+ public DataFilterRecord()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 4; // bitFlags
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link DataFilterRecord#bitFlags}*/
+public DataFilterRecord setBitFlags(int pBitFlags)
{
- int marshalSize = 0;
-
- marshalSize += 4; // bitFlags
-
- return marshalSize;
-}
-
-
-/** Setter for {@link DataFilterRecord#bitFlags}*/
-public DataFilterRecord setBitFlags(int pBitFlags)
-{
- bitFlags = pBitFlags;
- return this;
-}
-
-/** Getter for {@link DataFilterRecord#bitFlags}*/
-public int getBitFlags()
+ bitFlags = pBitFlags;
+ return this;
+}
+
+/** Getter for {@link DataFilterRecord#bitFlags}*/
+public int getBitFlags()
{
return bitFlags;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeInt(bitFlags);
+ {
+ dos.writeInt(bitFlags);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- bitFlags = dis.readInt();
- uPosition += 4;
+ {
+ bitFlags = dis.readInt();
+ uPosition += 4;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putInt( (int)bitFlags);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- bitFlags = buff.getInt();
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putInt( (int)bitFlags);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ bitFlags = buff.getInt();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final DataFilterRecord rhs = (DataFilterRecord)obj;
-
- if( ! (bitFlags == rhs.bitFlags)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final DataFilterRecord rhs = (DataFilterRecord)obj;
+
+ if( ! (bitFlags == rhs.bitFlags)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" bitFlags: ").append(bitFlags).append("\n");
- sb.append(" GROUND_BURIAL_DEPTH_OFFSET_BIT: ").append(GROUND_BURIAL_DEPTH_OFFSET_BIT).append("\n");
- sb.append(" WATER_BURIAL_DEPTH_OFFSET_BIT: ").append(WATER_BURIAL_DEPTH_OFFSET_BIT).append("\n");
- sb.append(" SNOW_BURIAL_DEPTH_OFFSET_BIT: ").append(SNOW_BURIAL_DEPTH_OFFSET_BIT).append("\n");
- sb.append(" MINE_ORIENTATION_BIT: ").append(MINE_ORIENTATION_BIT).append("\n");
- sb.append(" THERMAL_CONSTRAST_BIT: ").append(THERMAL_CONSTRAST_BIT).append("\n");
- sb.append(" REFLECTANCE_BIT: ").append(REFLECTANCE_BIT).append("\n");
- sb.append(" MINE_EMPLACEMENT_TIME_BIT: ").append(MINE_EMPLACEMENT_TIME_BIT).append("\n");
- sb.append(" TRIP_DETONATION_WIRE_BIT: ").append(TRIP_DETONATION_WIRE_BIT).append("\n");
- sb.append(" FUSING_BIT: ").append(FUSING_BIT).append("\n");
- sb.append(" SCALAR_DETECTION_COEFFICIENT_BIT: ").append(SCALAR_DETECTION_COEFFICIENT_BIT).append("\n");
- sb.append(" PAINT_SCHEME_BIT: ").append(PAINT_SCHEME_BIT).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" bitFlags: ").append(bitFlags).append("\n");
+ sb.append(" GROUND_BURIAL_DEPTH_OFFSET_BIT: ").append(GROUND_BURIAL_DEPTH_OFFSET_BIT).append("\n");
+ sb.append(" WATER_BURIAL_DEPTH_OFFSET_BIT: ").append(WATER_BURIAL_DEPTH_OFFSET_BIT).append("\n");
+ sb.append(" SNOW_BURIAL_DEPTH_OFFSET_BIT: ").append(SNOW_BURIAL_DEPTH_OFFSET_BIT).append("\n");
+ sb.append(" MINE_ORIENTATION_BIT: ").append(MINE_ORIENTATION_BIT).append("\n");
+ sb.append(" THERMAL_CONSTRAST_BIT: ").append(THERMAL_CONSTRAST_BIT).append("\n");
+ sb.append(" REFLECTANCE_BIT: ").append(REFLECTANCE_BIT).append("\n");
+ sb.append(" MINE_EMPLACEMENT_TIME_BIT: ").append(MINE_EMPLACEMENT_TIME_BIT).append("\n");
+ sb.append(" TRIP_DETONATION_WIRE_BIT: ").append(TRIP_DETONATION_WIRE_BIT).append("\n");
+ sb.append(" FUSING_BIT: ").append(FUSING_BIT).append("\n");
+ sb.append(" SCALAR_DETECTION_COEFFICIENT_BIT: ").append(SCALAR_DETECTION_COEFFICIENT_BIT).append("\n");
+ sb.append(" PAINT_SCHEME_BIT: ").append(PAINT_SCHEME_BIT).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/DataPdu.java b/src-generated/edu/nps/moves/dis7/DataPdu.java
index ae6fb84b1c17286984b4d2cc1dc60b8fe3322b04..81b68316530b8e2494c80e4507b3201a2be90d5e 100644
--- a/src-generated/edu/nps/moves/dis7/DataPdu.java
+++ b/src-generated/edu/nps/moves/dis7/DataPdu.java
@@ -1,317 +1,317 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 7.5.11 Information issued in response to a Data Query PDU or Set Data PDU. Section 5.6.5.11
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class DataPdu extends SimulationManagementFamilyPdu implements Serializable
-{
- /** ID of request */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 7.5.11 Information issued in response to a Data Query PDU or Set Data PDU. Section 5.6.5.11
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class DataPdu extends SimulationManagementFamilyPdu implements Serializable
+{
+ /** ID of request */
protected int requestID;
-
- /** padding */
+
+ /** padding */
protected int padding1 = (int)0;
-
- /** Number of fixed datum records */
+
+ /** Number of fixed datum records */
protected int numberOfFixedDatumRecords;
-
- /** Number of variable datum records, handled automatically by marshaller at run time (and not modifiable by end-user programmers) */
+
+ /** Number of variable datum records, handled automatically by marshaller at run time (and not modifiable by end-user programmers) */
protected int numberOfVariableDatumRecords;
-
- /** variable length list of fixed datums */
+
+ /** variable length list of fixed datums */
protected List< FixedDatum > fixedDatums = new ArrayList< FixedDatum >();
-
- /** variable length list of variable length datums */
+
+ /** variable length list of variable length datums */
protected List< VariableDatum > variableDatums = new ArrayList< VariableDatum >();
-
-
-/** Constructor */
- public DataPdu()
- {
- setPduType( DISPDUType.DATA );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += 4; // requestID
- marshalSize += 4; // padding1
- marshalSize += 4; // numberOfFixedDatumRecords
- marshalSize += 4; // numberOfVariableDatumRecords
- for(int idx=0; idx < fixedDatums.size(); idx++)
- {
- FixedDatum listElement = fixedDatums.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
- for(int idx=0; idx < variableDatums.size(); idx++)
- {
- VariableDatum listElement = variableDatums.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link DataPdu#requestID}*/
-public DataPdu setRequestID(int pRequestID)
+
+
+/** Constructor */
+ public DataPdu()
+ {
+ setPduType( DISPDUType.DATA );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += 4; // requestID
+ marshalSize += 4; // padding1
+ marshalSize += 4; // numberOfFixedDatumRecords
+ marshalSize += 4; // numberOfVariableDatumRecords
+ for(int idx=0; idx < fixedDatums.size(); idx++)
+ {
+ FixedDatum listElement = fixedDatums.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+ for(int idx=0; idx < variableDatums.size(); idx++)
+ {
+ VariableDatum listElement = variableDatums.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link DataPdu#requestID}*/
+public DataPdu setRequestID(int pRequestID)
{
- requestID = pRequestID;
- return this;
-}
-
-/** Getter for {@link DataPdu#requestID}*/
-public int getRequestID()
+ requestID = pRequestID;
+ return this;
+}
+
+/** Getter for {@link DataPdu#requestID}*/
+public int getRequestID()
{
return requestID;
-}
-
-/** Setter for {@link DataPdu#padding1}*/
-public DataPdu setPadding1(int pPadding1)
+}
+
+/** Setter for {@link DataPdu#padding1}*/
+public DataPdu setPadding1(int pPadding1)
{
- padding1 = pPadding1;
- return this;
-}
-
-/** Getter for {@link DataPdu#padding1}*/
-public int getPadding1()
+ padding1 = pPadding1;
+ return this;
+}
+
+/** Getter for {@link DataPdu#padding1}*/
+public int getPadding1()
{
return padding1;
-}
-
-/** Setter for {@link DataPdu#fixedDatums}*/
-public DataPdu setFixedDatums(List<FixedDatum> pFixedDatums)
+}
+
+/** Setter for {@link DataPdu#fixedDatums}*/
+public DataPdu setFixedDatums(List<FixedDatum> pFixedDatums)
{
- fixedDatums = pFixedDatums;
- return this;
-}
-
-/** Getter for {@link DataPdu#fixedDatums}*/
-public List<FixedDatum> getFixedDatums()
+ fixedDatums = pFixedDatums;
+ return this;
+}
+
+/** Getter for {@link DataPdu#fixedDatums}*/
+public List<FixedDatum> getFixedDatums()
{
return fixedDatums;
-}
-
-/** Setter for {@link DataPdu#variableDatums}*/
-public DataPdu setVariableDatums(List<VariableDatum> pVariableDatums)
+}
+
+/** Setter for {@link DataPdu#variableDatums}*/
+public DataPdu setVariableDatums(List<VariableDatum> pVariableDatums)
{
- variableDatums = pVariableDatums;
- return this;
-}
-
-/** Getter for {@link DataPdu#variableDatums}*/
-public List<VariableDatum> getVariableDatums()
+ variableDatums = pVariableDatums;
+ return this;
+}
+
+/** Getter for {@link DataPdu#variableDatums}*/
+public List<VariableDatum> getVariableDatums()
{
return variableDatums;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- dos.writeInt(requestID);
- dos.writeInt(padding1);
- dos.writeInt(fixedDatums.size());
- dos.writeInt(variableDatums.size());
-
- for(int idx = 0; idx < fixedDatums.size(); idx++)
- {
- FixedDatum aFixedDatum = fixedDatums.get(idx);
- aFixedDatum.marshal(dos);
- }
-
-
- for(int idx = 0; idx < variableDatums.size(); idx++)
- {
- VariableDatum aVariableDatum = variableDatums.get(idx);
- aVariableDatum.marshal(dos);
- }
-
+ {
+ dos.writeInt(requestID);
+ dos.writeInt(padding1);
+ dos.writeInt(fixedDatums.size());
+ dos.writeInt(variableDatums.size());
+
+ for(int idx = 0; idx < fixedDatums.size(); idx++)
+ {
+ FixedDatum aFixedDatum = fixedDatums.get(idx);
+ aFixedDatum.marshal(dos);
+ }
+
+
+ for(int idx = 0; idx < variableDatums.size(); idx++)
+ {
+ VariableDatum aVariableDatum = variableDatums.get(idx);
+ aVariableDatum.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- requestID = dis.readInt();
- uPosition += 4;
- padding1 = dis.readInt();
- uPosition += 4;
- numberOfFixedDatumRecords = dis.readInt();
- uPosition += 4;
- numberOfVariableDatumRecords = dis.readInt();
- uPosition += 4;
- for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
- {
- FixedDatum anX = new FixedDatum();
- uPosition += anX.unmarshal(dis);
- fixedDatums.add(anX);
- }
-
- for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
- {
- VariableDatum anX = new VariableDatum();
- uPosition += anX.unmarshal(dis);
- variableDatums.add(anX);
- }
-
+ {
+ requestID = dis.readInt();
+ uPosition += 4;
+ padding1 = dis.readInt();
+ uPosition += 4;
+ numberOfFixedDatumRecords = dis.readInt();
+ uPosition += 4;
+ numberOfVariableDatumRecords = dis.readInt();
+ uPosition += 4;
+ for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
+ {
+ FixedDatum anX = new FixedDatum();
+ uPosition += anX.unmarshal(dis);
+ fixedDatums.add(anX);
+ }
+
+ for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
+ {
+ VariableDatum anX = new VariableDatum();
+ uPosition += anX.unmarshal(dis);
+ variableDatums.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- buff.putInt( (int)requestID);
- buff.putInt( (int)padding1);
- buff.putInt( (int)fixedDatums.size());
- buff.putInt( (int)variableDatums.size());
-
- for(int idx = 0; idx < fixedDatums.size(); idx++)
- {
- FixedDatum aFixedDatum = fixedDatums.get(idx);
- aFixedDatum.marshal(buff);
- }
-
-
- for(int idx = 0; idx < variableDatums.size(); idx++)
- {
- VariableDatum aVariableDatum = variableDatums.get(idx);
- aVariableDatum.marshal(buff);
- }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ buff.putInt( (int)requestID);
+ buff.putInt( (int)padding1);
+ buff.putInt( (int)fixedDatums.size());
+ buff.putInt( (int)variableDatums.size());
+
+ for(int idx = 0; idx < fixedDatums.size(); idx++)
+ {
+ FixedDatum aFixedDatum = fixedDatums.get(idx);
+ aFixedDatum.marshal(buff);
+ }
+
+
+ for(int idx = 0; idx < variableDatums.size(); idx++)
+ {
+ VariableDatum aVariableDatum = variableDatums.get(idx);
+ aVariableDatum.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- requestID = buff.getInt();
- padding1 = buff.getInt();
- numberOfFixedDatumRecords = buff.getInt();
- numberOfVariableDatumRecords = buff.getInt();
- for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
- {
- FixedDatum anX = new FixedDatum();
- anX.unmarshal(buff);
- fixedDatums.add(anX);
- }
-
- for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
- {
- VariableDatum anX = new VariableDatum();
- anX.unmarshal(buff);
- variableDatums.add(anX);
- }
-
- return getMarshalledSize();
+
+ requestID = buff.getInt();
+ padding1 = buff.getInt();
+ numberOfFixedDatumRecords = buff.getInt();
+ numberOfVariableDatumRecords = buff.getInt();
+ for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
+ {
+ FixedDatum anX = new FixedDatum();
+ anX.unmarshal(buff);
+ fixedDatums.add(anX);
+ }
+
+ for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
+ {
+ VariableDatum anX = new VariableDatum();
+ anX.unmarshal(buff);
+ variableDatums.add(anX);
+ }
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final DataPdu rhs = (DataPdu)obj;
-
- if( ! (requestID == rhs.requestID)) ivarsEqual = false;
- if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
-
- for(int idx = 0; idx < fixedDatums.size(); idx++)
- if( ! ( fixedDatums.get(idx).equals(rhs.fixedDatums.get(idx)))) ivarsEqual = false;
-
-
- for(int idx = 0; idx < variableDatums.size(); idx++)
- if( ! ( variableDatums.get(idx).equals(rhs.variableDatums.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final DataPdu rhs = (DataPdu)obj;
+
+ if( ! (requestID == rhs.requestID)) ivarsEqual = false;
+ if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
+
+ for(int idx = 0; idx < fixedDatums.size(); idx++)
+ if( ! ( fixedDatums.get(idx).equals(rhs.fixedDatums.get(idx)))) ivarsEqual = false;
+
+
+ for(int idx = 0; idx < variableDatums.size(); idx++)
+ if( ! ( variableDatums.get(idx).equals(rhs.variableDatums.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" requestID: ").append(requestID).append("\n");
- sb.append(" padding1: ").append(padding1).append("\n");
- sb.append(" fixedDatums: ").append("\n");
- fixedDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
- sb.append(" variableDatums: ").append("\n");
- variableDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" requestID: ").append(requestID).append("\n");
+ sb.append(" padding1: ").append(padding1).append("\n");
+ sb.append(" fixedDatums: ").append("\n");
+ fixedDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+ sb.append(" variableDatums: ").append("\n");
+ variableDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/DataQueryDatumSpecification.java b/src-generated/edu/nps/moves/dis7/DataQueryDatumSpecification.java
index c6b62e1ba086f1cbef47d0072209e08189a5a636..8385c78458b54a670cdb4895bb32032486d72ee9 100644
--- a/src-generated/edu/nps/moves/dis7/DataQueryDatumSpecification.java
+++ b/src-generated/edu/nps/moves/dis7/DataQueryDatumSpecification.java
@@ -1,266 +1,266 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * List of fixed and variable datum records. Section 6.2.17
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class DataQueryDatumSpecification extends Object implements Serializable
-{
- /** Number of fixed datums */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * List of fixed and variable datum records. Section 6.2.17
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class DataQueryDatumSpecification extends Object implements Serializable
+{
+ /** Number of fixed datums */
protected int numberOfFixedDatums;
-
- /** Number of variable datums */
+
+ /** Number of variable datums */
protected int numberOfVariableDatums;
-
- /** variable length list fixed datum IDs */
+
+ /** variable length list fixed datum IDs */
protected List< UnsignedDISInteger > fixedDatumIDList = new ArrayList< UnsignedDISInteger >();
-
- /** variable length list variable datum IDs */
+
+ /** variable length list variable datum IDs */
protected List< UnsignedDISInteger > variableDatumIDList = new ArrayList< UnsignedDISInteger >();
-
-
-/** Constructor */
- public DataQueryDatumSpecification()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public DataQueryDatumSpecification()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 4; // numberOfFixedDatums
+ marshalSize += 4; // numberOfVariableDatums
+ for(int idx=0; idx < fixedDatumIDList.size(); idx++)
+ {
+ UnsignedDISInteger listElement = fixedDatumIDList.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+ for(int idx=0; idx < variableDatumIDList.size(); idx++)
+ {
+ UnsignedDISInteger listElement = variableDatumIDList.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link DataQueryDatumSpecification#fixedDatumIDList}*/
+public DataQueryDatumSpecification setFixedDatumIDList(List<UnsignedDISInteger> pFixedDatumIDList)
{
- int marshalSize = 0;
-
- marshalSize += 4; // numberOfFixedDatums
- marshalSize += 4; // numberOfVariableDatums
- for(int idx=0; idx < fixedDatumIDList.size(); idx++)
- {
- UnsignedDISInteger listElement = fixedDatumIDList.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
- for(int idx=0; idx < variableDatumIDList.size(); idx++)
- {
- UnsignedDISInteger listElement = variableDatumIDList.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link DataQueryDatumSpecification#fixedDatumIDList}*/
-public DataQueryDatumSpecification setFixedDatumIDList(List<UnsignedDISInteger> pFixedDatumIDList)
-{
- fixedDatumIDList = pFixedDatumIDList;
- return this;
-}
-
-/** Getter for {@link DataQueryDatumSpecification#fixedDatumIDList}*/
-public List<UnsignedDISInteger> getFixedDatumIDList()
+ fixedDatumIDList = pFixedDatumIDList;
+ return this;
+}
+
+/** Getter for {@link DataQueryDatumSpecification#fixedDatumIDList}*/
+public List<UnsignedDISInteger> getFixedDatumIDList()
{
return fixedDatumIDList;
-}
-
-/** Setter for {@link DataQueryDatumSpecification#variableDatumIDList}*/
-public DataQueryDatumSpecification setVariableDatumIDList(List<UnsignedDISInteger> pVariableDatumIDList)
+}
+
+/** Setter for {@link DataQueryDatumSpecification#variableDatumIDList}*/
+public DataQueryDatumSpecification setVariableDatumIDList(List<UnsignedDISInteger> pVariableDatumIDList)
{
- variableDatumIDList = pVariableDatumIDList;
- return this;
-}
-
-/** Getter for {@link DataQueryDatumSpecification#variableDatumIDList}*/
-public List<UnsignedDISInteger> getVariableDatumIDList()
+ variableDatumIDList = pVariableDatumIDList;
+ return this;
+}
+
+/** Getter for {@link DataQueryDatumSpecification#variableDatumIDList}*/
+public List<UnsignedDISInteger> getVariableDatumIDList()
{
return variableDatumIDList;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeInt(fixedDatumIDList.size());
- dos.writeInt(variableDatumIDList.size());
-
- for(int idx = 0; idx < fixedDatumIDList.size(); idx++)
- {
- UnsignedDISInteger aUnsignedDISInteger = fixedDatumIDList.get(idx);
- aUnsignedDISInteger.marshal(dos);
- }
-
-
- for(int idx = 0; idx < variableDatumIDList.size(); idx++)
- {
- UnsignedDISInteger aUnsignedDISInteger = variableDatumIDList.get(idx);
- aUnsignedDISInteger.marshal(dos);
- }
-
+ {
+ dos.writeInt(fixedDatumIDList.size());
+ dos.writeInt(variableDatumIDList.size());
+
+ for(int idx = 0; idx < fixedDatumIDList.size(); idx++)
+ {
+ UnsignedDISInteger aUnsignedDISInteger = fixedDatumIDList.get(idx);
+ aUnsignedDISInteger.marshal(dos);
+ }
+
+
+ for(int idx = 0; idx < variableDatumIDList.size(); idx++)
+ {
+ UnsignedDISInteger aUnsignedDISInteger = variableDatumIDList.get(idx);
+ aUnsignedDISInteger.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- numberOfFixedDatums = dis.readInt();
- uPosition += 4;
- numberOfVariableDatums = dis.readInt();
- uPosition += 4;
- for(int idx = 0; idx < numberOfFixedDatums; idx++)
- {
- UnsignedDISInteger anX = new UnsignedDISInteger();
- uPosition += anX.unmarshal(dis);
- fixedDatumIDList.add(anX);
- }
-
- for(int idx = 0; idx < numberOfVariableDatums; idx++)
- {
- UnsignedDISInteger anX = new UnsignedDISInteger();
- uPosition += anX.unmarshal(dis);
- variableDatumIDList.add(anX);
- }
-
+ {
+ numberOfFixedDatums = dis.readInt();
+ uPosition += 4;
+ numberOfVariableDatums = dis.readInt();
+ uPosition += 4;
+ for(int idx = 0; idx < numberOfFixedDatums; idx++)
+ {
+ UnsignedDISInteger anX = new UnsignedDISInteger();
+ uPosition += anX.unmarshal(dis);
+ fixedDatumIDList.add(anX);
+ }
+
+ for(int idx = 0; idx < numberOfVariableDatums; idx++)
+ {
+ UnsignedDISInteger anX = new UnsignedDISInteger();
+ uPosition += anX.unmarshal(dis);
+ variableDatumIDList.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putInt( (int)fixedDatumIDList.size());
- buff.putInt( (int)variableDatumIDList.size());
-
- for(int idx = 0; idx < fixedDatumIDList.size(); idx++)
- {
- UnsignedDISInteger aUnsignedDISInteger = fixedDatumIDList.get(idx);
- aUnsignedDISInteger.marshal(buff);
- }
-
-
- for(int idx = 0; idx < variableDatumIDList.size(); idx++)
- {
- UnsignedDISInteger aUnsignedDISInteger = variableDatumIDList.get(idx);
- aUnsignedDISInteger.marshal(buff);
- }
-
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- numberOfFixedDatums = buff.getInt();
- numberOfVariableDatums = buff.getInt();
- for(int idx = 0; idx < numberOfFixedDatums; idx++)
- {
- UnsignedDISInteger anX = new UnsignedDISInteger();
- anX.unmarshal(buff);
- fixedDatumIDList.add(anX);
- }
-
- for(int idx = 0; idx < numberOfVariableDatums; idx++)
- {
- UnsignedDISInteger anX = new UnsignedDISInteger();
- anX.unmarshal(buff);
- variableDatumIDList.add(anX);
- }
-
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putInt( (int)fixedDatumIDList.size());
+ buff.putInt( (int)variableDatumIDList.size());
+
+ for(int idx = 0; idx < fixedDatumIDList.size(); idx++)
+ {
+ UnsignedDISInteger aUnsignedDISInteger = fixedDatumIDList.get(idx);
+ aUnsignedDISInteger.marshal(buff);
+ }
+
+
+ for(int idx = 0; idx < variableDatumIDList.size(); idx++)
+ {
+ UnsignedDISInteger aUnsignedDISInteger = variableDatumIDList.get(idx);
+ aUnsignedDISInteger.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ numberOfFixedDatums = buff.getInt();
+ numberOfVariableDatums = buff.getInt();
+ for(int idx = 0; idx < numberOfFixedDatums; idx++)
+ {
+ UnsignedDISInteger anX = new UnsignedDISInteger();
+ anX.unmarshal(buff);
+ fixedDatumIDList.add(anX);
+ }
+
+ for(int idx = 0; idx < numberOfVariableDatums; idx++)
+ {
+ UnsignedDISInteger anX = new UnsignedDISInteger();
+ anX.unmarshal(buff);
+ variableDatumIDList.add(anX);
+ }
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final DataQueryDatumSpecification rhs = (DataQueryDatumSpecification)obj;
-
-
- for(int idx = 0; idx < fixedDatumIDList.size(); idx++)
- if( ! ( fixedDatumIDList.get(idx).equals(rhs.fixedDatumIDList.get(idx)))) ivarsEqual = false;
-
-
- for(int idx = 0; idx < variableDatumIDList.size(); idx++)
- if( ! ( variableDatumIDList.get(idx).equals(rhs.variableDatumIDList.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final DataQueryDatumSpecification rhs = (DataQueryDatumSpecification)obj;
+
+
+ for(int idx = 0; idx < fixedDatumIDList.size(); idx++)
+ if( ! ( fixedDatumIDList.get(idx).equals(rhs.fixedDatumIDList.get(idx)))) ivarsEqual = false;
+
+
+ for(int idx = 0; idx < variableDatumIDList.size(); idx++)
+ if( ! ( variableDatumIDList.get(idx).equals(rhs.variableDatumIDList.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" fixedDatumIDList: ").append("\n");
- fixedDatumIDList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
- sb.append(" variableDatumIDList: ").append("\n");
- variableDatumIDList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" fixedDatumIDList: ").append("\n");
+ fixedDatumIDList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+ sb.append(" variableDatumIDList: ").append("\n");
+ variableDatumIDList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/DataQueryPdu.java b/src-generated/edu/nps/moves/dis7/DataQueryPdu.java
index ebf2ddc955aa9767d317ab3e26de30684b336dc0..b8adb6ec261570a7d59c2418306dfb834cb9b47b 100644
--- a/src-generated/edu/nps/moves/dis7/DataQueryPdu.java
+++ b/src-generated/edu/nps/moves/dis7/DataQueryPdu.java
@@ -1,317 +1,317 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Section 7.5.9. Request for data from an entity. See 5.6.5.9
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class DataQueryPdu extends SimulationManagementFamilyPdu implements Serializable
-{
- /** ID of request */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Section 7.5.9. Request for data from an entity. See 5.6.5.9
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class DataQueryPdu extends SimulationManagementFamilyPdu implements Serializable
+{
+ /** ID of request */
protected int requestID;
-
- /** time issues between issues of Data PDUs. Zero means send once only. */
+
+ /** time issues between issues of Data PDUs. Zero means send once only. */
protected int timeInterval;
-
- /** Number of fixed datum records */
+
+ /** Number of fixed datum records */
protected int numberOfFixedDatumRecords;
-
- /** Number of variable datum records, handled automatically by marshaller at run time (and not modifiable by end-user programmers) */
+
+ /** Number of variable datum records, handled automatically by marshaller at run time (and not modifiable by end-user programmers) */
protected int numberOfVariableDatumRecords;
-
- /** variable length list of fixed datums */
+
+ /** variable length list of fixed datums */
protected List< FixedDatum > fixedDatums = new ArrayList< FixedDatum >();
-
- /** variable length list of variable length datums */
+
+ /** variable length list of variable length datums */
protected List< VariableDatum > variableDatums = new ArrayList< VariableDatum >();
-
-
-/** Constructor */
- public DataQueryPdu()
- {
- setPduType( DISPDUType.DATA_QUERY );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += 4; // requestID
- marshalSize += 4; // timeInterval
- marshalSize += 4; // numberOfFixedDatumRecords
- marshalSize += 4; // numberOfVariableDatumRecords
- for(int idx=0; idx < fixedDatums.size(); idx++)
- {
- FixedDatum listElement = fixedDatums.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
- for(int idx=0; idx < variableDatums.size(); idx++)
- {
- VariableDatum listElement = variableDatums.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link DataQueryPdu#requestID}*/
-public DataQueryPdu setRequestID(int pRequestID)
+
+
+/** Constructor */
+ public DataQueryPdu()
+ {
+ setPduType( DISPDUType.DATA_QUERY );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += 4; // requestID
+ marshalSize += 4; // timeInterval
+ marshalSize += 4; // numberOfFixedDatumRecords
+ marshalSize += 4; // numberOfVariableDatumRecords
+ for(int idx=0; idx < fixedDatums.size(); idx++)
+ {
+ FixedDatum listElement = fixedDatums.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+ for(int idx=0; idx < variableDatums.size(); idx++)
+ {
+ VariableDatum listElement = variableDatums.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link DataQueryPdu#requestID}*/
+public DataQueryPdu setRequestID(int pRequestID)
{
- requestID = pRequestID;
- return this;
-}
-
-/** Getter for {@link DataQueryPdu#requestID}*/
-public int getRequestID()
+ requestID = pRequestID;
+ return this;
+}
+
+/** Getter for {@link DataQueryPdu#requestID}*/
+public int getRequestID()
{
return requestID;
-}
-
-/** Setter for {@link DataQueryPdu#timeInterval}*/
-public DataQueryPdu setTimeInterval(int pTimeInterval)
+}
+
+/** Setter for {@link DataQueryPdu#timeInterval}*/
+public DataQueryPdu setTimeInterval(int pTimeInterval)
{
- timeInterval = pTimeInterval;
- return this;
-}
-
-/** Getter for {@link DataQueryPdu#timeInterval}*/
-public int getTimeInterval()
+ timeInterval = pTimeInterval;
+ return this;
+}
+
+/** Getter for {@link DataQueryPdu#timeInterval}*/
+public int getTimeInterval()
{
return timeInterval;
-}
-
-/** Setter for {@link DataQueryPdu#fixedDatums}*/
-public DataQueryPdu setFixedDatums(List<FixedDatum> pFixedDatums)
+}
+
+/** Setter for {@link DataQueryPdu#fixedDatums}*/
+public DataQueryPdu setFixedDatums(List<FixedDatum> pFixedDatums)
{
- fixedDatums = pFixedDatums;
- return this;
-}
-
-/** Getter for {@link DataQueryPdu#fixedDatums}*/
-public List<FixedDatum> getFixedDatums()
+ fixedDatums = pFixedDatums;
+ return this;
+}
+
+/** Getter for {@link DataQueryPdu#fixedDatums}*/
+public List<FixedDatum> getFixedDatums()
{
return fixedDatums;
-}
-
-/** Setter for {@link DataQueryPdu#variableDatums}*/
-public DataQueryPdu setVariableDatums(List<VariableDatum> pVariableDatums)
+}
+
+/** Setter for {@link DataQueryPdu#variableDatums}*/
+public DataQueryPdu setVariableDatums(List<VariableDatum> pVariableDatums)
{
- variableDatums = pVariableDatums;
- return this;
-}
-
-/** Getter for {@link DataQueryPdu#variableDatums}*/
-public List<VariableDatum> getVariableDatums()
+ variableDatums = pVariableDatums;
+ return this;
+}
+
+/** Getter for {@link DataQueryPdu#variableDatums}*/
+public List<VariableDatum> getVariableDatums()
{
return variableDatums;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- dos.writeInt(requestID);
- dos.writeInt(timeInterval);
- dos.writeInt(fixedDatums.size());
- dos.writeInt(variableDatums.size());
-
- for(int idx = 0; idx < fixedDatums.size(); idx++)
- {
- FixedDatum aFixedDatum = fixedDatums.get(idx);
- aFixedDatum.marshal(dos);
- }
-
-
- for(int idx = 0; idx < variableDatums.size(); idx++)
- {
- VariableDatum aVariableDatum = variableDatums.get(idx);
- aVariableDatum.marshal(dos);
- }
-
+ {
+ dos.writeInt(requestID);
+ dos.writeInt(timeInterval);
+ dos.writeInt(fixedDatums.size());
+ dos.writeInt(variableDatums.size());
+
+ for(int idx = 0; idx < fixedDatums.size(); idx++)
+ {
+ FixedDatum aFixedDatum = fixedDatums.get(idx);
+ aFixedDatum.marshal(dos);
+ }
+
+
+ for(int idx = 0; idx < variableDatums.size(); idx++)
+ {
+ VariableDatum aVariableDatum = variableDatums.get(idx);
+ aVariableDatum.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- requestID = dis.readInt();
- uPosition += 4;
- timeInterval = dis.readInt();
- uPosition += 4;
- numberOfFixedDatumRecords = dis.readInt();
- uPosition += 4;
- numberOfVariableDatumRecords = dis.readInt();
- uPosition += 4;
- for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
- {
- FixedDatum anX = new FixedDatum();
- uPosition += anX.unmarshal(dis);
- fixedDatums.add(anX);
- }
-
- for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
- {
- VariableDatum anX = new VariableDatum();
- uPosition += anX.unmarshal(dis);
- variableDatums.add(anX);
- }
-
+ {
+ requestID = dis.readInt();
+ uPosition += 4;
+ timeInterval = dis.readInt();
+ uPosition += 4;
+ numberOfFixedDatumRecords = dis.readInt();
+ uPosition += 4;
+ numberOfVariableDatumRecords = dis.readInt();
+ uPosition += 4;
+ for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
+ {
+ FixedDatum anX = new FixedDatum();
+ uPosition += anX.unmarshal(dis);
+ fixedDatums.add(anX);
+ }
+
+ for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
+ {
+ VariableDatum anX = new VariableDatum();
+ uPosition += anX.unmarshal(dis);
+ variableDatums.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- buff.putInt( (int)requestID);
- buff.putInt( (int)timeInterval);
- buff.putInt( (int)fixedDatums.size());
- buff.putInt( (int)variableDatums.size());
-
- for(int idx = 0; idx < fixedDatums.size(); idx++)
- {
- FixedDatum aFixedDatum = fixedDatums.get(idx);
- aFixedDatum.marshal(buff);
- }
-
-
- for(int idx = 0; idx < variableDatums.size(); idx++)
- {
- VariableDatum aVariableDatum = variableDatums.get(idx);
- aVariableDatum.marshal(buff);
- }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ buff.putInt( (int)requestID);
+ buff.putInt( (int)timeInterval);
+ buff.putInt( (int)fixedDatums.size());
+ buff.putInt( (int)variableDatums.size());
+
+ for(int idx = 0; idx < fixedDatums.size(); idx++)
+ {
+ FixedDatum aFixedDatum = fixedDatums.get(idx);
+ aFixedDatum.marshal(buff);
+ }
+
+
+ for(int idx = 0; idx < variableDatums.size(); idx++)
+ {
+ VariableDatum aVariableDatum = variableDatums.get(idx);
+ aVariableDatum.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- requestID = buff.getInt();
- timeInterval = buff.getInt();
- numberOfFixedDatumRecords = buff.getInt();
- numberOfVariableDatumRecords = buff.getInt();
- for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
- {
- FixedDatum anX = new FixedDatum();
- anX.unmarshal(buff);
- fixedDatums.add(anX);
- }
-
- for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
- {
- VariableDatum anX = new VariableDatum();
- anX.unmarshal(buff);
- variableDatums.add(anX);
- }
-
- return getMarshalledSize();
+
+ requestID = buff.getInt();
+ timeInterval = buff.getInt();
+ numberOfFixedDatumRecords = buff.getInt();
+ numberOfVariableDatumRecords = buff.getInt();
+ for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
+ {
+ FixedDatum anX = new FixedDatum();
+ anX.unmarshal(buff);
+ fixedDatums.add(anX);
+ }
+
+ for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
+ {
+ VariableDatum anX = new VariableDatum();
+ anX.unmarshal(buff);
+ variableDatums.add(anX);
+ }
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final DataQueryPdu rhs = (DataQueryPdu)obj;
-
- if( ! (requestID == rhs.requestID)) ivarsEqual = false;
- if( ! (timeInterval == rhs.timeInterval)) ivarsEqual = false;
-
- for(int idx = 0; idx < fixedDatums.size(); idx++)
- if( ! ( fixedDatums.get(idx).equals(rhs.fixedDatums.get(idx)))) ivarsEqual = false;
-
-
- for(int idx = 0; idx < variableDatums.size(); idx++)
- if( ! ( variableDatums.get(idx).equals(rhs.variableDatums.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final DataQueryPdu rhs = (DataQueryPdu)obj;
+
+ if( ! (requestID == rhs.requestID)) ivarsEqual = false;
+ if( ! (timeInterval == rhs.timeInterval)) ivarsEqual = false;
+
+ for(int idx = 0; idx < fixedDatums.size(); idx++)
+ if( ! ( fixedDatums.get(idx).equals(rhs.fixedDatums.get(idx)))) ivarsEqual = false;
+
+
+ for(int idx = 0; idx < variableDatums.size(); idx++)
+ if( ! ( variableDatums.get(idx).equals(rhs.variableDatums.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" requestID: ").append(requestID).append("\n");
- sb.append(" timeInterval: ").append(timeInterval).append("\n");
- sb.append(" fixedDatums: ").append("\n");
- fixedDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
- sb.append(" variableDatums: ").append("\n");
- variableDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" requestID: ").append(requestID).append("\n");
+ sb.append(" timeInterval: ").append(timeInterval).append("\n");
+ sb.append(" fixedDatums: ").append("\n");
+ fixedDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+ sb.append(" variableDatums: ").append("\n");
+ variableDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/DataQueryRPdu.java b/src-generated/edu/nps/moves/dis7/DataQueryRPdu.java
index 36e74d807291eecb26276b5e0fd8585b6ecd42a2..534292ca3f57c29e504d96605b425715f462fe1b 100644
--- a/src-generated/edu/nps/moves/dis7/DataQueryRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/DataQueryRPdu.java
@@ -1,389 +1,389 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.12.4.9 Serves the same function as the Data Query PDU but with the addition of reliability service levels
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class DataQueryRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
-{
- /** level of reliability service used for this transaction uid 74 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 5.12.4.9 Serves the same function as the Data Query PDU but with the addition of reliability service levels
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class DataQueryRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
+{
+ /** level of reliability service used for this transaction uid 74 */
protected RequiredReliabilityService requiredReliabilityService = RequiredReliabilityService.values()[0];
-
- /** padding */
+
+ /** padding */
protected byte pad1;
-
- /** padding */
+
+ /** padding */
protected short pad2;
-
- /** request ID */
+
+ /** request ID */
protected int requestID;
-
- /** time interval between issuing data query PDUs */
+
+ /** time interval between issuing data query PDUs */
protected int timeInterval;
-
- /** Fixed datum record count */
+
+ /** Fixed datum record count */
protected int numberOfFixedDatumRecords;
-
- /** variable datum record count */
+
+ /** variable datum record count */
protected int numberOfVariableDatumRecords;
-
- /** Fixed datum records */
+
+ /** Fixed datum records */
protected List< FixedDatum > fixedDatumRecords = new ArrayList< FixedDatum >();
-
- /** Variable datum records */
+
+ /** Variable datum records */
protected List< VariableDatum > variableDatumRecords = new ArrayList< VariableDatum >();
-
-
-/** Constructor */
- public DataQueryRPdu()
- {
- setPduType( DISPDUType.DATA_QUERY_RELIABLE );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public DataQueryRPdu()
+ {
+ setPduType( DISPDUType.DATA_QUERY_RELIABLE );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += requiredReliabilityService.getMarshalledSize();
+ marshalSize += 1; // pad1
+ marshalSize += 2; // pad2
+ marshalSize += 4; // requestID
+ marshalSize += 4; // timeInterval
+ marshalSize += 4; // numberOfFixedDatumRecords
+ marshalSize += 4; // numberOfVariableDatumRecords
+ for(int idx=0; idx < fixedDatumRecords.size(); idx++)
+ {
+ FixedDatum listElement = fixedDatumRecords.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+ for(int idx=0; idx < variableDatumRecords.size(); idx++)
+ {
+ VariableDatum listElement = variableDatumRecords.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link DataQueryRPdu#requiredReliabilityService}*/
+public DataQueryRPdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += requiredReliabilityService.getMarshalledSize();
- marshalSize += 1; // pad1
- marshalSize += 2; // pad2
- marshalSize += 4; // requestID
- marshalSize += 4; // timeInterval
- marshalSize += 4; // numberOfFixedDatumRecords
- marshalSize += 4; // numberOfVariableDatumRecords
- for(int idx=0; idx < fixedDatumRecords.size(); idx++)
- {
- FixedDatum listElement = fixedDatumRecords.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
- for(int idx=0; idx < variableDatumRecords.size(); idx++)
- {
- VariableDatum listElement = variableDatumRecords.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link DataQueryRPdu#requiredReliabilityService}*/
-public DataQueryRPdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
-{
- requiredReliabilityService = pRequiredReliabilityService;
- return this;
-}
-
-/** Getter for {@link DataQueryRPdu#requiredReliabilityService}*/
-public RequiredReliabilityService getRequiredReliabilityService()
+ requiredReliabilityService = pRequiredReliabilityService;
+ return this;
+}
+
+/** Getter for {@link DataQueryRPdu#requiredReliabilityService}*/
+public RequiredReliabilityService getRequiredReliabilityService()
{
return requiredReliabilityService;
-}
-
-/** Setter for {@link DataQueryRPdu#pad1}*/
-public DataQueryRPdu setPad1(byte pPad1)
+}
+
+/** Setter for {@link DataQueryRPdu#pad1}*/
+public DataQueryRPdu setPad1(byte pPad1)
{
- pad1 = pPad1;
- return this;
-}
-
-/** Getter for {@link DataQueryRPdu#pad1}*/
-public byte getPad1()
+ pad1 = pPad1;
+ return this;
+}
+
+/** Getter for {@link DataQueryRPdu#pad1}*/
+public byte getPad1()
{
return pad1;
-}
-
-/** Setter for {@link DataQueryRPdu#pad2}*/
-public DataQueryRPdu setPad2(short pPad2)
+}
+
+/** Setter for {@link DataQueryRPdu#pad2}*/
+public DataQueryRPdu setPad2(short pPad2)
{
- pad2 = pPad2;
- return this;
-}
-
-/** Getter for {@link DataQueryRPdu#pad2}*/
-public short getPad2()
+ pad2 = pPad2;
+ return this;
+}
+
+/** Getter for {@link DataQueryRPdu#pad2}*/
+public short getPad2()
{
return pad2;
-}
-
-/** Setter for {@link DataQueryRPdu#requestID}*/
-public DataQueryRPdu setRequestID(int pRequestID)
+}
+
+/** Setter for {@link DataQueryRPdu#requestID}*/
+public DataQueryRPdu setRequestID(int pRequestID)
{
- requestID = pRequestID;
- return this;
-}
-
-/** Getter for {@link DataQueryRPdu#requestID}*/
-public int getRequestID()
+ requestID = pRequestID;
+ return this;
+}
+
+/** Getter for {@link DataQueryRPdu#requestID}*/
+public int getRequestID()
{
return requestID;
-}
-
-/** Setter for {@link DataQueryRPdu#timeInterval}*/
-public DataQueryRPdu setTimeInterval(int pTimeInterval)
+}
+
+/** Setter for {@link DataQueryRPdu#timeInterval}*/
+public DataQueryRPdu setTimeInterval(int pTimeInterval)
{
- timeInterval = pTimeInterval;
- return this;
-}
-
-/** Getter for {@link DataQueryRPdu#timeInterval}*/
-public int getTimeInterval()
+ timeInterval = pTimeInterval;
+ return this;
+}
+
+/** Getter for {@link DataQueryRPdu#timeInterval}*/
+public int getTimeInterval()
{
return timeInterval;
-}
-
-/** Setter for {@link DataQueryRPdu#fixedDatumRecords}*/
-public DataQueryRPdu setFixedDatumRecords(List<FixedDatum> pFixedDatumRecords)
+}
+
+/** Setter for {@link DataQueryRPdu#fixedDatumRecords}*/
+public DataQueryRPdu setFixedDatumRecords(List<FixedDatum> pFixedDatumRecords)
{
- fixedDatumRecords = pFixedDatumRecords;
- return this;
-}
-
-/** Getter for {@link DataQueryRPdu#fixedDatumRecords}*/
-public List<FixedDatum> getFixedDatumRecords()
+ fixedDatumRecords = pFixedDatumRecords;
+ return this;
+}
+
+/** Getter for {@link DataQueryRPdu#fixedDatumRecords}*/
+public List<FixedDatum> getFixedDatumRecords()
{
return fixedDatumRecords;
-}
-
-/** Setter for {@link DataQueryRPdu#variableDatumRecords}*/
-public DataQueryRPdu setVariableDatumRecords(List<VariableDatum> pVariableDatumRecords)
+}
+
+/** Setter for {@link DataQueryRPdu#variableDatumRecords}*/
+public DataQueryRPdu setVariableDatumRecords(List<VariableDatum> pVariableDatumRecords)
{
- variableDatumRecords = pVariableDatumRecords;
- return this;
-}
-
-/** Getter for {@link DataQueryRPdu#variableDatumRecords}*/
-public List<VariableDatum> getVariableDatumRecords()
+ variableDatumRecords = pVariableDatumRecords;
+ return this;
+}
+
+/** Getter for {@link DataQueryRPdu#variableDatumRecords}*/
+public List<VariableDatum> getVariableDatumRecords()
{
return variableDatumRecords;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- requiredReliabilityService.marshal(dos);
- dos.writeByte(pad1);
- dos.writeShort(pad2);
- dos.writeInt(requestID);
- dos.writeInt(timeInterval);
- dos.writeInt(fixedDatumRecords.size());
- dos.writeInt(variableDatumRecords.size());
-
- for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
- {
- FixedDatum aFixedDatum = fixedDatumRecords.get(idx);
- aFixedDatum.marshal(dos);
- }
-
-
- for(int idx = 0; idx < variableDatumRecords.size(); idx++)
- {
- VariableDatum aVariableDatum = variableDatumRecords.get(idx);
- aVariableDatum.marshal(dos);
- }
-
+ {
+ requiredReliabilityService.marshal(dos);
+ dos.writeByte(pad1);
+ dos.writeShort(pad2);
+ dos.writeInt(requestID);
+ dos.writeInt(timeInterval);
+ dos.writeInt(fixedDatumRecords.size());
+ dos.writeInt(variableDatumRecords.size());
+
+ for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
+ {
+ FixedDatum aFixedDatum = fixedDatumRecords.get(idx);
+ aFixedDatum.marshal(dos);
+ }
+
+
+ for(int idx = 0; idx < variableDatumRecords.size(); idx++)
+ {
+ VariableDatum aVariableDatum = variableDatumRecords.get(idx);
+ aVariableDatum.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(dis);
- uPosition += requiredReliabilityService.getMarshalledSize();
- pad1 = (byte)dis.readUnsignedByte();
- uPosition += 1;
- pad2 = (short)dis.readUnsignedShort();
- uPosition += 2;
- requestID = dis.readInt();
- uPosition += 4;
- timeInterval = dis.readInt();
- uPosition += 4;
- numberOfFixedDatumRecords = dis.readInt();
- uPosition += 4;
- numberOfVariableDatumRecords = dis.readInt();
- uPosition += 4;
- for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
- {
- FixedDatum anX = new FixedDatum();
- uPosition += anX.unmarshal(dis);
- fixedDatumRecords.add(anX);
- }
-
- for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
- {
- VariableDatum anX = new VariableDatum();
- uPosition += anX.unmarshal(dis);
- variableDatumRecords.add(anX);
- }
-
+ {
+ requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(dis);
+ uPosition += requiredReliabilityService.getMarshalledSize();
+ pad1 = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ pad2 = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ requestID = dis.readInt();
+ uPosition += 4;
+ timeInterval = dis.readInt();
+ uPosition += 4;
+ numberOfFixedDatumRecords = dis.readInt();
+ uPosition += 4;
+ numberOfVariableDatumRecords = dis.readInt();
+ uPosition += 4;
+ for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
+ {
+ FixedDatum anX = new FixedDatum();
+ uPosition += anX.unmarshal(dis);
+ fixedDatumRecords.add(anX);
+ }
+
+ for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
+ {
+ VariableDatum anX = new VariableDatum();
+ uPosition += anX.unmarshal(dis);
+ variableDatumRecords.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- requiredReliabilityService.marshal(buff);
- buff.put( (byte)pad1);
- buff.putShort( (short)pad2);
- buff.putInt( (int)requestID);
- buff.putInt( (int)timeInterval);
- buff.putInt( (int)fixedDatumRecords.size());
- buff.putInt( (int)variableDatumRecords.size());
-
- for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
- {
- FixedDatum aFixedDatum = fixedDatumRecords.get(idx);
- aFixedDatum.marshal(buff);
- }
-
-
- for(int idx = 0; idx < variableDatumRecords.size(); idx++)
- {
- VariableDatum aVariableDatum = variableDatumRecords.get(idx);
- aVariableDatum.marshal(buff);
- }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ requiredReliabilityService.marshal(buff);
+ buff.put( (byte)pad1);
+ buff.putShort( (short)pad2);
+ buff.putInt( (int)requestID);
+ buff.putInt( (int)timeInterval);
+ buff.putInt( (int)fixedDatumRecords.size());
+ buff.putInt( (int)variableDatumRecords.size());
+
+ for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
+ {
+ FixedDatum aFixedDatum = fixedDatumRecords.get(idx);
+ aFixedDatum.marshal(buff);
+ }
+
+
+ for(int idx = 0; idx < variableDatumRecords.size(); idx++)
+ {
+ VariableDatum aVariableDatum = variableDatumRecords.get(idx);
+ aVariableDatum.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(buff);
- pad1 = (byte)(buff.get() & 0xFF);
- pad2 = (short)(buff.getShort() & 0xFFFF);
- requestID = buff.getInt();
- timeInterval = buff.getInt();
- numberOfFixedDatumRecords = buff.getInt();
- numberOfVariableDatumRecords = buff.getInt();
- for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
- {
- FixedDatum anX = new FixedDatum();
- anX.unmarshal(buff);
- fixedDatumRecords.add(anX);
- }
-
- for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
- {
- VariableDatum anX = new VariableDatum();
- anX.unmarshal(buff);
- variableDatumRecords.add(anX);
- }
-
- return getMarshalledSize();
+
+ requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(buff);
+ pad1 = (byte)(buff.get() & 0xFF);
+ pad2 = (short)(buff.getShort() & 0xFFFF);
+ requestID = buff.getInt();
+ timeInterval = buff.getInt();
+ numberOfFixedDatumRecords = buff.getInt();
+ numberOfVariableDatumRecords = buff.getInt();
+ for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
+ {
+ FixedDatum anX = new FixedDatum();
+ anX.unmarshal(buff);
+ fixedDatumRecords.add(anX);
+ }
+
+ for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
+ {
+ VariableDatum anX = new VariableDatum();
+ anX.unmarshal(buff);
+ variableDatumRecords.add(anX);
+ }
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final DataQueryRPdu rhs = (DataQueryRPdu)obj;
-
- if( ! (requiredReliabilityService == rhs.requiredReliabilityService)) ivarsEqual = false;
- if( ! (pad1 == rhs.pad1)) ivarsEqual = false;
- if( ! (pad2 == rhs.pad2)) ivarsEqual = false;
- if( ! (requestID == rhs.requestID)) ivarsEqual = false;
- if( ! (timeInterval == rhs.timeInterval)) ivarsEqual = false;
-
- for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
- if( ! ( fixedDatumRecords.get(idx).equals(rhs.fixedDatumRecords.get(idx)))) ivarsEqual = false;
-
-
- for(int idx = 0; idx < variableDatumRecords.size(); idx++)
- if( ! ( variableDatumRecords.get(idx).equals(rhs.variableDatumRecords.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final DataQueryRPdu rhs = (DataQueryRPdu)obj;
+
+ if( ! (requiredReliabilityService == rhs.requiredReliabilityService)) ivarsEqual = false;
+ if( ! (pad1 == rhs.pad1)) ivarsEqual = false;
+ if( ! (pad2 == rhs.pad2)) ivarsEqual = false;
+ if( ! (requestID == rhs.requestID)) ivarsEqual = false;
+ if( ! (timeInterval == rhs.timeInterval)) ivarsEqual = false;
+
+ for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
+ if( ! ( fixedDatumRecords.get(idx).equals(rhs.fixedDatumRecords.get(idx)))) ivarsEqual = false;
+
+
+ for(int idx = 0; idx < variableDatumRecords.size(); idx++)
+ if( ! ( variableDatumRecords.get(idx).equals(rhs.variableDatumRecords.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
- sb.append(" pad1: ").append(pad1).append("\n");
- sb.append(" pad2: ").append(pad2).append("\n");
- sb.append(" requestID: ").append(requestID).append("\n");
- sb.append(" timeInterval: ").append(timeInterval).append("\n");
- sb.append(" fixedDatumRecords: ").append("\n");
- fixedDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
- sb.append(" variableDatumRecords: ").append("\n");
- variableDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
+ sb.append(" pad1: ").append(pad1).append("\n");
+ sb.append(" pad2: ").append(pad2).append("\n");
+ sb.append(" requestID: ").append(requestID).append("\n");
+ sb.append(" timeInterval: ").append(timeInterval).append("\n");
+ sb.append(" fixedDatumRecords: ").append("\n");
+ fixedDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+ sb.append(" variableDatumRecords: ").append("\n");
+ variableDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/DataQueryReliablePdu.java b/src-generated/edu/nps/moves/dis7/DataQueryReliablePdu.java
index 77cf1d749b93215bc43646758db6abbcb52ee908..49f4a574f9692a6ec40065af6ff0ed81785c38cc 100644
--- a/src-generated/edu/nps/moves/dis7/DataQueryReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/DataQueryReliablePdu.java
@@ -1,17 +1,17 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * more descriptive name for a DataQueryRPdu
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class DataQueryReliablePdu extends DataQueryRPdu
-{}
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * more descriptive name for a DataQueryRPdu
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class DataQueryReliablePdu extends DataQueryRPdu
+{}
diff --git a/src-generated/edu/nps/moves/dis7/DataRPdu.java b/src-generated/edu/nps/moves/dis7/DataRPdu.java
index b818ccc6c97cde9ed39334ac4f13b34c41ff86dd..ec58d35729daf4cb547b14066f58dd6316edd491 100644
--- a/src-generated/edu/nps/moves/dis7/DataRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/DataRPdu.java
@@ -1,365 +1,365 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.12.4.11 Serves the same function as the Data PDU but with the addition of reliability service levels and is used in response to a Data Query-R PDU, a Data-R PDU, or a Set Data-R PDU.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class DataRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
-{
- /** Request ID */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 5.12.4.11 Serves the same function as the Data PDU but with the addition of reliability service levels and is used in response to a Data Query-R PDU, a Data-R PDU, or a Set Data-R PDU.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class DataRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
+{
+ /** Request ID */
protected int requestID;
-
- /** level of reliability service used for this transaction uid 74 */
+
+ /** level of reliability service used for this transaction uid 74 */
protected RequiredReliabilityService requiredReliabilityService = RequiredReliabilityService.values()[0];
-
- /** padding */
+
+ /** padding */
protected byte pad1;
-
- /** padding */
+
+ /** padding */
protected short pad2;
-
- /** Fixed datum record count */
+
+ /** Fixed datum record count */
protected int numberOfFixedDatumRecords;
-
- /** variable datum record count */
+
+ /** variable datum record count */
protected int numberOfVariableDatumRecords;
-
- /** Fixed datum records */
+
+ /** Fixed datum records */
protected List< FixedDatum > fixedDatumRecords = new ArrayList< FixedDatum >();
-
- /** Variable datum records */
+
+ /** Variable datum records */
protected List< VariableDatum > variableDatumRecords = new ArrayList< VariableDatum >();
-
-
-/** Constructor */
- public DataRPdu()
- {
- setPduType( DISPDUType.DATA_RELIABLE );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public DataRPdu()
+ {
+ setPduType( DISPDUType.DATA_RELIABLE );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += 4; // requestID
+ marshalSize += requiredReliabilityService.getMarshalledSize();
+ marshalSize += 1; // pad1
+ marshalSize += 2; // pad2
+ marshalSize += 4; // numberOfFixedDatumRecords
+ marshalSize += 4; // numberOfVariableDatumRecords
+ for(int idx=0; idx < fixedDatumRecords.size(); idx++)
+ {
+ FixedDatum listElement = fixedDatumRecords.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+ for(int idx=0; idx < variableDatumRecords.size(); idx++)
+ {
+ VariableDatum listElement = variableDatumRecords.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link DataRPdu#requestID}*/
+public DataRPdu setRequestID(int pRequestID)
{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += 4; // requestID
- marshalSize += requiredReliabilityService.getMarshalledSize();
- marshalSize += 1; // pad1
- marshalSize += 2; // pad2
- marshalSize += 4; // numberOfFixedDatumRecords
- marshalSize += 4; // numberOfVariableDatumRecords
- for(int idx=0; idx < fixedDatumRecords.size(); idx++)
- {
- FixedDatum listElement = fixedDatumRecords.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
- for(int idx=0; idx < variableDatumRecords.size(); idx++)
- {
- VariableDatum listElement = variableDatumRecords.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link DataRPdu#requestID}*/
-public DataRPdu setRequestID(int pRequestID)
-{
- requestID = pRequestID;
- return this;
-}
-
-/** Getter for {@link DataRPdu#requestID}*/
-public int getRequestID()
+ requestID = pRequestID;
+ return this;
+}
+
+/** Getter for {@link DataRPdu#requestID}*/
+public int getRequestID()
{
return requestID;
-}
-
-/** Setter for {@link DataRPdu#requiredReliabilityService}*/
-public DataRPdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
+}
+
+/** Setter for {@link DataRPdu#requiredReliabilityService}*/
+public DataRPdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
{
- requiredReliabilityService = pRequiredReliabilityService;
- return this;
-}
-
-/** Getter for {@link DataRPdu#requiredReliabilityService}*/
-public RequiredReliabilityService getRequiredReliabilityService()
+ requiredReliabilityService = pRequiredReliabilityService;
+ return this;
+}
+
+/** Getter for {@link DataRPdu#requiredReliabilityService}*/
+public RequiredReliabilityService getRequiredReliabilityService()
{
return requiredReliabilityService;
-}
-
-/** Setter for {@link DataRPdu#pad1}*/
-public DataRPdu setPad1(byte pPad1)
+}
+
+/** Setter for {@link DataRPdu#pad1}*/
+public DataRPdu setPad1(byte pPad1)
{
- pad1 = pPad1;
- return this;
-}
-
-/** Getter for {@link DataRPdu#pad1}*/
-public byte getPad1()
+ pad1 = pPad1;
+ return this;
+}
+
+/** Getter for {@link DataRPdu#pad1}*/
+public byte getPad1()
{
return pad1;
-}
-
-/** Setter for {@link DataRPdu#pad2}*/
-public DataRPdu setPad2(short pPad2)
+}
+
+/** Setter for {@link DataRPdu#pad2}*/
+public DataRPdu setPad2(short pPad2)
{
- pad2 = pPad2;
- return this;
-}
-
-/** Getter for {@link DataRPdu#pad2}*/
-public short getPad2()
+ pad2 = pPad2;
+ return this;
+}
+
+/** Getter for {@link DataRPdu#pad2}*/
+public short getPad2()
{
return pad2;
-}
-
-/** Setter for {@link DataRPdu#fixedDatumRecords}*/
-public DataRPdu setFixedDatumRecords(List<FixedDatum> pFixedDatumRecords)
+}
+
+/** Setter for {@link DataRPdu#fixedDatumRecords}*/
+public DataRPdu setFixedDatumRecords(List<FixedDatum> pFixedDatumRecords)
{
- fixedDatumRecords = pFixedDatumRecords;
- return this;
-}
-
-/** Getter for {@link DataRPdu#fixedDatumRecords}*/
-public List<FixedDatum> getFixedDatumRecords()
+ fixedDatumRecords = pFixedDatumRecords;
+ return this;
+}
+
+/** Getter for {@link DataRPdu#fixedDatumRecords}*/
+public List<FixedDatum> getFixedDatumRecords()
{
return fixedDatumRecords;
-}
-
-/** Setter for {@link DataRPdu#variableDatumRecords}*/
-public DataRPdu setVariableDatumRecords(List<VariableDatum> pVariableDatumRecords)
+}
+
+/** Setter for {@link DataRPdu#variableDatumRecords}*/
+public DataRPdu setVariableDatumRecords(List<VariableDatum> pVariableDatumRecords)
{
- variableDatumRecords = pVariableDatumRecords;
- return this;
-}
-
-/** Getter for {@link DataRPdu#variableDatumRecords}*/
-public List<VariableDatum> getVariableDatumRecords()
+ variableDatumRecords = pVariableDatumRecords;
+ return this;
+}
+
+/** Getter for {@link DataRPdu#variableDatumRecords}*/
+public List<VariableDatum> getVariableDatumRecords()
{
return variableDatumRecords;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- dos.writeInt(requestID);
- requiredReliabilityService.marshal(dos);
- dos.writeByte(pad1);
- dos.writeShort(pad2);
- dos.writeInt(fixedDatumRecords.size());
- dos.writeInt(variableDatumRecords.size());
-
- for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
- {
- FixedDatum aFixedDatum = fixedDatumRecords.get(idx);
- aFixedDatum.marshal(dos);
- }
-
-
- for(int idx = 0; idx < variableDatumRecords.size(); idx++)
- {
- VariableDatum aVariableDatum = variableDatumRecords.get(idx);
- aVariableDatum.marshal(dos);
- }
-
+ {
+ dos.writeInt(requestID);
+ requiredReliabilityService.marshal(dos);
+ dos.writeByte(pad1);
+ dos.writeShort(pad2);
+ dos.writeInt(fixedDatumRecords.size());
+ dos.writeInt(variableDatumRecords.size());
+
+ for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
+ {
+ FixedDatum aFixedDatum = fixedDatumRecords.get(idx);
+ aFixedDatum.marshal(dos);
+ }
+
+
+ for(int idx = 0; idx < variableDatumRecords.size(); idx++)
+ {
+ VariableDatum aVariableDatum = variableDatumRecords.get(idx);
+ aVariableDatum.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- requestID = dis.readInt();
- uPosition += 4;
- requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(dis);
- uPosition += requiredReliabilityService.getMarshalledSize();
- pad1 = (byte)dis.readUnsignedByte();
- uPosition += 1;
- pad2 = (short)dis.readUnsignedShort();
- uPosition += 2;
- numberOfFixedDatumRecords = dis.readInt();
- uPosition += 4;
- numberOfVariableDatumRecords = dis.readInt();
- uPosition += 4;
- for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
- {
- FixedDatum anX = new FixedDatum();
- uPosition += anX.unmarshal(dis);
- fixedDatumRecords.add(anX);
- }
-
- for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
- {
- VariableDatum anX = new VariableDatum();
- uPosition += anX.unmarshal(dis);
- variableDatumRecords.add(anX);
- }
-
+ {
+ requestID = dis.readInt();
+ uPosition += 4;
+ requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(dis);
+ uPosition += requiredReliabilityService.getMarshalledSize();
+ pad1 = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ pad2 = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ numberOfFixedDatumRecords = dis.readInt();
+ uPosition += 4;
+ numberOfVariableDatumRecords = dis.readInt();
+ uPosition += 4;
+ for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
+ {
+ FixedDatum anX = new FixedDatum();
+ uPosition += anX.unmarshal(dis);
+ fixedDatumRecords.add(anX);
+ }
+
+ for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
+ {
+ VariableDatum anX = new VariableDatum();
+ uPosition += anX.unmarshal(dis);
+ variableDatumRecords.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- buff.putInt( (int)requestID);
- requiredReliabilityService.marshal(buff);
- buff.put( (byte)pad1);
- buff.putShort( (short)pad2);
- buff.putInt( (int)fixedDatumRecords.size());
- buff.putInt( (int)variableDatumRecords.size());
-
- for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
- {
- FixedDatum aFixedDatum = fixedDatumRecords.get(idx);
- aFixedDatum.marshal(buff);
- }
-
-
- for(int idx = 0; idx < variableDatumRecords.size(); idx++)
- {
- VariableDatum aVariableDatum = variableDatumRecords.get(idx);
- aVariableDatum.marshal(buff);
- }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ buff.putInt( (int)requestID);
+ requiredReliabilityService.marshal(buff);
+ buff.put( (byte)pad1);
+ buff.putShort( (short)pad2);
+ buff.putInt( (int)fixedDatumRecords.size());
+ buff.putInt( (int)variableDatumRecords.size());
+
+ for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
+ {
+ FixedDatum aFixedDatum = fixedDatumRecords.get(idx);
+ aFixedDatum.marshal(buff);
+ }
+
+
+ for(int idx = 0; idx < variableDatumRecords.size(); idx++)
+ {
+ VariableDatum aVariableDatum = variableDatumRecords.get(idx);
+ aVariableDatum.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- requestID = buff.getInt();
- requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(buff);
- pad1 = (byte)(buff.get() & 0xFF);
- pad2 = (short)(buff.getShort() & 0xFFFF);
- numberOfFixedDatumRecords = buff.getInt();
- numberOfVariableDatumRecords = buff.getInt();
- for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
- {
- FixedDatum anX = new FixedDatum();
- anX.unmarshal(buff);
- fixedDatumRecords.add(anX);
- }
-
- for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
- {
- VariableDatum anX = new VariableDatum();
- anX.unmarshal(buff);
- variableDatumRecords.add(anX);
- }
-
- return getMarshalledSize();
+
+ requestID = buff.getInt();
+ requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(buff);
+ pad1 = (byte)(buff.get() & 0xFF);
+ pad2 = (short)(buff.getShort() & 0xFFFF);
+ numberOfFixedDatumRecords = buff.getInt();
+ numberOfVariableDatumRecords = buff.getInt();
+ for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
+ {
+ FixedDatum anX = new FixedDatum();
+ anX.unmarshal(buff);
+ fixedDatumRecords.add(anX);
+ }
+
+ for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
+ {
+ VariableDatum anX = new VariableDatum();
+ anX.unmarshal(buff);
+ variableDatumRecords.add(anX);
+ }
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final DataRPdu rhs = (DataRPdu)obj;
-
- if( ! (requestID == rhs.requestID)) ivarsEqual = false;
- if( ! (requiredReliabilityService == rhs.requiredReliabilityService)) ivarsEqual = false;
- if( ! (pad1 == rhs.pad1)) ivarsEqual = false;
- if( ! (pad2 == rhs.pad2)) ivarsEqual = false;
-
- for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
- if( ! ( fixedDatumRecords.get(idx).equals(rhs.fixedDatumRecords.get(idx)))) ivarsEqual = false;
-
-
- for(int idx = 0; idx < variableDatumRecords.size(); idx++)
- if( ! ( variableDatumRecords.get(idx).equals(rhs.variableDatumRecords.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final DataRPdu rhs = (DataRPdu)obj;
+
+ if( ! (requestID == rhs.requestID)) ivarsEqual = false;
+ if( ! (requiredReliabilityService == rhs.requiredReliabilityService)) ivarsEqual = false;
+ if( ! (pad1 == rhs.pad1)) ivarsEqual = false;
+ if( ! (pad2 == rhs.pad2)) ivarsEqual = false;
+
+ for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
+ if( ! ( fixedDatumRecords.get(idx).equals(rhs.fixedDatumRecords.get(idx)))) ivarsEqual = false;
+
+
+ for(int idx = 0; idx < variableDatumRecords.size(); idx++)
+ if( ! ( variableDatumRecords.get(idx).equals(rhs.variableDatumRecords.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" requestID: ").append(requestID).append("\n");
- sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
- sb.append(" pad1: ").append(pad1).append("\n");
- sb.append(" pad2: ").append(pad2).append("\n");
- sb.append(" fixedDatumRecords: ").append("\n");
- fixedDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
- sb.append(" variableDatumRecords: ").append("\n");
- variableDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" requestID: ").append(requestID).append("\n");
+ sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
+ sb.append(" pad1: ").append(pad1).append("\n");
+ sb.append(" pad2: ").append(pad2).append("\n");
+ sb.append(" fixedDatumRecords: ").append("\n");
+ fixedDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+ sb.append(" variableDatumRecords: ").append("\n");
+ variableDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/DataReliablePdu.java b/src-generated/edu/nps/moves/dis7/DataReliablePdu.java
index 4d1fb78548b26094347eaf43f4c8007be183f848..1e539484a802634b885ff2678405e92f29ce9f5a 100644
--- a/src-generated/edu/nps/moves/dis7/DataReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/DataReliablePdu.java
@@ -1,17 +1,17 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * more descriptive name for a DataRPdu
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class DataReliablePdu extends DataRPdu
-{}
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * more descriptive name for a DataRPdu
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class DataReliablePdu extends DataRPdu
+{}
diff --git a/src-generated/edu/nps/moves/dis7/DatumSpecification.java b/src-generated/edu/nps/moves/dis7/DatumSpecification.java
index 7cbee05506835cb54792945d6e8e611591972e62..45058b0fb838ded1dd02bedac39d7b2fe0e35ce1 100644
--- a/src-generated/edu/nps/moves/dis7/DatumSpecification.java
+++ b/src-generated/edu/nps/moves/dis7/DatumSpecification.java
@@ -1,266 +1,266 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * List of fixed and variable datum records. Section 6.2.18
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class DatumSpecification extends Object implements Serializable
-{
- /** Number of fixed datums */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * List of fixed and variable datum records. Section 6.2.18
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class DatumSpecification extends Object implements Serializable
+{
+ /** Number of fixed datums */
protected int numberOfFixedDatums;
-
- /** Number of variable datums */
+
+ /** Number of variable datums */
protected int numberOfVariableDatums;
-
- /** variable length list fixed datums */
+
+ /** variable length list fixed datums */
protected List< FixedDatum > fixedDatumIDList = new ArrayList< FixedDatum >();
-
- /** variable length list variable datums */
+
+ /** variable length list variable datums */
protected List< VariableDatum > variableDatumIDList = new ArrayList< VariableDatum >();
-
-
-/** Constructor */
- public DatumSpecification()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public DatumSpecification()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 4; // numberOfFixedDatums
+ marshalSize += 4; // numberOfVariableDatums
+ for(int idx=0; idx < fixedDatumIDList.size(); idx++)
+ {
+ FixedDatum listElement = fixedDatumIDList.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+ for(int idx=0; idx < variableDatumIDList.size(); idx++)
+ {
+ VariableDatum listElement = variableDatumIDList.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link DatumSpecification#fixedDatumIDList}*/
+public DatumSpecification setFixedDatumIDList(List<FixedDatum> pFixedDatumIDList)
{
- int marshalSize = 0;
-
- marshalSize += 4; // numberOfFixedDatums
- marshalSize += 4; // numberOfVariableDatums
- for(int idx=0; idx < fixedDatumIDList.size(); idx++)
- {
- FixedDatum listElement = fixedDatumIDList.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
- for(int idx=0; idx < variableDatumIDList.size(); idx++)
- {
- VariableDatum listElement = variableDatumIDList.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link DatumSpecification#fixedDatumIDList}*/
-public DatumSpecification setFixedDatumIDList(List<FixedDatum> pFixedDatumIDList)
-{
- fixedDatumIDList = pFixedDatumIDList;
- return this;
-}
-
-/** Getter for {@link DatumSpecification#fixedDatumIDList}*/
-public List<FixedDatum> getFixedDatumIDList()
+ fixedDatumIDList = pFixedDatumIDList;
+ return this;
+}
+
+/** Getter for {@link DatumSpecification#fixedDatumIDList}*/
+public List<FixedDatum> getFixedDatumIDList()
{
return fixedDatumIDList;
-}
-
-/** Setter for {@link DatumSpecification#variableDatumIDList}*/
-public DatumSpecification setVariableDatumIDList(List<VariableDatum> pVariableDatumIDList)
+}
+
+/** Setter for {@link DatumSpecification#variableDatumIDList}*/
+public DatumSpecification setVariableDatumIDList(List<VariableDatum> pVariableDatumIDList)
{
- variableDatumIDList = pVariableDatumIDList;
- return this;
-}
-
-/** Getter for {@link DatumSpecification#variableDatumIDList}*/
-public List<VariableDatum> getVariableDatumIDList()
+ variableDatumIDList = pVariableDatumIDList;
+ return this;
+}
+
+/** Getter for {@link DatumSpecification#variableDatumIDList}*/
+public List<VariableDatum> getVariableDatumIDList()
{
return variableDatumIDList;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeInt(fixedDatumIDList.size());
- dos.writeInt(variableDatumIDList.size());
-
- for(int idx = 0; idx < fixedDatumIDList.size(); idx++)
- {
- FixedDatum aFixedDatum = fixedDatumIDList.get(idx);
- aFixedDatum.marshal(dos);
- }
-
-
- for(int idx = 0; idx < variableDatumIDList.size(); idx++)
- {
- VariableDatum aVariableDatum = variableDatumIDList.get(idx);
- aVariableDatum.marshal(dos);
- }
-
+ {
+ dos.writeInt(fixedDatumIDList.size());
+ dos.writeInt(variableDatumIDList.size());
+
+ for(int idx = 0; idx < fixedDatumIDList.size(); idx++)
+ {
+ FixedDatum aFixedDatum = fixedDatumIDList.get(idx);
+ aFixedDatum.marshal(dos);
+ }
+
+
+ for(int idx = 0; idx < variableDatumIDList.size(); idx++)
+ {
+ VariableDatum aVariableDatum = variableDatumIDList.get(idx);
+ aVariableDatum.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- numberOfFixedDatums = dis.readInt();
- uPosition += 4;
- numberOfVariableDatums = dis.readInt();
- uPosition += 4;
- for(int idx = 0; idx < numberOfFixedDatums; idx++)
- {
- FixedDatum anX = new FixedDatum();
- uPosition += anX.unmarshal(dis);
- fixedDatumIDList.add(anX);
- }
-
- for(int idx = 0; idx < numberOfVariableDatums; idx++)
- {
- VariableDatum anX = new VariableDatum();
- uPosition += anX.unmarshal(dis);
- variableDatumIDList.add(anX);
- }
-
+ {
+ numberOfFixedDatums = dis.readInt();
+ uPosition += 4;
+ numberOfVariableDatums = dis.readInt();
+ uPosition += 4;
+ for(int idx = 0; idx < numberOfFixedDatums; idx++)
+ {
+ FixedDatum anX = new FixedDatum();
+ uPosition += anX.unmarshal(dis);
+ fixedDatumIDList.add(anX);
+ }
+
+ for(int idx = 0; idx < numberOfVariableDatums; idx++)
+ {
+ VariableDatum anX = new VariableDatum();
+ uPosition += anX.unmarshal(dis);
+ variableDatumIDList.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putInt( (int)fixedDatumIDList.size());
- buff.putInt( (int)variableDatumIDList.size());
-
- for(int idx = 0; idx < fixedDatumIDList.size(); idx++)
- {
- FixedDatum aFixedDatum = fixedDatumIDList.get(idx);
- aFixedDatum.marshal(buff);
- }
-
-
- for(int idx = 0; idx < variableDatumIDList.size(); idx++)
- {
- VariableDatum aVariableDatum = variableDatumIDList.get(idx);
- aVariableDatum.marshal(buff);
- }
-
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- numberOfFixedDatums = buff.getInt();
- numberOfVariableDatums = buff.getInt();
- for(int idx = 0; idx < numberOfFixedDatums; idx++)
- {
- FixedDatum anX = new FixedDatum();
- anX.unmarshal(buff);
- fixedDatumIDList.add(anX);
- }
-
- for(int idx = 0; idx < numberOfVariableDatums; idx++)
- {
- VariableDatum anX = new VariableDatum();
- anX.unmarshal(buff);
- variableDatumIDList.add(anX);
- }
-
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putInt( (int)fixedDatumIDList.size());
+ buff.putInt( (int)variableDatumIDList.size());
+
+ for(int idx = 0; idx < fixedDatumIDList.size(); idx++)
+ {
+ FixedDatum aFixedDatum = fixedDatumIDList.get(idx);
+ aFixedDatum.marshal(buff);
+ }
+
+
+ for(int idx = 0; idx < variableDatumIDList.size(); idx++)
+ {
+ VariableDatum aVariableDatum = variableDatumIDList.get(idx);
+ aVariableDatum.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ numberOfFixedDatums = buff.getInt();
+ numberOfVariableDatums = buff.getInt();
+ for(int idx = 0; idx < numberOfFixedDatums; idx++)
+ {
+ FixedDatum anX = new FixedDatum();
+ anX.unmarshal(buff);
+ fixedDatumIDList.add(anX);
+ }
+
+ for(int idx = 0; idx < numberOfVariableDatums; idx++)
+ {
+ VariableDatum anX = new VariableDatum();
+ anX.unmarshal(buff);
+ variableDatumIDList.add(anX);
+ }
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final DatumSpecification rhs = (DatumSpecification)obj;
-
-
- for(int idx = 0; idx < fixedDatumIDList.size(); idx++)
- if( ! ( fixedDatumIDList.get(idx).equals(rhs.fixedDatumIDList.get(idx)))) ivarsEqual = false;
-
-
- for(int idx = 0; idx < variableDatumIDList.size(); idx++)
- if( ! ( variableDatumIDList.get(idx).equals(rhs.variableDatumIDList.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final DatumSpecification rhs = (DatumSpecification)obj;
+
+
+ for(int idx = 0; idx < fixedDatumIDList.size(); idx++)
+ if( ! ( fixedDatumIDList.get(idx).equals(rhs.fixedDatumIDList.get(idx)))) ivarsEqual = false;
+
+
+ for(int idx = 0; idx < variableDatumIDList.size(); idx++)
+ if( ! ( variableDatumIDList.get(idx).equals(rhs.variableDatumIDList.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" fixedDatumIDList: ").append("\n");
- fixedDatumIDList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
- sb.append(" variableDatumIDList: ").append("\n");
- variableDatumIDList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" fixedDatumIDList: ").append("\n");
+ fixedDatumIDList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+ sb.append(" variableDatumIDList: ").append("\n");
+ variableDatumIDList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/DeadReckoningParameters.java b/src-generated/edu/nps/moves/dis7/DeadReckoningParameters.java
index 8fbb894a65e21ee3659f8509b0fb48cd43ece2ab..44da70d5465ef44c0bd45c8a5968aa073d6b1970 100644
--- a/src-generated/edu/nps/moves/dis7/DeadReckoningParameters.java
+++ b/src-generated/edu/nps/moves/dis7/DeadReckoningParameters.java
@@ -1,246 +1,246 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Not specified in the standard. This is used by the ESPDU
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class DeadReckoningParameters extends Object implements Serializable
-{
- /** Algorithm to use in computing dead reckoning. See EBV doc. uid 44 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Not specified in the standard. This is used by the ESPDU
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class DeadReckoningParameters extends Object implements Serializable
+{
+ /** Algorithm to use in computing dead reckoning. See EBV doc. uid 44 */
protected DeadReckoningAlgorithm deadReckoningAlgorithm = DeadReckoningAlgorithm.values()[0];
-
- /** Dead reckoning parameters. Contents depends on algorithm. */
+
+ /** Dead reckoning parameters. Contents depends on algorithm. */
protected byte[] parameters = new byte[15];
-
- /** Linear acceleration of the entity */
+
+ /** Linear acceleration of the entity */
protected Vector3Float entityLinearAcceleration = new Vector3Float();
-
- /** Angular velocity of the entity */
+
+ /** Angular velocity of the entity */
protected Vector3Float entityAngularVelocity = new Vector3Float();
-
-
-/** Constructor */
- public DeadReckoningParameters()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public DeadReckoningParameters()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += deadReckoningAlgorithm.getMarshalledSize();
+ marshalSize += parameters.length * 1;
+ marshalSize += entityLinearAcceleration.getMarshalledSize();
+ marshalSize += entityAngularVelocity.getMarshalledSize();
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link DeadReckoningParameters#deadReckoningAlgorithm}*/
+public DeadReckoningParameters setDeadReckoningAlgorithm(DeadReckoningAlgorithm pDeadReckoningAlgorithm)
{
- int marshalSize = 0;
-
- marshalSize += deadReckoningAlgorithm.getMarshalledSize();
- marshalSize += parameters.length * 1;
- marshalSize += entityLinearAcceleration.getMarshalledSize();
- marshalSize += entityAngularVelocity.getMarshalledSize();
-
- return marshalSize;
-}
-
-
-/** Setter for {@link DeadReckoningParameters#deadReckoningAlgorithm}*/
-public DeadReckoningParameters setDeadReckoningAlgorithm(DeadReckoningAlgorithm pDeadReckoningAlgorithm)
-{
- deadReckoningAlgorithm = pDeadReckoningAlgorithm;
- return this;
-}
-
-/** Getter for {@link DeadReckoningParameters#deadReckoningAlgorithm}*/
-public DeadReckoningAlgorithm getDeadReckoningAlgorithm()
+ deadReckoningAlgorithm = pDeadReckoningAlgorithm;
+ return this;
+}
+
+/** Getter for {@link DeadReckoningParameters#deadReckoningAlgorithm}*/
+public DeadReckoningAlgorithm getDeadReckoningAlgorithm()
{
return deadReckoningAlgorithm;
-}
-
-/** Setter for {@link DeadReckoningParameters#parameters}*/
-public DeadReckoningParameters setParameters(byte[] pParameters)
+}
+
+/** Setter for {@link DeadReckoningParameters#parameters}*/
+public DeadReckoningParameters setParameters(byte[] pParameters)
{
- parameters = Arrays.copyOf(pParameters, parameters.length);
- return this;
-}
-
-/** Getter for {@link DeadReckoningParameters#parameters}*/
-public byte[] getParameters()
+ parameters = Arrays.copyOf(pParameters, parameters.length);
+ return this;
+}
+
+/** Getter for {@link DeadReckoningParameters#parameters}*/
+public byte[] getParameters()
{
return parameters;
-}
-
-/** Setter for {@link DeadReckoningParameters#entityLinearAcceleration}*/
-public DeadReckoningParameters setEntityLinearAcceleration(Vector3Float pEntityLinearAcceleration)
+}
+
+/** Setter for {@link DeadReckoningParameters#entityLinearAcceleration}*/
+public DeadReckoningParameters setEntityLinearAcceleration(Vector3Float pEntityLinearAcceleration)
{
- entityLinearAcceleration = pEntityLinearAcceleration;
- return this;
-}
-
-/** Getter for {@link DeadReckoningParameters#entityLinearAcceleration}*/
-public Vector3Float getEntityLinearAcceleration()
+ entityLinearAcceleration = pEntityLinearAcceleration;
+ return this;
+}
+
+/** Getter for {@link DeadReckoningParameters#entityLinearAcceleration}*/
+public Vector3Float getEntityLinearAcceleration()
{
return entityLinearAcceleration;
-}
-
-/** Setter for {@link DeadReckoningParameters#entityAngularVelocity}*/
-public DeadReckoningParameters setEntityAngularVelocity(Vector3Float pEntityAngularVelocity)
+}
+
+/** Setter for {@link DeadReckoningParameters#entityAngularVelocity}*/
+public DeadReckoningParameters setEntityAngularVelocity(Vector3Float pEntityAngularVelocity)
{
- entityAngularVelocity = pEntityAngularVelocity;
- return this;
-}
-
-/** Getter for {@link DeadReckoningParameters#entityAngularVelocity}*/
-public Vector3Float getEntityAngularVelocity()
+ entityAngularVelocity = pEntityAngularVelocity;
+ return this;
+}
+
+/** Getter for {@link DeadReckoningParameters#entityAngularVelocity}*/
+public Vector3Float getEntityAngularVelocity()
{
return entityAngularVelocity;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- deadReckoningAlgorithm.marshal(dos);
-
- for(int idx = 0; idx < parameters.length; idx++)
- dos.writeByte(parameters[idx]);
-
- entityLinearAcceleration.marshal(dos);
- entityAngularVelocity.marshal(dos);
+ {
+ deadReckoningAlgorithm.marshal(dos);
+
+ for(int idx = 0; idx < parameters.length; idx++)
+ dos.writeByte(parameters[idx]);
+
+ entityLinearAcceleration.marshal(dos);
+ entityAngularVelocity.marshal(dos);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- deadReckoningAlgorithm = DeadReckoningAlgorithm.unmarshalEnum(dis);
- uPosition += deadReckoningAlgorithm.getMarshalledSize();
- for(int idx = 0; idx < parameters.length; idx++)
- parameters[idx] = dis.readByte();
- uPosition += (parameters.length * 1);
- uPosition += entityLinearAcceleration.unmarshal(dis);
- uPosition += entityAngularVelocity.unmarshal(dis);
+ {
+ deadReckoningAlgorithm = DeadReckoningAlgorithm.unmarshalEnum(dis);
+ uPosition += deadReckoningAlgorithm.getMarshalledSize();
+ for(int idx = 0; idx < parameters.length; idx++)
+ parameters[idx] = dis.readByte();
+ uPosition += (parameters.length * 1);
+ uPosition += entityLinearAcceleration.unmarshal(dis);
+ uPosition += entityAngularVelocity.unmarshal(dis);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- deadReckoningAlgorithm.marshal(buff);
-
- for(int idx = 0; idx < parameters.length; idx++)
- buff.put((byte)parameters[idx]);
-
- entityLinearAcceleration.marshal(buff);
- entityAngularVelocity.marshal(buff);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- deadReckoningAlgorithm = DeadReckoningAlgorithm.unmarshalEnum(buff);
- for(int idx = 0; idx < parameters.length; idx++)
- parameters[idx] = buff.get();
- entityLinearAcceleration.unmarshal(buff);
- entityAngularVelocity.unmarshal(buff);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ deadReckoningAlgorithm.marshal(buff);
+
+ for(int idx = 0; idx < parameters.length; idx++)
+ buff.put((byte)parameters[idx]);
+
+ entityLinearAcceleration.marshal(buff);
+ entityAngularVelocity.marshal(buff);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ deadReckoningAlgorithm = DeadReckoningAlgorithm.unmarshalEnum(buff);
+ for(int idx = 0; idx < parameters.length; idx++)
+ parameters[idx] = buff.get();
+ entityLinearAcceleration.unmarshal(buff);
+ entityAngularVelocity.unmarshal(buff);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final DeadReckoningParameters rhs = (DeadReckoningParameters)obj;
-
- if( ! (deadReckoningAlgorithm == rhs.deadReckoningAlgorithm)) ivarsEqual = false;
-
- for(int idx = 0; idx < 15; idx++)
- {
- if(!(parameters[idx] == rhs.parameters[idx])) ivarsEqual = false;
- }
-
- if( ! (entityLinearAcceleration.equals( rhs.entityLinearAcceleration) )) ivarsEqual = false;
- if( ! (entityAngularVelocity.equals( rhs.entityAngularVelocity) )) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final DeadReckoningParameters rhs = (DeadReckoningParameters)obj;
+
+ if( ! (deadReckoningAlgorithm == rhs.deadReckoningAlgorithm)) ivarsEqual = false;
+
+ for(int idx = 0; idx < 15; idx++)
+ {
+ if(!(parameters[idx] == rhs.parameters[idx])) ivarsEqual = false;
+ }
+
+ if( ! (entityLinearAcceleration.equals( rhs.entityLinearAcceleration) )) ivarsEqual = false;
+ if( ! (entityAngularVelocity.equals( rhs.entityAngularVelocity) )) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" deadReckoningAlgorithm: ").append(deadReckoningAlgorithm).append("\n");
- sb.append(" parameters: ").append("\n");
- sb.append(Arrays.toString(parameters)).append("\n");
- sb.append(" entityLinearAcceleration: ").append(entityLinearAcceleration).append("\n");
- sb.append(" entityAngularVelocity: ").append(entityAngularVelocity).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" deadReckoningAlgorithm: ").append(deadReckoningAlgorithm).append("\n");
+ sb.append(" parameters: ").append("\n");
+ sb.append(Arrays.toString(parameters)).append("\n");
+ sb.append(" entityLinearAcceleration: ").append(entityLinearAcceleration).append("\n");
+ sb.append(" entityAngularVelocity: ").append(entityAngularVelocity).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/DesignatorPdu.java b/src-generated/edu/nps/moves/dis7/DesignatorPdu.java
index 0a3d95c447ec43614a49a498519d9b8df8f45785..b114aaebf224c02a5f2f2c3bd539f65102799f4a 100644
--- a/src-generated/edu/nps/moves/dis7/DesignatorPdu.java
+++ b/src-generated/edu/nps/moves/dis7/DesignatorPdu.java
@@ -1,424 +1,424 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 7.6.3 Handles designating operations. See 5.3.7.2.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class DesignatorPdu extends DistributedEmissionsFamilyPdu implements Serializable
-{
- /** ID of the entity designating */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 7.6.3 Handles designating operations. See 5.3.7.2.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class DesignatorPdu extends DistributedEmissionsFamilyPdu implements Serializable
+{
+ /** ID of the entity designating */
protected EntityID designatingEntityID = new EntityID();
-
- /** This field shall specify a unique emitter database number assigned to differentiate between otherwise similar or identical emitter beams within an emitter system. uid 80 */
+
+ /** This field shall specify a unique emitter database number assigned to differentiate between otherwise similar or identical emitter beams within an emitter system. uid 80 */
protected DesignatorSystemName codeName = DesignatorSystemName.values()[0];
-
- /** ID of the entity being designated */
+
+ /** ID of the entity being designated */
protected EntityID designatedEntityID = new EntityID();
-
- /** This field shall identify the designator code being used by the designating entity uid 81 */
+
+ /** This field shall identify the designator code being used by the designating entity uid 81 */
protected DesignatorDesignatorCode designatorCode = DesignatorDesignatorCode.values()[0];
-
- /** This field shall identify the designator output power in watts */
+
+ /** This field shall identify the designator output power in watts */
protected float designatorPower;
-
- /** This field shall identify the designator wavelength in units of microns */
+
+ /** This field shall identify the designator wavelength in units of microns */
protected float designatorWavelength;
-
- /** designtor spot wrt the designated entity */
+
+ /** designtor spot wrt the designated entity */
protected Vector3Float designatorSpotWrtDesignated = new Vector3Float();
-
- /** designtor spot wrt the designated entity */
+
+ /** designtor spot wrt the designated entity */
protected Vector3Double designatorSpotLocation = new Vector3Double();
-
- /** Dead reckoning algorithm uid 44 */
+
+ /** Dead reckoning algorithm uid 44 */
protected DeadReckoningAlgorithm deadReckoningAlgorithm = DeadReckoningAlgorithm.values()[0];
-
- /** padding */
+
+ /** padding */
protected byte padding1;
-
- /** padding */
+
+ /** padding */
protected short padding2;
-
- /** linear accelleration of entity */
+
+ /** linear accelleration of entity */
protected Vector3Float entityLinearAcceleration = new Vector3Float();
-
-
-/** Constructor */
- public DesignatorPdu()
- {
- setPduType( DISPDUType.DESIGNATOR );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += designatingEntityID.getMarshalledSize();
- marshalSize += codeName.getMarshalledSize();
- marshalSize += designatedEntityID.getMarshalledSize();
- marshalSize += designatorCode.getMarshalledSize();
- marshalSize += 4; // designatorPower
- marshalSize += 4; // designatorWavelength
- marshalSize += designatorSpotWrtDesignated.getMarshalledSize();
- marshalSize += designatorSpotLocation.getMarshalledSize();
- marshalSize += deadReckoningAlgorithm.getMarshalledSize();
- marshalSize += 1; // padding1
- marshalSize += 2; // padding2
- marshalSize += entityLinearAcceleration.getMarshalledSize();
-
- return marshalSize;
-}
-
-
-/** Setter for {@link DesignatorPdu#designatingEntityID}*/
-public DesignatorPdu setDesignatingEntityID(EntityID pDesignatingEntityID)
+
+
+/** Constructor */
+ public DesignatorPdu()
+ {
+ setPduType( DISPDUType.DESIGNATOR );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += designatingEntityID.getMarshalledSize();
+ marshalSize += codeName.getMarshalledSize();
+ marshalSize += designatedEntityID.getMarshalledSize();
+ marshalSize += designatorCode.getMarshalledSize();
+ marshalSize += 4; // designatorPower
+ marshalSize += 4; // designatorWavelength
+ marshalSize += designatorSpotWrtDesignated.getMarshalledSize();
+ marshalSize += designatorSpotLocation.getMarshalledSize();
+ marshalSize += deadReckoningAlgorithm.getMarshalledSize();
+ marshalSize += 1; // padding1
+ marshalSize += 2; // padding2
+ marshalSize += entityLinearAcceleration.getMarshalledSize();
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link DesignatorPdu#designatingEntityID}*/
+public DesignatorPdu setDesignatingEntityID(EntityID pDesignatingEntityID)
{
- designatingEntityID = pDesignatingEntityID;
- return this;
-}
-
-/** Getter for {@link DesignatorPdu#designatingEntityID}*/
-public EntityID getDesignatingEntityID()
+ designatingEntityID = pDesignatingEntityID;
+ return this;
+}
+
+/** Getter for {@link DesignatorPdu#designatingEntityID}*/
+public EntityID getDesignatingEntityID()
{
return designatingEntityID;
-}
-
-/** Setter for {@link DesignatorPdu#codeName}*/
-public DesignatorPdu setCodeName(DesignatorSystemName pCodeName)
+}
+
+/** Setter for {@link DesignatorPdu#codeName}*/
+public DesignatorPdu setCodeName(DesignatorSystemName pCodeName)
{
- codeName = pCodeName;
- return this;
-}
-
-/** Getter for {@link DesignatorPdu#codeName}*/
-public DesignatorSystemName getCodeName()
+ codeName = pCodeName;
+ return this;
+}
+
+/** Getter for {@link DesignatorPdu#codeName}*/
+public DesignatorSystemName getCodeName()
{
return codeName;
-}
-
-/** Setter for {@link DesignatorPdu#designatedEntityID}*/
-public DesignatorPdu setDesignatedEntityID(EntityID pDesignatedEntityID)
+}
+
+/** Setter for {@link DesignatorPdu#designatedEntityID}*/
+public DesignatorPdu setDesignatedEntityID(EntityID pDesignatedEntityID)
{
- designatedEntityID = pDesignatedEntityID;
- return this;
-}
-
-/** Getter for {@link DesignatorPdu#designatedEntityID}*/
-public EntityID getDesignatedEntityID()
+ designatedEntityID = pDesignatedEntityID;
+ return this;
+}
+
+/** Getter for {@link DesignatorPdu#designatedEntityID}*/
+public EntityID getDesignatedEntityID()
{
return designatedEntityID;
-}
-
-/** Setter for {@link DesignatorPdu#designatorCode}*/
-public DesignatorPdu setDesignatorCode(DesignatorDesignatorCode pDesignatorCode)
+}
+
+/** Setter for {@link DesignatorPdu#designatorCode}*/
+public DesignatorPdu setDesignatorCode(DesignatorDesignatorCode pDesignatorCode)
{
- designatorCode = pDesignatorCode;
- return this;
-}
-
-/** Getter for {@link DesignatorPdu#designatorCode}*/
-public DesignatorDesignatorCode getDesignatorCode()
+ designatorCode = pDesignatorCode;
+ return this;
+}
+
+/** Getter for {@link DesignatorPdu#designatorCode}*/
+public DesignatorDesignatorCode getDesignatorCode()
{
return designatorCode;
-}
-
-/** Setter for {@link DesignatorPdu#designatorPower}*/
-public DesignatorPdu setDesignatorPower(float pDesignatorPower)
+}
+
+/** Setter for {@link DesignatorPdu#designatorPower}*/
+public DesignatorPdu setDesignatorPower(float pDesignatorPower)
{
- designatorPower = pDesignatorPower;
- return this;
-}
-
-/** Getter for {@link DesignatorPdu#designatorPower}*/
-public float getDesignatorPower()
+ designatorPower = pDesignatorPower;
+ return this;
+}
+
+/** Getter for {@link DesignatorPdu#designatorPower}*/
+public float getDesignatorPower()
{
return designatorPower;
-}
-
-/** Setter for {@link DesignatorPdu#designatorWavelength}*/
-public DesignatorPdu setDesignatorWavelength(float pDesignatorWavelength)
+}
+
+/** Setter for {@link DesignatorPdu#designatorWavelength}*/
+public DesignatorPdu setDesignatorWavelength(float pDesignatorWavelength)
{
- designatorWavelength = pDesignatorWavelength;
- return this;
-}
-
-/** Getter for {@link DesignatorPdu#designatorWavelength}*/
-public float getDesignatorWavelength()
+ designatorWavelength = pDesignatorWavelength;
+ return this;
+}
+
+/** Getter for {@link DesignatorPdu#designatorWavelength}*/
+public float getDesignatorWavelength()
{
return designatorWavelength;
-}
-
-/** Setter for {@link DesignatorPdu#designatorSpotWrtDesignated}*/
-public DesignatorPdu setDesignatorSpotWrtDesignated(Vector3Float pDesignatorSpotWrtDesignated)
+}
+
+/** Setter for {@link DesignatorPdu#designatorSpotWrtDesignated}*/
+public DesignatorPdu setDesignatorSpotWrtDesignated(Vector3Float pDesignatorSpotWrtDesignated)
{
- designatorSpotWrtDesignated = pDesignatorSpotWrtDesignated;
- return this;
-}
-
-/** Getter for {@link DesignatorPdu#designatorSpotWrtDesignated}*/
-public Vector3Float getDesignatorSpotWrtDesignated()
+ designatorSpotWrtDesignated = pDesignatorSpotWrtDesignated;
+ return this;
+}
+
+/** Getter for {@link DesignatorPdu#designatorSpotWrtDesignated}*/
+public Vector3Float getDesignatorSpotWrtDesignated()
{
return designatorSpotWrtDesignated;
-}
-
-/** Setter for {@link DesignatorPdu#designatorSpotLocation}*/
-public DesignatorPdu setDesignatorSpotLocation(Vector3Double pDesignatorSpotLocation)
+}
+
+/** Setter for {@link DesignatorPdu#designatorSpotLocation}*/
+public DesignatorPdu setDesignatorSpotLocation(Vector3Double pDesignatorSpotLocation)
{
- designatorSpotLocation = pDesignatorSpotLocation;
- return this;
-}
-
-/** Getter for {@link DesignatorPdu#designatorSpotLocation}*/
-public Vector3Double getDesignatorSpotLocation()
+ designatorSpotLocation = pDesignatorSpotLocation;
+ return this;
+}
+
+/** Getter for {@link DesignatorPdu#designatorSpotLocation}*/
+public Vector3Double getDesignatorSpotLocation()
{
return designatorSpotLocation;
-}
-
-/** Setter for {@link DesignatorPdu#deadReckoningAlgorithm}*/
-public DesignatorPdu setDeadReckoningAlgorithm(DeadReckoningAlgorithm pDeadReckoningAlgorithm)
+}
+
+/** Setter for {@link DesignatorPdu#deadReckoningAlgorithm}*/
+public DesignatorPdu setDeadReckoningAlgorithm(DeadReckoningAlgorithm pDeadReckoningAlgorithm)
{
- deadReckoningAlgorithm = pDeadReckoningAlgorithm;
- return this;
-}
-
-/** Getter for {@link DesignatorPdu#deadReckoningAlgorithm}*/
-public DeadReckoningAlgorithm getDeadReckoningAlgorithm()
+ deadReckoningAlgorithm = pDeadReckoningAlgorithm;
+ return this;
+}
+
+/** Getter for {@link DesignatorPdu#deadReckoningAlgorithm}*/
+public DeadReckoningAlgorithm getDeadReckoningAlgorithm()
{
return deadReckoningAlgorithm;
-}
-
-/** Setter for {@link DesignatorPdu#padding1}*/
-public DesignatorPdu setPadding1(byte pPadding1)
+}
+
+/** Setter for {@link DesignatorPdu#padding1}*/
+public DesignatorPdu setPadding1(byte pPadding1)
{
- padding1 = pPadding1;
- return this;
-}
-
-/** Getter for {@link DesignatorPdu#padding1}*/
-public byte getPadding1()
+ padding1 = pPadding1;
+ return this;
+}
+
+/** Getter for {@link DesignatorPdu#padding1}*/
+public byte getPadding1()
{
return padding1;
-}
-
-/** Setter for {@link DesignatorPdu#padding2}*/
-public DesignatorPdu setPadding2(short pPadding2)
+}
+
+/** Setter for {@link DesignatorPdu#padding2}*/
+public DesignatorPdu setPadding2(short pPadding2)
{
- padding2 = pPadding2;
- return this;
-}
-
-/** Getter for {@link DesignatorPdu#padding2}*/
-public short getPadding2()
+ padding2 = pPadding2;
+ return this;
+}
+
+/** Getter for {@link DesignatorPdu#padding2}*/
+public short getPadding2()
{
return padding2;
-}
-
-/** Setter for {@link DesignatorPdu#entityLinearAcceleration}*/
-public DesignatorPdu setEntityLinearAcceleration(Vector3Float pEntityLinearAcceleration)
+}
+
+/** Setter for {@link DesignatorPdu#entityLinearAcceleration}*/
+public DesignatorPdu setEntityLinearAcceleration(Vector3Float pEntityLinearAcceleration)
{
- entityLinearAcceleration = pEntityLinearAcceleration;
- return this;
-}
-
-/** Getter for {@link DesignatorPdu#entityLinearAcceleration}*/
-public Vector3Float getEntityLinearAcceleration()
+ entityLinearAcceleration = pEntityLinearAcceleration;
+ return this;
+}
+
+/** Getter for {@link DesignatorPdu#entityLinearAcceleration}*/
+public Vector3Float getEntityLinearAcceleration()
{
return entityLinearAcceleration;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- designatingEntityID.marshal(dos);
- codeName.marshal(dos);
- designatedEntityID.marshal(dos);
- designatorCode.marshal(dos);
- dos.writeFloat(designatorPower);
- dos.writeFloat(designatorWavelength);
- designatorSpotWrtDesignated.marshal(dos);
- designatorSpotLocation.marshal(dos);
- deadReckoningAlgorithm.marshal(dos);
- dos.writeByte(padding1);
- dos.writeShort(padding2);
- entityLinearAcceleration.marshal(dos);
+ {
+ designatingEntityID.marshal(dos);
+ codeName.marshal(dos);
+ designatedEntityID.marshal(dos);
+ designatorCode.marshal(dos);
+ dos.writeFloat(designatorPower);
+ dos.writeFloat(designatorWavelength);
+ designatorSpotWrtDesignated.marshal(dos);
+ designatorSpotLocation.marshal(dos);
+ deadReckoningAlgorithm.marshal(dos);
+ dos.writeByte(padding1);
+ dos.writeShort(padding2);
+ entityLinearAcceleration.marshal(dos);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += designatingEntityID.unmarshal(dis);
- codeName = DesignatorSystemName.unmarshalEnum(dis);
- uPosition += codeName.getMarshalledSize();
- uPosition += designatedEntityID.unmarshal(dis);
- designatorCode = DesignatorDesignatorCode.unmarshalEnum(dis);
- uPosition += designatorCode.getMarshalledSize();
- designatorPower = dis.readFloat();
- uPosition += 4;
- designatorWavelength = dis.readFloat();
- uPosition += 4;
- uPosition += designatorSpotWrtDesignated.unmarshal(dis);
- uPosition += designatorSpotLocation.unmarshal(dis);
- deadReckoningAlgorithm = DeadReckoningAlgorithm.unmarshalEnum(dis);
- uPosition += deadReckoningAlgorithm.getMarshalledSize();
- padding1 = (byte)dis.readUnsignedByte();
- uPosition += 1;
- padding2 = (short)dis.readUnsignedShort();
- uPosition += 2;
- uPosition += entityLinearAcceleration.unmarshal(dis);
+ {
+ uPosition += designatingEntityID.unmarshal(dis);
+ codeName = DesignatorSystemName.unmarshalEnum(dis);
+ uPosition += codeName.getMarshalledSize();
+ uPosition += designatedEntityID.unmarshal(dis);
+ designatorCode = DesignatorDesignatorCode.unmarshalEnum(dis);
+ uPosition += designatorCode.getMarshalledSize();
+ designatorPower = dis.readFloat();
+ uPosition += 4;
+ designatorWavelength = dis.readFloat();
+ uPosition += 4;
+ uPosition += designatorSpotWrtDesignated.unmarshal(dis);
+ uPosition += designatorSpotLocation.unmarshal(dis);
+ deadReckoningAlgorithm = DeadReckoningAlgorithm.unmarshalEnum(dis);
+ uPosition += deadReckoningAlgorithm.getMarshalledSize();
+ padding1 = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ padding2 = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ uPosition += entityLinearAcceleration.unmarshal(dis);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- designatingEntityID.marshal(buff);
- codeName.marshal(buff);
- designatedEntityID.marshal(buff);
- designatorCode.marshal(buff);
- buff.putFloat( (float)designatorPower);
- buff.putFloat( (float)designatorWavelength);
- designatorSpotWrtDesignated.marshal(buff);
- designatorSpotLocation.marshal(buff);
- deadReckoningAlgorithm.marshal(buff);
- buff.put( (byte)padding1);
- buff.putShort( (short)padding2);
- entityLinearAcceleration.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ designatingEntityID.marshal(buff);
+ codeName.marshal(buff);
+ designatedEntityID.marshal(buff);
+ designatorCode.marshal(buff);
+ buff.putFloat( (float)designatorPower);
+ buff.putFloat( (float)designatorWavelength);
+ designatorSpotWrtDesignated.marshal(buff);
+ designatorSpotLocation.marshal(buff);
+ deadReckoningAlgorithm.marshal(buff);
+ buff.put( (byte)padding1);
+ buff.putShort( (short)padding2);
+ entityLinearAcceleration.marshal(buff);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- designatingEntityID.unmarshal(buff);
- codeName = DesignatorSystemName.unmarshalEnum(buff);
- designatedEntityID.unmarshal(buff);
- designatorCode = DesignatorDesignatorCode.unmarshalEnum(buff);
- designatorPower = buff.getFloat();
- designatorWavelength = buff.getFloat();
- designatorSpotWrtDesignated.unmarshal(buff);
- designatorSpotLocation.unmarshal(buff);
- deadReckoningAlgorithm = DeadReckoningAlgorithm.unmarshalEnum(buff);
- padding1 = (byte)(buff.get() & 0xFF);
- padding2 = (short)(buff.getShort() & 0xFFFF);
- entityLinearAcceleration.unmarshal(buff);
- return getMarshalledSize();
+
+ designatingEntityID.unmarshal(buff);
+ codeName = DesignatorSystemName.unmarshalEnum(buff);
+ designatedEntityID.unmarshal(buff);
+ designatorCode = DesignatorDesignatorCode.unmarshalEnum(buff);
+ designatorPower = buff.getFloat();
+ designatorWavelength = buff.getFloat();
+ designatorSpotWrtDesignated.unmarshal(buff);
+ designatorSpotLocation.unmarshal(buff);
+ deadReckoningAlgorithm = DeadReckoningAlgorithm.unmarshalEnum(buff);
+ padding1 = (byte)(buff.get() & 0xFF);
+ padding2 = (short)(buff.getShort() & 0xFFFF);
+ entityLinearAcceleration.unmarshal(buff);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final DesignatorPdu rhs = (DesignatorPdu)obj;
-
- if( ! (designatingEntityID.equals( rhs.designatingEntityID) )) ivarsEqual = false;
- if( ! (codeName == rhs.codeName)) ivarsEqual = false;
- if( ! (designatedEntityID.equals( rhs.designatedEntityID) )) ivarsEqual = false;
- if( ! (designatorCode == rhs.designatorCode)) ivarsEqual = false;
- if( ! (designatorPower == rhs.designatorPower)) ivarsEqual = false;
- if( ! (designatorWavelength == rhs.designatorWavelength)) ivarsEqual = false;
- if( ! (designatorSpotWrtDesignated.equals( rhs.designatorSpotWrtDesignated) )) ivarsEqual = false;
- if( ! (designatorSpotLocation.equals( rhs.designatorSpotLocation) )) ivarsEqual = false;
- if( ! (deadReckoningAlgorithm == rhs.deadReckoningAlgorithm)) ivarsEqual = false;
- if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
- if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
- if( ! (entityLinearAcceleration.equals( rhs.entityLinearAcceleration) )) ivarsEqual = false;
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final DesignatorPdu rhs = (DesignatorPdu)obj;
+
+ if( ! (designatingEntityID.equals( rhs.designatingEntityID) )) ivarsEqual = false;
+ if( ! (codeName == rhs.codeName)) ivarsEqual = false;
+ if( ! (designatedEntityID.equals( rhs.designatedEntityID) )) ivarsEqual = false;
+ if( ! (designatorCode == rhs.designatorCode)) ivarsEqual = false;
+ if( ! (designatorPower == rhs.designatorPower)) ivarsEqual = false;
+ if( ! (designatorWavelength == rhs.designatorWavelength)) ivarsEqual = false;
+ if( ! (designatorSpotWrtDesignated.equals( rhs.designatorSpotWrtDesignated) )) ivarsEqual = false;
+ if( ! (designatorSpotLocation.equals( rhs.designatorSpotLocation) )) ivarsEqual = false;
+ if( ! (deadReckoningAlgorithm == rhs.deadReckoningAlgorithm)) ivarsEqual = false;
+ if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
+ if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
+ if( ! (entityLinearAcceleration.equals( rhs.entityLinearAcceleration) )) ivarsEqual = false;
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" designatingEntityID: ").append(designatingEntityID).append("\n");
- sb.append(" codeName: ").append(codeName).append("\n");
- sb.append(" designatedEntityID: ").append(designatedEntityID).append("\n");
- sb.append(" designatorCode: ").append(designatorCode).append("\n");
- sb.append(" designatorPower: ").append(designatorPower).append("\n");
- sb.append(" designatorWavelength: ").append(designatorWavelength).append("\n");
- sb.append(" designatorSpotWrtDesignated: ").append(designatorSpotWrtDesignated).append("\n");
- sb.append(" designatorSpotLocation: ").append(designatorSpotLocation).append("\n");
- sb.append(" deadReckoningAlgorithm: ").append(deadReckoningAlgorithm).append("\n");
- sb.append(" padding1: ").append(padding1).append("\n");
- sb.append(" padding2: ").append(padding2).append("\n");
- sb.append(" entityLinearAcceleration: ").append(entityLinearAcceleration).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" designatingEntityID: ").append(designatingEntityID).append("\n");
+ sb.append(" codeName: ").append(codeName).append("\n");
+ sb.append(" designatedEntityID: ").append(designatedEntityID).append("\n");
+ sb.append(" designatorCode: ").append(designatorCode).append("\n");
+ sb.append(" designatorPower: ").append(designatorPower).append("\n");
+ sb.append(" designatorWavelength: ").append(designatorWavelength).append("\n");
+ sb.append(" designatorSpotWrtDesignated: ").append(designatorSpotWrtDesignated).append("\n");
+ sb.append(" designatorSpotLocation: ").append(designatorSpotLocation).append("\n");
+ sb.append(" deadReckoningAlgorithm: ").append(deadReckoningAlgorithm).append("\n");
+ sb.append(" padding1: ").append(padding1).append("\n");
+ sb.append(" padding2: ").append(padding2).append("\n");
+ sb.append(" entityLinearAcceleration: ").append(entityLinearAcceleration).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/DetonationPdu.java b/src-generated/edu/nps/moves/dis7/DetonationPdu.java
index 1b258491aa557e699641df15b54c2ba8a8e9e035..53df05591401a7a2b6e066fd5aa26b2991432bfd 100644
--- a/src-generated/edu/nps/moves/dis7/DetonationPdu.java
+++ b/src-generated/edu/nps/moves/dis7/DetonationPdu.java
@@ -1,437 +1,437 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 7.3.3 Used to communicate the detonation or impact of munitions, as well as non-munition explosions, the burst or initial bloom of chaff, and the ignition of a flare.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class DetonationPdu extends WarfareFamilyPdu implements Serializable
-{
- /** ID of the entity that shot */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 7.3.3 Used to communicate the detonation or impact of munitions, as well as non-munition explosions, the burst or initial bloom of chaff, and the ignition of a flare.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class DetonationPdu extends WarfareFamilyPdu implements Serializable
+{
+ /** ID of the entity that shot */
protected EntityID sourceEntityID = new EntityID();
-
- /** ID of the entity that is being shot at */
+
+ /** ID of the entity that is being shot at */
protected EntityID targetEntityID = new EntityID();
-
- /** ID of the expendable entity, Section 7.3.3 */
+
+ /** ID of the expendable entity, Section 7.3.3 */
protected EntityID explodingEntityID = new EntityID();
-
- /** ID of event, Section 7.3.3 */
+
+ /** ID of event, Section 7.3.3 */
protected EventIdentifier eventID = new EventIdentifier();
-
- /** velocity of the munition immediately before detonation/impact, Section 7.3.3 */
+
+ /** velocity of the munition immediately before detonation/impact, Section 7.3.3 */
protected Vector3Float velocity = new Vector3Float();
-
- /** location of the munition detonation, the expendable detonation, Section 7.3.3 */
+
+ /** location of the munition detonation, the expendable detonation, Section 7.3.3 */
protected Vector3Double locationInWorldCoordinates = new Vector3Double();
-
- /** Describes the detonation represented, Section 7.3.3 */
+
+ /** Describes the detonation represented, Section 7.3.3 */
protected MunitionDescriptor descriptor = new MunitionDescriptor();
-
- /** Velocity of the ammunition, Section 7.3.3 */
+
+ /** Velocity of the ammunition, Section 7.3.3 */
protected Vector3Float locationOfEntityCoordinates = new Vector3Float();
-
- /** result of the detonation, Section 7.3.3 uid 62 */
+
+ /** result of the detonation, Section 7.3.3 uid 62 */
protected DetonationResult detonationResult = DetonationResult.values()[0];
-
- /** How many articulation parameters we have, Section 7.3.3 */
+
+ /** How many articulation parameters we have, Section 7.3.3 */
protected byte numberOfVariableParameters;
-
- /** padding */
+
+ /** padding */
protected short pad;
-
- /** specify the parameter values for each Variable Parameter record, Section 7.3.3 */
+
+ /** specify the parameter values for each Variable Parameter record, Section 7.3.3 */
protected List< VariableParameter > variableParameters = new ArrayList< VariableParameter >();
-
-
-/** Constructor */
- public DetonationPdu()
- {
- setPduType( DISPDUType.DETONATION );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += sourceEntityID.getMarshalledSize();
- marshalSize += targetEntityID.getMarshalledSize();
- marshalSize += explodingEntityID.getMarshalledSize();
- marshalSize += eventID.getMarshalledSize();
- marshalSize += velocity.getMarshalledSize();
- marshalSize += locationInWorldCoordinates.getMarshalledSize();
- marshalSize += descriptor.getMarshalledSize();
- marshalSize += locationOfEntityCoordinates.getMarshalledSize();
- marshalSize += detonationResult.getMarshalledSize();
- marshalSize += 1; // numberOfVariableParameters
- marshalSize += 2; // pad
- for(int idx=0; idx < variableParameters.size(); idx++)
- {
- VariableParameter listElement = variableParameters.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link DetonationPdu#sourceEntityID}*/
-public DetonationPdu setSourceEntityID(EntityID pSourceEntityID)
+
+
+/** Constructor */
+ public DetonationPdu()
+ {
+ setPduType( DISPDUType.DETONATION );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += sourceEntityID.getMarshalledSize();
+ marshalSize += targetEntityID.getMarshalledSize();
+ marshalSize += explodingEntityID.getMarshalledSize();
+ marshalSize += eventID.getMarshalledSize();
+ marshalSize += velocity.getMarshalledSize();
+ marshalSize += locationInWorldCoordinates.getMarshalledSize();
+ marshalSize += descriptor.getMarshalledSize();
+ marshalSize += locationOfEntityCoordinates.getMarshalledSize();
+ marshalSize += detonationResult.getMarshalledSize();
+ marshalSize += 1; // numberOfVariableParameters
+ marshalSize += 2; // pad
+ for(int idx=0; idx < variableParameters.size(); idx++)
+ {
+ VariableParameter listElement = variableParameters.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link DetonationPdu#sourceEntityID}*/
+public DetonationPdu setSourceEntityID(EntityID pSourceEntityID)
{
- sourceEntityID = pSourceEntityID;
- return this;
-}
-
-/** Getter for {@link DetonationPdu#sourceEntityID}*/
-public EntityID getSourceEntityID()
+ sourceEntityID = pSourceEntityID;
+ return this;
+}
+
+/** Getter for {@link DetonationPdu#sourceEntityID}*/
+public EntityID getSourceEntityID()
{
return sourceEntityID;
-}
-
-/** Setter for {@link DetonationPdu#targetEntityID}*/
-public DetonationPdu setTargetEntityID(EntityID pTargetEntityID)
+}
+
+/** Setter for {@link DetonationPdu#targetEntityID}*/
+public DetonationPdu setTargetEntityID(EntityID pTargetEntityID)
{
- targetEntityID = pTargetEntityID;
- return this;
-}
-
-/** Getter for {@link DetonationPdu#targetEntityID}*/
-public EntityID getTargetEntityID()
+ targetEntityID = pTargetEntityID;
+ return this;
+}
+
+/** Getter for {@link DetonationPdu#targetEntityID}*/
+public EntityID getTargetEntityID()
{
return targetEntityID;
-}
-
-/** Setter for {@link DetonationPdu#explodingEntityID}*/
-public DetonationPdu setExplodingEntityID(EntityID pExplodingEntityID)
+}
+
+/** Setter for {@link DetonationPdu#explodingEntityID}*/
+public DetonationPdu setExplodingEntityID(EntityID pExplodingEntityID)
{
- explodingEntityID = pExplodingEntityID;
- return this;
-}
-
-/** Getter for {@link DetonationPdu#explodingEntityID}*/
-public EntityID getExplodingEntityID()
+ explodingEntityID = pExplodingEntityID;
+ return this;
+}
+
+/** Getter for {@link DetonationPdu#explodingEntityID}*/
+public EntityID getExplodingEntityID()
{
return explodingEntityID;
-}
-
-/** Setter for {@link DetonationPdu#eventID}*/
-public DetonationPdu setEventID(EventIdentifier pEventID)
+}
+
+/** Setter for {@link DetonationPdu#eventID}*/
+public DetonationPdu setEventID(EventIdentifier pEventID)
{
- eventID = pEventID;
- return this;
-}
-
-/** Getter for {@link DetonationPdu#eventID}*/
-public EventIdentifier getEventID()
+ eventID = pEventID;
+ return this;
+}
+
+/** Getter for {@link DetonationPdu#eventID}*/
+public EventIdentifier getEventID()
{
return eventID;
-}
-
-/** Setter for {@link DetonationPdu#velocity}*/
-public DetonationPdu setVelocity(Vector3Float pVelocity)
+}
+
+/** Setter for {@link DetonationPdu#velocity}*/
+public DetonationPdu setVelocity(Vector3Float pVelocity)
{
- velocity = pVelocity;
- return this;
-}
-
-/** Getter for {@link DetonationPdu#velocity}*/
-public Vector3Float getVelocity()
+ velocity = pVelocity;
+ return this;
+}
+
+/** Getter for {@link DetonationPdu#velocity}*/
+public Vector3Float getVelocity()
{
return velocity;
-}
-
-/** Setter for {@link DetonationPdu#locationInWorldCoordinates}*/
-public DetonationPdu setLocationInWorldCoordinates(Vector3Double pLocationInWorldCoordinates)
+}
+
+/** Setter for {@link DetonationPdu#locationInWorldCoordinates}*/
+public DetonationPdu setLocationInWorldCoordinates(Vector3Double pLocationInWorldCoordinates)
{
- locationInWorldCoordinates = pLocationInWorldCoordinates;
- return this;
-}
-
-/** Getter for {@link DetonationPdu#locationInWorldCoordinates}*/
-public Vector3Double getLocationInWorldCoordinates()
+ locationInWorldCoordinates = pLocationInWorldCoordinates;
+ return this;
+}
+
+/** Getter for {@link DetonationPdu#locationInWorldCoordinates}*/
+public Vector3Double getLocationInWorldCoordinates()
{
return locationInWorldCoordinates;
-}
-
-/** Setter for {@link DetonationPdu#descriptor}*/
-public DetonationPdu setDescriptor(MunitionDescriptor pDescriptor)
+}
+
+/** Setter for {@link DetonationPdu#descriptor}*/
+public DetonationPdu setDescriptor(MunitionDescriptor pDescriptor)
{
- descriptor = pDescriptor;
- return this;
-}
-
-/** Getter for {@link DetonationPdu#descriptor}*/
-public MunitionDescriptor getDescriptor()
+ descriptor = pDescriptor;
+ return this;
+}
+
+/** Getter for {@link DetonationPdu#descriptor}*/
+public MunitionDescriptor getDescriptor()
{
return descriptor;
-}
-
-/** Setter for {@link DetonationPdu#locationOfEntityCoordinates}*/
-public DetonationPdu setLocationOfEntityCoordinates(Vector3Float pLocationOfEntityCoordinates)
+}
+
+/** Setter for {@link DetonationPdu#locationOfEntityCoordinates}*/
+public DetonationPdu setLocationOfEntityCoordinates(Vector3Float pLocationOfEntityCoordinates)
{
- locationOfEntityCoordinates = pLocationOfEntityCoordinates;
- return this;
-}
-
-/** Getter for {@link DetonationPdu#locationOfEntityCoordinates}*/
-public Vector3Float getLocationOfEntityCoordinates()
+ locationOfEntityCoordinates = pLocationOfEntityCoordinates;
+ return this;
+}
+
+/** Getter for {@link DetonationPdu#locationOfEntityCoordinates}*/
+public Vector3Float getLocationOfEntityCoordinates()
{
return locationOfEntityCoordinates;
-}
-
-/** Setter for {@link DetonationPdu#detonationResult}*/
-public DetonationPdu setDetonationResult(DetonationResult pDetonationResult)
+}
+
+/** Setter for {@link DetonationPdu#detonationResult}*/
+public DetonationPdu setDetonationResult(DetonationResult pDetonationResult)
{
- detonationResult = pDetonationResult;
- return this;
-}
-
-/** Getter for {@link DetonationPdu#detonationResult}*/
-public DetonationResult getDetonationResult()
+ detonationResult = pDetonationResult;
+ return this;
+}
+
+/** Getter for {@link DetonationPdu#detonationResult}*/
+public DetonationResult getDetonationResult()
{
return detonationResult;
-}
-
-/** Setter for {@link DetonationPdu#pad}*/
-public DetonationPdu setPad(short pPad)
+}
+
+/** Setter for {@link DetonationPdu#pad}*/
+public DetonationPdu setPad(short pPad)
{
- pad = pPad;
- return this;
-}
-
-/** Getter for {@link DetonationPdu#pad}*/
-public short getPad()
+ pad = pPad;
+ return this;
+}
+
+/** Getter for {@link DetonationPdu#pad}*/
+public short getPad()
{
return pad;
-}
-
-/** Setter for {@link DetonationPdu#variableParameters}*/
-public DetonationPdu setVariableParameters(List<VariableParameter> pVariableParameters)
+}
+
+/** Setter for {@link DetonationPdu#variableParameters}*/
+public DetonationPdu setVariableParameters(List<VariableParameter> pVariableParameters)
{
- variableParameters = pVariableParameters;
- return this;
-}
-
-/** Getter for {@link DetonationPdu#variableParameters}*/
-public List<VariableParameter> getVariableParameters()
+ variableParameters = pVariableParameters;
+ return this;
+}
+
+/** Getter for {@link DetonationPdu#variableParameters}*/
+public List<VariableParameter> getVariableParameters()
{
return variableParameters;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- sourceEntityID.marshal(dos);
- targetEntityID.marshal(dos);
- explodingEntityID.marshal(dos);
- eventID.marshal(dos);
- velocity.marshal(dos);
- locationInWorldCoordinates.marshal(dos);
- descriptor.marshal(dos);
- locationOfEntityCoordinates.marshal(dos);
- detonationResult.marshal(dos);
- dos.writeByte(variableParameters.size());
- dos.writeShort(pad);
-
- for(int idx = 0; idx < variableParameters.size(); idx++)
- {
- VariableParameter aVariableParameter = variableParameters.get(idx);
- aVariableParameter.marshal(dos);
- }
-
+ {
+ sourceEntityID.marshal(dos);
+ targetEntityID.marshal(dos);
+ explodingEntityID.marshal(dos);
+ eventID.marshal(dos);
+ velocity.marshal(dos);
+ locationInWorldCoordinates.marshal(dos);
+ descriptor.marshal(dos);
+ locationOfEntityCoordinates.marshal(dos);
+ detonationResult.marshal(dos);
+ dos.writeByte(variableParameters.size());
+ dos.writeShort(pad);
+
+ for(int idx = 0; idx < variableParameters.size(); idx++)
+ {
+ VariableParameter aVariableParameter = variableParameters.get(idx);
+ aVariableParameter.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += sourceEntityID.unmarshal(dis);
- uPosition += targetEntityID.unmarshal(dis);
- uPosition += explodingEntityID.unmarshal(dis);
- uPosition += eventID.unmarshal(dis);
- uPosition += velocity.unmarshal(dis);
- uPosition += locationInWorldCoordinates.unmarshal(dis);
- uPosition += descriptor.unmarshal(dis);
- uPosition += locationOfEntityCoordinates.unmarshal(dis);
- detonationResult = DetonationResult.unmarshalEnum(dis);
- uPosition += detonationResult.getMarshalledSize();
- numberOfVariableParameters = (byte)dis.readUnsignedByte();
- uPosition += 1;
- pad = (short)dis.readUnsignedShort();
- uPosition += 2;
- for(int idx = 0; idx < numberOfVariableParameters; idx++)
- {
- VariableParameter anX = new VariableParameter();
- uPosition += anX.unmarshal(dis);
- variableParameters.add(anX);
- }
-
+ {
+ uPosition += sourceEntityID.unmarshal(dis);
+ uPosition += targetEntityID.unmarshal(dis);
+ uPosition += explodingEntityID.unmarshal(dis);
+ uPosition += eventID.unmarshal(dis);
+ uPosition += velocity.unmarshal(dis);
+ uPosition += locationInWorldCoordinates.unmarshal(dis);
+ uPosition += descriptor.unmarshal(dis);
+ uPosition += locationOfEntityCoordinates.unmarshal(dis);
+ detonationResult = DetonationResult.unmarshalEnum(dis);
+ uPosition += detonationResult.getMarshalledSize();
+ numberOfVariableParameters = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ pad = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ for(int idx = 0; idx < numberOfVariableParameters; idx++)
+ {
+ VariableParameter anX = new VariableParameter();
+ uPosition += anX.unmarshal(dis);
+ variableParameters.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- sourceEntityID.marshal(buff);
- targetEntityID.marshal(buff);
- explodingEntityID.marshal(buff);
- eventID.marshal(buff);
- velocity.marshal(buff);
- locationInWorldCoordinates.marshal(buff);
- descriptor.marshal(buff);
- locationOfEntityCoordinates.marshal(buff);
- detonationResult.marshal(buff);
- buff.put( (byte)variableParameters.size());
- buff.putShort( (short)pad);
-
- for(int idx = 0; idx < variableParameters.size(); idx++)
- {
- VariableParameter aVariableParameter = variableParameters.get(idx);
- aVariableParameter.marshal(buff);
- }
-
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ sourceEntityID.marshal(buff);
+ targetEntityID.marshal(buff);
+ explodingEntityID.marshal(buff);
+ eventID.marshal(buff);
+ velocity.marshal(buff);
+ locationInWorldCoordinates.marshal(buff);
+ descriptor.marshal(buff);
+ locationOfEntityCoordinates.marshal(buff);
+ detonationResult.marshal(buff);
+ buff.put( (byte)variableParameters.size());
+ buff.putShort( (short)pad);
+
+ for(int idx = 0; idx < variableParameters.size(); idx++)
+ {
+ VariableParameter aVariableParameter = variableParameters.get(idx);
+ aVariableParameter.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- sourceEntityID.unmarshal(buff);
- targetEntityID.unmarshal(buff);
- explodingEntityID.unmarshal(buff);
- eventID.unmarshal(buff);
- velocity.unmarshal(buff);
- locationInWorldCoordinates.unmarshal(buff);
- descriptor.unmarshal(buff);
- locationOfEntityCoordinates.unmarshal(buff);
- detonationResult = DetonationResult.unmarshalEnum(buff);
- numberOfVariableParameters = (byte)(buff.get() & 0xFF);
- pad = (short)(buff.getShort() & 0xFFFF);
- for(int idx = 0; idx < numberOfVariableParameters; idx++)
- {
- VariableParameter anX = new VariableParameter();
- anX.unmarshal(buff);
- variableParameters.add(anX);
- }
-
- return getMarshalledSize();
+
+ sourceEntityID.unmarshal(buff);
+ targetEntityID.unmarshal(buff);
+ explodingEntityID.unmarshal(buff);
+ eventID.unmarshal(buff);
+ velocity.unmarshal(buff);
+ locationInWorldCoordinates.unmarshal(buff);
+ descriptor.unmarshal(buff);
+ locationOfEntityCoordinates.unmarshal(buff);
+ detonationResult = DetonationResult.unmarshalEnum(buff);
+ numberOfVariableParameters = (byte)(buff.get() & 0xFF);
+ pad = (short)(buff.getShort() & 0xFFFF);
+ for(int idx = 0; idx < numberOfVariableParameters; idx++)
+ {
+ VariableParameter anX = new VariableParameter();
+ anX.unmarshal(buff);
+ variableParameters.add(anX);
+ }
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final DetonationPdu rhs = (DetonationPdu)obj;
-
- if( ! (sourceEntityID.equals( rhs.sourceEntityID) )) ivarsEqual = false;
- if( ! (targetEntityID.equals( rhs.targetEntityID) )) ivarsEqual = false;
- if( ! (explodingEntityID.equals( rhs.explodingEntityID) )) ivarsEqual = false;
- if( ! (eventID.equals( rhs.eventID) )) ivarsEqual = false;
- if( ! (velocity.equals( rhs.velocity) )) ivarsEqual = false;
- if( ! (locationInWorldCoordinates.equals( rhs.locationInWorldCoordinates) )) ivarsEqual = false;
- if( ! (descriptor.equals( rhs.descriptor) )) ivarsEqual = false;
- if( ! (locationOfEntityCoordinates.equals( rhs.locationOfEntityCoordinates) )) ivarsEqual = false;
- if( ! (detonationResult == rhs.detonationResult)) ivarsEqual = false;
- if( ! (pad == rhs.pad)) ivarsEqual = false;
-
- for(int idx = 0; idx < variableParameters.size(); idx++)
- if( ! ( variableParameters.get(idx).equals(rhs.variableParameters.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final DetonationPdu rhs = (DetonationPdu)obj;
+
+ if( ! (sourceEntityID.equals( rhs.sourceEntityID) )) ivarsEqual = false;
+ if( ! (targetEntityID.equals( rhs.targetEntityID) )) ivarsEqual = false;
+ if( ! (explodingEntityID.equals( rhs.explodingEntityID) )) ivarsEqual = false;
+ if( ! (eventID.equals( rhs.eventID) )) ivarsEqual = false;
+ if( ! (velocity.equals( rhs.velocity) )) ivarsEqual = false;
+ if( ! (locationInWorldCoordinates.equals( rhs.locationInWorldCoordinates) )) ivarsEqual = false;
+ if( ! (descriptor.equals( rhs.descriptor) )) ivarsEqual = false;
+ if( ! (locationOfEntityCoordinates.equals( rhs.locationOfEntityCoordinates) )) ivarsEqual = false;
+ if( ! (detonationResult == rhs.detonationResult)) ivarsEqual = false;
+ if( ! (pad == rhs.pad)) ivarsEqual = false;
+
+ for(int idx = 0; idx < variableParameters.size(); idx++)
+ if( ! ( variableParameters.get(idx).equals(rhs.variableParameters.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" sourceEntityID: ").append(sourceEntityID).append("\n");
- sb.append(" targetEntityID: ").append(targetEntityID).append("\n");
- sb.append(" explodingEntityID: ").append(explodingEntityID).append("\n");
- sb.append(" eventID: ").append(eventID).append("\n");
- sb.append(" velocity: ").append(velocity).append("\n");
- sb.append(" locationInWorldCoordinates: ").append(locationInWorldCoordinates).append("\n");
- sb.append(" descriptor: ").append(descriptor).append("\n");
- sb.append(" locationOfEntityCoordinates: ").append(locationOfEntityCoordinates).append("\n");
- sb.append(" detonationResult: ").append(detonationResult).append("\n");
- sb.append(" pad: ").append(pad).append("\n");
- sb.append(" variableParameters: ").append("\n");
- variableParameters.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" sourceEntityID: ").append(sourceEntityID).append("\n");
+ sb.append(" targetEntityID: ").append(targetEntityID).append("\n");
+ sb.append(" explodingEntityID: ").append(explodingEntityID).append("\n");
+ sb.append(" eventID: ").append(eventID).append("\n");
+ sb.append(" velocity: ").append(velocity).append("\n");
+ sb.append(" locationInWorldCoordinates: ").append(locationInWorldCoordinates).append("\n");
+ sb.append(" descriptor: ").append(descriptor).append("\n");
+ sb.append(" locationOfEntityCoordinates: ").append(locationOfEntityCoordinates).append("\n");
+ sb.append(" detonationResult: ").append(detonationResult).append("\n");
+ sb.append(" pad: ").append(pad).append("\n");
+ sb.append(" variableParameters: ").append("\n");
+ variableParameters.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/DirectedEnergyAreaAimpoint.java b/src-generated/edu/nps/moves/dis7/DirectedEnergyAreaAimpoint.java
index a1da16bc7c2003ba2eedeac2293ac1eb82947354..bf5f8be02bef81d304b2a7cc11843782675f6ca5 100644
--- a/src-generated/edu/nps/moves/dis7/DirectedEnergyAreaAimpoint.java
+++ b/src-generated/edu/nps/moves/dis7/DirectedEnergyAreaAimpoint.java
@@ -1,347 +1,347 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * DE Precision Aimpoint Record. Section 6.2.20.2
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class DirectedEnergyAreaAimpoint extends Object implements Serializable
-{
- /** Type of Record enumeration */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * DE Precision Aimpoint Record. Section 6.2.20.2
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class DirectedEnergyAreaAimpoint extends Object implements Serializable
+{
+ /** Type of Record enumeration */
protected int recordType = (int)4001;
-
- /** Length of Record */
+
+ /** Length of Record */
protected short recordLength;
-
- /** Padding */
+
+ /** Padding */
protected short padding = (short)0;
-
- /** Number of beam antenna pattern records */
+
+ /** Number of beam antenna pattern records */
protected short beamAntennaPatternRecordCount = (short)0;
-
- /** Number of DE target energy depositon records */
+
+ /** Number of DE target energy depositon records */
protected short directedEnergyTargetEnergyDepositionRecordCount = (short)0;
-
- /** list of beam antenna records. See 6.2.9.2 */
+
+ /** list of beam antenna records. See 6.2.9.2 */
protected List< BeamAntennaPattern > beamAntennaParameterList = new ArrayList< BeamAntennaPattern >();
-
- /** list of DE target deposition records. See 6.2.21.4 */
+
+ /** list of DE target deposition records. See 6.2.21.4 */
protected List< DirectedEnergyTargetEnergyDeposition > directedEnergyTargetEnergyDepositionRecordList = new ArrayList< DirectedEnergyTargetEnergyDeposition >();
-
+
private byte[] padding2 = new byte[0]; // pad to 64-bit boundary
-
-
-/** Constructor */
- public DirectedEnergyAreaAimpoint()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += 4; // recordType
- marshalSize += 2; // recordLength
- marshalSize += 2; // padding
- marshalSize += 2; // beamAntennaPatternRecordCount
- marshalSize += 2; // directedEnergyTargetEnergyDepositionRecordCount
- for(int idx=0; idx < beamAntennaParameterList.size(); idx++)
- {
- BeamAntennaPattern listElement = beamAntennaParameterList.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
- for(int idx=0; idx < directedEnergyTargetEnergyDepositionRecordList.size(); idx++)
- {
- DirectedEnergyTargetEnergyDeposition listElement = directedEnergyTargetEnergyDepositionRecordList.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
- marshalSize += padding2.length;
-
- return marshalSize;
-}
-
-
-/** Setter for {@link DirectedEnergyAreaAimpoint#recordType}*/
-public DirectedEnergyAreaAimpoint setRecordType(int pRecordType)
+
+
+/** Constructor */
+ public DirectedEnergyAreaAimpoint()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 4; // recordType
+ marshalSize += 2; // recordLength
+ marshalSize += 2; // padding
+ marshalSize += 2; // beamAntennaPatternRecordCount
+ marshalSize += 2; // directedEnergyTargetEnergyDepositionRecordCount
+ for(int idx=0; idx < beamAntennaParameterList.size(); idx++)
+ {
+ BeamAntennaPattern listElement = beamAntennaParameterList.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+ for(int idx=0; idx < directedEnergyTargetEnergyDepositionRecordList.size(); idx++)
+ {
+ DirectedEnergyTargetEnergyDeposition listElement = directedEnergyTargetEnergyDepositionRecordList.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+ marshalSize += padding2.length;
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link DirectedEnergyAreaAimpoint#recordType}*/
+public DirectedEnergyAreaAimpoint setRecordType(int pRecordType)
{
- recordType = pRecordType;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyAreaAimpoint#recordType}*/
-public int getRecordType()
+ recordType = pRecordType;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyAreaAimpoint#recordType}*/
+public int getRecordType()
{
return recordType;
-}
-
-/** Setter for {@link DirectedEnergyAreaAimpoint#recordLength}*/
-public DirectedEnergyAreaAimpoint setRecordLength(short pRecordLength)
+}
+
+/** Setter for {@link DirectedEnergyAreaAimpoint#recordLength}*/
+public DirectedEnergyAreaAimpoint setRecordLength(short pRecordLength)
{
- recordLength = pRecordLength;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyAreaAimpoint#recordLength}*/
-public short getRecordLength()
+ recordLength = pRecordLength;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyAreaAimpoint#recordLength}*/
+public short getRecordLength()
{
return recordLength;
-}
-
-/** Setter for {@link DirectedEnergyAreaAimpoint#padding}*/
-public DirectedEnergyAreaAimpoint setPadding(short pPadding)
+}
+
+/** Setter for {@link DirectedEnergyAreaAimpoint#padding}*/
+public DirectedEnergyAreaAimpoint setPadding(short pPadding)
{
- padding = pPadding;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyAreaAimpoint#padding}*/
-public short getPadding()
+ padding = pPadding;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyAreaAimpoint#padding}*/
+public short getPadding()
{
return padding;
-}
-
-/** Setter for {@link DirectedEnergyAreaAimpoint#beamAntennaParameterList}*/
-public DirectedEnergyAreaAimpoint setBeamAntennaParameterList(List<BeamAntennaPattern> pBeamAntennaParameterList)
+}
+
+/** Setter for {@link DirectedEnergyAreaAimpoint#beamAntennaParameterList}*/
+public DirectedEnergyAreaAimpoint setBeamAntennaParameterList(List<BeamAntennaPattern> pBeamAntennaParameterList)
{
- beamAntennaParameterList = pBeamAntennaParameterList;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyAreaAimpoint#beamAntennaParameterList}*/
-public List<BeamAntennaPattern> getBeamAntennaParameterList()
+ beamAntennaParameterList = pBeamAntennaParameterList;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyAreaAimpoint#beamAntennaParameterList}*/
+public List<BeamAntennaPattern> getBeamAntennaParameterList()
{
return beamAntennaParameterList;
-}
-
-/** Setter for {@link DirectedEnergyAreaAimpoint#directedEnergyTargetEnergyDepositionRecordList}*/
-public DirectedEnergyAreaAimpoint setDirectedEnergyTargetEnergyDepositionRecordList(List<DirectedEnergyTargetEnergyDeposition> pDirectedEnergyTargetEnergyDepositionRecordList)
+}
+
+/** Setter for {@link DirectedEnergyAreaAimpoint#directedEnergyTargetEnergyDepositionRecordList}*/
+public DirectedEnergyAreaAimpoint setDirectedEnergyTargetEnergyDepositionRecordList(List<DirectedEnergyTargetEnergyDeposition> pDirectedEnergyTargetEnergyDepositionRecordList)
{
- directedEnergyTargetEnergyDepositionRecordList = pDirectedEnergyTargetEnergyDepositionRecordList;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyAreaAimpoint#directedEnergyTargetEnergyDepositionRecordList}*/
-public List<DirectedEnergyTargetEnergyDeposition> getDirectedEnergyTargetEnergyDepositionRecordList()
+ directedEnergyTargetEnergyDepositionRecordList = pDirectedEnergyTargetEnergyDepositionRecordList;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyAreaAimpoint#directedEnergyTargetEnergyDepositionRecordList}*/
+public List<DirectedEnergyTargetEnergyDeposition> getDirectedEnergyTargetEnergyDepositionRecordList()
{
return directedEnergyTargetEnergyDepositionRecordList;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeInt(recordType);
- dos.writeShort(recordLength);
- dos.writeShort(padding);
- dos.writeShort(beamAntennaParameterList.size());
- dos.writeShort(directedEnergyTargetEnergyDepositionRecordList.size());
-
- for(int idx = 0; idx < beamAntennaParameterList.size(); idx++)
- {
- BeamAntennaPattern aBeamAntennaPattern = beamAntennaParameterList.get(idx);
- aBeamAntennaPattern.marshal(dos);
- }
-
-
- for(int idx = 0; idx < directedEnergyTargetEnergyDepositionRecordList.size(); idx++)
- {
- DirectedEnergyTargetEnergyDeposition aDirectedEnergyTargetEnergyDeposition = directedEnergyTargetEnergyDepositionRecordList.get(idx);
- aDirectedEnergyTargetEnergyDeposition.marshal(dos);
- }
-
- padding2 = new byte[Align.to64bits(dos)];
+ {
+ dos.writeInt(recordType);
+ dos.writeShort(recordLength);
+ dos.writeShort(padding);
+ dos.writeShort(beamAntennaParameterList.size());
+ dos.writeShort(directedEnergyTargetEnergyDepositionRecordList.size());
+
+ for(int idx = 0; idx < beamAntennaParameterList.size(); idx++)
+ {
+ BeamAntennaPattern aBeamAntennaPattern = beamAntennaParameterList.get(idx);
+ aBeamAntennaPattern.marshal(dos);
+ }
+
+
+ for(int idx = 0; idx < directedEnergyTargetEnergyDepositionRecordList.size(); idx++)
+ {
+ DirectedEnergyTargetEnergyDeposition aDirectedEnergyTargetEnergyDeposition = directedEnergyTargetEnergyDepositionRecordList.get(idx);
+ aDirectedEnergyTargetEnergyDeposition.marshal(dos);
+ }
+
+ padding2 = new byte[Align.to64bits(dos)];
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- recordType = dis.readInt();
- uPosition += 4;
- recordLength = (short)dis.readUnsignedShort();
- uPosition += 2;
- padding = (short)dis.readUnsignedShort();
- uPosition += 2;
- beamAntennaPatternRecordCount = (short)dis.readUnsignedShort();
- uPosition += 2;
- directedEnergyTargetEnergyDepositionRecordCount = (short)dis.readUnsignedShort();
- uPosition += 2;
- for(int idx = 0; idx < beamAntennaPatternRecordCount; idx++)
- {
- BeamAntennaPattern anX = new BeamAntennaPattern();
- uPosition += anX.unmarshal(dis);
- beamAntennaParameterList.add(anX);
- }
-
- for(int idx = 0; idx < directedEnergyTargetEnergyDepositionRecordCount; idx++)
- {
- DirectedEnergyTargetEnergyDeposition anX = new DirectedEnergyTargetEnergyDeposition();
- uPosition += anX.unmarshal(dis);
- directedEnergyTargetEnergyDepositionRecordList.add(anX);
- }
-
- padding2 = new byte[Align.from64bits(uPosition,dis)];
- uPosition += padding2.length;
+ {
+ recordType = dis.readInt();
+ uPosition += 4;
+ recordLength = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ padding = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ beamAntennaPatternRecordCount = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ directedEnergyTargetEnergyDepositionRecordCount = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ for(int idx = 0; idx < beamAntennaPatternRecordCount; idx++)
+ {
+ BeamAntennaPattern anX = new BeamAntennaPattern();
+ uPosition += anX.unmarshal(dis);
+ beamAntennaParameterList.add(anX);
+ }
+
+ for(int idx = 0; idx < directedEnergyTargetEnergyDepositionRecordCount; idx++)
+ {
+ DirectedEnergyTargetEnergyDeposition anX = new DirectedEnergyTargetEnergyDeposition();
+ uPosition += anX.unmarshal(dis);
+ directedEnergyTargetEnergyDepositionRecordList.add(anX);
+ }
+
+ padding2 = new byte[Align.from64bits(uPosition,dis)];
+ uPosition += padding2.length;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putInt( (int)recordType);
- buff.putShort( (short)recordLength);
- buff.putShort( (short)padding);
- buff.putShort( (short)beamAntennaParameterList.size());
- buff.putShort( (short)directedEnergyTargetEnergyDepositionRecordList.size());
-
- for(int idx = 0; idx < beamAntennaParameterList.size(); idx++)
- {
- BeamAntennaPattern aBeamAntennaPattern = beamAntennaParameterList.get(idx);
- aBeamAntennaPattern.marshal(buff);
- }
-
-
- for(int idx = 0; idx < directedEnergyTargetEnergyDepositionRecordList.size(); idx++)
- {
- DirectedEnergyTargetEnergyDeposition aDirectedEnergyTargetEnergyDeposition = directedEnergyTargetEnergyDepositionRecordList.get(idx);
- aDirectedEnergyTargetEnergyDeposition.marshal(buff);
- }
-
- padding2 = new byte[Align.to64bits(buff)];
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- recordType = buff.getInt();
- recordLength = (short)(buff.getShort() & 0xFFFF);
- padding = (short)(buff.getShort() & 0xFFFF);
- beamAntennaPatternRecordCount = (short)(buff.getShort() & 0xFFFF);
- directedEnergyTargetEnergyDepositionRecordCount = (short)(buff.getShort() & 0xFFFF);
- for(int idx = 0; idx < beamAntennaPatternRecordCount; idx++)
- {
- BeamAntennaPattern anX = new BeamAntennaPattern();
- anX.unmarshal(buff);
- beamAntennaParameterList.add(anX);
- }
-
- for(int idx = 0; idx < directedEnergyTargetEnergyDepositionRecordCount; idx++)
- {
- DirectedEnergyTargetEnergyDeposition anX = new DirectedEnergyTargetEnergyDeposition();
- anX.unmarshal(buff);
- directedEnergyTargetEnergyDepositionRecordList.add(anX);
- }
-
- padding2 = new byte[Align.from64bits(buff)];
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putInt( (int)recordType);
+ buff.putShort( (short)recordLength);
+ buff.putShort( (short)padding);
+ buff.putShort( (short)beamAntennaParameterList.size());
+ buff.putShort( (short)directedEnergyTargetEnergyDepositionRecordList.size());
+
+ for(int idx = 0; idx < beamAntennaParameterList.size(); idx++)
+ {
+ BeamAntennaPattern aBeamAntennaPattern = beamAntennaParameterList.get(idx);
+ aBeamAntennaPattern.marshal(buff);
+ }
+
+
+ for(int idx = 0; idx < directedEnergyTargetEnergyDepositionRecordList.size(); idx++)
+ {
+ DirectedEnergyTargetEnergyDeposition aDirectedEnergyTargetEnergyDeposition = directedEnergyTargetEnergyDepositionRecordList.get(idx);
+ aDirectedEnergyTargetEnergyDeposition.marshal(buff);
+ }
+
+ padding2 = new byte[Align.to64bits(buff)];
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ recordType = buff.getInt();
+ recordLength = (short)(buff.getShort() & 0xFFFF);
+ padding = (short)(buff.getShort() & 0xFFFF);
+ beamAntennaPatternRecordCount = (short)(buff.getShort() & 0xFFFF);
+ directedEnergyTargetEnergyDepositionRecordCount = (short)(buff.getShort() & 0xFFFF);
+ for(int idx = 0; idx < beamAntennaPatternRecordCount; idx++)
+ {
+ BeamAntennaPattern anX = new BeamAntennaPattern();
+ anX.unmarshal(buff);
+ beamAntennaParameterList.add(anX);
+ }
+
+ for(int idx = 0; idx < directedEnergyTargetEnergyDepositionRecordCount; idx++)
+ {
+ DirectedEnergyTargetEnergyDeposition anX = new DirectedEnergyTargetEnergyDeposition();
+ anX.unmarshal(buff);
+ directedEnergyTargetEnergyDepositionRecordList.add(anX);
+ }
+
+ padding2 = new byte[Align.from64bits(buff)];
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final DirectedEnergyAreaAimpoint rhs = (DirectedEnergyAreaAimpoint)obj;
-
- if( ! (recordType == rhs.recordType)) ivarsEqual = false;
- if( ! (recordLength == rhs.recordLength)) ivarsEqual = false;
- if( ! (padding == rhs.padding)) ivarsEqual = false;
-
- for(int idx = 0; idx < beamAntennaParameterList.size(); idx++)
- if( ! ( beamAntennaParameterList.get(idx).equals(rhs.beamAntennaParameterList.get(idx)))) ivarsEqual = false;
-
-
- for(int idx = 0; idx < directedEnergyTargetEnergyDepositionRecordList.size(); idx++)
- if( ! ( directedEnergyTargetEnergyDepositionRecordList.get(idx).equals(rhs.directedEnergyTargetEnergyDepositionRecordList.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final DirectedEnergyAreaAimpoint rhs = (DirectedEnergyAreaAimpoint)obj;
+
+ if( ! (recordType == rhs.recordType)) ivarsEqual = false;
+ if( ! (recordLength == rhs.recordLength)) ivarsEqual = false;
+ if( ! (padding == rhs.padding)) ivarsEqual = false;
+
+ for(int idx = 0; idx < beamAntennaParameterList.size(); idx++)
+ if( ! ( beamAntennaParameterList.get(idx).equals(rhs.beamAntennaParameterList.get(idx)))) ivarsEqual = false;
+
+
+ for(int idx = 0; idx < directedEnergyTargetEnergyDepositionRecordList.size(); idx++)
+ if( ! ( directedEnergyTargetEnergyDepositionRecordList.get(idx).equals(rhs.directedEnergyTargetEnergyDepositionRecordList.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" recordType: ").append(recordType).append("\n");
- sb.append(" recordLength: ").append(recordLength).append("\n");
- sb.append(" padding: ").append(padding).append("\n");
- sb.append(" padding2: ").append(padding2).append("\n");
- sb.append(" beamAntennaParameterList: ").append("\n");
- beamAntennaParameterList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
- sb.append(" directedEnergyTargetEnergyDepositionRecordList: ").append("\n");
- directedEnergyTargetEnergyDepositionRecordList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" recordType: ").append(recordType).append("\n");
+ sb.append(" recordLength: ").append(recordLength).append("\n");
+ sb.append(" padding: ").append(padding).append("\n");
+ sb.append(" padding2: ").append(padding2).append("\n");
+ sb.append(" beamAntennaParameterList: ").append("\n");
+ beamAntennaParameterList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+ sb.append(" directedEnergyTargetEnergyDepositionRecordList: ").append("\n");
+ directedEnergyTargetEnergyDepositionRecordList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/DirectedEnergyDamage.java b/src-generated/edu/nps/moves/dis7/DirectedEnergyDamage.java
index a31eb875962ca36a5e2341813992d3e4dcc7e053..2c40a77644d8046c073c0c9cba03fd2b761d02a3 100644
--- a/src-generated/edu/nps/moves/dis7/DirectedEnergyDamage.java
+++ b/src-generated/edu/nps/moves/dis7/DirectedEnergyDamage.java
@@ -1,423 +1,423 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Damage sustained by an entity due to directed energy. Location of the damage based on a relative x,y,z location from the center of the entity. Section 6.2.15.2
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class DirectedEnergyDamage extends Object implements Serializable
-{
- /** DE Record Type. */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Damage sustained by an entity due to directed energy. Location of the damage based on a relative x,y,z location from the center of the entity. Section 6.2.15.2
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class DirectedEnergyDamage extends Object implements Serializable
+{
+ /** DE Record Type. */
protected int recordType = (int)4500;
-
- /** DE Record Length (bytes) */
+
+ /** DE Record Length (bytes) */
protected short recordLength = (short)40;
-
- /** padding */
+
+ /** padding */
protected short padding = (short)0;
-
- /** location of damage, relative to center of entity */
+
+ /** location of damage, relative to center of entity */
protected Vector3Float damageLocation = new Vector3Float();
-
- /** Size of damaged area, in meters */
+
+ /** Size of damaged area, in meters */
protected float damageDiameter;
-
- /** average temp of the damaged area, in degrees celsius. If firing entitty does not model this, use a value of -273.15 */
+
+ /** average temp of the damaged area, in degrees celsius. If firing entitty does not model this, use a value of -273.15 */
protected float temperature = (float)-273.15;
-
- /** enumeration uid 314 */
+
+ /** enumeration uid 314 */
protected EntityDamageStatusComponentIdentification componentIdentification = EntityDamageStatusComponentIdentification.values()[0];
-
- /** enumeration uid 315 */
+
+ /** enumeration uid 315 */
protected DEDamageDescriptionComponentDamageStatus componentDamageStatus = DEDamageDescriptionComponentDamageStatus.values()[0];
-
- /** enumeration uid 317 */
+
+ /** enumeration uid 317 */
protected DEDamageDescriptionComponentVisualDamageStatus componentVisualDamageStatus = new DEDamageDescriptionComponentVisualDamageStatus();
-
- /** enumeration uid 316 */
+
+ /** enumeration uid 316 */
protected DEDamageDescriptionComponentVisualSmokeColor componentVisualSmokeColor = DEDamageDescriptionComponentVisualSmokeColor.values()[0];
-
- /** For any component damage resulting this field shall be set to the fire event ID from that PDU. */
+
+ /** For any component damage resulting this field shall be set to the fire event ID from that PDU. */
protected EventIdentifier fireEventID = new EventIdentifier();
-
- /** padding */
+
+ /** padding */
protected short padding2 = (short)0;
-
-
-/** Constructor */
- public DirectedEnergyDamage()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += 4; // recordType
- marshalSize += 2; // recordLength
- marshalSize += 2; // padding
- marshalSize += damageLocation.getMarshalledSize();
- marshalSize += 4; // damageDiameter
- marshalSize += 4; // temperature
- marshalSize += componentIdentification.getMarshalledSize();
- marshalSize += componentDamageStatus.getMarshalledSize();
- marshalSize += componentVisualDamageStatus.getMarshalledSize();
- marshalSize += componentVisualSmokeColor.getMarshalledSize();
- marshalSize += fireEventID.getMarshalledSize();
- marshalSize += 2; // padding2
-
- return marshalSize;
-}
-
-
-/** Setter for {@link DirectedEnergyDamage#recordType}*/
-public DirectedEnergyDamage setRecordType(int pRecordType)
+
+
+/** Constructor */
+ public DirectedEnergyDamage()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 4; // recordType
+ marshalSize += 2; // recordLength
+ marshalSize += 2; // padding
+ marshalSize += damageLocation.getMarshalledSize();
+ marshalSize += 4; // damageDiameter
+ marshalSize += 4; // temperature
+ marshalSize += componentIdentification.getMarshalledSize();
+ marshalSize += componentDamageStatus.getMarshalledSize();
+ marshalSize += componentVisualDamageStatus.getMarshalledSize();
+ marshalSize += componentVisualSmokeColor.getMarshalledSize();
+ marshalSize += fireEventID.getMarshalledSize();
+ marshalSize += 2; // padding2
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link DirectedEnergyDamage#recordType}*/
+public DirectedEnergyDamage setRecordType(int pRecordType)
{
- recordType = pRecordType;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyDamage#recordType}*/
-public int getRecordType()
+ recordType = pRecordType;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyDamage#recordType}*/
+public int getRecordType()
{
return recordType;
-}
-
-/** Setter for {@link DirectedEnergyDamage#recordLength}*/
-public DirectedEnergyDamage setRecordLength(short pRecordLength)
+}
+
+/** Setter for {@link DirectedEnergyDamage#recordLength}*/
+public DirectedEnergyDamage setRecordLength(short pRecordLength)
{
- recordLength = pRecordLength;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyDamage#recordLength}*/
-public short getRecordLength()
+ recordLength = pRecordLength;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyDamage#recordLength}*/
+public short getRecordLength()
{
return recordLength;
-}
-
-/** Setter for {@link DirectedEnergyDamage#padding}*/
-public DirectedEnergyDamage setPadding(short pPadding)
+}
+
+/** Setter for {@link DirectedEnergyDamage#padding}*/
+public DirectedEnergyDamage setPadding(short pPadding)
{
- padding = pPadding;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyDamage#padding}*/
-public short getPadding()
+ padding = pPadding;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyDamage#padding}*/
+public short getPadding()
{
return padding;
-}
-
-/** Setter for {@link DirectedEnergyDamage#damageLocation}*/
-public DirectedEnergyDamage setDamageLocation(Vector3Float pDamageLocation)
+}
+
+/** Setter for {@link DirectedEnergyDamage#damageLocation}*/
+public DirectedEnergyDamage setDamageLocation(Vector3Float pDamageLocation)
{
- damageLocation = pDamageLocation;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyDamage#damageLocation}*/
-public Vector3Float getDamageLocation()
+ damageLocation = pDamageLocation;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyDamage#damageLocation}*/
+public Vector3Float getDamageLocation()
{
return damageLocation;
-}
-
-/** Setter for {@link DirectedEnergyDamage#damageDiameter}*/
-public DirectedEnergyDamage setDamageDiameter(float pDamageDiameter)
+}
+
+/** Setter for {@link DirectedEnergyDamage#damageDiameter}*/
+public DirectedEnergyDamage setDamageDiameter(float pDamageDiameter)
{
- damageDiameter = pDamageDiameter;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyDamage#damageDiameter}*/
-public float getDamageDiameter()
+ damageDiameter = pDamageDiameter;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyDamage#damageDiameter}*/
+public float getDamageDiameter()
{
return damageDiameter;
-}
-
-/** Setter for {@link DirectedEnergyDamage#temperature}*/
-public DirectedEnergyDamage setTemperature(float pTemperature)
+}
+
+/** Setter for {@link DirectedEnergyDamage#temperature}*/
+public DirectedEnergyDamage setTemperature(float pTemperature)
{
- temperature = pTemperature;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyDamage#temperature}*/
-public float getTemperature()
+ temperature = pTemperature;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyDamage#temperature}*/
+public float getTemperature()
{
return temperature;
-}
-
-/** Setter for {@link DirectedEnergyDamage#componentIdentification}*/
-public DirectedEnergyDamage setComponentIdentification(EntityDamageStatusComponentIdentification pComponentIdentification)
+}
+
+/** Setter for {@link DirectedEnergyDamage#componentIdentification}*/
+public DirectedEnergyDamage setComponentIdentification(EntityDamageStatusComponentIdentification pComponentIdentification)
{
- componentIdentification = pComponentIdentification;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyDamage#componentIdentification}*/
-public EntityDamageStatusComponentIdentification getComponentIdentification()
+ componentIdentification = pComponentIdentification;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyDamage#componentIdentification}*/
+public EntityDamageStatusComponentIdentification getComponentIdentification()
{
return componentIdentification;
-}
-
-/** Setter for {@link DirectedEnergyDamage#componentDamageStatus}*/
-public DirectedEnergyDamage setComponentDamageStatus(DEDamageDescriptionComponentDamageStatus pComponentDamageStatus)
+}
+
+/** Setter for {@link DirectedEnergyDamage#componentDamageStatus}*/
+public DirectedEnergyDamage setComponentDamageStatus(DEDamageDescriptionComponentDamageStatus pComponentDamageStatus)
{
- componentDamageStatus = pComponentDamageStatus;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyDamage#componentDamageStatus}*/
-public DEDamageDescriptionComponentDamageStatus getComponentDamageStatus()
+ componentDamageStatus = pComponentDamageStatus;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyDamage#componentDamageStatus}*/
+public DEDamageDescriptionComponentDamageStatus getComponentDamageStatus()
{
return componentDamageStatus;
-}
-
-/** Setter for {@link DirectedEnergyDamage#componentVisualDamageStatus}*/
-public DirectedEnergyDamage setComponentVisualDamageStatus(DEDamageDescriptionComponentVisualDamageStatus pComponentVisualDamageStatus)
+}
+
+/** Setter for {@link DirectedEnergyDamage#componentVisualDamageStatus}*/
+public DirectedEnergyDamage setComponentVisualDamageStatus(DEDamageDescriptionComponentVisualDamageStatus pComponentVisualDamageStatus)
{
- componentVisualDamageStatus = pComponentVisualDamageStatus;
- return this;
-}
-
-/** Setter for {@link DirectedEnergyDamage#componentVisualDamageStatus}*/
-public DEDamageDescriptionComponentVisualDamageStatus getComponentVisualDamageStatus()
+ componentVisualDamageStatus = pComponentVisualDamageStatus;
+ return this;
+}
+
+/** Setter for {@link DirectedEnergyDamage#componentVisualDamageStatus}*/
+public DEDamageDescriptionComponentVisualDamageStatus getComponentVisualDamageStatus()
{
return componentVisualDamageStatus;
-}
-
-/** Setter for {@link DirectedEnergyDamage#componentVisualSmokeColor}*/
-public DirectedEnergyDamage setComponentVisualSmokeColor(DEDamageDescriptionComponentVisualSmokeColor pComponentVisualSmokeColor)
+}
+
+/** Setter for {@link DirectedEnergyDamage#componentVisualSmokeColor}*/
+public DirectedEnergyDamage setComponentVisualSmokeColor(DEDamageDescriptionComponentVisualSmokeColor pComponentVisualSmokeColor)
{
- componentVisualSmokeColor = pComponentVisualSmokeColor;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyDamage#componentVisualSmokeColor}*/
-public DEDamageDescriptionComponentVisualSmokeColor getComponentVisualSmokeColor()
+ componentVisualSmokeColor = pComponentVisualSmokeColor;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyDamage#componentVisualSmokeColor}*/
+public DEDamageDescriptionComponentVisualSmokeColor getComponentVisualSmokeColor()
{
return componentVisualSmokeColor;
-}
-
-/** Setter for {@link DirectedEnergyDamage#fireEventID}*/
-public DirectedEnergyDamage setFireEventID(EventIdentifier pFireEventID)
+}
+
+/** Setter for {@link DirectedEnergyDamage#fireEventID}*/
+public DirectedEnergyDamage setFireEventID(EventIdentifier pFireEventID)
{
- fireEventID = pFireEventID;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyDamage#fireEventID}*/
-public EventIdentifier getFireEventID()
+ fireEventID = pFireEventID;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyDamage#fireEventID}*/
+public EventIdentifier getFireEventID()
{
return fireEventID;
-}
-
-/** Setter for {@link DirectedEnergyDamage#padding2}*/
-public DirectedEnergyDamage setPadding2(short pPadding2)
+}
+
+/** Setter for {@link DirectedEnergyDamage#padding2}*/
+public DirectedEnergyDamage setPadding2(short pPadding2)
{
- padding2 = pPadding2;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyDamage#padding2}*/
-public short getPadding2()
+ padding2 = pPadding2;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyDamage#padding2}*/
+public short getPadding2()
{
return padding2;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeInt(recordType);
- dos.writeShort(recordLength);
- dos.writeShort(padding);
- damageLocation.marshal(dos);
- dos.writeFloat(damageDiameter);
- dos.writeFloat(temperature);
- componentIdentification.marshal(dos);
- componentDamageStatus.marshal(dos);
- componentVisualDamageStatus.marshal(dos);
- componentVisualSmokeColor.marshal(dos);
- fireEventID.marshal(dos);
- dos.writeShort(padding2);
+ {
+ dos.writeInt(recordType);
+ dos.writeShort(recordLength);
+ dos.writeShort(padding);
+ damageLocation.marshal(dos);
+ dos.writeFloat(damageDiameter);
+ dos.writeFloat(temperature);
+ componentIdentification.marshal(dos);
+ componentDamageStatus.marshal(dos);
+ componentVisualDamageStatus.marshal(dos);
+ componentVisualSmokeColor.marshal(dos);
+ fireEventID.marshal(dos);
+ dos.writeShort(padding2);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- recordType = dis.readInt();
- uPosition += 4;
- recordLength = (short)dis.readUnsignedShort();
- uPosition += 2;
- padding = (short)dis.readUnsignedShort();
- uPosition += 2;
- uPosition += damageLocation.unmarshal(dis);
- damageDiameter = dis.readFloat();
- uPosition += 4;
- temperature = dis.readFloat();
- uPosition += 4;
- componentIdentification = EntityDamageStatusComponentIdentification.unmarshalEnum(dis);
- uPosition += componentIdentification.getMarshalledSize();
- componentDamageStatus = DEDamageDescriptionComponentDamageStatus.unmarshalEnum(dis);
- uPosition += componentDamageStatus.getMarshalledSize();
- uPosition += componentVisualDamageStatus.unmarshal(dis);
- componentVisualSmokeColor = DEDamageDescriptionComponentVisualSmokeColor.unmarshalEnum(dis);
- uPosition += componentVisualSmokeColor.getMarshalledSize();
- uPosition += fireEventID.unmarshal(dis);
- padding2 = (short)dis.readUnsignedShort();
- uPosition += 2;
+ {
+ recordType = dis.readInt();
+ uPosition += 4;
+ recordLength = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ padding = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ uPosition += damageLocation.unmarshal(dis);
+ damageDiameter = dis.readFloat();
+ uPosition += 4;
+ temperature = dis.readFloat();
+ uPosition += 4;
+ componentIdentification = EntityDamageStatusComponentIdentification.unmarshalEnum(dis);
+ uPosition += componentIdentification.getMarshalledSize();
+ componentDamageStatus = DEDamageDescriptionComponentDamageStatus.unmarshalEnum(dis);
+ uPosition += componentDamageStatus.getMarshalledSize();
+ uPosition += componentVisualDamageStatus.unmarshal(dis);
+ componentVisualSmokeColor = DEDamageDescriptionComponentVisualSmokeColor.unmarshalEnum(dis);
+ uPosition += componentVisualSmokeColor.getMarshalledSize();
+ uPosition += fireEventID.unmarshal(dis);
+ padding2 = (short)dis.readUnsignedShort();
+ uPosition += 2;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putInt( (int)recordType);
- buff.putShort( (short)recordLength);
- buff.putShort( (short)padding);
- damageLocation.marshal(buff);
- buff.putFloat( (float)damageDiameter);
- buff.putFloat( (float)temperature);
- componentIdentification.marshal(buff);
- componentDamageStatus.marshal(buff);
- componentVisualDamageStatus.marshal(buff);
- componentVisualSmokeColor.marshal(buff);
- fireEventID.marshal(buff);
- buff.putShort( (short)padding2);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- recordType = buff.getInt();
- recordLength = (short)(buff.getShort() & 0xFFFF);
- padding = (short)(buff.getShort() & 0xFFFF);
- damageLocation.unmarshal(buff);
- damageDiameter = buff.getFloat();
- temperature = buff.getFloat();
- componentIdentification = EntityDamageStatusComponentIdentification.unmarshalEnum(buff);
- componentDamageStatus = DEDamageDescriptionComponentDamageStatus.unmarshalEnum(buff);
- componentVisualDamageStatus.unmarshal(buff);
- componentVisualSmokeColor = DEDamageDescriptionComponentVisualSmokeColor.unmarshalEnum(buff);
- fireEventID.unmarshal(buff);
- padding2 = (short)(buff.getShort() & 0xFFFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putInt( (int)recordType);
+ buff.putShort( (short)recordLength);
+ buff.putShort( (short)padding);
+ damageLocation.marshal(buff);
+ buff.putFloat( (float)damageDiameter);
+ buff.putFloat( (float)temperature);
+ componentIdentification.marshal(buff);
+ componentDamageStatus.marshal(buff);
+ componentVisualDamageStatus.marshal(buff);
+ componentVisualSmokeColor.marshal(buff);
+ fireEventID.marshal(buff);
+ buff.putShort( (short)padding2);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ recordType = buff.getInt();
+ recordLength = (short)(buff.getShort() & 0xFFFF);
+ padding = (short)(buff.getShort() & 0xFFFF);
+ damageLocation.unmarshal(buff);
+ damageDiameter = buff.getFloat();
+ temperature = buff.getFloat();
+ componentIdentification = EntityDamageStatusComponentIdentification.unmarshalEnum(buff);
+ componentDamageStatus = DEDamageDescriptionComponentDamageStatus.unmarshalEnum(buff);
+ componentVisualDamageStatus.unmarshal(buff);
+ componentVisualSmokeColor = DEDamageDescriptionComponentVisualSmokeColor.unmarshalEnum(buff);
+ fireEventID.unmarshal(buff);
+ padding2 = (short)(buff.getShort() & 0xFFFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final DirectedEnergyDamage rhs = (DirectedEnergyDamage)obj;
-
- if( ! (recordType == rhs.recordType)) ivarsEqual = false;
- if( ! (recordLength == rhs.recordLength)) ivarsEqual = false;
- if( ! (padding == rhs.padding)) ivarsEqual = false;
- if( ! (damageLocation.equals( rhs.damageLocation) )) ivarsEqual = false;
- if( ! (damageDiameter == rhs.damageDiameter)) ivarsEqual = false;
- if( ! (temperature == rhs.temperature)) ivarsEqual = false;
- if( ! (componentIdentification == rhs.componentIdentification)) ivarsEqual = false;
- if( ! (componentDamageStatus == rhs.componentDamageStatus)) ivarsEqual = false;
- if( ! (componentVisualDamageStatus.equals( rhs.componentVisualDamageStatus) )) ivarsEqual = false;
- if( ! (componentVisualSmokeColor == rhs.componentVisualSmokeColor)) ivarsEqual = false;
- if( ! (fireEventID.equals( rhs.fireEventID) )) ivarsEqual = false;
- if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final DirectedEnergyDamage rhs = (DirectedEnergyDamage)obj;
+
+ if( ! (recordType == rhs.recordType)) ivarsEqual = false;
+ if( ! (recordLength == rhs.recordLength)) ivarsEqual = false;
+ if( ! (padding == rhs.padding)) ivarsEqual = false;
+ if( ! (damageLocation.equals( rhs.damageLocation) )) ivarsEqual = false;
+ if( ! (damageDiameter == rhs.damageDiameter)) ivarsEqual = false;
+ if( ! (temperature == rhs.temperature)) ivarsEqual = false;
+ if( ! (componentIdentification == rhs.componentIdentification)) ivarsEqual = false;
+ if( ! (componentDamageStatus == rhs.componentDamageStatus)) ivarsEqual = false;
+ if( ! (componentVisualDamageStatus.equals( rhs.componentVisualDamageStatus) )) ivarsEqual = false;
+ if( ! (componentVisualSmokeColor == rhs.componentVisualSmokeColor)) ivarsEqual = false;
+ if( ! (fireEventID.equals( rhs.fireEventID) )) ivarsEqual = false;
+ if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" recordType: ").append(recordType).append("\n");
- sb.append(" recordLength: ").append(recordLength).append("\n");
- sb.append(" padding: ").append(padding).append("\n");
- sb.append(" damageLocation: ").append(damageLocation).append("\n");
- sb.append(" damageDiameter: ").append(damageDiameter).append("\n");
- sb.append(" temperature: ").append(temperature).append("\n");
- sb.append(" componentIdentification: ").append(componentIdentification).append("\n");
- sb.append(" componentDamageStatus: ").append(componentDamageStatus).append("\n");
- sb.append(" componentVisualDamageStatus: ").append(componentVisualDamageStatus).append("\n");
- sb.append(" componentVisualSmokeColor: ").append(componentVisualSmokeColor).append("\n");
- sb.append(" fireEventID: ").append(fireEventID).append("\n");
- sb.append(" padding2: ").append(padding2).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" recordType: ").append(recordType).append("\n");
+ sb.append(" recordLength: ").append(recordLength).append("\n");
+ sb.append(" padding: ").append(padding).append("\n");
+ sb.append(" damageLocation: ").append(damageLocation).append("\n");
+ sb.append(" damageDiameter: ").append(damageDiameter).append("\n");
+ sb.append(" temperature: ").append(temperature).append("\n");
+ sb.append(" componentIdentification: ").append(componentIdentification).append("\n");
+ sb.append(" componentDamageStatus: ").append(componentDamageStatus).append("\n");
+ sb.append(" componentVisualDamageStatus: ").append(componentVisualDamageStatus).append("\n");
+ sb.append(" componentVisualSmokeColor: ").append(componentVisualSmokeColor).append("\n");
+ sb.append(" fireEventID: ").append(fireEventID).append("\n");
+ sb.append(" padding2: ").append(padding2).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/DirectedEnergyFirePdu.java b/src-generated/edu/nps/moves/dis7/DirectedEnergyFirePdu.java
index a62334ed4afb75deb92c1191e38ff3433ab37251..f8a725a3d9f9abe4adf90faec961c5d462b2a5de 100644
--- a/src-generated/edu/nps/moves/dis7/DirectedEnergyFirePdu.java
+++ b/src-generated/edu/nps/moves/dis7/DirectedEnergyFirePdu.java
@@ -1,577 +1,577 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 7.3.4 Used to communicate the firing of a directed energy weapon.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class DirectedEnergyFirePdu extends WarfareFamilyPdu implements Serializable
-{
- /** ID of the entity that shot */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 7.3.4 Used to communicate the firing of a directed energy weapon.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class DirectedEnergyFirePdu extends WarfareFamilyPdu implements Serializable
+{
+ /** ID of the entity that shot */
protected EntityID firingEntityID = new EntityID();
-
+
protected EventIdentifier eventID = new EventIdentifier();
-
- /** Field shall identify the munition type enumeration for the DE weapon beam, Section 7.3.4 */
+
+ /** Field shall identify the munition type enumeration for the DE weapon beam, Section 7.3.4 */
protected EntityType munitionType = new EntityType();
-
- /** Field shall indicate the simulation time at start of the shot, Section 7.3.4 */
+
+ /** Field shall indicate the simulation time at start of the shot, Section 7.3.4 */
protected ClockTime shotStartTime = new ClockTime();
-
- /** Field shall indicate the current cumulative duration of the shot, Section 7.3.4 */
+
+ /** Field shall indicate the current cumulative duration of the shot, Section 7.3.4 */
protected float commulativeShotTime;
-
- /** Field shall identify the location of the DE weapon aperture/emitter, Section 7.3.4 */
+
+ /** Field shall identify the location of the DE weapon aperture/emitter, Section 7.3.4 */
protected Vector3Float apertureEmitterLocation = new Vector3Float();
-
- /** Field shall identify the beam diameter at the aperture/emitter, Section 7.3.4 */
+
+ /** Field shall identify the beam diameter at the aperture/emitter, Section 7.3.4 */
protected float apertureDiameter;
-
- /** Field shall identify the emissions wavelength in units of meters, Section 7.3.4 */
+
+ /** Field shall identify the emissions wavelength in units of meters, Section 7.3.4 */
protected float wavelength;
-
+
protected int pad1;
-
+
protected float pulseRepititionFrequency;
-
- /** field shall identify the pulse width emissions in units of seconds, Section 7.3.4 */
+
+ /** field shall identify the pulse width emissions in units of seconds, Section 7.3.4 */
protected float pulseWidth;
-
- /** 16bit Boolean field shall contain various flags to indicate status information needed to process a DE, Section 7.3.4 uid 313 */
+
+ /** 16bit Boolean field shall contain various flags to indicate status information needed to process a DE, Section 7.3.4 uid 313 */
protected DEFireFlags flags = new DEFireFlags();
-
- /** Field shall identify the pulse shape and shall be represented as an 8-bit enumeration, Section 7.3.4 uid 312 */
+
+ /** Field shall identify the pulse shape and shall be represented as an 8-bit enumeration, Section 7.3.4 uid 312 */
protected DEFirePulseShape pulseShape = DEFirePulseShape.values()[0];
-
+
protected byte pad2;
-
+
protected int pad3;
-
+
protected short pad4;
-
- /** Field shall specify the number of DE records, Section 7.3.4 */
+
+ /** Field shall specify the number of DE records, Section 7.3.4 */
protected short numberOfDERecords;
-
- /** Fields shall contain one or more DE records, records shall conform to the variable record format (Section6.2.82), Section 7.3.4 */
+
+ /** Fields shall contain one or more DE records, records shall conform to the variable record format (Section6.2.82), Section 7.3.4 */
protected List< StandardVariableSpecification > dERecords = new ArrayList< StandardVariableSpecification >();
-
-
-/** Constructor */
- public DirectedEnergyFirePdu()
- {
- setPduType( DISPDUType.DIRECTED_ENERGY_FIRE );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += firingEntityID.getMarshalledSize();
- marshalSize += eventID.getMarshalledSize();
- marshalSize += munitionType.getMarshalledSize();
- marshalSize += shotStartTime.getMarshalledSize();
- marshalSize += 4; // commulativeShotTime
- marshalSize += apertureEmitterLocation.getMarshalledSize();
- marshalSize += 4; // apertureDiameter
- marshalSize += 4; // wavelength
- marshalSize += 4; // pad1
- marshalSize += 4; // pulseRepititionFrequency
- marshalSize += 4; // pulseWidth
- marshalSize += flags.getMarshalledSize();
- marshalSize += pulseShape.getMarshalledSize();
- marshalSize += 1; // pad2
- marshalSize += 4; // pad3
- marshalSize += 2; // pad4
- marshalSize += 2; // numberOfDERecords
- for(int idx=0; idx < dERecords.size(); idx++)
- {
- StandardVariableSpecification listElement = dERecords.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link DirectedEnergyFirePdu#firingEntityID}*/
-public DirectedEnergyFirePdu setFiringEntityID(EntityID pFiringEntityID)
-{
- firingEntityID = pFiringEntityID;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyFirePdu#firingEntityID}*/
-public EntityID getFiringEntityID()
+
+
+/** Constructor */
+ public DirectedEnergyFirePdu()
+ {
+ setPduType( DISPDUType.DIRECTED_ENERGY_FIRE );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += firingEntityID.getMarshalledSize();
+ marshalSize += eventID.getMarshalledSize();
+ marshalSize += munitionType.getMarshalledSize();
+ marshalSize += shotStartTime.getMarshalledSize();
+ marshalSize += 4; // commulativeShotTime
+ marshalSize += apertureEmitterLocation.getMarshalledSize();
+ marshalSize += 4; // apertureDiameter
+ marshalSize += 4; // wavelength
+ marshalSize += 4; // pad1
+ marshalSize += 4; // pulseRepititionFrequency
+ marshalSize += 4; // pulseWidth
+ marshalSize += flags.getMarshalledSize();
+ marshalSize += pulseShape.getMarshalledSize();
+ marshalSize += 1; // pad2
+ marshalSize += 4; // pad3
+ marshalSize += 2; // pad4
+ marshalSize += 2; // numberOfDERecords
+ for(int idx=0; idx < dERecords.size(); idx++)
+ {
+ StandardVariableSpecification listElement = dERecords.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link DirectedEnergyFirePdu#firingEntityID}*/
+public DirectedEnergyFirePdu setFiringEntityID(EntityID pFiringEntityID)
+{
+ firingEntityID = pFiringEntityID;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyFirePdu#firingEntityID}*/
+public EntityID getFiringEntityID()
{
return firingEntityID;
-}
-
-/** Setter for {@link DirectedEnergyFirePdu#eventID}*/
-public DirectedEnergyFirePdu setEventID(EventIdentifier pEventID)
-{
- eventID = pEventID;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyFirePdu#eventID}*/
-public EventIdentifier getEventID()
+}
+
+/** Setter for {@link DirectedEnergyFirePdu#eventID}*/
+public DirectedEnergyFirePdu setEventID(EventIdentifier pEventID)
+{
+ eventID = pEventID;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyFirePdu#eventID}*/
+public EventIdentifier getEventID()
{
return eventID;
-}
-
-/** Setter for {@link DirectedEnergyFirePdu#munitionType}*/
-public DirectedEnergyFirePdu setMunitionType(EntityType pMunitionType)
-{
- munitionType = pMunitionType;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyFirePdu#munitionType}*/
-public EntityType getMunitionType()
+}
+
+/** Setter for {@link DirectedEnergyFirePdu#munitionType}*/
+public DirectedEnergyFirePdu setMunitionType(EntityType pMunitionType)
+{
+ munitionType = pMunitionType;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyFirePdu#munitionType}*/
+public EntityType getMunitionType()
{
return munitionType;
-}
-
-/** Setter for {@link DirectedEnergyFirePdu#shotStartTime}*/
-public DirectedEnergyFirePdu setShotStartTime(ClockTime pShotStartTime)
-{
- shotStartTime = pShotStartTime;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyFirePdu#shotStartTime}*/
-public ClockTime getShotStartTime()
+}
+
+/** Setter for {@link DirectedEnergyFirePdu#shotStartTime}*/
+public DirectedEnergyFirePdu setShotStartTime(ClockTime pShotStartTime)
+{
+ shotStartTime = pShotStartTime;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyFirePdu#shotStartTime}*/
+public ClockTime getShotStartTime()
{
return shotStartTime;
-}
-
-/** Setter for {@link DirectedEnergyFirePdu#commulativeShotTime}*/
-public DirectedEnergyFirePdu setCommulativeShotTime(float pCommulativeShotTime)
-{
- commulativeShotTime = pCommulativeShotTime;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyFirePdu#commulativeShotTime}*/
-public float getCommulativeShotTime()
+}
+
+/** Setter for {@link DirectedEnergyFirePdu#commulativeShotTime}*/
+public DirectedEnergyFirePdu setCommulativeShotTime(float pCommulativeShotTime)
+{
+ commulativeShotTime = pCommulativeShotTime;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyFirePdu#commulativeShotTime}*/
+public float getCommulativeShotTime()
{
return commulativeShotTime;
-}
-
-/** Setter for {@link DirectedEnergyFirePdu#apertureEmitterLocation}*/
-public DirectedEnergyFirePdu setApertureEmitterLocation(Vector3Float pApertureEmitterLocation)
-{
- apertureEmitterLocation = pApertureEmitterLocation;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyFirePdu#apertureEmitterLocation}*/
-public Vector3Float getApertureEmitterLocation()
+}
+
+/** Setter for {@link DirectedEnergyFirePdu#apertureEmitterLocation}*/
+public DirectedEnergyFirePdu setApertureEmitterLocation(Vector3Float pApertureEmitterLocation)
+{
+ apertureEmitterLocation = pApertureEmitterLocation;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyFirePdu#apertureEmitterLocation}*/
+public Vector3Float getApertureEmitterLocation()
{
return apertureEmitterLocation;
-}
-
-/** Setter for {@link DirectedEnergyFirePdu#apertureDiameter}*/
-public DirectedEnergyFirePdu setApertureDiameter(float pApertureDiameter)
-{
- apertureDiameter = pApertureDiameter;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyFirePdu#apertureDiameter}*/
-public float getApertureDiameter()
+}
+
+/** Setter for {@link DirectedEnergyFirePdu#apertureDiameter}*/
+public DirectedEnergyFirePdu setApertureDiameter(float pApertureDiameter)
+{
+ apertureDiameter = pApertureDiameter;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyFirePdu#apertureDiameter}*/
+public float getApertureDiameter()
{
return apertureDiameter;
-}
-
-/** Setter for {@link DirectedEnergyFirePdu#wavelength}*/
-public DirectedEnergyFirePdu setWavelength(float pWavelength)
-{
- wavelength = pWavelength;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyFirePdu#wavelength}*/
-public float getWavelength()
+}
+
+/** Setter for {@link DirectedEnergyFirePdu#wavelength}*/
+public DirectedEnergyFirePdu setWavelength(float pWavelength)
+{
+ wavelength = pWavelength;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyFirePdu#wavelength}*/
+public float getWavelength()
{
return wavelength;
-}
-
-/** Setter for {@link DirectedEnergyFirePdu#pad1}*/
-public DirectedEnergyFirePdu setPad1(int pPad1)
-{
- pad1 = pPad1;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyFirePdu#pad1}*/
-public int getPad1()
+}
+
+/** Setter for {@link DirectedEnergyFirePdu#pad1}*/
+public DirectedEnergyFirePdu setPad1(int pPad1)
+{
+ pad1 = pPad1;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyFirePdu#pad1}*/
+public int getPad1()
{
return pad1;
-}
-
-/** Setter for {@link DirectedEnergyFirePdu#pulseRepititionFrequency}*/
-public DirectedEnergyFirePdu setPulseRepititionFrequency(float pPulseRepititionFrequency)
-{
- pulseRepititionFrequency = pPulseRepititionFrequency;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyFirePdu#pulseRepititionFrequency}*/
-public float getPulseRepititionFrequency()
+}
+
+/** Setter for {@link DirectedEnergyFirePdu#pulseRepititionFrequency}*/
+public DirectedEnergyFirePdu setPulseRepititionFrequency(float pPulseRepititionFrequency)
+{
+ pulseRepititionFrequency = pPulseRepititionFrequency;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyFirePdu#pulseRepititionFrequency}*/
+public float getPulseRepititionFrequency()
{
return pulseRepititionFrequency;
-}
-
-/** Setter for {@link DirectedEnergyFirePdu#pulseWidth}*/
-public DirectedEnergyFirePdu setPulseWidth(float pPulseWidth)
-{
- pulseWidth = pPulseWidth;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyFirePdu#pulseWidth}*/
-public float getPulseWidth()
+}
+
+/** Setter for {@link DirectedEnergyFirePdu#pulseWidth}*/
+public DirectedEnergyFirePdu setPulseWidth(float pPulseWidth)
+{
+ pulseWidth = pPulseWidth;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyFirePdu#pulseWidth}*/
+public float getPulseWidth()
{
return pulseWidth;
-}
-
-/** Setter for {@link DirectedEnergyFirePdu#flags}*/
-public DirectedEnergyFirePdu setFlags(DEFireFlags pFlags)
-{
- flags = pFlags;
- return this;
-}
-
-/** Setter for {@link DirectedEnergyFirePdu#flags}*/
-public DEFireFlags getFlags()
+}
+
+/** Setter for {@link DirectedEnergyFirePdu#flags}*/
+public DirectedEnergyFirePdu setFlags(DEFireFlags pFlags)
+{
+ flags = pFlags;
+ return this;
+}
+
+/** Setter for {@link DirectedEnergyFirePdu#flags}*/
+public DEFireFlags getFlags()
{
return flags;
-}
-
-/** Setter for {@link DirectedEnergyFirePdu#pulseShape}*/
-public DirectedEnergyFirePdu setPulseShape(DEFirePulseShape pPulseShape)
-{
- pulseShape = pPulseShape;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyFirePdu#pulseShape}*/
-public DEFirePulseShape getPulseShape()
+}
+
+/** Setter for {@link DirectedEnergyFirePdu#pulseShape}*/
+public DirectedEnergyFirePdu setPulseShape(DEFirePulseShape pPulseShape)
+{
+ pulseShape = pPulseShape;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyFirePdu#pulseShape}*/
+public DEFirePulseShape getPulseShape()
{
return pulseShape;
-}
-
-/** Setter for {@link DirectedEnergyFirePdu#pad2}*/
-public DirectedEnergyFirePdu setPad2(byte pPad2)
-{
- pad2 = pPad2;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyFirePdu#pad2}*/
-public byte getPad2()
+}
+
+/** Setter for {@link DirectedEnergyFirePdu#pad2}*/
+public DirectedEnergyFirePdu setPad2(byte pPad2)
+{
+ pad2 = pPad2;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyFirePdu#pad2}*/
+public byte getPad2()
{
return pad2;
-}
-
-/** Setter for {@link DirectedEnergyFirePdu#pad3}*/
-public DirectedEnergyFirePdu setPad3(int pPad3)
-{
- pad3 = pPad3;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyFirePdu#pad3}*/
-public int getPad3()
+}
+
+/** Setter for {@link DirectedEnergyFirePdu#pad3}*/
+public DirectedEnergyFirePdu setPad3(int pPad3)
+{
+ pad3 = pPad3;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyFirePdu#pad3}*/
+public int getPad3()
{
return pad3;
-}
-
-/** Setter for {@link DirectedEnergyFirePdu#pad4}*/
-public DirectedEnergyFirePdu setPad4(short pPad4)
-{
- pad4 = pPad4;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyFirePdu#pad4}*/
-public short getPad4()
+}
+
+/** Setter for {@link DirectedEnergyFirePdu#pad4}*/
+public DirectedEnergyFirePdu setPad4(short pPad4)
+{
+ pad4 = pPad4;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyFirePdu#pad4}*/
+public short getPad4()
{
return pad4;
-}
-
-/** Setter for {@link DirectedEnergyFirePdu#dERecords}*/
-public DirectedEnergyFirePdu setDERecords(List<StandardVariableSpecification> pDERecords)
-{
- dERecords = pDERecords;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyFirePdu#dERecords}*/
-public List<StandardVariableSpecification> getDERecords()
+}
+
+/** Setter for {@link DirectedEnergyFirePdu#dERecords}*/
+public DirectedEnergyFirePdu setDERecords(List<StandardVariableSpecification> pDERecords)
+{
+ dERecords = pDERecords;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyFirePdu#dERecords}*/
+public List<StandardVariableSpecification> getDERecords()
{
return dERecords;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- firingEntityID.marshal(dos);
- eventID.marshal(dos);
- munitionType.marshal(dos);
- shotStartTime.marshal(dos);
- dos.writeFloat(commulativeShotTime);
- apertureEmitterLocation.marshal(dos);
- dos.writeFloat(apertureDiameter);
- dos.writeFloat(wavelength);
- dos.writeInt(pad1);
- dos.writeFloat(pulseRepititionFrequency);
- dos.writeFloat(pulseWidth);
- flags.marshal(dos);
- pulseShape.marshal(dos);
- dos.writeByte(pad2);
- dos.writeInt(pad3);
- dos.writeShort(pad4);
- dos.writeShort(dERecords.size());
-
- for(int idx = 0; idx < dERecords.size(); idx++)
- {
- StandardVariableSpecification aStandardVariableSpecification = dERecords.get(idx);
- aStandardVariableSpecification.marshal(dos);
- }
-
+ {
+ firingEntityID.marshal(dos);
+ eventID.marshal(dos);
+ munitionType.marshal(dos);
+ shotStartTime.marshal(dos);
+ dos.writeFloat(commulativeShotTime);
+ apertureEmitterLocation.marshal(dos);
+ dos.writeFloat(apertureDiameter);
+ dos.writeFloat(wavelength);
+ dos.writeInt(pad1);
+ dos.writeFloat(pulseRepititionFrequency);
+ dos.writeFloat(pulseWidth);
+ flags.marshal(dos);
+ pulseShape.marshal(dos);
+ dos.writeByte(pad2);
+ dos.writeInt(pad3);
+ dos.writeShort(pad4);
+ dos.writeShort(dERecords.size());
+
+ for(int idx = 0; idx < dERecords.size(); idx++)
+ {
+ StandardVariableSpecification aStandardVariableSpecification = dERecords.get(idx);
+ aStandardVariableSpecification.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += firingEntityID.unmarshal(dis);
- uPosition += eventID.unmarshal(dis);
- uPosition += munitionType.unmarshal(dis);
- uPosition += shotStartTime.unmarshal(dis);
- commulativeShotTime = dis.readFloat();
- uPosition += 4;
- uPosition += apertureEmitterLocation.unmarshal(dis);
- apertureDiameter = dis.readFloat();
- uPosition += 4;
- wavelength = dis.readFloat();
- uPosition += 4;
- pad1 = dis.readInt();
- uPosition += 4;
- pulseRepititionFrequency = dis.readFloat();
- uPosition += 4;
- pulseWidth = dis.readFloat();
- uPosition += 4;
- uPosition += flags.unmarshal(dis);
- pulseShape = DEFirePulseShape.unmarshalEnum(dis);
- uPosition += pulseShape.getMarshalledSize();
- pad2 = (byte)dis.readUnsignedByte();
- uPosition += 1;
- pad3 = dis.readInt();
- uPosition += 4;
- pad4 = (short)dis.readUnsignedShort();
- uPosition += 2;
- numberOfDERecords = (short)dis.readUnsignedShort();
- uPosition += 2;
- for(int idx = 0; idx < numberOfDERecords; idx++)
- {
- StandardVariableSpecification anX = new StandardVariableSpecification();
- uPosition += anX.unmarshal(dis);
- dERecords.add(anX);
- }
-
+ {
+ uPosition += firingEntityID.unmarshal(dis);
+ uPosition += eventID.unmarshal(dis);
+ uPosition += munitionType.unmarshal(dis);
+ uPosition += shotStartTime.unmarshal(dis);
+ commulativeShotTime = dis.readFloat();
+ uPosition += 4;
+ uPosition += apertureEmitterLocation.unmarshal(dis);
+ apertureDiameter = dis.readFloat();
+ uPosition += 4;
+ wavelength = dis.readFloat();
+ uPosition += 4;
+ pad1 = dis.readInt();
+ uPosition += 4;
+ pulseRepititionFrequency = dis.readFloat();
+ uPosition += 4;
+ pulseWidth = dis.readFloat();
+ uPosition += 4;
+ uPosition += flags.unmarshal(dis);
+ pulseShape = DEFirePulseShape.unmarshalEnum(dis);
+ uPosition += pulseShape.getMarshalledSize();
+ pad2 = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ pad3 = dis.readInt();
+ uPosition += 4;
+ pad4 = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ numberOfDERecords = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ for(int idx = 0; idx < numberOfDERecords; idx++)
+ {
+ StandardVariableSpecification anX = new StandardVariableSpecification();
+ uPosition += anX.unmarshal(dis);
+ dERecords.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- firingEntityID.marshal(buff);
- eventID.marshal(buff);
- munitionType.marshal(buff);
- shotStartTime.marshal(buff);
- buff.putFloat( (float)commulativeShotTime);
- apertureEmitterLocation.marshal(buff);
- buff.putFloat( (float)apertureDiameter);
- buff.putFloat( (float)wavelength);
- buff.putInt( (int)pad1);
- buff.putFloat( (float)pulseRepititionFrequency);
- buff.putFloat( (float)pulseWidth);
- flags.marshal(buff);
- pulseShape.marshal(buff);
- buff.put( (byte)pad2);
- buff.putInt( (int)pad3);
- buff.putShort( (short)pad4);
- buff.putShort( (short)dERecords.size());
-
- for(int idx = 0; idx < dERecords.size(); idx++)
- {
- StandardVariableSpecification aStandardVariableSpecification = dERecords.get(idx);
- aStandardVariableSpecification.marshal(buff);
- }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+ }
+ return getMarshalledSize();
+}
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ firingEntityID.marshal(buff);
+ eventID.marshal(buff);
+ munitionType.marshal(buff);
+ shotStartTime.marshal(buff);
+ buff.putFloat( (float)commulativeShotTime);
+ apertureEmitterLocation.marshal(buff);
+ buff.putFloat( (float)apertureDiameter);
+ buff.putFloat( (float)wavelength);
+ buff.putInt( (int)pad1);
+ buff.putFloat( (float)pulseRepititionFrequency);
+ buff.putFloat( (float)pulseWidth);
+ flags.marshal(buff);
+ pulseShape.marshal(buff);
+ buff.put( (byte)pad2);
+ buff.putInt( (int)pad3);
+ buff.putShort( (short)pad4);
+ buff.putShort( (short)dERecords.size());
+
+ for(int idx = 0; idx < dERecords.size(); idx++)
+ {
+ StandardVariableSpecification aStandardVariableSpecification = dERecords.get(idx);
+ aStandardVariableSpecification.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- firingEntityID.unmarshal(buff);
- eventID.unmarshal(buff);
- munitionType.unmarshal(buff);
- shotStartTime.unmarshal(buff);
- commulativeShotTime = buff.getFloat();
- apertureEmitterLocation.unmarshal(buff);
- apertureDiameter = buff.getFloat();
- wavelength = buff.getFloat();
- pad1 = buff.getInt();
- pulseRepititionFrequency = buff.getFloat();
- pulseWidth = buff.getFloat();
- flags.unmarshal(buff);
- pulseShape = DEFirePulseShape.unmarshalEnum(buff);
- pad2 = (byte)(buff.get() & 0xFF);
- pad3 = buff.getInt();
- pad4 = (short)(buff.getShort() & 0xFFFF);
- numberOfDERecords = (short)(buff.getShort() & 0xFFFF);
- for(int idx = 0; idx < numberOfDERecords; idx++)
- {
- StandardVariableSpecification anX = new StandardVariableSpecification();
- anX.unmarshal(buff);
- dERecords.add(anX);
- }
-
- return getMarshalledSize();
-}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final DirectedEnergyFirePdu rhs = (DirectedEnergyFirePdu)obj;
-
- if( ! (firingEntityID.equals( rhs.firingEntityID) )) ivarsEqual = false;
- if( ! (eventID.equals( rhs.eventID) )) ivarsEqual = false;
- if( ! (munitionType.equals( rhs.munitionType) )) ivarsEqual = false;
- if( ! (shotStartTime.equals( rhs.shotStartTime) )) ivarsEqual = false;
- if( ! (commulativeShotTime == rhs.commulativeShotTime)) ivarsEqual = false;
- if( ! (apertureEmitterLocation.equals( rhs.apertureEmitterLocation) )) ivarsEqual = false;
- if( ! (apertureDiameter == rhs.apertureDiameter)) ivarsEqual = false;
- if( ! (wavelength == rhs.wavelength)) ivarsEqual = false;
- if( ! (pad1 == rhs.pad1)) ivarsEqual = false;
- if( ! (pulseRepititionFrequency == rhs.pulseRepititionFrequency)) ivarsEqual = false;
- if( ! (pulseWidth == rhs.pulseWidth)) ivarsEqual = false;
- if( ! (flags.equals( rhs.flags) )) ivarsEqual = false;
- if( ! (pulseShape == rhs.pulseShape)) ivarsEqual = false;
- if( ! (pad2 == rhs.pad2)) ivarsEqual = false;
- if( ! (pad3 == rhs.pad3)) ivarsEqual = false;
- if( ! (pad4 == rhs.pad4)) ivarsEqual = false;
-
- for(int idx = 0; idx < dERecords.size(); idx++)
- if( ! ( dERecords.get(idx).equals(rhs.dERecords.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ firingEntityID.unmarshal(buff);
+ eventID.unmarshal(buff);
+ munitionType.unmarshal(buff);
+ shotStartTime.unmarshal(buff);
+ commulativeShotTime = buff.getFloat();
+ apertureEmitterLocation.unmarshal(buff);
+ apertureDiameter = buff.getFloat();
+ wavelength = buff.getFloat();
+ pad1 = buff.getInt();
+ pulseRepititionFrequency = buff.getFloat();
+ pulseWidth = buff.getFloat();
+ flags.unmarshal(buff);
+ pulseShape = DEFirePulseShape.unmarshalEnum(buff);
+ pad2 = (byte)(buff.get() & 0xFF);
+ pad3 = buff.getInt();
+ pad4 = (short)(buff.getShort() & 0xFFFF);
+ numberOfDERecords = (short)(buff.getShort() & 0xFFFF);
+ for(int idx = 0; idx < numberOfDERecords; idx++)
+ {
+ StandardVariableSpecification anX = new StandardVariableSpecification();
+ anX.unmarshal(buff);
+ dERecords.add(anX);
+ }
+
+ return getMarshalledSize();
+}
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final DirectedEnergyFirePdu rhs = (DirectedEnergyFirePdu)obj;
+
+ if( ! (firingEntityID.equals( rhs.firingEntityID) )) ivarsEqual = false;
+ if( ! (eventID.equals( rhs.eventID) )) ivarsEqual = false;
+ if( ! (munitionType.equals( rhs.munitionType) )) ivarsEqual = false;
+ if( ! (shotStartTime.equals( rhs.shotStartTime) )) ivarsEqual = false;
+ if( ! (commulativeShotTime == rhs.commulativeShotTime)) ivarsEqual = false;
+ if( ! (apertureEmitterLocation.equals( rhs.apertureEmitterLocation) )) ivarsEqual = false;
+ if( ! (apertureDiameter == rhs.apertureDiameter)) ivarsEqual = false;
+ if( ! (wavelength == rhs.wavelength)) ivarsEqual = false;
+ if( ! (pad1 == rhs.pad1)) ivarsEqual = false;
+ if( ! (pulseRepititionFrequency == rhs.pulseRepititionFrequency)) ivarsEqual = false;
+ if( ! (pulseWidth == rhs.pulseWidth)) ivarsEqual = false;
+ if( ! (flags.equals( rhs.flags) )) ivarsEqual = false;
+ if( ! (pulseShape == rhs.pulseShape)) ivarsEqual = false;
+ if( ! (pad2 == rhs.pad2)) ivarsEqual = false;
+ if( ! (pad3 == rhs.pad3)) ivarsEqual = false;
+ if( ! (pad4 == rhs.pad4)) ivarsEqual = false;
+
+ for(int idx = 0; idx < dERecords.size(); idx++)
+ if( ! ( dERecords.get(idx).equals(rhs.dERecords.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" firingEntityID: ").append(firingEntityID).append("\n");
- sb.append(" eventID: ").append(eventID).append("\n");
- sb.append(" munitionType: ").append(munitionType).append("\n");
- sb.append(" shotStartTime: ").append(shotStartTime).append("\n");
- sb.append(" commulativeShotTime: ").append(commulativeShotTime).append("\n");
- sb.append(" apertureEmitterLocation: ").append(apertureEmitterLocation).append("\n");
- sb.append(" apertureDiameter: ").append(apertureDiameter).append("\n");
- sb.append(" wavelength: ").append(wavelength).append("\n");
- sb.append(" pad1: ").append(pad1).append("\n");
- sb.append(" pulseRepititionFrequency: ").append(pulseRepititionFrequency).append("\n");
- sb.append(" pulseWidth: ").append(pulseWidth).append("\n");
- sb.append(" flags: ").append(flags).append("\n");
- sb.append(" pulseShape: ").append(pulseShape).append("\n");
- sb.append(" pad2: ").append(pad2).append("\n");
- sb.append(" pad3: ").append(pad3).append("\n");
- sb.append(" pad4: ").append(pad4).append("\n");
- sb.append(" dERecords: ").append("\n");
- dERecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" firingEntityID: ").append(firingEntityID).append("\n");
+ sb.append(" eventID: ").append(eventID).append("\n");
+ sb.append(" munitionType: ").append(munitionType).append("\n");
+ sb.append(" shotStartTime: ").append(shotStartTime).append("\n");
+ sb.append(" commulativeShotTime: ").append(commulativeShotTime).append("\n");
+ sb.append(" apertureEmitterLocation: ").append(apertureEmitterLocation).append("\n");
+ sb.append(" apertureDiameter: ").append(apertureDiameter).append("\n");
+ sb.append(" wavelength: ").append(wavelength).append("\n");
+ sb.append(" pad1: ").append(pad1).append("\n");
+ sb.append(" pulseRepititionFrequency: ").append(pulseRepititionFrequency).append("\n");
+ sb.append(" pulseWidth: ").append(pulseWidth).append("\n");
+ sb.append(" flags: ").append(flags).append("\n");
+ sb.append(" pulseShape: ").append(pulseShape).append("\n");
+ sb.append(" pad2: ").append(pad2).append("\n");
+ sb.append(" pad3: ").append(pad3).append("\n");
+ sb.append(" pad4: ").append(pad4).append("\n");
+ sb.append(" dERecords: ").append("\n");
+ dERecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/DirectedEnergyPrecisionAimpoint.java b/src-generated/edu/nps/moves/dis7/DirectedEnergyPrecisionAimpoint.java
index 7ef0e725bb9a783e1432b1ebc95395423c036c44..285f8d0a3a5dc4a4db7844c4036c2388c41a5a86 100644
--- a/src-generated/edu/nps/moves/dis7/DirectedEnergyPrecisionAimpoint.java
+++ b/src-generated/edu/nps/moves/dis7/DirectedEnergyPrecisionAimpoint.java
@@ -1,493 +1,493 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * DE Precision Aimpoint Record. Section 6.2.20.3
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class DirectedEnergyPrecisionAimpoint extends Object implements Serializable
-{
- /** Type of Record */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * DE Precision Aimpoint Record. Section 6.2.20.3
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class DirectedEnergyPrecisionAimpoint extends Object implements Serializable
+{
+ /** Type of Record */
protected int recordType = (int)4000;
-
- /** Length of Record */
+
+ /** Length of Record */
protected short recordLength = (short)88;
-
- /** Padding */
+
+ /** Padding */
protected short padding = (short)0;
-
- /** Position of Target Spot in World Coordinates. */
+
+ /** Position of Target Spot in World Coordinates. */
protected Vector3Double targetSpotLocation = new Vector3Double();
-
- /** Position (meters) of Target Spot relative to Entity Position. */
+
+ /** Position (meters) of Target Spot relative to Entity Position. */
protected Vector3Float targetSpotEntityLocation = new Vector3Float();
-
- /** Velocity (meters/sec) of Target Spot. */
+
+ /** Velocity (meters/sec) of Target Spot. */
protected Vector3Float targetSpotVelocity = new Vector3Float();
-
- /** Acceleration (meters/sec/sec) of Target Spot. */
+
+ /** Acceleration (meters/sec/sec) of Target Spot. */
protected Vector3Float targetSpotAcceleration = new Vector3Float();
-
- /** Unique ID of the target entity. */
+
+ /** Unique ID of the target entity. */
protected EntityID targetEntityID = new EntityID();
-
- /** Target Component ID ENUM, same as in DamageDescriptionRecord. */
+
+ /** Target Component ID ENUM, same as in DamageDescriptionRecord. */
protected byte targetComponentID = (byte)0;
-
- /** Spot Shape ENUM. uid 311 */
+
+ /** Spot Shape ENUM. uid 311 */
protected DEPrecisionAimpointBeamSpotType beamSpotType = DEPrecisionAimpointBeamSpotType.values()[0];
-
- /** Beam Spot Cross Section Semi-Major Axis. */
+
+ /** Beam Spot Cross Section Semi-Major Axis. */
protected float beamSpotCrossSectionSemiMajorAxis = (float)0;
-
- /** Beam Spot Cross Section Semi-Major Axis. */
+
+ /** Beam Spot Cross Section Semi-Major Axis. */
protected float beamSpotCrossSectionSemiMinorAxis = (float)0;
-
- /** Beam Spot Cross Section Orientation Angle. */
+
+ /** Beam Spot Cross Section Orientation Angle. */
protected float beamSpotCrossSectionOrientationAngle = (float)0;
-
- /** Peak irradiance */
+
+ /** Peak irradiance */
protected float peakIrradiance = (float)0;
-
- /** padding */
+
+ /** padding */
protected int padding2 = (int)0;
-
-
-/** Constructor */
- public DirectedEnergyPrecisionAimpoint()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += 4; // recordType
- marshalSize += 2; // recordLength
- marshalSize += 2; // padding
- marshalSize += targetSpotLocation.getMarshalledSize();
- marshalSize += targetSpotEntityLocation.getMarshalledSize();
- marshalSize += targetSpotVelocity.getMarshalledSize();
- marshalSize += targetSpotAcceleration.getMarshalledSize();
- marshalSize += targetEntityID.getMarshalledSize();
- marshalSize += 1; // targetComponentID
- marshalSize += beamSpotType.getMarshalledSize();
- marshalSize += 4; // beamSpotCrossSectionSemiMajorAxis
- marshalSize += 4; // beamSpotCrossSectionSemiMinorAxis
- marshalSize += 4; // beamSpotCrossSectionOrientationAngle
- marshalSize += 4; // peakIrradiance
- marshalSize += 4; // padding2
-
- return marshalSize;
-}
-
-
-/** Setter for {@link DirectedEnergyPrecisionAimpoint#recordType}*/
-public DirectedEnergyPrecisionAimpoint setRecordType(int pRecordType)
-{
- recordType = pRecordType;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyPrecisionAimpoint#recordType}*/
-public int getRecordType()
+
+
+/** Constructor */
+ public DirectedEnergyPrecisionAimpoint()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 4; // recordType
+ marshalSize += 2; // recordLength
+ marshalSize += 2; // padding
+ marshalSize += targetSpotLocation.getMarshalledSize();
+ marshalSize += targetSpotEntityLocation.getMarshalledSize();
+ marshalSize += targetSpotVelocity.getMarshalledSize();
+ marshalSize += targetSpotAcceleration.getMarshalledSize();
+ marshalSize += targetEntityID.getMarshalledSize();
+ marshalSize += 1; // targetComponentID
+ marshalSize += beamSpotType.getMarshalledSize();
+ marshalSize += 4; // beamSpotCrossSectionSemiMajorAxis
+ marshalSize += 4; // beamSpotCrossSectionSemiMinorAxis
+ marshalSize += 4; // beamSpotCrossSectionOrientationAngle
+ marshalSize += 4; // peakIrradiance
+ marshalSize += 4; // padding2
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link DirectedEnergyPrecisionAimpoint#recordType}*/
+public DirectedEnergyPrecisionAimpoint setRecordType(int pRecordType)
+{
+ recordType = pRecordType;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyPrecisionAimpoint#recordType}*/
+public int getRecordType()
{
return recordType;
-}
-
-/** Setter for {@link DirectedEnergyPrecisionAimpoint#recordLength}*/
-public DirectedEnergyPrecisionAimpoint setRecordLength(short pRecordLength)
-{
- recordLength = pRecordLength;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyPrecisionAimpoint#recordLength}*/
-public short getRecordLength()
+}
+
+/** Setter for {@link DirectedEnergyPrecisionAimpoint#recordLength}*/
+public DirectedEnergyPrecisionAimpoint setRecordLength(short pRecordLength)
+{
+ recordLength = pRecordLength;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyPrecisionAimpoint#recordLength}*/
+public short getRecordLength()
{
return recordLength;
-}
-
-/** Setter for {@link DirectedEnergyPrecisionAimpoint#padding}*/
-public DirectedEnergyPrecisionAimpoint setPadding(short pPadding)
-{
- padding = pPadding;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyPrecisionAimpoint#padding}*/
-public short getPadding()
+}
+
+/** Setter for {@link DirectedEnergyPrecisionAimpoint#padding}*/
+public DirectedEnergyPrecisionAimpoint setPadding(short pPadding)
+{
+ padding = pPadding;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyPrecisionAimpoint#padding}*/
+public short getPadding()
{
return padding;
-}
-
-/** Setter for {@link DirectedEnergyPrecisionAimpoint#targetSpotLocation}*/
-public DirectedEnergyPrecisionAimpoint setTargetSpotLocation(Vector3Double pTargetSpotLocation)
-{
- targetSpotLocation = pTargetSpotLocation;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyPrecisionAimpoint#targetSpotLocation}*/
-public Vector3Double getTargetSpotLocation()
+}
+
+/** Setter for {@link DirectedEnergyPrecisionAimpoint#targetSpotLocation}*/
+public DirectedEnergyPrecisionAimpoint setTargetSpotLocation(Vector3Double pTargetSpotLocation)
+{
+ targetSpotLocation = pTargetSpotLocation;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyPrecisionAimpoint#targetSpotLocation}*/
+public Vector3Double getTargetSpotLocation()
{
return targetSpotLocation;
-}
-
-/** Setter for {@link DirectedEnergyPrecisionAimpoint#targetSpotEntityLocation}*/
-public DirectedEnergyPrecisionAimpoint setTargetSpotEntityLocation(Vector3Float pTargetSpotEntityLocation)
-{
- targetSpotEntityLocation = pTargetSpotEntityLocation;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyPrecisionAimpoint#targetSpotEntityLocation}*/
-public Vector3Float getTargetSpotEntityLocation()
+}
+
+/** Setter for {@link DirectedEnergyPrecisionAimpoint#targetSpotEntityLocation}*/
+public DirectedEnergyPrecisionAimpoint setTargetSpotEntityLocation(Vector3Float pTargetSpotEntityLocation)
+{
+ targetSpotEntityLocation = pTargetSpotEntityLocation;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyPrecisionAimpoint#targetSpotEntityLocation}*/
+public Vector3Float getTargetSpotEntityLocation()
{
return targetSpotEntityLocation;
-}
-
-/** Setter for {@link DirectedEnergyPrecisionAimpoint#targetSpotVelocity}*/
-public DirectedEnergyPrecisionAimpoint setTargetSpotVelocity(Vector3Float pTargetSpotVelocity)
-{
- targetSpotVelocity = pTargetSpotVelocity;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyPrecisionAimpoint#targetSpotVelocity}*/
-public Vector3Float getTargetSpotVelocity()
+}
+
+/** Setter for {@link DirectedEnergyPrecisionAimpoint#targetSpotVelocity}*/
+public DirectedEnergyPrecisionAimpoint setTargetSpotVelocity(Vector3Float pTargetSpotVelocity)
+{
+ targetSpotVelocity = pTargetSpotVelocity;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyPrecisionAimpoint#targetSpotVelocity}*/
+public Vector3Float getTargetSpotVelocity()
{
return targetSpotVelocity;
-}
-
-/** Setter for {@link DirectedEnergyPrecisionAimpoint#targetSpotAcceleration}*/
-public DirectedEnergyPrecisionAimpoint setTargetSpotAcceleration(Vector3Float pTargetSpotAcceleration)
-{
- targetSpotAcceleration = pTargetSpotAcceleration;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyPrecisionAimpoint#targetSpotAcceleration}*/
-public Vector3Float getTargetSpotAcceleration()
+}
+
+/** Setter for {@link DirectedEnergyPrecisionAimpoint#targetSpotAcceleration}*/
+public DirectedEnergyPrecisionAimpoint setTargetSpotAcceleration(Vector3Float pTargetSpotAcceleration)
+{
+ targetSpotAcceleration = pTargetSpotAcceleration;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyPrecisionAimpoint#targetSpotAcceleration}*/
+public Vector3Float getTargetSpotAcceleration()
{
return targetSpotAcceleration;
-}
-
-/** Setter for {@link DirectedEnergyPrecisionAimpoint#targetEntityID}*/
-public DirectedEnergyPrecisionAimpoint setTargetEntityID(EntityID pTargetEntityID)
-{
- targetEntityID = pTargetEntityID;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyPrecisionAimpoint#targetEntityID}*/
-public EntityID getTargetEntityID()
+}
+
+/** Setter for {@link DirectedEnergyPrecisionAimpoint#targetEntityID}*/
+public DirectedEnergyPrecisionAimpoint setTargetEntityID(EntityID pTargetEntityID)
+{
+ targetEntityID = pTargetEntityID;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyPrecisionAimpoint#targetEntityID}*/
+public EntityID getTargetEntityID()
{
return targetEntityID;
-}
-
-/** Setter for {@link DirectedEnergyPrecisionAimpoint#targetComponentID}*/
-public DirectedEnergyPrecisionAimpoint setTargetComponentID(byte pTargetComponentID)
-{
- targetComponentID = pTargetComponentID;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyPrecisionAimpoint#targetComponentID}*/
-public byte getTargetComponentID()
+}
+
+/** Setter for {@link DirectedEnergyPrecisionAimpoint#targetComponentID}*/
+public DirectedEnergyPrecisionAimpoint setTargetComponentID(byte pTargetComponentID)
+{
+ targetComponentID = pTargetComponentID;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyPrecisionAimpoint#targetComponentID}*/
+public byte getTargetComponentID()
{
return targetComponentID;
-}
-
-/** Setter for {@link DirectedEnergyPrecisionAimpoint#beamSpotType}*/
-public DirectedEnergyPrecisionAimpoint setBeamSpotType(DEPrecisionAimpointBeamSpotType pBeamSpotType)
-{
- beamSpotType = pBeamSpotType;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyPrecisionAimpoint#beamSpotType}*/
-public DEPrecisionAimpointBeamSpotType getBeamSpotType()
+}
+
+/** Setter for {@link DirectedEnergyPrecisionAimpoint#beamSpotType}*/
+public DirectedEnergyPrecisionAimpoint setBeamSpotType(DEPrecisionAimpointBeamSpotType pBeamSpotType)
+{
+ beamSpotType = pBeamSpotType;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyPrecisionAimpoint#beamSpotType}*/
+public DEPrecisionAimpointBeamSpotType getBeamSpotType()
{
return beamSpotType;
-}
-
-/** Setter for {@link DirectedEnergyPrecisionAimpoint#beamSpotCrossSectionSemiMajorAxis}*/
-public DirectedEnergyPrecisionAimpoint setBeamSpotCrossSectionSemiMajorAxis(float pBeamSpotCrossSectionSemiMajorAxis)
-{
- beamSpotCrossSectionSemiMajorAxis = pBeamSpotCrossSectionSemiMajorAxis;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyPrecisionAimpoint#beamSpotCrossSectionSemiMajorAxis}*/
-public float getBeamSpotCrossSectionSemiMajorAxis()
+}
+
+/** Setter for {@link DirectedEnergyPrecisionAimpoint#beamSpotCrossSectionSemiMajorAxis}*/
+public DirectedEnergyPrecisionAimpoint setBeamSpotCrossSectionSemiMajorAxis(float pBeamSpotCrossSectionSemiMajorAxis)
+{
+ beamSpotCrossSectionSemiMajorAxis = pBeamSpotCrossSectionSemiMajorAxis;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyPrecisionAimpoint#beamSpotCrossSectionSemiMajorAxis}*/
+public float getBeamSpotCrossSectionSemiMajorAxis()
{
return beamSpotCrossSectionSemiMajorAxis;
-}
-
-/** Setter for {@link DirectedEnergyPrecisionAimpoint#beamSpotCrossSectionSemiMinorAxis}*/
-public DirectedEnergyPrecisionAimpoint setBeamSpotCrossSectionSemiMinorAxis(float pBeamSpotCrossSectionSemiMinorAxis)
-{
- beamSpotCrossSectionSemiMinorAxis = pBeamSpotCrossSectionSemiMinorAxis;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyPrecisionAimpoint#beamSpotCrossSectionSemiMinorAxis}*/
-public float getBeamSpotCrossSectionSemiMinorAxis()
+}
+
+/** Setter for {@link DirectedEnergyPrecisionAimpoint#beamSpotCrossSectionSemiMinorAxis}*/
+public DirectedEnergyPrecisionAimpoint setBeamSpotCrossSectionSemiMinorAxis(float pBeamSpotCrossSectionSemiMinorAxis)
+{
+ beamSpotCrossSectionSemiMinorAxis = pBeamSpotCrossSectionSemiMinorAxis;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyPrecisionAimpoint#beamSpotCrossSectionSemiMinorAxis}*/
+public float getBeamSpotCrossSectionSemiMinorAxis()
{
return beamSpotCrossSectionSemiMinorAxis;
-}
-
-/** Setter for {@link DirectedEnergyPrecisionAimpoint#beamSpotCrossSectionOrientationAngle}*/
-public DirectedEnergyPrecisionAimpoint setBeamSpotCrossSectionOrientationAngle(float pBeamSpotCrossSectionOrientationAngle)
-{
- beamSpotCrossSectionOrientationAngle = pBeamSpotCrossSectionOrientationAngle;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyPrecisionAimpoint#beamSpotCrossSectionOrientationAngle}*/
-public float getBeamSpotCrossSectionOrientationAngle()
+}
+
+/** Setter for {@link DirectedEnergyPrecisionAimpoint#beamSpotCrossSectionOrientationAngle}*/
+public DirectedEnergyPrecisionAimpoint setBeamSpotCrossSectionOrientationAngle(float pBeamSpotCrossSectionOrientationAngle)
+{
+ beamSpotCrossSectionOrientationAngle = pBeamSpotCrossSectionOrientationAngle;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyPrecisionAimpoint#beamSpotCrossSectionOrientationAngle}*/
+public float getBeamSpotCrossSectionOrientationAngle()
{
return beamSpotCrossSectionOrientationAngle;
-}
-
-/** Setter for {@link DirectedEnergyPrecisionAimpoint#peakIrradiance}*/
-public DirectedEnergyPrecisionAimpoint setPeakIrradiance(float pPeakIrradiance)
-{
- peakIrradiance = pPeakIrradiance;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyPrecisionAimpoint#peakIrradiance}*/
-public float getPeakIrradiance()
+}
+
+/** Setter for {@link DirectedEnergyPrecisionAimpoint#peakIrradiance}*/
+public DirectedEnergyPrecisionAimpoint setPeakIrradiance(float pPeakIrradiance)
+{
+ peakIrradiance = pPeakIrradiance;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyPrecisionAimpoint#peakIrradiance}*/
+public float getPeakIrradiance()
{
return peakIrradiance;
-}
-
-/** Setter for {@link DirectedEnergyPrecisionAimpoint#padding2}*/
-public DirectedEnergyPrecisionAimpoint setPadding2(int pPadding2)
-{
- padding2 = pPadding2;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyPrecisionAimpoint#padding2}*/
-public int getPadding2()
+}
+
+/** Setter for {@link DirectedEnergyPrecisionAimpoint#padding2}*/
+public DirectedEnergyPrecisionAimpoint setPadding2(int pPadding2)
+{
+ padding2 = pPadding2;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyPrecisionAimpoint#padding2}*/
+public int getPadding2()
{
return padding2;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeInt(recordType);
- dos.writeShort(recordLength);
- dos.writeShort(padding);
- targetSpotLocation.marshal(dos);
- targetSpotEntityLocation.marshal(dos);
- targetSpotVelocity.marshal(dos);
- targetSpotAcceleration.marshal(dos);
- targetEntityID.marshal(dos);
- dos.writeByte(targetComponentID);
- beamSpotType.marshal(dos);
- dos.writeFloat(beamSpotCrossSectionSemiMajorAxis);
- dos.writeFloat(beamSpotCrossSectionSemiMinorAxis);
- dos.writeFloat(beamSpotCrossSectionOrientationAngle);
- dos.writeFloat(peakIrradiance);
- dos.writeInt(padding2);
+ {
+ dos.writeInt(recordType);
+ dos.writeShort(recordLength);
+ dos.writeShort(padding);
+ targetSpotLocation.marshal(dos);
+ targetSpotEntityLocation.marshal(dos);
+ targetSpotVelocity.marshal(dos);
+ targetSpotAcceleration.marshal(dos);
+ targetEntityID.marshal(dos);
+ dos.writeByte(targetComponentID);
+ beamSpotType.marshal(dos);
+ dos.writeFloat(beamSpotCrossSectionSemiMajorAxis);
+ dos.writeFloat(beamSpotCrossSectionSemiMinorAxis);
+ dos.writeFloat(beamSpotCrossSectionOrientationAngle);
+ dos.writeFloat(peakIrradiance);
+ dos.writeInt(padding2);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- recordType = dis.readInt();
- uPosition += 4;
- recordLength = (short)dis.readUnsignedShort();
- uPosition += 2;
- padding = (short)dis.readUnsignedShort();
- uPosition += 2;
- uPosition += targetSpotLocation.unmarshal(dis);
- uPosition += targetSpotEntityLocation.unmarshal(dis);
- uPosition += targetSpotVelocity.unmarshal(dis);
- uPosition += targetSpotAcceleration.unmarshal(dis);
- uPosition += targetEntityID.unmarshal(dis);
- targetComponentID = (byte)dis.readUnsignedByte();
- uPosition += 1;
- beamSpotType = DEPrecisionAimpointBeamSpotType.unmarshalEnum(dis);
- uPosition += beamSpotType.getMarshalledSize();
- beamSpotCrossSectionSemiMajorAxis = dis.readFloat();
- uPosition += 4;
- beamSpotCrossSectionSemiMinorAxis = dis.readFloat();
- uPosition += 4;
- beamSpotCrossSectionOrientationAngle = dis.readFloat();
- uPosition += 4;
- peakIrradiance = dis.readFloat();
- uPosition += 4;
- padding2 = dis.readInt();
- uPosition += 4;
+ {
+ recordType = dis.readInt();
+ uPosition += 4;
+ recordLength = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ padding = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ uPosition += targetSpotLocation.unmarshal(dis);
+ uPosition += targetSpotEntityLocation.unmarshal(dis);
+ uPosition += targetSpotVelocity.unmarshal(dis);
+ uPosition += targetSpotAcceleration.unmarshal(dis);
+ uPosition += targetEntityID.unmarshal(dis);
+ targetComponentID = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ beamSpotType = DEPrecisionAimpointBeamSpotType.unmarshalEnum(dis);
+ uPosition += beamSpotType.getMarshalledSize();
+ beamSpotCrossSectionSemiMajorAxis = dis.readFloat();
+ uPosition += 4;
+ beamSpotCrossSectionSemiMinorAxis = dis.readFloat();
+ uPosition += 4;
+ beamSpotCrossSectionOrientationAngle = dis.readFloat();
+ uPosition += 4;
+ peakIrradiance = dis.readFloat();
+ uPosition += 4;
+ padding2 = dis.readInt();
+ uPosition += 4;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putInt( (int)recordType);
- buff.putShort( (short)recordLength);
- buff.putShort( (short)padding);
- targetSpotLocation.marshal(buff);
- targetSpotEntityLocation.marshal(buff);
- targetSpotVelocity.marshal(buff);
- targetSpotAcceleration.marshal(buff);
- targetEntityID.marshal(buff);
- buff.put( (byte)targetComponentID);
- beamSpotType.marshal(buff);
- buff.putFloat( (float)beamSpotCrossSectionSemiMajorAxis);
- buff.putFloat( (float)beamSpotCrossSectionSemiMinorAxis);
- buff.putFloat( (float)beamSpotCrossSectionOrientationAngle);
- buff.putFloat( (float)peakIrradiance);
- buff.putInt( (int)padding2);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- recordType = buff.getInt();
- recordLength = (short)(buff.getShort() & 0xFFFF);
- padding = (short)(buff.getShort() & 0xFFFF);
- targetSpotLocation.unmarshal(buff);
- targetSpotEntityLocation.unmarshal(buff);
- targetSpotVelocity.unmarshal(buff);
- targetSpotAcceleration.unmarshal(buff);
- targetEntityID.unmarshal(buff);
- targetComponentID = (byte)(buff.get() & 0xFF);
- beamSpotType = DEPrecisionAimpointBeamSpotType.unmarshalEnum(buff);
- beamSpotCrossSectionSemiMajorAxis = buff.getFloat();
- beamSpotCrossSectionSemiMinorAxis = buff.getFloat();
- beamSpotCrossSectionOrientationAngle = buff.getFloat();
- peakIrradiance = buff.getFloat();
- padding2 = buff.getInt();
- return getMarshalledSize();
-}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final DirectedEnergyPrecisionAimpoint rhs = (DirectedEnergyPrecisionAimpoint)obj;
-
- if( ! (recordType == rhs.recordType)) ivarsEqual = false;
- if( ! (recordLength == rhs.recordLength)) ivarsEqual = false;
- if( ! (padding == rhs.padding)) ivarsEqual = false;
- if( ! (targetSpotLocation.equals( rhs.targetSpotLocation) )) ivarsEqual = false;
- if( ! (targetSpotEntityLocation.equals( rhs.targetSpotEntityLocation) )) ivarsEqual = false;
- if( ! (targetSpotVelocity.equals( rhs.targetSpotVelocity) )) ivarsEqual = false;
- if( ! (targetSpotAcceleration.equals( rhs.targetSpotAcceleration) )) ivarsEqual = false;
- if( ! (targetEntityID.equals( rhs.targetEntityID) )) ivarsEqual = false;
- if( ! (targetComponentID == rhs.targetComponentID)) ivarsEqual = false;
- if( ! (beamSpotType == rhs.beamSpotType)) ivarsEqual = false;
- if( ! (beamSpotCrossSectionSemiMajorAxis == rhs.beamSpotCrossSectionSemiMajorAxis)) ivarsEqual = false;
- if( ! (beamSpotCrossSectionSemiMinorAxis == rhs.beamSpotCrossSectionSemiMinorAxis)) ivarsEqual = false;
- if( ! (beamSpotCrossSectionOrientationAngle == rhs.beamSpotCrossSectionOrientationAngle)) ivarsEqual = false;
- if( ! (peakIrradiance == rhs.peakIrradiance)) ivarsEqual = false;
- if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+ }
+ return getMarshalledSize();
+}
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putInt( (int)recordType);
+ buff.putShort( (short)recordLength);
+ buff.putShort( (short)padding);
+ targetSpotLocation.marshal(buff);
+ targetSpotEntityLocation.marshal(buff);
+ targetSpotVelocity.marshal(buff);
+ targetSpotAcceleration.marshal(buff);
+ targetEntityID.marshal(buff);
+ buff.put( (byte)targetComponentID);
+ beamSpotType.marshal(buff);
+ buff.putFloat( (float)beamSpotCrossSectionSemiMajorAxis);
+ buff.putFloat( (float)beamSpotCrossSectionSemiMinorAxis);
+ buff.putFloat( (float)beamSpotCrossSectionOrientationAngle);
+ buff.putFloat( (float)peakIrradiance);
+ buff.putInt( (int)padding2);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ recordType = buff.getInt();
+ recordLength = (short)(buff.getShort() & 0xFFFF);
+ padding = (short)(buff.getShort() & 0xFFFF);
+ targetSpotLocation.unmarshal(buff);
+ targetSpotEntityLocation.unmarshal(buff);
+ targetSpotVelocity.unmarshal(buff);
+ targetSpotAcceleration.unmarshal(buff);
+ targetEntityID.unmarshal(buff);
+ targetComponentID = (byte)(buff.get() & 0xFF);
+ beamSpotType = DEPrecisionAimpointBeamSpotType.unmarshalEnum(buff);
+ beamSpotCrossSectionSemiMajorAxis = buff.getFloat();
+ beamSpotCrossSectionSemiMinorAxis = buff.getFloat();
+ beamSpotCrossSectionOrientationAngle = buff.getFloat();
+ peakIrradiance = buff.getFloat();
+ padding2 = buff.getInt();
+ return getMarshalledSize();
+}
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final DirectedEnergyPrecisionAimpoint rhs = (DirectedEnergyPrecisionAimpoint)obj;
+
+ if( ! (recordType == rhs.recordType)) ivarsEqual = false;
+ if( ! (recordLength == rhs.recordLength)) ivarsEqual = false;
+ if( ! (padding == rhs.padding)) ivarsEqual = false;
+ if( ! (targetSpotLocation.equals( rhs.targetSpotLocation) )) ivarsEqual = false;
+ if( ! (targetSpotEntityLocation.equals( rhs.targetSpotEntityLocation) )) ivarsEqual = false;
+ if( ! (targetSpotVelocity.equals( rhs.targetSpotVelocity) )) ivarsEqual = false;
+ if( ! (targetSpotAcceleration.equals( rhs.targetSpotAcceleration) )) ivarsEqual = false;
+ if( ! (targetEntityID.equals( rhs.targetEntityID) )) ivarsEqual = false;
+ if( ! (targetComponentID == rhs.targetComponentID)) ivarsEqual = false;
+ if( ! (beamSpotType == rhs.beamSpotType)) ivarsEqual = false;
+ if( ! (beamSpotCrossSectionSemiMajorAxis == rhs.beamSpotCrossSectionSemiMajorAxis)) ivarsEqual = false;
+ if( ! (beamSpotCrossSectionSemiMinorAxis == rhs.beamSpotCrossSectionSemiMinorAxis)) ivarsEqual = false;
+ if( ! (beamSpotCrossSectionOrientationAngle == rhs.beamSpotCrossSectionOrientationAngle)) ivarsEqual = false;
+ if( ! (peakIrradiance == rhs.peakIrradiance)) ivarsEqual = false;
+ if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" recordType: ").append(recordType).append("\n");
- sb.append(" recordLength: ").append(recordLength).append("\n");
- sb.append(" padding: ").append(padding).append("\n");
- sb.append(" targetSpotLocation: ").append(targetSpotLocation).append("\n");
- sb.append(" targetSpotEntityLocation: ").append(targetSpotEntityLocation).append("\n");
- sb.append(" targetSpotVelocity: ").append(targetSpotVelocity).append("\n");
- sb.append(" targetSpotAcceleration: ").append(targetSpotAcceleration).append("\n");
- sb.append(" targetEntityID: ").append(targetEntityID).append("\n");
- sb.append(" targetComponentID: ").append(targetComponentID).append("\n");
- sb.append(" beamSpotType: ").append(beamSpotType).append("\n");
- sb.append(" beamSpotCrossSectionSemiMajorAxis: ").append(beamSpotCrossSectionSemiMajorAxis).append("\n");
- sb.append(" beamSpotCrossSectionSemiMinorAxis: ").append(beamSpotCrossSectionSemiMinorAxis).append("\n");
- sb.append(" beamSpotCrossSectionOrientationAngle: ").append(beamSpotCrossSectionOrientationAngle).append("\n");
- sb.append(" peakIrradiance: ").append(peakIrradiance).append("\n");
- sb.append(" padding2: ").append(padding2).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" recordType: ").append(recordType).append("\n");
+ sb.append(" recordLength: ").append(recordLength).append("\n");
+ sb.append(" padding: ").append(padding).append("\n");
+ sb.append(" targetSpotLocation: ").append(targetSpotLocation).append("\n");
+ sb.append(" targetSpotEntityLocation: ").append(targetSpotEntityLocation).append("\n");
+ sb.append(" targetSpotVelocity: ").append(targetSpotVelocity).append("\n");
+ sb.append(" targetSpotAcceleration: ").append(targetSpotAcceleration).append("\n");
+ sb.append(" targetEntityID: ").append(targetEntityID).append("\n");
+ sb.append(" targetComponentID: ").append(targetComponentID).append("\n");
+ sb.append(" beamSpotType: ").append(beamSpotType).append("\n");
+ sb.append(" beamSpotCrossSectionSemiMajorAxis: ").append(beamSpotCrossSectionSemiMajorAxis).append("\n");
+ sb.append(" beamSpotCrossSectionSemiMinorAxis: ").append(beamSpotCrossSectionSemiMinorAxis).append("\n");
+ sb.append(" beamSpotCrossSectionOrientationAngle: ").append(beamSpotCrossSectionOrientationAngle).append("\n");
+ sb.append(" peakIrradiance: ").append(peakIrradiance).append("\n");
+ sb.append(" padding2: ").append(padding2).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/DirectedEnergyTargetEnergyDeposition.java b/src-generated/edu/nps/moves/dis7/DirectedEnergyTargetEnergyDeposition.java
index 3629b76b4761e83172bf21b59a14b60d0c2c63cb..5081adc39a89443dc7975dbe52bf89d00e55a3d2 100644
--- a/src-generated/edu/nps/moves/dis7/DirectedEnergyTargetEnergyDeposition.java
+++ b/src-generated/edu/nps/moves/dis7/DirectedEnergyTargetEnergyDeposition.java
@@ -1,209 +1,209 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * DE energy depostion properties for a target entity. Section 6.2.20.4
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class DirectedEnergyTargetEnergyDeposition extends Object implements Serializable
-{
- /** Unique ID of the target entity. */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * DE energy depostion properties for a target entity. Section 6.2.20.4
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class DirectedEnergyTargetEnergyDeposition extends Object implements Serializable
+{
+ /** Unique ID of the target entity. */
protected EntityID targetEntityID = new EntityID();
-
- /** padding */
+
+ /** padding */
protected short padding = (short)0;
-
- /** Peak irradiance */
+
+ /** Peak irradiance */
protected float peakIrradiance;
-
-
-/** Constructor */
- public DirectedEnergyTargetEnergyDeposition()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += targetEntityID.getMarshalledSize();
- marshalSize += 2; // padding
- marshalSize += 4; // peakIrradiance
-
- return marshalSize;
-}
-
-
-/** Setter for {@link DirectedEnergyTargetEnergyDeposition#targetEntityID}*/
-public DirectedEnergyTargetEnergyDeposition setTargetEntityID(EntityID pTargetEntityID)
+
+
+/** Constructor */
+ public DirectedEnergyTargetEnergyDeposition()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += targetEntityID.getMarshalledSize();
+ marshalSize += 2; // padding
+ marshalSize += 4; // peakIrradiance
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link DirectedEnergyTargetEnergyDeposition#targetEntityID}*/
+public DirectedEnergyTargetEnergyDeposition setTargetEntityID(EntityID pTargetEntityID)
{
- targetEntityID = pTargetEntityID;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyTargetEnergyDeposition#targetEntityID}*/
-public EntityID getTargetEntityID()
+ targetEntityID = pTargetEntityID;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyTargetEnergyDeposition#targetEntityID}*/
+public EntityID getTargetEntityID()
{
return targetEntityID;
-}
-
-/** Setter for {@link DirectedEnergyTargetEnergyDeposition#padding}*/
-public DirectedEnergyTargetEnergyDeposition setPadding(short pPadding)
+}
+
+/** Setter for {@link DirectedEnergyTargetEnergyDeposition#padding}*/
+public DirectedEnergyTargetEnergyDeposition setPadding(short pPadding)
{
- padding = pPadding;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyTargetEnergyDeposition#padding}*/
-public short getPadding()
+ padding = pPadding;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyTargetEnergyDeposition#padding}*/
+public short getPadding()
{
return padding;
-}
-
-/** Setter for {@link DirectedEnergyTargetEnergyDeposition#peakIrradiance}*/
-public DirectedEnergyTargetEnergyDeposition setPeakIrradiance(float pPeakIrradiance)
+}
+
+/** Setter for {@link DirectedEnergyTargetEnergyDeposition#peakIrradiance}*/
+public DirectedEnergyTargetEnergyDeposition setPeakIrradiance(float pPeakIrradiance)
{
- peakIrradiance = pPeakIrradiance;
- return this;
-}
-
-/** Getter for {@link DirectedEnergyTargetEnergyDeposition#peakIrradiance}*/
-public float getPeakIrradiance()
+ peakIrradiance = pPeakIrradiance;
+ return this;
+}
+
+/** Getter for {@link DirectedEnergyTargetEnergyDeposition#peakIrradiance}*/
+public float getPeakIrradiance()
{
return peakIrradiance;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- targetEntityID.marshal(dos);
- dos.writeShort(padding);
- dos.writeFloat(peakIrradiance);
+ {
+ targetEntityID.marshal(dos);
+ dos.writeShort(padding);
+ dos.writeFloat(peakIrradiance);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- uPosition += targetEntityID.unmarshal(dis);
- padding = (short)dis.readUnsignedShort();
- uPosition += 2;
- peakIrradiance = dis.readFloat();
- uPosition += 4;
+ {
+ uPosition += targetEntityID.unmarshal(dis);
+ padding = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ peakIrradiance = dis.readFloat();
+ uPosition += 4;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- targetEntityID.marshal(buff);
- buff.putShort( (short)padding);
- buff.putFloat( (float)peakIrradiance);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- targetEntityID.unmarshal(buff);
- padding = (short)(buff.getShort() & 0xFFFF);
- peakIrradiance = buff.getFloat();
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ targetEntityID.marshal(buff);
+ buff.putShort( (short)padding);
+ buff.putFloat( (float)peakIrradiance);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ targetEntityID.unmarshal(buff);
+ padding = (short)(buff.getShort() & 0xFFFF);
+ peakIrradiance = buff.getFloat();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final DirectedEnergyTargetEnergyDeposition rhs = (DirectedEnergyTargetEnergyDeposition)obj;
-
- if( ! (targetEntityID.equals( rhs.targetEntityID) )) ivarsEqual = false;
- if( ! (padding == rhs.padding)) ivarsEqual = false;
- if( ! (peakIrradiance == rhs.peakIrradiance)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final DirectedEnergyTargetEnergyDeposition rhs = (DirectedEnergyTargetEnergyDeposition)obj;
+
+ if( ! (targetEntityID.equals( rhs.targetEntityID) )) ivarsEqual = false;
+ if( ! (padding == rhs.padding)) ivarsEqual = false;
+ if( ! (peakIrradiance == rhs.peakIrradiance)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" targetEntityID: ").append(targetEntityID).append("\n");
- sb.append(" padding: ").append(padding).append("\n");
- sb.append(" peakIrradiance: ").append(peakIrradiance).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" targetEntityID: ").append(targetEntityID).append("\n");
+ sb.append(" padding: ").append(padding).append("\n");
+ sb.append(" peakIrradiance: ").append(peakIrradiance).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/DistributedEmissionsFamilyPdu.java b/src-generated/edu/nps/moves/dis7/DistributedEmissionsFamilyPdu.java
index 62b33a4c985540cd03398f917085602fbf225430..157a6ee089a5104a505fd2fd38b83089e8438343 100644
--- a/src-generated/edu/nps/moves/dis7/DistributedEmissionsFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/DistributedEmissionsFamilyPdu.java
@@ -1,141 +1,141 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Section 5.3.7. Electronic Emissions. Abstract superclass for distributed emissions PDU
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public abstract class DistributedEmissionsFamilyPdu extends PduBase implements Serializable
-{
-
-/** Constructor */
- public DistributedEmissionsFamilyPdu()
- {
- setProtocolFamily( DISProtocolFamily.DISTRIBUTED_EMISSION_REGENERATION );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
-
- return marshalSize;
-}
-
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Section 5.3.7. Electronic Emissions. Abstract superclass for distributed emissions PDU
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public abstract class DistributedEmissionsFamilyPdu extends PduBase implements Serializable
+{
+
+/** Constructor */
+ public DistributedEmissionsFamilyPdu()
+ {
+ setProtocolFamily( DISProtocolFamily.DISTRIBUTED_EMISSION_REGENERATION );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+
+ return marshalSize;
+}
+
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
+ {
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
+ {
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- return getMarshalledSize();
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final DistributedEmissionsFamilyPdu rhs = (DistributedEmissionsFamilyPdu)obj;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final DistributedEmissionsFamilyPdu rhs = (DistributedEmissionsFamilyPdu)obj;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
-
- return sb.toString();
- }
-} // end of class
+
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EEFundamentalParameterData.java b/src-generated/edu/nps/moves/dis7/EEFundamentalParameterData.java
index e858c357d11a740bd036fa0fedd1723337a6aa64..8208ea4614b57113927927698ea7e5aacd6cee21 100644
--- a/src-generated/edu/nps/moves/dis7/EEFundamentalParameterData.java
+++ b/src-generated/edu/nps/moves/dis7/EEFundamentalParameterData.java
@@ -1,258 +1,258 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Contains electromagnetic emmission regeneration parameters that are variable throught a scenario. Section 6.2.22.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class EEFundamentalParameterData extends Object implements Serializable
-{
- /** center frequency of the emission in hertz. */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Contains electromagnetic emmission regeneration parameters that are variable throught a scenario. Section 6.2.22.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class EEFundamentalParameterData extends Object implements Serializable
+{
+ /** center frequency of the emission in hertz. */
protected float frequency;
-
- /** Bandwidth of the frequencies corresponding to the fequency field. */
+
+ /** Bandwidth of the frequencies corresponding to the fequency field. */
protected float frequencyRange;
-
- /** Effective radiated power for the emission in DdBm. For a radar noise jammer, indicates the peak of the transmitted power. */
+
+ /** Effective radiated power for the emission in DdBm. For a radar noise jammer, indicates the peak of the transmitted power. */
protected float effectiveRadiatedPower;
-
- /** Average repetition frequency of the emission in hertz. */
+
+ /** Average repetition frequency of the emission in hertz. */
protected float pulseRepetitionFrequency;
-
- /** Average pulse width of the emission in microseconds. */
+
+ /** Average pulse width of the emission in microseconds. */
protected float pulseWidth;
-
-
-/** Constructor */
- public EEFundamentalParameterData()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public EEFundamentalParameterData()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 4; // frequency
+ marshalSize += 4; // frequencyRange
+ marshalSize += 4; // effectiveRadiatedPower
+ marshalSize += 4; // pulseRepetitionFrequency
+ marshalSize += 4; // pulseWidth
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link EEFundamentalParameterData#frequency}*/
+public EEFundamentalParameterData setFrequency(float pFrequency)
{
- int marshalSize = 0;
-
- marshalSize += 4; // frequency
- marshalSize += 4; // frequencyRange
- marshalSize += 4; // effectiveRadiatedPower
- marshalSize += 4; // pulseRepetitionFrequency
- marshalSize += 4; // pulseWidth
-
- return marshalSize;
-}
-
-
-/** Setter for {@link EEFundamentalParameterData#frequency}*/
-public EEFundamentalParameterData setFrequency(float pFrequency)
-{
- frequency = pFrequency;
- return this;
-}
-
-/** Getter for {@link EEFundamentalParameterData#frequency}*/
-public float getFrequency()
+ frequency = pFrequency;
+ return this;
+}
+
+/** Getter for {@link EEFundamentalParameterData#frequency}*/
+public float getFrequency()
{
return frequency;
-}
-
-/** Setter for {@link EEFundamentalParameterData#frequencyRange}*/
-public EEFundamentalParameterData setFrequencyRange(float pFrequencyRange)
+}
+
+/** Setter for {@link EEFundamentalParameterData#frequencyRange}*/
+public EEFundamentalParameterData setFrequencyRange(float pFrequencyRange)
{
- frequencyRange = pFrequencyRange;
- return this;
-}
-
-/** Getter for {@link EEFundamentalParameterData#frequencyRange}*/
-public float getFrequencyRange()
+ frequencyRange = pFrequencyRange;
+ return this;
+}
+
+/** Getter for {@link EEFundamentalParameterData#frequencyRange}*/
+public float getFrequencyRange()
{
return frequencyRange;
-}
-
-/** Setter for {@link EEFundamentalParameterData#effectiveRadiatedPower}*/
-public EEFundamentalParameterData setEffectiveRadiatedPower(float pEffectiveRadiatedPower)
+}
+
+/** Setter for {@link EEFundamentalParameterData#effectiveRadiatedPower}*/
+public EEFundamentalParameterData setEffectiveRadiatedPower(float pEffectiveRadiatedPower)
{
- effectiveRadiatedPower = pEffectiveRadiatedPower;
- return this;
-}
-
-/** Getter for {@link EEFundamentalParameterData#effectiveRadiatedPower}*/
-public float getEffectiveRadiatedPower()
+ effectiveRadiatedPower = pEffectiveRadiatedPower;
+ return this;
+}
+
+/** Getter for {@link EEFundamentalParameterData#effectiveRadiatedPower}*/
+public float getEffectiveRadiatedPower()
{
return effectiveRadiatedPower;
-}
-
-/** Setter for {@link EEFundamentalParameterData#pulseRepetitionFrequency}*/
-public EEFundamentalParameterData setPulseRepetitionFrequency(float pPulseRepetitionFrequency)
+}
+
+/** Setter for {@link EEFundamentalParameterData#pulseRepetitionFrequency}*/
+public EEFundamentalParameterData setPulseRepetitionFrequency(float pPulseRepetitionFrequency)
{
- pulseRepetitionFrequency = pPulseRepetitionFrequency;
- return this;
-}
-
-/** Getter for {@link EEFundamentalParameterData#pulseRepetitionFrequency}*/
-public float getPulseRepetitionFrequency()
+ pulseRepetitionFrequency = pPulseRepetitionFrequency;
+ return this;
+}
+
+/** Getter for {@link EEFundamentalParameterData#pulseRepetitionFrequency}*/
+public float getPulseRepetitionFrequency()
{
return pulseRepetitionFrequency;
-}
-
-/** Setter for {@link EEFundamentalParameterData#pulseWidth}*/
-public EEFundamentalParameterData setPulseWidth(float pPulseWidth)
+}
+
+/** Setter for {@link EEFundamentalParameterData#pulseWidth}*/
+public EEFundamentalParameterData setPulseWidth(float pPulseWidth)
{
- pulseWidth = pPulseWidth;
- return this;
-}
-
-/** Getter for {@link EEFundamentalParameterData#pulseWidth}*/
-public float getPulseWidth()
+ pulseWidth = pPulseWidth;
+ return this;
+}
+
+/** Getter for {@link EEFundamentalParameterData#pulseWidth}*/
+public float getPulseWidth()
{
return pulseWidth;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeFloat(frequency);
- dos.writeFloat(frequencyRange);
- dos.writeFloat(effectiveRadiatedPower);
- dos.writeFloat(pulseRepetitionFrequency);
- dos.writeFloat(pulseWidth);
+ {
+ dos.writeFloat(frequency);
+ dos.writeFloat(frequencyRange);
+ dos.writeFloat(effectiveRadiatedPower);
+ dos.writeFloat(pulseRepetitionFrequency);
+ dos.writeFloat(pulseWidth);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- frequency = dis.readFloat();
- uPosition += 4;
- frequencyRange = dis.readFloat();
- uPosition += 4;
- effectiveRadiatedPower = dis.readFloat();
- uPosition += 4;
- pulseRepetitionFrequency = dis.readFloat();
- uPosition += 4;
- pulseWidth = dis.readFloat();
- uPosition += 4;
+ {
+ frequency = dis.readFloat();
+ uPosition += 4;
+ frequencyRange = dis.readFloat();
+ uPosition += 4;
+ effectiveRadiatedPower = dis.readFloat();
+ uPosition += 4;
+ pulseRepetitionFrequency = dis.readFloat();
+ uPosition += 4;
+ pulseWidth = dis.readFloat();
+ uPosition += 4;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putFloat( (float)frequency);
- buff.putFloat( (float)frequencyRange);
- buff.putFloat( (float)effectiveRadiatedPower);
- buff.putFloat( (float)pulseRepetitionFrequency);
- buff.putFloat( (float)pulseWidth);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- frequency = buff.getFloat();
- frequencyRange = buff.getFloat();
- effectiveRadiatedPower = buff.getFloat();
- pulseRepetitionFrequency = buff.getFloat();
- pulseWidth = buff.getFloat();
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putFloat( (float)frequency);
+ buff.putFloat( (float)frequencyRange);
+ buff.putFloat( (float)effectiveRadiatedPower);
+ buff.putFloat( (float)pulseRepetitionFrequency);
+ buff.putFloat( (float)pulseWidth);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ frequency = buff.getFloat();
+ frequencyRange = buff.getFloat();
+ effectiveRadiatedPower = buff.getFloat();
+ pulseRepetitionFrequency = buff.getFloat();
+ pulseWidth = buff.getFloat();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final EEFundamentalParameterData rhs = (EEFundamentalParameterData)obj;
-
- if( ! (frequency == rhs.frequency)) ivarsEqual = false;
- if( ! (frequencyRange == rhs.frequencyRange)) ivarsEqual = false;
- if( ! (effectiveRadiatedPower == rhs.effectiveRadiatedPower)) ivarsEqual = false;
- if( ! (pulseRepetitionFrequency == rhs.pulseRepetitionFrequency)) ivarsEqual = false;
- if( ! (pulseWidth == rhs.pulseWidth)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final EEFundamentalParameterData rhs = (EEFundamentalParameterData)obj;
+
+ if( ! (frequency == rhs.frequency)) ivarsEqual = false;
+ if( ! (frequencyRange == rhs.frequencyRange)) ivarsEqual = false;
+ if( ! (effectiveRadiatedPower == rhs.effectiveRadiatedPower)) ivarsEqual = false;
+ if( ! (pulseRepetitionFrequency == rhs.pulseRepetitionFrequency)) ivarsEqual = false;
+ if( ! (pulseWidth == rhs.pulseWidth)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" frequency: ").append(frequency).append("\n");
- sb.append(" frequencyRange: ").append(frequencyRange).append("\n");
- sb.append(" effectiveRadiatedPower: ").append(effectiveRadiatedPower).append("\n");
- sb.append(" pulseRepetitionFrequency: ").append(pulseRepetitionFrequency).append("\n");
- sb.append(" pulseWidth: ").append(pulseWidth).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" frequency: ").append(frequency).append("\n");
+ sb.append(" frequencyRange: ").append(frequencyRange).append("\n");
+ sb.append(" effectiveRadiatedPower: ").append(effectiveRadiatedPower).append("\n");
+ sb.append(" pulseRepetitionFrequency: ").append(pulseRepetitionFrequency).append("\n");
+ sb.append(" pulseWidth: ").append(pulseWidth).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ElectromagneticEmissionPdu.java b/src-generated/edu/nps/moves/dis7/ElectromagneticEmissionPdu.java
index e204b2af539ae0afe13996437ef6db5f34cc87be..67b0c3bce93aed280f754ea3e8a79dd3900154f0 100644
--- a/src-generated/edu/nps/moves/dis7/ElectromagneticEmissionPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ElectromagneticEmissionPdu.java
@@ -1,300 +1,300 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 7.6.2 Communicate active electromagnetic emissions, including radar and radar-related electronic warfare (e.g., jamming). Exceptions include IFF interrogations and replies, navigation aids, voice, beacon and data radio communications, directed energy weapons, and laser ranging and designation systems, which are handled by other PDUs. Section 5.3.7.1.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class ElectromagneticEmissionPdu extends DistributedEmissionsFamilyPdu implements Serializable
-{
- /** ID of the entity emitting */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 7.6.2 Communicate active electromagnetic emissions, including radar and radar-related electronic warfare (e.g., jamming). Exceptions include IFF interrogations and replies, navigation aids, voice, beacon and data radio communications, directed energy weapons, and laser ranging and designation systems, which are handled by other PDUs. Section 5.3.7.1.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class ElectromagneticEmissionPdu extends DistributedEmissionsFamilyPdu implements Serializable
+{
+ /** ID of the entity emitting */
protected EntityID emittingEntityID = new EntityID();
-
- /** ID of event */
+
+ /** ID of event */
protected EventIdentifier eventID = new EventIdentifier();
-
- /** This field shall be used to indicate if the data in the PDU represents a state update or just data that has changed since issuance of the last Electromagnetic Emission PDU [relative to the identified entity and emission system(s)]. uid 77 */
+
+ /** This field shall be used to indicate if the data in the PDU represents a state update or just data that has changed since issuance of the last Electromagnetic Emission PDU [relative to the identified entity and emission system(s)]. uid 77 */
protected ElectromagneticEmissionStateUpdateIndicator stateUpdateIndicator = ElectromagneticEmissionStateUpdateIndicator.values()[0];
-
- /** This field shall specify the number of emission systems being described in the current PDU. */
+
+ /** This field shall specify the number of emission systems being described in the current PDU. */
protected byte numberOfSystems;
-
- /** padding */
+
+ /** padding */
protected short paddingForEmissionsPdu;
-
- /** Electronic emmissions systems */
+
+ /** Electronic emmissions systems */
protected List< ElectronicEmitter > systems = new ArrayList< ElectronicEmitter >();
-
-
-/** Constructor */
- public ElectromagneticEmissionPdu()
- {
- setPduType( DISPDUType.ELECTROMAGNETIC_EMISSION );
- setPaddingForEmissionsPdu( (short)0 );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += emittingEntityID.getMarshalledSize();
- marshalSize += eventID.getMarshalledSize();
- marshalSize += stateUpdateIndicator.getMarshalledSize();
- marshalSize += 1; // numberOfSystems
- marshalSize += 2; // paddingForEmissionsPdu
- for(int idx=0; idx < systems.size(); idx++)
- {
- ElectronicEmitter listElement = systems.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link ElectromagneticEmissionPdu#emittingEntityID}*/
-public ElectromagneticEmissionPdu setEmittingEntityID(EntityID pEmittingEntityID)
+
+
+/** Constructor */
+ public ElectromagneticEmissionPdu()
+ {
+ setPduType( DISPDUType.ELECTROMAGNETIC_EMISSION );
+ setPaddingForEmissionsPdu( (short)0 );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += emittingEntityID.getMarshalledSize();
+ marshalSize += eventID.getMarshalledSize();
+ marshalSize += stateUpdateIndicator.getMarshalledSize();
+ marshalSize += 1; // numberOfSystems
+ marshalSize += 2; // paddingForEmissionsPdu
+ for(int idx=0; idx < systems.size(); idx++)
+ {
+ ElectronicEmitter listElement = systems.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link ElectromagneticEmissionPdu#emittingEntityID}*/
+public ElectromagneticEmissionPdu setEmittingEntityID(EntityID pEmittingEntityID)
{
- emittingEntityID = pEmittingEntityID;
- return this;
-}
-
-/** Getter for {@link ElectromagneticEmissionPdu#emittingEntityID}*/
-public EntityID getEmittingEntityID()
+ emittingEntityID = pEmittingEntityID;
+ return this;
+}
+
+/** Getter for {@link ElectromagneticEmissionPdu#emittingEntityID}*/
+public EntityID getEmittingEntityID()
{
return emittingEntityID;
-}
-
-/** Setter for {@link ElectromagneticEmissionPdu#eventID}*/
-public ElectromagneticEmissionPdu setEventID(EventIdentifier pEventID)
+}
+
+/** Setter for {@link ElectromagneticEmissionPdu#eventID}*/
+public ElectromagneticEmissionPdu setEventID(EventIdentifier pEventID)
{
- eventID = pEventID;
- return this;
-}
-
-/** Getter for {@link ElectromagneticEmissionPdu#eventID}*/
-public EventIdentifier getEventID()
+ eventID = pEventID;
+ return this;
+}
+
+/** Getter for {@link ElectromagneticEmissionPdu#eventID}*/
+public EventIdentifier getEventID()
{
return eventID;
-}
-
-/** Setter for {@link ElectromagneticEmissionPdu#stateUpdateIndicator}*/
-public ElectromagneticEmissionPdu setStateUpdateIndicator(ElectromagneticEmissionStateUpdateIndicator pStateUpdateIndicator)
+}
+
+/** Setter for {@link ElectromagneticEmissionPdu#stateUpdateIndicator}*/
+public ElectromagneticEmissionPdu setStateUpdateIndicator(ElectromagneticEmissionStateUpdateIndicator pStateUpdateIndicator)
{
- stateUpdateIndicator = pStateUpdateIndicator;
- return this;
-}
-
-/** Getter for {@link ElectromagneticEmissionPdu#stateUpdateIndicator}*/
-public ElectromagneticEmissionStateUpdateIndicator getStateUpdateIndicator()
+ stateUpdateIndicator = pStateUpdateIndicator;
+ return this;
+}
+
+/** Getter for {@link ElectromagneticEmissionPdu#stateUpdateIndicator}*/
+public ElectromagneticEmissionStateUpdateIndicator getStateUpdateIndicator()
{
return stateUpdateIndicator;
-}
-
-/** Setter for {@link ElectromagneticEmissionPdu#paddingForEmissionsPdu}*/
-public ElectromagneticEmissionPdu setPaddingForEmissionsPdu(short pPaddingForEmissionsPdu)
+}
+
+/** Setter for {@link ElectromagneticEmissionPdu#paddingForEmissionsPdu}*/
+public ElectromagneticEmissionPdu setPaddingForEmissionsPdu(short pPaddingForEmissionsPdu)
{
- paddingForEmissionsPdu = pPaddingForEmissionsPdu;
- return this;
-}
-
-/** Getter for {@link ElectromagneticEmissionPdu#paddingForEmissionsPdu}*/
-public short getPaddingForEmissionsPdu()
+ paddingForEmissionsPdu = pPaddingForEmissionsPdu;
+ return this;
+}
+
+/** Getter for {@link ElectromagneticEmissionPdu#paddingForEmissionsPdu}*/
+public short getPaddingForEmissionsPdu()
{
return paddingForEmissionsPdu;
-}
-
-/** Setter for {@link ElectromagneticEmissionPdu#systems}*/
-public ElectromagneticEmissionPdu setSystems(List<ElectronicEmitter> pSystems)
+}
+
+/** Setter for {@link ElectromagneticEmissionPdu#systems}*/
+public ElectromagneticEmissionPdu setSystems(List<ElectronicEmitter> pSystems)
{
- systems = pSystems;
- return this;
-}
-
-/** Getter for {@link ElectromagneticEmissionPdu#systems}*/
-public List<ElectronicEmitter> getSystems()
+ systems = pSystems;
+ return this;
+}
+
+/** Getter for {@link ElectromagneticEmissionPdu#systems}*/
+public List<ElectronicEmitter> getSystems()
{
return systems;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- emittingEntityID.marshal(dos);
- eventID.marshal(dos);
- stateUpdateIndicator.marshal(dos);
- dos.writeByte(systems.size());
- dos.writeShort(paddingForEmissionsPdu);
-
- for(int idx = 0; idx < systems.size(); idx++)
- {
- ElectronicEmitter aElectronicEmitter = systems.get(idx);
- aElectronicEmitter.marshal(dos);
- }
-
+ {
+ emittingEntityID.marshal(dos);
+ eventID.marshal(dos);
+ stateUpdateIndicator.marshal(dos);
+ dos.writeByte(systems.size());
+ dos.writeShort(paddingForEmissionsPdu);
+
+ for(int idx = 0; idx < systems.size(); idx++)
+ {
+ ElectronicEmitter aElectronicEmitter = systems.get(idx);
+ aElectronicEmitter.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += emittingEntityID.unmarshal(dis);
- uPosition += eventID.unmarshal(dis);
- stateUpdateIndicator = ElectromagneticEmissionStateUpdateIndicator.unmarshalEnum(dis);
- uPosition += stateUpdateIndicator.getMarshalledSize();
- numberOfSystems = (byte)dis.readUnsignedByte();
- uPosition += 1;
- paddingForEmissionsPdu = (short)dis.readUnsignedShort();
- uPosition += 2;
- for(int idx = 0; idx < numberOfSystems; idx++)
- {
- ElectronicEmitter anX = new ElectronicEmitter();
- uPosition += anX.unmarshal(dis);
- systems.add(anX);
- }
-
+ {
+ uPosition += emittingEntityID.unmarshal(dis);
+ uPosition += eventID.unmarshal(dis);
+ stateUpdateIndicator = ElectromagneticEmissionStateUpdateIndicator.unmarshalEnum(dis);
+ uPosition += stateUpdateIndicator.getMarshalledSize();
+ numberOfSystems = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ paddingForEmissionsPdu = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ for(int idx = 0; idx < numberOfSystems; idx++)
+ {
+ ElectronicEmitter anX = new ElectronicEmitter();
+ uPosition += anX.unmarshal(dis);
+ systems.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- emittingEntityID.marshal(buff);
- eventID.marshal(buff);
- stateUpdateIndicator.marshal(buff);
- buff.put( (byte)systems.size());
- buff.putShort( (short)paddingForEmissionsPdu);
-
- for(int idx = 0; idx < systems.size(); idx++)
- {
- ElectronicEmitter aElectronicEmitter = systems.get(idx);
- aElectronicEmitter.marshal(buff);
- }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ emittingEntityID.marshal(buff);
+ eventID.marshal(buff);
+ stateUpdateIndicator.marshal(buff);
+ buff.put( (byte)systems.size());
+ buff.putShort( (short)paddingForEmissionsPdu);
+
+ for(int idx = 0; idx < systems.size(); idx++)
+ {
+ ElectronicEmitter aElectronicEmitter = systems.get(idx);
+ aElectronicEmitter.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- emittingEntityID.unmarshal(buff);
- eventID.unmarshal(buff);
- stateUpdateIndicator = ElectromagneticEmissionStateUpdateIndicator.unmarshalEnum(buff);
- numberOfSystems = (byte)(buff.get() & 0xFF);
- paddingForEmissionsPdu = (short)(buff.getShort() & 0xFFFF);
- for(int idx = 0; idx < numberOfSystems; idx++)
- {
- ElectronicEmitter anX = new ElectronicEmitter();
- anX.unmarshal(buff);
- systems.add(anX);
- }
-
- return getMarshalledSize();
+
+ emittingEntityID.unmarshal(buff);
+ eventID.unmarshal(buff);
+ stateUpdateIndicator = ElectromagneticEmissionStateUpdateIndicator.unmarshalEnum(buff);
+ numberOfSystems = (byte)(buff.get() & 0xFF);
+ paddingForEmissionsPdu = (short)(buff.getShort() & 0xFFFF);
+ for(int idx = 0; idx < numberOfSystems; idx++)
+ {
+ ElectronicEmitter anX = new ElectronicEmitter();
+ anX.unmarshal(buff);
+ systems.add(anX);
+ }
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final ElectromagneticEmissionPdu rhs = (ElectromagneticEmissionPdu)obj;
-
- if( ! (emittingEntityID.equals( rhs.emittingEntityID) )) ivarsEqual = false;
- if( ! (eventID.equals( rhs.eventID) )) ivarsEqual = false;
- if( ! (stateUpdateIndicator == rhs.stateUpdateIndicator)) ivarsEqual = false;
- if( ! (paddingForEmissionsPdu == rhs.paddingForEmissionsPdu)) ivarsEqual = false;
-
- for(int idx = 0; idx < systems.size(); idx++)
- if( ! ( systems.get(idx).equals(rhs.systems.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final ElectromagneticEmissionPdu rhs = (ElectromagneticEmissionPdu)obj;
+
+ if( ! (emittingEntityID.equals( rhs.emittingEntityID) )) ivarsEqual = false;
+ if( ! (eventID.equals( rhs.eventID) )) ivarsEqual = false;
+ if( ! (stateUpdateIndicator == rhs.stateUpdateIndicator)) ivarsEqual = false;
+ if( ! (paddingForEmissionsPdu == rhs.paddingForEmissionsPdu)) ivarsEqual = false;
+
+ for(int idx = 0; idx < systems.size(); idx++)
+ if( ! ( systems.get(idx).equals(rhs.systems.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" emittingEntityID: ").append(emittingEntityID).append("\n");
- sb.append(" eventID: ").append(eventID).append("\n");
- sb.append(" stateUpdateIndicator: ").append(stateUpdateIndicator).append("\n");
- sb.append(" paddingForEmissionsPdu: ").append(paddingForEmissionsPdu).append("\n");
- sb.append(" systems: ").append("\n");
- systems.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" emittingEntityID: ").append(emittingEntityID).append("\n");
+ sb.append(" eventID: ").append(eventID).append("\n");
+ sb.append(" stateUpdateIndicator: ").append(stateUpdateIndicator).append("\n");
+ sb.append(" paddingForEmissionsPdu: ").append(paddingForEmissionsPdu).append("\n");
+ sb.append(" systems: ").append("\n");
+ systems.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ElectronicEmitter.java b/src-generated/edu/nps/moves/dis7/ElectronicEmitter.java
index 813b684b749c3faf13f2255d6f090305ed75e734..89b34e9649c51f4b0446f404a8db262d57b6e8f1 100644
--- a/src-generated/edu/nps/moves/dis7/ElectronicEmitter.java
+++ b/src-generated/edu/nps/moves/dis7/ElectronicEmitter.java
@@ -1,271 +1,271 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class ElectronicEmitter extends Object implements Serializable
-{
- /** this field shall specify the length of this emitter system's data in 32-bit words. */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class ElectronicEmitter extends Object implements Serializable
+{
+ /** this field shall specify the length of this emitter system's data in 32-bit words. */
protected byte systemDataLength;
-
- /** the number of beams being described in the current PDU for the emitter system being described. */
+
+ /** the number of beams being described in the current PDU for the emitter system being described. */
protected byte numberOfBeams;
-
- /** information about a particular emitter system and shall be represented by an Emitter System record (see 6.2.23). */
+
+ /** information about a particular emitter system and shall be represented by an Emitter System record (see 6.2.23). */
protected EmitterSystem emitterSystem = new EmitterSystem();
-
- /** the location of the antenna beam source with respect to the emitting entity's coordinate system. This location shall be the origin of the emitter coordinate system that shall have the same orientation as the entity coordinate system. This field shall be represented by an Entity Coordinate Vector record see 6.2.95 */
+
+ /** the location of the antenna beam source with respect to the emitting entity's coordinate system. This location shall be the origin of the emitter coordinate system that shall have the same orientation as the entity coordinate system. This field shall be represented by an Entity Coordinate Vector record see 6.2.95 */
protected Vector3Float location = new Vector3Float();
-
- /** Electronic emmission beams */
+
+ /** Electronic emmission beams */
protected List< EmitterBeam > beams = new ArrayList< EmitterBeam >();
-
-
-/** Constructor */
- public ElectronicEmitter()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public ElectronicEmitter()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 1; // systemDataLength
+ marshalSize += 1; // numberOfBeams
+ marshalSize += emitterSystem.getMarshalledSize();
+ marshalSize += location.getMarshalledSize();
+ for(int idx=0; idx < beams.size(); idx++)
+ {
+ EmitterBeam listElement = beams.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link ElectronicEmitter#systemDataLength}*/
+public ElectronicEmitter setSystemDataLength(byte pSystemDataLength)
{
- int marshalSize = 0;
-
- marshalSize += 1; // systemDataLength
- marshalSize += 1; // numberOfBeams
- marshalSize += emitterSystem.getMarshalledSize();
- marshalSize += location.getMarshalledSize();
- for(int idx=0; idx < beams.size(); idx++)
- {
- EmitterBeam listElement = beams.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link ElectronicEmitter#systemDataLength}*/
-public ElectronicEmitter setSystemDataLength(byte pSystemDataLength)
-{
- systemDataLength = pSystemDataLength;
- return this;
-}
-
-/** Getter for {@link ElectronicEmitter#systemDataLength}*/
-public byte getSystemDataLength()
+ systemDataLength = pSystemDataLength;
+ return this;
+}
+
+/** Getter for {@link ElectronicEmitter#systemDataLength}*/
+public byte getSystemDataLength()
{
return systemDataLength;
-}
-
-/** Setter for {@link ElectronicEmitter#emitterSystem}*/
-public ElectronicEmitter setEmitterSystem(EmitterSystem pEmitterSystem)
+}
+
+/** Setter for {@link ElectronicEmitter#emitterSystem}*/
+public ElectronicEmitter setEmitterSystem(EmitterSystem pEmitterSystem)
{
- emitterSystem = pEmitterSystem;
- return this;
-}
-
-/** Getter for {@link ElectronicEmitter#emitterSystem}*/
-public EmitterSystem getEmitterSystem()
+ emitterSystem = pEmitterSystem;
+ return this;
+}
+
+/** Getter for {@link ElectronicEmitter#emitterSystem}*/
+public EmitterSystem getEmitterSystem()
{
return emitterSystem;
-}
-
-/** Setter for {@link ElectronicEmitter#location}*/
-public ElectronicEmitter setLocation(Vector3Float pLocation)
+}
+
+/** Setter for {@link ElectronicEmitter#location}*/
+public ElectronicEmitter setLocation(Vector3Float pLocation)
{
- location = pLocation;
- return this;
-}
-
-/** Getter for {@link ElectronicEmitter#location}*/
-public Vector3Float getLocation()
+ location = pLocation;
+ return this;
+}
+
+/** Getter for {@link ElectronicEmitter#location}*/
+public Vector3Float getLocation()
{
return location;
-}
-
-/** Setter for {@link ElectronicEmitter#beams}*/
-public ElectronicEmitter setBeams(List<EmitterBeam> pBeams)
+}
+
+/** Setter for {@link ElectronicEmitter#beams}*/
+public ElectronicEmitter setBeams(List<EmitterBeam> pBeams)
{
- beams = pBeams;
- return this;
-}
-
-/** Getter for {@link ElectronicEmitter#beams}*/
-public List<EmitterBeam> getBeams()
+ beams = pBeams;
+ return this;
+}
+
+/** Getter for {@link ElectronicEmitter#beams}*/
+public List<EmitterBeam> getBeams()
{
return beams;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeByte(systemDataLength);
- dos.writeByte(beams.size());
- emitterSystem.marshal(dos);
- location.marshal(dos);
-
- for(int idx = 0; idx < beams.size(); idx++)
- {
- EmitterBeam aEmitterBeam = beams.get(idx);
- aEmitterBeam.marshal(dos);
- }
-
+ {
+ dos.writeByte(systemDataLength);
+ dos.writeByte(beams.size());
+ emitterSystem.marshal(dos);
+ location.marshal(dos);
+
+ for(int idx = 0; idx < beams.size(); idx++)
+ {
+ EmitterBeam aEmitterBeam = beams.get(idx);
+ aEmitterBeam.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- systemDataLength = (byte)dis.readUnsignedByte();
- uPosition += 1;
- numberOfBeams = (byte)dis.readUnsignedByte();
- uPosition += 1;
- uPosition += emitterSystem.unmarshal(dis);
- uPosition += location.unmarshal(dis);
- for(int idx = 0; idx < numberOfBeams; idx++)
- {
- EmitterBeam anX = new EmitterBeam();
- uPosition += anX.unmarshal(dis);
- beams.add(anX);
- }
-
+ {
+ systemDataLength = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ numberOfBeams = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ uPosition += emitterSystem.unmarshal(dis);
+ uPosition += location.unmarshal(dis);
+ for(int idx = 0; idx < numberOfBeams; idx++)
+ {
+ EmitterBeam anX = new EmitterBeam();
+ uPosition += anX.unmarshal(dis);
+ beams.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.put( (byte)systemDataLength);
- buff.put( (byte)beams.size());
- emitterSystem.marshal(buff);
- location.marshal(buff);
-
- for(int idx = 0; idx < beams.size(); idx++)
- {
- EmitterBeam aEmitterBeam = beams.get(idx);
- aEmitterBeam.marshal(buff);
- }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- systemDataLength = (byte)(buff.get() & 0xFF);
- numberOfBeams = (byte)(buff.get() & 0xFF);
- emitterSystem.unmarshal(buff);
- location.unmarshal(buff);
- for(int idx = 0; idx < numberOfBeams; idx++)
- {
- EmitterBeam anX = new EmitterBeam();
- anX.unmarshal(buff);
- beams.add(anX);
- }
-
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.put( (byte)systemDataLength);
+ buff.put( (byte)beams.size());
+ emitterSystem.marshal(buff);
+ location.marshal(buff);
+
+ for(int idx = 0; idx < beams.size(); idx++)
+ {
+ EmitterBeam aEmitterBeam = beams.get(idx);
+ aEmitterBeam.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ systemDataLength = (byte)(buff.get() & 0xFF);
+ numberOfBeams = (byte)(buff.get() & 0xFF);
+ emitterSystem.unmarshal(buff);
+ location.unmarshal(buff);
+ for(int idx = 0; idx < numberOfBeams; idx++)
+ {
+ EmitterBeam anX = new EmitterBeam();
+ anX.unmarshal(buff);
+ beams.add(anX);
+ }
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final ElectronicEmitter rhs = (ElectronicEmitter)obj;
-
- if( ! (systemDataLength == rhs.systemDataLength)) ivarsEqual = false;
- if( ! (emitterSystem.equals( rhs.emitterSystem) )) ivarsEqual = false;
- if( ! (location.equals( rhs.location) )) ivarsEqual = false;
-
- for(int idx = 0; idx < beams.size(); idx++)
- if( ! ( beams.get(idx).equals(rhs.beams.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final ElectronicEmitter rhs = (ElectronicEmitter)obj;
+
+ if( ! (systemDataLength == rhs.systemDataLength)) ivarsEqual = false;
+ if( ! (emitterSystem.equals( rhs.emitterSystem) )) ivarsEqual = false;
+ if( ! (location.equals( rhs.location) )) ivarsEqual = false;
+
+ for(int idx = 0; idx < beams.size(); idx++)
+ if( ! ( beams.get(idx).equals(rhs.beams.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" systemDataLength: ").append(systemDataLength).append("\n");
- sb.append(" emitterSystem: ").append(emitterSystem).append("\n");
- sb.append(" location: ").append(location).append("\n");
- sb.append(" beams: ").append("\n");
- beams.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" systemDataLength: ").append(systemDataLength).append("\n");
+ sb.append(" emitterSystem: ").append(emitterSystem).append("\n");
+ sb.append(" location: ").append(location).append("\n");
+ sb.append(" beams: ").append("\n");
+ beams.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EmitterBeam.java b/src-generated/edu/nps/moves/dis7/EmitterBeam.java
index 3c2adde19eabd15c1aef4f26096d094b2c2b5bff..dd452863e4d4ab5c75bbe294563d48ab5b44609b 100644
--- a/src-generated/edu/nps/moves/dis7/EmitterBeam.java
+++ b/src-generated/edu/nps/moves/dis7/EmitterBeam.java
@@ -1,404 +1,404 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class EmitterBeam extends Object implements Serializable
-{
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class EmitterBeam extends Object implements Serializable
+{
protected byte beamDataLength;
-
+
protected byte beamNumber;
-
+
protected short beamParameterIndex;
-
+
protected EEFundamentalParameterData fundamentalParameterData = new EEFundamentalParameterData();
-
+
protected BeamData beamData = new BeamData();
-
- /** uid 78 */
+
+ /** uid 78 */
protected ElectromagneticEmissionBeamFunction beamFunction = ElectromagneticEmissionBeamFunction.values()[0];
-
+
protected byte numberOfTargets;
-
- /** uid 79 */
+
+ /** uid 79 */
protected HighDensityTrackJam highDensityTrackJam = HighDensityTrackJam.values()[0];
-
+
protected BeamStatus beamStatus = new BeamStatus();
-
+
protected JammingTechnique jammingTechnique = new JammingTechnique();
-
+
protected List< TrackJamData > trackJamData = new ArrayList< TrackJamData >();
-
-
-/** Constructor */
- public EmitterBeam()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public EmitterBeam()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 1; // beamDataLength
+ marshalSize += 1; // beamNumber
+ marshalSize += 2; // beamParameterIndex
+ marshalSize += fundamentalParameterData.getMarshalledSize();
+ marshalSize += beamData.getMarshalledSize();
+ marshalSize += beamFunction.getMarshalledSize();
+ marshalSize += 1; // numberOfTargets
+ marshalSize += highDensityTrackJam.getMarshalledSize();
+ marshalSize += beamStatus.getMarshalledSize();
+ marshalSize += jammingTechnique.getMarshalledSize();
+ for(int idx=0; idx < trackJamData.size(); idx++)
+ {
+ TrackJamData listElement = trackJamData.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link EmitterBeam#beamDataLength}*/
+public EmitterBeam setBeamDataLength(byte pBeamDataLength)
{
- int marshalSize = 0;
-
- marshalSize += 1; // beamDataLength
- marshalSize += 1; // beamNumber
- marshalSize += 2; // beamParameterIndex
- marshalSize += fundamentalParameterData.getMarshalledSize();
- marshalSize += beamData.getMarshalledSize();
- marshalSize += beamFunction.getMarshalledSize();
- marshalSize += 1; // numberOfTargets
- marshalSize += highDensityTrackJam.getMarshalledSize();
- marshalSize += beamStatus.getMarshalledSize();
- marshalSize += jammingTechnique.getMarshalledSize();
- for(int idx=0; idx < trackJamData.size(); idx++)
- {
- TrackJamData listElement = trackJamData.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link EmitterBeam#beamDataLength}*/
-public EmitterBeam setBeamDataLength(byte pBeamDataLength)
-{
- beamDataLength = pBeamDataLength;
- return this;
-}
-
-/** Getter for {@link EmitterBeam#beamDataLength}*/
-public byte getBeamDataLength()
+ beamDataLength = pBeamDataLength;
+ return this;
+}
+
+/** Getter for {@link EmitterBeam#beamDataLength}*/
+public byte getBeamDataLength()
{
return beamDataLength;
-}
-
-/** Setter for {@link EmitterBeam#beamNumber}*/
-public EmitterBeam setBeamNumber(byte pBeamNumber)
+}
+
+/** Setter for {@link EmitterBeam#beamNumber}*/
+public EmitterBeam setBeamNumber(byte pBeamNumber)
{
- beamNumber = pBeamNumber;
- return this;
-}
-
-/** Getter for {@link EmitterBeam#beamNumber}*/
-public byte getBeamNumber()
+ beamNumber = pBeamNumber;
+ return this;
+}
+
+/** Getter for {@link EmitterBeam#beamNumber}*/
+public byte getBeamNumber()
{
return beamNumber;
-}
-
-/** Setter for {@link EmitterBeam#beamParameterIndex}*/
-public EmitterBeam setBeamParameterIndex(short pBeamParameterIndex)
+}
+
+/** Setter for {@link EmitterBeam#beamParameterIndex}*/
+public EmitterBeam setBeamParameterIndex(short pBeamParameterIndex)
{
- beamParameterIndex = pBeamParameterIndex;
- return this;
-}
-
-/** Getter for {@link EmitterBeam#beamParameterIndex}*/
-public short getBeamParameterIndex()
+ beamParameterIndex = pBeamParameterIndex;
+ return this;
+}
+
+/** Getter for {@link EmitterBeam#beamParameterIndex}*/
+public short getBeamParameterIndex()
{
return beamParameterIndex;
-}
-
-/** Setter for {@link EmitterBeam#fundamentalParameterData}*/
-public EmitterBeam setFundamentalParameterData(EEFundamentalParameterData pFundamentalParameterData)
+}
+
+/** Setter for {@link EmitterBeam#fundamentalParameterData}*/
+public EmitterBeam setFundamentalParameterData(EEFundamentalParameterData pFundamentalParameterData)
{
- fundamentalParameterData = pFundamentalParameterData;
- return this;
-}
-
-/** Getter for {@link EmitterBeam#fundamentalParameterData}*/
-public EEFundamentalParameterData getFundamentalParameterData()
+ fundamentalParameterData = pFundamentalParameterData;
+ return this;
+}
+
+/** Getter for {@link EmitterBeam#fundamentalParameterData}*/
+public EEFundamentalParameterData getFundamentalParameterData()
{
return fundamentalParameterData;
-}
-
-/** Setter for {@link EmitterBeam#beamData}*/
-public EmitterBeam setBeamData(BeamData pBeamData)
+}
+
+/** Setter for {@link EmitterBeam#beamData}*/
+public EmitterBeam setBeamData(BeamData pBeamData)
{
- beamData = pBeamData;
- return this;
-}
-
-/** Getter for {@link EmitterBeam#beamData}*/
-public BeamData getBeamData()
+ beamData = pBeamData;
+ return this;
+}
+
+/** Getter for {@link EmitterBeam#beamData}*/
+public BeamData getBeamData()
{
return beamData;
-}
-
-/** Setter for {@link EmitterBeam#beamFunction}*/
-public EmitterBeam setBeamFunction(ElectromagneticEmissionBeamFunction pBeamFunction)
+}
+
+/** Setter for {@link EmitterBeam#beamFunction}*/
+public EmitterBeam setBeamFunction(ElectromagneticEmissionBeamFunction pBeamFunction)
{
- beamFunction = pBeamFunction;
- return this;
-}
-
-/** Getter for {@link EmitterBeam#beamFunction}*/
-public ElectromagneticEmissionBeamFunction getBeamFunction()
+ beamFunction = pBeamFunction;
+ return this;
+}
+
+/** Getter for {@link EmitterBeam#beamFunction}*/
+public ElectromagneticEmissionBeamFunction getBeamFunction()
{
return beamFunction;
-}
-
-/** Setter for {@link EmitterBeam#highDensityTrackJam}*/
-public EmitterBeam setHighDensityTrackJam(HighDensityTrackJam pHighDensityTrackJam)
+}
+
+/** Setter for {@link EmitterBeam#highDensityTrackJam}*/
+public EmitterBeam setHighDensityTrackJam(HighDensityTrackJam pHighDensityTrackJam)
{
- highDensityTrackJam = pHighDensityTrackJam;
- return this;
-}
-
-/** Getter for {@link EmitterBeam#highDensityTrackJam}*/
-public HighDensityTrackJam getHighDensityTrackJam()
+ highDensityTrackJam = pHighDensityTrackJam;
+ return this;
+}
+
+/** Getter for {@link EmitterBeam#highDensityTrackJam}*/
+public HighDensityTrackJam getHighDensityTrackJam()
{
return highDensityTrackJam;
-}
-
-/** Setter for {@link EmitterBeam#beamStatus}*/
-public EmitterBeam setBeamStatus(BeamStatus pBeamStatus)
+}
+
+/** Setter for {@link EmitterBeam#beamStatus}*/
+public EmitterBeam setBeamStatus(BeamStatus pBeamStatus)
{
- beamStatus = pBeamStatus;
- return this;
-}
-
-/** Getter for {@link EmitterBeam#beamStatus}*/
-public BeamStatus getBeamStatus()
+ beamStatus = pBeamStatus;
+ return this;
+}
+
+/** Getter for {@link EmitterBeam#beamStatus}*/
+public BeamStatus getBeamStatus()
{
return beamStatus;
-}
-
-/** Setter for {@link EmitterBeam#jammingTechnique}*/
-public EmitterBeam setJammingTechnique(JammingTechnique pJammingTechnique)
+}
+
+/** Setter for {@link EmitterBeam#jammingTechnique}*/
+public EmitterBeam setJammingTechnique(JammingTechnique pJammingTechnique)
{
- jammingTechnique = pJammingTechnique;
- return this;
-}
-
-/** Getter for {@link EmitterBeam#jammingTechnique}*/
-public JammingTechnique getJammingTechnique()
+ jammingTechnique = pJammingTechnique;
+ return this;
+}
+
+/** Getter for {@link EmitterBeam#jammingTechnique}*/
+public JammingTechnique getJammingTechnique()
{
return jammingTechnique;
-}
-
-/** Setter for {@link EmitterBeam#trackJamData}*/
-public EmitterBeam setTrackJamData(List<TrackJamData> pTrackJamData)
+}
+
+/** Setter for {@link EmitterBeam#trackJamData}*/
+public EmitterBeam setTrackJamData(List<TrackJamData> pTrackJamData)
{
- trackJamData = pTrackJamData;
- return this;
-}
-
-/** Getter for {@link EmitterBeam#trackJamData}*/
-public List<TrackJamData> getTrackJamData()
+ trackJamData = pTrackJamData;
+ return this;
+}
+
+/** Getter for {@link EmitterBeam#trackJamData}*/
+public List<TrackJamData> getTrackJamData()
{
return trackJamData;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeByte(beamDataLength);
- dos.writeByte(beamNumber);
- dos.writeShort(beamParameterIndex);
- fundamentalParameterData.marshal(dos);
- beamData.marshal(dos);
- beamFunction.marshal(dos);
- dos.writeByte(trackJamData.size());
- highDensityTrackJam.marshal(dos);
- beamStatus.marshal(dos);
- jammingTechnique.marshal(dos);
-
- for(int idx = 0; idx < trackJamData.size(); idx++)
- {
- TrackJamData aTrackJamData = trackJamData.get(idx);
- aTrackJamData.marshal(dos);
- }
-
+ {
+ dos.writeByte(beamDataLength);
+ dos.writeByte(beamNumber);
+ dos.writeShort(beamParameterIndex);
+ fundamentalParameterData.marshal(dos);
+ beamData.marshal(dos);
+ beamFunction.marshal(dos);
+ dos.writeByte(trackJamData.size());
+ highDensityTrackJam.marshal(dos);
+ beamStatus.marshal(dos);
+ jammingTechnique.marshal(dos);
+
+ for(int idx = 0; idx < trackJamData.size(); idx++)
+ {
+ TrackJamData aTrackJamData = trackJamData.get(idx);
+ aTrackJamData.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- beamDataLength = (byte)dis.readUnsignedByte();
- uPosition += 1;
- beamNumber = (byte)dis.readUnsignedByte();
- uPosition += 1;
- beamParameterIndex = (short)dis.readUnsignedShort();
- uPosition += 2;
- uPosition += fundamentalParameterData.unmarshal(dis);
- uPosition += beamData.unmarshal(dis);
- beamFunction = ElectromagneticEmissionBeamFunction.unmarshalEnum(dis);
- uPosition += beamFunction.getMarshalledSize();
- numberOfTargets = (byte)dis.readUnsignedByte();
- uPosition += 1;
- highDensityTrackJam = HighDensityTrackJam.unmarshalEnum(dis);
- uPosition += highDensityTrackJam.getMarshalledSize();
- uPosition += beamStatus.unmarshal(dis);
- uPosition += jammingTechnique.unmarshal(dis);
- for(int idx = 0; idx < numberOfTargets; idx++)
- {
- TrackJamData anX = new TrackJamData();
- uPosition += anX.unmarshal(dis);
- trackJamData.add(anX);
- }
-
+ {
+ beamDataLength = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ beamNumber = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ beamParameterIndex = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ uPosition += fundamentalParameterData.unmarshal(dis);
+ uPosition += beamData.unmarshal(dis);
+ beamFunction = ElectromagneticEmissionBeamFunction.unmarshalEnum(dis);
+ uPosition += beamFunction.getMarshalledSize();
+ numberOfTargets = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ highDensityTrackJam = HighDensityTrackJam.unmarshalEnum(dis);
+ uPosition += highDensityTrackJam.getMarshalledSize();
+ uPosition += beamStatus.unmarshal(dis);
+ uPosition += jammingTechnique.unmarshal(dis);
+ for(int idx = 0; idx < numberOfTargets; idx++)
+ {
+ TrackJamData anX = new TrackJamData();
+ uPosition += anX.unmarshal(dis);
+ trackJamData.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.put( (byte)beamDataLength);
- buff.put( (byte)beamNumber);
- buff.putShort( (short)beamParameterIndex);
- fundamentalParameterData.marshal(buff);
- beamData.marshal(buff);
- beamFunction.marshal(buff);
- buff.put( (byte)trackJamData.size());
- highDensityTrackJam.marshal(buff);
- beamStatus.marshal(buff);
- jammingTechnique.marshal(buff);
-
- for(int idx = 0; idx < trackJamData.size(); idx++)
- {
- TrackJamData aTrackJamData = trackJamData.get(idx);
- aTrackJamData.marshal(buff);
- }
-
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- beamDataLength = (byte)(buff.get() & 0xFF);
- beamNumber = (byte)(buff.get() & 0xFF);
- beamParameterIndex = (short)(buff.getShort() & 0xFFFF);
- fundamentalParameterData.unmarshal(buff);
- beamData.unmarshal(buff);
- beamFunction = ElectromagneticEmissionBeamFunction.unmarshalEnum(buff);
- numberOfTargets = (byte)(buff.get() & 0xFF);
- highDensityTrackJam = HighDensityTrackJam.unmarshalEnum(buff);
- beamStatus.unmarshal(buff);
- jammingTechnique.unmarshal(buff);
- for(int idx = 0; idx < numberOfTargets; idx++)
- {
- TrackJamData anX = new TrackJamData();
- anX.unmarshal(buff);
- trackJamData.add(anX);
- }
-
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.put( (byte)beamDataLength);
+ buff.put( (byte)beamNumber);
+ buff.putShort( (short)beamParameterIndex);
+ fundamentalParameterData.marshal(buff);
+ beamData.marshal(buff);
+ beamFunction.marshal(buff);
+ buff.put( (byte)trackJamData.size());
+ highDensityTrackJam.marshal(buff);
+ beamStatus.marshal(buff);
+ jammingTechnique.marshal(buff);
+
+ for(int idx = 0; idx < trackJamData.size(); idx++)
+ {
+ TrackJamData aTrackJamData = trackJamData.get(idx);
+ aTrackJamData.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ beamDataLength = (byte)(buff.get() & 0xFF);
+ beamNumber = (byte)(buff.get() & 0xFF);
+ beamParameterIndex = (short)(buff.getShort() & 0xFFFF);
+ fundamentalParameterData.unmarshal(buff);
+ beamData.unmarshal(buff);
+ beamFunction = ElectromagneticEmissionBeamFunction.unmarshalEnum(buff);
+ numberOfTargets = (byte)(buff.get() & 0xFF);
+ highDensityTrackJam = HighDensityTrackJam.unmarshalEnum(buff);
+ beamStatus.unmarshal(buff);
+ jammingTechnique.unmarshal(buff);
+ for(int idx = 0; idx < numberOfTargets; idx++)
+ {
+ TrackJamData anX = new TrackJamData();
+ anX.unmarshal(buff);
+ trackJamData.add(anX);
+ }
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final EmitterBeam rhs = (EmitterBeam)obj;
-
- if( ! (beamDataLength == rhs.beamDataLength)) ivarsEqual = false;
- if( ! (beamNumber == rhs.beamNumber)) ivarsEqual = false;
- if( ! (beamParameterIndex == rhs.beamParameterIndex)) ivarsEqual = false;
- if( ! (fundamentalParameterData.equals( rhs.fundamentalParameterData) )) ivarsEqual = false;
- if( ! (beamData.equals( rhs.beamData) )) ivarsEqual = false;
- if( ! (beamFunction == rhs.beamFunction)) ivarsEqual = false;
- if( ! (highDensityTrackJam == rhs.highDensityTrackJam)) ivarsEqual = false;
- if( ! (beamStatus.equals( rhs.beamStatus) )) ivarsEqual = false;
- if( ! (jammingTechnique.equals( rhs.jammingTechnique) )) ivarsEqual = false;
-
- for(int idx = 0; idx < trackJamData.size(); idx++)
- if( ! ( trackJamData.get(idx).equals(rhs.trackJamData.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final EmitterBeam rhs = (EmitterBeam)obj;
+
+ if( ! (beamDataLength == rhs.beamDataLength)) ivarsEqual = false;
+ if( ! (beamNumber == rhs.beamNumber)) ivarsEqual = false;
+ if( ! (beamParameterIndex == rhs.beamParameterIndex)) ivarsEqual = false;
+ if( ! (fundamentalParameterData.equals( rhs.fundamentalParameterData) )) ivarsEqual = false;
+ if( ! (beamData.equals( rhs.beamData) )) ivarsEqual = false;
+ if( ! (beamFunction == rhs.beamFunction)) ivarsEqual = false;
+ if( ! (highDensityTrackJam == rhs.highDensityTrackJam)) ivarsEqual = false;
+ if( ! (beamStatus.equals( rhs.beamStatus) )) ivarsEqual = false;
+ if( ! (jammingTechnique.equals( rhs.jammingTechnique) )) ivarsEqual = false;
+
+ for(int idx = 0; idx < trackJamData.size(); idx++)
+ if( ! ( trackJamData.get(idx).equals(rhs.trackJamData.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" beamDataLength: ").append(beamDataLength).append("\n");
- sb.append(" beamNumber: ").append(beamNumber).append("\n");
- sb.append(" beamParameterIndex: ").append(beamParameterIndex).append("\n");
- sb.append(" fundamentalParameterData: ").append(fundamentalParameterData).append("\n");
- sb.append(" beamData: ").append(beamData).append("\n");
- sb.append(" beamFunction: ").append(beamFunction).append("\n");
- sb.append(" highDensityTrackJam: ").append(highDensityTrackJam).append("\n");
- sb.append(" beamStatus: ").append(beamStatus).append("\n");
- sb.append(" jammingTechnique: ").append(jammingTechnique).append("\n");
- sb.append(" trackJamData: ").append("\n");
- trackJamData.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" beamDataLength: ").append(beamDataLength).append("\n");
+ sb.append(" beamNumber: ").append(beamNumber).append("\n");
+ sb.append(" beamParameterIndex: ").append(beamParameterIndex).append("\n");
+ sb.append(" fundamentalParameterData: ").append(fundamentalParameterData).append("\n");
+ sb.append(" beamData: ").append(beamData).append("\n");
+ sb.append(" beamFunction: ").append(beamFunction).append("\n");
+ sb.append(" highDensityTrackJam: ").append(highDensityTrackJam).append("\n");
+ sb.append(" beamStatus: ").append(beamStatus).append("\n");
+ sb.append(" jammingTechnique: ").append(jammingTechnique).append("\n");
+ sb.append(" trackJamData: ").append("\n");
+ trackJamData.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EmitterSystem.java b/src-generated/edu/nps/moves/dis7/EmitterSystem.java
index 528c336a158492004c972817b24e9e6f904b2566..5ff47980e1815ac3d808fdbd80cbad4f1ed0b3bc 100644
--- a/src-generated/edu/nps/moves/dis7/EmitterSystem.java
+++ b/src-generated/edu/nps/moves/dis7/EmitterSystem.java
@@ -1,210 +1,210 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * This field shall specify information about a particular emitter system. Section 6.2.23.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class EmitterSystem extends Object implements Serializable
-{
- /** Name of the emitter, 16 bit enumeration uid 75 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * This field shall specify information about a particular emitter system. Section 6.2.23.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class EmitterSystem extends Object implements Serializable
+{
+ /** Name of the emitter, 16 bit enumeration uid 75 */
protected EmitterName emitterName = EmitterName.values()[0];
-
- /** function of the emitter, 8 bit enumeration uid 76 */
+
+ /** function of the emitter, 8 bit enumeration uid 76 */
protected EmitterSystemFunction emitterFunction = EmitterSystemFunction.values()[0];
-
- /** emitter ID, 8 bit enumeration */
+
+ /** emitter ID, 8 bit enumeration */
protected byte emitterIDNumber;
-
-
-/** Constructor */
- public EmitterSystem()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += emitterName.getMarshalledSize();
- marshalSize += emitterFunction.getMarshalledSize();
- marshalSize += 1; // emitterIDNumber
-
- return marshalSize;
-}
-
-
-/** Setter for {@link EmitterSystem#emitterName}*/
-public EmitterSystem setEmitterName(EmitterName pEmitterName)
+
+
+/** Constructor */
+ public EmitterSystem()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += emitterName.getMarshalledSize();
+ marshalSize += emitterFunction.getMarshalledSize();
+ marshalSize += 1; // emitterIDNumber
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link EmitterSystem#emitterName}*/
+public EmitterSystem setEmitterName(EmitterName pEmitterName)
{
- emitterName = pEmitterName;
- return this;
-}
-
-/** Getter for {@link EmitterSystem#emitterName}*/
-public EmitterName getEmitterName()
+ emitterName = pEmitterName;
+ return this;
+}
+
+/** Getter for {@link EmitterSystem#emitterName}*/
+public EmitterName getEmitterName()
{
return emitterName;
-}
-
-/** Setter for {@link EmitterSystem#emitterFunction}*/
-public EmitterSystem setEmitterFunction(EmitterSystemFunction pEmitterFunction)
+}
+
+/** Setter for {@link EmitterSystem#emitterFunction}*/
+public EmitterSystem setEmitterFunction(EmitterSystemFunction pEmitterFunction)
{
- emitterFunction = pEmitterFunction;
- return this;
-}
-
-/** Getter for {@link EmitterSystem#emitterFunction}*/
-public EmitterSystemFunction getEmitterFunction()
+ emitterFunction = pEmitterFunction;
+ return this;
+}
+
+/** Getter for {@link EmitterSystem#emitterFunction}*/
+public EmitterSystemFunction getEmitterFunction()
{
return emitterFunction;
-}
-
-/** Setter for {@link EmitterSystem#emitterIDNumber}*/
-public EmitterSystem setEmitterIDNumber(byte pEmitterIDNumber)
+}
+
+/** Setter for {@link EmitterSystem#emitterIDNumber}*/
+public EmitterSystem setEmitterIDNumber(byte pEmitterIDNumber)
{
- emitterIDNumber = pEmitterIDNumber;
- return this;
-}
-
-/** Getter for {@link EmitterSystem#emitterIDNumber}*/
-public byte getEmitterIDNumber()
+ emitterIDNumber = pEmitterIDNumber;
+ return this;
+}
+
+/** Getter for {@link EmitterSystem#emitterIDNumber}*/
+public byte getEmitterIDNumber()
{
return emitterIDNumber;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- emitterName.marshal(dos);
- emitterFunction.marshal(dos);
- dos.writeByte(emitterIDNumber);
+ {
+ emitterName.marshal(dos);
+ emitterFunction.marshal(dos);
+ dos.writeByte(emitterIDNumber);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- emitterName = EmitterName.unmarshalEnum(dis);
- uPosition += emitterName.getMarshalledSize();
- emitterFunction = EmitterSystemFunction.unmarshalEnum(dis);
- uPosition += emitterFunction.getMarshalledSize();
- emitterIDNumber = (byte)dis.readUnsignedByte();
- uPosition += 1;
+ {
+ emitterName = EmitterName.unmarshalEnum(dis);
+ uPosition += emitterName.getMarshalledSize();
+ emitterFunction = EmitterSystemFunction.unmarshalEnum(dis);
+ uPosition += emitterFunction.getMarshalledSize();
+ emitterIDNumber = (byte)dis.readUnsignedByte();
+ uPosition += 1;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- emitterName.marshal(buff);
- emitterFunction.marshal(buff);
- buff.put( (byte)emitterIDNumber);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- emitterName = EmitterName.unmarshalEnum(buff);
- emitterFunction = EmitterSystemFunction.unmarshalEnum(buff);
- emitterIDNumber = (byte)(buff.get() & 0xFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ emitterName.marshal(buff);
+ emitterFunction.marshal(buff);
+ buff.put( (byte)emitterIDNumber);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ emitterName = EmitterName.unmarshalEnum(buff);
+ emitterFunction = EmitterSystemFunction.unmarshalEnum(buff);
+ emitterIDNumber = (byte)(buff.get() & 0xFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final EmitterSystem rhs = (EmitterSystem)obj;
-
- if( ! (emitterName == rhs.emitterName)) ivarsEqual = false;
- if( ! (emitterFunction == rhs.emitterFunction)) ivarsEqual = false;
- if( ! (emitterIDNumber == rhs.emitterIDNumber)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final EmitterSystem rhs = (EmitterSystem)obj;
+
+ if( ! (emitterName == rhs.emitterName)) ivarsEqual = false;
+ if( ! (emitterFunction == rhs.emitterFunction)) ivarsEqual = false;
+ if( ! (emitterIDNumber == rhs.emitterIDNumber)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" emitterName: ").append(emitterName).append("\n");
- sb.append(" emitterFunction: ").append(emitterFunction).append("\n");
- sb.append(" emitterIDNumber: ").append(emitterIDNumber).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" emitterName: ").append(emitterName).append("\n");
+ sb.append(" emitterFunction: ").append(emitterFunction).append("\n");
+ sb.append(" emitterIDNumber: ").append(emitterIDNumber).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EngineFuel.java b/src-generated/edu/nps/moves/dis7/EngineFuel.java
index 2240ab85acad74068b02674aeb28677e3f0ec4d6..10f5471056c8b0898a5c1820ef59bd7277fbab9c 100644
--- a/src-generated/edu/nps/moves/dis7/EngineFuel.java
+++ b/src-generated/edu/nps/moves/dis7/EngineFuel.java
@@ -1,258 +1,258 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Information about an entity's engine fuel. Section 6.2.24.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class EngineFuel extends Object implements Serializable
-{
- /** Fuel quantity, units specified by next field */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Information about an entity's engine fuel. Section 6.2.24.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class EngineFuel extends Object implements Serializable
+{
+ /** Fuel quantity, units specified by next field */
protected int fuelQuantity;
-
- /** Units in which the fuel is measured uid 328 */
+
+ /** Units in which the fuel is measured uid 328 */
protected FuelMeasurementUnits fuelMeasurementUnits = FuelMeasurementUnits.values()[0];
-
- /** Type of fuel uid 413 */
+
+ /** Type of fuel uid 413 */
protected SupplyFuelType fuelType = SupplyFuelType.values()[0];
-
- /** Location of fuel as related to entity. See section 14 of EBV document uid 329 */
+
+ /** Location of fuel as related to entity. See section 14 of EBV document uid 329 */
protected FuelLocation fuelLocation = FuelLocation.values()[0];
-
- /** padding */
+
+ /** padding */
protected byte padding = (byte)0;
-
-
-/** Constructor */
- public EngineFuel()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public EngineFuel()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 4; // fuelQuantity
+ marshalSize += fuelMeasurementUnits.getMarshalledSize();
+ marshalSize += fuelType.getMarshalledSize();
+ marshalSize += fuelLocation.getMarshalledSize();
+ marshalSize += 1; // padding
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link EngineFuel#fuelQuantity}*/
+public EngineFuel setFuelQuantity(int pFuelQuantity)
{
- int marshalSize = 0;
-
- marshalSize += 4; // fuelQuantity
- marshalSize += fuelMeasurementUnits.getMarshalledSize();
- marshalSize += fuelType.getMarshalledSize();
- marshalSize += fuelLocation.getMarshalledSize();
- marshalSize += 1; // padding
-
- return marshalSize;
-}
-
-
-/** Setter for {@link EngineFuel#fuelQuantity}*/
-public EngineFuel setFuelQuantity(int pFuelQuantity)
-{
- fuelQuantity = pFuelQuantity;
- return this;
-}
-
-/** Getter for {@link EngineFuel#fuelQuantity}*/
-public int getFuelQuantity()
+ fuelQuantity = pFuelQuantity;
+ return this;
+}
+
+/** Getter for {@link EngineFuel#fuelQuantity}*/
+public int getFuelQuantity()
{
return fuelQuantity;
-}
-
-/** Setter for {@link EngineFuel#fuelMeasurementUnits}*/
-public EngineFuel setFuelMeasurementUnits(FuelMeasurementUnits pFuelMeasurementUnits)
+}
+
+/** Setter for {@link EngineFuel#fuelMeasurementUnits}*/
+public EngineFuel setFuelMeasurementUnits(FuelMeasurementUnits pFuelMeasurementUnits)
{
- fuelMeasurementUnits = pFuelMeasurementUnits;
- return this;
-}
-
-/** Getter for {@link EngineFuel#fuelMeasurementUnits}*/
-public FuelMeasurementUnits getFuelMeasurementUnits()
+ fuelMeasurementUnits = pFuelMeasurementUnits;
+ return this;
+}
+
+/** Getter for {@link EngineFuel#fuelMeasurementUnits}*/
+public FuelMeasurementUnits getFuelMeasurementUnits()
{
return fuelMeasurementUnits;
-}
-
-/** Setter for {@link EngineFuel#fuelType}*/
-public EngineFuel setFuelType(SupplyFuelType pFuelType)
+}
+
+/** Setter for {@link EngineFuel#fuelType}*/
+public EngineFuel setFuelType(SupplyFuelType pFuelType)
{
- fuelType = pFuelType;
- return this;
-}
-
-/** Getter for {@link EngineFuel#fuelType}*/
-public SupplyFuelType getFuelType()
+ fuelType = pFuelType;
+ return this;
+}
+
+/** Getter for {@link EngineFuel#fuelType}*/
+public SupplyFuelType getFuelType()
{
return fuelType;
-}
-
-/** Setter for {@link EngineFuel#fuelLocation}*/
-public EngineFuel setFuelLocation(FuelLocation pFuelLocation)
+}
+
+/** Setter for {@link EngineFuel#fuelLocation}*/
+public EngineFuel setFuelLocation(FuelLocation pFuelLocation)
{
- fuelLocation = pFuelLocation;
- return this;
-}
-
-/** Getter for {@link EngineFuel#fuelLocation}*/
-public FuelLocation getFuelLocation()
+ fuelLocation = pFuelLocation;
+ return this;
+}
+
+/** Getter for {@link EngineFuel#fuelLocation}*/
+public FuelLocation getFuelLocation()
{
return fuelLocation;
-}
-
-/** Setter for {@link EngineFuel#padding}*/
-public EngineFuel setPadding(byte pPadding)
+}
+
+/** Setter for {@link EngineFuel#padding}*/
+public EngineFuel setPadding(byte pPadding)
{
- padding = pPadding;
- return this;
-}
-
-/** Getter for {@link EngineFuel#padding}*/
-public byte getPadding()
+ padding = pPadding;
+ return this;
+}
+
+/** Getter for {@link EngineFuel#padding}*/
+public byte getPadding()
{
return padding;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeInt(fuelQuantity);
- fuelMeasurementUnits.marshal(dos);
- fuelType.marshal(dos);
- fuelLocation.marshal(dos);
- dos.writeByte(padding);
+ {
+ dos.writeInt(fuelQuantity);
+ fuelMeasurementUnits.marshal(dos);
+ fuelType.marshal(dos);
+ fuelLocation.marshal(dos);
+ dos.writeByte(padding);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- fuelQuantity = dis.readInt();
- uPosition += 4;
- fuelMeasurementUnits = FuelMeasurementUnits.unmarshalEnum(dis);
- uPosition += fuelMeasurementUnits.getMarshalledSize();
- fuelType = SupplyFuelType.unmarshalEnum(dis);
- uPosition += fuelType.getMarshalledSize();
- fuelLocation = FuelLocation.unmarshalEnum(dis);
- uPosition += fuelLocation.getMarshalledSize();
- padding = (byte)dis.readUnsignedByte();
- uPosition += 1;
+ {
+ fuelQuantity = dis.readInt();
+ uPosition += 4;
+ fuelMeasurementUnits = FuelMeasurementUnits.unmarshalEnum(dis);
+ uPosition += fuelMeasurementUnits.getMarshalledSize();
+ fuelType = SupplyFuelType.unmarshalEnum(dis);
+ uPosition += fuelType.getMarshalledSize();
+ fuelLocation = FuelLocation.unmarshalEnum(dis);
+ uPosition += fuelLocation.getMarshalledSize();
+ padding = (byte)dis.readUnsignedByte();
+ uPosition += 1;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putInt( (int)fuelQuantity);
- fuelMeasurementUnits.marshal(buff);
- fuelType.marshal(buff);
- fuelLocation.marshal(buff);
- buff.put( (byte)padding);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- fuelQuantity = buff.getInt();
- fuelMeasurementUnits = FuelMeasurementUnits.unmarshalEnum(buff);
- fuelType = SupplyFuelType.unmarshalEnum(buff);
- fuelLocation = FuelLocation.unmarshalEnum(buff);
- padding = (byte)(buff.get() & 0xFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putInt( (int)fuelQuantity);
+ fuelMeasurementUnits.marshal(buff);
+ fuelType.marshal(buff);
+ fuelLocation.marshal(buff);
+ buff.put( (byte)padding);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ fuelQuantity = buff.getInt();
+ fuelMeasurementUnits = FuelMeasurementUnits.unmarshalEnum(buff);
+ fuelType = SupplyFuelType.unmarshalEnum(buff);
+ fuelLocation = FuelLocation.unmarshalEnum(buff);
+ padding = (byte)(buff.get() & 0xFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final EngineFuel rhs = (EngineFuel)obj;
-
- if( ! (fuelQuantity == rhs.fuelQuantity)) ivarsEqual = false;
- if( ! (fuelMeasurementUnits == rhs.fuelMeasurementUnits)) ivarsEqual = false;
- if( ! (fuelType == rhs.fuelType)) ivarsEqual = false;
- if( ! (fuelLocation == rhs.fuelLocation)) ivarsEqual = false;
- if( ! (padding == rhs.padding)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final EngineFuel rhs = (EngineFuel)obj;
+
+ if( ! (fuelQuantity == rhs.fuelQuantity)) ivarsEqual = false;
+ if( ! (fuelMeasurementUnits == rhs.fuelMeasurementUnits)) ivarsEqual = false;
+ if( ! (fuelType == rhs.fuelType)) ivarsEqual = false;
+ if( ! (fuelLocation == rhs.fuelLocation)) ivarsEqual = false;
+ if( ! (padding == rhs.padding)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" fuelQuantity: ").append(fuelQuantity).append("\n");
- sb.append(" fuelMeasurementUnits: ").append(fuelMeasurementUnits).append("\n");
- sb.append(" fuelType: ").append(fuelType).append("\n");
- sb.append(" fuelLocation: ").append(fuelLocation).append("\n");
- sb.append(" padding: ").append(padding).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" fuelQuantity: ").append(fuelQuantity).append("\n");
+ sb.append(" fuelMeasurementUnits: ").append(fuelMeasurementUnits).append("\n");
+ sb.append(" fuelType: ").append(fuelType).append("\n");
+ sb.append(" fuelLocation: ").append(fuelLocation).append("\n");
+ sb.append(" padding: ").append(padding).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EngineFuelReload.java b/src-generated/edu/nps/moves/dis7/EngineFuelReload.java
index 53c98e27873b66bc7d7179599a1f32355819cd7b..5f184e2c36a1a07c955d4645172e8cc99685085a 100644
--- a/src-generated/edu/nps/moves/dis7/EngineFuelReload.java
+++ b/src-generated/edu/nps/moves/dis7/EngineFuelReload.java
@@ -1,330 +1,330 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * For each type or location of engine fuell, this record specifies the type, location, fuel measurement units, and reload quantity and maximum quantity. Section 6.2.25.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class EngineFuelReload extends Object implements Serializable
-{
- /** standard quantity of fuel loaded */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * For each type or location of engine fuell, this record specifies the type, location, fuel measurement units, and reload quantity and maximum quantity. Section 6.2.25.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class EngineFuelReload extends Object implements Serializable
+{
+ /** standard quantity of fuel loaded */
protected int standardQuantity;
-
- /** maximum quantity of fuel loaded */
+
+ /** maximum quantity of fuel loaded */
protected int maximumQuantity;
-
- /** seconds normally required to to reload standard qty */
+
+ /** seconds normally required to to reload standard qty */
protected int standardQuantityReloadTime;
-
- /** seconds normally required to to reload maximum qty */
+
+ /** seconds normally required to to reload maximum qty */
protected int maximumQuantityReloadTime;
-
- /** Units of measure uid 328 */
+
+ /** Units of measure uid 328 */
protected FuelMeasurementUnits fuelMeasurmentUnits = FuelMeasurementUnits.values()[0];
-
- /** uid 413 */
+
+ /** uid 413 */
protected SupplyFuelType fuelType = SupplyFuelType.values()[0];
-
- /** fuel location as related to the entity uid 329 */
+
+ /** fuel location as related to the entity uid 329 */
protected FuelLocation fuelLocation = FuelLocation.values()[0];
-
- /** padding */
+
+ /** padding */
protected byte padding = (byte)0;
-
-
-/** Constructor */
- public EngineFuelReload()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public EngineFuelReload()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 4; // standardQuantity
+ marshalSize += 4; // maximumQuantity
+ marshalSize += 4; // standardQuantityReloadTime
+ marshalSize += 4; // maximumQuantityReloadTime
+ marshalSize += fuelMeasurmentUnits.getMarshalledSize();
+ marshalSize += fuelType.getMarshalledSize();
+ marshalSize += fuelLocation.getMarshalledSize();
+ marshalSize += 1; // padding
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link EngineFuelReload#standardQuantity}*/
+public EngineFuelReload setStandardQuantity(int pStandardQuantity)
{
- int marshalSize = 0;
-
- marshalSize += 4; // standardQuantity
- marshalSize += 4; // maximumQuantity
- marshalSize += 4; // standardQuantityReloadTime
- marshalSize += 4; // maximumQuantityReloadTime
- marshalSize += fuelMeasurmentUnits.getMarshalledSize();
- marshalSize += fuelType.getMarshalledSize();
- marshalSize += fuelLocation.getMarshalledSize();
- marshalSize += 1; // padding
-
- return marshalSize;
-}
-
-
-/** Setter for {@link EngineFuelReload#standardQuantity}*/
-public EngineFuelReload setStandardQuantity(int pStandardQuantity)
-{
- standardQuantity = pStandardQuantity;
- return this;
-}
-
-/** Getter for {@link EngineFuelReload#standardQuantity}*/
-public int getStandardQuantity()
+ standardQuantity = pStandardQuantity;
+ return this;
+}
+
+/** Getter for {@link EngineFuelReload#standardQuantity}*/
+public int getStandardQuantity()
{
return standardQuantity;
-}
-
-/** Setter for {@link EngineFuelReload#maximumQuantity}*/
-public EngineFuelReload setMaximumQuantity(int pMaximumQuantity)
+}
+
+/** Setter for {@link EngineFuelReload#maximumQuantity}*/
+public EngineFuelReload setMaximumQuantity(int pMaximumQuantity)
{
- maximumQuantity = pMaximumQuantity;
- return this;
-}
-
-/** Getter for {@link EngineFuelReload#maximumQuantity}*/
-public int getMaximumQuantity()
+ maximumQuantity = pMaximumQuantity;
+ return this;
+}
+
+/** Getter for {@link EngineFuelReload#maximumQuantity}*/
+public int getMaximumQuantity()
{
return maximumQuantity;
-}
-
-/** Setter for {@link EngineFuelReload#standardQuantityReloadTime}*/
-public EngineFuelReload setStandardQuantityReloadTime(int pStandardQuantityReloadTime)
+}
+
+/** Setter for {@link EngineFuelReload#standardQuantityReloadTime}*/
+public EngineFuelReload setStandardQuantityReloadTime(int pStandardQuantityReloadTime)
{
- standardQuantityReloadTime = pStandardQuantityReloadTime;
- return this;
-}
-
-/** Getter for {@link EngineFuelReload#standardQuantityReloadTime}*/
-public int getStandardQuantityReloadTime()
+ standardQuantityReloadTime = pStandardQuantityReloadTime;
+ return this;
+}
+
+/** Getter for {@link EngineFuelReload#standardQuantityReloadTime}*/
+public int getStandardQuantityReloadTime()
{
return standardQuantityReloadTime;
-}
-
-/** Setter for {@link EngineFuelReload#maximumQuantityReloadTime}*/
-public EngineFuelReload setMaximumQuantityReloadTime(int pMaximumQuantityReloadTime)
+}
+
+/** Setter for {@link EngineFuelReload#maximumQuantityReloadTime}*/
+public EngineFuelReload setMaximumQuantityReloadTime(int pMaximumQuantityReloadTime)
{
- maximumQuantityReloadTime = pMaximumQuantityReloadTime;
- return this;
-}
-
-/** Getter for {@link EngineFuelReload#maximumQuantityReloadTime}*/
-public int getMaximumQuantityReloadTime()
+ maximumQuantityReloadTime = pMaximumQuantityReloadTime;
+ return this;
+}
+
+/** Getter for {@link EngineFuelReload#maximumQuantityReloadTime}*/
+public int getMaximumQuantityReloadTime()
{
return maximumQuantityReloadTime;
-}
-
-/** Setter for {@link EngineFuelReload#fuelMeasurmentUnits}*/
-public EngineFuelReload setFuelMeasurmentUnits(FuelMeasurementUnits pFuelMeasurmentUnits)
+}
+
+/** Setter for {@link EngineFuelReload#fuelMeasurmentUnits}*/
+public EngineFuelReload setFuelMeasurmentUnits(FuelMeasurementUnits pFuelMeasurmentUnits)
{
- fuelMeasurmentUnits = pFuelMeasurmentUnits;
- return this;
-}
-
-/** Getter for {@link EngineFuelReload#fuelMeasurmentUnits}*/
-public FuelMeasurementUnits getFuelMeasurmentUnits()
+ fuelMeasurmentUnits = pFuelMeasurmentUnits;
+ return this;
+}
+
+/** Getter for {@link EngineFuelReload#fuelMeasurmentUnits}*/
+public FuelMeasurementUnits getFuelMeasurmentUnits()
{
return fuelMeasurmentUnits;
-}
-
-/** Setter for {@link EngineFuelReload#fuelType}*/
-public EngineFuelReload setFuelType(SupplyFuelType pFuelType)
+}
+
+/** Setter for {@link EngineFuelReload#fuelType}*/
+public EngineFuelReload setFuelType(SupplyFuelType pFuelType)
{
- fuelType = pFuelType;
- return this;
-}
-
-/** Getter for {@link EngineFuelReload#fuelType}*/
-public SupplyFuelType getFuelType()
+ fuelType = pFuelType;
+ return this;
+}
+
+/** Getter for {@link EngineFuelReload#fuelType}*/
+public SupplyFuelType getFuelType()
{
return fuelType;
-}
-
-/** Setter for {@link EngineFuelReload#fuelLocation}*/
-public EngineFuelReload setFuelLocation(FuelLocation pFuelLocation)
+}
+
+/** Setter for {@link EngineFuelReload#fuelLocation}*/
+public EngineFuelReload setFuelLocation(FuelLocation pFuelLocation)
{
- fuelLocation = pFuelLocation;
- return this;
-}
-
-/** Getter for {@link EngineFuelReload#fuelLocation}*/
-public FuelLocation getFuelLocation()
+ fuelLocation = pFuelLocation;
+ return this;
+}
+
+/** Getter for {@link EngineFuelReload#fuelLocation}*/
+public FuelLocation getFuelLocation()
{
return fuelLocation;
-}
-
-/** Setter for {@link EngineFuelReload#padding}*/
-public EngineFuelReload setPadding(byte pPadding)
+}
+
+/** Setter for {@link EngineFuelReload#padding}*/
+public EngineFuelReload setPadding(byte pPadding)
{
- padding = pPadding;
- return this;
-}
-
-/** Getter for {@link EngineFuelReload#padding}*/
-public byte getPadding()
+ padding = pPadding;
+ return this;
+}
+
+/** Getter for {@link EngineFuelReload#padding}*/
+public byte getPadding()
{
return padding;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeInt(standardQuantity);
- dos.writeInt(maximumQuantity);
- dos.writeInt(standardQuantityReloadTime);
- dos.writeInt(maximumQuantityReloadTime);
- fuelMeasurmentUnits.marshal(dos);
- fuelType.marshal(dos);
- fuelLocation.marshal(dos);
- dos.writeByte(padding);
+ {
+ dos.writeInt(standardQuantity);
+ dos.writeInt(maximumQuantity);
+ dos.writeInt(standardQuantityReloadTime);
+ dos.writeInt(maximumQuantityReloadTime);
+ fuelMeasurmentUnits.marshal(dos);
+ fuelType.marshal(dos);
+ fuelLocation.marshal(dos);
+ dos.writeByte(padding);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- standardQuantity = dis.readInt();
- uPosition += 4;
- maximumQuantity = dis.readInt();
- uPosition += 4;
- standardQuantityReloadTime = dis.readInt();
- uPosition += 4;
- maximumQuantityReloadTime = dis.readInt();
- uPosition += 4;
- fuelMeasurmentUnits = FuelMeasurementUnits.unmarshalEnum(dis);
- uPosition += fuelMeasurmentUnits.getMarshalledSize();
- fuelType = SupplyFuelType.unmarshalEnum(dis);
- uPosition += fuelType.getMarshalledSize();
- fuelLocation = FuelLocation.unmarshalEnum(dis);
- uPosition += fuelLocation.getMarshalledSize();
- padding = (byte)dis.readUnsignedByte();
- uPosition += 1;
+ {
+ standardQuantity = dis.readInt();
+ uPosition += 4;
+ maximumQuantity = dis.readInt();
+ uPosition += 4;
+ standardQuantityReloadTime = dis.readInt();
+ uPosition += 4;
+ maximumQuantityReloadTime = dis.readInt();
+ uPosition += 4;
+ fuelMeasurmentUnits = FuelMeasurementUnits.unmarshalEnum(dis);
+ uPosition += fuelMeasurmentUnits.getMarshalledSize();
+ fuelType = SupplyFuelType.unmarshalEnum(dis);
+ uPosition += fuelType.getMarshalledSize();
+ fuelLocation = FuelLocation.unmarshalEnum(dis);
+ uPosition += fuelLocation.getMarshalledSize();
+ padding = (byte)dis.readUnsignedByte();
+ uPosition += 1;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putInt( (int)standardQuantity);
- buff.putInt( (int)maximumQuantity);
- buff.putInt( (int)standardQuantityReloadTime);
- buff.putInt( (int)maximumQuantityReloadTime);
- fuelMeasurmentUnits.marshal(buff);
- fuelType.marshal(buff);
- fuelLocation.marshal(buff);
- buff.put( (byte)padding);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- standardQuantity = buff.getInt();
- maximumQuantity = buff.getInt();
- standardQuantityReloadTime = buff.getInt();
- maximumQuantityReloadTime = buff.getInt();
- fuelMeasurmentUnits = FuelMeasurementUnits.unmarshalEnum(buff);
- fuelType = SupplyFuelType.unmarshalEnum(buff);
- fuelLocation = FuelLocation.unmarshalEnum(buff);
- padding = (byte)(buff.get() & 0xFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putInt( (int)standardQuantity);
+ buff.putInt( (int)maximumQuantity);
+ buff.putInt( (int)standardQuantityReloadTime);
+ buff.putInt( (int)maximumQuantityReloadTime);
+ fuelMeasurmentUnits.marshal(buff);
+ fuelType.marshal(buff);
+ fuelLocation.marshal(buff);
+ buff.put( (byte)padding);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ standardQuantity = buff.getInt();
+ maximumQuantity = buff.getInt();
+ standardQuantityReloadTime = buff.getInt();
+ maximumQuantityReloadTime = buff.getInt();
+ fuelMeasurmentUnits = FuelMeasurementUnits.unmarshalEnum(buff);
+ fuelType = SupplyFuelType.unmarshalEnum(buff);
+ fuelLocation = FuelLocation.unmarshalEnum(buff);
+ padding = (byte)(buff.get() & 0xFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final EngineFuelReload rhs = (EngineFuelReload)obj;
-
- if( ! (standardQuantity == rhs.standardQuantity)) ivarsEqual = false;
- if( ! (maximumQuantity == rhs.maximumQuantity)) ivarsEqual = false;
- if( ! (standardQuantityReloadTime == rhs.standardQuantityReloadTime)) ivarsEqual = false;
- if( ! (maximumQuantityReloadTime == rhs.maximumQuantityReloadTime)) ivarsEqual = false;
- if( ! (fuelMeasurmentUnits == rhs.fuelMeasurmentUnits)) ivarsEqual = false;
- if( ! (fuelType == rhs.fuelType)) ivarsEqual = false;
- if( ! (fuelLocation == rhs.fuelLocation)) ivarsEqual = false;
- if( ! (padding == rhs.padding)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final EngineFuelReload rhs = (EngineFuelReload)obj;
+
+ if( ! (standardQuantity == rhs.standardQuantity)) ivarsEqual = false;
+ if( ! (maximumQuantity == rhs.maximumQuantity)) ivarsEqual = false;
+ if( ! (standardQuantityReloadTime == rhs.standardQuantityReloadTime)) ivarsEqual = false;
+ if( ! (maximumQuantityReloadTime == rhs.maximumQuantityReloadTime)) ivarsEqual = false;
+ if( ! (fuelMeasurmentUnits == rhs.fuelMeasurmentUnits)) ivarsEqual = false;
+ if( ! (fuelType == rhs.fuelType)) ivarsEqual = false;
+ if( ! (fuelLocation == rhs.fuelLocation)) ivarsEqual = false;
+ if( ! (padding == rhs.padding)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" standardQuantity: ").append(standardQuantity).append("\n");
- sb.append(" maximumQuantity: ").append(maximumQuantity).append("\n");
- sb.append(" standardQuantityReloadTime: ").append(standardQuantityReloadTime).append("\n");
- sb.append(" maximumQuantityReloadTime: ").append(maximumQuantityReloadTime).append("\n");
- sb.append(" fuelMeasurmentUnits: ").append(fuelMeasurmentUnits).append("\n");
- sb.append(" fuelType: ").append(fuelType).append("\n");
- sb.append(" fuelLocation: ").append(fuelLocation).append("\n");
- sb.append(" padding: ").append(padding).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" standardQuantity: ").append(standardQuantity).append("\n");
+ sb.append(" maximumQuantity: ").append(maximumQuantity).append("\n");
+ sb.append(" standardQuantityReloadTime: ").append(standardQuantityReloadTime).append("\n");
+ sb.append(" maximumQuantityReloadTime: ").append(maximumQuantityReloadTime).append("\n");
+ sb.append(" fuelMeasurmentUnits: ").append(fuelMeasurmentUnits).append("\n");
+ sb.append(" fuelType: ").append(fuelType).append("\n");
+ sb.append(" fuelLocation: ").append(fuelLocation).append("\n");
+ sb.append(" padding: ").append(padding).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EntityAssociationVP.java b/src-generated/edu/nps/moves/dis7/EntityAssociationVP.java
index d49f3031d5e4c3eeda2f02ec8d06382c48bed21f..b8c6173495f5b010c09d7e023b379445e58471ea 100644
--- a/src-generated/edu/nps/moves/dis7/EntityAssociationVP.java
+++ b/src-generated/edu/nps/moves/dis7/EntityAssociationVP.java
@@ -1,353 +1,353 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Association or disassociation of two entities. Section 6.2.94.4.3
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class EntityAssociationVP extends Object implements Serializable
-{
- /** the identification of the Variable Parameter record. Enumeration from EBV uid 56 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Association or disassociation of two entities. Section 6.2.94.4.3
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class EntityAssociationVP extends Object implements Serializable
+{
+ /** the identification of the Variable Parameter record. Enumeration from EBV uid 56 */
protected VariableParameterRecordType recordType = VariableParameterRecordType.ENTITY_ASSOCIATION;
-
- /** Indicates if this VP has changed since last issuance uid 320 */
+
+ /** Indicates if this VP has changed since last issuance uid 320 */
protected EntityVPRecordChangeIndicator changeIndicator = EntityVPRecordChangeIndicator.values()[0];
-
- /** Indicates association status between two entities uid 319 */
+
+ /** Indicates association status between two entities uid 319 */
protected EntityAssociationAssociationType associationStatus = EntityAssociationAssociationType.values()[0];
-
- /** Type of association; 8 bit enum uid 323 */
+
+ /** Type of association; 8 bit enum uid 323 */
protected EntityAssociationPhysicalAssociationType associationType = EntityAssociationPhysicalAssociationType.values()[0];
-
- /** Object ID of entity associated with this entity */
+
+ /** Object ID of entity associated with this entity */
protected EntityID entityID = new EntityID();
-
- /** Station location on one's own entity uid 212 */
+
+ /** Station location on one's own entity uid 212 */
protected IsPartOfStationName ownStationLocation = IsPartOfStationName.values()[0];
-
- /** Type of physical connection uid 324 */
+
+ /** Type of physical connection uid 324 */
protected EntityAssociationPhysicalConnectionType physicalConnectionType = EntityAssociationPhysicalConnectionType.values()[0];
-
- /** Type of member the entity is within the group uid 321 */
+
+ /** Type of member the entity is within the group uid 321 */
protected EntityAssociationGroupMemberType groupMemberType = EntityAssociationGroupMemberType.values()[0];
-
- /** Group if any to which the entity belongs */
+
+ /** Group if any to which the entity belongs */
protected short groupNumber;
-
-
-/** Constructor */
- public EntityAssociationVP()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public EntityAssociationVP()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += recordType.getMarshalledSize();
+ marshalSize += changeIndicator.getMarshalledSize();
+ marshalSize += associationStatus.getMarshalledSize();
+ marshalSize += associationType.getMarshalledSize();
+ marshalSize += entityID.getMarshalledSize();
+ marshalSize += ownStationLocation.getMarshalledSize();
+ marshalSize += physicalConnectionType.getMarshalledSize();
+ marshalSize += groupMemberType.getMarshalledSize();
+ marshalSize += 2; // groupNumber
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link EntityAssociationVP#recordType}*/
+public EntityAssociationVP setRecordType(VariableParameterRecordType pRecordType)
{
- int marshalSize = 0;
-
- marshalSize += recordType.getMarshalledSize();
- marshalSize += changeIndicator.getMarshalledSize();
- marshalSize += associationStatus.getMarshalledSize();
- marshalSize += associationType.getMarshalledSize();
- marshalSize += entityID.getMarshalledSize();
- marshalSize += ownStationLocation.getMarshalledSize();
- marshalSize += physicalConnectionType.getMarshalledSize();
- marshalSize += groupMemberType.getMarshalledSize();
- marshalSize += 2; // groupNumber
-
- return marshalSize;
-}
-
-
-/** Setter for {@link EntityAssociationVP#recordType}*/
-public EntityAssociationVP setRecordType(VariableParameterRecordType pRecordType)
-{
- recordType = pRecordType;
- return this;
-}
-
-/** Getter for {@link EntityAssociationVP#recordType}*/
-public VariableParameterRecordType getRecordType()
+ recordType = pRecordType;
+ return this;
+}
+
+/** Getter for {@link EntityAssociationVP#recordType}*/
+public VariableParameterRecordType getRecordType()
{
return recordType;
-}
-
-/** Setter for {@link EntityAssociationVP#changeIndicator}*/
-public EntityAssociationVP setChangeIndicator(EntityVPRecordChangeIndicator pChangeIndicator)
+}
+
+/** Setter for {@link EntityAssociationVP#changeIndicator}*/
+public EntityAssociationVP setChangeIndicator(EntityVPRecordChangeIndicator pChangeIndicator)
{
- changeIndicator = pChangeIndicator;
- return this;
-}
-
-/** Getter for {@link EntityAssociationVP#changeIndicator}*/
-public EntityVPRecordChangeIndicator getChangeIndicator()
+ changeIndicator = pChangeIndicator;
+ return this;
+}
+
+/** Getter for {@link EntityAssociationVP#changeIndicator}*/
+public EntityVPRecordChangeIndicator getChangeIndicator()
{
return changeIndicator;
-}
-
-/** Setter for {@link EntityAssociationVP#associationStatus}*/
-public EntityAssociationVP setAssociationStatus(EntityAssociationAssociationType pAssociationStatus)
+}
+
+/** Setter for {@link EntityAssociationVP#associationStatus}*/
+public EntityAssociationVP setAssociationStatus(EntityAssociationAssociationType pAssociationStatus)
{
- associationStatus = pAssociationStatus;
- return this;
-}
-
-/** Getter for {@link EntityAssociationVP#associationStatus}*/
-public EntityAssociationAssociationType getAssociationStatus()
+ associationStatus = pAssociationStatus;
+ return this;
+}
+
+/** Getter for {@link EntityAssociationVP#associationStatus}*/
+public EntityAssociationAssociationType getAssociationStatus()
{
return associationStatus;
-}
-
-/** Setter for {@link EntityAssociationVP#associationType}*/
-public EntityAssociationVP setAssociationType(EntityAssociationPhysicalAssociationType pAssociationType)
+}
+
+/** Setter for {@link EntityAssociationVP#associationType}*/
+public EntityAssociationVP setAssociationType(EntityAssociationPhysicalAssociationType pAssociationType)
{
- associationType = pAssociationType;
- return this;
-}
-
-/** Getter for {@link EntityAssociationVP#associationType}*/
-public EntityAssociationPhysicalAssociationType getAssociationType()
+ associationType = pAssociationType;
+ return this;
+}
+
+/** Getter for {@link EntityAssociationVP#associationType}*/
+public EntityAssociationPhysicalAssociationType getAssociationType()
{
return associationType;
-}
-
-/** Setter for {@link EntityAssociationVP#entityID}*/
-public EntityAssociationVP setEntityID(EntityID pEntityID)
+}
+
+/** Setter for {@link EntityAssociationVP#entityID}*/
+public EntityAssociationVP setEntityID(EntityID pEntityID)
{
- entityID = pEntityID;
- return this;
-}
-
-/** Getter for {@link EntityAssociationVP#entityID}*/
-public EntityID getEntityID()
+ entityID = pEntityID;
+ return this;
+}
+
+/** Getter for {@link EntityAssociationVP#entityID}*/
+public EntityID getEntityID()
{
return entityID;
-}
-
-/** Setter for {@link EntityAssociationVP#ownStationLocation}*/
-public EntityAssociationVP setOwnStationLocation(IsPartOfStationName pOwnStationLocation)
+}
+
+/** Setter for {@link EntityAssociationVP#ownStationLocation}*/
+public EntityAssociationVP setOwnStationLocation(IsPartOfStationName pOwnStationLocation)
{
- ownStationLocation = pOwnStationLocation;
- return this;
-}
-
-/** Getter for {@link EntityAssociationVP#ownStationLocation}*/
-public IsPartOfStationName getOwnStationLocation()
+ ownStationLocation = pOwnStationLocation;
+ return this;
+}
+
+/** Getter for {@link EntityAssociationVP#ownStationLocation}*/
+public IsPartOfStationName getOwnStationLocation()
{
return ownStationLocation;
-}
-
-/** Setter for {@link EntityAssociationVP#physicalConnectionType}*/
-public EntityAssociationVP setPhysicalConnectionType(EntityAssociationPhysicalConnectionType pPhysicalConnectionType)
+}
+
+/** Setter for {@link EntityAssociationVP#physicalConnectionType}*/
+public EntityAssociationVP setPhysicalConnectionType(EntityAssociationPhysicalConnectionType pPhysicalConnectionType)
{
- physicalConnectionType = pPhysicalConnectionType;
- return this;
-}
-
-/** Getter for {@link EntityAssociationVP#physicalConnectionType}*/
-public EntityAssociationPhysicalConnectionType getPhysicalConnectionType()
+ physicalConnectionType = pPhysicalConnectionType;
+ return this;
+}
+
+/** Getter for {@link EntityAssociationVP#physicalConnectionType}*/
+public EntityAssociationPhysicalConnectionType getPhysicalConnectionType()
{
return physicalConnectionType;
-}
-
-/** Setter for {@link EntityAssociationVP#groupMemberType}*/
-public EntityAssociationVP setGroupMemberType(EntityAssociationGroupMemberType pGroupMemberType)
+}
+
+/** Setter for {@link EntityAssociationVP#groupMemberType}*/
+public EntityAssociationVP setGroupMemberType(EntityAssociationGroupMemberType pGroupMemberType)
{
- groupMemberType = pGroupMemberType;
- return this;
-}
-
-/** Getter for {@link EntityAssociationVP#groupMemberType}*/
-public EntityAssociationGroupMemberType getGroupMemberType()
+ groupMemberType = pGroupMemberType;
+ return this;
+}
+
+/** Getter for {@link EntityAssociationVP#groupMemberType}*/
+public EntityAssociationGroupMemberType getGroupMemberType()
{
return groupMemberType;
-}
-
-/** Setter for {@link EntityAssociationVP#groupNumber}*/
-public EntityAssociationVP setGroupNumber(short pGroupNumber)
+}
+
+/** Setter for {@link EntityAssociationVP#groupNumber}*/
+public EntityAssociationVP setGroupNumber(short pGroupNumber)
{
- groupNumber = pGroupNumber;
- return this;
-}
-
-/** Getter for {@link EntityAssociationVP#groupNumber}*/
-public short getGroupNumber()
+ groupNumber = pGroupNumber;
+ return this;
+}
+
+/** Getter for {@link EntityAssociationVP#groupNumber}*/
+public short getGroupNumber()
{
return groupNumber;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- recordType.marshal(dos);
- changeIndicator.marshal(dos);
- associationStatus.marshal(dos);
- associationType.marshal(dos);
- entityID.marshal(dos);
- ownStationLocation.marshal(dos);
- physicalConnectionType.marshal(dos);
- groupMemberType.marshal(dos);
- dos.writeShort(groupNumber);
+ {
+ recordType.marshal(dos);
+ changeIndicator.marshal(dos);
+ associationStatus.marshal(dos);
+ associationType.marshal(dos);
+ entityID.marshal(dos);
+ ownStationLocation.marshal(dos);
+ physicalConnectionType.marshal(dos);
+ groupMemberType.marshal(dos);
+ dos.writeShort(groupNumber);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- recordType = VariableParameterRecordType.unmarshalEnum(dis);
- uPosition += recordType.getMarshalledSize();
- changeIndicator = EntityVPRecordChangeIndicator.unmarshalEnum(dis);
- uPosition += changeIndicator.getMarshalledSize();
- associationStatus = EntityAssociationAssociationType.unmarshalEnum(dis);
- uPosition += associationStatus.getMarshalledSize();
- associationType = EntityAssociationPhysicalAssociationType.unmarshalEnum(dis);
- uPosition += associationType.getMarshalledSize();
- uPosition += entityID.unmarshal(dis);
- ownStationLocation = IsPartOfStationName.unmarshalEnum(dis);
- uPosition += ownStationLocation.getMarshalledSize();
- physicalConnectionType = EntityAssociationPhysicalConnectionType.unmarshalEnum(dis);
- uPosition += physicalConnectionType.getMarshalledSize();
- groupMemberType = EntityAssociationGroupMemberType.unmarshalEnum(dis);
- uPosition += groupMemberType.getMarshalledSize();
- groupNumber = (short)dis.readUnsignedShort();
- uPosition += 2;
+ {
+ recordType = VariableParameterRecordType.unmarshalEnum(dis);
+ uPosition += recordType.getMarshalledSize();
+ changeIndicator = EntityVPRecordChangeIndicator.unmarshalEnum(dis);
+ uPosition += changeIndicator.getMarshalledSize();
+ associationStatus = EntityAssociationAssociationType.unmarshalEnum(dis);
+ uPosition += associationStatus.getMarshalledSize();
+ associationType = EntityAssociationPhysicalAssociationType.unmarshalEnum(dis);
+ uPosition += associationType.getMarshalledSize();
+ uPosition += entityID.unmarshal(dis);
+ ownStationLocation = IsPartOfStationName.unmarshalEnum(dis);
+ uPosition += ownStationLocation.getMarshalledSize();
+ physicalConnectionType = EntityAssociationPhysicalConnectionType.unmarshalEnum(dis);
+ uPosition += physicalConnectionType.getMarshalledSize();
+ groupMemberType = EntityAssociationGroupMemberType.unmarshalEnum(dis);
+ uPosition += groupMemberType.getMarshalledSize();
+ groupNumber = (short)dis.readUnsignedShort();
+ uPosition += 2;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- recordType.marshal(buff);
- changeIndicator.marshal(buff);
- associationStatus.marshal(buff);
- associationType.marshal(buff);
- entityID.marshal(buff);
- ownStationLocation.marshal(buff);
- physicalConnectionType.marshal(buff);
- groupMemberType.marshal(buff);
- buff.putShort( (short)groupNumber);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- recordType = VariableParameterRecordType.unmarshalEnum(buff);
- changeIndicator = EntityVPRecordChangeIndicator.unmarshalEnum(buff);
- associationStatus = EntityAssociationAssociationType.unmarshalEnum(buff);
- associationType = EntityAssociationPhysicalAssociationType.unmarshalEnum(buff);
- entityID.unmarshal(buff);
- ownStationLocation = IsPartOfStationName.unmarshalEnum(buff);
- physicalConnectionType = EntityAssociationPhysicalConnectionType.unmarshalEnum(buff);
- groupMemberType = EntityAssociationGroupMemberType.unmarshalEnum(buff);
- groupNumber = (short)(buff.getShort() & 0xFFFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ recordType.marshal(buff);
+ changeIndicator.marshal(buff);
+ associationStatus.marshal(buff);
+ associationType.marshal(buff);
+ entityID.marshal(buff);
+ ownStationLocation.marshal(buff);
+ physicalConnectionType.marshal(buff);
+ groupMemberType.marshal(buff);
+ buff.putShort( (short)groupNumber);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ recordType = VariableParameterRecordType.unmarshalEnum(buff);
+ changeIndicator = EntityVPRecordChangeIndicator.unmarshalEnum(buff);
+ associationStatus = EntityAssociationAssociationType.unmarshalEnum(buff);
+ associationType = EntityAssociationPhysicalAssociationType.unmarshalEnum(buff);
+ entityID.unmarshal(buff);
+ ownStationLocation = IsPartOfStationName.unmarshalEnum(buff);
+ physicalConnectionType = EntityAssociationPhysicalConnectionType.unmarshalEnum(buff);
+ groupMemberType = EntityAssociationGroupMemberType.unmarshalEnum(buff);
+ groupNumber = (short)(buff.getShort() & 0xFFFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final EntityAssociationVP rhs = (EntityAssociationVP)obj;
-
- if( ! (recordType == rhs.recordType)) ivarsEqual = false;
- if( ! (changeIndicator == rhs.changeIndicator)) ivarsEqual = false;
- if( ! (associationStatus == rhs.associationStatus)) ivarsEqual = false;
- if( ! (associationType == rhs.associationType)) ivarsEqual = false;
- if( ! (entityID.equals( rhs.entityID) )) ivarsEqual = false;
- if( ! (ownStationLocation == rhs.ownStationLocation)) ivarsEqual = false;
- if( ! (physicalConnectionType == rhs.physicalConnectionType)) ivarsEqual = false;
- if( ! (groupMemberType == rhs.groupMemberType)) ivarsEqual = false;
- if( ! (groupNumber == rhs.groupNumber)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final EntityAssociationVP rhs = (EntityAssociationVP)obj;
+
+ if( ! (recordType == rhs.recordType)) ivarsEqual = false;
+ if( ! (changeIndicator == rhs.changeIndicator)) ivarsEqual = false;
+ if( ! (associationStatus == rhs.associationStatus)) ivarsEqual = false;
+ if( ! (associationType == rhs.associationType)) ivarsEqual = false;
+ if( ! (entityID.equals( rhs.entityID) )) ivarsEqual = false;
+ if( ! (ownStationLocation == rhs.ownStationLocation)) ivarsEqual = false;
+ if( ! (physicalConnectionType == rhs.physicalConnectionType)) ivarsEqual = false;
+ if( ! (groupMemberType == rhs.groupMemberType)) ivarsEqual = false;
+ if( ! (groupNumber == rhs.groupNumber)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" recordType: ").append(recordType).append("\n");
- sb.append(" changeIndicator: ").append(changeIndicator).append("\n");
- sb.append(" associationStatus: ").append(associationStatus).append("\n");
- sb.append(" associationType: ").append(associationType).append("\n");
- sb.append(" entityID: ").append(entityID).append("\n");
- sb.append(" ownStationLocation: ").append(ownStationLocation).append("\n");
- sb.append(" physicalConnectionType: ").append(physicalConnectionType).append("\n");
- sb.append(" groupMemberType: ").append(groupMemberType).append("\n");
- sb.append(" groupNumber: ").append(groupNumber).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" recordType: ").append(recordType).append("\n");
+ sb.append(" changeIndicator: ").append(changeIndicator).append("\n");
+ sb.append(" associationStatus: ").append(associationStatus).append("\n");
+ sb.append(" associationType: ").append(associationType).append("\n");
+ sb.append(" entityID: ").append(entityID).append("\n");
+ sb.append(" ownStationLocation: ").append(ownStationLocation).append("\n");
+ sb.append(" physicalConnectionType: ").append(physicalConnectionType).append("\n");
+ sb.append(" groupMemberType: ").append(groupMemberType).append("\n");
+ sb.append(" groupNumber: ").append(groupNumber).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EntityDamageStatusPdu.java b/src-generated/edu/nps/moves/dis7/EntityDamageStatusPdu.java
index f10479e3ae9b87267f66579ce0f43faa94acbb17..9ee00d92d7ec60e948304072c8eff4b9137cd32e 100644
--- a/src-generated/edu/nps/moves/dis7/EntityDamageStatusPdu.java
+++ b/src-generated/edu/nps/moves/dis7/EntityDamageStatusPdu.java
@@ -1,274 +1,274 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 7.3.5 Used to communicate detailed damage information sustained by an entity regardless of the source of the damage.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class EntityDamageStatusPdu extends WarfareFamilyPdu implements Serializable
-{
- /** Field shall identify the damaged entity (see 6.2.28), Section 7.3.4 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 7.3.5 Used to communicate detailed damage information sustained by an entity regardless of the source of the damage.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class EntityDamageStatusPdu extends WarfareFamilyPdu implements Serializable
+{
+ /** Field shall identify the damaged entity (see 6.2.28), Section 7.3.4 */
protected EntityID damagedEntityID = new EntityID();
-
+
protected short padding1 = (short)0;
-
+
protected short padding2 = (short)0;
-
- /** field shall specify the number of Damage Description records, Section 7.3.5 */
+
+ /** field shall specify the number of Damage Description records, Section 7.3.5 */
protected short numberOfDamageDescription = (short)0;
-
- /** Fields shall contain one or more Damage Description records (see 6.2.17) and may contain other Standard Variable records, Section 7.3.5 */
+
+ /** Fields shall contain one or more Damage Description records (see 6.2.17) and may contain other Standard Variable records, Section 7.3.5 */
protected List< DirectedEnergyDamage > damageDescriptionRecords = new ArrayList< DirectedEnergyDamage >();
-
-
-/** Constructor */
- public EntityDamageStatusPdu()
- {
- setPduType( DISPDUType.ENTITY_DAMAGE_STATUS );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public EntityDamageStatusPdu()
+ {
+ setPduType( DISPDUType.ENTITY_DAMAGE_STATUS );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += damagedEntityID.getMarshalledSize();
+ marshalSize += 2; // padding1
+ marshalSize += 2; // padding2
+ marshalSize += 2; // numberOfDamageDescription
+ for(int idx=0; idx < damageDescriptionRecords.size(); idx++)
+ {
+ DirectedEnergyDamage listElement = damageDescriptionRecords.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link EntityDamageStatusPdu#damagedEntityID}*/
+public EntityDamageStatusPdu setDamagedEntityID(EntityID pDamagedEntityID)
{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += damagedEntityID.getMarshalledSize();
- marshalSize += 2; // padding1
- marshalSize += 2; // padding2
- marshalSize += 2; // numberOfDamageDescription
- for(int idx=0; idx < damageDescriptionRecords.size(); idx++)
- {
- DirectedEnergyDamage listElement = damageDescriptionRecords.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link EntityDamageStatusPdu#damagedEntityID}*/
-public EntityDamageStatusPdu setDamagedEntityID(EntityID pDamagedEntityID)
-{
- damagedEntityID = pDamagedEntityID;
- return this;
-}
-
-/** Getter for {@link EntityDamageStatusPdu#damagedEntityID}*/
-public EntityID getDamagedEntityID()
+ damagedEntityID = pDamagedEntityID;
+ return this;
+}
+
+/** Getter for {@link EntityDamageStatusPdu#damagedEntityID}*/
+public EntityID getDamagedEntityID()
{
return damagedEntityID;
-}
-
-/** Setter for {@link EntityDamageStatusPdu#padding1}*/
-public EntityDamageStatusPdu setPadding1(short pPadding1)
+}
+
+/** Setter for {@link EntityDamageStatusPdu#padding1}*/
+public EntityDamageStatusPdu setPadding1(short pPadding1)
{
- padding1 = pPadding1;
- return this;
-}
-
-/** Getter for {@link EntityDamageStatusPdu#padding1}*/
-public short getPadding1()
+ padding1 = pPadding1;
+ return this;
+}
+
+/** Getter for {@link EntityDamageStatusPdu#padding1}*/
+public short getPadding1()
{
return padding1;
-}
-
-/** Setter for {@link EntityDamageStatusPdu#padding2}*/
-public EntityDamageStatusPdu setPadding2(short pPadding2)
+}
+
+/** Setter for {@link EntityDamageStatusPdu#padding2}*/
+public EntityDamageStatusPdu setPadding2(short pPadding2)
{
- padding2 = pPadding2;
- return this;
-}
-
-/** Getter for {@link EntityDamageStatusPdu#padding2}*/
-public short getPadding2()
+ padding2 = pPadding2;
+ return this;
+}
+
+/** Getter for {@link EntityDamageStatusPdu#padding2}*/
+public short getPadding2()
{
return padding2;
-}
-
-/** Setter for {@link EntityDamageStatusPdu#damageDescriptionRecords}*/
-public EntityDamageStatusPdu setDamageDescriptionRecords(List<DirectedEnergyDamage> pDamageDescriptionRecords)
+}
+
+/** Setter for {@link EntityDamageStatusPdu#damageDescriptionRecords}*/
+public EntityDamageStatusPdu setDamageDescriptionRecords(List<DirectedEnergyDamage> pDamageDescriptionRecords)
{
- damageDescriptionRecords = pDamageDescriptionRecords;
- return this;
-}
-
-/** Getter for {@link EntityDamageStatusPdu#damageDescriptionRecords}*/
-public List<DirectedEnergyDamage> getDamageDescriptionRecords()
+ damageDescriptionRecords = pDamageDescriptionRecords;
+ return this;
+}
+
+/** Getter for {@link EntityDamageStatusPdu#damageDescriptionRecords}*/
+public List<DirectedEnergyDamage> getDamageDescriptionRecords()
{
return damageDescriptionRecords;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- damagedEntityID.marshal(dos);
- dos.writeShort(padding1);
- dos.writeShort(padding2);
- dos.writeShort(damageDescriptionRecords.size());
-
- for(int idx = 0; idx < damageDescriptionRecords.size(); idx++)
- {
- DirectedEnergyDamage aDirectedEnergyDamage = damageDescriptionRecords.get(idx);
- aDirectedEnergyDamage.marshal(dos);
- }
-
+ {
+ damagedEntityID.marshal(dos);
+ dos.writeShort(padding1);
+ dos.writeShort(padding2);
+ dos.writeShort(damageDescriptionRecords.size());
+
+ for(int idx = 0; idx < damageDescriptionRecords.size(); idx++)
+ {
+ DirectedEnergyDamage aDirectedEnergyDamage = damageDescriptionRecords.get(idx);
+ aDirectedEnergyDamage.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += damagedEntityID.unmarshal(dis);
- padding1 = (short)dis.readUnsignedShort();
- uPosition += 2;
- padding2 = (short)dis.readUnsignedShort();
- uPosition += 2;
- numberOfDamageDescription = (short)dis.readUnsignedShort();
- uPosition += 2;
- for(int idx = 0; idx < numberOfDamageDescription; idx++)
- {
- DirectedEnergyDamage anX = new DirectedEnergyDamage();
- uPosition += anX.unmarshal(dis);
- damageDescriptionRecords.add(anX);
- }
-
+ {
+ uPosition += damagedEntityID.unmarshal(dis);
+ padding1 = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ padding2 = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ numberOfDamageDescription = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ for(int idx = 0; idx < numberOfDamageDescription; idx++)
+ {
+ DirectedEnergyDamage anX = new DirectedEnergyDamage();
+ uPosition += anX.unmarshal(dis);
+ damageDescriptionRecords.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- damagedEntityID.marshal(buff);
- buff.putShort( (short)padding1);
- buff.putShort( (short)padding2);
- buff.putShort( (short)damageDescriptionRecords.size());
-
- for(int idx = 0; idx < damageDescriptionRecords.size(); idx++)
- {
- DirectedEnergyDamage aDirectedEnergyDamage = damageDescriptionRecords.get(idx);
- aDirectedEnergyDamage.marshal(buff);
- }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ damagedEntityID.marshal(buff);
+ buff.putShort( (short)padding1);
+ buff.putShort( (short)padding2);
+ buff.putShort( (short)damageDescriptionRecords.size());
+
+ for(int idx = 0; idx < damageDescriptionRecords.size(); idx++)
+ {
+ DirectedEnergyDamage aDirectedEnergyDamage = damageDescriptionRecords.get(idx);
+ aDirectedEnergyDamage.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- damagedEntityID.unmarshal(buff);
- padding1 = (short)(buff.getShort() & 0xFFFF);
- padding2 = (short)(buff.getShort() & 0xFFFF);
- numberOfDamageDescription = (short)(buff.getShort() & 0xFFFF);
- for(int idx = 0; idx < numberOfDamageDescription; idx++)
- {
- DirectedEnergyDamage anX = new DirectedEnergyDamage();
- anX.unmarshal(buff);
- damageDescriptionRecords.add(anX);
- }
-
- return getMarshalledSize();
+
+ damagedEntityID.unmarshal(buff);
+ padding1 = (short)(buff.getShort() & 0xFFFF);
+ padding2 = (short)(buff.getShort() & 0xFFFF);
+ numberOfDamageDescription = (short)(buff.getShort() & 0xFFFF);
+ for(int idx = 0; idx < numberOfDamageDescription; idx++)
+ {
+ DirectedEnergyDamage anX = new DirectedEnergyDamage();
+ anX.unmarshal(buff);
+ damageDescriptionRecords.add(anX);
+ }
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final EntityDamageStatusPdu rhs = (EntityDamageStatusPdu)obj;
-
- if( ! (damagedEntityID.equals( rhs.damagedEntityID) )) ivarsEqual = false;
- if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
- if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
-
- for(int idx = 0; idx < damageDescriptionRecords.size(); idx++)
- if( ! ( damageDescriptionRecords.get(idx).equals(rhs.damageDescriptionRecords.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final EntityDamageStatusPdu rhs = (EntityDamageStatusPdu)obj;
+
+ if( ! (damagedEntityID.equals( rhs.damagedEntityID) )) ivarsEqual = false;
+ if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
+ if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
+
+ for(int idx = 0; idx < damageDescriptionRecords.size(); idx++)
+ if( ! ( damageDescriptionRecords.get(idx).equals(rhs.damageDescriptionRecords.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" damagedEntityID: ").append(damagedEntityID).append("\n");
- sb.append(" padding1: ").append(padding1).append("\n");
- sb.append(" padding2: ").append(padding2).append("\n");
- sb.append(" damageDescriptionRecords: ").append("\n");
- damageDescriptionRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" damagedEntityID: ").append(damagedEntityID).append("\n");
+ sb.append(" padding1: ").append(padding1).append("\n");
+ sb.append(" padding2: ").append(padding2).append("\n");
+ sb.append(" damageDescriptionRecords: ").append("\n");
+ damageDescriptionRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EntityID.java b/src-generated/edu/nps/moves/dis7/EntityID.java
index 95dace71284bafdb43ab18a8b65beed9834be1d7..25aa6e518e062d6763a64315f1b0c149e2f9609e 100644
--- a/src-generated/edu/nps/moves/dis7/EntityID.java
+++ b/src-generated/edu/nps/moves/dis7/EntityID.java
@@ -1,210 +1,210 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * more laconically named EntityIdentifier
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class EntityID extends Object implements Serializable
-{
- /** Site ID */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * more laconically named EntityIdentifier
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class EntityID extends Object implements Serializable
+{
+ /** Site ID */
protected short siteID;
-
- /** application number ID */
+
+ /** application number ID */
protected short applicationID;
-
- /** Entity number ID */
+
+ /** Entity number ID */
protected short entityID;
-
-
-/** Constructor */
- public EntityID()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += 2; // siteID
- marshalSize += 2; // applicationID
- marshalSize += 2; // entityID
-
- return marshalSize;
-}
-
-
-/** Setter for {@link EntityID#siteID}*/
-public EntityID setSiteID(short pSiteID)
+
+
+/** Constructor */
+ public EntityID()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 2; // siteID
+ marshalSize += 2; // applicationID
+ marshalSize += 2; // entityID
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link EntityID#siteID}*/
+public EntityID setSiteID(short pSiteID)
{
- siteID = pSiteID;
- return this;
-}
-
-/** Getter for {@link EntityID#siteID}*/
-public short getSiteID()
+ siteID = pSiteID;
+ return this;
+}
+
+/** Getter for {@link EntityID#siteID}*/
+public short getSiteID()
{
return siteID;
-}
-
-/** Setter for {@link EntityID#applicationID}*/
-public EntityID setApplicationID(short pApplicationID)
+}
+
+/** Setter for {@link EntityID#applicationID}*/
+public EntityID setApplicationID(short pApplicationID)
{
- applicationID = pApplicationID;
- return this;
-}
-
-/** Getter for {@link EntityID#applicationID}*/
-public short getApplicationID()
+ applicationID = pApplicationID;
+ return this;
+}
+
+/** Getter for {@link EntityID#applicationID}*/
+public short getApplicationID()
{
return applicationID;
-}
-
-/** Setter for {@link EntityID#entityID}*/
-public EntityID setEntityID(short pEntityID)
+}
+
+/** Setter for {@link EntityID#entityID}*/
+public EntityID setEntityID(short pEntityID)
{
- entityID = pEntityID;
- return this;
-}
-
-/** Getter for {@link EntityID#entityID}*/
-public short getEntityID()
+ entityID = pEntityID;
+ return this;
+}
+
+/** Getter for {@link EntityID#entityID}*/
+public short getEntityID()
{
return entityID;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeShort(siteID);
- dos.writeShort(applicationID);
- dos.writeShort(entityID);
+ {
+ dos.writeShort(siteID);
+ dos.writeShort(applicationID);
+ dos.writeShort(entityID);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- siteID = (short)dis.readUnsignedShort();
- uPosition += 2;
- applicationID = (short)dis.readUnsignedShort();
- uPosition += 2;
- entityID = (short)dis.readUnsignedShort();
- uPosition += 2;
+ {
+ siteID = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ applicationID = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ entityID = (short)dis.readUnsignedShort();
+ uPosition += 2;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putShort( (short)siteID);
- buff.putShort( (short)applicationID);
- buff.putShort( (short)entityID);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- siteID = (short)(buff.getShort() & 0xFFFF);
- applicationID = (short)(buff.getShort() & 0xFFFF);
- entityID = (short)(buff.getShort() & 0xFFFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putShort( (short)siteID);
+ buff.putShort( (short)applicationID);
+ buff.putShort( (short)entityID);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ siteID = (short)(buff.getShort() & 0xFFFF);
+ applicationID = (short)(buff.getShort() & 0xFFFF);
+ entityID = (short)(buff.getShort() & 0xFFFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final EntityID rhs = (EntityID)obj;
-
- if( ! (siteID == rhs.siteID)) ivarsEqual = false;
- if( ! (applicationID == rhs.applicationID)) ivarsEqual = false;
- if( ! (entityID == rhs.entityID)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final EntityID rhs = (EntityID)obj;
+
+ if( ! (siteID == rhs.siteID)) ivarsEqual = false;
+ if( ! (applicationID == rhs.applicationID)) ivarsEqual = false;
+ if( ! (entityID == rhs.entityID)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" siteID: ").append(siteID).append("\n");
- sb.append(" applicationID: ").append(applicationID).append("\n");
- sb.append(" entityID: ").append(entityID).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" siteID: ").append(siteID).append("\n");
+ sb.append(" applicationID: ").append(applicationID).append("\n");
+ sb.append(" entityID: ").append(entityID).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EntityIdentifier.java b/src-generated/edu/nps/moves/dis7/EntityIdentifier.java
index 7732bf6aa066cf0dbb72cce08b0412fbc0402879..012ef3e32e3f1be038c401153c345a8cfa6ba1ce 100644
--- a/src-generated/edu/nps/moves/dis7/EntityIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/EntityIdentifier.java
@@ -1,185 +1,185 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Entity Identifier. Unique ID for entities in the world. Consists of an simulation address and a entity number. Section 6.2.28.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class EntityIdentifier extends Object implements Serializable
-{
- /** Site and application IDs */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Entity Identifier. Unique ID for entities in the world. Consists of an simulation address and a entity number. Section 6.2.28.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class EntityIdentifier extends Object implements Serializable
+{
+ /** Site and application IDs */
protected SimulationAddress simulationAddress = new SimulationAddress();
-
- /** Entity number */
+
+ /** Entity number */
protected short entityNumber;
-
-
-/** Constructor */
- public EntityIdentifier()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += simulationAddress.getMarshalledSize();
- marshalSize += 2; // entityNumber
-
- return marshalSize;
-}
-
-
-/** Setter for {@link EntityIdentifier#simulationAddress}*/
-public EntityIdentifier setSimulationAddress(SimulationAddress pSimulationAddress)
+
+
+/** Constructor */
+ public EntityIdentifier()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += simulationAddress.getMarshalledSize();
+ marshalSize += 2; // entityNumber
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link EntityIdentifier#simulationAddress}*/
+public EntityIdentifier setSimulationAddress(SimulationAddress pSimulationAddress)
{
- simulationAddress = pSimulationAddress;
- return this;
-}
-
-/** Getter for {@link EntityIdentifier#simulationAddress}*/
-public SimulationAddress getSimulationAddress()
+ simulationAddress = pSimulationAddress;
+ return this;
+}
+
+/** Getter for {@link EntityIdentifier#simulationAddress}*/
+public SimulationAddress getSimulationAddress()
{
return simulationAddress;
-}
-
-/** Setter for {@link EntityIdentifier#entityNumber}*/
-public EntityIdentifier setEntityNumber(short pEntityNumber)
+}
+
+/** Setter for {@link EntityIdentifier#entityNumber}*/
+public EntityIdentifier setEntityNumber(short pEntityNumber)
{
- entityNumber = pEntityNumber;
- return this;
-}
-
-/** Getter for {@link EntityIdentifier#entityNumber}*/
-public short getEntityNumber()
+ entityNumber = pEntityNumber;
+ return this;
+}
+
+/** Getter for {@link EntityIdentifier#entityNumber}*/
+public short getEntityNumber()
{
return entityNumber;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- simulationAddress.marshal(dos);
- dos.writeShort(entityNumber);
+ {
+ simulationAddress.marshal(dos);
+ dos.writeShort(entityNumber);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- uPosition += simulationAddress.unmarshal(dis);
- entityNumber = (short)dis.readUnsignedShort();
- uPosition += 2;
+ {
+ uPosition += simulationAddress.unmarshal(dis);
+ entityNumber = (short)dis.readUnsignedShort();
+ uPosition += 2;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- simulationAddress.marshal(buff);
- buff.putShort( (short)entityNumber);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- simulationAddress.unmarshal(buff);
- entityNumber = (short)(buff.getShort() & 0xFFFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ simulationAddress.marshal(buff);
+ buff.putShort( (short)entityNumber);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ simulationAddress.unmarshal(buff);
+ entityNumber = (short)(buff.getShort() & 0xFFFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final EntityIdentifier rhs = (EntityIdentifier)obj;
-
- if( ! (simulationAddress.equals( rhs.simulationAddress) )) ivarsEqual = false;
- if( ! (entityNumber == rhs.entityNumber)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final EntityIdentifier rhs = (EntityIdentifier)obj;
+
+ if( ! (simulationAddress.equals( rhs.simulationAddress) )) ivarsEqual = false;
+ if( ! (entityNumber == rhs.entityNumber)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
- sb.append(" entityNumber: ").append(entityNumber).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
+ sb.append(" entityNumber: ").append(entityNumber).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EntityInformationFamilyPdu.java b/src-generated/edu/nps/moves/dis7/EntityInformationFamilyPdu.java
index ad4be250472027ec5bc7272070542ac34e96e59f..e8cdab056ec04ddcedaac22c839420faa5a47f70 100644
--- a/src-generated/edu/nps/moves/dis7/EntityInformationFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/EntityInformationFamilyPdu.java
@@ -1,141 +1,141 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Section 5.3.3. Common superclass for EntityState, Collision, collision-elastic, and entity state update PDUs.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public abstract class EntityInformationFamilyPdu extends PduBase implements Serializable
-{
-
-/** Constructor */
- public EntityInformationFamilyPdu()
- {
- setProtocolFamily( DISProtocolFamily.ENTITY_INFORMATION_INTERACTION );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
-
- return marshalSize;
-}
-
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Section 5.3.3. Common superclass for EntityState, Collision, collision-elastic, and entity state update PDUs.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public abstract class EntityInformationFamilyPdu extends PduBase implements Serializable
+{
+
+/** Constructor */
+ public EntityInformationFamilyPdu()
+ {
+ setProtocolFamily( DISProtocolFamily.ENTITY_INFORMATION_INTERACTION );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+
+ return marshalSize;
+}
+
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
+ {
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
+ {
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- return getMarshalledSize();
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final EntityInformationFamilyPdu rhs = (EntityInformationFamilyPdu)obj;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final EntityInformationFamilyPdu rhs = (EntityInformationFamilyPdu)obj;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
-
- return sb.toString();
- }
-} // end of class
+
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EntityManagementFamilyPdu.java b/src-generated/edu/nps/moves/dis7/EntityManagementFamilyPdu.java
index bca365563709a3096ec279203e75ae03bb56a914..62f4ebc527607db9364ad15a252d75db9f97400e 100644
--- a/src-generated/edu/nps/moves/dis7/EntityManagementFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/EntityManagementFamilyPdu.java
@@ -1,141 +1,141 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Managment of grouping of PDUs, and more. Section 7.8
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public abstract class EntityManagementFamilyPdu extends PduBase implements Serializable
-{
-
-/** Constructor */
- public EntityManagementFamilyPdu()
- {
- setProtocolFamily( DISProtocolFamily.ENTITY_MANAGEMENT );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
-
- return marshalSize;
-}
-
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Managment of grouping of PDUs, and more. Section 7.8
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public abstract class EntityManagementFamilyPdu extends PduBase implements Serializable
+{
+
+/** Constructor */
+ public EntityManagementFamilyPdu()
+ {
+ setProtocolFamily( DISProtocolFamily.ENTITY_MANAGEMENT );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+
+ return marshalSize;
+}
+
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
+ {
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
+ {
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- return getMarshalledSize();
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final EntityManagementFamilyPdu rhs = (EntityManagementFamilyPdu)obj;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final EntityManagementFamilyPdu rhs = (EntityManagementFamilyPdu)obj;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
-
- return sb.toString();
- }
-} // end of class
+
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EntityMarking.java b/src-generated/edu/nps/moves/dis7/EntityMarking.java
index f9f724bebc113aad526b87e86aa9ba742dedef5c..84419737bbe9be39dcc777dcd076ebda0ec078f1 100644
--- a/src-generated/edu/nps/moves/dis7/EntityMarking.java
+++ b/src-generated/edu/nps/moves/dis7/EntityMarking.java
@@ -1,200 +1,200 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Specifies the character set used inthe first byte, followed by 11 characters of text data. Section 6.29
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class EntityMarking extends Object implements Serializable
-{
- /** The character set uid 45 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Specifies the character set used inthe first byte, followed by 11 characters of text data. Section 6.29
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class EntityMarking extends Object implements Serializable
+{
+ /** The character set uid 45 */
protected EntityMarkingCharacterSet characterSet = EntityMarkingCharacterSet.values()[0];
-
- /** The characters */
+
+ /** The characters */
protected byte[] characters = new byte[11];
-
-
-/** Constructor */
- public EntityMarking()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += characterSet.getMarshalledSize();
- marshalSize += characters.length * 1;
-
- return marshalSize;
-}
-
-
-/** Setter for {@link EntityMarking#characterSet}*/
-public EntityMarking setCharacterSet(EntityMarkingCharacterSet pCharacterSet)
+
+
+/** Constructor */
+ public EntityMarking()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += characterSet.getMarshalledSize();
+ marshalSize += characters.length * 1;
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link EntityMarking#characterSet}*/
+public EntityMarking setCharacterSet(EntityMarkingCharacterSet pCharacterSet)
{
- characterSet = pCharacterSet;
- return this;
-}
-
-/** Getter for {@link EntityMarking#characterSet}*/
-public EntityMarkingCharacterSet getCharacterSet()
+ characterSet = pCharacterSet;
+ return this;
+}
+
+/** Getter for {@link EntityMarking#characterSet}*/
+public EntityMarkingCharacterSet getCharacterSet()
{
return characterSet;
-}
-
-/** Setter for {@link EntityMarking#characters}*/
-public EntityMarking setCharacters(byte[] pCharacters)
+}
+
+/** Setter for {@link EntityMarking#characters}*/
+public EntityMarking setCharacters(byte[] pCharacters)
{
- characters = Arrays.copyOf(pCharacters, characters.length);
- return this;
-}
-
-/** Getter for {@link EntityMarking#characters}*/
-public byte[] getCharacters()
+ characters = Arrays.copyOf(pCharacters, characters.length);
+ return this;
+}
+
+/** Getter for {@link EntityMarking#characters}*/
+public byte[] getCharacters()
{
return characters;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- characterSet.marshal(dos);
-
- for(int idx = 0; idx < characters.length; idx++)
- dos.writeByte(characters[idx]);
-
+ {
+ characterSet.marshal(dos);
+
+ for(int idx = 0; idx < characters.length; idx++)
+ dos.writeByte(characters[idx]);
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- characterSet = EntityMarkingCharacterSet.unmarshalEnum(dis);
- uPosition += characterSet.getMarshalledSize();
- for(int idx = 0; idx < characters.length; idx++)
- characters[idx] = dis.readByte();
- uPosition += (characters.length * 1);
+ {
+ characterSet = EntityMarkingCharacterSet.unmarshalEnum(dis);
+ uPosition += characterSet.getMarshalledSize();
+ for(int idx = 0; idx < characters.length; idx++)
+ characters[idx] = dis.readByte();
+ uPosition += (characters.length * 1);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- characterSet.marshal(buff);
-
- for(int idx = 0; idx < characters.length; idx++)
- buff.put((byte)characters[idx]);
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- characterSet = EntityMarkingCharacterSet.unmarshalEnum(buff);
- for(int idx = 0; idx < characters.length; idx++)
- characters[idx] = buff.get();
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ characterSet.marshal(buff);
+
+ for(int idx = 0; idx < characters.length; idx++)
+ buff.put((byte)characters[idx]);
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ characterSet = EntityMarkingCharacterSet.unmarshalEnum(buff);
+ for(int idx = 0; idx < characters.length; idx++)
+ characters[idx] = buff.get();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final EntityMarking rhs = (EntityMarking)obj;
-
- if( ! (characterSet == rhs.characterSet)) ivarsEqual = false;
-
- for(int idx = 0; idx < 11; idx++)
- {
- if(!(characters[idx] == rhs.characters[idx])) ivarsEqual = false;
- }
-
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final EntityMarking rhs = (EntityMarking)obj;
+
+ if( ! (characterSet == rhs.characterSet)) ivarsEqual = false;
+
+ for(int idx = 0; idx < 11; idx++)
+ {
+ if(!(characters[idx] == rhs.characters[idx])) ivarsEqual = false;
+ }
+
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" characterSet: ").append(characterSet).append("\n");
- sb.append(" characters: ").append("\n");
- sb.append(Arrays.toString(characters)).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" characterSet: ").append(characterSet).append("\n");
+ sb.append(" characters: ").append("\n");
+ sb.append(Arrays.toString(characters)).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EntityStatePdu.java b/src-generated/edu/nps/moves/dis7/EntityStatePdu.java
index 22fa540e490242c1e37ae96a304dafea204fb25b..8bb0601ff70727acc6f5c38534ccadcf1f675c1b 100644
--- a/src-generated/edu/nps/moves/dis7/EntityStatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/EntityStatePdu.java
@@ -1,459 +1,459 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 7.2.2. Represents the postion and state of one entity in the world. See 5.3.2.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class EntityStatePdu extends EntityInformationFamilyPdu implements Serializable
-{
- /** Unique ID for an entity that is tied to this state information */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 7.2.2. Represents the postion and state of one entity in the world. See 5.3.2.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class EntityStatePdu extends EntityInformationFamilyPdu implements Serializable
+{
+ /** Unique ID for an entity that is tied to this state information */
protected EntityID entityID = new EntityID();
-
- /** What force this entity is affiliated with, eg red, blue, neutral, etc uid 6 */
+
+ /** What force this entity is affiliated with, eg red, blue, neutral, etc uid 6 */
protected ForceID forceId = ForceID.values()[0];
-
- /** How many variable parameters are in the variable length list. In earlier versions of DIS these were known as articulation parameters */
+
+ /** How many variable parameters are in the variable length list. In earlier versions of DIS these were known as articulation parameters */
protected byte numberOfVariableParameters;
-
- /** Describes the type of entity in the world */
+
+ /** Describes the type of entity in the world */
protected EntityType entityType = new EntityType();
-
+
protected EntityType alternativeEntityType = new EntityType();
-
- /** Describes the speed of the entity in the world */
+
+ /** Describes the speed of the entity in the world */
protected Vector3Float entityLinearVelocity = new Vector3Float();
-
- /** describes the location of the entity in the world */
+
+ /** describes the location of the entity in the world */
protected Vector3Double entityLocation = new Vector3Double();
-
- /** describes the orientation of the entity, in euler angles */
+
+ /** describes the orientation of the entity, in euler angles */
protected EulerAngles entityOrientation = new EulerAngles();
-
- /** a series of bit flags that are used to help draw the entity, such as smoking, on fire, etc. */
+
+ /** a series of bit flags that are used to help draw the entity, such as smoking, on fire, etc. */
protected int entityAppearance;
-
- /** parameters used for dead reckoning */
+
+ /** parameters used for dead reckoning */
protected DeadReckoningParameters deadReckoningParameters = new DeadReckoningParameters();
-
- /** characters that can be used for debugging, or to draw unique strings on the side of entities in the world */
+
+ /** characters that can be used for debugging, or to draw unique strings on the side of entities in the world */
protected EntityMarking marking = new EntityMarking();
-
- /** a series of bit flags uid 55 */
+
+ /** a series of bit flags uid 55 */
protected EntityCapabilities capabilities = new LandPlatformCapabilities();
-
- /** variable length list of variable parameters. In earlier DIS versions this was articulation parameters. */
+
+ /** variable length list of variable parameters. In earlier DIS versions this was articulation parameters. */
protected List< VariableParameter > variableParameters = new ArrayList< VariableParameter >();
-
-
-/** Constructor */
- public EntityStatePdu()
- {
- setPduType( DISPDUType.ENTITY_STATE );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += entityID.getMarshalledSize();
- marshalSize += forceId.getMarshalledSize();
- marshalSize += 1; // numberOfVariableParameters
- marshalSize += entityType.getMarshalledSize();
- marshalSize += alternativeEntityType.getMarshalledSize();
- marshalSize += entityLinearVelocity.getMarshalledSize();
- marshalSize += entityLocation.getMarshalledSize();
- marshalSize += entityOrientation.getMarshalledSize();
- marshalSize += 4; // entityAppearance
- marshalSize += deadReckoningParameters.getMarshalledSize();
- marshalSize += marking.getMarshalledSize();
- marshalSize += capabilities.getMarshalledSize();
- for(int idx=0; idx < variableParameters.size(); idx++)
- {
- VariableParameter listElement = variableParameters.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link EntityStatePdu#entityID}*/
-public EntityStatePdu setEntityID(EntityID pEntityID)
+
+
+/** Constructor */
+ public EntityStatePdu()
+ {
+ setPduType( DISPDUType.ENTITY_STATE );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += entityID.getMarshalledSize();
+ marshalSize += forceId.getMarshalledSize();
+ marshalSize += 1; // numberOfVariableParameters
+ marshalSize += entityType.getMarshalledSize();
+ marshalSize += alternativeEntityType.getMarshalledSize();
+ marshalSize += entityLinearVelocity.getMarshalledSize();
+ marshalSize += entityLocation.getMarshalledSize();
+ marshalSize += entityOrientation.getMarshalledSize();
+ marshalSize += 4; // entityAppearance
+ marshalSize += deadReckoningParameters.getMarshalledSize();
+ marshalSize += marking.getMarshalledSize();
+ marshalSize += capabilities.getMarshalledSize();
+ for(int idx=0; idx < variableParameters.size(); idx++)
+ {
+ VariableParameter listElement = variableParameters.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link EntityStatePdu#entityID}*/
+public EntityStatePdu setEntityID(EntityID pEntityID)
{
- entityID = pEntityID;
- return this;
-}
-
-/** Getter for {@link EntityStatePdu#entityID}*/
-public EntityID getEntityID()
+ entityID = pEntityID;
+ return this;
+}
+
+/** Getter for {@link EntityStatePdu#entityID}*/
+public EntityID getEntityID()
{
return entityID;
-}
-
-/** Setter for {@link EntityStatePdu#forceId}*/
-public EntityStatePdu setForceId(ForceID pForceId)
+}
+
+/** Setter for {@link EntityStatePdu#forceId}*/
+public EntityStatePdu setForceId(ForceID pForceId)
{
- forceId = pForceId;
- return this;
-}
-
-/** Getter for {@link EntityStatePdu#forceId}*/
-public ForceID getForceId()
+ forceId = pForceId;
+ return this;
+}
+
+/** Getter for {@link EntityStatePdu#forceId}*/
+public ForceID getForceId()
{
return forceId;
-}
-
-/** Setter for {@link EntityStatePdu#entityType}*/
-public EntityStatePdu setEntityType(EntityType pEntityType)
+}
+
+/** Setter for {@link EntityStatePdu#entityType}*/
+public EntityStatePdu setEntityType(EntityType pEntityType)
{
- entityType = pEntityType;
- return this;
-}
-
-/** Getter for {@link EntityStatePdu#entityType}*/
-public EntityType getEntityType()
+ entityType = pEntityType;
+ return this;
+}
+
+/** Getter for {@link EntityStatePdu#entityType}*/
+public EntityType getEntityType()
{
return entityType;
-}
-
-/** Setter for {@link EntityStatePdu#alternativeEntityType}*/
-public EntityStatePdu setAlternativeEntityType(EntityType pAlternativeEntityType)
+}
+
+/** Setter for {@link EntityStatePdu#alternativeEntityType}*/
+public EntityStatePdu setAlternativeEntityType(EntityType pAlternativeEntityType)
{
- alternativeEntityType = pAlternativeEntityType;
- return this;
-}
-
-/** Getter for {@link EntityStatePdu#alternativeEntityType}*/
-public EntityType getAlternativeEntityType()
+ alternativeEntityType = pAlternativeEntityType;
+ return this;
+}
+
+/** Getter for {@link EntityStatePdu#alternativeEntityType}*/
+public EntityType getAlternativeEntityType()
{
return alternativeEntityType;
-}
-
-/** Setter for {@link EntityStatePdu#entityLinearVelocity}*/
-public EntityStatePdu setEntityLinearVelocity(Vector3Float pEntityLinearVelocity)
+}
+
+/** Setter for {@link EntityStatePdu#entityLinearVelocity}*/
+public EntityStatePdu setEntityLinearVelocity(Vector3Float pEntityLinearVelocity)
{
- entityLinearVelocity = pEntityLinearVelocity;
- return this;
-}
-
-/** Getter for {@link EntityStatePdu#entityLinearVelocity}*/
-public Vector3Float getEntityLinearVelocity()
+ entityLinearVelocity = pEntityLinearVelocity;
+ return this;
+}
+
+/** Getter for {@link EntityStatePdu#entityLinearVelocity}*/
+public Vector3Float getEntityLinearVelocity()
{
return entityLinearVelocity;
-}
-
-/** Setter for {@link EntityStatePdu#entityLocation}*/
-public EntityStatePdu setEntityLocation(Vector3Double pEntityLocation)
+}
+
+/** Setter for {@link EntityStatePdu#entityLocation}*/
+public EntityStatePdu setEntityLocation(Vector3Double pEntityLocation)
{
- entityLocation = pEntityLocation;
- return this;
-}
-
-/** Getter for {@link EntityStatePdu#entityLocation}*/
-public Vector3Double getEntityLocation()
+ entityLocation = pEntityLocation;
+ return this;
+}
+
+/** Getter for {@link EntityStatePdu#entityLocation}*/
+public Vector3Double getEntityLocation()
{
return entityLocation;
-}
-
-/** Setter for {@link EntityStatePdu#entityOrientation}*/
-public EntityStatePdu setEntityOrientation(EulerAngles pEntityOrientation)
+}
+
+/** Setter for {@link EntityStatePdu#entityOrientation}*/
+public EntityStatePdu setEntityOrientation(EulerAngles pEntityOrientation)
{
- entityOrientation = pEntityOrientation;
- return this;
-}
-
-/** Getter for {@link EntityStatePdu#entityOrientation}*/
-public EulerAngles getEntityOrientation()
+ entityOrientation = pEntityOrientation;
+ return this;
+}
+
+/** Getter for {@link EntityStatePdu#entityOrientation}*/
+public EulerAngles getEntityOrientation()
{
return entityOrientation;
-}
-
-/** Setter for {@link EntityStatePdu#entityAppearance}*/
-public EntityStatePdu setEntityAppearance(int pEntityAppearance)
+}
+
+/** Setter for {@link EntityStatePdu#entityAppearance}*/
+public EntityStatePdu setEntityAppearance(int pEntityAppearance)
{
- entityAppearance = pEntityAppearance;
- return this;
-}
-
-/** Getter for {@link EntityStatePdu#entityAppearance}*/
-public int getEntityAppearance()
+ entityAppearance = pEntityAppearance;
+ return this;
+}
+
+/** Getter for {@link EntityStatePdu#entityAppearance}*/
+public int getEntityAppearance()
{
return entityAppearance;
-}
-
-/** Setter for {@link EntityStatePdu#deadReckoningParameters}*/
-public EntityStatePdu setDeadReckoningParameters(DeadReckoningParameters pDeadReckoningParameters)
+}
+
+/** Setter for {@link EntityStatePdu#deadReckoningParameters}*/
+public EntityStatePdu setDeadReckoningParameters(DeadReckoningParameters pDeadReckoningParameters)
{
- deadReckoningParameters = pDeadReckoningParameters;
- return this;
-}
-
-/** Getter for {@link EntityStatePdu#deadReckoningParameters}*/
-public DeadReckoningParameters getDeadReckoningParameters()
+ deadReckoningParameters = pDeadReckoningParameters;
+ return this;
+}
+
+/** Getter for {@link EntityStatePdu#deadReckoningParameters}*/
+public DeadReckoningParameters getDeadReckoningParameters()
{
return deadReckoningParameters;
-}
-
-/** Setter for {@link EntityStatePdu#marking}*/
-public EntityStatePdu setMarking(EntityMarking pMarking)
+}
+
+/** Setter for {@link EntityStatePdu#marking}*/
+public EntityStatePdu setMarking(EntityMarking pMarking)
{
- marking = pMarking;
- return this;
-}
-
-/** Getter for {@link EntityStatePdu#marking}*/
-public EntityMarking getMarking()
+ marking = pMarking;
+ return this;
+}
+
+/** Getter for {@link EntityStatePdu#marking}*/
+public EntityMarking getMarking()
{
return marking;
-}
-
-/** Setter for {@link EntityStatePdu#capabilities}*/
-public EntityStatePdu setCapabilities(EntityCapabilities pCapabilities)
+}
+
+/** Setter for {@link EntityStatePdu#capabilities}*/
+public EntityStatePdu setCapabilities(EntityCapabilities pCapabilities)
{
- capabilities = pCapabilities;
- return this;
-}
-
-/** Setter for {@link EntityStatePdu#capabilities}*/
-public EntityCapabilities getCapabilities()
+ capabilities = pCapabilities;
+ return this;
+}
+
+/** Setter for {@link EntityStatePdu#capabilities}*/
+public EntityCapabilities getCapabilities()
{
return capabilities;
-}
-
-/** Setter for {@link EntityStatePdu#variableParameters}*/
-public EntityStatePdu setVariableParameters(List<VariableParameter> pVariableParameters)
+}
+
+/** Setter for {@link EntityStatePdu#variableParameters}*/
+public EntityStatePdu setVariableParameters(List<VariableParameter> pVariableParameters)
{
- variableParameters = pVariableParameters;
- return this;
-}
-
-/** Getter for {@link EntityStatePdu#variableParameters}*/
-public List<VariableParameter> getVariableParameters()
+ variableParameters = pVariableParameters;
+ return this;
+}
+
+/** Getter for {@link EntityStatePdu#variableParameters}*/
+public List<VariableParameter> getVariableParameters()
{
return variableParameters;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- entityID.marshal(dos);
- forceId.marshal(dos);
- dos.writeByte(variableParameters.size());
- entityType.marshal(dos);
- alternativeEntityType.marshal(dos);
- entityLinearVelocity.marshal(dos);
- entityLocation.marshal(dos);
- entityOrientation.marshal(dos);
- dos.writeInt(entityAppearance);
- deadReckoningParameters.marshal(dos);
- marking.marshal(dos);
- capabilities.marshal(dos);
-
- for(int idx = 0; idx < variableParameters.size(); idx++)
- {
- VariableParameter aVariableParameter = variableParameters.get(idx);
- aVariableParameter.marshal(dos);
- }
-
+ {
+ entityID.marshal(dos);
+ forceId.marshal(dos);
+ dos.writeByte(variableParameters.size());
+ entityType.marshal(dos);
+ alternativeEntityType.marshal(dos);
+ entityLinearVelocity.marshal(dos);
+ entityLocation.marshal(dos);
+ entityOrientation.marshal(dos);
+ dos.writeInt(entityAppearance);
+ deadReckoningParameters.marshal(dos);
+ marking.marshal(dos);
+ capabilities.marshal(dos);
+
+ for(int idx = 0; idx < variableParameters.size(); idx++)
+ {
+ VariableParameter aVariableParameter = variableParameters.get(idx);
+ aVariableParameter.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += entityID.unmarshal(dis);
- forceId = ForceID.unmarshalEnum(dis);
- uPosition += forceId.getMarshalledSize();
- numberOfVariableParameters = (byte)dis.readUnsignedByte();
- uPosition += 1;
- uPosition += entityType.unmarshal(dis);
- uPosition += alternativeEntityType.unmarshal(dis);
- uPosition += entityLinearVelocity.unmarshal(dis);
- uPosition += entityLocation.unmarshal(dis);
- uPosition += entityOrientation.unmarshal(dis);
- entityAppearance = dis.readInt();
- uPosition += 4;
- uPosition += deadReckoningParameters.unmarshal(dis);
- uPosition += marking.unmarshal(dis);
- uPosition += capabilities.unmarshal(dis);
- for(int idx = 0; idx < numberOfVariableParameters; idx++)
- {
- VariableParameter anX = new VariableParameter();
- uPosition += anX.unmarshal(dis);
- variableParameters.add(anX);
- }
-
+ {
+ uPosition += entityID.unmarshal(dis);
+ forceId = ForceID.unmarshalEnum(dis);
+ uPosition += forceId.getMarshalledSize();
+ numberOfVariableParameters = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ uPosition += entityType.unmarshal(dis);
+ uPosition += alternativeEntityType.unmarshal(dis);
+ uPosition += entityLinearVelocity.unmarshal(dis);
+ uPosition += entityLocation.unmarshal(dis);
+ uPosition += entityOrientation.unmarshal(dis);
+ entityAppearance = dis.readInt();
+ uPosition += 4;
+ uPosition += deadReckoningParameters.unmarshal(dis);
+ uPosition += marking.unmarshal(dis);
+ uPosition += capabilities.unmarshal(dis);
+ for(int idx = 0; idx < numberOfVariableParameters; idx++)
+ {
+ VariableParameter anX = new VariableParameter();
+ uPosition += anX.unmarshal(dis);
+ variableParameters.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- entityID.marshal(buff);
- forceId.marshal(buff);
- buff.put( (byte)variableParameters.size());
- entityType.marshal(buff);
- alternativeEntityType.marshal(buff);
- entityLinearVelocity.marshal(buff);
- entityLocation.marshal(buff);
- entityOrientation.marshal(buff);
- buff.putInt( (int)entityAppearance);
- deadReckoningParameters.marshal(buff);
- marking.marshal(buff);
- capabilities.marshal(buff);
-
- for(int idx = 0; idx < variableParameters.size(); idx++)
- {
- VariableParameter aVariableParameter = variableParameters.get(idx);
- aVariableParameter.marshal(buff);
- }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ entityID.marshal(buff);
+ forceId.marshal(buff);
+ buff.put( (byte)variableParameters.size());
+ entityType.marshal(buff);
+ alternativeEntityType.marshal(buff);
+ entityLinearVelocity.marshal(buff);
+ entityLocation.marshal(buff);
+ entityOrientation.marshal(buff);
+ buff.putInt( (int)entityAppearance);
+ deadReckoningParameters.marshal(buff);
+ marking.marshal(buff);
+ capabilities.marshal(buff);
+
+ for(int idx = 0; idx < variableParameters.size(); idx++)
+ {
+ VariableParameter aVariableParameter = variableParameters.get(idx);
+ aVariableParameter.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- entityID.unmarshal(buff);
- forceId = ForceID.unmarshalEnum(buff);
- numberOfVariableParameters = (byte)(buff.get() & 0xFF);
- entityType.unmarshal(buff);
- alternativeEntityType.unmarshal(buff);
- entityLinearVelocity.unmarshal(buff);
- entityLocation.unmarshal(buff);
- entityOrientation.unmarshal(buff);
- entityAppearance = buff.getInt();
- deadReckoningParameters.unmarshal(buff);
- marking.unmarshal(buff);
- capabilities.unmarshal(buff);
- for(int idx = 0; idx < numberOfVariableParameters; idx++)
- {
- VariableParameter anX = new VariableParameter();
- anX.unmarshal(buff);
- variableParameters.add(anX);
- }
-
- return getMarshalledSize();
+
+ entityID.unmarshal(buff);
+ forceId = ForceID.unmarshalEnum(buff);
+ numberOfVariableParameters = (byte)(buff.get() & 0xFF);
+ entityType.unmarshal(buff);
+ alternativeEntityType.unmarshal(buff);
+ entityLinearVelocity.unmarshal(buff);
+ entityLocation.unmarshal(buff);
+ entityOrientation.unmarshal(buff);
+ entityAppearance = buff.getInt();
+ deadReckoningParameters.unmarshal(buff);
+ marking.unmarshal(buff);
+ capabilities.unmarshal(buff);
+ for(int idx = 0; idx < numberOfVariableParameters; idx++)
+ {
+ VariableParameter anX = new VariableParameter();
+ anX.unmarshal(buff);
+ variableParameters.add(anX);
+ }
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final EntityStatePdu rhs = (EntityStatePdu)obj;
-
- if( ! (entityID.equals( rhs.entityID) )) ivarsEqual = false;
- if( ! (forceId == rhs.forceId)) ivarsEqual = false;
- if( ! (entityType.equals( rhs.entityType) )) ivarsEqual = false;
- if( ! (alternativeEntityType.equals( rhs.alternativeEntityType) )) ivarsEqual = false;
- if( ! (entityLinearVelocity.equals( rhs.entityLinearVelocity) )) ivarsEqual = false;
- if( ! (entityLocation.equals( rhs.entityLocation) )) ivarsEqual = false;
- if( ! (entityOrientation.equals( rhs.entityOrientation) )) ivarsEqual = false;
- if( ! (entityAppearance == rhs.entityAppearance)) ivarsEqual = false;
- if( ! (deadReckoningParameters.equals( rhs.deadReckoningParameters) )) ivarsEqual = false;
- if( ! (marking.equals( rhs.marking) )) ivarsEqual = false;
- if( ! (capabilities.equals( rhs.capabilities) )) ivarsEqual = false;
-
- for(int idx = 0; idx < variableParameters.size(); idx++)
- if( ! ( variableParameters.get(idx).equals(rhs.variableParameters.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final EntityStatePdu rhs = (EntityStatePdu)obj;
+
+ if( ! (entityID.equals( rhs.entityID) )) ivarsEqual = false;
+ if( ! (forceId == rhs.forceId)) ivarsEqual = false;
+ if( ! (entityType.equals( rhs.entityType) )) ivarsEqual = false;
+ if( ! (alternativeEntityType.equals( rhs.alternativeEntityType) )) ivarsEqual = false;
+ if( ! (entityLinearVelocity.equals( rhs.entityLinearVelocity) )) ivarsEqual = false;
+ if( ! (entityLocation.equals( rhs.entityLocation) )) ivarsEqual = false;
+ if( ! (entityOrientation.equals( rhs.entityOrientation) )) ivarsEqual = false;
+ if( ! (entityAppearance == rhs.entityAppearance)) ivarsEqual = false;
+ if( ! (deadReckoningParameters.equals( rhs.deadReckoningParameters) )) ivarsEqual = false;
+ if( ! (marking.equals( rhs.marking) )) ivarsEqual = false;
+ if( ! (capabilities.equals( rhs.capabilities) )) ivarsEqual = false;
+
+ for(int idx = 0; idx < variableParameters.size(); idx++)
+ if( ! ( variableParameters.get(idx).equals(rhs.variableParameters.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" entityID: ").append(entityID).append("\n");
- sb.append(" forceId: ").append(forceId).append("\n");
- sb.append(" entityType: ").append(entityType).append("\n");
- sb.append(" alternativeEntityType: ").append(alternativeEntityType).append("\n");
- sb.append(" entityLinearVelocity: ").append(entityLinearVelocity).append("\n");
- sb.append(" entityLocation: ").append(entityLocation).append("\n");
- sb.append(" entityOrientation: ").append(entityOrientation).append("\n");
- sb.append(" entityAppearance: ").append(entityAppearance).append("\n");
- sb.append(" deadReckoningParameters: ").append(deadReckoningParameters).append("\n");
- sb.append(" marking: ").append(marking).append("\n");
- sb.append(" capabilities: ").append(capabilities).append("\n");
- sb.append(" variableParameters: ").append("\n");
- variableParameters.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" entityID: ").append(entityID).append("\n");
+ sb.append(" forceId: ").append(forceId).append("\n");
+ sb.append(" entityType: ").append(entityType).append("\n");
+ sb.append(" alternativeEntityType: ").append(alternativeEntityType).append("\n");
+ sb.append(" entityLinearVelocity: ").append(entityLinearVelocity).append("\n");
+ sb.append(" entityLocation: ").append(entityLocation).append("\n");
+ sb.append(" entityOrientation: ").append(entityOrientation).append("\n");
+ sb.append(" entityAppearance: ").append(entityAppearance).append("\n");
+ sb.append(" deadReckoningParameters: ").append(deadReckoningParameters).append("\n");
+ sb.append(" marking: ").append(marking).append("\n");
+ sb.append(" capabilities: ").append(capabilities).append("\n");
+ sb.append(" variableParameters: ").append("\n");
+ variableParameters.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EntityStateUpdatePdu.java b/src-generated/edu/nps/moves/dis7/EntityStateUpdatePdu.java
index ce97c298501f13eb36af5aeade31d549b7311f0a..edc90df72e864e8553acf6c8478faf9cb914a300 100644
--- a/src-generated/edu/nps/moves/dis7/EntityStateUpdatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/EntityStateUpdatePdu.java
@@ -1,345 +1,345 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 7.2.5. Nonstatic information about a particular entity may be communicated by issuing an Entity State Update PDU. 5.3.5.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class EntityStateUpdatePdu extends EntityInformationFamilyPdu implements Serializable
-{
- /** This field shall identify the entity issuing the PDU, and shall be represented by an Entity Identifier record (see 6.2.28). */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 7.2.5. Nonstatic information about a particular entity may be communicated by issuing an Entity State Update PDU. 5.3.5.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class EntityStateUpdatePdu extends EntityInformationFamilyPdu implements Serializable
+{
+ /** This field shall identify the entity issuing the PDU, and shall be represented by an Entity Identifier record (see 6.2.28). */
protected EntityID entityID = new EntityID();
-
- /** Padding */
+
+ /** Padding */
protected byte padding1;
-
- /** This field shall specify the number of variable parameters present. This field shall be represented by an 8-bit unsigned integer (see Annex I). */
+
+ /** This field shall specify the number of variable parameters present. This field shall be represented by an 8-bit unsigned integer (see Annex I). */
protected byte numberOfVariableParameters;
-
- /** This field shall specify an entity's linear velocity. The coordinate system for an entity's linear velocity depends on the dead reckoning algorithm used. This field shall be represented by a Linear Velocity Vector record [see 6.2.95 item c)]). */
+
+ /** This field shall specify an entity's linear velocity. The coordinate system for an entity's linear velocity depends on the dead reckoning algorithm used. This field shall be represented by a Linear Velocity Vector record [see 6.2.95 item c)]). */
protected Vector3Float entityLinearVelocity = new Vector3Float();
-
- /** This field shall specify an entity's physical location in the simulated world and shall be represented by a World Coordinates record (see 6.2.97). */
+
+ /** This field shall specify an entity's physical location in the simulated world and shall be represented by a World Coordinates record (see 6.2.97). */
protected Vector3Double entityLocation = new Vector3Double();
-
- /** This field shall specify an entity's orientation and shall be represented by an Euler Angles record (see 6.2.33). */
+
+ /** This field shall specify an entity's orientation and shall be represented by an Euler Angles record (see 6.2.33). */
protected EulerAngles entityOrientation = new EulerAngles();
-
- /** This field shall specify the dynamic changes to the entity's appearance attributes. This field shall be represented by an Entity Appearance record (see 6.2.26). */
+
+ /** This field shall specify the dynamic changes to the entity's appearance attributes. This field shall be represented by an Entity Appearance record (see 6.2.26). */
protected int entityAppearance;
-
- /** This field shall specify the parameter values for each Variable Parameter record that is included (see 6.2.93 and Annex I). */
+
+ /** This field shall specify the parameter values for each Variable Parameter record that is included (see 6.2.93 and Annex I). */
protected List< VariableParameter > variableParameters = new ArrayList< VariableParameter >();
-
-
-/** Constructor */
- public EntityStateUpdatePdu()
- {
- setPduType( DISPDUType.ENTITY_STATE_UPDATE );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public EntityStateUpdatePdu()
+ {
+ setPduType( DISPDUType.ENTITY_STATE_UPDATE );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += entityID.getMarshalledSize();
+ marshalSize += 1; // padding1
+ marshalSize += 1; // numberOfVariableParameters
+ marshalSize += entityLinearVelocity.getMarshalledSize();
+ marshalSize += entityLocation.getMarshalledSize();
+ marshalSize += entityOrientation.getMarshalledSize();
+ marshalSize += 4; // entityAppearance
+ for(int idx=0; idx < variableParameters.size(); idx++)
+ {
+ VariableParameter listElement = variableParameters.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link EntityStateUpdatePdu#entityID}*/
+public EntityStateUpdatePdu setEntityID(EntityID pEntityID)
{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += entityID.getMarshalledSize();
- marshalSize += 1; // padding1
- marshalSize += 1; // numberOfVariableParameters
- marshalSize += entityLinearVelocity.getMarshalledSize();
- marshalSize += entityLocation.getMarshalledSize();
- marshalSize += entityOrientation.getMarshalledSize();
- marshalSize += 4; // entityAppearance
- for(int idx=0; idx < variableParameters.size(); idx++)
- {
- VariableParameter listElement = variableParameters.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link EntityStateUpdatePdu#entityID}*/
-public EntityStateUpdatePdu setEntityID(EntityID pEntityID)
-{
- entityID = pEntityID;
- return this;
-}
-
-/** Getter for {@link EntityStateUpdatePdu#entityID}*/
-public EntityID getEntityID()
+ entityID = pEntityID;
+ return this;
+}
+
+/** Getter for {@link EntityStateUpdatePdu#entityID}*/
+public EntityID getEntityID()
{
return entityID;
-}
-
-/** Setter for {@link EntityStateUpdatePdu#padding1}*/
-public EntityStateUpdatePdu setPadding1(byte pPadding1)
+}
+
+/** Setter for {@link EntityStateUpdatePdu#padding1}*/
+public EntityStateUpdatePdu setPadding1(byte pPadding1)
{
- padding1 = pPadding1;
- return this;
-}
-
-/** Getter for {@link EntityStateUpdatePdu#padding1}*/
-public byte getPadding1()
+ padding1 = pPadding1;
+ return this;
+}
+
+/** Getter for {@link EntityStateUpdatePdu#padding1}*/
+public byte getPadding1()
{
return padding1;
-}
-
-/** Setter for {@link EntityStateUpdatePdu#entityLinearVelocity}*/
-public EntityStateUpdatePdu setEntityLinearVelocity(Vector3Float pEntityLinearVelocity)
+}
+
+/** Setter for {@link EntityStateUpdatePdu#entityLinearVelocity}*/
+public EntityStateUpdatePdu setEntityLinearVelocity(Vector3Float pEntityLinearVelocity)
{
- entityLinearVelocity = pEntityLinearVelocity;
- return this;
-}
-
-/** Getter for {@link EntityStateUpdatePdu#entityLinearVelocity}*/
-public Vector3Float getEntityLinearVelocity()
+ entityLinearVelocity = pEntityLinearVelocity;
+ return this;
+}
+
+/** Getter for {@link EntityStateUpdatePdu#entityLinearVelocity}*/
+public Vector3Float getEntityLinearVelocity()
{
return entityLinearVelocity;
-}
-
-/** Setter for {@link EntityStateUpdatePdu#entityLocation}*/
-public EntityStateUpdatePdu setEntityLocation(Vector3Double pEntityLocation)
+}
+
+/** Setter for {@link EntityStateUpdatePdu#entityLocation}*/
+public EntityStateUpdatePdu setEntityLocation(Vector3Double pEntityLocation)
{
- entityLocation = pEntityLocation;
- return this;
-}
-
-/** Getter for {@link EntityStateUpdatePdu#entityLocation}*/
-public Vector3Double getEntityLocation()
+ entityLocation = pEntityLocation;
+ return this;
+}
+
+/** Getter for {@link EntityStateUpdatePdu#entityLocation}*/
+public Vector3Double getEntityLocation()
{
return entityLocation;
-}
-
-/** Setter for {@link EntityStateUpdatePdu#entityOrientation}*/
-public EntityStateUpdatePdu setEntityOrientation(EulerAngles pEntityOrientation)
+}
+
+/** Setter for {@link EntityStateUpdatePdu#entityOrientation}*/
+public EntityStateUpdatePdu setEntityOrientation(EulerAngles pEntityOrientation)
{
- entityOrientation = pEntityOrientation;
- return this;
-}
-
-/** Getter for {@link EntityStateUpdatePdu#entityOrientation}*/
-public EulerAngles getEntityOrientation()
+ entityOrientation = pEntityOrientation;
+ return this;
+}
+
+/** Getter for {@link EntityStateUpdatePdu#entityOrientation}*/
+public EulerAngles getEntityOrientation()
{
return entityOrientation;
-}
-
-/** Setter for {@link EntityStateUpdatePdu#entityAppearance}*/
-public EntityStateUpdatePdu setEntityAppearance(int pEntityAppearance)
+}
+
+/** Setter for {@link EntityStateUpdatePdu#entityAppearance}*/
+public EntityStateUpdatePdu setEntityAppearance(int pEntityAppearance)
{
- entityAppearance = pEntityAppearance;
- return this;
-}
-
-/** Getter for {@link EntityStateUpdatePdu#entityAppearance}*/
-public int getEntityAppearance()
+ entityAppearance = pEntityAppearance;
+ return this;
+}
+
+/** Getter for {@link EntityStateUpdatePdu#entityAppearance}*/
+public int getEntityAppearance()
{
return entityAppearance;
-}
-
-/** Setter for {@link EntityStateUpdatePdu#variableParameters}*/
-public EntityStateUpdatePdu setVariableParameters(List<VariableParameter> pVariableParameters)
+}
+
+/** Setter for {@link EntityStateUpdatePdu#variableParameters}*/
+public EntityStateUpdatePdu setVariableParameters(List<VariableParameter> pVariableParameters)
{
- variableParameters = pVariableParameters;
- return this;
-}
-
-/** Getter for {@link EntityStateUpdatePdu#variableParameters}*/
-public List<VariableParameter> getVariableParameters()
+ variableParameters = pVariableParameters;
+ return this;
+}
+
+/** Getter for {@link EntityStateUpdatePdu#variableParameters}*/
+public List<VariableParameter> getVariableParameters()
{
return variableParameters;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- entityID.marshal(dos);
- dos.writeByte(padding1);
- dos.writeByte(variableParameters.size());
- entityLinearVelocity.marshal(dos);
- entityLocation.marshal(dos);
- entityOrientation.marshal(dos);
- dos.writeInt(entityAppearance);
-
- for(int idx = 0; idx < variableParameters.size(); idx++)
- {
- VariableParameter aVariableParameter = variableParameters.get(idx);
- aVariableParameter.marshal(dos);
- }
-
+ {
+ entityID.marshal(dos);
+ dos.writeByte(padding1);
+ dos.writeByte(variableParameters.size());
+ entityLinearVelocity.marshal(dos);
+ entityLocation.marshal(dos);
+ entityOrientation.marshal(dos);
+ dos.writeInt(entityAppearance);
+
+ for(int idx = 0; idx < variableParameters.size(); idx++)
+ {
+ VariableParameter aVariableParameter = variableParameters.get(idx);
+ aVariableParameter.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += entityID.unmarshal(dis);
- padding1 = (byte)dis.readUnsignedByte();
- uPosition += 1;
- numberOfVariableParameters = (byte)dis.readUnsignedByte();
- uPosition += 1;
- uPosition += entityLinearVelocity.unmarshal(dis);
- uPosition += entityLocation.unmarshal(dis);
- uPosition += entityOrientation.unmarshal(dis);
- entityAppearance = dis.readInt();
- uPosition += 4;
- for(int idx = 0; idx < numberOfVariableParameters; idx++)
- {
- VariableParameter anX = new VariableParameter();
- uPosition += anX.unmarshal(dis);
- variableParameters.add(anX);
- }
-
+ {
+ uPosition += entityID.unmarshal(dis);
+ padding1 = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ numberOfVariableParameters = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ uPosition += entityLinearVelocity.unmarshal(dis);
+ uPosition += entityLocation.unmarshal(dis);
+ uPosition += entityOrientation.unmarshal(dis);
+ entityAppearance = dis.readInt();
+ uPosition += 4;
+ for(int idx = 0; idx < numberOfVariableParameters; idx++)
+ {
+ VariableParameter anX = new VariableParameter();
+ uPosition += anX.unmarshal(dis);
+ variableParameters.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- entityID.marshal(buff);
- buff.put( (byte)padding1);
- buff.put( (byte)variableParameters.size());
- entityLinearVelocity.marshal(buff);
- entityLocation.marshal(buff);
- entityOrientation.marshal(buff);
- buff.putInt( (int)entityAppearance);
-
- for(int idx = 0; idx < variableParameters.size(); idx++)
- {
- VariableParameter aVariableParameter = variableParameters.get(idx);
- aVariableParameter.marshal(buff);
- }
-
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ entityID.marshal(buff);
+ buff.put( (byte)padding1);
+ buff.put( (byte)variableParameters.size());
+ entityLinearVelocity.marshal(buff);
+ entityLocation.marshal(buff);
+ entityOrientation.marshal(buff);
+ buff.putInt( (int)entityAppearance);
+
+ for(int idx = 0; idx < variableParameters.size(); idx++)
+ {
+ VariableParameter aVariableParameter = variableParameters.get(idx);
+ aVariableParameter.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- entityID.unmarshal(buff);
- padding1 = (byte)(buff.get() & 0xFF);
- numberOfVariableParameters = (byte)(buff.get() & 0xFF);
- entityLinearVelocity.unmarshal(buff);
- entityLocation.unmarshal(buff);
- entityOrientation.unmarshal(buff);
- entityAppearance = buff.getInt();
- for(int idx = 0; idx < numberOfVariableParameters; idx++)
- {
- VariableParameter anX = new VariableParameter();
- anX.unmarshal(buff);
- variableParameters.add(anX);
- }
-
- return getMarshalledSize();
+
+ entityID.unmarshal(buff);
+ padding1 = (byte)(buff.get() & 0xFF);
+ numberOfVariableParameters = (byte)(buff.get() & 0xFF);
+ entityLinearVelocity.unmarshal(buff);
+ entityLocation.unmarshal(buff);
+ entityOrientation.unmarshal(buff);
+ entityAppearance = buff.getInt();
+ for(int idx = 0; idx < numberOfVariableParameters; idx++)
+ {
+ VariableParameter anX = new VariableParameter();
+ anX.unmarshal(buff);
+ variableParameters.add(anX);
+ }
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final EntityStateUpdatePdu rhs = (EntityStateUpdatePdu)obj;
-
- if( ! (entityID.equals( rhs.entityID) )) ivarsEqual = false;
- if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
- if( ! (entityLinearVelocity.equals( rhs.entityLinearVelocity) )) ivarsEqual = false;
- if( ! (entityLocation.equals( rhs.entityLocation) )) ivarsEqual = false;
- if( ! (entityOrientation.equals( rhs.entityOrientation) )) ivarsEqual = false;
- if( ! (entityAppearance == rhs.entityAppearance)) ivarsEqual = false;
-
- for(int idx = 0; idx < variableParameters.size(); idx++)
- if( ! ( variableParameters.get(idx).equals(rhs.variableParameters.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final EntityStateUpdatePdu rhs = (EntityStateUpdatePdu)obj;
+
+ if( ! (entityID.equals( rhs.entityID) )) ivarsEqual = false;
+ if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
+ if( ! (entityLinearVelocity.equals( rhs.entityLinearVelocity) )) ivarsEqual = false;
+ if( ! (entityLocation.equals( rhs.entityLocation) )) ivarsEqual = false;
+ if( ! (entityOrientation.equals( rhs.entityOrientation) )) ivarsEqual = false;
+ if( ! (entityAppearance == rhs.entityAppearance)) ivarsEqual = false;
+
+ for(int idx = 0; idx < variableParameters.size(); idx++)
+ if( ! ( variableParameters.get(idx).equals(rhs.variableParameters.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" entityID: ").append(entityID).append("\n");
- sb.append(" padding1: ").append(padding1).append("\n");
- sb.append(" entityLinearVelocity: ").append(entityLinearVelocity).append("\n");
- sb.append(" entityLocation: ").append(entityLocation).append("\n");
- sb.append(" entityOrientation: ").append(entityOrientation).append("\n");
- sb.append(" entityAppearance: ").append(entityAppearance).append("\n");
- sb.append(" variableParameters: ").append("\n");
- variableParameters.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" entityID: ").append(entityID).append("\n");
+ sb.append(" padding1: ").append(padding1).append("\n");
+ sb.append(" entityLinearVelocity: ").append(entityLinearVelocity).append("\n");
+ sb.append(" entityLocation: ").append(entityLocation).append("\n");
+ sb.append(" entityOrientation: ").append(entityOrientation).append("\n");
+ sb.append(" entityAppearance: ").append(entityAppearance).append("\n");
+ sb.append(" variableParameters: ").append("\n");
+ variableParameters.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EntityType.java b/src-generated/edu/nps/moves/dis7/EntityType.java
index ec666ad11239f4e6eeb3b82e091620c00b1c7157..25080bcc84b39ed8ef934e8646dbf0e1089758b4 100644
--- a/src-generated/edu/nps/moves/dis7/EntityType.java
+++ b/src-generated/edu/nps/moves/dis7/EntityType.java
@@ -1,304 +1,304 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Identifies the type of Entity
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class EntityType extends Object implements Serializable
-{
- /** Kind of entity uid 7 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Identifies the type of Entity
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class EntityType extends Object implements Serializable
+{
+ /** Kind of entity uid 7 */
protected EntityKind entityKind = EntityKind.values()[0];
-
- /** Domain of entity (air, surface, subsurface, space, etc) */
+
+ /** Domain of entity (air, surface, subsurface, space, etc) */
protected Domain domain = Domain.inst(PlatformDomain.OTHER);
-
- /** country to which the design of the entity is attributed uid 29 */
+
+ /** country to which the design of the entity is attributed uid 29 */
protected Country country = Country.values()[0];
-
- /** category of entity */
+
+ /** category of entity */
protected byte category;
-
- /** subcategory based on category */
+
+ /** subcategory based on category */
protected byte subCategory;
-
- /** specific info based on subcategory */
+
+ /** specific info based on subcategory */
protected byte specific;
-
+
protected byte extra;
-
-
-/** Constructor */
- public EntityType()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += entityKind.getMarshalledSize();
- marshalSize += domain.getMarshalledSize();
- marshalSize += country.getMarshalledSize();
- marshalSize += 1; // category
- marshalSize += 1; // subCategory
- marshalSize += 1; // specific
- marshalSize += 1; // extra
-
- return marshalSize;
-}
-
-
-/** Setter for {@link EntityType#entityKind}*/
-public EntityType setEntityKind(EntityKind pEntityKind)
+
+
+/** Constructor */
+ public EntityType()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += entityKind.getMarshalledSize();
+ marshalSize += domain.getMarshalledSize();
+ marshalSize += country.getMarshalledSize();
+ marshalSize += 1; // category
+ marshalSize += 1; // subCategory
+ marshalSize += 1; // specific
+ marshalSize += 1; // extra
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link EntityType#entityKind}*/
+public EntityType setEntityKind(EntityKind pEntityKind)
{
- entityKind = pEntityKind;
- return this;
-}
-
-/** Getter for {@link EntityType#entityKind}*/
-public EntityKind getEntityKind()
+ entityKind = pEntityKind;
+ return this;
+}
+
+/** Getter for {@link EntityType#entityKind}*/
+public EntityKind getEntityKind()
{
return entityKind;
-}
-
-/** Setter for {@link EntityType#domain}*/
-public EntityType setDomain(Domain pDomain)
+}
+
+/** Setter for {@link EntityType#domain}*/
+public EntityType setDomain(Domain pDomain)
{
- domain = pDomain;
- return this;
-}
-
-/** Getter for {@link EntityType#domain}*/
-public Domain getDomain()
+ domain = pDomain;
+ return this;
+}
+
+/** Getter for {@link EntityType#domain}*/
+public Domain getDomain()
{
return domain;
-}
-
-/** Setter for {@link EntityType#country}*/
-public EntityType setCountry(Country pCountry)
+}
+
+/** Setter for {@link EntityType#country}*/
+public EntityType setCountry(Country pCountry)
{
- country = pCountry;
- return this;
-}
-
-/** Getter for {@link EntityType#country}*/
-public Country getCountry()
+ country = pCountry;
+ return this;
+}
+
+/** Getter for {@link EntityType#country}*/
+public Country getCountry()
{
return country;
-}
-
-/** Setter for {@link EntityType#category}*/
-public EntityType setCategory(byte pCategory)
+}
+
+/** Setter for {@link EntityType#category}*/
+public EntityType setCategory(byte pCategory)
{
- category = pCategory;
- return this;
-}
-
-/** Getter for {@link EntityType#category}*/
-public byte getCategory()
+ category = pCategory;
+ return this;
+}
+
+/** Getter for {@link EntityType#category}*/
+public byte getCategory()
{
return category;
-}
-
-/** Setter for {@link EntityType#subCategory}*/
-public EntityType setSubCategory(byte pSubCategory)
+}
+
+/** Setter for {@link EntityType#subCategory}*/
+public EntityType setSubCategory(byte pSubCategory)
{
- subCategory = pSubCategory;
- return this;
-}
-
-/** Getter for {@link EntityType#subCategory}*/
-public byte getSubCategory()
+ subCategory = pSubCategory;
+ return this;
+}
+
+/** Getter for {@link EntityType#subCategory}*/
+public byte getSubCategory()
{
return subCategory;
-}
-
-/** Setter for {@link EntityType#specific}*/
-public EntityType setSpecific(byte pSpecific)
+}
+
+/** Setter for {@link EntityType#specific}*/
+public EntityType setSpecific(byte pSpecific)
{
- specific = pSpecific;
- return this;
-}
-
-/** Getter for {@link EntityType#specific}*/
-public byte getSpecific()
+ specific = pSpecific;
+ return this;
+}
+
+/** Getter for {@link EntityType#specific}*/
+public byte getSpecific()
{
return specific;
-}
-
-/** Setter for {@link EntityType#extra}*/
-public EntityType setExtra(byte pExtra)
+}
+
+/** Setter for {@link EntityType#extra}*/
+public EntityType setExtra(byte pExtra)
{
- extra = pExtra;
- return this;
-}
-
-/** Getter for {@link EntityType#extra}*/
-public byte getExtra()
+ extra = pExtra;
+ return this;
+}
+
+/** Getter for {@link EntityType#extra}*/
+public byte getExtra()
{
return extra;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- entityKind.marshal(dos);
- domain.marshal(dos);
- country.marshal(dos);
- dos.writeByte(category);
- dos.writeByte(subCategory);
- dos.writeByte(specific);
- dos.writeByte(extra);
+ {
+ entityKind.marshal(dos);
+ domain.marshal(dos);
+ country.marshal(dos);
+ dos.writeByte(category);
+ dos.writeByte(subCategory);
+ dos.writeByte(specific);
+ dos.writeByte(extra);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- entityKind = EntityKind.unmarshalEnum(dis);
- uPosition += entityKind.getMarshalledSize();
- uPosition += domain.unmarshal(dis);
- country = Country.unmarshalEnum(dis);
- uPosition += country.getMarshalledSize();
- category = (byte)dis.readUnsignedByte();
- uPosition += 1;
- subCategory = (byte)dis.readUnsignedByte();
- uPosition += 1;
- specific = (byte)dis.readUnsignedByte();
- uPosition += 1;
- extra = (byte)dis.readUnsignedByte();
- uPosition += 1;
+ {
+ entityKind = EntityKind.unmarshalEnum(dis);
+ uPosition += entityKind.getMarshalledSize();
+ uPosition += domain.unmarshal(dis);
+ country = Country.unmarshalEnum(dis);
+ uPosition += country.getMarshalledSize();
+ category = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ subCategory = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ specific = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ extra = (byte)dis.readUnsignedByte();
+ uPosition += 1;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- entityKind.marshal(buff);
- domain.marshal(buff);
- country.marshal(buff);
- buff.put( (byte)category);
- buff.put( (byte)subCategory);
- buff.put( (byte)specific);
- buff.put( (byte)extra);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- entityKind = EntityKind.unmarshalEnum(buff);
- domain.unmarshal(buff);
- country = Country.unmarshalEnum(buff);
- category = (byte)(buff.get() & 0xFF);
- subCategory = (byte)(buff.get() & 0xFF);
- specific = (byte)(buff.get() & 0xFF);
- extra = (byte)(buff.get() & 0xFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ entityKind.marshal(buff);
+ domain.marshal(buff);
+ country.marshal(buff);
+ buff.put( (byte)category);
+ buff.put( (byte)subCategory);
+ buff.put( (byte)specific);
+ buff.put( (byte)extra);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ entityKind = EntityKind.unmarshalEnum(buff);
+ domain.unmarshal(buff);
+ country = Country.unmarshalEnum(buff);
+ category = (byte)(buff.get() & 0xFF);
+ subCategory = (byte)(buff.get() & 0xFF);
+ specific = (byte)(buff.get() & 0xFF);
+ extra = (byte)(buff.get() & 0xFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final EntityType rhs = (EntityType)obj;
-
- if( ! (entityKind == rhs.entityKind)) ivarsEqual = false;
- if( ! (domain.equals( rhs.domain) )) ivarsEqual = false;
- if( ! (country == rhs.country)) ivarsEqual = false;
- if( ! (category == rhs.category)) ivarsEqual = false;
- if( ! (subCategory == rhs.subCategory)) ivarsEqual = false;
- if( ! (specific == rhs.specific)) ivarsEqual = false;
- if( ! (extra == rhs.extra)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final EntityType rhs = (EntityType)obj;
+
+ if( ! (entityKind == rhs.entityKind)) ivarsEqual = false;
+ if( ! (domain.equals( rhs.domain) )) ivarsEqual = false;
+ if( ! (country == rhs.country)) ivarsEqual = false;
+ if( ! (category == rhs.category)) ivarsEqual = false;
+ if( ! (subCategory == rhs.subCategory)) ivarsEqual = false;
+ if( ! (specific == rhs.specific)) ivarsEqual = false;
+ if( ! (extra == rhs.extra)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" entityKind: ").append(entityKind).append("\n");
- sb.append(" domain: ").append(domain).append("\n");
- sb.append(" country: ").append(country).append("\n");
- sb.append(" category: ").append(category).append("\n");
- sb.append(" subCategory: ").append(subCategory).append("\n");
- sb.append(" specific: ").append(specific).append("\n");
- sb.append(" extra: ").append(extra).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" entityKind: ").append(entityKind).append("\n");
+ sb.append(" domain: ").append(domain).append("\n");
+ sb.append(" country: ").append(country).append("\n");
+ sb.append(" category: ").append(category).append("\n");
+ sb.append(" subCategory: ").append(subCategory).append("\n");
+ sb.append(" specific: ").append(specific).append("\n");
+ sb.append(" extra: ").append(extra).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EntityTypeRaw.java b/src-generated/edu/nps/moves/dis7/EntityTypeRaw.java
index cdf1dae870d388fcdffe07ac42bbd8a582f07187..cbb028fd243de5d79462fecbe96f2ac742253c66 100644
--- a/src-generated/edu/nps/moves/dis7/EntityTypeRaw.java
+++ b/src-generated/edu/nps/moves/dis7/EntityTypeRaw.java
@@ -1,305 +1,305 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Identifies the type of Entity
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class EntityTypeRaw extends Object implements Serializable
-{
- /** Kind of entity uid 7 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Identifies the type of Entity
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class EntityTypeRaw extends Object implements Serializable
+{
+ /** Kind of entity uid 7 */
protected EntityKind entityKind = EntityKind.values()[0];
-
- /** Domain of entity (air, surface, subsurface, space, etc) */
+
+ /** Domain of entity (air, surface, subsurface, space, etc) */
protected byte domain;
-
- /** country to which the design of the entity is attributed */
+
+ /** country to which the design of the entity is attributed */
protected short country;
-
- /** category of entity */
+
+ /** category of entity */
protected byte category;
-
- /** subcategory of entity */
+
+ /** subcategory of entity */
protected byte subCategory;
-
- /** specific info based on subcategory field. Renamed from specific because that is a reserved word in SQL. */
+
+ /** specific info based on subcategory field. Renamed from specific because that is a reserved word in SQL. */
protected byte specific;
-
+
protected byte extra;
-
-
-/** Constructor */
- public EntityTypeRaw()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += entityKind.getMarshalledSize();
- marshalSize += 1; // domain
- marshalSize += 2; // country
- marshalSize += 1; // category
- marshalSize += 1; // subCategory
- marshalSize += 1; // specific
- marshalSize += 1; // extra
-
- return marshalSize;
-}
-
-
-/** Setter for {@link EntityTypeRaw#entityKind}*/
-public EntityTypeRaw setEntityKind(EntityKind pEntityKind)
+
+
+/** Constructor */
+ public EntityTypeRaw()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += entityKind.getMarshalledSize();
+ marshalSize += 1; // domain
+ marshalSize += 2; // country
+ marshalSize += 1; // category
+ marshalSize += 1; // subCategory
+ marshalSize += 1; // specific
+ marshalSize += 1; // extra
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link EntityTypeRaw#entityKind}*/
+public EntityTypeRaw setEntityKind(EntityKind pEntityKind)
{
- entityKind = pEntityKind;
- return this;
-}
-
-/** Getter for {@link EntityTypeRaw#entityKind}*/
-public EntityKind getEntityKind()
+ entityKind = pEntityKind;
+ return this;
+}
+
+/** Getter for {@link EntityTypeRaw#entityKind}*/
+public EntityKind getEntityKind()
{
return entityKind;
-}
-
-/** Setter for {@link EntityTypeRaw#domain}*/
-public EntityTypeRaw setDomain(byte pDomain)
+}
+
+/** Setter for {@link EntityTypeRaw#domain}*/
+public EntityTypeRaw setDomain(byte pDomain)
{
- domain = pDomain;
- return this;
-}
-
-/** Getter for {@link EntityTypeRaw#domain}*/
-public byte getDomain()
+ domain = pDomain;
+ return this;
+}
+
+/** Getter for {@link EntityTypeRaw#domain}*/
+public byte getDomain()
{
return domain;
-}
-
-/** Setter for {@link EntityTypeRaw#country}*/
-public EntityTypeRaw setCountry(short pCountry)
+}
+
+/** Setter for {@link EntityTypeRaw#country}*/
+public EntityTypeRaw setCountry(short pCountry)
{
- country = pCountry;
- return this;
-}
-
-/** Getter for {@link EntityTypeRaw#country}*/
-public short getCountry()
+ country = pCountry;
+ return this;
+}
+
+/** Getter for {@link EntityTypeRaw#country}*/
+public short getCountry()
{
return country;
-}
-
-/** Setter for {@link EntityTypeRaw#category}*/
-public EntityTypeRaw setCategory(byte pCategory)
+}
+
+/** Setter for {@link EntityTypeRaw#category}*/
+public EntityTypeRaw setCategory(byte pCategory)
{
- category = pCategory;
- return this;
-}
-
-/** Getter for {@link EntityTypeRaw#category}*/
-public byte getCategory()
+ category = pCategory;
+ return this;
+}
+
+/** Getter for {@link EntityTypeRaw#category}*/
+public byte getCategory()
{
return category;
-}
-
-/** Setter for {@link EntityTypeRaw#subCategory}*/
-public EntityTypeRaw setSubCategory(byte pSubCategory)
+}
+
+/** Setter for {@link EntityTypeRaw#subCategory}*/
+public EntityTypeRaw setSubCategory(byte pSubCategory)
{
- subCategory = pSubCategory;
- return this;
-}
-
-/** Getter for {@link EntityTypeRaw#subCategory}*/
-public byte getSubCategory()
+ subCategory = pSubCategory;
+ return this;
+}
+
+/** Getter for {@link EntityTypeRaw#subCategory}*/
+public byte getSubCategory()
{
return subCategory;
-}
-
-/** Setter for {@link EntityTypeRaw#specific}*/
-public EntityTypeRaw setSpecific(byte pSpecific)
+}
+
+/** Setter for {@link EntityTypeRaw#specific}*/
+public EntityTypeRaw setSpecific(byte pSpecific)
{
- specific = pSpecific;
- return this;
-}
-
-/** Getter for {@link EntityTypeRaw#specific}*/
-public byte getSpecific()
+ specific = pSpecific;
+ return this;
+}
+
+/** Getter for {@link EntityTypeRaw#specific}*/
+public byte getSpecific()
{
return specific;
-}
-
-/** Setter for {@link EntityTypeRaw#extra}*/
-public EntityTypeRaw setExtra(byte pExtra)
+}
+
+/** Setter for {@link EntityTypeRaw#extra}*/
+public EntityTypeRaw setExtra(byte pExtra)
{
- extra = pExtra;
- return this;
-}
-
-/** Getter for {@link EntityTypeRaw#extra}*/
-public byte getExtra()
+ extra = pExtra;
+ return this;
+}
+
+/** Getter for {@link EntityTypeRaw#extra}*/
+public byte getExtra()
{
return extra;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- entityKind.marshal(dos);
- dos.writeByte(domain);
- dos.writeShort(country);
- dos.writeByte(category);
- dos.writeByte(subCategory);
- dos.writeByte(specific);
- dos.writeByte(extra);
+ {
+ entityKind.marshal(dos);
+ dos.writeByte(domain);
+ dos.writeShort(country);
+ dos.writeByte(category);
+ dos.writeByte(subCategory);
+ dos.writeByte(specific);
+ dos.writeByte(extra);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- entityKind = EntityKind.unmarshalEnum(dis);
- uPosition += entityKind.getMarshalledSize();
- domain = (byte)dis.readUnsignedByte();
- uPosition += 1;
- country = (short)dis.readUnsignedShort();
- uPosition += 2;
- category = (byte)dis.readUnsignedByte();
- uPosition += 1;
- subCategory = (byte)dis.readUnsignedByte();
- uPosition += 1;
- specific = (byte)dis.readUnsignedByte();
- uPosition += 1;
- extra = (byte)dis.readUnsignedByte();
- uPosition += 1;
+ {
+ entityKind = EntityKind.unmarshalEnum(dis);
+ uPosition += entityKind.getMarshalledSize();
+ domain = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ country = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ category = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ subCategory = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ specific = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ extra = (byte)dis.readUnsignedByte();
+ uPosition += 1;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- entityKind.marshal(buff);
- buff.put( (byte)domain);
- buff.putShort( (short)country);
- buff.put( (byte)category);
- buff.put( (byte)subCategory);
- buff.put( (byte)specific);
- buff.put( (byte)extra);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- entityKind = EntityKind.unmarshalEnum(buff);
- domain = (byte)(buff.get() & 0xFF);
- country = (short)(buff.getShort() & 0xFFFF);
- category = (byte)(buff.get() & 0xFF);
- subCategory = (byte)(buff.get() & 0xFF);
- specific = (byte)(buff.get() & 0xFF);
- extra = (byte)(buff.get() & 0xFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ entityKind.marshal(buff);
+ buff.put( (byte)domain);
+ buff.putShort( (short)country);
+ buff.put( (byte)category);
+ buff.put( (byte)subCategory);
+ buff.put( (byte)specific);
+ buff.put( (byte)extra);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ entityKind = EntityKind.unmarshalEnum(buff);
+ domain = (byte)(buff.get() & 0xFF);
+ country = (short)(buff.getShort() & 0xFFFF);
+ category = (byte)(buff.get() & 0xFF);
+ subCategory = (byte)(buff.get() & 0xFF);
+ specific = (byte)(buff.get() & 0xFF);
+ extra = (byte)(buff.get() & 0xFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final EntityTypeRaw rhs = (EntityTypeRaw)obj;
-
- if( ! (entityKind == rhs.entityKind)) ivarsEqual = false;
- if( ! (domain == rhs.domain)) ivarsEqual = false;
- if( ! (country == rhs.country)) ivarsEqual = false;
- if( ! (category == rhs.category)) ivarsEqual = false;
- if( ! (subCategory == rhs.subCategory)) ivarsEqual = false;
- if( ! (specific == rhs.specific)) ivarsEqual = false;
- if( ! (extra == rhs.extra)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final EntityTypeRaw rhs = (EntityTypeRaw)obj;
+
+ if( ! (entityKind == rhs.entityKind)) ivarsEqual = false;
+ if( ! (domain == rhs.domain)) ivarsEqual = false;
+ if( ! (country == rhs.country)) ivarsEqual = false;
+ if( ! (category == rhs.category)) ivarsEqual = false;
+ if( ! (subCategory == rhs.subCategory)) ivarsEqual = false;
+ if( ! (specific == rhs.specific)) ivarsEqual = false;
+ if( ! (extra == rhs.extra)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" entityKind: ").append(entityKind).append("\n");
- sb.append(" domain: ").append(domain).append("\n");
- sb.append(" country: ").append(country).append("\n");
- sb.append(" category: ").append(category).append("\n");
- sb.append(" subCategory: ").append(subCategory).append("\n");
- sb.append(" specific: ").append(specific).append("\n");
- sb.append(" extra: ").append(extra).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" entityKind: ").append(entityKind).append("\n");
+ sb.append(" domain: ").append(domain).append("\n");
+ sb.append(" country: ").append(country).append("\n");
+ sb.append(" category: ").append(category).append("\n");
+ sb.append(" subCategory: ").append(subCategory).append("\n");
+ sb.append(" specific: ").append(specific).append("\n");
+ sb.append(" extra: ").append(extra).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EntityTypeVP.java b/src-generated/edu/nps/moves/dis7/EntityTypeVP.java
index 6a8956ef8c940c0b49e1f4e858cc2e4872a6858e..7cdd884fbbc3cf63ad5fbb5aaa3c606a1757d318 100644
--- a/src-generated/edu/nps/moves/dis7/EntityTypeVP.java
+++ b/src-generated/edu/nps/moves/dis7/EntityTypeVP.java
@@ -1,257 +1,257 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Association or disassociation of two entities. Section 6.2.94.5
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class EntityTypeVP extends Object implements Serializable
-{
- /** the identification of the Variable Parameter record. uid 56 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Association or disassociation of two entities. Section 6.2.94.5
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class EntityTypeVP extends Object implements Serializable
+{
+ /** the identification of the Variable Parameter record. uid 56 */
protected VariableParameterRecordType recordType = VariableParameterRecordType.ENTITY_TYPE;
-
- /** Indicates if this VP has changed since last issuance uid 320 */
+
+ /** Indicates if this VP has changed since last issuance uid 320 */
protected EntityVPRecordChangeIndicator changeIndicator = EntityVPRecordChangeIndicator.values()[0];
-
- /** */
+
+ /** */
protected EntityType entityType = new EntityType();
-
- /** padding */
+
+ /** padding */
protected short padding = (short)0;
-
- /** padding */
+
+ /** padding */
protected int padding1 = (int)0;
-
-
-/** Constructor */
- public EntityTypeVP()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public EntityTypeVP()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += recordType.getMarshalledSize();
+ marshalSize += changeIndicator.getMarshalledSize();
+ marshalSize += entityType.getMarshalledSize();
+ marshalSize += 2; // padding
+ marshalSize += 4; // padding1
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link EntityTypeVP#recordType}*/
+public EntityTypeVP setRecordType(VariableParameterRecordType pRecordType)
{
- int marshalSize = 0;
-
- marshalSize += recordType.getMarshalledSize();
- marshalSize += changeIndicator.getMarshalledSize();
- marshalSize += entityType.getMarshalledSize();
- marshalSize += 2; // padding
- marshalSize += 4; // padding1
-
- return marshalSize;
-}
-
-
-/** Setter for {@link EntityTypeVP#recordType}*/
-public EntityTypeVP setRecordType(VariableParameterRecordType pRecordType)
-{
- recordType = pRecordType;
- return this;
-}
-
-/** Getter for {@link EntityTypeVP#recordType}*/
-public VariableParameterRecordType getRecordType()
+ recordType = pRecordType;
+ return this;
+}
+
+/** Getter for {@link EntityTypeVP#recordType}*/
+public VariableParameterRecordType getRecordType()
{
return recordType;
-}
-
-/** Setter for {@link EntityTypeVP#changeIndicator}*/
-public EntityTypeVP setChangeIndicator(EntityVPRecordChangeIndicator pChangeIndicator)
+}
+
+/** Setter for {@link EntityTypeVP#changeIndicator}*/
+public EntityTypeVP setChangeIndicator(EntityVPRecordChangeIndicator pChangeIndicator)
{
- changeIndicator = pChangeIndicator;
- return this;
-}
-
-/** Getter for {@link EntityTypeVP#changeIndicator}*/
-public EntityVPRecordChangeIndicator getChangeIndicator()
+ changeIndicator = pChangeIndicator;
+ return this;
+}
+
+/** Getter for {@link EntityTypeVP#changeIndicator}*/
+public EntityVPRecordChangeIndicator getChangeIndicator()
{
return changeIndicator;
-}
-
-/** Setter for {@link EntityTypeVP#entityType}*/
-public EntityTypeVP setEntityType(EntityType pEntityType)
+}
+
+/** Setter for {@link EntityTypeVP#entityType}*/
+public EntityTypeVP setEntityType(EntityType pEntityType)
{
- entityType = pEntityType;
- return this;
-}
-
-/** Getter for {@link EntityTypeVP#entityType}*/
-public EntityType getEntityType()
+ entityType = pEntityType;
+ return this;
+}
+
+/** Getter for {@link EntityTypeVP#entityType}*/
+public EntityType getEntityType()
{
return entityType;
-}
-
-/** Setter for {@link EntityTypeVP#padding}*/
-public EntityTypeVP setPadding(short pPadding)
+}
+
+/** Setter for {@link EntityTypeVP#padding}*/
+public EntityTypeVP setPadding(short pPadding)
{
- padding = pPadding;
- return this;
-}
-
-/** Getter for {@link EntityTypeVP#padding}*/
-public short getPadding()
+ padding = pPadding;
+ return this;
+}
+
+/** Getter for {@link EntityTypeVP#padding}*/
+public short getPadding()
{
return padding;
-}
-
-/** Setter for {@link EntityTypeVP#padding1}*/
-public EntityTypeVP setPadding1(int pPadding1)
+}
+
+/** Setter for {@link EntityTypeVP#padding1}*/
+public EntityTypeVP setPadding1(int pPadding1)
{
- padding1 = pPadding1;
- return this;
-}
-
-/** Getter for {@link EntityTypeVP#padding1}*/
-public int getPadding1()
+ padding1 = pPadding1;
+ return this;
+}
+
+/** Getter for {@link EntityTypeVP#padding1}*/
+public int getPadding1()
{
return padding1;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- recordType.marshal(dos);
- changeIndicator.marshal(dos);
- entityType.marshal(dos);
- dos.writeShort(padding);
- dos.writeInt(padding1);
+ {
+ recordType.marshal(dos);
+ changeIndicator.marshal(dos);
+ entityType.marshal(dos);
+ dos.writeShort(padding);
+ dos.writeInt(padding1);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- recordType = VariableParameterRecordType.unmarshalEnum(dis);
- uPosition += recordType.getMarshalledSize();
- changeIndicator = EntityVPRecordChangeIndicator.unmarshalEnum(dis);
- uPosition += changeIndicator.getMarshalledSize();
- uPosition += entityType.unmarshal(dis);
- padding = (short)dis.readUnsignedShort();
- uPosition += 2;
- padding1 = dis.readInt();
- uPosition += 4;
+ {
+ recordType = VariableParameterRecordType.unmarshalEnum(dis);
+ uPosition += recordType.getMarshalledSize();
+ changeIndicator = EntityVPRecordChangeIndicator.unmarshalEnum(dis);
+ uPosition += changeIndicator.getMarshalledSize();
+ uPosition += entityType.unmarshal(dis);
+ padding = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ padding1 = dis.readInt();
+ uPosition += 4;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- recordType.marshal(buff);
- changeIndicator.marshal(buff);
- entityType.marshal(buff);
- buff.putShort( (short)padding);
- buff.putInt( (int)padding1);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- recordType = VariableParameterRecordType.unmarshalEnum(buff);
- changeIndicator = EntityVPRecordChangeIndicator.unmarshalEnum(buff);
- entityType.unmarshal(buff);
- padding = (short)(buff.getShort() & 0xFFFF);
- padding1 = buff.getInt();
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ recordType.marshal(buff);
+ changeIndicator.marshal(buff);
+ entityType.marshal(buff);
+ buff.putShort( (short)padding);
+ buff.putInt( (int)padding1);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ recordType = VariableParameterRecordType.unmarshalEnum(buff);
+ changeIndicator = EntityVPRecordChangeIndicator.unmarshalEnum(buff);
+ entityType.unmarshal(buff);
+ padding = (short)(buff.getShort() & 0xFFFF);
+ padding1 = buff.getInt();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final EntityTypeVP rhs = (EntityTypeVP)obj;
-
- if( ! (recordType == rhs.recordType)) ivarsEqual = false;
- if( ! (changeIndicator == rhs.changeIndicator)) ivarsEqual = false;
- if( ! (entityType.equals( rhs.entityType) )) ivarsEqual = false;
- if( ! (padding == rhs.padding)) ivarsEqual = false;
- if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final EntityTypeVP rhs = (EntityTypeVP)obj;
+
+ if( ! (recordType == rhs.recordType)) ivarsEqual = false;
+ if( ! (changeIndicator == rhs.changeIndicator)) ivarsEqual = false;
+ if( ! (entityType.equals( rhs.entityType) )) ivarsEqual = false;
+ if( ! (padding == rhs.padding)) ivarsEqual = false;
+ if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" recordType: ").append(recordType).append("\n");
- sb.append(" changeIndicator: ").append(changeIndicator).append("\n");
- sb.append(" entityType: ").append(entityType).append("\n");
- sb.append(" padding: ").append(padding).append("\n");
- sb.append(" padding1: ").append(padding1).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" recordType: ").append(recordType).append("\n");
+ sb.append(" changeIndicator: ").append(changeIndicator).append("\n");
+ sb.append(" entityType: ").append(entityType).append("\n");
+ sb.append(" padding: ").append(padding).append("\n");
+ sb.append(" padding1: ").append(padding1).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/Environment.java b/src-generated/edu/nps/moves/dis7/Environment.java
index 8004254a37e5b44778d5a59dff0aa1787877480e..e142b07c1cb7d5deae5908e0c8a9896cb544f2a6 100644
--- a/src-generated/edu/nps/moves/dis7/Environment.java
+++ b/src-generated/edu/nps/moves/dis7/Environment.java
@@ -1,281 +1,281 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Information about a geometry, a state associated with a geometry, a bounding volume, or an associated entity ID. 6.2.31, not fully defined. 'The current definitions can be found in DIS PCR 240'
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class Environment extends Object implements Serializable
-{
- /** Record type uid 250 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Information about a geometry, a state associated with a geometry, a bounding volume, or an associated entity ID. 6.2.31, not fully defined. 'The current definitions can be found in DIS PCR 240'
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class Environment extends Object implements Serializable
+{
+ /** Record type uid 250 */
protected EnvironmentalProcessRecordType environmentType = EnvironmentalProcessRecordType.values()[0];
-
- /** length, in bits */
+
+ /** length, in bits */
protected short length;
-
- /** Identify the sequentially numbered record index */
+
+ /** Identify the sequentially numbered record index */
protected byte index;
-
- /** padding */
+
+ /** padding */
protected byte padding1;
-
- /** Geometry or state record */
+
+ /** Geometry or state record */
protected byte[] geometry = new byte[0];
-
+
private byte[] padding2 = new byte[0]; // pad to 64-bit boundary
-
-
-/** Constructor */
- public Environment()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public Environment()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += environmentType.getMarshalledSize();
+ marshalSize += 2; // length
+ marshalSize += 1; // index
+ marshalSize += 1; // padding1
+ marshalSize += geometry.length * 1;
+ marshalSize += padding2.length;
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link Environment#environmentType}*/
+public Environment setEnvironmentType(EnvironmentalProcessRecordType pEnvironmentType)
{
- int marshalSize = 0;
-
- marshalSize += environmentType.getMarshalledSize();
- marshalSize += 2; // length
- marshalSize += 1; // index
- marshalSize += 1; // padding1
- marshalSize += geometry.length * 1;
- marshalSize += padding2.length;
-
- return marshalSize;
-}
-
-
-/** Setter for {@link Environment#environmentType}*/
-public Environment setEnvironmentType(EnvironmentalProcessRecordType pEnvironmentType)
-{
- environmentType = pEnvironmentType;
- return this;
-}
-
-/** Getter for {@link Environment#environmentType}*/
-public EnvironmentalProcessRecordType getEnvironmentType()
+ environmentType = pEnvironmentType;
+ return this;
+}
+
+/** Getter for {@link Environment#environmentType}*/
+public EnvironmentalProcessRecordType getEnvironmentType()
{
return environmentType;
-}
-
-/** Setter for {@link Environment#length}*/
-public Environment setLength(short pLength)
+}
+
+/** Setter for {@link Environment#length}*/
+public Environment setLength(short pLength)
{
- length = pLength;
- return this;
-}
-
-/** Getter for {@link Environment#length}*/
-public short getLength()
+ length = pLength;
+ return this;
+}
+
+/** Getter for {@link Environment#length}*/
+public short getLength()
{
return length;
-}
-
-/** Setter for {@link Environment#index}*/
-public Environment setIndex(byte pIndex)
+}
+
+/** Setter for {@link Environment#index}*/
+public Environment setIndex(byte pIndex)
{
- index = pIndex;
- return this;
-}
-
-/** Getter for {@link Environment#index}*/
-public byte getIndex()
+ index = pIndex;
+ return this;
+}
+
+/** Getter for {@link Environment#index}*/
+public byte getIndex()
{
return index;
-}
-
-/** Setter for {@link Environment#padding1}*/
-public Environment setPadding1(byte pPadding1)
+}
+
+/** Setter for {@link Environment#padding1}*/
+public Environment setPadding1(byte pPadding1)
{
- padding1 = pPadding1;
- return this;
-}
-
-/** Getter for {@link Environment#padding1}*/
-public byte getPadding1()
+ padding1 = pPadding1;
+ return this;
+}
+
+/** Getter for {@link Environment#padding1}*/
+public byte getPadding1()
{
return padding1;
-}
-
-/** Setter for {@link Environment#geometry}*/
-public Environment setGeometry(byte[] pGeometry)
+}
+
+/** Setter for {@link Environment#geometry}*/
+public Environment setGeometry(byte[] pGeometry)
{
- geometry = pGeometry;
- return this;
-}
-
-/** Getter for {@link Environment#geometry}*/
-public byte[] getGeometry()
+ geometry = pGeometry;
+ return this;
+}
+
+/** Getter for {@link Environment#geometry}*/
+public byte[] getGeometry()
{
return geometry;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- environmentType.marshal(dos);
- dos.writeShort(length);
- dos.writeByte(index);
- dos.writeByte(padding1);
-
- for(int idx = 0; idx < geometry.length; idx++)
- dos.writeByte(geometry[idx]);
-
- padding2 = new byte[Align.to64bits(dos)];
+ {
+ environmentType.marshal(dos);
+ dos.writeShort(length);
+ dos.writeByte(index);
+ dos.writeByte(padding1);
+
+ for(int idx = 0; idx < geometry.length; idx++)
+ dos.writeByte(geometry[idx]);
+
+ padding2 = new byte[Align.to64bits(dos)];
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- environmentType = EnvironmentalProcessRecordType.unmarshalEnum(dis);
- uPosition += environmentType.getMarshalledSize();
- length = (short)dis.readUnsignedShort();
- uPosition += 2;
- index = (byte)dis.readUnsignedByte();
- uPosition += 1;
- padding1 = (byte)dis.readUnsignedByte();
- uPosition += 1;
- for(int idx = 0; idx < geometry.length; idx++)
- geometry[idx] = dis.readByte();
- uPosition += (geometry.length * 1);
- padding2 = new byte[Align.from64bits(uPosition,dis)];
- uPosition += padding2.length;
+ {
+ environmentType = EnvironmentalProcessRecordType.unmarshalEnum(dis);
+ uPosition += environmentType.getMarshalledSize();
+ length = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ index = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ padding1 = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ for(int idx = 0; idx < geometry.length; idx++)
+ geometry[idx] = dis.readByte();
+ uPosition += (geometry.length * 1);
+ padding2 = new byte[Align.from64bits(uPosition,dis)];
+ uPosition += padding2.length;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- environmentType.marshal(buff);
- buff.putShort( (short)length);
- buff.put( (byte)index);
- buff.put( (byte)padding1);
-
- for(int idx = 0; idx < geometry.length; idx++)
- buff.put((byte)geometry[idx]);
-
- padding2 = new byte[Align.to64bits(buff)];
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- environmentType = EnvironmentalProcessRecordType.unmarshalEnum(buff);
- length = (short)(buff.getShort() & 0xFFFF);
- index = (byte)(buff.get() & 0xFF);
- padding1 = (byte)(buff.get() & 0xFF);
- for(int idx = 0; idx < geometry.length; idx++)
- geometry[idx] = buff.get();
- padding2 = new byte[Align.from64bits(buff)];
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ environmentType.marshal(buff);
+ buff.putShort( (short)length);
+ buff.put( (byte)index);
+ buff.put( (byte)padding1);
+
+ for(int idx = 0; idx < geometry.length; idx++)
+ buff.put((byte)geometry[idx]);
+
+ padding2 = new byte[Align.to64bits(buff)];
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ environmentType = EnvironmentalProcessRecordType.unmarshalEnum(buff);
+ length = (short)(buff.getShort() & 0xFFFF);
+ index = (byte)(buff.get() & 0xFF);
+ padding1 = (byte)(buff.get() & 0xFF);
+ for(int idx = 0; idx < geometry.length; idx++)
+ geometry[idx] = buff.get();
+ padding2 = new byte[Align.from64bits(buff)];
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final Environment rhs = (Environment)obj;
-
- if( ! (environmentType == rhs.environmentType)) ivarsEqual = false;
- if( ! (length == rhs.length)) ivarsEqual = false;
- if( ! (index == rhs.index)) ivarsEqual = false;
- if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
-
- for(int idx = 0; idx < 0; idx++)
- {
- if(!(geometry[idx] == rhs.geometry[idx])) ivarsEqual = false;
- }
-
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final Environment rhs = (Environment)obj;
+
+ if( ! (environmentType == rhs.environmentType)) ivarsEqual = false;
+ if( ! (length == rhs.length)) ivarsEqual = false;
+ if( ! (index == rhs.index)) ivarsEqual = false;
+ if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
+
+ for(int idx = 0; idx < 0; idx++)
+ {
+ if(!(geometry[idx] == rhs.geometry[idx])) ivarsEqual = false;
+ }
+
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" environmentType: ").append(environmentType).append("\n");
- sb.append(" length: ").append(length).append("\n");
- sb.append(" index: ").append(index).append("\n");
- sb.append(" padding1: ").append(padding1).append("\n");
- sb.append(" geometry: ").append("\n");
- sb.append(Arrays.toString(geometry)).append("\n");
- sb.append(" padding2: ").append(padding2).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" environmentType: ").append(environmentType).append("\n");
+ sb.append(" length: ").append(length).append("\n");
+ sb.append(" index: ").append(index).append("\n");
+ sb.append(" padding1: ").append(padding1).append("\n");
+ sb.append(" geometry: ").append("\n");
+ sb.append(Arrays.toString(geometry)).append("\n");
+ sb.append(" padding2: ").append(padding2).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EnvironmentalProcessPdu.java b/src-generated/edu/nps/moves/dis7/EnvironmentalProcessPdu.java
index 889c1b2cf97cedfdc2a25fa943a02925132c10a6..6687360d51fa5ce542c30929ba1b137f18cb4a3e 100644
--- a/src-generated/edu/nps/moves/dis7/EnvironmentalProcessPdu.java
+++ b/src-generated/edu/nps/moves/dis7/EnvironmentalProcessPdu.java
@@ -1,322 +1,322 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 7.10.2 Used to communicate information about environmental effects and processes.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class EnvironmentalProcessPdu extends SyntheticEnvironmentFamilyPdu implements Serializable
-{
- /** Environmental process ID */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 7.10.2 Used to communicate information about environmental effects and processes.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class EnvironmentalProcessPdu extends SyntheticEnvironmentFamilyPdu implements Serializable
+{
+ /** Environmental process ID */
protected ObjectIdentifier environementalProcessID = new ObjectIdentifier();
-
- /** Environment type */
+
+ /** Environment type */
protected EntityType environmentType = new EntityType();
-
- /** model type uid 248 */
+
+ /** model type uid 248 */
protected EnvironmentalProcessModelType modelType = EnvironmentalProcessModelType.values()[0];
-
- /** Environment status uid 249 */
+
+ /** Environment status uid 249 */
protected EnvironmentalProcessEnvironmentStatus environmentStatus = new EnvironmentalProcessEnvironmentStatus();
-
- /** number of environment records */
+
+ /** number of environment records */
protected short numberOfEnvironmentRecords;
-
- /** PDU sequence number for the environmental process if pdu sequencing required */
+
+ /** PDU sequence number for the environmental process if pdu sequencing required */
protected short sequenceNumber;
-
- /** environmemt records */
+
+ /** environmemt records */
protected List< Environment > environmentRecords = new ArrayList< Environment >();
-
-
-/** Constructor */
- public EnvironmentalProcessPdu()
- {
- setPduType( DISPDUType.ENVIRONMENTAL_PROCESS );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += environementalProcessID.getMarshalledSize();
- marshalSize += environmentType.getMarshalledSize();
- marshalSize += modelType.getMarshalledSize();
- marshalSize += environmentStatus.getMarshalledSize();
- marshalSize += 2; // numberOfEnvironmentRecords
- marshalSize += 2; // sequenceNumber
- for(int idx=0; idx < environmentRecords.size(); idx++)
- {
- Environment listElement = environmentRecords.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link EnvironmentalProcessPdu#environementalProcessID}*/
-public EnvironmentalProcessPdu setEnvironementalProcessID(ObjectIdentifier pEnvironementalProcessID)
+
+
+/** Constructor */
+ public EnvironmentalProcessPdu()
+ {
+ setPduType( DISPDUType.ENVIRONMENTAL_PROCESS );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += environementalProcessID.getMarshalledSize();
+ marshalSize += environmentType.getMarshalledSize();
+ marshalSize += modelType.getMarshalledSize();
+ marshalSize += environmentStatus.getMarshalledSize();
+ marshalSize += 2; // numberOfEnvironmentRecords
+ marshalSize += 2; // sequenceNumber
+ for(int idx=0; idx < environmentRecords.size(); idx++)
+ {
+ Environment listElement = environmentRecords.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link EnvironmentalProcessPdu#environementalProcessID}*/
+public EnvironmentalProcessPdu setEnvironementalProcessID(ObjectIdentifier pEnvironementalProcessID)
{
- environementalProcessID = pEnvironementalProcessID;
- return this;
-}
-
-/** Getter for {@link EnvironmentalProcessPdu#environementalProcessID}*/
-public ObjectIdentifier getEnvironementalProcessID()
+ environementalProcessID = pEnvironementalProcessID;
+ return this;
+}
+
+/** Getter for {@link EnvironmentalProcessPdu#environementalProcessID}*/
+public ObjectIdentifier getEnvironementalProcessID()
{
return environementalProcessID;
-}
-
-/** Setter for {@link EnvironmentalProcessPdu#environmentType}*/
-public EnvironmentalProcessPdu setEnvironmentType(EntityType pEnvironmentType)
+}
+
+/** Setter for {@link EnvironmentalProcessPdu#environmentType}*/
+public EnvironmentalProcessPdu setEnvironmentType(EntityType pEnvironmentType)
{
- environmentType = pEnvironmentType;
- return this;
-}
-
-/** Getter for {@link EnvironmentalProcessPdu#environmentType}*/
-public EntityType getEnvironmentType()
+ environmentType = pEnvironmentType;
+ return this;
+}
+
+/** Getter for {@link EnvironmentalProcessPdu#environmentType}*/
+public EntityType getEnvironmentType()
{
return environmentType;
-}
-
-/** Setter for {@link EnvironmentalProcessPdu#modelType}*/
-public EnvironmentalProcessPdu setModelType(EnvironmentalProcessModelType pModelType)
+}
+
+/** Setter for {@link EnvironmentalProcessPdu#modelType}*/
+public EnvironmentalProcessPdu setModelType(EnvironmentalProcessModelType pModelType)
{
- modelType = pModelType;
- return this;
-}
-
-/** Getter for {@link EnvironmentalProcessPdu#modelType}*/
-public EnvironmentalProcessModelType getModelType()
+ modelType = pModelType;
+ return this;
+}
+
+/** Getter for {@link EnvironmentalProcessPdu#modelType}*/
+public EnvironmentalProcessModelType getModelType()
{
return modelType;
-}
-
-/** Setter for {@link EnvironmentalProcessPdu#environmentStatus}*/
-public EnvironmentalProcessPdu setEnvironmentStatus(EnvironmentalProcessEnvironmentStatus pEnvironmentStatus)
+}
+
+/** Setter for {@link EnvironmentalProcessPdu#environmentStatus}*/
+public EnvironmentalProcessPdu setEnvironmentStatus(EnvironmentalProcessEnvironmentStatus pEnvironmentStatus)
{
- environmentStatus = pEnvironmentStatus;
- return this;
-}
-
-/** Setter for {@link EnvironmentalProcessPdu#environmentStatus}*/
-public EnvironmentalProcessEnvironmentStatus getEnvironmentStatus()
+ environmentStatus = pEnvironmentStatus;
+ return this;
+}
+
+/** Setter for {@link EnvironmentalProcessPdu#environmentStatus}*/
+public EnvironmentalProcessEnvironmentStatus getEnvironmentStatus()
{
return environmentStatus;
-}
-
-/** Setter for {@link EnvironmentalProcessPdu#sequenceNumber}*/
-public EnvironmentalProcessPdu setSequenceNumber(short pSequenceNumber)
+}
+
+/** Setter for {@link EnvironmentalProcessPdu#sequenceNumber}*/
+public EnvironmentalProcessPdu setSequenceNumber(short pSequenceNumber)
{
- sequenceNumber = pSequenceNumber;
- return this;
-}
-
-/** Getter for {@link EnvironmentalProcessPdu#sequenceNumber}*/
-public short getSequenceNumber()
+ sequenceNumber = pSequenceNumber;
+ return this;
+}
+
+/** Getter for {@link EnvironmentalProcessPdu#sequenceNumber}*/
+public short getSequenceNumber()
{
return sequenceNumber;
-}
-
-/** Setter for {@link EnvironmentalProcessPdu#environmentRecords}*/
-public EnvironmentalProcessPdu setEnvironmentRecords(List<Environment> pEnvironmentRecords)
+}
+
+/** Setter for {@link EnvironmentalProcessPdu#environmentRecords}*/
+public EnvironmentalProcessPdu setEnvironmentRecords(List<Environment> pEnvironmentRecords)
{
- environmentRecords = pEnvironmentRecords;
- return this;
-}
-
-/** Getter for {@link EnvironmentalProcessPdu#environmentRecords}*/
-public List<Environment> getEnvironmentRecords()
+ environmentRecords = pEnvironmentRecords;
+ return this;
+}
+
+/** Getter for {@link EnvironmentalProcessPdu#environmentRecords}*/
+public List<Environment> getEnvironmentRecords()
{
return environmentRecords;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- environementalProcessID.marshal(dos);
- environmentType.marshal(dos);
- modelType.marshal(dos);
- environmentStatus.marshal(dos);
- dos.writeShort(environmentRecords.size());
- dos.writeShort(sequenceNumber);
-
- for(int idx = 0; idx < environmentRecords.size(); idx++)
- {
- Environment aEnvironment = environmentRecords.get(idx);
- aEnvironment.marshal(dos);
- }
-
+ {
+ environementalProcessID.marshal(dos);
+ environmentType.marshal(dos);
+ modelType.marshal(dos);
+ environmentStatus.marshal(dos);
+ dos.writeShort(environmentRecords.size());
+ dos.writeShort(sequenceNumber);
+
+ for(int idx = 0; idx < environmentRecords.size(); idx++)
+ {
+ Environment aEnvironment = environmentRecords.get(idx);
+ aEnvironment.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += environementalProcessID.unmarshal(dis);
- uPosition += environmentType.unmarshal(dis);
- modelType = EnvironmentalProcessModelType.unmarshalEnum(dis);
- uPosition += modelType.getMarshalledSize();
- uPosition += environmentStatus.unmarshal(dis);
- numberOfEnvironmentRecords = (short)dis.readUnsignedShort();
- uPosition += 2;
- sequenceNumber = (short)dis.readUnsignedShort();
- uPosition += 2;
- for(int idx = 0; idx < numberOfEnvironmentRecords; idx++)
- {
- Environment anX = new Environment();
- uPosition += anX.unmarshal(dis);
- environmentRecords.add(anX);
- }
-
+ {
+ uPosition += environementalProcessID.unmarshal(dis);
+ uPosition += environmentType.unmarshal(dis);
+ modelType = EnvironmentalProcessModelType.unmarshalEnum(dis);
+ uPosition += modelType.getMarshalledSize();
+ uPosition += environmentStatus.unmarshal(dis);
+ numberOfEnvironmentRecords = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ sequenceNumber = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ for(int idx = 0; idx < numberOfEnvironmentRecords; idx++)
+ {
+ Environment anX = new Environment();
+ uPosition += anX.unmarshal(dis);
+ environmentRecords.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- environementalProcessID.marshal(buff);
- environmentType.marshal(buff);
- modelType.marshal(buff);
- environmentStatus.marshal(buff);
- buff.putShort( (short)environmentRecords.size());
- buff.putShort( (short)sequenceNumber);
-
- for(int idx = 0; idx < environmentRecords.size(); idx++)
- {
- Environment aEnvironment = environmentRecords.get(idx);
- aEnvironment.marshal(buff);
- }
-
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ environementalProcessID.marshal(buff);
+ environmentType.marshal(buff);
+ modelType.marshal(buff);
+ environmentStatus.marshal(buff);
+ buff.putShort( (short)environmentRecords.size());
+ buff.putShort( (short)sequenceNumber);
+
+ for(int idx = 0; idx < environmentRecords.size(); idx++)
+ {
+ Environment aEnvironment = environmentRecords.get(idx);
+ aEnvironment.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- environementalProcessID.unmarshal(buff);
- environmentType.unmarshal(buff);
- modelType = EnvironmentalProcessModelType.unmarshalEnum(buff);
- environmentStatus.unmarshal(buff);
- numberOfEnvironmentRecords = (short)(buff.getShort() & 0xFFFF);
- sequenceNumber = (short)(buff.getShort() & 0xFFFF);
- for(int idx = 0; idx < numberOfEnvironmentRecords; idx++)
- {
- Environment anX = new Environment();
- anX.unmarshal(buff);
- environmentRecords.add(anX);
- }
-
- return getMarshalledSize();
+
+ environementalProcessID.unmarshal(buff);
+ environmentType.unmarshal(buff);
+ modelType = EnvironmentalProcessModelType.unmarshalEnum(buff);
+ environmentStatus.unmarshal(buff);
+ numberOfEnvironmentRecords = (short)(buff.getShort() & 0xFFFF);
+ sequenceNumber = (short)(buff.getShort() & 0xFFFF);
+ for(int idx = 0; idx < numberOfEnvironmentRecords; idx++)
+ {
+ Environment anX = new Environment();
+ anX.unmarshal(buff);
+ environmentRecords.add(anX);
+ }
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final EnvironmentalProcessPdu rhs = (EnvironmentalProcessPdu)obj;
-
- if( ! (environementalProcessID.equals( rhs.environementalProcessID) )) ivarsEqual = false;
- if( ! (environmentType.equals( rhs.environmentType) )) ivarsEqual = false;
- if( ! (modelType == rhs.modelType)) ivarsEqual = false;
- if( ! (environmentStatus.equals( rhs.environmentStatus) )) ivarsEqual = false;
- if( ! (sequenceNumber == rhs.sequenceNumber)) ivarsEqual = false;
-
- for(int idx = 0; idx < environmentRecords.size(); idx++)
- if( ! ( environmentRecords.get(idx).equals(rhs.environmentRecords.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final EnvironmentalProcessPdu rhs = (EnvironmentalProcessPdu)obj;
+
+ if( ! (environementalProcessID.equals( rhs.environementalProcessID) )) ivarsEqual = false;
+ if( ! (environmentType.equals( rhs.environmentType) )) ivarsEqual = false;
+ if( ! (modelType == rhs.modelType)) ivarsEqual = false;
+ if( ! (environmentStatus.equals( rhs.environmentStatus) )) ivarsEqual = false;
+ if( ! (sequenceNumber == rhs.sequenceNumber)) ivarsEqual = false;
+
+ for(int idx = 0; idx < environmentRecords.size(); idx++)
+ if( ! ( environmentRecords.get(idx).equals(rhs.environmentRecords.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" environementalProcessID: ").append(environementalProcessID).append("\n");
- sb.append(" environmentType: ").append(environmentType).append("\n");
- sb.append(" modelType: ").append(modelType).append("\n");
- sb.append(" environmentStatus: ").append(environmentStatus).append("\n");
- sb.append(" sequenceNumber: ").append(sequenceNumber).append("\n");
- sb.append(" environmentRecords: ").append("\n");
- environmentRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" environementalProcessID: ").append(environementalProcessID).append("\n");
+ sb.append(" environmentType: ").append(environmentType).append("\n");
+ sb.append(" modelType: ").append(modelType).append("\n");
+ sb.append(" environmentStatus: ").append(environmentStatus).append("\n");
+ sb.append(" sequenceNumber: ").append(sequenceNumber).append("\n");
+ sb.append(" environmentRecords: ").append("\n");
+ environmentRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EulerAngles.java b/src-generated/edu/nps/moves/dis7/EulerAngles.java
index a6542050654f4a51a3b57fe91e86bd60226a64a4..f13fe4f7eebba056603c7ad0308f51f72ad8c6db 100644
--- a/src-generated/edu/nps/moves/dis7/EulerAngles.java
+++ b/src-generated/edu/nps/moves/dis7/EulerAngles.java
@@ -1,207 +1,207 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Three floating point values representing an orientation, psi, theta, and phi, aka the euler angles, in radians. Section 6.2.33
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class EulerAngles extends Object implements Serializable
-{
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Three floating point values representing an orientation, psi, theta, and phi, aka the euler angles, in radians. Section 6.2.33
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class EulerAngles extends Object implements Serializable
+{
protected float psi;
-
+
protected float theta;
-
+
protected float phi;
-
-
-/** Constructor */
- public EulerAngles()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += 4; // psi
- marshalSize += 4; // theta
- marshalSize += 4; // phi
-
- return marshalSize;
-}
-
-
-/** Setter for {@link EulerAngles#psi}*/
-public EulerAngles setPsi(float pPsi)
+
+
+/** Constructor */
+ public EulerAngles()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 4; // psi
+ marshalSize += 4; // theta
+ marshalSize += 4; // phi
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link EulerAngles#psi}*/
+public EulerAngles setPsi(float pPsi)
{
- psi = pPsi;
- return this;
-}
-
-/** Getter for {@link EulerAngles#psi}*/
-public float getPsi()
+ psi = pPsi;
+ return this;
+}
+
+/** Getter for {@link EulerAngles#psi}*/
+public float getPsi()
{
return psi;
-}
-
-/** Setter for {@link EulerAngles#theta}*/
-public EulerAngles setTheta(float pTheta)
+}
+
+/** Setter for {@link EulerAngles#theta}*/
+public EulerAngles setTheta(float pTheta)
{
- theta = pTheta;
- return this;
-}
-
-/** Getter for {@link EulerAngles#theta}*/
-public float getTheta()
+ theta = pTheta;
+ return this;
+}
+
+/** Getter for {@link EulerAngles#theta}*/
+public float getTheta()
{
return theta;
-}
-
-/** Setter for {@link EulerAngles#phi}*/
-public EulerAngles setPhi(float pPhi)
+}
+
+/** Setter for {@link EulerAngles#phi}*/
+public EulerAngles setPhi(float pPhi)
{
- phi = pPhi;
- return this;
-}
-
-/** Getter for {@link EulerAngles#phi}*/
-public float getPhi()
+ phi = pPhi;
+ return this;
+}
+
+/** Getter for {@link EulerAngles#phi}*/
+public float getPhi()
{
return phi;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeFloat(psi);
- dos.writeFloat(theta);
- dos.writeFloat(phi);
+ {
+ dos.writeFloat(psi);
+ dos.writeFloat(theta);
+ dos.writeFloat(phi);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- psi = dis.readFloat();
- uPosition += 4;
- theta = dis.readFloat();
- uPosition += 4;
- phi = dis.readFloat();
- uPosition += 4;
+ {
+ psi = dis.readFloat();
+ uPosition += 4;
+ theta = dis.readFloat();
+ uPosition += 4;
+ phi = dis.readFloat();
+ uPosition += 4;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putFloat( (float)psi);
- buff.putFloat( (float)theta);
- buff.putFloat( (float)phi);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- psi = buff.getFloat();
- theta = buff.getFloat();
- phi = buff.getFloat();
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putFloat( (float)psi);
+ buff.putFloat( (float)theta);
+ buff.putFloat( (float)phi);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ psi = buff.getFloat();
+ theta = buff.getFloat();
+ phi = buff.getFloat();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final EulerAngles rhs = (EulerAngles)obj;
-
- if( ! (psi == rhs.psi)) ivarsEqual = false;
- if( ! (theta == rhs.theta)) ivarsEqual = false;
- if( ! (phi == rhs.phi)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final EulerAngles rhs = (EulerAngles)obj;
+
+ if( ! (psi == rhs.psi)) ivarsEqual = false;
+ if( ! (theta == rhs.theta)) ivarsEqual = false;
+ if( ! (phi == rhs.phi)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" psi: ").append(psi).append("\n");
- sb.append(" theta: ").append(theta).append("\n");
- sb.append(" phi: ").append(phi).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" psi: ").append(psi).append("\n");
+ sb.append(" theta: ").append(theta).append("\n");
+ sb.append(" phi: ").append(phi).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EventIdentifier.java b/src-generated/edu/nps/moves/dis7/EventIdentifier.java
index 7b30e613636e06443f0c055d2625c5b5a24c3437..78862cda472c7d9a5a6969220e51ddbbf2749574 100644
--- a/src-generated/edu/nps/moves/dis7/EventIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/EventIdentifier.java
@@ -1,184 +1,184 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Identifies an event in the world. Use this format for every PDU EXCEPT the LiveEntityPdu. Section 6.2.34.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class EventIdentifier extends Object implements Serializable
-{
- /** Site and application IDs */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Identifies an event in the world. Use this format for every PDU EXCEPT the LiveEntityPdu. Section 6.2.34.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class EventIdentifier extends Object implements Serializable
+{
+ /** Site and application IDs */
protected SimulationAddress simulationAddress = new SimulationAddress();
-
+
protected short eventNumber;
-
-
-/** Constructor */
- public EventIdentifier()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += simulationAddress.getMarshalledSize();
- marshalSize += 2; // eventNumber
-
- return marshalSize;
-}
-
-
-/** Setter for {@link EventIdentifier#simulationAddress}*/
-public EventIdentifier setSimulationAddress(SimulationAddress pSimulationAddress)
+
+
+/** Constructor */
+ public EventIdentifier()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += simulationAddress.getMarshalledSize();
+ marshalSize += 2; // eventNumber
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link EventIdentifier#simulationAddress}*/
+public EventIdentifier setSimulationAddress(SimulationAddress pSimulationAddress)
{
- simulationAddress = pSimulationAddress;
- return this;
-}
-
-/** Getter for {@link EventIdentifier#simulationAddress}*/
-public SimulationAddress getSimulationAddress()
+ simulationAddress = pSimulationAddress;
+ return this;
+}
+
+/** Getter for {@link EventIdentifier#simulationAddress}*/
+public SimulationAddress getSimulationAddress()
{
return simulationAddress;
-}
-
-/** Setter for {@link EventIdentifier#eventNumber}*/
-public EventIdentifier setEventNumber(short pEventNumber)
+}
+
+/** Setter for {@link EventIdentifier#eventNumber}*/
+public EventIdentifier setEventNumber(short pEventNumber)
{
- eventNumber = pEventNumber;
- return this;
-}
-
-/** Getter for {@link EventIdentifier#eventNumber}*/
-public short getEventNumber()
+ eventNumber = pEventNumber;
+ return this;
+}
+
+/** Getter for {@link EventIdentifier#eventNumber}*/
+public short getEventNumber()
{
return eventNumber;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- simulationAddress.marshal(dos);
- dos.writeShort(eventNumber);
+ {
+ simulationAddress.marshal(dos);
+ dos.writeShort(eventNumber);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- uPosition += simulationAddress.unmarshal(dis);
- eventNumber = (short)dis.readUnsignedShort();
- uPosition += 2;
+ {
+ uPosition += simulationAddress.unmarshal(dis);
+ eventNumber = (short)dis.readUnsignedShort();
+ uPosition += 2;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- simulationAddress.marshal(buff);
- buff.putShort( (short)eventNumber);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- simulationAddress.unmarshal(buff);
- eventNumber = (short)(buff.getShort() & 0xFFFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ simulationAddress.marshal(buff);
+ buff.putShort( (short)eventNumber);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ simulationAddress.unmarshal(buff);
+ eventNumber = (short)(buff.getShort() & 0xFFFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final EventIdentifier rhs = (EventIdentifier)obj;
-
- if( ! (simulationAddress.equals( rhs.simulationAddress) )) ivarsEqual = false;
- if( ! (eventNumber == rhs.eventNumber)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final EventIdentifier rhs = (EventIdentifier)obj;
+
+ if( ! (simulationAddress.equals( rhs.simulationAddress) )) ivarsEqual = false;
+ if( ! (eventNumber == rhs.eventNumber)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
- sb.append(" eventNumber: ").append(eventNumber).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
+ sb.append(" eventNumber: ").append(eventNumber).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EventIdentifierLiveEntity.java b/src-generated/edu/nps/moves/dis7/EventIdentifierLiveEntity.java
index bbb5b7205e9bd66eb2d0253d04fda2d2286ec2e8..632f3eb3e5b1616b6bf96e074865e20172a92d67 100644
--- a/src-generated/edu/nps/moves/dis7/EventIdentifierLiveEntity.java
+++ b/src-generated/edu/nps/moves/dis7/EventIdentifierLiveEntity.java
@@ -1,207 +1,207 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Identifies an event in the world. Use this format for ONLY the LiveEntityPdu. Section 6.2.34.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class EventIdentifierLiveEntity extends Object implements Serializable
-{
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Identifies an event in the world. Use this format for ONLY the LiveEntityPdu. Section 6.2.34.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class EventIdentifierLiveEntity extends Object implements Serializable
+{
protected byte siteNumber;
-
+
protected byte applicationNumber;
-
+
protected short eventNumber;
-
-
-/** Constructor */
- public EventIdentifierLiveEntity()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += 1; // siteNumber
- marshalSize += 1; // applicationNumber
- marshalSize += 2; // eventNumber
-
- return marshalSize;
-}
-
-
-/** Setter for {@link EventIdentifierLiveEntity#siteNumber}*/
-public EventIdentifierLiveEntity setSiteNumber(byte pSiteNumber)
+
+
+/** Constructor */
+ public EventIdentifierLiveEntity()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 1; // siteNumber
+ marshalSize += 1; // applicationNumber
+ marshalSize += 2; // eventNumber
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link EventIdentifierLiveEntity#siteNumber}*/
+public EventIdentifierLiveEntity setSiteNumber(byte pSiteNumber)
{
- siteNumber = pSiteNumber;
- return this;
-}
-
-/** Getter for {@link EventIdentifierLiveEntity#siteNumber}*/
-public byte getSiteNumber()
+ siteNumber = pSiteNumber;
+ return this;
+}
+
+/** Getter for {@link EventIdentifierLiveEntity#siteNumber}*/
+public byte getSiteNumber()
{
return siteNumber;
-}
-
-/** Setter for {@link EventIdentifierLiveEntity#applicationNumber}*/
-public EventIdentifierLiveEntity setApplicationNumber(byte pApplicationNumber)
+}
+
+/** Setter for {@link EventIdentifierLiveEntity#applicationNumber}*/
+public EventIdentifierLiveEntity setApplicationNumber(byte pApplicationNumber)
{
- applicationNumber = pApplicationNumber;
- return this;
-}
-
-/** Getter for {@link EventIdentifierLiveEntity#applicationNumber}*/
-public byte getApplicationNumber()
+ applicationNumber = pApplicationNumber;
+ return this;
+}
+
+/** Getter for {@link EventIdentifierLiveEntity#applicationNumber}*/
+public byte getApplicationNumber()
{
return applicationNumber;
-}
-
-/** Setter for {@link EventIdentifierLiveEntity#eventNumber}*/
-public EventIdentifierLiveEntity setEventNumber(short pEventNumber)
+}
+
+/** Setter for {@link EventIdentifierLiveEntity#eventNumber}*/
+public EventIdentifierLiveEntity setEventNumber(short pEventNumber)
{
- eventNumber = pEventNumber;
- return this;
-}
-
-/** Getter for {@link EventIdentifierLiveEntity#eventNumber}*/
-public short getEventNumber()
+ eventNumber = pEventNumber;
+ return this;
+}
+
+/** Getter for {@link EventIdentifierLiveEntity#eventNumber}*/
+public short getEventNumber()
{
return eventNumber;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeByte(siteNumber);
- dos.writeByte(applicationNumber);
- dos.writeShort(eventNumber);
+ {
+ dos.writeByte(siteNumber);
+ dos.writeByte(applicationNumber);
+ dos.writeShort(eventNumber);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- siteNumber = (byte)dis.readUnsignedByte();
- uPosition += 1;
- applicationNumber = (byte)dis.readUnsignedByte();
- uPosition += 1;
- eventNumber = (short)dis.readUnsignedShort();
- uPosition += 2;
+ {
+ siteNumber = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ applicationNumber = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ eventNumber = (short)dis.readUnsignedShort();
+ uPosition += 2;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.put( (byte)siteNumber);
- buff.put( (byte)applicationNumber);
- buff.putShort( (short)eventNumber);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- siteNumber = (byte)(buff.get() & 0xFF);
- applicationNumber = (byte)(buff.get() & 0xFF);
- eventNumber = (short)(buff.getShort() & 0xFFFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.put( (byte)siteNumber);
+ buff.put( (byte)applicationNumber);
+ buff.putShort( (short)eventNumber);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ siteNumber = (byte)(buff.get() & 0xFF);
+ applicationNumber = (byte)(buff.get() & 0xFF);
+ eventNumber = (short)(buff.getShort() & 0xFFFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final EventIdentifierLiveEntity rhs = (EventIdentifierLiveEntity)obj;
-
- if( ! (siteNumber == rhs.siteNumber)) ivarsEqual = false;
- if( ! (applicationNumber == rhs.applicationNumber)) ivarsEqual = false;
- if( ! (eventNumber == rhs.eventNumber)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final EventIdentifierLiveEntity rhs = (EventIdentifierLiveEntity)obj;
+
+ if( ! (siteNumber == rhs.siteNumber)) ivarsEqual = false;
+ if( ! (applicationNumber == rhs.applicationNumber)) ivarsEqual = false;
+ if( ! (eventNumber == rhs.eventNumber)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" siteNumber: ").append(siteNumber).append("\n");
- sb.append(" applicationNumber: ").append(applicationNumber).append("\n");
- sb.append(" eventNumber: ").append(eventNumber).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" siteNumber: ").append(siteNumber).append("\n");
+ sb.append(" applicationNumber: ").append(applicationNumber).append("\n");
+ sb.append(" eventNumber: ").append(eventNumber).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EventReportPdu.java b/src-generated/edu/nps/moves/dis7/EventReportPdu.java
index 5644db8fa386364c2eac87b1d5b8b838f7ab91d4..75a06f270da3749ae24fd5b406443875670e17a7 100644
--- a/src-generated/edu/nps/moves/dis7/EventReportPdu.java
+++ b/src-generated/edu/nps/moves/dis7/EventReportPdu.java
@@ -1,317 +1,317 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 7.5.12 Reports occurance of a significant event to the simulation manager. See 5.6.5.12.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class EventReportPdu extends SimulationManagementFamilyPdu implements Serializable
-{
- /** Type of event uid 73 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 7.5.12 Reports occurance of a significant event to the simulation manager. See 5.6.5.12.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class EventReportPdu extends SimulationManagementFamilyPdu implements Serializable
+{
+ /** Type of event uid 73 */
protected EventReportEventType eventType = EventReportEventType.values()[0];
-
- /** padding */
+
+ /** padding */
protected int padding1 = (int)0;
-
- /** Number of fixed datum records */
+
+ /** Number of fixed datum records */
protected int numberOfFixedDatumRecords;
-
- /** Number of variable datum records, handled automatically by marshaller at run time (and not modifiable by end-user programmers) */
+
+ /** Number of variable datum records, handled automatically by marshaller at run time (and not modifiable by end-user programmers) */
protected int numberOfVariableDatumRecords;
-
- /** variable length list of fixed datums */
+
+ /** variable length list of fixed datums */
protected List< FixedDatum > fixedDatums = new ArrayList< FixedDatum >();
-
- /** variable length list of variable length datums */
+
+ /** variable length list of variable length datums */
protected List< VariableDatum > variableDatums = new ArrayList< VariableDatum >();
-
-
-/** Constructor */
- public EventReportPdu()
- {
- setPduType( DISPDUType.EVENT_REPORT );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += eventType.getMarshalledSize();
- marshalSize += 4; // padding1
- marshalSize += 4; // numberOfFixedDatumRecords
- marshalSize += 4; // numberOfVariableDatumRecords
- for(int idx=0; idx < fixedDatums.size(); idx++)
- {
- FixedDatum listElement = fixedDatums.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
- for(int idx=0; idx < variableDatums.size(); idx++)
- {
- VariableDatum listElement = variableDatums.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link EventReportPdu#eventType}*/
-public EventReportPdu setEventType(EventReportEventType pEventType)
+
+
+/** Constructor */
+ public EventReportPdu()
+ {
+ setPduType( DISPDUType.EVENT_REPORT );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += eventType.getMarshalledSize();
+ marshalSize += 4; // padding1
+ marshalSize += 4; // numberOfFixedDatumRecords
+ marshalSize += 4; // numberOfVariableDatumRecords
+ for(int idx=0; idx < fixedDatums.size(); idx++)
+ {
+ FixedDatum listElement = fixedDatums.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+ for(int idx=0; idx < variableDatums.size(); idx++)
+ {
+ VariableDatum listElement = variableDatums.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link EventReportPdu#eventType}*/
+public EventReportPdu setEventType(EventReportEventType pEventType)
{
- eventType = pEventType;
- return this;
-}
-
-/** Getter for {@link EventReportPdu#eventType}*/
-public EventReportEventType getEventType()
+ eventType = pEventType;
+ return this;
+}
+
+/** Getter for {@link EventReportPdu#eventType}*/
+public EventReportEventType getEventType()
{
return eventType;
-}
-
-/** Setter for {@link EventReportPdu#padding1}*/
-public EventReportPdu setPadding1(int pPadding1)
+}
+
+/** Setter for {@link EventReportPdu#padding1}*/
+public EventReportPdu setPadding1(int pPadding1)
{
- padding1 = pPadding1;
- return this;
-}
-
-/** Getter for {@link EventReportPdu#padding1}*/
-public int getPadding1()
+ padding1 = pPadding1;
+ return this;
+}
+
+/** Getter for {@link EventReportPdu#padding1}*/
+public int getPadding1()
{
return padding1;
-}
-
-/** Setter for {@link EventReportPdu#fixedDatums}*/
-public EventReportPdu setFixedDatums(List<FixedDatum> pFixedDatums)
+}
+
+/** Setter for {@link EventReportPdu#fixedDatums}*/
+public EventReportPdu setFixedDatums(List<FixedDatum> pFixedDatums)
{
- fixedDatums = pFixedDatums;
- return this;
-}
-
-/** Getter for {@link EventReportPdu#fixedDatums}*/
-public List<FixedDatum> getFixedDatums()
+ fixedDatums = pFixedDatums;
+ return this;
+}
+
+/** Getter for {@link EventReportPdu#fixedDatums}*/
+public List<FixedDatum> getFixedDatums()
{
return fixedDatums;
-}
-
-/** Setter for {@link EventReportPdu#variableDatums}*/
-public EventReportPdu setVariableDatums(List<VariableDatum> pVariableDatums)
+}
+
+/** Setter for {@link EventReportPdu#variableDatums}*/
+public EventReportPdu setVariableDatums(List<VariableDatum> pVariableDatums)
{
- variableDatums = pVariableDatums;
- return this;
-}
-
-/** Getter for {@link EventReportPdu#variableDatums}*/
-public List<VariableDatum> getVariableDatums()
+ variableDatums = pVariableDatums;
+ return this;
+}
+
+/** Getter for {@link EventReportPdu#variableDatums}*/
+public List<VariableDatum> getVariableDatums()
{
return variableDatums;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- eventType.marshal(dos);
- dos.writeInt(padding1);
- dos.writeInt(fixedDatums.size());
- dos.writeInt(variableDatums.size());
-
- for(int idx = 0; idx < fixedDatums.size(); idx++)
- {
- FixedDatum aFixedDatum = fixedDatums.get(idx);
- aFixedDatum.marshal(dos);
- }
-
-
- for(int idx = 0; idx < variableDatums.size(); idx++)
- {
- VariableDatum aVariableDatum = variableDatums.get(idx);
- aVariableDatum.marshal(dos);
- }
-
+ {
+ eventType.marshal(dos);
+ dos.writeInt(padding1);
+ dos.writeInt(fixedDatums.size());
+ dos.writeInt(variableDatums.size());
+
+ for(int idx = 0; idx < fixedDatums.size(); idx++)
+ {
+ FixedDatum aFixedDatum = fixedDatums.get(idx);
+ aFixedDatum.marshal(dos);
+ }
+
+
+ for(int idx = 0; idx < variableDatums.size(); idx++)
+ {
+ VariableDatum aVariableDatum = variableDatums.get(idx);
+ aVariableDatum.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- eventType = EventReportEventType.unmarshalEnum(dis);
- uPosition += eventType.getMarshalledSize();
- padding1 = dis.readInt();
- uPosition += 4;
- numberOfFixedDatumRecords = dis.readInt();
- uPosition += 4;
- numberOfVariableDatumRecords = dis.readInt();
- uPosition += 4;
- for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
- {
- FixedDatum anX = new FixedDatum();
- uPosition += anX.unmarshal(dis);
- fixedDatums.add(anX);
- }
-
- for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
- {
- VariableDatum anX = new VariableDatum();
- uPosition += anX.unmarshal(dis);
- variableDatums.add(anX);
- }
-
+ {
+ eventType = EventReportEventType.unmarshalEnum(dis);
+ uPosition += eventType.getMarshalledSize();
+ padding1 = dis.readInt();
+ uPosition += 4;
+ numberOfFixedDatumRecords = dis.readInt();
+ uPosition += 4;
+ numberOfVariableDatumRecords = dis.readInt();
+ uPosition += 4;
+ for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
+ {
+ FixedDatum anX = new FixedDatum();
+ uPosition += anX.unmarshal(dis);
+ fixedDatums.add(anX);
+ }
+
+ for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
+ {
+ VariableDatum anX = new VariableDatum();
+ uPosition += anX.unmarshal(dis);
+ variableDatums.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- eventType.marshal(buff);
- buff.putInt( (int)padding1);
- buff.putInt( (int)fixedDatums.size());
- buff.putInt( (int)variableDatums.size());
-
- for(int idx = 0; idx < fixedDatums.size(); idx++)
- {
- FixedDatum aFixedDatum = fixedDatums.get(idx);
- aFixedDatum.marshal(buff);
- }
-
-
- for(int idx = 0; idx < variableDatums.size(); idx++)
- {
- VariableDatum aVariableDatum = variableDatums.get(idx);
- aVariableDatum.marshal(buff);
- }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ eventType.marshal(buff);
+ buff.putInt( (int)padding1);
+ buff.putInt( (int)fixedDatums.size());
+ buff.putInt( (int)variableDatums.size());
+
+ for(int idx = 0; idx < fixedDatums.size(); idx++)
+ {
+ FixedDatum aFixedDatum = fixedDatums.get(idx);
+ aFixedDatum.marshal(buff);
+ }
+
+
+ for(int idx = 0; idx < variableDatums.size(); idx++)
+ {
+ VariableDatum aVariableDatum = variableDatums.get(idx);
+ aVariableDatum.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- eventType = EventReportEventType.unmarshalEnum(buff);
- padding1 = buff.getInt();
- numberOfFixedDatumRecords = buff.getInt();
- numberOfVariableDatumRecords = buff.getInt();
- for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
- {
- FixedDatum anX = new FixedDatum();
- anX.unmarshal(buff);
- fixedDatums.add(anX);
- }
-
- for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
- {
- VariableDatum anX = new VariableDatum();
- anX.unmarshal(buff);
- variableDatums.add(anX);
- }
-
- return getMarshalledSize();
+
+ eventType = EventReportEventType.unmarshalEnum(buff);
+ padding1 = buff.getInt();
+ numberOfFixedDatumRecords = buff.getInt();
+ numberOfVariableDatumRecords = buff.getInt();
+ for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
+ {
+ FixedDatum anX = new FixedDatum();
+ anX.unmarshal(buff);
+ fixedDatums.add(anX);
+ }
+
+ for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
+ {
+ VariableDatum anX = new VariableDatum();
+ anX.unmarshal(buff);
+ variableDatums.add(anX);
+ }
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final EventReportPdu rhs = (EventReportPdu)obj;
-
- if( ! (eventType == rhs.eventType)) ivarsEqual = false;
- if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
-
- for(int idx = 0; idx < fixedDatums.size(); idx++)
- if( ! ( fixedDatums.get(idx).equals(rhs.fixedDatums.get(idx)))) ivarsEqual = false;
-
-
- for(int idx = 0; idx < variableDatums.size(); idx++)
- if( ! ( variableDatums.get(idx).equals(rhs.variableDatums.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final EventReportPdu rhs = (EventReportPdu)obj;
+
+ if( ! (eventType == rhs.eventType)) ivarsEqual = false;
+ if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
+
+ for(int idx = 0; idx < fixedDatums.size(); idx++)
+ if( ! ( fixedDatums.get(idx).equals(rhs.fixedDatums.get(idx)))) ivarsEqual = false;
+
+
+ for(int idx = 0; idx < variableDatums.size(); idx++)
+ if( ! ( variableDatums.get(idx).equals(rhs.variableDatums.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" eventType: ").append(eventType).append("\n");
- sb.append(" padding1: ").append(padding1).append("\n");
- sb.append(" fixedDatums: ").append("\n");
- fixedDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
- sb.append(" variableDatums: ").append("\n");
- variableDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" eventType: ").append(eventType).append("\n");
+ sb.append(" padding1: ").append(padding1).append("\n");
+ sb.append(" fixedDatums: ").append("\n");
+ fixedDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+ sb.append(" variableDatums: ").append("\n");
+ variableDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EventReportRPdu.java b/src-generated/edu/nps/moves/dis7/EventReportRPdu.java
index 40309a0e7e2dba9901e9b413428df5383f6e5f05..725f5aa2c1c5207f06c9601f02bda4f7c4855676 100644
--- a/src-generated/edu/nps/moves/dis7/EventReportRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/EventReportRPdu.java
@@ -1,317 +1,317 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.12.4.12 Contains the same information as found in the Event Report PDU.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class EventReportRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
-{
- /** Event type uid 73 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 5.12.4.12 Contains the same information as found in the Event Report PDU.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class EventReportRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
+{
+ /** Event type uid 73 */
protected EventReportEventType eventType = EventReportEventType.values()[0];
-
- /** padding */
+
+ /** padding */
protected int pad1;
-
- /** Fixed datum record count */
+
+ /** Fixed datum record count */
protected int numberOfFixedDatumRecords;
-
- /** variable datum record count */
+
+ /** variable datum record count */
protected int numberOfVariableDatumRecords;
-
- /** Fixed datum records */
+
+ /** Fixed datum records */
protected List< FixedDatum > fixedDatumRecords = new ArrayList< FixedDatum >();
-
- /** Variable datum records */
+
+ /** Variable datum records */
protected List< VariableDatum > variableDatumRecords = new ArrayList< VariableDatum >();
-
-
-/** Constructor */
- public EventReportRPdu()
- {
- setPduType( DISPDUType.EVENT_REPORT_RELIABLE );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += eventType.getMarshalledSize();
- marshalSize += 4; // pad1
- marshalSize += 4; // numberOfFixedDatumRecords
- marshalSize += 4; // numberOfVariableDatumRecords
- for(int idx=0; idx < fixedDatumRecords.size(); idx++)
- {
- FixedDatum listElement = fixedDatumRecords.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
- for(int idx=0; idx < variableDatumRecords.size(); idx++)
- {
- VariableDatum listElement = variableDatumRecords.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link EventReportRPdu#eventType}*/
-public EventReportRPdu setEventType(EventReportEventType pEventType)
+
+
+/** Constructor */
+ public EventReportRPdu()
+ {
+ setPduType( DISPDUType.EVENT_REPORT_RELIABLE );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += eventType.getMarshalledSize();
+ marshalSize += 4; // pad1
+ marshalSize += 4; // numberOfFixedDatumRecords
+ marshalSize += 4; // numberOfVariableDatumRecords
+ for(int idx=0; idx < fixedDatumRecords.size(); idx++)
+ {
+ FixedDatum listElement = fixedDatumRecords.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+ for(int idx=0; idx < variableDatumRecords.size(); idx++)
+ {
+ VariableDatum listElement = variableDatumRecords.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link EventReportRPdu#eventType}*/
+public EventReportRPdu setEventType(EventReportEventType pEventType)
{
- eventType = pEventType;
- return this;
-}
-
-/** Getter for {@link EventReportRPdu#eventType}*/
-public EventReportEventType getEventType()
+ eventType = pEventType;
+ return this;
+}
+
+/** Getter for {@link EventReportRPdu#eventType}*/
+public EventReportEventType getEventType()
{
return eventType;
-}
-
-/** Setter for {@link EventReportRPdu#pad1}*/
-public EventReportRPdu setPad1(int pPad1)
+}
+
+/** Setter for {@link EventReportRPdu#pad1}*/
+public EventReportRPdu setPad1(int pPad1)
{
- pad1 = pPad1;
- return this;
-}
-
-/** Getter for {@link EventReportRPdu#pad1}*/
-public int getPad1()
+ pad1 = pPad1;
+ return this;
+}
+
+/** Getter for {@link EventReportRPdu#pad1}*/
+public int getPad1()
{
return pad1;
-}
-
-/** Setter for {@link EventReportRPdu#fixedDatumRecords}*/
-public EventReportRPdu setFixedDatumRecords(List<FixedDatum> pFixedDatumRecords)
+}
+
+/** Setter for {@link EventReportRPdu#fixedDatumRecords}*/
+public EventReportRPdu setFixedDatumRecords(List<FixedDatum> pFixedDatumRecords)
{
- fixedDatumRecords = pFixedDatumRecords;
- return this;
-}
-
-/** Getter for {@link EventReportRPdu#fixedDatumRecords}*/
-public List<FixedDatum> getFixedDatumRecords()
+ fixedDatumRecords = pFixedDatumRecords;
+ return this;
+}
+
+/** Getter for {@link EventReportRPdu#fixedDatumRecords}*/
+public List<FixedDatum> getFixedDatumRecords()
{
return fixedDatumRecords;
-}
-
-/** Setter for {@link EventReportRPdu#variableDatumRecords}*/
-public EventReportRPdu setVariableDatumRecords(List<VariableDatum> pVariableDatumRecords)
+}
+
+/** Setter for {@link EventReportRPdu#variableDatumRecords}*/
+public EventReportRPdu setVariableDatumRecords(List<VariableDatum> pVariableDatumRecords)
{
- variableDatumRecords = pVariableDatumRecords;
- return this;
-}
-
-/** Getter for {@link EventReportRPdu#variableDatumRecords}*/
-public List<VariableDatum> getVariableDatumRecords()
+ variableDatumRecords = pVariableDatumRecords;
+ return this;
+}
+
+/** Getter for {@link EventReportRPdu#variableDatumRecords}*/
+public List<VariableDatum> getVariableDatumRecords()
{
return variableDatumRecords;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- eventType.marshal(dos);
- dos.writeInt(pad1);
- dos.writeInt(fixedDatumRecords.size());
- dos.writeInt(variableDatumRecords.size());
-
- for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
- {
- FixedDatum aFixedDatum = fixedDatumRecords.get(idx);
- aFixedDatum.marshal(dos);
- }
-
-
- for(int idx = 0; idx < variableDatumRecords.size(); idx++)
- {
- VariableDatum aVariableDatum = variableDatumRecords.get(idx);
- aVariableDatum.marshal(dos);
- }
-
+ {
+ eventType.marshal(dos);
+ dos.writeInt(pad1);
+ dos.writeInt(fixedDatumRecords.size());
+ dos.writeInt(variableDatumRecords.size());
+
+ for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
+ {
+ FixedDatum aFixedDatum = fixedDatumRecords.get(idx);
+ aFixedDatum.marshal(dos);
+ }
+
+
+ for(int idx = 0; idx < variableDatumRecords.size(); idx++)
+ {
+ VariableDatum aVariableDatum = variableDatumRecords.get(idx);
+ aVariableDatum.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- eventType = EventReportEventType.unmarshalEnum(dis);
- uPosition += eventType.getMarshalledSize();
- pad1 = dis.readInt();
- uPosition += 4;
- numberOfFixedDatumRecords = dis.readInt();
- uPosition += 4;
- numberOfVariableDatumRecords = dis.readInt();
- uPosition += 4;
- for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
- {
- FixedDatum anX = new FixedDatum();
- uPosition += anX.unmarshal(dis);
- fixedDatumRecords.add(anX);
- }
-
- for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
- {
- VariableDatum anX = new VariableDatum();
- uPosition += anX.unmarshal(dis);
- variableDatumRecords.add(anX);
- }
-
+ {
+ eventType = EventReportEventType.unmarshalEnum(dis);
+ uPosition += eventType.getMarshalledSize();
+ pad1 = dis.readInt();
+ uPosition += 4;
+ numberOfFixedDatumRecords = dis.readInt();
+ uPosition += 4;
+ numberOfVariableDatumRecords = dis.readInt();
+ uPosition += 4;
+ for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
+ {
+ FixedDatum anX = new FixedDatum();
+ uPosition += anX.unmarshal(dis);
+ fixedDatumRecords.add(anX);
+ }
+
+ for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
+ {
+ VariableDatum anX = new VariableDatum();
+ uPosition += anX.unmarshal(dis);
+ variableDatumRecords.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- eventType.marshal(buff);
- buff.putInt( (int)pad1);
- buff.putInt( (int)fixedDatumRecords.size());
- buff.putInt( (int)variableDatumRecords.size());
-
- for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
- {
- FixedDatum aFixedDatum = fixedDatumRecords.get(idx);
- aFixedDatum.marshal(buff);
- }
-
-
- for(int idx = 0; idx < variableDatumRecords.size(); idx++)
- {
- VariableDatum aVariableDatum = variableDatumRecords.get(idx);
- aVariableDatum.marshal(buff);
- }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ eventType.marshal(buff);
+ buff.putInt( (int)pad1);
+ buff.putInt( (int)fixedDatumRecords.size());
+ buff.putInt( (int)variableDatumRecords.size());
+
+ for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
+ {
+ FixedDatum aFixedDatum = fixedDatumRecords.get(idx);
+ aFixedDatum.marshal(buff);
+ }
+
+
+ for(int idx = 0; idx < variableDatumRecords.size(); idx++)
+ {
+ VariableDatum aVariableDatum = variableDatumRecords.get(idx);
+ aVariableDatum.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- eventType = EventReportEventType.unmarshalEnum(buff);
- pad1 = buff.getInt();
- numberOfFixedDatumRecords = buff.getInt();
- numberOfVariableDatumRecords = buff.getInt();
- for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
- {
- FixedDatum anX = new FixedDatum();
- anX.unmarshal(buff);
- fixedDatumRecords.add(anX);
- }
-
- for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
- {
- VariableDatum anX = new VariableDatum();
- anX.unmarshal(buff);
- variableDatumRecords.add(anX);
- }
-
- return getMarshalledSize();
+
+ eventType = EventReportEventType.unmarshalEnum(buff);
+ pad1 = buff.getInt();
+ numberOfFixedDatumRecords = buff.getInt();
+ numberOfVariableDatumRecords = buff.getInt();
+ for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
+ {
+ FixedDatum anX = new FixedDatum();
+ anX.unmarshal(buff);
+ fixedDatumRecords.add(anX);
+ }
+
+ for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
+ {
+ VariableDatum anX = new VariableDatum();
+ anX.unmarshal(buff);
+ variableDatumRecords.add(anX);
+ }
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final EventReportRPdu rhs = (EventReportRPdu)obj;
-
- if( ! (eventType == rhs.eventType)) ivarsEqual = false;
- if( ! (pad1 == rhs.pad1)) ivarsEqual = false;
-
- for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
- if( ! ( fixedDatumRecords.get(idx).equals(rhs.fixedDatumRecords.get(idx)))) ivarsEqual = false;
-
-
- for(int idx = 0; idx < variableDatumRecords.size(); idx++)
- if( ! ( variableDatumRecords.get(idx).equals(rhs.variableDatumRecords.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final EventReportRPdu rhs = (EventReportRPdu)obj;
+
+ if( ! (eventType == rhs.eventType)) ivarsEqual = false;
+ if( ! (pad1 == rhs.pad1)) ivarsEqual = false;
+
+ for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
+ if( ! ( fixedDatumRecords.get(idx).equals(rhs.fixedDatumRecords.get(idx)))) ivarsEqual = false;
+
+
+ for(int idx = 0; idx < variableDatumRecords.size(); idx++)
+ if( ! ( variableDatumRecords.get(idx).equals(rhs.variableDatumRecords.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" eventType: ").append(eventType).append("\n");
- sb.append(" pad1: ").append(pad1).append("\n");
- sb.append(" fixedDatumRecords: ").append("\n");
- fixedDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
- sb.append(" variableDatumRecords: ").append("\n");
- variableDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" eventType: ").append(eventType).append("\n");
+ sb.append(" pad1: ").append(pad1).append("\n");
+ sb.append(" fixedDatumRecords: ").append("\n");
+ fixedDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+ sb.append(" variableDatumRecords: ").append("\n");
+ variableDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/EventReportReliablePdu.java b/src-generated/edu/nps/moves/dis7/EventReportReliablePdu.java
index f74dc742d11220b0c859a3f080e7eb1b736ec5b4..bc230a1638967392d2d002dd385b9f45c9e4e7fa 100644
--- a/src-generated/edu/nps/moves/dis7/EventReportReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/EventReportReliablePdu.java
@@ -1,17 +1,17 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * more descriptive name for a EventReportRPdu
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class EventReportReliablePdu extends EventReportRPdu
-{}
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * more descriptive name for a EventReportRPdu
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class EventReportReliablePdu extends EventReportRPdu
+{}
diff --git a/src-generated/edu/nps/moves/dis7/Expendable.java b/src-generated/edu/nps/moves/dis7/Expendable.java
index 6bffcbb00683fc218e26353fe06c651907c1e1e2..156af9ccfc28173f93c6dd3b129dffb6e7fef293 100644
--- a/src-generated/edu/nps/moves/dis7/Expendable.java
+++ b/src-generated/edu/nps/moves/dis7/Expendable.java
@@ -1,254 +1,254 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * An entity's expendable (chaff, flares, etc) information. Section 6.2.36
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class Expendable extends Object implements Serializable
-{
- /** Type of expendable */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * An entity's expendable (chaff, flares, etc) information. Section 6.2.36
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class Expendable extends Object implements Serializable
+{
+ /** Type of expendable */
protected EntityType expendable = new EntityType();
-
+
protected int station;
-
+
protected short quantity;
-
- /** uid 327 */
+
+ /** uid 327 */
protected MunitionExpendableStatus expendableStatus = MunitionExpendableStatus.values()[0];
-
+
protected byte padding = (byte)0;
-
-
-/** Constructor */
- public Expendable()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += expendable.getMarshalledSize();
- marshalSize += 4; // station
- marshalSize += 2; // quantity
- marshalSize += expendableStatus.getMarshalledSize();
- marshalSize += 1; // padding
-
- return marshalSize;
-}
-
-
-/** Setter for {@link Expendable#expendable}*/
-public Expendable setExpendable(EntityType pExpendable)
-{
- expendable = pExpendable;
- return this;
-}
-
-/** Getter for {@link Expendable#expendable}*/
-public EntityType getExpendable()
+
+
+/** Constructor */
+ public Expendable()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += expendable.getMarshalledSize();
+ marshalSize += 4; // station
+ marshalSize += 2; // quantity
+ marshalSize += expendableStatus.getMarshalledSize();
+ marshalSize += 1; // padding
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link Expendable#expendable}*/
+public Expendable setExpendable(EntityType pExpendable)
+{
+ expendable = pExpendable;
+ return this;
+}
+
+/** Getter for {@link Expendable#expendable}*/
+public EntityType getExpendable()
{
return expendable;
-}
-
-/** Setter for {@link Expendable#station}*/
-public Expendable setStation(int pStation)
-{
- station = pStation;
- return this;
-}
-
-/** Getter for {@link Expendable#station}*/
-public int getStation()
+}
+
+/** Setter for {@link Expendable#station}*/
+public Expendable setStation(int pStation)
+{
+ station = pStation;
+ return this;
+}
+
+/** Getter for {@link Expendable#station}*/
+public int getStation()
{
return station;
-}
-
-/** Setter for {@link Expendable#quantity}*/
-public Expendable setQuantity(short pQuantity)
-{
- quantity = pQuantity;
- return this;
-}
-
-/** Getter for {@link Expendable#quantity}*/
-public short getQuantity()
+}
+
+/** Setter for {@link Expendable#quantity}*/
+public Expendable setQuantity(short pQuantity)
+{
+ quantity = pQuantity;
+ return this;
+}
+
+/** Getter for {@link Expendable#quantity}*/
+public short getQuantity()
{
return quantity;
-}
-
-/** Setter for {@link Expendable#expendableStatus}*/
-public Expendable setExpendableStatus(MunitionExpendableStatus pExpendableStatus)
-{
- expendableStatus = pExpendableStatus;
- return this;
-}
-
-/** Getter for {@link Expendable#expendableStatus}*/
-public MunitionExpendableStatus getExpendableStatus()
+}
+
+/** Setter for {@link Expendable#expendableStatus}*/
+public Expendable setExpendableStatus(MunitionExpendableStatus pExpendableStatus)
+{
+ expendableStatus = pExpendableStatus;
+ return this;
+}
+
+/** Getter for {@link Expendable#expendableStatus}*/
+public MunitionExpendableStatus getExpendableStatus()
{
return expendableStatus;
-}
-
-/** Setter for {@link Expendable#padding}*/
-public Expendable setPadding(byte pPadding)
-{
- padding = pPadding;
- return this;
-}
-
-/** Getter for {@link Expendable#padding}*/
-public byte getPadding()
+}
+
+/** Setter for {@link Expendable#padding}*/
+public Expendable setPadding(byte pPadding)
+{
+ padding = pPadding;
+ return this;
+}
+
+/** Getter for {@link Expendable#padding}*/
+public byte getPadding()
{
return padding;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- expendable.marshal(dos);
- dos.writeInt(station);
- dos.writeShort(quantity);
- expendableStatus.marshal(dos);
- dos.writeByte(padding);
+ {
+ expendable.marshal(dos);
+ dos.writeInt(station);
+ dos.writeShort(quantity);
+ expendableStatus.marshal(dos);
+ dos.writeByte(padding);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- uPosition += expendable.unmarshal(dis);
- station = dis.readInt();
- uPosition += 4;
- quantity = (short)dis.readUnsignedShort();
- uPosition += 2;
- expendableStatus = MunitionExpendableStatus.unmarshalEnum(dis);
- uPosition += expendableStatus.getMarshalledSize();
- padding = (byte)dis.readUnsignedByte();
- uPosition += 1;
+ {
+ uPosition += expendable.unmarshal(dis);
+ station = dis.readInt();
+ uPosition += 4;
+ quantity = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ expendableStatus = MunitionExpendableStatus.unmarshalEnum(dis);
+ uPosition += expendableStatus.getMarshalledSize();
+ padding = (byte)dis.readUnsignedByte();
+ uPosition += 1;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- expendable.marshal(buff);
- buff.putInt( (int)station);
- buff.putShort( (short)quantity);
- expendableStatus.marshal(buff);
- buff.put( (byte)padding);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- expendable.unmarshal(buff);
- station = buff.getInt();
- quantity = (short)(buff.getShort() & 0xFFFF);
- expendableStatus = MunitionExpendableStatus.unmarshalEnum(buff);
- padding = (byte)(buff.get() & 0xFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ expendable.marshal(buff);
+ buff.putInt( (int)station);
+ buff.putShort( (short)quantity);
+ expendableStatus.marshal(buff);
+ buff.put( (byte)padding);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ expendable.unmarshal(buff);
+ station = buff.getInt();
+ quantity = (short)(buff.getShort() & 0xFFFF);
+ expendableStatus = MunitionExpendableStatus.unmarshalEnum(buff);
+ padding = (byte)(buff.get() & 0xFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final Expendable rhs = (Expendable)obj;
-
- if( ! (expendable.equals( rhs.expendable) )) ivarsEqual = false;
- if( ! (station == rhs.station)) ivarsEqual = false;
- if( ! (quantity == rhs.quantity)) ivarsEqual = false;
- if( ! (expendableStatus == rhs.expendableStatus)) ivarsEqual = false;
- if( ! (padding == rhs.padding)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final Expendable rhs = (Expendable)obj;
+
+ if( ! (expendable.equals( rhs.expendable) )) ivarsEqual = false;
+ if( ! (station == rhs.station)) ivarsEqual = false;
+ if( ! (quantity == rhs.quantity)) ivarsEqual = false;
+ if( ! (expendableStatus == rhs.expendableStatus)) ivarsEqual = false;
+ if( ! (padding == rhs.padding)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" expendable: ").append(expendable).append("\n");
- sb.append(" station: ").append(station).append("\n");
- sb.append(" quantity: ").append(quantity).append("\n");
- sb.append(" expendableStatus: ").append(expendableStatus).append("\n");
- sb.append(" padding: ").append(padding).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" expendable: ").append(expendable).append("\n");
+ sb.append(" station: ").append(station).append("\n");
+ sb.append(" quantity: ").append(quantity).append("\n");
+ sb.append(" expendableStatus: ").append(expendableStatus).append("\n");
+ sb.append(" padding: ").append(padding).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ExpendableDescriptor.java b/src-generated/edu/nps/moves/dis7/ExpendableDescriptor.java
index d8796d8c8fda0c85899eb13b842117b80eee4e3b..ae00e02f8a4e04bf4ebe25f6ba1cb36ea315f1e1 100644
--- a/src-generated/edu/nps/moves/dis7/ExpendableDescriptor.java
+++ b/src-generated/edu/nps/moves/dis7/ExpendableDescriptor.java
@@ -1,185 +1,185 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Burst of chaff or expendible device. Section 6.2.19.4
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class ExpendableDescriptor extends Object implements Serializable
-{
- /** Type of the object that exploded */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Burst of chaff or expendible device. Section 6.2.19.4
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class ExpendableDescriptor extends Object implements Serializable
+{
+ /** Type of the object that exploded */
protected EntityType expendableType = new EntityType();
-
- /** Padding */
+
+ /** Padding */
protected long padding = (long)0;
-
-
-/** Constructor */
- public ExpendableDescriptor()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += expendableType.getMarshalledSize();
- marshalSize += 8; // padding
-
- return marshalSize;
-}
-
-
-/** Setter for {@link ExpendableDescriptor#expendableType}*/
-public ExpendableDescriptor setExpendableType(EntityType pExpendableType)
+
+
+/** Constructor */
+ public ExpendableDescriptor()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += expendableType.getMarshalledSize();
+ marshalSize += 8; // padding
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link ExpendableDescriptor#expendableType}*/
+public ExpendableDescriptor setExpendableType(EntityType pExpendableType)
{
- expendableType = pExpendableType;
- return this;
-}
-
-/** Getter for {@link ExpendableDescriptor#expendableType}*/
-public EntityType getExpendableType()
+ expendableType = pExpendableType;
+ return this;
+}
+
+/** Getter for {@link ExpendableDescriptor#expendableType}*/
+public EntityType getExpendableType()
{
return expendableType;
-}
-
-/** Setter for {@link ExpendableDescriptor#padding}*/
-public ExpendableDescriptor setPadding(long pPadding)
+}
+
+/** Setter for {@link ExpendableDescriptor#padding}*/
+public ExpendableDescriptor setPadding(long pPadding)
{
- padding = pPadding;
- return this;
-}
-
-/** Getter for {@link ExpendableDescriptor#padding}*/
-public long getPadding()
+ padding = pPadding;
+ return this;
+}
+
+/** Getter for {@link ExpendableDescriptor#padding}*/
+public long getPadding()
{
return padding;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- expendableType.marshal(dos);
- dos.writeLong(padding);
+ {
+ expendableType.marshal(dos);
+ dos.writeLong(padding);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- uPosition += expendableType.unmarshal(dis);
- padding = dis.readLong();
- uPosition += 4;
+ {
+ uPosition += expendableType.unmarshal(dis);
+ padding = dis.readLong();
+ uPosition += 4;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- expendableType.marshal(buff);
- buff.putLong( (long)padding);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- expendableType.unmarshal(buff);
- padding = buff.getLong();
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ expendableType.marshal(buff);
+ buff.putLong( (long)padding);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ expendableType.unmarshal(buff);
+ padding = buff.getLong();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final ExpendableDescriptor rhs = (ExpendableDescriptor)obj;
-
- if( ! (expendableType.equals( rhs.expendableType) )) ivarsEqual = false;
- if( ! (padding == rhs.padding)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final ExpendableDescriptor rhs = (ExpendableDescriptor)obj;
+
+ if( ! (expendableType.equals( rhs.expendableType) )) ivarsEqual = false;
+ if( ! (padding == rhs.padding)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" expendableType: ").append(expendableType).append("\n");
- sb.append(" padding: ").append(padding).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" expendableType: ").append(expendableType).append("\n");
+ sb.append(" padding: ").append(padding).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ExpendableReload.java b/src-generated/edu/nps/moves/dis7/ExpendableReload.java
index bfa693468e4300d011810ab916657e30dd5bc542..9b05e150b30e5030c4cc0db252e36bc2b3460f44 100644
--- a/src-generated/edu/nps/moves/dis7/ExpendableReload.java
+++ b/src-generated/edu/nps/moves/dis7/ExpendableReload.java
@@ -1,276 +1,276 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * An entity's expendable (chaff, flares, etc) information. Section 6.2.37
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class ExpendableReload extends Object implements Serializable
-{
- /** Type of expendable */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * An entity's expendable (chaff, flares, etc) information. Section 6.2.37
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class ExpendableReload extends Object implements Serializable
+{
+ /** Type of expendable */
protected EntityType expendable = new EntityType();
-
+
protected int station;
-
+
protected short standardQuantity;
-
+
protected short maximumQuantity;
-
+
protected int standardQuantityReloadTime;
-
+
protected int maximumQuantityReloadTime;
-
-
-/** Constructor */
- public ExpendableReload()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += expendable.getMarshalledSize();
- marshalSize += 4; // station
- marshalSize += 2; // standardQuantity
- marshalSize += 2; // maximumQuantity
- marshalSize += 4; // standardQuantityReloadTime
- marshalSize += 4; // maximumQuantityReloadTime
-
- return marshalSize;
-}
-
-
-/** Setter for {@link ExpendableReload#expendable}*/
-public ExpendableReload setExpendable(EntityType pExpendable)
+
+
+/** Constructor */
+ public ExpendableReload()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += expendable.getMarshalledSize();
+ marshalSize += 4; // station
+ marshalSize += 2; // standardQuantity
+ marshalSize += 2; // maximumQuantity
+ marshalSize += 4; // standardQuantityReloadTime
+ marshalSize += 4; // maximumQuantityReloadTime
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link ExpendableReload#expendable}*/
+public ExpendableReload setExpendable(EntityType pExpendable)
{
- expendable = pExpendable;
- return this;
-}
-
-/** Getter for {@link ExpendableReload#expendable}*/
-public EntityType getExpendable()
+ expendable = pExpendable;
+ return this;
+}
+
+/** Getter for {@link ExpendableReload#expendable}*/
+public EntityType getExpendable()
{
return expendable;
-}
-
-/** Setter for {@link ExpendableReload#station}*/
-public ExpendableReload setStation(int pStation)
+}
+
+/** Setter for {@link ExpendableReload#station}*/
+public ExpendableReload setStation(int pStation)
{
- station = pStation;
- return this;
-}
-
-/** Getter for {@link ExpendableReload#station}*/
-public int getStation()
+ station = pStation;
+ return this;
+}
+
+/** Getter for {@link ExpendableReload#station}*/
+public int getStation()
{
return station;
-}
-
-/** Setter for {@link ExpendableReload#standardQuantity}*/
-public ExpendableReload setStandardQuantity(short pStandardQuantity)
+}
+
+/** Setter for {@link ExpendableReload#standardQuantity}*/
+public ExpendableReload setStandardQuantity(short pStandardQuantity)
{
- standardQuantity = pStandardQuantity;
- return this;
-}
-
-/** Getter for {@link ExpendableReload#standardQuantity}*/
-public short getStandardQuantity()
+ standardQuantity = pStandardQuantity;
+ return this;
+}
+
+/** Getter for {@link ExpendableReload#standardQuantity}*/
+public short getStandardQuantity()
{
return standardQuantity;
-}
-
-/** Setter for {@link ExpendableReload#maximumQuantity}*/
-public ExpendableReload setMaximumQuantity(short pMaximumQuantity)
+}
+
+/** Setter for {@link ExpendableReload#maximumQuantity}*/
+public ExpendableReload setMaximumQuantity(short pMaximumQuantity)
{
- maximumQuantity = pMaximumQuantity;
- return this;
-}
-
-/** Getter for {@link ExpendableReload#maximumQuantity}*/
-public short getMaximumQuantity()
+ maximumQuantity = pMaximumQuantity;
+ return this;
+}
+
+/** Getter for {@link ExpendableReload#maximumQuantity}*/
+public short getMaximumQuantity()
{
return maximumQuantity;
-}
-
-/** Setter for {@link ExpendableReload#standardQuantityReloadTime}*/
-public ExpendableReload setStandardQuantityReloadTime(int pStandardQuantityReloadTime)
+}
+
+/** Setter for {@link ExpendableReload#standardQuantityReloadTime}*/
+public ExpendableReload setStandardQuantityReloadTime(int pStandardQuantityReloadTime)
{
- standardQuantityReloadTime = pStandardQuantityReloadTime;
- return this;
-}
-
-/** Getter for {@link ExpendableReload#standardQuantityReloadTime}*/
-public int getStandardQuantityReloadTime()
+ standardQuantityReloadTime = pStandardQuantityReloadTime;
+ return this;
+}
+
+/** Getter for {@link ExpendableReload#standardQuantityReloadTime}*/
+public int getStandardQuantityReloadTime()
{
return standardQuantityReloadTime;
-}
-
-/** Setter for {@link ExpendableReload#maximumQuantityReloadTime}*/
-public ExpendableReload setMaximumQuantityReloadTime(int pMaximumQuantityReloadTime)
+}
+
+/** Setter for {@link ExpendableReload#maximumQuantityReloadTime}*/
+public ExpendableReload setMaximumQuantityReloadTime(int pMaximumQuantityReloadTime)
{
- maximumQuantityReloadTime = pMaximumQuantityReloadTime;
- return this;
-}
-
-/** Getter for {@link ExpendableReload#maximumQuantityReloadTime}*/
-public int getMaximumQuantityReloadTime()
+ maximumQuantityReloadTime = pMaximumQuantityReloadTime;
+ return this;
+}
+
+/** Getter for {@link ExpendableReload#maximumQuantityReloadTime}*/
+public int getMaximumQuantityReloadTime()
{
return maximumQuantityReloadTime;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- expendable.marshal(dos);
- dos.writeInt(station);
- dos.writeShort(standardQuantity);
- dos.writeShort(maximumQuantity);
- dos.writeInt(standardQuantityReloadTime);
- dos.writeInt(maximumQuantityReloadTime);
+ {
+ expendable.marshal(dos);
+ dos.writeInt(station);
+ dos.writeShort(standardQuantity);
+ dos.writeShort(maximumQuantity);
+ dos.writeInt(standardQuantityReloadTime);
+ dos.writeInt(maximumQuantityReloadTime);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- uPosition += expendable.unmarshal(dis);
- station = dis.readInt();
- uPosition += 4;
- standardQuantity = (short)dis.readUnsignedShort();
- uPosition += 2;
- maximumQuantity = (short)dis.readUnsignedShort();
- uPosition += 2;
- standardQuantityReloadTime = dis.readInt();
- uPosition += 4;
- maximumQuantityReloadTime = dis.readInt();
- uPosition += 4;
+ {
+ uPosition += expendable.unmarshal(dis);
+ station = dis.readInt();
+ uPosition += 4;
+ standardQuantity = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ maximumQuantity = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ standardQuantityReloadTime = dis.readInt();
+ uPosition += 4;
+ maximumQuantityReloadTime = dis.readInt();
+ uPosition += 4;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- expendable.marshal(buff);
- buff.putInt( (int)station);
- buff.putShort( (short)standardQuantity);
- buff.putShort( (short)maximumQuantity);
- buff.putInt( (int)standardQuantityReloadTime);
- buff.putInt( (int)maximumQuantityReloadTime);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- expendable.unmarshal(buff);
- station = buff.getInt();
- standardQuantity = (short)(buff.getShort() & 0xFFFF);
- maximumQuantity = (short)(buff.getShort() & 0xFFFF);
- standardQuantityReloadTime = buff.getInt();
- maximumQuantityReloadTime = buff.getInt();
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ expendable.marshal(buff);
+ buff.putInt( (int)station);
+ buff.putShort( (short)standardQuantity);
+ buff.putShort( (short)maximumQuantity);
+ buff.putInt( (int)standardQuantityReloadTime);
+ buff.putInt( (int)maximumQuantityReloadTime);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ expendable.unmarshal(buff);
+ station = buff.getInt();
+ standardQuantity = (short)(buff.getShort() & 0xFFFF);
+ maximumQuantity = (short)(buff.getShort() & 0xFFFF);
+ standardQuantityReloadTime = buff.getInt();
+ maximumQuantityReloadTime = buff.getInt();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final ExpendableReload rhs = (ExpendableReload)obj;
-
- if( ! (expendable.equals( rhs.expendable) )) ivarsEqual = false;
- if( ! (station == rhs.station)) ivarsEqual = false;
- if( ! (standardQuantity == rhs.standardQuantity)) ivarsEqual = false;
- if( ! (maximumQuantity == rhs.maximumQuantity)) ivarsEqual = false;
- if( ! (standardQuantityReloadTime == rhs.standardQuantityReloadTime)) ivarsEqual = false;
- if( ! (maximumQuantityReloadTime == rhs.maximumQuantityReloadTime)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final ExpendableReload rhs = (ExpendableReload)obj;
+
+ if( ! (expendable.equals( rhs.expendable) )) ivarsEqual = false;
+ if( ! (station == rhs.station)) ivarsEqual = false;
+ if( ! (standardQuantity == rhs.standardQuantity)) ivarsEqual = false;
+ if( ! (maximumQuantity == rhs.maximumQuantity)) ivarsEqual = false;
+ if( ! (standardQuantityReloadTime == rhs.standardQuantityReloadTime)) ivarsEqual = false;
+ if( ! (maximumQuantityReloadTime == rhs.maximumQuantityReloadTime)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" expendable: ").append(expendable).append("\n");
- sb.append(" station: ").append(station).append("\n");
- sb.append(" standardQuantity: ").append(standardQuantity).append("\n");
- sb.append(" maximumQuantity: ").append(maximumQuantity).append("\n");
- sb.append(" standardQuantityReloadTime: ").append(standardQuantityReloadTime).append("\n");
- sb.append(" maximumQuantityReloadTime: ").append(maximumQuantityReloadTime).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" expendable: ").append(expendable).append("\n");
+ sb.append(" station: ").append(station).append("\n");
+ sb.append(" standardQuantity: ").append(standardQuantity).append("\n");
+ sb.append(" maximumQuantity: ").append(maximumQuantity).append("\n");
+ sb.append(" standardQuantityReloadTime: ").append(standardQuantityReloadTime).append("\n");
+ sb.append(" maximumQuantityReloadTime: ").append(maximumQuantityReloadTime).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ExplosionDescriptor.java b/src-generated/edu/nps/moves/dis7/ExplosionDescriptor.java
index 20df76cda51513bfb2f98881769b46184ab892ca..154ad868b7ffdc29f8254f894557c14018fcd439 100644
--- a/src-generated/edu/nps/moves/dis7/ExplosionDescriptor.java
+++ b/src-generated/edu/nps/moves/dis7/ExplosionDescriptor.java
@@ -1,233 +1,233 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Explosion of a non-munition. Section 6.2.19.3
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class ExplosionDescriptor extends Object implements Serializable
-{
- /** Type of the object that exploded. See 6.2.30 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Explosion of a non-munition. Section 6.2.19.3
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class ExplosionDescriptor extends Object implements Serializable
+{
+ /** Type of the object that exploded. See 6.2.30 */
protected EntityType explodingObject = new EntityType();
-
- /** Material that exploded. Can be grain dust, tnt, gasoline, etc. Enumeration uid 310 */
+
+ /** Material that exploded. Can be grain dust, tnt, gasoline, etc. Enumeration uid 310 */
protected ExplosiveMaterialCategories explosiveMaterial = ExplosiveMaterialCategories.values()[0];
-
- /** padding */
+
+ /** padding */
protected short padding = (short)0;
-
- /** Force of explosion, in equivalent KG of TNT */
+
+ /** Force of explosion, in equivalent KG of TNT */
protected float explosiveForce;
-
-
-/** Constructor */
- public ExplosionDescriptor()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public ExplosionDescriptor()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += explodingObject.getMarshalledSize();
+ marshalSize += explosiveMaterial.getMarshalledSize();
+ marshalSize += 2; // padding
+ marshalSize += 4; // explosiveForce
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link ExplosionDescriptor#explodingObject}*/
+public ExplosionDescriptor setExplodingObject(EntityType pExplodingObject)
{
- int marshalSize = 0;
-
- marshalSize += explodingObject.getMarshalledSize();
- marshalSize += explosiveMaterial.getMarshalledSize();
- marshalSize += 2; // padding
- marshalSize += 4; // explosiveForce
-
- return marshalSize;
-}
-
-
-/** Setter for {@link ExplosionDescriptor#explodingObject}*/
-public ExplosionDescriptor setExplodingObject(EntityType pExplodingObject)
-{
- explodingObject = pExplodingObject;
- return this;
-}
-
-/** Getter for {@link ExplosionDescriptor#explodingObject}*/
-public EntityType getExplodingObject()
+ explodingObject = pExplodingObject;
+ return this;
+}
+
+/** Getter for {@link ExplosionDescriptor#explodingObject}*/
+public EntityType getExplodingObject()
{
return explodingObject;
-}
-
-/** Setter for {@link ExplosionDescriptor#explosiveMaterial}*/
-public ExplosionDescriptor setExplosiveMaterial(ExplosiveMaterialCategories pExplosiveMaterial)
+}
+
+/** Setter for {@link ExplosionDescriptor#explosiveMaterial}*/
+public ExplosionDescriptor setExplosiveMaterial(ExplosiveMaterialCategories pExplosiveMaterial)
{
- explosiveMaterial = pExplosiveMaterial;
- return this;
-}
-
-/** Getter for {@link ExplosionDescriptor#explosiveMaterial}*/
-public ExplosiveMaterialCategories getExplosiveMaterial()
+ explosiveMaterial = pExplosiveMaterial;
+ return this;
+}
+
+/** Getter for {@link ExplosionDescriptor#explosiveMaterial}*/
+public ExplosiveMaterialCategories getExplosiveMaterial()
{
return explosiveMaterial;
-}
-
-/** Setter for {@link ExplosionDescriptor#padding}*/
-public ExplosionDescriptor setPadding(short pPadding)
+}
+
+/** Setter for {@link ExplosionDescriptor#padding}*/
+public ExplosionDescriptor setPadding(short pPadding)
{
- padding = pPadding;
- return this;
-}
-
-/** Getter for {@link ExplosionDescriptor#padding}*/
-public short getPadding()
+ padding = pPadding;
+ return this;
+}
+
+/** Getter for {@link ExplosionDescriptor#padding}*/
+public short getPadding()
{
return padding;
-}
-
-/** Setter for {@link ExplosionDescriptor#explosiveForce}*/
-public ExplosionDescriptor setExplosiveForce(float pExplosiveForce)
+}
+
+/** Setter for {@link ExplosionDescriptor#explosiveForce}*/
+public ExplosionDescriptor setExplosiveForce(float pExplosiveForce)
{
- explosiveForce = pExplosiveForce;
- return this;
-}
-
-/** Getter for {@link ExplosionDescriptor#explosiveForce}*/
-public float getExplosiveForce()
+ explosiveForce = pExplosiveForce;
+ return this;
+}
+
+/** Getter for {@link ExplosionDescriptor#explosiveForce}*/
+public float getExplosiveForce()
{
return explosiveForce;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- explodingObject.marshal(dos);
- explosiveMaterial.marshal(dos);
- dos.writeShort(padding);
- dos.writeFloat(explosiveForce);
+ {
+ explodingObject.marshal(dos);
+ explosiveMaterial.marshal(dos);
+ dos.writeShort(padding);
+ dos.writeFloat(explosiveForce);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- uPosition += explodingObject.unmarshal(dis);
- explosiveMaterial = ExplosiveMaterialCategories.unmarshalEnum(dis);
- uPosition += explosiveMaterial.getMarshalledSize();
- padding = (short)dis.readUnsignedShort();
- uPosition += 2;
- explosiveForce = dis.readFloat();
- uPosition += 4;
+ {
+ uPosition += explodingObject.unmarshal(dis);
+ explosiveMaterial = ExplosiveMaterialCategories.unmarshalEnum(dis);
+ uPosition += explosiveMaterial.getMarshalledSize();
+ padding = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ explosiveForce = dis.readFloat();
+ uPosition += 4;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- explodingObject.marshal(buff);
- explosiveMaterial.marshal(buff);
- buff.putShort( (short)padding);
- buff.putFloat( (float)explosiveForce);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- explodingObject.unmarshal(buff);
- explosiveMaterial = ExplosiveMaterialCategories.unmarshalEnum(buff);
- padding = (short)(buff.getShort() & 0xFFFF);
- explosiveForce = buff.getFloat();
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ explodingObject.marshal(buff);
+ explosiveMaterial.marshal(buff);
+ buff.putShort( (short)padding);
+ buff.putFloat( (float)explosiveForce);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ explodingObject.unmarshal(buff);
+ explosiveMaterial = ExplosiveMaterialCategories.unmarshalEnum(buff);
+ padding = (short)(buff.getShort() & 0xFFFF);
+ explosiveForce = buff.getFloat();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final ExplosionDescriptor rhs = (ExplosionDescriptor)obj;
-
- if( ! (explodingObject.equals( rhs.explodingObject) )) ivarsEqual = false;
- if( ! (explosiveMaterial == rhs.explosiveMaterial)) ivarsEqual = false;
- if( ! (padding == rhs.padding)) ivarsEqual = false;
- if( ! (explosiveForce == rhs.explosiveForce)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final ExplosionDescriptor rhs = (ExplosionDescriptor)obj;
+
+ if( ! (explodingObject.equals( rhs.explodingObject) )) ivarsEqual = false;
+ if( ! (explosiveMaterial == rhs.explosiveMaterial)) ivarsEqual = false;
+ if( ! (padding == rhs.padding)) ivarsEqual = false;
+ if( ! (explosiveForce == rhs.explosiveForce)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" explodingObject: ").append(explodingObject).append("\n");
- sb.append(" explosiveMaterial: ").append(explosiveMaterial).append("\n");
- sb.append(" padding: ").append(padding).append("\n");
- sb.append(" explosiveForce: ").append(explosiveForce).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" explodingObject: ").append(explodingObject).append("\n");
+ sb.append(" explosiveMaterial: ").append(explosiveMaterial).append("\n");
+ sb.append(" padding: ").append(padding).append("\n");
+ sb.append(" explosiveForce: ").append(explosiveForce).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/FalseTargetsAttribute.java b/src-generated/edu/nps/moves/dis7/FalseTargetsAttribute.java
index 2c22a5792e3bb756e23691d0ad75978a9f43fd71..35921657ea302066beb7588a881359606cc6847b 100644
--- a/src-generated/edu/nps/moves/dis7/FalseTargetsAttribute.java
+++ b/src-generated/edu/nps/moves/dis7/FalseTargetsAttribute.java
@@ -1,484 +1,484 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * The False Targets attribute record shall be used to communicate discrete values that are associated with false targets jamming that cannot be referenced to an emitter mode. The values provided in the False Targets attri- bute record shall be considered valid only for the victim radar beams listed in the jamming beam's Track/Jam Data records (provided in the associated Electromagnetic Emission PDU). Section 6.2.21.3
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class FalseTargetsAttribute extends Object implements Serializable
-{
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * The False Targets attribute record shall be used to communicate discrete values that are associated with false targets jamming that cannot be referenced to an emitter mode. The values provided in the False Targets attri- bute record shall be considered valid only for the victim radar beams listed in the jamming beam's Track/Jam Data records (provided in the associated Electromagnetic Emission PDU). Section 6.2.21.3
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class FalseTargetsAttribute extends Object implements Serializable
+{
protected int recordType = (int)3502;
-
+
protected short recordLength = (short)40;
-
+
protected short padding = (short)0;
-
+
protected byte emitterNumber;
-
+
protected byte beamNumber;
-
- /** uid 300 */
+
+ /** uid 300 */
protected EEAttributeStateIndicator stateIndicator = EEAttributeStateIndicator.values()[0];
-
+
protected byte padding2 = (byte)0;
-
+
protected short padding3 = (short)0;
-
+
protected short falseTargetCount;
-
+
protected float walkSpeed;
-
+
protected float walkAcceleration;
-
+
protected float maximumWalkDistance;
-
+
protected float keepTime;
-
+
protected float echoSpacing;
-
+
protected float firstTargetOffset;
-
-
-/** Constructor */
- public FalseTargetsAttribute()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += 4; // recordType
- marshalSize += 2; // recordLength
- marshalSize += 2; // padding
- marshalSize += 1; // emitterNumber
- marshalSize += 1; // beamNumber
- marshalSize += stateIndicator.getMarshalledSize();
- marshalSize += 1; // padding2
- marshalSize += 2; // padding3
- marshalSize += 2; // falseTargetCount
- marshalSize += 4; // walkSpeed
- marshalSize += 4; // walkAcceleration
- marshalSize += 4; // maximumWalkDistance
- marshalSize += 4; // keepTime
- marshalSize += 4; // echoSpacing
- marshalSize += 4; // firstTargetOffset
-
- return marshalSize;
-}
-
-
-/** Setter for {@link FalseTargetsAttribute#recordType}*/
-public FalseTargetsAttribute setRecordType(int pRecordType)
-{
- recordType = pRecordType;
- return this;
-}
-
-/** Getter for {@link FalseTargetsAttribute#recordType}*/
-public int getRecordType()
+
+
+/** Constructor */
+ public FalseTargetsAttribute()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 4; // recordType
+ marshalSize += 2; // recordLength
+ marshalSize += 2; // padding
+ marshalSize += 1; // emitterNumber
+ marshalSize += 1; // beamNumber
+ marshalSize += stateIndicator.getMarshalledSize();
+ marshalSize += 1; // padding2
+ marshalSize += 2; // padding3
+ marshalSize += 2; // falseTargetCount
+ marshalSize += 4; // walkSpeed
+ marshalSize += 4; // walkAcceleration
+ marshalSize += 4; // maximumWalkDistance
+ marshalSize += 4; // keepTime
+ marshalSize += 4; // echoSpacing
+ marshalSize += 4; // firstTargetOffset
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link FalseTargetsAttribute#recordType}*/
+public FalseTargetsAttribute setRecordType(int pRecordType)
+{
+ recordType = pRecordType;
+ return this;
+}
+
+/** Getter for {@link FalseTargetsAttribute#recordType}*/
+public int getRecordType()
{
return recordType;
-}
-
-/** Setter for {@link FalseTargetsAttribute#recordLength}*/
-public FalseTargetsAttribute setRecordLength(short pRecordLength)
-{
- recordLength = pRecordLength;
- return this;
-}
-
-/** Getter for {@link FalseTargetsAttribute#recordLength}*/
-public short getRecordLength()
+}
+
+/** Setter for {@link FalseTargetsAttribute#recordLength}*/
+public FalseTargetsAttribute setRecordLength(short pRecordLength)
+{
+ recordLength = pRecordLength;
+ return this;
+}
+
+/** Getter for {@link FalseTargetsAttribute#recordLength}*/
+public short getRecordLength()
{
return recordLength;
-}
-
-/** Setter for {@link FalseTargetsAttribute#padding}*/
-public FalseTargetsAttribute setPadding(short pPadding)
-{
- padding = pPadding;
- return this;
-}
-
-/** Getter for {@link FalseTargetsAttribute#padding}*/
-public short getPadding()
+}
+
+/** Setter for {@link FalseTargetsAttribute#padding}*/
+public FalseTargetsAttribute setPadding(short pPadding)
+{
+ padding = pPadding;
+ return this;
+}
+
+/** Getter for {@link FalseTargetsAttribute#padding}*/
+public short getPadding()
{
return padding;
-}
-
-/** Setter for {@link FalseTargetsAttribute#emitterNumber}*/
-public FalseTargetsAttribute setEmitterNumber(byte pEmitterNumber)
-{
- emitterNumber = pEmitterNumber;
- return this;
-}
-
-/** Getter for {@link FalseTargetsAttribute#emitterNumber}*/
-public byte getEmitterNumber()
+}
+
+/** Setter for {@link FalseTargetsAttribute#emitterNumber}*/
+public FalseTargetsAttribute setEmitterNumber(byte pEmitterNumber)
+{
+ emitterNumber = pEmitterNumber;
+ return this;
+}
+
+/** Getter for {@link FalseTargetsAttribute#emitterNumber}*/
+public byte getEmitterNumber()
{
return emitterNumber;
-}
-
-/** Setter for {@link FalseTargetsAttribute#beamNumber}*/
-public FalseTargetsAttribute setBeamNumber(byte pBeamNumber)
-{
- beamNumber = pBeamNumber;
- return this;
-}
-
-/** Getter for {@link FalseTargetsAttribute#beamNumber}*/
-public byte getBeamNumber()
+}
+
+/** Setter for {@link FalseTargetsAttribute#beamNumber}*/
+public FalseTargetsAttribute setBeamNumber(byte pBeamNumber)
+{
+ beamNumber = pBeamNumber;
+ return this;
+}
+
+/** Getter for {@link FalseTargetsAttribute#beamNumber}*/
+public byte getBeamNumber()
{
return beamNumber;
-}
-
-/** Setter for {@link FalseTargetsAttribute#stateIndicator}*/
-public FalseTargetsAttribute setStateIndicator(EEAttributeStateIndicator pStateIndicator)
-{
- stateIndicator = pStateIndicator;
- return this;
-}
-
-/** Getter for {@link FalseTargetsAttribute#stateIndicator}*/
-public EEAttributeStateIndicator getStateIndicator()
+}
+
+/** Setter for {@link FalseTargetsAttribute#stateIndicator}*/
+public FalseTargetsAttribute setStateIndicator(EEAttributeStateIndicator pStateIndicator)
+{
+ stateIndicator = pStateIndicator;
+ return this;
+}
+
+/** Getter for {@link FalseTargetsAttribute#stateIndicator}*/
+public EEAttributeStateIndicator getStateIndicator()
{
return stateIndicator;
-}
-
-/** Setter for {@link FalseTargetsAttribute#padding2}*/
-public FalseTargetsAttribute setPadding2(byte pPadding2)
-{
- padding2 = pPadding2;
- return this;
-}
-
-/** Getter for {@link FalseTargetsAttribute#padding2}*/
-public byte getPadding2()
+}
+
+/** Setter for {@link FalseTargetsAttribute#padding2}*/
+public FalseTargetsAttribute setPadding2(byte pPadding2)
+{
+ padding2 = pPadding2;
+ return this;
+}
+
+/** Getter for {@link FalseTargetsAttribute#padding2}*/
+public byte getPadding2()
{
return padding2;
-}
-
-/** Setter for {@link FalseTargetsAttribute#padding3}*/
-public FalseTargetsAttribute setPadding3(short pPadding3)
-{
- padding3 = pPadding3;
- return this;
-}
-
-/** Getter for {@link FalseTargetsAttribute#padding3}*/
-public short getPadding3()
+}
+
+/** Setter for {@link FalseTargetsAttribute#padding3}*/
+public FalseTargetsAttribute setPadding3(short pPadding3)
+{
+ padding3 = pPadding3;
+ return this;
+}
+
+/** Getter for {@link FalseTargetsAttribute#padding3}*/
+public short getPadding3()
{
return padding3;
-}
-
-/** Setter for {@link FalseTargetsAttribute#falseTargetCount}*/
-public FalseTargetsAttribute setFalseTargetCount(short pFalseTargetCount)
-{
- falseTargetCount = pFalseTargetCount;
- return this;
-}
-
-/** Getter for {@link FalseTargetsAttribute#falseTargetCount}*/
-public short getFalseTargetCount()
+}
+
+/** Setter for {@link FalseTargetsAttribute#falseTargetCount}*/
+public FalseTargetsAttribute setFalseTargetCount(short pFalseTargetCount)
+{
+ falseTargetCount = pFalseTargetCount;
+ return this;
+}
+
+/** Getter for {@link FalseTargetsAttribute#falseTargetCount}*/
+public short getFalseTargetCount()
{
return falseTargetCount;
-}
-
-/** Setter for {@link FalseTargetsAttribute#walkSpeed}*/
-public FalseTargetsAttribute setWalkSpeed(float pWalkSpeed)
-{
- walkSpeed = pWalkSpeed;
- return this;
-}
-
-/** Getter for {@link FalseTargetsAttribute#walkSpeed}*/
-public float getWalkSpeed()
+}
+
+/** Setter for {@link FalseTargetsAttribute#walkSpeed}*/
+public FalseTargetsAttribute setWalkSpeed(float pWalkSpeed)
+{
+ walkSpeed = pWalkSpeed;
+ return this;
+}
+
+/** Getter for {@link FalseTargetsAttribute#walkSpeed}*/
+public float getWalkSpeed()
{
return walkSpeed;
-}
-
-/** Setter for {@link FalseTargetsAttribute#walkAcceleration}*/
-public FalseTargetsAttribute setWalkAcceleration(float pWalkAcceleration)
-{
- walkAcceleration = pWalkAcceleration;
- return this;
-}
-
-/** Getter for {@link FalseTargetsAttribute#walkAcceleration}*/
-public float getWalkAcceleration()
+}
+
+/** Setter for {@link FalseTargetsAttribute#walkAcceleration}*/
+public FalseTargetsAttribute setWalkAcceleration(float pWalkAcceleration)
+{
+ walkAcceleration = pWalkAcceleration;
+ return this;
+}
+
+/** Getter for {@link FalseTargetsAttribute#walkAcceleration}*/
+public float getWalkAcceleration()
{
return walkAcceleration;
-}
-
-/** Setter for {@link FalseTargetsAttribute#maximumWalkDistance}*/
-public FalseTargetsAttribute setMaximumWalkDistance(float pMaximumWalkDistance)
-{
- maximumWalkDistance = pMaximumWalkDistance;
- return this;
-}
-
-/** Getter for {@link FalseTargetsAttribute#maximumWalkDistance}*/
-public float getMaximumWalkDistance()
+}
+
+/** Setter for {@link FalseTargetsAttribute#maximumWalkDistance}*/
+public FalseTargetsAttribute setMaximumWalkDistance(float pMaximumWalkDistance)
+{
+ maximumWalkDistance = pMaximumWalkDistance;
+ return this;
+}
+
+/** Getter for {@link FalseTargetsAttribute#maximumWalkDistance}*/
+public float getMaximumWalkDistance()
{
return maximumWalkDistance;
-}
-
-/** Setter for {@link FalseTargetsAttribute#keepTime}*/
-public FalseTargetsAttribute setKeepTime(float pKeepTime)
-{
- keepTime = pKeepTime;
- return this;
-}
-
-/** Getter for {@link FalseTargetsAttribute#keepTime}*/
-public float getKeepTime()
+}
+
+/** Setter for {@link FalseTargetsAttribute#keepTime}*/
+public FalseTargetsAttribute setKeepTime(float pKeepTime)
+{
+ keepTime = pKeepTime;
+ return this;
+}
+
+/** Getter for {@link FalseTargetsAttribute#keepTime}*/
+public float getKeepTime()
{
return keepTime;
-}
-
-/** Setter for {@link FalseTargetsAttribute#echoSpacing}*/
-public FalseTargetsAttribute setEchoSpacing(float pEchoSpacing)
-{
- echoSpacing = pEchoSpacing;
- return this;
-}
-
-/** Getter for {@link FalseTargetsAttribute#echoSpacing}*/
-public float getEchoSpacing()
+}
+
+/** Setter for {@link FalseTargetsAttribute#echoSpacing}*/
+public FalseTargetsAttribute setEchoSpacing(float pEchoSpacing)
+{
+ echoSpacing = pEchoSpacing;
+ return this;
+}
+
+/** Getter for {@link FalseTargetsAttribute#echoSpacing}*/
+public float getEchoSpacing()
{
return echoSpacing;
-}
-
-/** Setter for {@link FalseTargetsAttribute#firstTargetOffset}*/
-public FalseTargetsAttribute setFirstTargetOffset(float pFirstTargetOffset)
-{
- firstTargetOffset = pFirstTargetOffset;
- return this;
-}
-
-/** Getter for {@link FalseTargetsAttribute#firstTargetOffset}*/
-public float getFirstTargetOffset()
+}
+
+/** Setter for {@link FalseTargetsAttribute#firstTargetOffset}*/
+public FalseTargetsAttribute setFirstTargetOffset(float pFirstTargetOffset)
+{
+ firstTargetOffset = pFirstTargetOffset;
+ return this;
+}
+
+/** Getter for {@link FalseTargetsAttribute#firstTargetOffset}*/
+public float getFirstTargetOffset()
{
return firstTargetOffset;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeInt(recordType);
- dos.writeShort(recordLength);
- dos.writeShort(padding);
- dos.writeByte(emitterNumber);
- dos.writeByte(beamNumber);
- stateIndicator.marshal(dos);
- dos.writeByte(padding2);
- dos.writeShort(padding3);
- dos.writeShort(falseTargetCount);
- dos.writeFloat(walkSpeed);
- dos.writeFloat(walkAcceleration);
- dos.writeFloat(maximumWalkDistance);
- dos.writeFloat(keepTime);
- dos.writeFloat(echoSpacing);
- dos.writeFloat(firstTargetOffset);
+ {
+ dos.writeInt(recordType);
+ dos.writeShort(recordLength);
+ dos.writeShort(padding);
+ dos.writeByte(emitterNumber);
+ dos.writeByte(beamNumber);
+ stateIndicator.marshal(dos);
+ dos.writeByte(padding2);
+ dos.writeShort(padding3);
+ dos.writeShort(falseTargetCount);
+ dos.writeFloat(walkSpeed);
+ dos.writeFloat(walkAcceleration);
+ dos.writeFloat(maximumWalkDistance);
+ dos.writeFloat(keepTime);
+ dos.writeFloat(echoSpacing);
+ dos.writeFloat(firstTargetOffset);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- recordType = dis.readInt();
- uPosition += 4;
- recordLength = (short)dis.readUnsignedShort();
- uPosition += 2;
- padding = (short)dis.readUnsignedShort();
- uPosition += 2;
- emitterNumber = (byte)dis.readUnsignedByte();
- uPosition += 1;
- beamNumber = (byte)dis.readUnsignedByte();
- uPosition += 1;
- stateIndicator = EEAttributeStateIndicator.unmarshalEnum(dis);
- uPosition += stateIndicator.getMarshalledSize();
- padding2 = (byte)dis.readUnsignedByte();
- uPosition += 1;
- padding3 = (short)dis.readUnsignedShort();
- uPosition += 2;
- falseTargetCount = (short)dis.readUnsignedShort();
- uPosition += 2;
- walkSpeed = dis.readFloat();
- uPosition += 4;
- walkAcceleration = dis.readFloat();
- uPosition += 4;
- maximumWalkDistance = dis.readFloat();
- uPosition += 4;
- keepTime = dis.readFloat();
- uPosition += 4;
- echoSpacing = dis.readFloat();
- uPosition += 4;
- firstTargetOffset = dis.readFloat();
- uPosition += 4;
+ {
+ recordType = dis.readInt();
+ uPosition += 4;
+ recordLength = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ padding = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ emitterNumber = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ beamNumber = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ stateIndicator = EEAttributeStateIndicator.unmarshalEnum(dis);
+ uPosition += stateIndicator.getMarshalledSize();
+ padding2 = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ padding3 = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ falseTargetCount = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ walkSpeed = dis.readFloat();
+ uPosition += 4;
+ walkAcceleration = dis.readFloat();
+ uPosition += 4;
+ maximumWalkDistance = dis.readFloat();
+ uPosition += 4;
+ keepTime = dis.readFloat();
+ uPosition += 4;
+ echoSpacing = dis.readFloat();
+ uPosition += 4;
+ firstTargetOffset = dis.readFloat();
+ uPosition += 4;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putInt( (int)recordType);
- buff.putShort( (short)recordLength);
- buff.putShort( (short)padding);
- buff.put( (byte)emitterNumber);
- buff.put( (byte)beamNumber);
- stateIndicator.marshal(buff);
- buff.put( (byte)padding2);
- buff.putShort( (short)padding3);
- buff.putShort( (short)falseTargetCount);
- buff.putFloat( (float)walkSpeed);
- buff.putFloat( (float)walkAcceleration);
- buff.putFloat( (float)maximumWalkDistance);
- buff.putFloat( (float)keepTime);
- buff.putFloat( (float)echoSpacing);
- buff.putFloat( (float)firstTargetOffset);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- recordType = buff.getInt();
- recordLength = (short)(buff.getShort() & 0xFFFF);
- padding = (short)(buff.getShort() & 0xFFFF);
- emitterNumber = (byte)(buff.get() & 0xFF);
- beamNumber = (byte)(buff.get() & 0xFF);
- stateIndicator = EEAttributeStateIndicator.unmarshalEnum(buff);
- padding2 = (byte)(buff.get() & 0xFF);
- padding3 = (short)(buff.getShort() & 0xFFFF);
- falseTargetCount = (short)(buff.getShort() & 0xFFFF);
- walkSpeed = buff.getFloat();
- walkAcceleration = buff.getFloat();
- maximumWalkDistance = buff.getFloat();
- keepTime = buff.getFloat();
- echoSpacing = buff.getFloat();
- firstTargetOffset = buff.getFloat();
- return getMarshalledSize();
-}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final FalseTargetsAttribute rhs = (FalseTargetsAttribute)obj;
-
- if( ! (recordType == rhs.recordType)) ivarsEqual = false;
- if( ! (recordLength == rhs.recordLength)) ivarsEqual = false;
- if( ! (padding == rhs.padding)) ivarsEqual = false;
- if( ! (emitterNumber == rhs.emitterNumber)) ivarsEqual = false;
- if( ! (beamNumber == rhs.beamNumber)) ivarsEqual = false;
- if( ! (stateIndicator == rhs.stateIndicator)) ivarsEqual = false;
- if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
- if( ! (padding3 == rhs.padding3)) ivarsEqual = false;
- if( ! (falseTargetCount == rhs.falseTargetCount)) ivarsEqual = false;
- if( ! (walkSpeed == rhs.walkSpeed)) ivarsEqual = false;
- if( ! (walkAcceleration == rhs.walkAcceleration)) ivarsEqual = false;
- if( ! (maximumWalkDistance == rhs.maximumWalkDistance)) ivarsEqual = false;
- if( ! (keepTime == rhs.keepTime)) ivarsEqual = false;
- if( ! (echoSpacing == rhs.echoSpacing)) ivarsEqual = false;
- if( ! (firstTargetOffset == rhs.firstTargetOffset)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+ }
+ return getMarshalledSize();
+}
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putInt( (int)recordType);
+ buff.putShort( (short)recordLength);
+ buff.putShort( (short)padding);
+ buff.put( (byte)emitterNumber);
+ buff.put( (byte)beamNumber);
+ stateIndicator.marshal(buff);
+ buff.put( (byte)padding2);
+ buff.putShort( (short)padding3);
+ buff.putShort( (short)falseTargetCount);
+ buff.putFloat( (float)walkSpeed);
+ buff.putFloat( (float)walkAcceleration);
+ buff.putFloat( (float)maximumWalkDistance);
+ buff.putFloat( (float)keepTime);
+ buff.putFloat( (float)echoSpacing);
+ buff.putFloat( (float)firstTargetOffset);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ recordType = buff.getInt();
+ recordLength = (short)(buff.getShort() & 0xFFFF);
+ padding = (short)(buff.getShort() & 0xFFFF);
+ emitterNumber = (byte)(buff.get() & 0xFF);
+ beamNumber = (byte)(buff.get() & 0xFF);
+ stateIndicator = EEAttributeStateIndicator.unmarshalEnum(buff);
+ padding2 = (byte)(buff.get() & 0xFF);
+ padding3 = (short)(buff.getShort() & 0xFFFF);
+ falseTargetCount = (short)(buff.getShort() & 0xFFFF);
+ walkSpeed = buff.getFloat();
+ walkAcceleration = buff.getFloat();
+ maximumWalkDistance = buff.getFloat();
+ keepTime = buff.getFloat();
+ echoSpacing = buff.getFloat();
+ firstTargetOffset = buff.getFloat();
+ return getMarshalledSize();
+}
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final FalseTargetsAttribute rhs = (FalseTargetsAttribute)obj;
+
+ if( ! (recordType == rhs.recordType)) ivarsEqual = false;
+ if( ! (recordLength == rhs.recordLength)) ivarsEqual = false;
+ if( ! (padding == rhs.padding)) ivarsEqual = false;
+ if( ! (emitterNumber == rhs.emitterNumber)) ivarsEqual = false;
+ if( ! (beamNumber == rhs.beamNumber)) ivarsEqual = false;
+ if( ! (stateIndicator == rhs.stateIndicator)) ivarsEqual = false;
+ if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
+ if( ! (padding3 == rhs.padding3)) ivarsEqual = false;
+ if( ! (falseTargetCount == rhs.falseTargetCount)) ivarsEqual = false;
+ if( ! (walkSpeed == rhs.walkSpeed)) ivarsEqual = false;
+ if( ! (walkAcceleration == rhs.walkAcceleration)) ivarsEqual = false;
+ if( ! (maximumWalkDistance == rhs.maximumWalkDistance)) ivarsEqual = false;
+ if( ! (keepTime == rhs.keepTime)) ivarsEqual = false;
+ if( ! (echoSpacing == rhs.echoSpacing)) ivarsEqual = false;
+ if( ! (firstTargetOffset == rhs.firstTargetOffset)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" recordType: ").append(recordType).append("\n");
- sb.append(" recordLength: ").append(recordLength).append("\n");
- sb.append(" padding: ").append(padding).append("\n");
- sb.append(" emitterNumber: ").append(emitterNumber).append("\n");
- sb.append(" beamNumber: ").append(beamNumber).append("\n");
- sb.append(" stateIndicator: ").append(stateIndicator).append("\n");
- sb.append(" padding2: ").append(padding2).append("\n");
- sb.append(" padding3: ").append(padding3).append("\n");
- sb.append(" falseTargetCount: ").append(falseTargetCount).append("\n");
- sb.append(" walkSpeed: ").append(walkSpeed).append("\n");
- sb.append(" walkAcceleration: ").append(walkAcceleration).append("\n");
- sb.append(" maximumWalkDistance: ").append(maximumWalkDistance).append("\n");
- sb.append(" keepTime: ").append(keepTime).append("\n");
- sb.append(" echoSpacing: ").append(echoSpacing).append("\n");
- sb.append(" firstTargetOffset: ").append(firstTargetOffset).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" recordType: ").append(recordType).append("\n");
+ sb.append(" recordLength: ").append(recordLength).append("\n");
+ sb.append(" padding: ").append(padding).append("\n");
+ sb.append(" emitterNumber: ").append(emitterNumber).append("\n");
+ sb.append(" beamNumber: ").append(beamNumber).append("\n");
+ sb.append(" stateIndicator: ").append(stateIndicator).append("\n");
+ sb.append(" padding2: ").append(padding2).append("\n");
+ sb.append(" padding3: ").append(padding3).append("\n");
+ sb.append(" falseTargetCount: ").append(falseTargetCount).append("\n");
+ sb.append(" walkSpeed: ").append(walkSpeed).append("\n");
+ sb.append(" walkAcceleration: ").append(walkAcceleration).append("\n");
+ sb.append(" maximumWalkDistance: ").append(maximumWalkDistance).append("\n");
+ sb.append(" keepTime: ").append(keepTime).append("\n");
+ sb.append(" echoSpacing: ").append(echoSpacing).append("\n");
+ sb.append(" firstTargetOffset: ").append(firstTargetOffset).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/FastEntityStatePdu.java b/src-generated/edu/nps/moves/dis7/FastEntityStatePdu.java
index 010bcf22ecdcc2855b0da152a5d175de9bec98b4..67f8d01004180084656704053ff384a3614a1a21 100644
--- a/src-generated/edu/nps/moves/dis7/FastEntityStatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/FastEntityStatePdu.java
@@ -1,1140 +1,1140 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Represents the postion and state of one entity in the world. This is identical in function to entity state pdu, but generates less garbage to collect in the Java world. Section 7.2.2.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class FastEntityStatePdu extends EntityInformationFamilyPdu implements Serializable
-{
- /** The site ID */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Represents the postion and state of one entity in the world. This is identical in function to entity state pdu, but generates less garbage to collect in the Java world. Section 7.2.2.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class FastEntityStatePdu extends EntityInformationFamilyPdu implements Serializable
+{
+ /** The site ID */
protected short site;
-
- /** The application ID */
+
+ /** The application ID */
protected short application;
-
- /** the entity ID */
+
+ /** the entity ID */
protected short entity;
-
- /** what force this entity is affiliated with, eg red, blue, neutral, etc */
+
+ /** what force this entity is affiliated with, eg red, blue, neutral, etc */
protected byte forceId;
-
- /** How many variable (nee articulation) parameters are in the variable length list */
+
+ /** How many variable (nee articulation) parameters are in the variable length list */
protected byte numberOfVariableParameters;
-
- /** Kind of entity */
+
+ /** Kind of entity */
protected byte entityKind;
-
- /** Domain of entity (air, surface, subsurface, space, etc) */
+
+ /** Domain of entity (air, surface, subsurface, space, etc) */
protected byte domain;
-
- /** country to which the design of the entity is attributed */
+
+ /** country to which the design of the entity is attributed */
protected short country;
-
- /** category of entity */
+
+ /** category of entity */
protected byte category;
-
- /** subcategory of entity */
+
+ /** subcategory of entity */
protected byte subcategory;
-
- /** specific info based on subcategory field */
+
+ /** specific info based on subcategory field */
protected byte specific;
-
+
protected byte extra;
-
- /** Kind of entity */
+
+ /** Kind of entity */
protected byte altEntityKind;
-
- /** Domain of entity (air, surface, subsurface, space, etc) */
+
+ /** Domain of entity (air, surface, subsurface, space, etc) */
protected byte altDomain;
-
- /** country to which the design of the entity is attributed */
+
+ /** country to which the design of the entity is attributed */
protected short altCountry;
-
- /** category of entity */
+
+ /** category of entity */
protected byte altCategory;
-
- /** subcategory of entity */
+
+ /** subcategory of entity */
protected byte altSubcategory;
-
- /** specific info based on subcategory field */
+
+ /** specific info based on subcategory field */
protected byte altSpecific;
-
+
protected byte altExtra;
-
- /** X velo */
+
+ /** X velo */
protected float xVelocity;
-
- /** y Value */
+
+ /** y Value */
protected float yVelocity;
-
- /** Z value */
+
+ /** Z value */
protected float zVelocity;
-
- /** X value */
+
+ /** X value */
protected double xLocation;
-
- /** y Value */
+
+ /** y Value */
protected double yLocation;
-
- /** Z value */
+
+ /** Z value */
protected double zLocation;
-
+
protected float psi;
-
+
protected float theta;
-
+
protected float phi;
-
- /** a series of bit flags that are used to help draw the entity, such as smoking, on fire, etc. */
+
+ /** a series of bit flags that are used to help draw the entity, such as smoking, on fire, etc. */
protected int entityAppearance;
-
- /** enumeration of what dead reckoning algorighm to use */
+
+ /** enumeration of what dead reckoning algorighm to use */
protected byte deadReckoningAlgorithm;
-
- /** other parameters to use in the dead reckoning algorithm */
+
+ /** other parameters to use in the dead reckoning algorithm */
protected byte[] otherParameters = new byte[15];
-
- /** X value */
+
+ /** X value */
protected float xAcceleration;
-
- /** y Value */
+
+ /** y Value */
protected float yAcceleration;
-
- /** Z value */
+
+ /** Z value */
protected float zAcceleration;
-
- /** X value */
+
+ /** X value */
protected float xAngularVelocity;
-
- /** y Value */
+
+ /** y Value */
protected float yAngularVelocity;
-
- /** Z value */
+
+ /** Z value */
protected float zAngularVelocity;
-
- /** characters that can be used for debugging, or to draw unique strings on the side of entities in the world */
+
+ /** characters that can be used for debugging, or to draw unique strings on the side of entities in the world */
protected byte[] marking = new byte[12];
-
- /** a series of bit flags */
+
+ /** a series of bit flags */
protected short capabilities;
-
- /** variable length list of variable parameters. In earlier versions of DIS these were known as articulation parameters */
+
+ /** variable length list of variable parameters. In earlier versions of DIS these were known as articulation parameters */
protected List< VariableParameter > variableParameters = new ArrayList< VariableParameter >();
-
-
-/** Constructor */
- public FastEntityStatePdu()
- {
- setPduType( DISPDUType.ENTITY_STATE );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += 2; // site
- marshalSize += 2; // application
- marshalSize += 2; // entity
- marshalSize += 1; // forceId
- marshalSize += 1; // numberOfVariableParameters
- marshalSize += 1; // entityKind
- marshalSize += 1; // domain
- marshalSize += 2; // country
- marshalSize += 1; // category
- marshalSize += 1; // subcategory
- marshalSize += 1; // specific
- marshalSize += 1; // extra
- marshalSize += 1; // altEntityKind
- marshalSize += 1; // altDomain
- marshalSize += 2; // altCountry
- marshalSize += 1; // altCategory
- marshalSize += 1; // altSubcategory
- marshalSize += 1; // altSpecific
- marshalSize += 1; // altExtra
- marshalSize += 4; // xVelocity
- marshalSize += 4; // yVelocity
- marshalSize += 4; // zVelocity
- marshalSize += 8; // xLocation
- marshalSize += 8; // yLocation
- marshalSize += 8; // zLocation
- marshalSize += 4; // psi
- marshalSize += 4; // theta
- marshalSize += 4; // phi
- marshalSize += 4; // entityAppearance
- marshalSize += 1; // deadReckoningAlgorithm
- marshalSize += otherParameters.length * 1;
- marshalSize += 4; // xAcceleration
- marshalSize += 4; // yAcceleration
- marshalSize += 4; // zAcceleration
- marshalSize += 4; // xAngularVelocity
- marshalSize += 4; // yAngularVelocity
- marshalSize += 4; // zAngularVelocity
- marshalSize += marking.length * 1;
- marshalSize += 2; // capabilities
- for(int idx=0; idx < variableParameters.size(); idx++)
- {
- VariableParameter listElement = variableParameters.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link FastEntityStatePdu#site}*/
-public FastEntityStatePdu setSite(short pSite)
-{
- site = pSite;
- return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#site}*/
-public short getSite()
+
+
+/** Constructor */
+ public FastEntityStatePdu()
+ {
+ setPduType( DISPDUType.ENTITY_STATE );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += 2; // site
+ marshalSize += 2; // application
+ marshalSize += 2; // entity
+ marshalSize += 1; // forceId
+ marshalSize += 1; // numberOfVariableParameters
+ marshalSize += 1; // entityKind
+ marshalSize += 1; // domain
+ marshalSize += 2; // country
+ marshalSize += 1; // category
+ marshalSize += 1; // subcategory
+ marshalSize += 1; // specific
+ marshalSize += 1; // extra
+ marshalSize += 1; // altEntityKind
+ marshalSize += 1; // altDomain
+ marshalSize += 2; // altCountry
+ marshalSize += 1; // altCategory
+ marshalSize += 1; // altSubcategory
+ marshalSize += 1; // altSpecific
+ marshalSize += 1; // altExtra
+ marshalSize += 4; // xVelocity
+ marshalSize += 4; // yVelocity
+ marshalSize += 4; // zVelocity
+ marshalSize += 8; // xLocation
+ marshalSize += 8; // yLocation
+ marshalSize += 8; // zLocation
+ marshalSize += 4; // psi
+ marshalSize += 4; // theta
+ marshalSize += 4; // phi
+ marshalSize += 4; // entityAppearance
+ marshalSize += 1; // deadReckoningAlgorithm
+ marshalSize += otherParameters.length * 1;
+ marshalSize += 4; // xAcceleration
+ marshalSize += 4; // yAcceleration
+ marshalSize += 4; // zAcceleration
+ marshalSize += 4; // xAngularVelocity
+ marshalSize += 4; // yAngularVelocity
+ marshalSize += 4; // zAngularVelocity
+ marshalSize += marking.length * 1;
+ marshalSize += 2; // capabilities
+ for(int idx=0; idx < variableParameters.size(); idx++)
+ {
+ VariableParameter listElement = variableParameters.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link FastEntityStatePdu#site}*/
+public FastEntityStatePdu setSite(short pSite)
+{
+ site = pSite;
+ return this;
+}
+
+/** Getter for {@link FastEntityStatePdu#site}*/
+public short getSite()
{
return site;
-}
-
-/** Setter for {@link FastEntityStatePdu#application}*/
-public FastEntityStatePdu setApplication(short pApplication)
-{
- application = pApplication;
- return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#application}*/
-public short getApplication()
+}
+
+/** Setter for {@link FastEntityStatePdu#application}*/
+public FastEntityStatePdu setApplication(short pApplication)
+{
+ application = pApplication;
+ return this;
+}
+
+/** Getter for {@link FastEntityStatePdu#application}*/
+public short getApplication()
{
return application;
-}
-
-/** Setter for {@link FastEntityStatePdu#entity}*/
-public FastEntityStatePdu setEntity(short pEntity)
-{
- entity = pEntity;
- return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#entity}*/
-public short getEntity()
+}
+
+/** Setter for {@link FastEntityStatePdu#entity}*/
+public FastEntityStatePdu setEntity(short pEntity)
+{
+ entity = pEntity;
+ return this;
+}
+
+/** Getter for {@link FastEntityStatePdu#entity}*/
+public short getEntity()
{
return entity;
-}
-
-/** Setter for {@link FastEntityStatePdu#forceId}*/
-public FastEntityStatePdu setForceId(byte pForceId)
-{
- forceId = pForceId;
- return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#forceId}*/
-public byte getForceId()
+}
+
+/** Setter for {@link FastEntityStatePdu#forceId}*/
+public FastEntityStatePdu setForceId(byte pForceId)
+{
+ forceId = pForceId;
+ return this;
+}
+
+/** Getter for {@link FastEntityStatePdu#forceId}*/
+public byte getForceId()
{
return forceId;
-}
-
-/** Setter for {@link FastEntityStatePdu#entityKind}*/
-public FastEntityStatePdu setEntityKind(byte pEntityKind)
-{
- entityKind = pEntityKind;
- return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#entityKind}*/
-public byte getEntityKind()
+}
+
+/** Setter for {@link FastEntityStatePdu#entityKind}*/
+public FastEntityStatePdu setEntityKind(byte pEntityKind)
+{
+ entityKind = pEntityKind;
+ return this;
+}
+
+/** Getter for {@link FastEntityStatePdu#entityKind}*/
+public byte getEntityKind()
{
return entityKind;
-}
-
-/** Setter for {@link FastEntityStatePdu#domain}*/
-public FastEntityStatePdu setDomain(byte pDomain)
-{
- domain = pDomain;
- return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#domain}*/
-public byte getDomain()
+}
+
+/** Setter for {@link FastEntityStatePdu#domain}*/
+public FastEntityStatePdu setDomain(byte pDomain)
+{
+ domain = pDomain;
+ return this;
+}
+
+/** Getter for {@link FastEntityStatePdu#domain}*/
+public byte getDomain()
{
return domain;
-}
-
-/** Setter for {@link FastEntityStatePdu#country}*/
-public FastEntityStatePdu setCountry(short pCountry)
-{
- country = pCountry;
- return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#country}*/
-public short getCountry()
+}
+
+/** Setter for {@link FastEntityStatePdu#country}*/
+public FastEntityStatePdu setCountry(short pCountry)
+{
+ country = pCountry;
+ return this;
+}
+
+/** Getter for {@link FastEntityStatePdu#country}*/
+public short getCountry()
{
return country;
-}
-
-/** Setter for {@link FastEntityStatePdu#category}*/
-public FastEntityStatePdu setCategory(byte pCategory)
-{
- category = pCategory;
- return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#category}*/
-public byte getCategory()
+}
+
+/** Setter for {@link FastEntityStatePdu#category}*/
+public FastEntityStatePdu setCategory(byte pCategory)
+{
+ category = pCategory;
+ return this;
+}
+
+/** Getter for {@link FastEntityStatePdu#category}*/
+public byte getCategory()
{
return category;
-}
-
-/** Setter for {@link FastEntityStatePdu#subcategory}*/
-public FastEntityStatePdu setSubcategory(byte pSubcategory)
-{
- subcategory = pSubcategory;
- return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#subcategory}*/
-public byte getSubcategory()
+}
+
+/** Setter for {@link FastEntityStatePdu#subcategory}*/
+public FastEntityStatePdu setSubcategory(byte pSubcategory)
+{
+ subcategory = pSubcategory;
+ return this;
+}
+
+/** Getter for {@link FastEntityStatePdu#subcategory}*/
+public byte getSubcategory()
{
return subcategory;
-}
-
-/** Setter for {@link FastEntityStatePdu#specific}*/
-public FastEntityStatePdu setSpecific(byte pSpecific)
-{
- specific = pSpecific;
- return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#specific}*/
-public byte getSpecific()
+}
+
+/** Setter for {@link FastEntityStatePdu#specific}*/
+public FastEntityStatePdu setSpecific(byte pSpecific)
+{
+ specific = pSpecific;
+ return this;
+}
+
+/** Getter for {@link FastEntityStatePdu#specific}*/
+public byte getSpecific()
{
return specific;
-}
-
-/** Setter for {@link FastEntityStatePdu#extra}*/
-public FastEntityStatePdu setExtra(byte pExtra)
-{
- extra = pExtra;
- return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#extra}*/
-public byte getExtra()
+}
+
+/** Setter for {@link FastEntityStatePdu#extra}*/
+public FastEntityStatePdu setExtra(byte pExtra)
+{
+ extra = pExtra;
+ return this;
+}
+
+/** Getter for {@link FastEntityStatePdu#extra}*/
+public byte getExtra()
{
return extra;
-}
-
-/** Setter for {@link FastEntityStatePdu#altEntityKind}*/
-public FastEntityStatePdu setAltEntityKind(byte pAltEntityKind)
-{
- altEntityKind = pAltEntityKind;
- return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#altEntityKind}*/
-public byte getAltEntityKind()
+}
+
+/** Setter for {@link FastEntityStatePdu#altEntityKind}*/
+public FastEntityStatePdu setAltEntityKind(byte pAltEntityKind)
+{
+ altEntityKind = pAltEntityKind;
+ return this;
+}
+
+/** Getter for {@link FastEntityStatePdu#altEntityKind}*/
+public byte getAltEntityKind()
{
return altEntityKind;
-}
-
-/** Setter for {@link FastEntityStatePdu#altDomain}*/
-public FastEntityStatePdu setAltDomain(byte pAltDomain)
-{
- altDomain = pAltDomain;
- return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#altDomain}*/
-public byte getAltDomain()
+}
+
+/** Setter for {@link FastEntityStatePdu#altDomain}*/
+public FastEntityStatePdu setAltDomain(byte pAltDomain)
+{
+ altDomain = pAltDomain;
+ return this;
+}
+
+/** Getter for {@link FastEntityStatePdu#altDomain}*/
+public byte getAltDomain()
{
return altDomain;
-}
-
-/** Setter for {@link FastEntityStatePdu#altCountry}*/
-public FastEntityStatePdu setAltCountry(short pAltCountry)
-{
- altCountry = pAltCountry;
- return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#altCountry}*/
-public short getAltCountry()
+}
+
+/** Setter for {@link FastEntityStatePdu#altCountry}*/
+public FastEntityStatePdu setAltCountry(short pAltCountry)
+{
+ altCountry = pAltCountry;
+ return this;
+}
+
+/** Getter for {@link FastEntityStatePdu#altCountry}*/
+public short getAltCountry()
{
return altCountry;
-}
-
-/** Setter for {@link FastEntityStatePdu#altCategory}*/
-public FastEntityStatePdu setAltCategory(byte pAltCategory)
-{
- altCategory = pAltCategory;
- return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#altCategory}*/
-public byte getAltCategory()
+}
+
+/** Setter for {@link FastEntityStatePdu#altCategory}*/
+public FastEntityStatePdu setAltCategory(byte pAltCategory)
+{
+ altCategory = pAltCategory;
+ return this;
+}
+
+/** Getter for {@link FastEntityStatePdu#altCategory}*/
+public byte getAltCategory()
{
return altCategory;
-}
-
-/** Setter for {@link FastEntityStatePdu#altSubcategory}*/
-public FastEntityStatePdu setAltSubcategory(byte pAltSubcategory)
-{
- altSubcategory = pAltSubcategory;
- return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#altSubcategory}*/
-public byte getAltSubcategory()
+}
+
+/** Setter for {@link FastEntityStatePdu#altSubcategory}*/
+public FastEntityStatePdu setAltSubcategory(byte pAltSubcategory)
+{
+ altSubcategory = pAltSubcategory;
+ return this;
+}
+
+/** Getter for {@link FastEntityStatePdu#altSubcategory}*/
+public byte getAltSubcategory()
{
return altSubcategory;
-}
-
-/** Setter for {@link FastEntityStatePdu#altSpecific}*/
-public FastEntityStatePdu setAltSpecific(byte pAltSpecific)
-{
- altSpecific = pAltSpecific;
- return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#altSpecific}*/
-public byte getAltSpecific()
+}
+
+/** Setter for {@link FastEntityStatePdu#altSpecific}*/
+public FastEntityStatePdu setAltSpecific(byte pAltSpecific)
+{
+ altSpecific = pAltSpecific;
+ return this;
+}
+
+/** Getter for {@link FastEntityStatePdu#altSpecific}*/
+public byte getAltSpecific()
{
return altSpecific;
-}
-
-/** Setter for {@link FastEntityStatePdu#altExtra}*/
-public FastEntityStatePdu setAltExtra(byte pAltExtra)
-{
- altExtra = pAltExtra;
- return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#altExtra}*/
-public byte getAltExtra()
+}
+
+/** Setter for {@link FastEntityStatePdu#altExtra}*/
+public FastEntityStatePdu setAltExtra(byte pAltExtra)
+{
+ altExtra = pAltExtra;
+ return this;
+}
+
+/** Getter for {@link FastEntityStatePdu#altExtra}*/
+public byte getAltExtra()
{
return altExtra;
-}
-
-/** Setter for {@link FastEntityStatePdu#xVelocity}*/
-public FastEntityStatePdu setXVelocity(float pXVelocity)
-{
- xVelocity = pXVelocity;
- return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#xVelocity}*/
-public float getXVelocity()
+}
+
+/** Setter for {@link FastEntityStatePdu#xVelocity}*/
+public FastEntityStatePdu setXVelocity(float pXVelocity)
+{
+ xVelocity = pXVelocity;
+ return this;
+}
+
+/** Getter for {@link FastEntityStatePdu#xVelocity}*/
+public float getXVelocity()
{
return xVelocity;
-}
-
-/** Setter for {@link FastEntityStatePdu#yVelocity}*/
-public FastEntityStatePdu setYVelocity(float pYVelocity)
-{
- yVelocity = pYVelocity;
- return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#yVelocity}*/
-public float getYVelocity()
+}
+
+/** Setter for {@link FastEntityStatePdu#yVelocity}*/
+public FastEntityStatePdu setYVelocity(float pYVelocity)
+{
+ yVelocity = pYVelocity;
+ return this;
+}
+
+/** Getter for {@link FastEntityStatePdu#yVelocity}*/
+public float getYVelocity()
{
return yVelocity;
-}
-
-/** Setter for {@link FastEntityStatePdu#zVelocity}*/
-public FastEntityStatePdu setZVelocity(float pZVelocity)
-{
- zVelocity = pZVelocity;
- return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#zVelocity}*/
-public float getZVelocity()
+}
+
+/** Setter for {@link FastEntityStatePdu#zVelocity}*/
+public FastEntityStatePdu setZVelocity(float pZVelocity)
+{
+ zVelocity = pZVelocity;
+ return this;
+}
+
+/** Getter for {@link FastEntityStatePdu#zVelocity}*/
+public float getZVelocity()
{
return zVelocity;
-}
-
-/** Setter for {@link FastEntityStatePdu#xLocation}*/
-public FastEntityStatePdu setXLocation(double pXLocation)
-{
- xLocation = pXLocation;
- return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#xLocation}*/
-public double getXLocation()
+}
+
+/** Setter for {@link FastEntityStatePdu#xLocation}*/
+public FastEntityStatePdu setXLocation(double pXLocation)
+{
+ xLocation = pXLocation;
+ return this;
+}
+
+/** Getter for {@link FastEntityStatePdu#xLocation}*/
+public double getXLocation()
{
return xLocation;
-}
-
-/** Setter for {@link FastEntityStatePdu#yLocation}*/
-public FastEntityStatePdu setYLocation(double pYLocation)
-{
- yLocation = pYLocation;
- return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#yLocation}*/
-public double getYLocation()
+}
+
+/** Setter for {@link FastEntityStatePdu#yLocation}*/
+public FastEntityStatePdu setYLocation(double pYLocation)
+{
+ yLocation = pYLocation;
+ return this;
+}
+
+/** Getter for {@link FastEntityStatePdu#yLocation}*/
+public double getYLocation()
{
return yLocation;
-}
-
-/** Setter for {@link FastEntityStatePdu#zLocation}*/
-public FastEntityStatePdu setZLocation(double pZLocation)
-{
- zLocation = pZLocation;
- return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#zLocation}*/
-public double getZLocation()
+}
+
+/** Setter for {@link FastEntityStatePdu#zLocation}*/
+public FastEntityStatePdu setZLocation(double pZLocation)
+{
+ zLocation = pZLocation;
+ return this;
+}
+
+/** Getter for {@link FastEntityStatePdu#zLocation}*/
+public double getZLocation()
{
return zLocation;
-}
-
-/** Setter for {@link FastEntityStatePdu#psi}*/
-public FastEntityStatePdu setPsi(float pPsi)
-{
- psi = pPsi;
- return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#psi}*/
-public float getPsi()
+}
+
+/** Setter for {@link FastEntityStatePdu#psi}*/
+public FastEntityStatePdu setPsi(float pPsi)
+{
+ psi = pPsi;
+ return this;
+}
+
+/** Getter for {@link FastEntityStatePdu#psi}*/
+public float getPsi()
{
return psi;
-}
-
-/** Setter for {@link FastEntityStatePdu#theta}*/
-public FastEntityStatePdu setTheta(float pTheta)
-{
- theta = pTheta;
- return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#theta}*/
-public float getTheta()
+}
+
+/** Setter for {@link FastEntityStatePdu#theta}*/
+public FastEntityStatePdu setTheta(float pTheta)
+{
+ theta = pTheta;
+ return this;
+}
+
+/** Getter for {@link FastEntityStatePdu#theta}*/
+public float getTheta()
{
return theta;
-}
-
-/** Setter for {@link FastEntityStatePdu#phi}*/
-public FastEntityStatePdu setPhi(float pPhi)
-{
- phi = pPhi;
- return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#phi}*/
-public float getPhi()
+}
+
+/** Setter for {@link FastEntityStatePdu#phi}*/
+public FastEntityStatePdu setPhi(float pPhi)
+{
+ phi = pPhi;
+ return this;
+}
+
+/** Getter for {@link FastEntityStatePdu#phi}*/
+public float getPhi()
{
return phi;
-}
-
-/** Setter for {@link FastEntityStatePdu#entityAppearance}*/
-public FastEntityStatePdu setEntityAppearance(int pEntityAppearance)
-{
- entityAppearance = pEntityAppearance;
- return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#entityAppearance}*/
-public int getEntityAppearance()
+}
+
+/** Setter for {@link FastEntityStatePdu#entityAppearance}*/
+public FastEntityStatePdu setEntityAppearance(int pEntityAppearance)
+{
+ entityAppearance = pEntityAppearance;
+ return this;
+}
+
+/** Getter for {@link FastEntityStatePdu#entityAppearance}*/
+public int getEntityAppearance()
{
return entityAppearance;
-}
-
-/** Setter for {@link FastEntityStatePdu#deadReckoningAlgorithm}*/
-public FastEntityStatePdu setDeadReckoningAlgorithm(byte pDeadReckoningAlgorithm)
-{
- deadReckoningAlgorithm = pDeadReckoningAlgorithm;
- return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#deadReckoningAlgorithm}*/
-public byte getDeadReckoningAlgorithm()
+}
+
+/** Setter for {@link FastEntityStatePdu#deadReckoningAlgorithm}*/
+public FastEntityStatePdu setDeadReckoningAlgorithm(byte pDeadReckoningAlgorithm)
+{
+ deadReckoningAlgorithm = pDeadReckoningAlgorithm;
+ return this;
+}
+
+/** Getter for {@link FastEntityStatePdu#deadReckoningAlgorithm}*/
+public byte getDeadReckoningAlgorithm()
{
return deadReckoningAlgorithm;
-}
-
-/** Setter for {@link FastEntityStatePdu#otherParameters}*/
-public FastEntityStatePdu setOtherParameters(byte[] pOtherParameters)
-{
- otherParameters = Arrays.copyOf(pOtherParameters, otherParameters.length);
- return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#otherParameters}*/
-public byte[] getOtherParameters()
+}
+
+/** Setter for {@link FastEntityStatePdu#otherParameters}*/
+public FastEntityStatePdu setOtherParameters(byte[] pOtherParameters)
+{
+ otherParameters = Arrays.copyOf(pOtherParameters, otherParameters.length);
+ return this;
+}
+
+/** Getter for {@link FastEntityStatePdu#otherParameters}*/
+public byte[] getOtherParameters()
{
return otherParameters;
-}
-
-/** Setter for {@link FastEntityStatePdu#xAcceleration}*/
-public FastEntityStatePdu setXAcceleration(float pXAcceleration)
-{
- xAcceleration = pXAcceleration;
- return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#xAcceleration}*/
-public float getXAcceleration()
+}
+
+/** Setter for {@link FastEntityStatePdu#xAcceleration}*/
+public FastEntityStatePdu setXAcceleration(float pXAcceleration)
+{
+ xAcceleration = pXAcceleration;
+ return this;
+}
+
+/** Getter for {@link FastEntityStatePdu#xAcceleration}*/
+public float getXAcceleration()
{
return xAcceleration;
-}
-
-/** Setter for {@link FastEntityStatePdu#yAcceleration}*/
-public FastEntityStatePdu setYAcceleration(float pYAcceleration)
-{
- yAcceleration = pYAcceleration;
- return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#yAcceleration}*/
-public float getYAcceleration()
+}
+
+/** Setter for {@link FastEntityStatePdu#yAcceleration}*/
+public FastEntityStatePdu setYAcceleration(float pYAcceleration)
+{
+ yAcceleration = pYAcceleration;
+ return this;
+}
+
+/** Getter for {@link FastEntityStatePdu#yAcceleration}*/
+public float getYAcceleration()
{
return yAcceleration;
-}
-
-/** Setter for {@link FastEntityStatePdu#zAcceleration}*/
-public FastEntityStatePdu setZAcceleration(float pZAcceleration)
-{
- zAcceleration = pZAcceleration;
- return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#zAcceleration}*/
-public float getZAcceleration()
+}
+
+/** Setter for {@link FastEntityStatePdu#zAcceleration}*/
+public FastEntityStatePdu setZAcceleration(float pZAcceleration)
+{
+ zAcceleration = pZAcceleration;
+ return this;
+}
+
+/** Getter for {@link FastEntityStatePdu#zAcceleration}*/
+public float getZAcceleration()
{
return zAcceleration;
-}
-
-/** Setter for {@link FastEntityStatePdu#xAngularVelocity}*/
-public FastEntityStatePdu setXAngularVelocity(float pXAngularVelocity)
-{
- xAngularVelocity = pXAngularVelocity;
- return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#xAngularVelocity}*/
-public float getXAngularVelocity()
+}
+
+/** Setter for {@link FastEntityStatePdu#xAngularVelocity}*/
+public FastEntityStatePdu setXAngularVelocity(float pXAngularVelocity)
+{
+ xAngularVelocity = pXAngularVelocity;
+ return this;
+}
+
+/** Getter for {@link FastEntityStatePdu#xAngularVelocity}*/
+public float getXAngularVelocity()
{
return xAngularVelocity;
-}
-
-/** Setter for {@link FastEntityStatePdu#yAngularVelocity}*/
-public FastEntityStatePdu setYAngularVelocity(float pYAngularVelocity)
-{
- yAngularVelocity = pYAngularVelocity;
- return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#yAngularVelocity}*/
-public float getYAngularVelocity()
+}
+
+/** Setter for {@link FastEntityStatePdu#yAngularVelocity}*/
+public FastEntityStatePdu setYAngularVelocity(float pYAngularVelocity)
+{
+ yAngularVelocity = pYAngularVelocity;
+ return this;
+}
+
+/** Getter for {@link FastEntityStatePdu#yAngularVelocity}*/
+public float getYAngularVelocity()
{
return yAngularVelocity;
-}
-
-/** Setter for {@link FastEntityStatePdu#zAngularVelocity}*/
-public FastEntityStatePdu setZAngularVelocity(float pZAngularVelocity)
-{
- zAngularVelocity = pZAngularVelocity;
- return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#zAngularVelocity}*/
-public float getZAngularVelocity()
+}
+
+/** Setter for {@link FastEntityStatePdu#zAngularVelocity}*/
+public FastEntityStatePdu setZAngularVelocity(float pZAngularVelocity)
+{
+ zAngularVelocity = pZAngularVelocity;
+ return this;
+}
+
+/** Getter for {@link FastEntityStatePdu#zAngularVelocity}*/
+public float getZAngularVelocity()
{
return zAngularVelocity;
-}
-
-/** Setter for {@link FastEntityStatePdu#marking}*/
-public FastEntityStatePdu setMarking(byte[] pMarking)
-{
- marking = Arrays.copyOf(pMarking, marking.length);
- return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#marking}*/
-public byte[] getMarking()
+}
+
+/** Setter for {@link FastEntityStatePdu#marking}*/
+public FastEntityStatePdu setMarking(byte[] pMarking)
+{
+ marking = Arrays.copyOf(pMarking, marking.length);
+ return this;
+}
+
+/** Getter for {@link FastEntityStatePdu#marking}*/
+public byte[] getMarking()
{
return marking;
-}
-
-/** Setter for {@link FastEntityStatePdu#capabilities}*/
-public FastEntityStatePdu setCapabilities(short pCapabilities)
-{
- capabilities = pCapabilities;
- return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#capabilities}*/
-public short getCapabilities()
+}
+
+/** Setter for {@link FastEntityStatePdu#capabilities}*/
+public FastEntityStatePdu setCapabilities(short pCapabilities)
+{
+ capabilities = pCapabilities;
+ return this;
+}
+
+/** Getter for {@link FastEntityStatePdu#capabilities}*/
+public short getCapabilities()
{
return capabilities;
-}
-
-/** Setter for {@link FastEntityStatePdu#variableParameters}*/
-public FastEntityStatePdu setVariableParameters(List<VariableParameter> pVariableParameters)
-{
- variableParameters = pVariableParameters;
- return this;
-}
-
-/** Getter for {@link FastEntityStatePdu#variableParameters}*/
-public List<VariableParameter> getVariableParameters()
+}
+
+/** Setter for {@link FastEntityStatePdu#variableParameters}*/
+public FastEntityStatePdu setVariableParameters(List<VariableParameter> pVariableParameters)
+{
+ variableParameters = pVariableParameters;
+ return this;
+}
+
+/** Getter for {@link FastEntityStatePdu#variableParameters}*/
+public List<VariableParameter> getVariableParameters()
{
return variableParameters;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- dos.writeShort(site);
- dos.writeShort(application);
- dos.writeShort(entity);
- dos.writeByte(forceId);
- dos.writeByte(variableParameters.size());
- dos.writeByte(entityKind);
- dos.writeByte(domain);
- dos.writeShort(country);
- dos.writeByte(category);
- dos.writeByte(subcategory);
- dos.writeByte(specific);
- dos.writeByte(extra);
- dos.writeByte(altEntityKind);
- dos.writeByte(altDomain);
- dos.writeShort(altCountry);
- dos.writeByte(altCategory);
- dos.writeByte(altSubcategory);
- dos.writeByte(altSpecific);
- dos.writeByte(altExtra);
- dos.writeFloat(xVelocity);
- dos.writeFloat(yVelocity);
- dos.writeFloat(zVelocity);
- dos.writeDouble(xLocation);
- dos.writeDouble(yLocation);
- dos.writeDouble(zLocation);
- dos.writeFloat(psi);
- dos.writeFloat(theta);
- dos.writeFloat(phi);
- dos.writeInt(entityAppearance);
- dos.writeByte(deadReckoningAlgorithm);
-
- for(int idx = 0; idx < otherParameters.length; idx++)
- dos.writeByte(otherParameters[idx]);
-
- dos.writeFloat(xAcceleration);
- dos.writeFloat(yAcceleration);
- dos.writeFloat(zAcceleration);
- dos.writeFloat(xAngularVelocity);
- dos.writeFloat(yAngularVelocity);
- dos.writeFloat(zAngularVelocity);
-
- for(int idx = 0; idx < marking.length; idx++)
- dos.writeByte(marking[idx]);
-
- dos.writeShort(capabilities);
-
- for(int idx = 0; idx < variableParameters.size(); idx++)
- {
- VariableParameter aVariableParameter = variableParameters.get(idx);
- aVariableParameter.marshal(dos);
- }
-
+ {
+ dos.writeShort(site);
+ dos.writeShort(application);
+ dos.writeShort(entity);
+ dos.writeByte(forceId);
+ dos.writeByte(variableParameters.size());
+ dos.writeByte(entityKind);
+ dos.writeByte(domain);
+ dos.writeShort(country);
+ dos.writeByte(category);
+ dos.writeByte(subcategory);
+ dos.writeByte(specific);
+ dos.writeByte(extra);
+ dos.writeByte(altEntityKind);
+ dos.writeByte(altDomain);
+ dos.writeShort(altCountry);
+ dos.writeByte(altCategory);
+ dos.writeByte(altSubcategory);
+ dos.writeByte(altSpecific);
+ dos.writeByte(altExtra);
+ dos.writeFloat(xVelocity);
+ dos.writeFloat(yVelocity);
+ dos.writeFloat(zVelocity);
+ dos.writeDouble(xLocation);
+ dos.writeDouble(yLocation);
+ dos.writeDouble(zLocation);
+ dos.writeFloat(psi);
+ dos.writeFloat(theta);
+ dos.writeFloat(phi);
+ dos.writeInt(entityAppearance);
+ dos.writeByte(deadReckoningAlgorithm);
+
+ for(int idx = 0; idx < otherParameters.length; idx++)
+ dos.writeByte(otherParameters[idx]);
+
+ dos.writeFloat(xAcceleration);
+ dos.writeFloat(yAcceleration);
+ dos.writeFloat(zAcceleration);
+ dos.writeFloat(xAngularVelocity);
+ dos.writeFloat(yAngularVelocity);
+ dos.writeFloat(zAngularVelocity);
+
+ for(int idx = 0; idx < marking.length; idx++)
+ dos.writeByte(marking[idx]);
+
+ dos.writeShort(capabilities);
+
+ for(int idx = 0; idx < variableParameters.size(); idx++)
+ {
+ VariableParameter aVariableParameter = variableParameters.get(idx);
+ aVariableParameter.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- site = (short)dis.readUnsignedShort();
- uPosition += 2;
- application = (short)dis.readUnsignedShort();
- uPosition += 2;
- entity = (short)dis.readUnsignedShort();
- uPosition += 2;
- forceId = (byte)dis.readUnsignedByte();
- uPosition += 1;
- numberOfVariableParameters = (byte)dis.readUnsignedByte();
- uPosition += 1;
- entityKind = (byte)dis.readUnsignedByte();
- uPosition += 1;
- domain = (byte)dis.readUnsignedByte();
- uPosition += 1;
- country = (short)dis.readUnsignedShort();
- uPosition += 2;
- category = (byte)dis.readUnsignedByte();
- uPosition += 1;
- subcategory = (byte)dis.readUnsignedByte();
- uPosition += 1;
- specific = (byte)dis.readUnsignedByte();
- uPosition += 1;
- extra = (byte)dis.readUnsignedByte();
- uPosition += 1;
- altEntityKind = (byte)dis.readUnsignedByte();
- uPosition += 1;
- altDomain = (byte)dis.readUnsignedByte();
- uPosition += 1;
- altCountry = (short)dis.readUnsignedShort();
- uPosition += 2;
- altCategory = (byte)dis.readUnsignedByte();
- uPosition += 1;
- altSubcategory = (byte)dis.readUnsignedByte();
- uPosition += 1;
- altSpecific = (byte)dis.readUnsignedByte();
- uPosition += 1;
- altExtra = (byte)dis.readUnsignedByte();
- uPosition += 1;
- xVelocity = dis.readFloat();
- uPosition += 4;
- yVelocity = dis.readFloat();
- uPosition += 4;
- zVelocity = dis.readFloat();
- uPosition += 4;
- xLocation = dis.readDouble();
- uPosition += 4;
- yLocation = dis.readDouble();
- uPosition += 4;
- zLocation = dis.readDouble();
- uPosition += 4;
- psi = dis.readFloat();
- uPosition += 4;
- theta = dis.readFloat();
- uPosition += 4;
- phi = dis.readFloat();
- uPosition += 4;
- entityAppearance = dis.readInt();
- uPosition += 4;
- deadReckoningAlgorithm = (byte)dis.readUnsignedByte();
- uPosition += 1;
- for(int idx = 0; idx < otherParameters.length; idx++)
- otherParameters[idx] = dis.readByte();
- uPosition += (otherParameters.length * 1);
- xAcceleration = dis.readFloat();
- uPosition += 4;
- yAcceleration = dis.readFloat();
- uPosition += 4;
- zAcceleration = dis.readFloat();
- uPosition += 4;
- xAngularVelocity = dis.readFloat();
- uPosition += 4;
- yAngularVelocity = dis.readFloat();
- uPosition += 4;
- zAngularVelocity = dis.readFloat();
- uPosition += 4;
- for(int idx = 0; idx < marking.length; idx++)
- marking[idx] = dis.readByte();
- uPosition += (marking.length * 1);
- capabilities = (short)dis.readUnsignedShort();
- uPosition += 2;
- for(int idx = 0; idx < numberOfVariableParameters; idx++)
- {
- VariableParameter anX = new VariableParameter();
- uPosition += anX.unmarshal(dis);
- variableParameters.add(anX);
- }
-
+ {
+ site = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ application = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ entity = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ forceId = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ numberOfVariableParameters = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ entityKind = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ domain = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ country = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ category = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ subcategory = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ specific = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ extra = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ altEntityKind = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ altDomain = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ altCountry = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ altCategory = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ altSubcategory = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ altSpecific = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ altExtra = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ xVelocity = dis.readFloat();
+ uPosition += 4;
+ yVelocity = dis.readFloat();
+ uPosition += 4;
+ zVelocity = dis.readFloat();
+ uPosition += 4;
+ xLocation = dis.readDouble();
+ uPosition += 4;
+ yLocation = dis.readDouble();
+ uPosition += 4;
+ zLocation = dis.readDouble();
+ uPosition += 4;
+ psi = dis.readFloat();
+ uPosition += 4;
+ theta = dis.readFloat();
+ uPosition += 4;
+ phi = dis.readFloat();
+ uPosition += 4;
+ entityAppearance = dis.readInt();
+ uPosition += 4;
+ deadReckoningAlgorithm = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ for(int idx = 0; idx < otherParameters.length; idx++)
+ otherParameters[idx] = dis.readByte();
+ uPosition += (otherParameters.length * 1);
+ xAcceleration = dis.readFloat();
+ uPosition += 4;
+ yAcceleration = dis.readFloat();
+ uPosition += 4;
+ zAcceleration = dis.readFloat();
+ uPosition += 4;
+ xAngularVelocity = dis.readFloat();
+ uPosition += 4;
+ yAngularVelocity = dis.readFloat();
+ uPosition += 4;
+ zAngularVelocity = dis.readFloat();
+ uPosition += 4;
+ for(int idx = 0; idx < marking.length; idx++)
+ marking[idx] = dis.readByte();
+ uPosition += (marking.length * 1);
+ capabilities = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ for(int idx = 0; idx < numberOfVariableParameters; idx++)
+ {
+ VariableParameter anX = new VariableParameter();
+ uPosition += anX.unmarshal(dis);
+ variableParameters.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- buff.putShort( (short)site);
- buff.putShort( (short)application);
- buff.putShort( (short)entity);
- buff.put( (byte)forceId);
- buff.put( (byte)variableParameters.size());
- buff.put( (byte)entityKind);
- buff.put( (byte)domain);
- buff.putShort( (short)country);
- buff.put( (byte)category);
- buff.put( (byte)subcategory);
- buff.put( (byte)specific);
- buff.put( (byte)extra);
- buff.put( (byte)altEntityKind);
- buff.put( (byte)altDomain);
- buff.putShort( (short)altCountry);
- buff.put( (byte)altCategory);
- buff.put( (byte)altSubcategory);
- buff.put( (byte)altSpecific);
- buff.put( (byte)altExtra);
- buff.putFloat( (float)xVelocity);
- buff.putFloat( (float)yVelocity);
- buff.putFloat( (float)zVelocity);
- buff.putDouble( (double)xLocation);
- buff.putDouble( (double)yLocation);
- buff.putDouble( (double)zLocation);
- buff.putFloat( (float)psi);
- buff.putFloat( (float)theta);
- buff.putFloat( (float)phi);
- buff.putInt( (int)entityAppearance);
- buff.put( (byte)deadReckoningAlgorithm);
-
- for(int idx = 0; idx < otherParameters.length; idx++)
- buff.put((byte)otherParameters[idx]);
-
- buff.putFloat( (float)xAcceleration);
- buff.putFloat( (float)yAcceleration);
- buff.putFloat( (float)zAcceleration);
- buff.putFloat( (float)xAngularVelocity);
- buff.putFloat( (float)yAngularVelocity);
- buff.putFloat( (float)zAngularVelocity);
-
- for(int idx = 0; idx < marking.length; idx++)
- buff.put((byte)marking[idx]);
-
- buff.putShort( (short)capabilities);
-
- for(int idx = 0; idx < variableParameters.size(); idx++)
- {
- VariableParameter aVariableParameter = variableParameters.get(idx);
- aVariableParameter.marshal(buff);
- }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+ }
+ return getMarshalledSize();
+}
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ buff.putShort( (short)site);
+ buff.putShort( (short)application);
+ buff.putShort( (short)entity);
+ buff.put( (byte)forceId);
+ buff.put( (byte)variableParameters.size());
+ buff.put( (byte)entityKind);
+ buff.put( (byte)domain);
+ buff.putShort( (short)country);
+ buff.put( (byte)category);
+ buff.put( (byte)subcategory);
+ buff.put( (byte)specific);
+ buff.put( (byte)extra);
+ buff.put( (byte)altEntityKind);
+ buff.put( (byte)altDomain);
+ buff.putShort( (short)altCountry);
+ buff.put( (byte)altCategory);
+ buff.put( (byte)altSubcategory);
+ buff.put( (byte)altSpecific);
+ buff.put( (byte)altExtra);
+ buff.putFloat( (float)xVelocity);
+ buff.putFloat( (float)yVelocity);
+ buff.putFloat( (float)zVelocity);
+ buff.putDouble( (double)xLocation);
+ buff.putDouble( (double)yLocation);
+ buff.putDouble( (double)zLocation);
+ buff.putFloat( (float)psi);
+ buff.putFloat( (float)theta);
+ buff.putFloat( (float)phi);
+ buff.putInt( (int)entityAppearance);
+ buff.put( (byte)deadReckoningAlgorithm);
+
+ for(int idx = 0; idx < otherParameters.length; idx++)
+ buff.put((byte)otherParameters[idx]);
+
+ buff.putFloat( (float)xAcceleration);
+ buff.putFloat( (float)yAcceleration);
+ buff.putFloat( (float)zAcceleration);
+ buff.putFloat( (float)xAngularVelocity);
+ buff.putFloat( (float)yAngularVelocity);
+ buff.putFloat( (float)zAngularVelocity);
+
+ for(int idx = 0; idx < marking.length; idx++)
+ buff.put((byte)marking[idx]);
+
+ buff.putShort( (short)capabilities);
+
+ for(int idx = 0; idx < variableParameters.size(); idx++)
+ {
+ VariableParameter aVariableParameter = variableParameters.get(idx);
+ aVariableParameter.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- site = (short)(buff.getShort() & 0xFFFF);
- application = (short)(buff.getShort() & 0xFFFF);
- entity = (short)(buff.getShort() & 0xFFFF);
- forceId = (byte)(buff.get() & 0xFF);
- numberOfVariableParameters = (byte)(buff.get() & 0xFF);
- entityKind = (byte)(buff.get() & 0xFF);
- domain = (byte)(buff.get() & 0xFF);
- country = (short)(buff.getShort() & 0xFFFF);
- category = (byte)(buff.get() & 0xFF);
- subcategory = (byte)(buff.get() & 0xFF);
- specific = (byte)(buff.get() & 0xFF);
- extra = (byte)(buff.get() & 0xFF);
- altEntityKind = (byte)(buff.get() & 0xFF);
- altDomain = (byte)(buff.get() & 0xFF);
- altCountry = (short)(buff.getShort() & 0xFFFF);
- altCategory = (byte)(buff.get() & 0xFF);
- altSubcategory = (byte)(buff.get() & 0xFF);
- altSpecific = (byte)(buff.get() & 0xFF);
- altExtra = (byte)(buff.get() & 0xFF);
- xVelocity = buff.getFloat();
- yVelocity = buff.getFloat();
- zVelocity = buff.getFloat();
- xLocation = buff.getDouble();
- yLocation = buff.getDouble();
- zLocation = buff.getDouble();
- psi = buff.getFloat();
- theta = buff.getFloat();
- phi = buff.getFloat();
- entityAppearance = buff.getInt();
- deadReckoningAlgorithm = (byte)(buff.get() & 0xFF);
- for(int idx = 0; idx < otherParameters.length; idx++)
- otherParameters[idx] = buff.get();
- xAcceleration = buff.getFloat();
- yAcceleration = buff.getFloat();
- zAcceleration = buff.getFloat();
- xAngularVelocity = buff.getFloat();
- yAngularVelocity = buff.getFloat();
- zAngularVelocity = buff.getFloat();
- for(int idx = 0; idx < marking.length; idx++)
- marking[idx] = buff.get();
- capabilities = (short)(buff.getShort() & 0xFFFF);
- for(int idx = 0; idx < numberOfVariableParameters; idx++)
- {
- VariableParameter anX = new VariableParameter();
- anX.unmarshal(buff);
- variableParameters.add(anX);
- }
-
- return getMarshalledSize();
-}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final FastEntityStatePdu rhs = (FastEntityStatePdu)obj;
-
- if( ! (site == rhs.site)) ivarsEqual = false;
- if( ! (application == rhs.application)) ivarsEqual = false;
- if( ! (entity == rhs.entity)) ivarsEqual = false;
- if( ! (forceId == rhs.forceId)) ivarsEqual = false;
- if( ! (entityKind == rhs.entityKind)) ivarsEqual = false;
- if( ! (domain == rhs.domain)) ivarsEqual = false;
- if( ! (country == rhs.country)) ivarsEqual = false;
- if( ! (category == rhs.category)) ivarsEqual = false;
- if( ! (subcategory == rhs.subcategory)) ivarsEqual = false;
- if( ! (specific == rhs.specific)) ivarsEqual = false;
- if( ! (extra == rhs.extra)) ivarsEqual = false;
- if( ! (altEntityKind == rhs.altEntityKind)) ivarsEqual = false;
- if( ! (altDomain == rhs.altDomain)) ivarsEqual = false;
- if( ! (altCountry == rhs.altCountry)) ivarsEqual = false;
- if( ! (altCategory == rhs.altCategory)) ivarsEqual = false;
- if( ! (altSubcategory == rhs.altSubcategory)) ivarsEqual = false;
- if( ! (altSpecific == rhs.altSpecific)) ivarsEqual = false;
- if( ! (altExtra == rhs.altExtra)) ivarsEqual = false;
- if( ! (xVelocity == rhs.xVelocity)) ivarsEqual = false;
- if( ! (yVelocity == rhs.yVelocity)) ivarsEqual = false;
- if( ! (zVelocity == rhs.zVelocity)) ivarsEqual = false;
- if( ! (xLocation == rhs.xLocation)) ivarsEqual = false;
- if( ! (yLocation == rhs.yLocation)) ivarsEqual = false;
- if( ! (zLocation == rhs.zLocation)) ivarsEqual = false;
- if( ! (psi == rhs.psi)) ivarsEqual = false;
- if( ! (theta == rhs.theta)) ivarsEqual = false;
- if( ! (phi == rhs.phi)) ivarsEqual = false;
- if( ! (entityAppearance == rhs.entityAppearance)) ivarsEqual = false;
- if( ! (deadReckoningAlgorithm == rhs.deadReckoningAlgorithm)) ivarsEqual = false;
-
- for(int idx = 0; idx < 15; idx++)
- {
- if(!(otherParameters[idx] == rhs.otherParameters[idx])) ivarsEqual = false;
- }
-
- if( ! (xAcceleration == rhs.xAcceleration)) ivarsEqual = false;
- if( ! (yAcceleration == rhs.yAcceleration)) ivarsEqual = false;
- if( ! (zAcceleration == rhs.zAcceleration)) ivarsEqual = false;
- if( ! (xAngularVelocity == rhs.xAngularVelocity)) ivarsEqual = false;
- if( ! (yAngularVelocity == rhs.yAngularVelocity)) ivarsEqual = false;
- if( ! (zAngularVelocity == rhs.zAngularVelocity)) ivarsEqual = false;
-
- for(int idx = 0; idx < 12; idx++)
- {
- if(!(marking[idx] == rhs.marking[idx])) ivarsEqual = false;
- }
-
- if( ! (capabilities == rhs.capabilities)) ivarsEqual = false;
-
- for(int idx = 0; idx < variableParameters.size(); idx++)
- if( ! ( variableParameters.get(idx).equals(rhs.variableParameters.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ site = (short)(buff.getShort() & 0xFFFF);
+ application = (short)(buff.getShort() & 0xFFFF);
+ entity = (short)(buff.getShort() & 0xFFFF);
+ forceId = (byte)(buff.get() & 0xFF);
+ numberOfVariableParameters = (byte)(buff.get() & 0xFF);
+ entityKind = (byte)(buff.get() & 0xFF);
+ domain = (byte)(buff.get() & 0xFF);
+ country = (short)(buff.getShort() & 0xFFFF);
+ category = (byte)(buff.get() & 0xFF);
+ subcategory = (byte)(buff.get() & 0xFF);
+ specific = (byte)(buff.get() & 0xFF);
+ extra = (byte)(buff.get() & 0xFF);
+ altEntityKind = (byte)(buff.get() & 0xFF);
+ altDomain = (byte)(buff.get() & 0xFF);
+ altCountry = (short)(buff.getShort() & 0xFFFF);
+ altCategory = (byte)(buff.get() & 0xFF);
+ altSubcategory = (byte)(buff.get() & 0xFF);
+ altSpecific = (byte)(buff.get() & 0xFF);
+ altExtra = (byte)(buff.get() & 0xFF);
+ xVelocity = buff.getFloat();
+ yVelocity = buff.getFloat();
+ zVelocity = buff.getFloat();
+ xLocation = buff.getDouble();
+ yLocation = buff.getDouble();
+ zLocation = buff.getDouble();
+ psi = buff.getFloat();
+ theta = buff.getFloat();
+ phi = buff.getFloat();
+ entityAppearance = buff.getInt();
+ deadReckoningAlgorithm = (byte)(buff.get() & 0xFF);
+ for(int idx = 0; idx < otherParameters.length; idx++)
+ otherParameters[idx] = buff.get();
+ xAcceleration = buff.getFloat();
+ yAcceleration = buff.getFloat();
+ zAcceleration = buff.getFloat();
+ xAngularVelocity = buff.getFloat();
+ yAngularVelocity = buff.getFloat();
+ zAngularVelocity = buff.getFloat();
+ for(int idx = 0; idx < marking.length; idx++)
+ marking[idx] = buff.get();
+ capabilities = (short)(buff.getShort() & 0xFFFF);
+ for(int idx = 0; idx < numberOfVariableParameters; idx++)
+ {
+ VariableParameter anX = new VariableParameter();
+ anX.unmarshal(buff);
+ variableParameters.add(anX);
+ }
+
+ return getMarshalledSize();
+}
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final FastEntityStatePdu rhs = (FastEntityStatePdu)obj;
+
+ if( ! (site == rhs.site)) ivarsEqual = false;
+ if( ! (application == rhs.application)) ivarsEqual = false;
+ if( ! (entity == rhs.entity)) ivarsEqual = false;
+ if( ! (forceId == rhs.forceId)) ivarsEqual = false;
+ if( ! (entityKind == rhs.entityKind)) ivarsEqual = false;
+ if( ! (domain == rhs.domain)) ivarsEqual = false;
+ if( ! (country == rhs.country)) ivarsEqual = false;
+ if( ! (category == rhs.category)) ivarsEqual = false;
+ if( ! (subcategory == rhs.subcategory)) ivarsEqual = false;
+ if( ! (specific == rhs.specific)) ivarsEqual = false;
+ if( ! (extra == rhs.extra)) ivarsEqual = false;
+ if( ! (altEntityKind == rhs.altEntityKind)) ivarsEqual = false;
+ if( ! (altDomain == rhs.altDomain)) ivarsEqual = false;
+ if( ! (altCountry == rhs.altCountry)) ivarsEqual = false;
+ if( ! (altCategory == rhs.altCategory)) ivarsEqual = false;
+ if( ! (altSubcategory == rhs.altSubcategory)) ivarsEqual = false;
+ if( ! (altSpecific == rhs.altSpecific)) ivarsEqual = false;
+ if( ! (altExtra == rhs.altExtra)) ivarsEqual = false;
+ if( ! (xVelocity == rhs.xVelocity)) ivarsEqual = false;
+ if( ! (yVelocity == rhs.yVelocity)) ivarsEqual = false;
+ if( ! (zVelocity == rhs.zVelocity)) ivarsEqual = false;
+ if( ! (xLocation == rhs.xLocation)) ivarsEqual = false;
+ if( ! (yLocation == rhs.yLocation)) ivarsEqual = false;
+ if( ! (zLocation == rhs.zLocation)) ivarsEqual = false;
+ if( ! (psi == rhs.psi)) ivarsEqual = false;
+ if( ! (theta == rhs.theta)) ivarsEqual = false;
+ if( ! (phi == rhs.phi)) ivarsEqual = false;
+ if( ! (entityAppearance == rhs.entityAppearance)) ivarsEqual = false;
+ if( ! (deadReckoningAlgorithm == rhs.deadReckoningAlgorithm)) ivarsEqual = false;
+
+ for(int idx = 0; idx < 15; idx++)
+ {
+ if(!(otherParameters[idx] == rhs.otherParameters[idx])) ivarsEqual = false;
+ }
+
+ if( ! (xAcceleration == rhs.xAcceleration)) ivarsEqual = false;
+ if( ! (yAcceleration == rhs.yAcceleration)) ivarsEqual = false;
+ if( ! (zAcceleration == rhs.zAcceleration)) ivarsEqual = false;
+ if( ! (xAngularVelocity == rhs.xAngularVelocity)) ivarsEqual = false;
+ if( ! (yAngularVelocity == rhs.yAngularVelocity)) ivarsEqual = false;
+ if( ! (zAngularVelocity == rhs.zAngularVelocity)) ivarsEqual = false;
+
+ for(int idx = 0; idx < 12; idx++)
+ {
+ if(!(marking[idx] == rhs.marking[idx])) ivarsEqual = false;
+ }
+
+ if( ! (capabilities == rhs.capabilities)) ivarsEqual = false;
+
+ for(int idx = 0; idx < variableParameters.size(); idx++)
+ if( ! ( variableParameters.get(idx).equals(rhs.variableParameters.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" site: ").append(site).append("\n");
- sb.append(" application: ").append(application).append("\n");
- sb.append(" entity: ").append(entity).append("\n");
- sb.append(" forceId: ").append(forceId).append("\n");
- sb.append(" entityKind: ").append(entityKind).append("\n");
- sb.append(" domain: ").append(domain).append("\n");
- sb.append(" country: ").append(country).append("\n");
- sb.append(" category: ").append(category).append("\n");
- sb.append(" subcategory: ").append(subcategory).append("\n");
- sb.append(" specific: ").append(specific).append("\n");
- sb.append(" extra: ").append(extra).append("\n");
- sb.append(" altEntityKind: ").append(altEntityKind).append("\n");
- sb.append(" altDomain: ").append(altDomain).append("\n");
- sb.append(" altCountry: ").append(altCountry).append("\n");
- sb.append(" altCategory: ").append(altCategory).append("\n");
- sb.append(" altSubcategory: ").append(altSubcategory).append("\n");
- sb.append(" altSpecific: ").append(altSpecific).append("\n");
- sb.append(" altExtra: ").append(altExtra).append("\n");
- sb.append(" xVelocity: ").append(xVelocity).append("\n");
- sb.append(" yVelocity: ").append(yVelocity).append("\n");
- sb.append(" zVelocity: ").append(zVelocity).append("\n");
- sb.append(" xLocation: ").append(xLocation).append("\n");
- sb.append(" yLocation: ").append(yLocation).append("\n");
- sb.append(" zLocation: ").append(zLocation).append("\n");
- sb.append(" psi: ").append(psi).append("\n");
- sb.append(" theta: ").append(theta).append("\n");
- sb.append(" phi: ").append(phi).append("\n");
- sb.append(" entityAppearance: ").append(entityAppearance).append("\n");
- sb.append(" deadReckoningAlgorithm: ").append(deadReckoningAlgorithm).append("\n");
- sb.append(" otherParameters: ").append("\n");
- sb.append(Arrays.toString(otherParameters)).append("\n");
- sb.append(" xAcceleration: ").append(xAcceleration).append("\n");
- sb.append(" yAcceleration: ").append(yAcceleration).append("\n");
- sb.append(" zAcceleration: ").append(zAcceleration).append("\n");
- sb.append(" xAngularVelocity: ").append(xAngularVelocity).append("\n");
- sb.append(" yAngularVelocity: ").append(yAngularVelocity).append("\n");
- sb.append(" zAngularVelocity: ").append(zAngularVelocity).append("\n");
- sb.append(" marking: ").append("\n");
- sb.append(Arrays.toString(marking)).append("\n");
- sb.append(" capabilities: ").append(capabilities).append("\n");
- sb.append(" variableParameters: ").append("\n");
- variableParameters.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" site: ").append(site).append("\n");
+ sb.append(" application: ").append(application).append("\n");
+ sb.append(" entity: ").append(entity).append("\n");
+ sb.append(" forceId: ").append(forceId).append("\n");
+ sb.append(" entityKind: ").append(entityKind).append("\n");
+ sb.append(" domain: ").append(domain).append("\n");
+ sb.append(" country: ").append(country).append("\n");
+ sb.append(" category: ").append(category).append("\n");
+ sb.append(" subcategory: ").append(subcategory).append("\n");
+ sb.append(" specific: ").append(specific).append("\n");
+ sb.append(" extra: ").append(extra).append("\n");
+ sb.append(" altEntityKind: ").append(altEntityKind).append("\n");
+ sb.append(" altDomain: ").append(altDomain).append("\n");
+ sb.append(" altCountry: ").append(altCountry).append("\n");
+ sb.append(" altCategory: ").append(altCategory).append("\n");
+ sb.append(" altSubcategory: ").append(altSubcategory).append("\n");
+ sb.append(" altSpecific: ").append(altSpecific).append("\n");
+ sb.append(" altExtra: ").append(altExtra).append("\n");
+ sb.append(" xVelocity: ").append(xVelocity).append("\n");
+ sb.append(" yVelocity: ").append(yVelocity).append("\n");
+ sb.append(" zVelocity: ").append(zVelocity).append("\n");
+ sb.append(" xLocation: ").append(xLocation).append("\n");
+ sb.append(" yLocation: ").append(yLocation).append("\n");
+ sb.append(" zLocation: ").append(zLocation).append("\n");
+ sb.append(" psi: ").append(psi).append("\n");
+ sb.append(" theta: ").append(theta).append("\n");
+ sb.append(" phi: ").append(phi).append("\n");
+ sb.append(" entityAppearance: ").append(entityAppearance).append("\n");
+ sb.append(" deadReckoningAlgorithm: ").append(deadReckoningAlgorithm).append("\n");
+ sb.append(" otherParameters: ").append("\n");
+ sb.append(Arrays.toString(otherParameters)).append("\n");
+ sb.append(" xAcceleration: ").append(xAcceleration).append("\n");
+ sb.append(" yAcceleration: ").append(yAcceleration).append("\n");
+ sb.append(" zAcceleration: ").append(zAcceleration).append("\n");
+ sb.append(" xAngularVelocity: ").append(xAngularVelocity).append("\n");
+ sb.append(" yAngularVelocity: ").append(yAngularVelocity).append("\n");
+ sb.append(" zAngularVelocity: ").append(zAngularVelocity).append("\n");
+ sb.append(" marking: ").append("\n");
+ sb.append(Arrays.toString(marking)).append("\n");
+ sb.append(" capabilities: ").append(capabilities).append("\n");
+ sb.append(" variableParameters: ").append("\n");
+ variableParameters.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/FirePdu.java b/src-generated/edu/nps/moves/dis7/FirePdu.java
index 5fc94223d33990af352307a7971ad859282a96b6..83a4e322c0d5b3d6d6c135ac4f361e7ffdde85a1 100644
--- a/src-generated/edu/nps/moves/dis7/FirePdu.java
+++ b/src-generated/edu/nps/moves/dis7/FirePdu.java
@@ -1,350 +1,350 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 7.3.2 Used to communicate the firing of a weapon or expendable.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class FirePdu extends WarfareFamilyPdu implements Serializable
-{
- /** ID of the entity that shot */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 7.3.2 Used to communicate the firing of a weapon or expendable.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class FirePdu extends WarfareFamilyPdu implements Serializable
+{
+ /** ID of the entity that shot */
protected EntityID firingEntityID = new EntityID();
-
- /** ID of the entity that is being shot at */
+
+ /** ID of the entity that is being shot at */
protected EntityID targetEntityID = new EntityID();
-
- /** This field shall specify the entity identification of the fired munition or expendable. This field shall be represented by an Entity Identifier record (see 6.2.28). */
+
+ /** This field shall specify the entity identification of the fired munition or expendable. This field shall be represented by an Entity Identifier record (see 6.2.28). */
protected EntityID munitionExpendibleID = new EntityID();
-
- /** This field shall contain an identification generated by the firing entity to associate related firing and detonation events. This field shall be represented by an Event Identifier record (see 6.2.34). */
+
+ /** This field shall contain an identification generated by the firing entity to associate related firing and detonation events. This field shall be represented by an Event Identifier record (see 6.2.34). */
protected EventIdentifier eventID = new EventIdentifier();
-
- /** This field shall identify the fire mission (see 5.4.3.3). This field shall be represented by a 32-bit unsigned integer. */
+
+ /** This field shall identify the fire mission (see 5.4.3.3). This field shall be represented by a 32-bit unsigned integer. */
protected int fireMissionIndex;
-
- /** This field shall specify the location, in world coordinates, from which the munition was launched, and shall be represented by a World Coordinates record (see 6.2.97). */
+
+ /** This field shall specify the location, in world coordinates, from which the munition was launched, and shall be represented by a World Coordinates record (see 6.2.97). */
protected Vector3Double locationInWorldCoordinates = new Vector3Double();
-
- /** This field shall describe the firing or launch of a munition or expendable represented by one of the following types of Descriptor records: Munition Descriptor (6.2.20.2) or Expendable Descriptor (6.2.20.4). */
+
+ /** This field shall describe the firing or launch of a munition or expendable represented by one of the following types of Descriptor records: Munition Descriptor (6.2.20.2) or Expendable Descriptor (6.2.20.4). */
protected MunitionDescriptor descriptor = new MunitionDescriptor();
-
- /** This field shall specify the velocity of the fired munition at the point when the issuing simulation application intends the externally visible effects of the launch (e.g. exhaust plume or muzzle blast) to first become apparent. The velocity shall be represented in world coordinates. This field shall be represented by a Linear Velocity Vector record [see 6.2.95 item c)]. */
+
+ /** This field shall specify the velocity of the fired munition at the point when the issuing simulation application intends the externally visible effects of the launch (e.g. exhaust plume or muzzle blast) to first become apparent. The velocity shall be represented in world coordinates. This field shall be represented by a Linear Velocity Vector record [see 6.2.95 item c)]. */
protected Vector3Float velocity = new Vector3Float();
-
- /** This field shall specify the range that an entity's fire control system has assumed in computing the fire control solution. This field shall be represented by a 32-bit floating point number in meters. For systems where range is unknown or unavailable, this field shall contain a value of zero. */
+
+ /** This field shall specify the range that an entity's fire control system has assumed in computing the fire control solution. This field shall be represented by a 32-bit floating point number in meters. For systems where range is unknown or unavailable, this field shall contain a value of zero. */
protected float range;
-
-
-/** Constructor */
- public FirePdu()
- {
- setPduType( DISPDUType.FIRE );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public FirePdu()
+ {
+ setPduType( DISPDUType.FIRE );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += firingEntityID.getMarshalledSize();
+ marshalSize += targetEntityID.getMarshalledSize();
+ marshalSize += munitionExpendibleID.getMarshalledSize();
+ marshalSize += eventID.getMarshalledSize();
+ marshalSize += 4; // fireMissionIndex
+ marshalSize += locationInWorldCoordinates.getMarshalledSize();
+ marshalSize += descriptor.getMarshalledSize();
+ marshalSize += velocity.getMarshalledSize();
+ marshalSize += 4; // range
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link FirePdu#firingEntityID}*/
+public FirePdu setFiringEntityID(EntityID pFiringEntityID)
{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += firingEntityID.getMarshalledSize();
- marshalSize += targetEntityID.getMarshalledSize();
- marshalSize += munitionExpendibleID.getMarshalledSize();
- marshalSize += eventID.getMarshalledSize();
- marshalSize += 4; // fireMissionIndex
- marshalSize += locationInWorldCoordinates.getMarshalledSize();
- marshalSize += descriptor.getMarshalledSize();
- marshalSize += velocity.getMarshalledSize();
- marshalSize += 4; // range
-
- return marshalSize;
-}
-
-
-/** Setter for {@link FirePdu#firingEntityID}*/
-public FirePdu setFiringEntityID(EntityID pFiringEntityID)
-{
- firingEntityID = pFiringEntityID;
- return this;
-}
-
-/** Getter for {@link FirePdu#firingEntityID}*/
-public EntityID getFiringEntityID()
+ firingEntityID = pFiringEntityID;
+ return this;
+}
+
+/** Getter for {@link FirePdu#firingEntityID}*/
+public EntityID getFiringEntityID()
{
return firingEntityID;
-}
-
-/** Setter for {@link FirePdu#targetEntityID}*/
-public FirePdu setTargetEntityID(EntityID pTargetEntityID)
+}
+
+/** Setter for {@link FirePdu#targetEntityID}*/
+public FirePdu setTargetEntityID(EntityID pTargetEntityID)
{
- targetEntityID = pTargetEntityID;
- return this;
-}
-
-/** Getter for {@link FirePdu#targetEntityID}*/
-public EntityID getTargetEntityID()
+ targetEntityID = pTargetEntityID;
+ return this;
+}
+
+/** Getter for {@link FirePdu#targetEntityID}*/
+public EntityID getTargetEntityID()
{
return targetEntityID;
-}
-
-/** Setter for {@link FirePdu#munitionExpendibleID}*/
-public FirePdu setMunitionExpendibleID(EntityID pMunitionExpendibleID)
+}
+
+/** Setter for {@link FirePdu#munitionExpendibleID}*/
+public FirePdu setMunitionExpendibleID(EntityID pMunitionExpendibleID)
{
- munitionExpendibleID = pMunitionExpendibleID;
- return this;
-}
-
-/** Getter for {@link FirePdu#munitionExpendibleID}*/
-public EntityID getMunitionExpendibleID()
+ munitionExpendibleID = pMunitionExpendibleID;
+ return this;
+}
+
+/** Getter for {@link FirePdu#munitionExpendibleID}*/
+public EntityID getMunitionExpendibleID()
{
return munitionExpendibleID;
-}
-
-/** Setter for {@link FirePdu#eventID}*/
-public FirePdu setEventID(EventIdentifier pEventID)
+}
+
+/** Setter for {@link FirePdu#eventID}*/
+public FirePdu setEventID(EventIdentifier pEventID)
{
- eventID = pEventID;
- return this;
-}
-
-/** Getter for {@link FirePdu#eventID}*/
-public EventIdentifier getEventID()
+ eventID = pEventID;
+ return this;
+}
+
+/** Getter for {@link FirePdu#eventID}*/
+public EventIdentifier getEventID()
{
return eventID;
-}
-
-/** Setter for {@link FirePdu#fireMissionIndex}*/
-public FirePdu setFireMissionIndex(int pFireMissionIndex)
+}
+
+/** Setter for {@link FirePdu#fireMissionIndex}*/
+public FirePdu setFireMissionIndex(int pFireMissionIndex)
{
- fireMissionIndex = pFireMissionIndex;
- return this;
-}
-
-/** Getter for {@link FirePdu#fireMissionIndex}*/
-public int getFireMissionIndex()
+ fireMissionIndex = pFireMissionIndex;
+ return this;
+}
+
+/** Getter for {@link FirePdu#fireMissionIndex}*/
+public int getFireMissionIndex()
{
return fireMissionIndex;
-}
-
-/** Setter for {@link FirePdu#locationInWorldCoordinates}*/
-public FirePdu setLocationInWorldCoordinates(Vector3Double pLocationInWorldCoordinates)
+}
+
+/** Setter for {@link FirePdu#locationInWorldCoordinates}*/
+public FirePdu setLocationInWorldCoordinates(Vector3Double pLocationInWorldCoordinates)
{
- locationInWorldCoordinates = pLocationInWorldCoordinates;
- return this;
-}
-
-/** Getter for {@link FirePdu#locationInWorldCoordinates}*/
-public Vector3Double getLocationInWorldCoordinates()
+ locationInWorldCoordinates = pLocationInWorldCoordinates;
+ return this;
+}
+
+/** Getter for {@link FirePdu#locationInWorldCoordinates}*/
+public Vector3Double getLocationInWorldCoordinates()
{
return locationInWorldCoordinates;
-}
-
-/** Setter for {@link FirePdu#descriptor}*/
-public FirePdu setDescriptor(MunitionDescriptor pDescriptor)
+}
+
+/** Setter for {@link FirePdu#descriptor}*/
+public FirePdu setDescriptor(MunitionDescriptor pDescriptor)
{
- descriptor = pDescriptor;
- return this;
-}
-
-/** Getter for {@link FirePdu#descriptor}*/
-public MunitionDescriptor getDescriptor()
+ descriptor = pDescriptor;
+ return this;
+}
+
+/** Getter for {@link FirePdu#descriptor}*/
+public MunitionDescriptor getDescriptor()
{
return descriptor;
-}
-
-/** Setter for {@link FirePdu#velocity}*/
-public FirePdu setVelocity(Vector3Float pVelocity)
+}
+
+/** Setter for {@link FirePdu#velocity}*/
+public FirePdu setVelocity(Vector3Float pVelocity)
{
- velocity = pVelocity;
- return this;
-}
-
-/** Getter for {@link FirePdu#velocity}*/
-public Vector3Float getVelocity()
+ velocity = pVelocity;
+ return this;
+}
+
+/** Getter for {@link FirePdu#velocity}*/
+public Vector3Float getVelocity()
{
return velocity;
-}
-
-/** Setter for {@link FirePdu#range}*/
-public FirePdu setRange(float pRange)
+}
+
+/** Setter for {@link FirePdu#range}*/
+public FirePdu setRange(float pRange)
{
- range = pRange;
- return this;
-}
-
-/** Getter for {@link FirePdu#range}*/
-public float getRange()
+ range = pRange;
+ return this;
+}
+
+/** Getter for {@link FirePdu#range}*/
+public float getRange()
{
return range;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- firingEntityID.marshal(dos);
- targetEntityID.marshal(dos);
- munitionExpendibleID.marshal(dos);
- eventID.marshal(dos);
- dos.writeInt(fireMissionIndex);
- locationInWorldCoordinates.marshal(dos);
- descriptor.marshal(dos);
- velocity.marshal(dos);
- dos.writeFloat(range);
+ {
+ firingEntityID.marshal(dos);
+ targetEntityID.marshal(dos);
+ munitionExpendibleID.marshal(dos);
+ eventID.marshal(dos);
+ dos.writeInt(fireMissionIndex);
+ locationInWorldCoordinates.marshal(dos);
+ descriptor.marshal(dos);
+ velocity.marshal(dos);
+ dos.writeFloat(range);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += firingEntityID.unmarshal(dis);
- uPosition += targetEntityID.unmarshal(dis);
- uPosition += munitionExpendibleID.unmarshal(dis);
- uPosition += eventID.unmarshal(dis);
- fireMissionIndex = dis.readInt();
- uPosition += 4;
- uPosition += locationInWorldCoordinates.unmarshal(dis);
- uPosition += descriptor.unmarshal(dis);
- uPosition += velocity.unmarshal(dis);
- range = dis.readFloat();
- uPosition += 4;
+ {
+ uPosition += firingEntityID.unmarshal(dis);
+ uPosition += targetEntityID.unmarshal(dis);
+ uPosition += munitionExpendibleID.unmarshal(dis);
+ uPosition += eventID.unmarshal(dis);
+ fireMissionIndex = dis.readInt();
+ uPosition += 4;
+ uPosition += locationInWorldCoordinates.unmarshal(dis);
+ uPosition += descriptor.unmarshal(dis);
+ uPosition += velocity.unmarshal(dis);
+ range = dis.readFloat();
+ uPosition += 4;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- firingEntityID.marshal(buff);
- targetEntityID.marshal(buff);
- munitionExpendibleID.marshal(buff);
- eventID.marshal(buff);
- buff.putInt( (int)fireMissionIndex);
- locationInWorldCoordinates.marshal(buff);
- descriptor.marshal(buff);
- velocity.marshal(buff);
- buff.putFloat( (float)range);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ firingEntityID.marshal(buff);
+ targetEntityID.marshal(buff);
+ munitionExpendibleID.marshal(buff);
+ eventID.marshal(buff);
+ buff.putInt( (int)fireMissionIndex);
+ locationInWorldCoordinates.marshal(buff);
+ descriptor.marshal(buff);
+ velocity.marshal(buff);
+ buff.putFloat( (float)range);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- firingEntityID.unmarshal(buff);
- targetEntityID.unmarshal(buff);
- munitionExpendibleID.unmarshal(buff);
- eventID.unmarshal(buff);
- fireMissionIndex = buff.getInt();
- locationInWorldCoordinates.unmarshal(buff);
- descriptor.unmarshal(buff);
- velocity.unmarshal(buff);
- range = buff.getFloat();
- return getMarshalledSize();
+
+ firingEntityID.unmarshal(buff);
+ targetEntityID.unmarshal(buff);
+ munitionExpendibleID.unmarshal(buff);
+ eventID.unmarshal(buff);
+ fireMissionIndex = buff.getInt();
+ locationInWorldCoordinates.unmarshal(buff);
+ descriptor.unmarshal(buff);
+ velocity.unmarshal(buff);
+ range = buff.getFloat();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final FirePdu rhs = (FirePdu)obj;
-
- if( ! (firingEntityID.equals( rhs.firingEntityID) )) ivarsEqual = false;
- if( ! (targetEntityID.equals( rhs.targetEntityID) )) ivarsEqual = false;
- if( ! (munitionExpendibleID.equals( rhs.munitionExpendibleID) )) ivarsEqual = false;
- if( ! (eventID.equals( rhs.eventID) )) ivarsEqual = false;
- if( ! (fireMissionIndex == rhs.fireMissionIndex)) ivarsEqual = false;
- if( ! (locationInWorldCoordinates.equals( rhs.locationInWorldCoordinates) )) ivarsEqual = false;
- if( ! (descriptor.equals( rhs.descriptor) )) ivarsEqual = false;
- if( ! (velocity.equals( rhs.velocity) )) ivarsEqual = false;
- if( ! (range == rhs.range)) ivarsEqual = false;
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final FirePdu rhs = (FirePdu)obj;
+
+ if( ! (firingEntityID.equals( rhs.firingEntityID) )) ivarsEqual = false;
+ if( ! (targetEntityID.equals( rhs.targetEntityID) )) ivarsEqual = false;
+ if( ! (munitionExpendibleID.equals( rhs.munitionExpendibleID) )) ivarsEqual = false;
+ if( ! (eventID.equals( rhs.eventID) )) ivarsEqual = false;
+ if( ! (fireMissionIndex == rhs.fireMissionIndex)) ivarsEqual = false;
+ if( ! (locationInWorldCoordinates.equals( rhs.locationInWorldCoordinates) )) ivarsEqual = false;
+ if( ! (descriptor.equals( rhs.descriptor) )) ivarsEqual = false;
+ if( ! (velocity.equals( rhs.velocity) )) ivarsEqual = false;
+ if( ! (range == rhs.range)) ivarsEqual = false;
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" firingEntityID: ").append(firingEntityID).append("\n");
- sb.append(" targetEntityID: ").append(targetEntityID).append("\n");
- sb.append(" munitionExpendibleID: ").append(munitionExpendibleID).append("\n");
- sb.append(" eventID: ").append(eventID).append("\n");
- sb.append(" fireMissionIndex: ").append(fireMissionIndex).append("\n");
- sb.append(" locationInWorldCoordinates: ").append(locationInWorldCoordinates).append("\n");
- sb.append(" descriptor: ").append(descriptor).append("\n");
- sb.append(" velocity: ").append(velocity).append("\n");
- sb.append(" range: ").append(range).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" firingEntityID: ").append(firingEntityID).append("\n");
+ sb.append(" targetEntityID: ").append(targetEntityID).append("\n");
+ sb.append(" munitionExpendibleID: ").append(munitionExpendibleID).append("\n");
+ sb.append(" eventID: ").append(eventID).append("\n");
+ sb.append(" fireMissionIndex: ").append(fireMissionIndex).append("\n");
+ sb.append(" locationInWorldCoordinates: ").append(locationInWorldCoordinates).append("\n");
+ sb.append(" descriptor: ").append(descriptor).append("\n");
+ sb.append(" velocity: ").append(velocity).append("\n");
+ sb.append(" range: ").append(range).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/FixedDatum.java b/src-generated/edu/nps/moves/dis7/FixedDatum.java
index 0bb54012bf8224c1d91c8267a0b8406906a2f23c..e6d3cd68a6a79f81c6c4786815f6a5a61b5e8681 100644
--- a/src-generated/edu/nps/moves/dis7/FixedDatum.java
+++ b/src-generated/edu/nps/moves/dis7/FixedDatum.java
@@ -1,186 +1,186 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Fixed Datum Record. Section 6.2.38
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class FixedDatum extends Object implements Serializable
-{
- /** ID of the fixed datum, an enumeration uid 66 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Fixed Datum Record. Section 6.2.38
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class FixedDatum extends Object implements Serializable
+{
+ /** ID of the fixed datum, an enumeration uid 66 */
protected VariableRecordType fixedDatumID = VariableRecordType.values()[0];
-
- /** Value for the fixed datum */
+
+ /** Value for the fixed datum */
protected int fixedDatumValue;
-
-
-/** Constructor */
- public FixedDatum()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += fixedDatumID.getMarshalledSize();
- marshalSize += 4; // fixedDatumValue
-
- return marshalSize;
-}
-
-
-/** Setter for {@link FixedDatum#fixedDatumID}*/
-public FixedDatum setFixedDatumID(VariableRecordType pFixedDatumID)
+
+
+/** Constructor */
+ public FixedDatum()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += fixedDatumID.getMarshalledSize();
+ marshalSize += 4; // fixedDatumValue
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link FixedDatum#fixedDatumID}*/
+public FixedDatum setFixedDatumID(VariableRecordType pFixedDatumID)
{
- fixedDatumID = pFixedDatumID;
- return this;
-}
-
-/** Getter for {@link FixedDatum#fixedDatumID}*/
-public VariableRecordType getFixedDatumID()
+ fixedDatumID = pFixedDatumID;
+ return this;
+}
+
+/** Getter for {@link FixedDatum#fixedDatumID}*/
+public VariableRecordType getFixedDatumID()
{
return fixedDatumID;
-}
-
-/** Setter for {@link FixedDatum#fixedDatumValue}*/
-public FixedDatum setFixedDatumValue(int pFixedDatumValue)
+}
+
+/** Setter for {@link FixedDatum#fixedDatumValue}*/
+public FixedDatum setFixedDatumValue(int pFixedDatumValue)
{
- fixedDatumValue = pFixedDatumValue;
- return this;
-}
-
-/** Getter for {@link FixedDatum#fixedDatumValue}*/
-public int getFixedDatumValue()
+ fixedDatumValue = pFixedDatumValue;
+ return this;
+}
+
+/** Getter for {@link FixedDatum#fixedDatumValue}*/
+public int getFixedDatumValue()
{
return fixedDatumValue;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- fixedDatumID.marshal(dos);
- dos.writeInt(fixedDatumValue);
+ {
+ fixedDatumID.marshal(dos);
+ dos.writeInt(fixedDatumValue);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- fixedDatumID = VariableRecordType.unmarshalEnum(dis);
- uPosition += fixedDatumID.getMarshalledSize();
- fixedDatumValue = dis.readInt();
- uPosition += 4;
+ {
+ fixedDatumID = VariableRecordType.unmarshalEnum(dis);
+ uPosition += fixedDatumID.getMarshalledSize();
+ fixedDatumValue = dis.readInt();
+ uPosition += 4;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- fixedDatumID.marshal(buff);
- buff.putInt( (int)fixedDatumValue);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- fixedDatumID = VariableRecordType.unmarshalEnum(buff);
- fixedDatumValue = buff.getInt();
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ fixedDatumID.marshal(buff);
+ buff.putInt( (int)fixedDatumValue);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ fixedDatumID = VariableRecordType.unmarshalEnum(buff);
+ fixedDatumValue = buff.getInt();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final FixedDatum rhs = (FixedDatum)obj;
-
- if( ! (fixedDatumID == rhs.fixedDatumID)) ivarsEqual = false;
- if( ! (fixedDatumValue == rhs.fixedDatumValue)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final FixedDatum rhs = (FixedDatum)obj;
+
+ if( ! (fixedDatumID == rhs.fixedDatumID)) ivarsEqual = false;
+ if( ! (fixedDatumValue == rhs.fixedDatumValue)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" fixedDatumID: ").append(fixedDatumID).append("\n");
- sb.append(" fixedDatumValue: ").append(fixedDatumValue).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" fixedDatumID: ").append(fixedDatumID).append("\n");
+ sb.append(" fixedDatumValue: ").append(fixedDatumValue).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/FundamentalOperationalData.java b/src-generated/edu/nps/moves/dis7/FundamentalOperationalData.java
index be7bacce99d84e3950915e951c3a152edbf8ad32..c1696abefd42e984aa153b70a0be73530046a91d 100644
--- a/src-generated/edu/nps/moves/dis7/FundamentalOperationalData.java
+++ b/src-generated/edu/nps/moves/dis7/FundamentalOperationalData.java
@@ -1,378 +1,378 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Basic operational data for IFF. Section 6.2.39
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class FundamentalOperationalData extends Object implements Serializable
-{
- /** system status, IEEE DIS 7 defined */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Basic operational data for IFF. Section 6.2.39
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class FundamentalOperationalData extends Object implements Serializable
+{
+ /** system status, IEEE DIS 7 defined */
protected byte systemStatus;
-
- /** data field 1 */
+
+ /** data field 1 */
protected byte dataField1;
-
- /** eight boolean fields */
+
+ /** eight boolean fields */
protected byte informationLayers;
-
- /** enumeration */
+
+ /** enumeration */
protected byte dataField2;
-
- /** parameter, enumeration */
+
+ /** parameter, enumeration */
protected short parameter1;
-
- /** parameter, enumeration */
+
+ /** parameter, enumeration */
protected short parameter2;
-
- /** parameter, enumeration */
+
+ /** parameter, enumeration */
protected short parameter3;
-
- /** parameter, enumeration */
+
+ /** parameter, enumeration */
protected short parameter4;
-
- /** parameter, enumeration */
+
+ /** parameter, enumeration */
protected short parameter5;
-
- /** parameter, enumeration */
+
+ /** parameter, enumeration */
protected short parameter6;
-
-
-/** Constructor */
- public FundamentalOperationalData()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public FundamentalOperationalData()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 1; // systemStatus
+ marshalSize += 1; // dataField1
+ marshalSize += 1; // informationLayers
+ marshalSize += 1; // dataField2
+ marshalSize += 2; // parameter1
+ marshalSize += 2; // parameter2
+ marshalSize += 2; // parameter3
+ marshalSize += 2; // parameter4
+ marshalSize += 2; // parameter5
+ marshalSize += 2; // parameter6
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link FundamentalOperationalData#systemStatus}*/
+public FundamentalOperationalData setSystemStatus(byte pSystemStatus)
{
- int marshalSize = 0;
-
- marshalSize += 1; // systemStatus
- marshalSize += 1; // dataField1
- marshalSize += 1; // informationLayers
- marshalSize += 1; // dataField2
- marshalSize += 2; // parameter1
- marshalSize += 2; // parameter2
- marshalSize += 2; // parameter3
- marshalSize += 2; // parameter4
- marshalSize += 2; // parameter5
- marshalSize += 2; // parameter6
-
- return marshalSize;
-}
-
-
-/** Setter for {@link FundamentalOperationalData#systemStatus}*/
-public FundamentalOperationalData setSystemStatus(byte pSystemStatus)
-{
- systemStatus = pSystemStatus;
- return this;
-}
-
-/** Getter for {@link FundamentalOperationalData#systemStatus}*/
-public byte getSystemStatus()
+ systemStatus = pSystemStatus;
+ return this;
+}
+
+/** Getter for {@link FundamentalOperationalData#systemStatus}*/
+public byte getSystemStatus()
{
return systemStatus;
-}
-
-/** Setter for {@link FundamentalOperationalData#dataField1}*/
-public FundamentalOperationalData setDataField1(byte pDataField1)
+}
+
+/** Setter for {@link FundamentalOperationalData#dataField1}*/
+public FundamentalOperationalData setDataField1(byte pDataField1)
{
- dataField1 = pDataField1;
- return this;
-}
-
-/** Getter for {@link FundamentalOperationalData#dataField1}*/
-public byte getDataField1()
+ dataField1 = pDataField1;
+ return this;
+}
+
+/** Getter for {@link FundamentalOperationalData#dataField1}*/
+public byte getDataField1()
{
return dataField1;
-}
-
-/** Setter for {@link FundamentalOperationalData#informationLayers}*/
-public FundamentalOperationalData setInformationLayers(byte pInformationLayers)
+}
+
+/** Setter for {@link FundamentalOperationalData#informationLayers}*/
+public FundamentalOperationalData setInformationLayers(byte pInformationLayers)
{
- informationLayers = pInformationLayers;
- return this;
-}
-
-/** Getter for {@link FundamentalOperationalData#informationLayers}*/
-public byte getInformationLayers()
+ informationLayers = pInformationLayers;
+ return this;
+}
+
+/** Getter for {@link FundamentalOperationalData#informationLayers}*/
+public byte getInformationLayers()
{
return informationLayers;
-}
-
-/** Setter for {@link FundamentalOperationalData#dataField2}*/
-public FundamentalOperationalData setDataField2(byte pDataField2)
+}
+
+/** Setter for {@link FundamentalOperationalData#dataField2}*/
+public FundamentalOperationalData setDataField2(byte pDataField2)
{
- dataField2 = pDataField2;
- return this;
-}
-
-/** Getter for {@link FundamentalOperationalData#dataField2}*/
-public byte getDataField2()
+ dataField2 = pDataField2;
+ return this;
+}
+
+/** Getter for {@link FundamentalOperationalData#dataField2}*/
+public byte getDataField2()
{
return dataField2;
-}
-
-/** Setter for {@link FundamentalOperationalData#parameter1}*/
-public FundamentalOperationalData setParameter1(short pParameter1)
+}
+
+/** Setter for {@link FundamentalOperationalData#parameter1}*/
+public FundamentalOperationalData setParameter1(short pParameter1)
{
- parameter1 = pParameter1;
- return this;
-}
-
-/** Getter for {@link FundamentalOperationalData#parameter1}*/
-public short getParameter1()
+ parameter1 = pParameter1;
+ return this;
+}
+
+/** Getter for {@link FundamentalOperationalData#parameter1}*/
+public short getParameter1()
{
return parameter1;
-}
-
-/** Setter for {@link FundamentalOperationalData#parameter2}*/
-public FundamentalOperationalData setParameter2(short pParameter2)
+}
+
+/** Setter for {@link FundamentalOperationalData#parameter2}*/
+public FundamentalOperationalData setParameter2(short pParameter2)
{
- parameter2 = pParameter2;
- return this;
-}
-
-/** Getter for {@link FundamentalOperationalData#parameter2}*/
-public short getParameter2()
+ parameter2 = pParameter2;
+ return this;
+}
+
+/** Getter for {@link FundamentalOperationalData#parameter2}*/
+public short getParameter2()
{
return parameter2;
-}
-
-/** Setter for {@link FundamentalOperationalData#parameter3}*/
-public FundamentalOperationalData setParameter3(short pParameter3)
+}
+
+/** Setter for {@link FundamentalOperationalData#parameter3}*/
+public FundamentalOperationalData setParameter3(short pParameter3)
{
- parameter3 = pParameter3;
- return this;
-}
-
-/** Getter for {@link FundamentalOperationalData#parameter3}*/
-public short getParameter3()
+ parameter3 = pParameter3;
+ return this;
+}
+
+/** Getter for {@link FundamentalOperationalData#parameter3}*/
+public short getParameter3()
{
return parameter3;
-}
-
-/** Setter for {@link FundamentalOperationalData#parameter4}*/
-public FundamentalOperationalData setParameter4(short pParameter4)
+}
+
+/** Setter for {@link FundamentalOperationalData#parameter4}*/
+public FundamentalOperationalData setParameter4(short pParameter4)
{
- parameter4 = pParameter4;
- return this;
-}
-
-/** Getter for {@link FundamentalOperationalData#parameter4}*/
-public short getParameter4()
+ parameter4 = pParameter4;
+ return this;
+}
+
+/** Getter for {@link FundamentalOperationalData#parameter4}*/
+public short getParameter4()
{
return parameter4;
-}
-
-/** Setter for {@link FundamentalOperationalData#parameter5}*/
-public FundamentalOperationalData setParameter5(short pParameter5)
+}
+
+/** Setter for {@link FundamentalOperationalData#parameter5}*/
+public FundamentalOperationalData setParameter5(short pParameter5)
{
- parameter5 = pParameter5;
- return this;
-}
-
-/** Getter for {@link FundamentalOperationalData#parameter5}*/
-public short getParameter5()
+ parameter5 = pParameter5;
+ return this;
+}
+
+/** Getter for {@link FundamentalOperationalData#parameter5}*/
+public short getParameter5()
{
return parameter5;
-}
-
-/** Setter for {@link FundamentalOperationalData#parameter6}*/
-public FundamentalOperationalData setParameter6(short pParameter6)
+}
+
+/** Setter for {@link FundamentalOperationalData#parameter6}*/
+public FundamentalOperationalData setParameter6(short pParameter6)
{
- parameter6 = pParameter6;
- return this;
-}
-
-/** Getter for {@link FundamentalOperationalData#parameter6}*/
-public short getParameter6()
+ parameter6 = pParameter6;
+ return this;
+}
+
+/** Getter for {@link FundamentalOperationalData#parameter6}*/
+public short getParameter6()
{
return parameter6;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeByte(systemStatus);
- dos.writeByte(dataField1);
- dos.writeByte(informationLayers);
- dos.writeByte(dataField2);
- dos.writeShort(parameter1);
- dos.writeShort(parameter2);
- dos.writeShort(parameter3);
- dos.writeShort(parameter4);
- dos.writeShort(parameter5);
- dos.writeShort(parameter6);
+ {
+ dos.writeByte(systemStatus);
+ dos.writeByte(dataField1);
+ dos.writeByte(informationLayers);
+ dos.writeByte(dataField2);
+ dos.writeShort(parameter1);
+ dos.writeShort(parameter2);
+ dos.writeShort(parameter3);
+ dos.writeShort(parameter4);
+ dos.writeShort(parameter5);
+ dos.writeShort(parameter6);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- systemStatus = (byte)dis.readUnsignedByte();
- uPosition += 1;
- dataField1 = (byte)dis.readUnsignedByte();
- uPosition += 1;
- informationLayers = (byte)dis.readUnsignedByte();
- uPosition += 1;
- dataField2 = (byte)dis.readUnsignedByte();
- uPosition += 1;
- parameter1 = (short)dis.readUnsignedShort();
- uPosition += 2;
- parameter2 = (short)dis.readUnsignedShort();
- uPosition += 2;
- parameter3 = (short)dis.readUnsignedShort();
- uPosition += 2;
- parameter4 = (short)dis.readUnsignedShort();
- uPosition += 2;
- parameter5 = (short)dis.readUnsignedShort();
- uPosition += 2;
- parameter6 = (short)dis.readUnsignedShort();
- uPosition += 2;
+ {
+ systemStatus = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ dataField1 = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ informationLayers = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ dataField2 = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ parameter1 = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ parameter2 = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ parameter3 = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ parameter4 = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ parameter5 = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ parameter6 = (short)dis.readUnsignedShort();
+ uPosition += 2;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.put( (byte)systemStatus);
- buff.put( (byte)dataField1);
- buff.put( (byte)informationLayers);
- buff.put( (byte)dataField2);
- buff.putShort( (short)parameter1);
- buff.putShort( (short)parameter2);
- buff.putShort( (short)parameter3);
- buff.putShort( (short)parameter4);
- buff.putShort( (short)parameter5);
- buff.putShort( (short)parameter6);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- systemStatus = (byte)(buff.get() & 0xFF);
- dataField1 = (byte)(buff.get() & 0xFF);
- informationLayers = (byte)(buff.get() & 0xFF);
- dataField2 = (byte)(buff.get() & 0xFF);
- parameter1 = (short)(buff.getShort() & 0xFFFF);
- parameter2 = (short)(buff.getShort() & 0xFFFF);
- parameter3 = (short)(buff.getShort() & 0xFFFF);
- parameter4 = (short)(buff.getShort() & 0xFFFF);
- parameter5 = (short)(buff.getShort() & 0xFFFF);
- parameter6 = (short)(buff.getShort() & 0xFFFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.put( (byte)systemStatus);
+ buff.put( (byte)dataField1);
+ buff.put( (byte)informationLayers);
+ buff.put( (byte)dataField2);
+ buff.putShort( (short)parameter1);
+ buff.putShort( (short)parameter2);
+ buff.putShort( (short)parameter3);
+ buff.putShort( (short)parameter4);
+ buff.putShort( (short)parameter5);
+ buff.putShort( (short)parameter6);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ systemStatus = (byte)(buff.get() & 0xFF);
+ dataField1 = (byte)(buff.get() & 0xFF);
+ informationLayers = (byte)(buff.get() & 0xFF);
+ dataField2 = (byte)(buff.get() & 0xFF);
+ parameter1 = (short)(buff.getShort() & 0xFFFF);
+ parameter2 = (short)(buff.getShort() & 0xFFFF);
+ parameter3 = (short)(buff.getShort() & 0xFFFF);
+ parameter4 = (short)(buff.getShort() & 0xFFFF);
+ parameter5 = (short)(buff.getShort() & 0xFFFF);
+ parameter6 = (short)(buff.getShort() & 0xFFFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final FundamentalOperationalData rhs = (FundamentalOperationalData)obj;
-
- if( ! (systemStatus == rhs.systemStatus)) ivarsEqual = false;
- if( ! (dataField1 == rhs.dataField1)) ivarsEqual = false;
- if( ! (informationLayers == rhs.informationLayers)) ivarsEqual = false;
- if( ! (dataField2 == rhs.dataField2)) ivarsEqual = false;
- if( ! (parameter1 == rhs.parameter1)) ivarsEqual = false;
- if( ! (parameter2 == rhs.parameter2)) ivarsEqual = false;
- if( ! (parameter3 == rhs.parameter3)) ivarsEqual = false;
- if( ! (parameter4 == rhs.parameter4)) ivarsEqual = false;
- if( ! (parameter5 == rhs.parameter5)) ivarsEqual = false;
- if( ! (parameter6 == rhs.parameter6)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final FundamentalOperationalData rhs = (FundamentalOperationalData)obj;
+
+ if( ! (systemStatus == rhs.systemStatus)) ivarsEqual = false;
+ if( ! (dataField1 == rhs.dataField1)) ivarsEqual = false;
+ if( ! (informationLayers == rhs.informationLayers)) ivarsEqual = false;
+ if( ! (dataField2 == rhs.dataField2)) ivarsEqual = false;
+ if( ! (parameter1 == rhs.parameter1)) ivarsEqual = false;
+ if( ! (parameter2 == rhs.parameter2)) ivarsEqual = false;
+ if( ! (parameter3 == rhs.parameter3)) ivarsEqual = false;
+ if( ! (parameter4 == rhs.parameter4)) ivarsEqual = false;
+ if( ! (parameter5 == rhs.parameter5)) ivarsEqual = false;
+ if( ! (parameter6 == rhs.parameter6)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" systemStatus: ").append(systemStatus).append("\n");
- sb.append(" dataField1: ").append(dataField1).append("\n");
- sb.append(" informationLayers: ").append(informationLayers).append("\n");
- sb.append(" dataField2: ").append(dataField2).append("\n");
- sb.append(" parameter1: ").append(parameter1).append("\n");
- sb.append(" parameter2: ").append(parameter2).append("\n");
- sb.append(" parameter3: ").append(parameter3).append("\n");
- sb.append(" parameter4: ").append(parameter4).append("\n");
- sb.append(" parameter5: ").append(parameter5).append("\n");
- sb.append(" parameter6: ").append(parameter6).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" systemStatus: ").append(systemStatus).append("\n");
+ sb.append(" dataField1: ").append(dataField1).append("\n");
+ sb.append(" informationLayers: ").append(informationLayers).append("\n");
+ sb.append(" dataField2: ").append(dataField2).append("\n");
+ sb.append(" parameter1: ").append(parameter1).append("\n");
+ sb.append(" parameter2: ").append(parameter2).append("\n");
+ sb.append(" parameter3: ").append(parameter3).append("\n");
+ sb.append(" parameter4: ").append(parameter4).append("\n");
+ sb.append(" parameter5: ").append(parameter5).append("\n");
+ sb.append(" parameter6: ").append(parameter6).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/GridAxisDescriptor.java b/src-generated/edu/nps/moves/dis7/GridAxisDescriptor.java
index 9e4ca460035a88a037af8bc21bf0a40b6a3718de..74c689ebdee2fbbe86f68a3cfd2bc3d19e4315be 100644
--- a/src-generated/edu/nps/moves/dis7/GridAxisDescriptor.java
+++ b/src-generated/edu/nps/moves/dis7/GridAxisDescriptor.java
@@ -1,257 +1,257 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class GridAxisDescriptor extends Object implements Serializable
-{
- /** coordinate of the grid origin or initial value */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class GridAxisDescriptor extends Object implements Serializable
+{
+ /** coordinate of the grid origin or initial value */
protected double domainInitialXi;
-
- /** coordinate of the endpoint or final value */
+
+ /** coordinate of the endpoint or final value */
protected double domainFinalXi;
-
- /** The number of grid points along the Xi domain axis for the enviornmental state data */
+
+ /** The number of grid points along the Xi domain axis for the enviornmental state data */
protected short domainPointsXi;
-
- /** interleaf factor along the domain axis. */
+
+ /** interleaf factor along the domain axis. */
protected byte interleafFactor;
-
- /** type of grid axis uid 377 */
+
+ /** type of grid axis uid 377 */
protected GridAxisDescriptorAxisType axisType = GridAxisDescriptorAxisType.values()[0];
-
-
-/** Constructor */
- public GridAxisDescriptor()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public GridAxisDescriptor()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 8; // domainInitialXi
+ marshalSize += 8; // domainFinalXi
+ marshalSize += 2; // domainPointsXi
+ marshalSize += 1; // interleafFactor
+ marshalSize += axisType.getMarshalledSize();
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link GridAxisDescriptor#domainInitialXi}*/
+public GridAxisDescriptor setDomainInitialXi(double pDomainInitialXi)
{
- int marshalSize = 0;
-
- marshalSize += 8; // domainInitialXi
- marshalSize += 8; // domainFinalXi
- marshalSize += 2; // domainPointsXi
- marshalSize += 1; // interleafFactor
- marshalSize += axisType.getMarshalledSize();
-
- return marshalSize;
-}
-
-
-/** Setter for {@link GridAxisDescriptor#domainInitialXi}*/
-public GridAxisDescriptor setDomainInitialXi(double pDomainInitialXi)
-{
- domainInitialXi = pDomainInitialXi;
- return this;
-}
-
-/** Getter for {@link GridAxisDescriptor#domainInitialXi}*/
-public double getDomainInitialXi()
+ domainInitialXi = pDomainInitialXi;
+ return this;
+}
+
+/** Getter for {@link GridAxisDescriptor#domainInitialXi}*/
+public double getDomainInitialXi()
{
return domainInitialXi;
-}
-
-/** Setter for {@link GridAxisDescriptor#domainFinalXi}*/
-public GridAxisDescriptor setDomainFinalXi(double pDomainFinalXi)
+}
+
+/** Setter for {@link GridAxisDescriptor#domainFinalXi}*/
+public GridAxisDescriptor setDomainFinalXi(double pDomainFinalXi)
{
- domainFinalXi = pDomainFinalXi;
- return this;
-}
-
-/** Getter for {@link GridAxisDescriptor#domainFinalXi}*/
-public double getDomainFinalXi()
+ domainFinalXi = pDomainFinalXi;
+ return this;
+}
+
+/** Getter for {@link GridAxisDescriptor#domainFinalXi}*/
+public double getDomainFinalXi()
{
return domainFinalXi;
-}
-
-/** Setter for {@link GridAxisDescriptor#domainPointsXi}*/
-public GridAxisDescriptor setDomainPointsXi(short pDomainPointsXi)
+}
+
+/** Setter for {@link GridAxisDescriptor#domainPointsXi}*/
+public GridAxisDescriptor setDomainPointsXi(short pDomainPointsXi)
{
- domainPointsXi = pDomainPointsXi;
- return this;
-}
-
-/** Getter for {@link GridAxisDescriptor#domainPointsXi}*/
-public short getDomainPointsXi()
+ domainPointsXi = pDomainPointsXi;
+ return this;
+}
+
+/** Getter for {@link GridAxisDescriptor#domainPointsXi}*/
+public short getDomainPointsXi()
{
return domainPointsXi;
-}
-
-/** Setter for {@link GridAxisDescriptor#interleafFactor}*/
-public GridAxisDescriptor setInterleafFactor(byte pInterleafFactor)
+}
+
+/** Setter for {@link GridAxisDescriptor#interleafFactor}*/
+public GridAxisDescriptor setInterleafFactor(byte pInterleafFactor)
{
- interleafFactor = pInterleafFactor;
- return this;
-}
-
-/** Getter for {@link GridAxisDescriptor#interleafFactor}*/
-public byte getInterleafFactor()
+ interleafFactor = pInterleafFactor;
+ return this;
+}
+
+/** Getter for {@link GridAxisDescriptor#interleafFactor}*/
+public byte getInterleafFactor()
{
return interleafFactor;
-}
-
-/** Setter for {@link GridAxisDescriptor#axisType}*/
-public GridAxisDescriptor setAxisType(GridAxisDescriptorAxisType pAxisType)
+}
+
+/** Setter for {@link GridAxisDescriptor#axisType}*/
+public GridAxisDescriptor setAxisType(GridAxisDescriptorAxisType pAxisType)
{
- axisType = pAxisType;
- return this;
-}
-
-/** Getter for {@link GridAxisDescriptor#axisType}*/
-public GridAxisDescriptorAxisType getAxisType()
+ axisType = pAxisType;
+ return this;
+}
+
+/** Getter for {@link GridAxisDescriptor#axisType}*/
+public GridAxisDescriptorAxisType getAxisType()
{
return axisType;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeDouble(domainInitialXi);
- dos.writeDouble(domainFinalXi);
- dos.writeShort(domainPointsXi);
- dos.writeByte(interleafFactor);
- axisType.marshal(dos);
+ {
+ dos.writeDouble(domainInitialXi);
+ dos.writeDouble(domainFinalXi);
+ dos.writeShort(domainPointsXi);
+ dos.writeByte(interleafFactor);
+ axisType.marshal(dos);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- domainInitialXi = dis.readDouble();
- uPosition += 4;
- domainFinalXi = dis.readDouble();
- uPosition += 4;
- domainPointsXi = (short)dis.readUnsignedShort();
- uPosition += 2;
- interleafFactor = (byte)dis.readUnsignedByte();
- uPosition += 1;
- axisType = GridAxisDescriptorAxisType.unmarshalEnum(dis);
- uPosition += axisType.getMarshalledSize();
+ {
+ domainInitialXi = dis.readDouble();
+ uPosition += 4;
+ domainFinalXi = dis.readDouble();
+ uPosition += 4;
+ domainPointsXi = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ interleafFactor = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ axisType = GridAxisDescriptorAxisType.unmarshalEnum(dis);
+ uPosition += axisType.getMarshalledSize();
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putDouble( (double)domainInitialXi);
- buff.putDouble( (double)domainFinalXi);
- buff.putShort( (short)domainPointsXi);
- buff.put( (byte)interleafFactor);
- axisType.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- domainInitialXi = buff.getDouble();
- domainFinalXi = buff.getDouble();
- domainPointsXi = (short)(buff.getShort() & 0xFFFF);
- interleafFactor = (byte)(buff.get() & 0xFF);
- axisType = GridAxisDescriptorAxisType.unmarshalEnum(buff);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putDouble( (double)domainInitialXi);
+ buff.putDouble( (double)domainFinalXi);
+ buff.putShort( (short)domainPointsXi);
+ buff.put( (byte)interleafFactor);
+ axisType.marshal(buff);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ domainInitialXi = buff.getDouble();
+ domainFinalXi = buff.getDouble();
+ domainPointsXi = (short)(buff.getShort() & 0xFFFF);
+ interleafFactor = (byte)(buff.get() & 0xFF);
+ axisType = GridAxisDescriptorAxisType.unmarshalEnum(buff);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final GridAxisDescriptor rhs = (GridAxisDescriptor)obj;
-
- if( ! (domainInitialXi == rhs.domainInitialXi)) ivarsEqual = false;
- if( ! (domainFinalXi == rhs.domainFinalXi)) ivarsEqual = false;
- if( ! (domainPointsXi == rhs.domainPointsXi)) ivarsEqual = false;
- if( ! (interleafFactor == rhs.interleafFactor)) ivarsEqual = false;
- if( ! (axisType == rhs.axisType)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final GridAxisDescriptor rhs = (GridAxisDescriptor)obj;
+
+ if( ! (domainInitialXi == rhs.domainInitialXi)) ivarsEqual = false;
+ if( ! (domainFinalXi == rhs.domainFinalXi)) ivarsEqual = false;
+ if( ! (domainPointsXi == rhs.domainPointsXi)) ivarsEqual = false;
+ if( ! (interleafFactor == rhs.interleafFactor)) ivarsEqual = false;
+ if( ! (axisType == rhs.axisType)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" domainInitialXi: ").append(domainInitialXi).append("\n");
- sb.append(" domainFinalXi: ").append(domainFinalXi).append("\n");
- sb.append(" domainPointsXi: ").append(domainPointsXi).append("\n");
- sb.append(" interleafFactor: ").append(interleafFactor).append("\n");
- sb.append(" axisType: ").append(axisType).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" domainInitialXi: ").append(domainInitialXi).append("\n");
+ sb.append(" domainFinalXi: ").append(domainFinalXi).append("\n");
+ sb.append(" domainPointsXi: ").append(domainPointsXi).append("\n");
+ sb.append(" interleafFactor: ").append(interleafFactor).append("\n");
+ sb.append(" axisType: ").append(axisType).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/GridAxisDescriptorFixed.java b/src-generated/edu/nps/moves/dis7/GridAxisDescriptorFixed.java
index 28237aeda533ea46dacc8fc7be847710869e4938..2f7d606f2ba755ed218edfa4059070c10206075e 100644
--- a/src-generated/edu/nps/moves/dis7/GridAxisDescriptorFixed.java
+++ b/src-generated/edu/nps/moves/dis7/GridAxisDescriptorFixed.java
@@ -1,188 +1,188 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Grid axis record for fixed data. Section 6.2.41
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class GridAxisDescriptorFixed extends GridAxisDescriptor implements Serializable
-{
- /** Number of grid locations along Xi axis */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Grid axis record for fixed data. Section 6.2.41
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class GridAxisDescriptorFixed extends GridAxisDescriptor implements Serializable
+{
+ /** Number of grid locations along Xi axis */
protected short numberOfPointsOnXiAxis;
-
- /** initial grid point for the current pdu */
+
+ /** initial grid point for the current pdu */
protected short initialIndex;
-
-
-/** Constructor */
- public GridAxisDescriptorFixed()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += 2; // numberOfPointsOnXiAxis
- marshalSize += 2; // initialIndex
-
- return marshalSize;
-}
-
-
-/** Setter for {@link GridAxisDescriptorFixed#numberOfPointsOnXiAxis}*/
-public GridAxisDescriptorFixed setNumberOfPointsOnXiAxis(short pNumberOfPointsOnXiAxis)
+
+
+/** Constructor */
+ public GridAxisDescriptorFixed()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += 2; // numberOfPointsOnXiAxis
+ marshalSize += 2; // initialIndex
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link GridAxisDescriptorFixed#numberOfPointsOnXiAxis}*/
+public GridAxisDescriptorFixed setNumberOfPointsOnXiAxis(short pNumberOfPointsOnXiAxis)
{
- numberOfPointsOnXiAxis = pNumberOfPointsOnXiAxis;
- return this;
-}
-
-/** Getter for {@link GridAxisDescriptorFixed#numberOfPointsOnXiAxis}*/
-public short getNumberOfPointsOnXiAxis()
+ numberOfPointsOnXiAxis = pNumberOfPointsOnXiAxis;
+ return this;
+}
+
+/** Getter for {@link GridAxisDescriptorFixed#numberOfPointsOnXiAxis}*/
+public short getNumberOfPointsOnXiAxis()
{
return numberOfPointsOnXiAxis;
-}
-
-/** Setter for {@link GridAxisDescriptorFixed#initialIndex}*/
-public GridAxisDescriptorFixed setInitialIndex(short pInitialIndex)
+}
+
+/** Setter for {@link GridAxisDescriptorFixed#initialIndex}*/
+public GridAxisDescriptorFixed setInitialIndex(short pInitialIndex)
{
- initialIndex = pInitialIndex;
- return this;
-}
-
-/** Getter for {@link GridAxisDescriptorFixed#initialIndex}*/
-public short getInitialIndex()
+ initialIndex = pInitialIndex;
+ return this;
+}
+
+/** Getter for {@link GridAxisDescriptorFixed#initialIndex}*/
+public short getInitialIndex()
{
return initialIndex;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- dos.writeShort(numberOfPointsOnXiAxis);
- dos.writeShort(initialIndex);
+ {
+ dos.writeShort(numberOfPointsOnXiAxis);
+ dos.writeShort(initialIndex);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- numberOfPointsOnXiAxis = (short)dis.readUnsignedShort();
- uPosition += 2;
- initialIndex = (short)dis.readUnsignedShort();
- uPosition += 2;
+ {
+ numberOfPointsOnXiAxis = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ initialIndex = (short)dis.readUnsignedShort();
+ uPosition += 2;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- buff.putShort( (short)numberOfPointsOnXiAxis);
- buff.putShort( (short)initialIndex);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ buff.putShort( (short)numberOfPointsOnXiAxis);
+ buff.putShort( (short)initialIndex);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- numberOfPointsOnXiAxis = (short)(buff.getShort() & 0xFFFF);
- initialIndex = (short)(buff.getShort() & 0xFFFF);
- return getMarshalledSize();
+
+ numberOfPointsOnXiAxis = (short)(buff.getShort() & 0xFFFF);
+ initialIndex = (short)(buff.getShort() & 0xFFFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final GridAxisDescriptorFixed rhs = (GridAxisDescriptorFixed)obj;
-
- if( ! (numberOfPointsOnXiAxis == rhs.numberOfPointsOnXiAxis)) ivarsEqual = false;
- if( ! (initialIndex == rhs.initialIndex)) ivarsEqual = false;
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final GridAxisDescriptorFixed rhs = (GridAxisDescriptorFixed)obj;
+
+ if( ! (numberOfPointsOnXiAxis == rhs.numberOfPointsOnXiAxis)) ivarsEqual = false;
+ if( ! (initialIndex == rhs.initialIndex)) ivarsEqual = false;
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" numberOfPointsOnXiAxis: ").append(numberOfPointsOnXiAxis).append("\n");
- sb.append(" initialIndex: ").append(initialIndex).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" numberOfPointsOnXiAxis: ").append(numberOfPointsOnXiAxis).append("\n");
+ sb.append(" initialIndex: ").append(initialIndex).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/GridAxisDescriptorVariable.java b/src-generated/edu/nps/moves/dis7/GridAxisDescriptorVariable.java
index 85baa2bae18543b7d77a4c7dff8e5d458024b838..96a8dc729344de7794a0a81ab530fca6121db1b7 100644
--- a/src-generated/edu/nps/moves/dis7/GridAxisDescriptorVariable.java
+++ b/src-generated/edu/nps/moves/dis7/GridAxisDescriptorVariable.java
@@ -1,283 +1,283 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Grid axis descriptor fo variable spacing axis data.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class GridAxisDescriptorVariable extends GridAxisDescriptor implements Serializable
-{
- /** Number of grid locations along Xi axis */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Grid axis descriptor fo variable spacing axis data.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class GridAxisDescriptorVariable extends GridAxisDescriptor implements Serializable
+{
+ /** Number of grid locations along Xi axis */
protected short numberOfPointsOnXiAxis;
-
- /** initial grid point for the current pdu */
+
+ /** initial grid point for the current pdu */
protected short initialIndex;
-
- /** value that linearly scales the coordinates of the grid locations for the xi axis */
+
+ /** value that linearly scales the coordinates of the grid locations for the xi axis */
protected double coordinateScaleXi;
-
- /** The constant offset value that shall be applied to the grid locations for the xi axis */
+
+ /** The constant offset value that shall be applied to the grid locations for the xi axis */
protected double coordinateOffsetXi = (double)0.0;
-
- /** list of coordinates */
+
+ /** list of coordinates */
protected short[] xiValues = new short[0];
-
+
private byte[] padding = new byte[0]; // pad to 64-bit boundary
-
-
-/** Constructor */
- public GridAxisDescriptorVariable()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public GridAxisDescriptorVariable()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += 2; // numberOfPointsOnXiAxis
+ marshalSize += 2; // initialIndex
+ marshalSize += 8; // coordinateScaleXi
+ marshalSize += 8; // coordinateOffsetXi
+ marshalSize += xiValues.length * 2;
+ marshalSize += padding.length;
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link GridAxisDescriptorVariable#numberOfPointsOnXiAxis}*/
+public GridAxisDescriptorVariable setNumberOfPointsOnXiAxis(short pNumberOfPointsOnXiAxis)
{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += 2; // numberOfPointsOnXiAxis
- marshalSize += 2; // initialIndex
- marshalSize += 8; // coordinateScaleXi
- marshalSize += 8; // coordinateOffsetXi
- marshalSize += xiValues.length * 2;
- marshalSize += padding.length;
-
- return marshalSize;
-}
-
-
-/** Setter for {@link GridAxisDescriptorVariable#numberOfPointsOnXiAxis}*/
-public GridAxisDescriptorVariable setNumberOfPointsOnXiAxis(short pNumberOfPointsOnXiAxis)
-{
- numberOfPointsOnXiAxis = pNumberOfPointsOnXiAxis;
- return this;
-}
-
-/** Getter for {@link GridAxisDescriptorVariable#numberOfPointsOnXiAxis}*/
-public short getNumberOfPointsOnXiAxis()
+ numberOfPointsOnXiAxis = pNumberOfPointsOnXiAxis;
+ return this;
+}
+
+/** Getter for {@link GridAxisDescriptorVariable#numberOfPointsOnXiAxis}*/
+public short getNumberOfPointsOnXiAxis()
{
return numberOfPointsOnXiAxis;
-}
-
-/** Setter for {@link GridAxisDescriptorVariable#initialIndex}*/
-public GridAxisDescriptorVariable setInitialIndex(short pInitialIndex)
+}
+
+/** Setter for {@link GridAxisDescriptorVariable#initialIndex}*/
+public GridAxisDescriptorVariable setInitialIndex(short pInitialIndex)
{
- initialIndex = pInitialIndex;
- return this;
-}
-
-/** Getter for {@link GridAxisDescriptorVariable#initialIndex}*/
-public short getInitialIndex()
+ initialIndex = pInitialIndex;
+ return this;
+}
+
+/** Getter for {@link GridAxisDescriptorVariable#initialIndex}*/
+public short getInitialIndex()
{
return initialIndex;
-}
-
-/** Setter for {@link GridAxisDescriptorVariable#coordinateScaleXi}*/
-public GridAxisDescriptorVariable setCoordinateScaleXi(double pCoordinateScaleXi)
+}
+
+/** Setter for {@link GridAxisDescriptorVariable#coordinateScaleXi}*/
+public GridAxisDescriptorVariable setCoordinateScaleXi(double pCoordinateScaleXi)
{
- coordinateScaleXi = pCoordinateScaleXi;
- return this;
-}
-
-/** Getter for {@link GridAxisDescriptorVariable#coordinateScaleXi}*/
-public double getCoordinateScaleXi()
+ coordinateScaleXi = pCoordinateScaleXi;
+ return this;
+}
+
+/** Getter for {@link GridAxisDescriptorVariable#coordinateScaleXi}*/
+public double getCoordinateScaleXi()
{
return coordinateScaleXi;
-}
-
-/** Setter for {@link GridAxisDescriptorVariable#coordinateOffsetXi}*/
-public GridAxisDescriptorVariable setCoordinateOffsetXi(double pCoordinateOffsetXi)
+}
+
+/** Setter for {@link GridAxisDescriptorVariable#coordinateOffsetXi}*/
+public GridAxisDescriptorVariable setCoordinateOffsetXi(double pCoordinateOffsetXi)
{
- coordinateOffsetXi = pCoordinateOffsetXi;
- return this;
-}
-
-/** Getter for {@link GridAxisDescriptorVariable#coordinateOffsetXi}*/
-public double getCoordinateOffsetXi()
+ coordinateOffsetXi = pCoordinateOffsetXi;
+ return this;
+}
+
+/** Getter for {@link GridAxisDescriptorVariable#coordinateOffsetXi}*/
+public double getCoordinateOffsetXi()
{
return coordinateOffsetXi;
-}
-
-/** Setter for {@link GridAxisDescriptorVariable#xiValues}*/
-public GridAxisDescriptorVariable setXiValues(short[] pXiValues)
+}
+
+/** Setter for {@link GridAxisDescriptorVariable#xiValues}*/
+public GridAxisDescriptorVariable setXiValues(short[] pXiValues)
{
- xiValues = pXiValues;
- return this;
-}
-
-/** Getter for {@link GridAxisDescriptorVariable#xiValues}*/
-public short[] getXiValues()
+ xiValues = pXiValues;
+ return this;
+}
+
+/** Getter for {@link GridAxisDescriptorVariable#xiValues}*/
+public short[] getXiValues()
{
return xiValues;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- dos.writeShort(numberOfPointsOnXiAxis);
- dos.writeShort(initialIndex);
- dos.writeDouble(coordinateScaleXi);
- dos.writeDouble(coordinateOffsetXi);
-
- for(int idx = 0; idx < xiValues.length; idx++)
- dos.writeShort(xiValues[idx]);
-
- padding = new byte[Align.to64bits(dos)];
+ {
+ dos.writeShort(numberOfPointsOnXiAxis);
+ dos.writeShort(initialIndex);
+ dos.writeDouble(coordinateScaleXi);
+ dos.writeDouble(coordinateOffsetXi);
+
+ for(int idx = 0; idx < xiValues.length; idx++)
+ dos.writeShort(xiValues[idx]);
+
+ padding = new byte[Align.to64bits(dos)];
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- numberOfPointsOnXiAxis = (short)dis.readUnsignedShort();
- uPosition += 2;
- initialIndex = (short)dis.readUnsignedShort();
- uPosition += 2;
- coordinateScaleXi = dis.readDouble();
- uPosition += 4;
- coordinateOffsetXi = dis.readDouble();
- uPosition += 4;
- for(int idx = 0; idx < xiValues.length; idx++)
- xiValues[idx] = dis.readShort();
- uPosition += (xiValues.length * 2);
- padding = new byte[Align.from64bits(uPosition,dis)];
- uPosition += padding.length;
+ {
+ numberOfPointsOnXiAxis = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ initialIndex = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ coordinateScaleXi = dis.readDouble();
+ uPosition += 4;
+ coordinateOffsetXi = dis.readDouble();
+ uPosition += 4;
+ for(int idx = 0; idx < xiValues.length; idx++)
+ xiValues[idx] = dis.readShort();
+ uPosition += (xiValues.length * 2);
+ padding = new byte[Align.from64bits(uPosition,dis)];
+ uPosition += padding.length;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- buff.putShort( (short)numberOfPointsOnXiAxis);
- buff.putShort( (short)initialIndex);
- buff.putDouble( (double)coordinateScaleXi);
- buff.putDouble( (double)coordinateOffsetXi);
-
- for(int idx = 0; idx < xiValues.length; idx++)
- buff.putShort((short)xiValues[idx]);
-
- padding = new byte[Align.to64bits(buff)];
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ buff.putShort( (short)numberOfPointsOnXiAxis);
+ buff.putShort( (short)initialIndex);
+ buff.putDouble( (double)coordinateScaleXi);
+ buff.putDouble( (double)coordinateOffsetXi);
+
+ for(int idx = 0; idx < xiValues.length; idx++)
+ buff.putShort((short)xiValues[idx]);
+
+ padding = new byte[Align.to64bits(buff)];
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- numberOfPointsOnXiAxis = (short)(buff.getShort() & 0xFFFF);
- initialIndex = (short)(buff.getShort() & 0xFFFF);
- coordinateScaleXi = buff.getDouble();
- coordinateOffsetXi = buff.getDouble();
- for(int idx = 0; idx < xiValues.length; idx++)
- xiValues[idx] = buff.getShort();
- padding = new byte[Align.from64bits(buff)];
- return getMarshalledSize();
+
+ numberOfPointsOnXiAxis = (short)(buff.getShort() & 0xFFFF);
+ initialIndex = (short)(buff.getShort() & 0xFFFF);
+ coordinateScaleXi = buff.getDouble();
+ coordinateOffsetXi = buff.getDouble();
+ for(int idx = 0; idx < xiValues.length; idx++)
+ xiValues[idx] = buff.getShort();
+ padding = new byte[Align.from64bits(buff)];
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final GridAxisDescriptorVariable rhs = (GridAxisDescriptorVariable)obj;
-
- if( ! (numberOfPointsOnXiAxis == rhs.numberOfPointsOnXiAxis)) ivarsEqual = false;
- if( ! (initialIndex == rhs.initialIndex)) ivarsEqual = false;
- if( ! (coordinateScaleXi == rhs.coordinateScaleXi)) ivarsEqual = false;
- if( ! (coordinateOffsetXi == rhs.coordinateOffsetXi)) ivarsEqual = false;
-
- for(int idx = 0; idx < 0; idx++)
- {
- if(!(xiValues[idx] == rhs.xiValues[idx])) ivarsEqual = false;
- }
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final GridAxisDescriptorVariable rhs = (GridAxisDescriptorVariable)obj;
+
+ if( ! (numberOfPointsOnXiAxis == rhs.numberOfPointsOnXiAxis)) ivarsEqual = false;
+ if( ! (initialIndex == rhs.initialIndex)) ivarsEqual = false;
+ if( ! (coordinateScaleXi == rhs.coordinateScaleXi)) ivarsEqual = false;
+ if( ! (coordinateOffsetXi == rhs.coordinateOffsetXi)) ivarsEqual = false;
+
+ for(int idx = 0; idx < 0; idx++)
+ {
+ if(!(xiValues[idx] == rhs.xiValues[idx])) ivarsEqual = false;
+ }
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" numberOfPointsOnXiAxis: ").append(numberOfPointsOnXiAxis).append("\n");
- sb.append(" initialIndex: ").append(initialIndex).append("\n");
- sb.append(" coordinateScaleXi: ").append(coordinateScaleXi).append("\n");
- sb.append(" coordinateOffsetXi: ").append(coordinateOffsetXi).append("\n");
- sb.append(" xiValues: ").append("\n");
- sb.append(Arrays.toString(xiValues)).append("\n");
- sb.append(" padding: ").append(padding).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" numberOfPointsOnXiAxis: ").append(numberOfPointsOnXiAxis).append("\n");
+ sb.append(" initialIndex: ").append(initialIndex).append("\n");
+ sb.append(" coordinateScaleXi: ").append(coordinateScaleXi).append("\n");
+ sb.append(" coordinateOffsetXi: ").append(coordinateOffsetXi).append("\n");
+ sb.append(" xiValues: ").append("\n");
+ sb.append(Arrays.toString(xiValues)).append("\n");
+ sb.append(" padding: ").append(padding).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/GridData.java b/src-generated/edu/nps/moves/dis7/GridData.java
index 9700cd83fec4c230949052bc5a4eab1c6875dca0..376320048d3cb376526d722a0685c9daed3402d1 100644
--- a/src-generated/edu/nps/moves/dis7/GridData.java
+++ b/src-generated/edu/nps/moves/dis7/GridData.java
@@ -1,186 +1,186 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 6.2.41, table 68
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class GridData extends Object implements Serializable
-{
- /** uid 246 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 6.2.41, table 68
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class GridData extends Object implements Serializable
+{
+ /** uid 246 */
protected GriddedDataSampleType sampleType = GriddedDataSampleType.values()[0];
-
- /** uid 247 */
+
+ /** uid 247 */
protected GriddedDataDataRepresentation dataRepresentation = GriddedDataDataRepresentation.values()[0];
-
-
-/** Constructor */
- public GridData()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += sampleType.getMarshalledSize();
- marshalSize += dataRepresentation.getMarshalledSize();
-
- return marshalSize;
-}
-
-
-/** Setter for {@link GridData#sampleType}*/
-public GridData setSampleType(GriddedDataSampleType pSampleType)
+
+
+/** Constructor */
+ public GridData()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += sampleType.getMarshalledSize();
+ marshalSize += dataRepresentation.getMarshalledSize();
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link GridData#sampleType}*/
+public GridData setSampleType(GriddedDataSampleType pSampleType)
{
- sampleType = pSampleType;
- return this;
-}
-
-/** Getter for {@link GridData#sampleType}*/
-public GriddedDataSampleType getSampleType()
+ sampleType = pSampleType;
+ return this;
+}
+
+/** Getter for {@link GridData#sampleType}*/
+public GriddedDataSampleType getSampleType()
{
return sampleType;
-}
-
-/** Setter for {@link GridData#dataRepresentation}*/
-public GridData setDataRepresentation(GriddedDataDataRepresentation pDataRepresentation)
+}
+
+/** Setter for {@link GridData#dataRepresentation}*/
+public GridData setDataRepresentation(GriddedDataDataRepresentation pDataRepresentation)
{
- dataRepresentation = pDataRepresentation;
- return this;
-}
-
-/** Getter for {@link GridData#dataRepresentation}*/
-public GriddedDataDataRepresentation getDataRepresentation()
+ dataRepresentation = pDataRepresentation;
+ return this;
+}
+
+/** Getter for {@link GridData#dataRepresentation}*/
+public GriddedDataDataRepresentation getDataRepresentation()
{
return dataRepresentation;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- sampleType.marshal(dos);
- dataRepresentation.marshal(dos);
+ {
+ sampleType.marshal(dos);
+ dataRepresentation.marshal(dos);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- sampleType = GriddedDataSampleType.unmarshalEnum(dis);
- uPosition += sampleType.getMarshalledSize();
- dataRepresentation = GriddedDataDataRepresentation.unmarshalEnum(dis);
- uPosition += dataRepresentation.getMarshalledSize();
+ {
+ sampleType = GriddedDataSampleType.unmarshalEnum(dis);
+ uPosition += sampleType.getMarshalledSize();
+ dataRepresentation = GriddedDataDataRepresentation.unmarshalEnum(dis);
+ uPosition += dataRepresentation.getMarshalledSize();
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- sampleType.marshal(buff);
- dataRepresentation.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- sampleType = GriddedDataSampleType.unmarshalEnum(buff);
- dataRepresentation = GriddedDataDataRepresentation.unmarshalEnum(buff);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ sampleType.marshal(buff);
+ dataRepresentation.marshal(buff);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ sampleType = GriddedDataSampleType.unmarshalEnum(buff);
+ dataRepresentation = GriddedDataDataRepresentation.unmarshalEnum(buff);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final GridData rhs = (GridData)obj;
-
- if( ! (sampleType == rhs.sampleType)) ivarsEqual = false;
- if( ! (dataRepresentation == rhs.dataRepresentation)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final GridData rhs = (GridData)obj;
+
+ if( ! (sampleType == rhs.sampleType)) ivarsEqual = false;
+ if( ! (dataRepresentation == rhs.dataRepresentation)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" sampleType: ").append(sampleType).append("\n");
- sb.append(" dataRepresentation: ").append(dataRepresentation).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" sampleType: ").append(sampleType).append("\n");
+ sb.append(" dataRepresentation: ").append(dataRepresentation).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/GridDataType0.java b/src-generated/edu/nps/moves/dis7/GridDataType0.java
index 761117b8263936dee246898ea328cf59033a65d5..f15115a2599ae83ce789dd531489b74cc3fe1405 100644
--- a/src-generated/edu/nps/moves/dis7/GridDataType0.java
+++ b/src-generated/edu/nps/moves/dis7/GridDataType0.java
@@ -1,194 +1,194 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 6.2.41, table 68
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class GridDataType0 extends GridData implements Serializable
-{
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 6.2.41, table 68
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class GridDataType0 extends GridData implements Serializable
+{
protected short numberOfBytes;
-
+
protected byte[] dataValues = new byte[0];
-
+
private byte[] padding = new byte[0]; // pad to 16-bit boundary
-
-
-/** Constructor */
- public GridDataType0()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public GridDataType0()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += 2; // numberOfBytes
+ marshalSize += dataValues.length * 1;
+ marshalSize += padding.length;
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link GridDataType0#dataValues}*/
+public GridDataType0 setDataValues(byte[] pDataValues)
{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += 2; // numberOfBytes
- marshalSize += dataValues.length * 1;
- marshalSize += padding.length;
-
- return marshalSize;
-}
-
-
-/** Setter for {@link GridDataType0#dataValues}*/
-public GridDataType0 setDataValues(byte[] pDataValues)
-{
- dataValues = pDataValues;
- return this;
-}
-
-/** Getter for {@link GridDataType0#dataValues}*/
-public byte[] getDataValues()
+ dataValues = pDataValues;
+ return this;
+}
+
+/** Getter for {@link GridDataType0#dataValues}*/
+public byte[] getDataValues()
{
return dataValues;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- dos.writeShort(dataValues.length);
-
- for(int idx = 0; idx < dataValues.length; idx++)
- dos.writeByte(dataValues[idx]);
-
- padding = new byte[Align.to16bits(dos)];
+ {
+ dos.writeShort(dataValues.length);
+
+ for(int idx = 0; idx < dataValues.length; idx++)
+ dos.writeByte(dataValues[idx]);
+
+ padding = new byte[Align.to16bits(dos)];
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- numberOfBytes = (short)dis.readUnsignedShort();
- uPosition += 2;
- for(int idx = 0; idx < dataValues.length; idx++)
- dataValues[idx] = dis.readByte();
- uPosition += (dataValues.length * 1);
- padding = new byte[Align.from16bits(uPosition,dis)];
- uPosition += padding.length;
+ {
+ numberOfBytes = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ for(int idx = 0; idx < dataValues.length; idx++)
+ dataValues[idx] = dis.readByte();
+ uPosition += (dataValues.length * 1);
+ padding = new byte[Align.from16bits(uPosition,dis)];
+ uPosition += padding.length;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- buff.putShort( (short)dataValues.length);
-
- for(int idx = 0; idx < dataValues.length; idx++)
- buff.put((byte)dataValues[idx]);
-
- padding = new byte[Align.to16bits(buff)];
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ buff.putShort( (short)dataValues.length);
+
+ for(int idx = 0; idx < dataValues.length; idx++)
+ buff.put((byte)dataValues[idx]);
+
+ padding = new byte[Align.to16bits(buff)];
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- numberOfBytes = (short)(buff.getShort() & 0xFFFF);
- for(int idx = 0; idx < dataValues.length; idx++)
- dataValues[idx] = buff.get();
- padding = new byte[Align.from16bits(buff)];
- return getMarshalledSize();
+
+ numberOfBytes = (short)(buff.getShort() & 0xFFFF);
+ for(int idx = 0; idx < dataValues.length; idx++)
+ dataValues[idx] = buff.get();
+ padding = new byte[Align.from16bits(buff)];
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final GridDataType0 rhs = (GridDataType0)obj;
-
-
- for(int idx = 0; idx < 0; idx++)
- {
- if(!(dataValues[idx] == rhs.dataValues[idx])) ivarsEqual = false;
- }
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final GridDataType0 rhs = (GridDataType0)obj;
+
+
+ for(int idx = 0; idx < 0; idx++)
+ {
+ if(!(dataValues[idx] == rhs.dataValues[idx])) ivarsEqual = false;
+ }
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" dataValues: ").append("\n");
- sb.append(Arrays.toString(dataValues)).append("\n");
- sb.append(" padding: ").append(padding).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" dataValues: ").append("\n");
+ sb.append(Arrays.toString(dataValues)).append("\n");
+ sb.append(" padding: ").append(padding).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/GridDataType1.java b/src-generated/edu/nps/moves/dis7/GridDataType1.java
index ff3ea3ed511c90f886ad2b645786a6748a5cfee2..0f282a321fc1bc8427410dc671c9aa794ce88635 100644
--- a/src-generated/edu/nps/moves/dis7/GridDataType1.java
+++ b/src-generated/edu/nps/moves/dis7/GridDataType1.java
@@ -1,240 +1,240 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 6.2.41, table 69
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class GridDataType1 extends GridData implements Serializable
-{
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 6.2.41, table 69
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class GridDataType1 extends GridData implements Serializable
+{
protected float fieldScale;
-
+
protected float fieldOffset;
-
+
protected short numberOfValues;
-
+
protected short[] dataValues = new short[0];
-
+
private byte[] padding = new byte[0]; // pad to 32-bit boundary
-
-
-/** Constructor */
- public GridDataType1()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += 4; // fieldScale
- marshalSize += 4; // fieldOffset
- marshalSize += 2; // numberOfValues
- marshalSize += dataValues.length * 2;
- marshalSize += padding.length;
-
- return marshalSize;
-}
-
-
-/** Setter for {@link GridDataType1#fieldScale}*/
-public GridDataType1 setFieldScale(float pFieldScale)
+
+
+/** Constructor */
+ public GridDataType1()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += 4; // fieldScale
+ marshalSize += 4; // fieldOffset
+ marshalSize += 2; // numberOfValues
+ marshalSize += dataValues.length * 2;
+ marshalSize += padding.length;
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link GridDataType1#fieldScale}*/
+public GridDataType1 setFieldScale(float pFieldScale)
{
- fieldScale = pFieldScale;
- return this;
-}
-
-/** Getter for {@link GridDataType1#fieldScale}*/
-public float getFieldScale()
+ fieldScale = pFieldScale;
+ return this;
+}
+
+/** Getter for {@link GridDataType1#fieldScale}*/
+public float getFieldScale()
{
return fieldScale;
-}
-
-/** Setter for {@link GridDataType1#fieldOffset}*/
-public GridDataType1 setFieldOffset(float pFieldOffset)
+}
+
+/** Setter for {@link GridDataType1#fieldOffset}*/
+public GridDataType1 setFieldOffset(float pFieldOffset)
{
- fieldOffset = pFieldOffset;
- return this;
-}
-
-/** Getter for {@link GridDataType1#fieldOffset}*/
-public float getFieldOffset()
+ fieldOffset = pFieldOffset;
+ return this;
+}
+
+/** Getter for {@link GridDataType1#fieldOffset}*/
+public float getFieldOffset()
{
return fieldOffset;
-}
-
-/** Setter for {@link GridDataType1#dataValues}*/
-public GridDataType1 setDataValues(short[] pDataValues)
+}
+
+/** Setter for {@link GridDataType1#dataValues}*/
+public GridDataType1 setDataValues(short[] pDataValues)
{
- dataValues = pDataValues;
- return this;
-}
-
-/** Getter for {@link GridDataType1#dataValues}*/
-public short[] getDataValues()
+ dataValues = pDataValues;
+ return this;
+}
+
+/** Getter for {@link GridDataType1#dataValues}*/
+public short[] getDataValues()
{
return dataValues;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- dos.writeFloat(fieldScale);
- dos.writeFloat(fieldOffset);
- dos.writeShort(dataValues.length);
-
- for(int idx = 0; idx < dataValues.length; idx++)
- dos.writeShort(dataValues[idx]);
-
- padding = new byte[Align.to32bits(dos)];
+ {
+ dos.writeFloat(fieldScale);
+ dos.writeFloat(fieldOffset);
+ dos.writeShort(dataValues.length);
+
+ for(int idx = 0; idx < dataValues.length; idx++)
+ dos.writeShort(dataValues[idx]);
+
+ padding = new byte[Align.to32bits(dos)];
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- fieldScale = dis.readFloat();
- uPosition += 4;
- fieldOffset = dis.readFloat();
- uPosition += 4;
- numberOfValues = (short)dis.readUnsignedShort();
- uPosition += 2;
- for(int idx = 0; idx < dataValues.length; idx++)
- dataValues[idx] = dis.readShort();
- uPosition += (dataValues.length * 2);
- padding = new byte[Align.from32bits(uPosition,dis)];
- uPosition += padding.length;
+ {
+ fieldScale = dis.readFloat();
+ uPosition += 4;
+ fieldOffset = dis.readFloat();
+ uPosition += 4;
+ numberOfValues = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ for(int idx = 0; idx < dataValues.length; idx++)
+ dataValues[idx] = dis.readShort();
+ uPosition += (dataValues.length * 2);
+ padding = new byte[Align.from32bits(uPosition,dis)];
+ uPosition += padding.length;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- buff.putFloat( (float)fieldScale);
- buff.putFloat( (float)fieldOffset);
- buff.putShort( (short)dataValues.length);
-
- for(int idx = 0; idx < dataValues.length; idx++)
- buff.putShort((short)dataValues[idx]);
-
- padding = new byte[Align.to32bits(buff)];
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ buff.putFloat( (float)fieldScale);
+ buff.putFloat( (float)fieldOffset);
+ buff.putShort( (short)dataValues.length);
+
+ for(int idx = 0; idx < dataValues.length; idx++)
+ buff.putShort((short)dataValues[idx]);
+
+ padding = new byte[Align.to32bits(buff)];
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- fieldScale = buff.getFloat();
- fieldOffset = buff.getFloat();
- numberOfValues = (short)(buff.getShort() & 0xFFFF);
- for(int idx = 0; idx < dataValues.length; idx++)
- dataValues[idx] = buff.getShort();
- padding = new byte[Align.from32bits(buff)];
- return getMarshalledSize();
+
+ fieldScale = buff.getFloat();
+ fieldOffset = buff.getFloat();
+ numberOfValues = (short)(buff.getShort() & 0xFFFF);
+ for(int idx = 0; idx < dataValues.length; idx++)
+ dataValues[idx] = buff.getShort();
+ padding = new byte[Align.from32bits(buff)];
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final GridDataType1 rhs = (GridDataType1)obj;
-
- if( ! (fieldScale == rhs.fieldScale)) ivarsEqual = false;
- if( ! (fieldOffset == rhs.fieldOffset)) ivarsEqual = false;
-
- for(int idx = 0; idx < 0; idx++)
- {
- if(!(dataValues[idx] == rhs.dataValues[idx])) ivarsEqual = false;
- }
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final GridDataType1 rhs = (GridDataType1)obj;
+
+ if( ! (fieldScale == rhs.fieldScale)) ivarsEqual = false;
+ if( ! (fieldOffset == rhs.fieldOffset)) ivarsEqual = false;
+
+ for(int idx = 0; idx < 0; idx++)
+ {
+ if(!(dataValues[idx] == rhs.dataValues[idx])) ivarsEqual = false;
+ }
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" fieldScale: ").append(fieldScale).append("\n");
- sb.append(" fieldOffset: ").append(fieldOffset).append("\n");
- sb.append(" dataValues: ").append("\n");
- sb.append(Arrays.toString(dataValues)).append("\n");
- sb.append(" padding: ").append(padding).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" fieldScale: ").append(fieldScale).append("\n");
+ sb.append(" fieldOffset: ").append(fieldOffset).append("\n");
+ sb.append(" dataValues: ").append("\n");
+ sb.append(Arrays.toString(dataValues)).append("\n");
+ sb.append(" padding: ").append(padding).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/GridDataType2.java b/src-generated/edu/nps/moves/dis7/GridDataType2.java
index 7b875d720891fa74485dc3f8f94229b99802f79b..c147aac8206cd4c1da3ee35896e42fa82eaa564e 100644
--- a/src-generated/edu/nps/moves/dis7/GridDataType2.java
+++ b/src-generated/edu/nps/moves/dis7/GridDataType2.java
@@ -1,208 +1,208 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 6.2.41, table 70
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class GridDataType2 extends GridData implements Serializable
-{
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 6.2.41, table 70
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class GridDataType2 extends GridData implements Serializable
+{
protected short numberOfValues;
-
+
protected short padding;
-
+
protected float[] dataValues = new float[0];
-
-
-/** Constructor */
- public GridDataType2()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += 2; // numberOfValues
- marshalSize += 2; // padding
- marshalSize += dataValues.length * 4;
-
- return marshalSize;
-}
-
-
-/** Setter for {@link GridDataType2#padding}*/
-public GridDataType2 setPadding(short pPadding)
+
+
+/** Constructor */
+ public GridDataType2()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += 2; // numberOfValues
+ marshalSize += 2; // padding
+ marshalSize += dataValues.length * 4;
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link GridDataType2#padding}*/
+public GridDataType2 setPadding(short pPadding)
{
- padding = pPadding;
- return this;
-}
-
-/** Getter for {@link GridDataType2#padding}*/
-public short getPadding()
+ padding = pPadding;
+ return this;
+}
+
+/** Getter for {@link GridDataType2#padding}*/
+public short getPadding()
{
return padding;
-}
-
-/** Setter for {@link GridDataType2#dataValues}*/
-public GridDataType2 setDataValues(float[] pDataValues)
+}
+
+/** Setter for {@link GridDataType2#dataValues}*/
+public GridDataType2 setDataValues(float[] pDataValues)
{
- dataValues = pDataValues;
- return this;
-}
-
-/** Getter for {@link GridDataType2#dataValues}*/
-public float[] getDataValues()
+ dataValues = pDataValues;
+ return this;
+}
+
+/** Getter for {@link GridDataType2#dataValues}*/
+public float[] getDataValues()
{
return dataValues;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- dos.writeShort(dataValues.length);
- dos.writeShort(padding);
-
- for(int idx = 0; idx < dataValues.length; idx++)
- dos.writeFloat(dataValues[idx]);
-
+ {
+ dos.writeShort(dataValues.length);
+ dos.writeShort(padding);
+
+ for(int idx = 0; idx < dataValues.length; idx++)
+ dos.writeFloat(dataValues[idx]);
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- numberOfValues = (short)dis.readUnsignedShort();
- uPosition += 2;
- padding = (short)dis.readUnsignedShort();
- uPosition += 2;
- for(int idx = 0; idx < dataValues.length; idx++)
- dataValues[idx] = dis.readFloat();
- uPosition += (dataValues.length * 4);
+ {
+ numberOfValues = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ padding = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ for(int idx = 0; idx < dataValues.length; idx++)
+ dataValues[idx] = dis.readFloat();
+ uPosition += (dataValues.length * 4);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- buff.putShort( (short)dataValues.length);
- buff.putShort( (short)padding);
-
- for(int idx = 0; idx < dataValues.length; idx++)
- buff.putFloat((float)dataValues[idx]);
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ buff.putShort( (short)dataValues.length);
+ buff.putShort( (short)padding);
+
+ for(int idx = 0; idx < dataValues.length; idx++)
+ buff.putFloat((float)dataValues[idx]);
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- numberOfValues = (short)(buff.getShort() & 0xFFFF);
- padding = (short)(buff.getShort() & 0xFFFF);
- for(int idx = 0; idx < dataValues.length; idx++)
- dataValues[idx] = buff.getFloat();
- return getMarshalledSize();
+
+ numberOfValues = (short)(buff.getShort() & 0xFFFF);
+ padding = (short)(buff.getShort() & 0xFFFF);
+ for(int idx = 0; idx < dataValues.length; idx++)
+ dataValues[idx] = buff.getFloat();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final GridDataType2 rhs = (GridDataType2)obj;
-
- if( ! (padding == rhs.padding)) ivarsEqual = false;
-
- for(int idx = 0; idx < 0; idx++)
- {
- if(!(dataValues[idx] == rhs.dataValues[idx])) ivarsEqual = false;
- }
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final GridDataType2 rhs = (GridDataType2)obj;
+
+ if( ! (padding == rhs.padding)) ivarsEqual = false;
+
+ for(int idx = 0; idx < 0; idx++)
+ {
+ if(!(dataValues[idx] == rhs.dataValues[idx])) ivarsEqual = false;
+ }
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" padding: ").append(padding).append("\n");
- sb.append(" dataValues: ").append("\n");
- sb.append(Arrays.toString(dataValues)).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" padding: ").append(padding).append("\n");
+ sb.append(" dataValues: ").append("\n");
+ sb.append(Arrays.toString(dataValues)).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/GriddedDataPdu.java b/src-generated/edu/nps/moves/dis7/GriddedDataPdu.java
index 0e9a3f4e1ee7d3f0bcd1a3fe8627ebfb6052ffea..a22a71969162de8b4f8ad1e416262fc2f5368eb7 100644
--- a/src-generated/edu/nps/moves/dis7/GriddedDataPdu.java
+++ b/src-generated/edu/nps/moves/dis7/GriddedDataPdu.java
@@ -1,568 +1,568 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 7.10.3 Used to communicate information about global, spatially varying environmental effects.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class GriddedDataPdu extends SyntheticEnvironmentFamilyPdu implements Serializable
-{
- /** environmental simulation application ID */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 7.10.3 Used to communicate information about global, spatially varying environmental effects.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class GriddedDataPdu extends SyntheticEnvironmentFamilyPdu implements Serializable
+{
+ /** environmental simulation application ID */
protected SimulationIdentifier environmentalSimulationApplicationID = new SimulationIdentifier();
-
- /** unique identifier for each piece of environmental data */
+
+ /** unique identifier for each piece of environmental data */
protected short fieldNumber;
-
- /** sequence number for the total set of PDUS used to transmit the data */
+
+ /** sequence number for the total set of PDUS used to transmit the data */
protected short pduNumber;
-
- /** Total number of PDUS used to transmit the data */
+
+ /** Total number of PDUS used to transmit the data */
protected short pduTotal;
-
- /** coordinate system of the grid uid 244 */
+
+ /** coordinate system of the grid uid 244 */
protected GriddedDataCoordinateSystem coordinateSystem = GriddedDataCoordinateSystem.values()[0];
-
- /** number of grid axes for the environmental data */
+
+ /** number of grid axes for the environmental data */
protected byte numberOfGridAxes;
-
- /** are domain grid axes identidal to those of the priveious domain update? uid 245 */
+
+ /** are domain grid axes identidal to those of the priveious domain update? uid 245 */
protected GriddedDataConstantGrid constantGrid = GriddedDataConstantGrid.values()[0];
-
- /** type of environment */
+
+ /** type of environment */
protected EntityType environmentType = new EntityType();
-
- /** orientation of the data grid */
+
+ /** orientation of the data grid */
protected EulerAngles orientation = new EulerAngles();
-
- /** valid time of the enviormental data sample, 64 bit unsigned int */
+
+ /** valid time of the enviormental data sample, 64 bit unsigned int */
protected ClockTime sampleTime = new ClockTime();
-
- /** total number of all data values for all pdus for an environmental sample */
+
+ /** total number of all data values for all pdus for an environmental sample */
protected int totalValues;
-
- /** total number of data values at each grid point. */
+
+ /** total number of data values at each grid point. */
protected byte vectorDimension;
-
- /** padding */
+
+ /** padding */
protected byte padding1;
-
- /** padding */
+
+ /** padding */
protected short padding2;
-
- /** */
+
+ /** */
protected List< GridAxisDescriptor > gridAxisDescriptors = new ArrayList< GridAxisDescriptor >();
-
- /** */
+
+ /** */
protected List< GridData > gridDataRecords = new ArrayList< GridData >();
-
-
-/** Constructor */
- public GriddedDataPdu()
- {
- setPduType( DISPDUType.GRIDDED_DATA );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += environmentalSimulationApplicationID.getMarshalledSize();
- marshalSize += 2; // fieldNumber
- marshalSize += 2; // pduNumber
- marshalSize += 2; // pduTotal
- marshalSize += coordinateSystem.getMarshalledSize();
- marshalSize += 1; // numberOfGridAxes
- marshalSize += constantGrid.getMarshalledSize();
- marshalSize += environmentType.getMarshalledSize();
- marshalSize += orientation.getMarshalledSize();
- marshalSize += sampleTime.getMarshalledSize();
- marshalSize += 4; // totalValues
- marshalSize += 1; // vectorDimension
- marshalSize += 1; // padding1
- marshalSize += 2; // padding2
- for(int idx=0; idx < gridAxisDescriptors.size(); idx++)
- {
- GridAxisDescriptor listElement = gridAxisDescriptors.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
- for(int idx=0; idx < gridDataRecords.size(); idx++)
- {
- GridData listElement = gridDataRecords.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link GriddedDataPdu#environmentalSimulationApplicationID}*/
-public GriddedDataPdu setEnvironmentalSimulationApplicationID(SimulationIdentifier pEnvironmentalSimulationApplicationID)
-{
- environmentalSimulationApplicationID = pEnvironmentalSimulationApplicationID;
- return this;
-}
-
-/** Getter for {@link GriddedDataPdu#environmentalSimulationApplicationID}*/
-public SimulationIdentifier getEnvironmentalSimulationApplicationID()
+
+
+/** Constructor */
+ public GriddedDataPdu()
+ {
+ setPduType( DISPDUType.GRIDDED_DATA );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += environmentalSimulationApplicationID.getMarshalledSize();
+ marshalSize += 2; // fieldNumber
+ marshalSize += 2; // pduNumber
+ marshalSize += 2; // pduTotal
+ marshalSize += coordinateSystem.getMarshalledSize();
+ marshalSize += 1; // numberOfGridAxes
+ marshalSize += constantGrid.getMarshalledSize();
+ marshalSize += environmentType.getMarshalledSize();
+ marshalSize += orientation.getMarshalledSize();
+ marshalSize += sampleTime.getMarshalledSize();
+ marshalSize += 4; // totalValues
+ marshalSize += 1; // vectorDimension
+ marshalSize += 1; // padding1
+ marshalSize += 2; // padding2
+ for(int idx=0; idx < gridAxisDescriptors.size(); idx++)
+ {
+ GridAxisDescriptor listElement = gridAxisDescriptors.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+ for(int idx=0; idx < gridDataRecords.size(); idx++)
+ {
+ GridData listElement = gridDataRecords.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link GriddedDataPdu#environmentalSimulationApplicationID}*/
+public GriddedDataPdu setEnvironmentalSimulationApplicationID(SimulationIdentifier pEnvironmentalSimulationApplicationID)
+{
+ environmentalSimulationApplicationID = pEnvironmentalSimulationApplicationID;
+ return this;
+}
+
+/** Getter for {@link GriddedDataPdu#environmentalSimulationApplicationID}*/
+public SimulationIdentifier getEnvironmentalSimulationApplicationID()
{
return environmentalSimulationApplicationID;
-}
-
-/** Setter for {@link GriddedDataPdu#fieldNumber}*/
-public GriddedDataPdu setFieldNumber(short pFieldNumber)
-{
- fieldNumber = pFieldNumber;
- return this;
-}
-
-/** Getter for {@link GriddedDataPdu#fieldNumber}*/
-public short getFieldNumber()
+}
+
+/** Setter for {@link GriddedDataPdu#fieldNumber}*/
+public GriddedDataPdu setFieldNumber(short pFieldNumber)
+{
+ fieldNumber = pFieldNumber;
+ return this;
+}
+
+/** Getter for {@link GriddedDataPdu#fieldNumber}*/
+public short getFieldNumber()
{
return fieldNumber;
-}
-
-/** Setter for {@link GriddedDataPdu#pduNumber}*/
-public GriddedDataPdu setPduNumber(short pPduNumber)
-{
- pduNumber = pPduNumber;
- return this;
-}
-
-/** Getter for {@link GriddedDataPdu#pduNumber}*/
-public short getPduNumber()
+}
+
+/** Setter for {@link GriddedDataPdu#pduNumber}*/
+public GriddedDataPdu setPduNumber(short pPduNumber)
+{
+ pduNumber = pPduNumber;
+ return this;
+}
+
+/** Getter for {@link GriddedDataPdu#pduNumber}*/
+public short getPduNumber()
{
return pduNumber;
-}
-
-/** Setter for {@link GriddedDataPdu#pduTotal}*/
-public GriddedDataPdu setPduTotal(short pPduTotal)
-{
- pduTotal = pPduTotal;
- return this;
-}
-
-/** Getter for {@link GriddedDataPdu#pduTotal}*/
-public short getPduTotal()
+}
+
+/** Setter for {@link GriddedDataPdu#pduTotal}*/
+public GriddedDataPdu setPduTotal(short pPduTotal)
+{
+ pduTotal = pPduTotal;
+ return this;
+}
+
+/** Getter for {@link GriddedDataPdu#pduTotal}*/
+public short getPduTotal()
{
return pduTotal;
-}
-
-/** Setter for {@link GriddedDataPdu#coordinateSystem}*/
-public GriddedDataPdu setCoordinateSystem(GriddedDataCoordinateSystem pCoordinateSystem)
-{
- coordinateSystem = pCoordinateSystem;
- return this;
-}
-
-/** Getter for {@link GriddedDataPdu#coordinateSystem}*/
-public GriddedDataCoordinateSystem getCoordinateSystem()
+}
+
+/** Setter for {@link GriddedDataPdu#coordinateSystem}*/
+public GriddedDataPdu setCoordinateSystem(GriddedDataCoordinateSystem pCoordinateSystem)
+{
+ coordinateSystem = pCoordinateSystem;
+ return this;
+}
+
+/** Getter for {@link GriddedDataPdu#coordinateSystem}*/
+public GriddedDataCoordinateSystem getCoordinateSystem()
{
return coordinateSystem;
-}
-
-/** Setter for {@link GriddedDataPdu#constantGrid}*/
-public GriddedDataPdu setConstantGrid(GriddedDataConstantGrid pConstantGrid)
-{
- constantGrid = pConstantGrid;
- return this;
-}
-
-/** Getter for {@link GriddedDataPdu#constantGrid}*/
-public GriddedDataConstantGrid getConstantGrid()
+}
+
+/** Setter for {@link GriddedDataPdu#constantGrid}*/
+public GriddedDataPdu setConstantGrid(GriddedDataConstantGrid pConstantGrid)
+{
+ constantGrid = pConstantGrid;
+ return this;
+}
+
+/** Getter for {@link GriddedDataPdu#constantGrid}*/
+public GriddedDataConstantGrid getConstantGrid()
{
return constantGrid;
-}
-
-/** Setter for {@link GriddedDataPdu#environmentType}*/
-public GriddedDataPdu setEnvironmentType(EntityType pEnvironmentType)
-{
- environmentType = pEnvironmentType;
- return this;
-}
-
-/** Getter for {@link GriddedDataPdu#environmentType}*/
-public EntityType getEnvironmentType()
+}
+
+/** Setter for {@link GriddedDataPdu#environmentType}*/
+public GriddedDataPdu setEnvironmentType(EntityType pEnvironmentType)
+{
+ environmentType = pEnvironmentType;
+ return this;
+}
+
+/** Getter for {@link GriddedDataPdu#environmentType}*/
+public EntityType getEnvironmentType()
{
return environmentType;
-}
-
-/** Setter for {@link GriddedDataPdu#orientation}*/
-public GriddedDataPdu setOrientation(EulerAngles pOrientation)
-{
- orientation = pOrientation;
- return this;
-}
-
-/** Getter for {@link GriddedDataPdu#orientation}*/
-public EulerAngles getOrientation()
+}
+
+/** Setter for {@link GriddedDataPdu#orientation}*/
+public GriddedDataPdu setOrientation(EulerAngles pOrientation)
+{
+ orientation = pOrientation;
+ return this;
+}
+
+/** Getter for {@link GriddedDataPdu#orientation}*/
+public EulerAngles getOrientation()
{
return orientation;
-}
-
-/** Setter for {@link GriddedDataPdu#sampleTime}*/
-public GriddedDataPdu setSampleTime(ClockTime pSampleTime)
-{
- sampleTime = pSampleTime;
- return this;
-}
-
-/** Getter for {@link GriddedDataPdu#sampleTime}*/
-public ClockTime getSampleTime()
+}
+
+/** Setter for {@link GriddedDataPdu#sampleTime}*/
+public GriddedDataPdu setSampleTime(ClockTime pSampleTime)
+{
+ sampleTime = pSampleTime;
+ return this;
+}
+
+/** Getter for {@link GriddedDataPdu#sampleTime}*/
+public ClockTime getSampleTime()
{
return sampleTime;
-}
-
-/** Setter for {@link GriddedDataPdu#totalValues}*/
-public GriddedDataPdu setTotalValues(int pTotalValues)
-{
- totalValues = pTotalValues;
- return this;
-}
-
-/** Getter for {@link GriddedDataPdu#totalValues}*/
-public int getTotalValues()
+}
+
+/** Setter for {@link GriddedDataPdu#totalValues}*/
+public GriddedDataPdu setTotalValues(int pTotalValues)
+{
+ totalValues = pTotalValues;
+ return this;
+}
+
+/** Getter for {@link GriddedDataPdu#totalValues}*/
+public int getTotalValues()
{
return totalValues;
-}
-
-/** Setter for {@link GriddedDataPdu#vectorDimension}*/
-public GriddedDataPdu setVectorDimension(byte pVectorDimension)
-{
- vectorDimension = pVectorDimension;
- return this;
-}
-
-/** Getter for {@link GriddedDataPdu#vectorDimension}*/
-public byte getVectorDimension()
+}
+
+/** Setter for {@link GriddedDataPdu#vectorDimension}*/
+public GriddedDataPdu setVectorDimension(byte pVectorDimension)
+{
+ vectorDimension = pVectorDimension;
+ return this;
+}
+
+/** Getter for {@link GriddedDataPdu#vectorDimension}*/
+public byte getVectorDimension()
{
return vectorDimension;
-}
-
-/** Setter for {@link GriddedDataPdu#padding1}*/
-public GriddedDataPdu setPadding1(byte pPadding1)
-{
- padding1 = pPadding1;
- return this;
-}
-
-/** Getter for {@link GriddedDataPdu#padding1}*/
-public byte getPadding1()
+}
+
+/** Setter for {@link GriddedDataPdu#padding1}*/
+public GriddedDataPdu setPadding1(byte pPadding1)
+{
+ padding1 = pPadding1;
+ return this;
+}
+
+/** Getter for {@link GriddedDataPdu#padding1}*/
+public byte getPadding1()
{
return padding1;
-}
-
-/** Setter for {@link GriddedDataPdu#padding2}*/
-public GriddedDataPdu setPadding2(short pPadding2)
-{
- padding2 = pPadding2;
- return this;
-}
-
-/** Getter for {@link GriddedDataPdu#padding2}*/
-public short getPadding2()
+}
+
+/** Setter for {@link GriddedDataPdu#padding2}*/
+public GriddedDataPdu setPadding2(short pPadding2)
+{
+ padding2 = pPadding2;
+ return this;
+}
+
+/** Getter for {@link GriddedDataPdu#padding2}*/
+public short getPadding2()
{
return padding2;
-}
-
-/** Setter for {@link GriddedDataPdu#gridAxisDescriptors}*/
-public GriddedDataPdu setGridAxisDescriptors(List<GridAxisDescriptor> pGridAxisDescriptors)
-{
- gridAxisDescriptors = pGridAxisDescriptors;
- return this;
-}
-
-/** Getter for {@link GriddedDataPdu#gridAxisDescriptors}*/
-public List<GridAxisDescriptor> getGridAxisDescriptors()
+}
+
+/** Setter for {@link GriddedDataPdu#gridAxisDescriptors}*/
+public GriddedDataPdu setGridAxisDescriptors(List<GridAxisDescriptor> pGridAxisDescriptors)
+{
+ gridAxisDescriptors = pGridAxisDescriptors;
+ return this;
+}
+
+/** Getter for {@link GriddedDataPdu#gridAxisDescriptors}*/
+public List<GridAxisDescriptor> getGridAxisDescriptors()
{
return gridAxisDescriptors;
-}
-
-/** Setter for {@link GriddedDataPdu#gridDataRecords}*/
-public GriddedDataPdu setGridDataRecords(List<GridData> pGridDataRecords)
-{
- gridDataRecords = pGridDataRecords;
- return this;
-}
-
-/** Getter for {@link GriddedDataPdu#gridDataRecords}*/
-public List<GridData> getGridDataRecords()
+}
+
+/** Setter for {@link GriddedDataPdu#gridDataRecords}*/
+public GriddedDataPdu setGridDataRecords(List<GridData> pGridDataRecords)
+{
+ gridDataRecords = pGridDataRecords;
+ return this;
+}
+
+/** Getter for {@link GriddedDataPdu#gridDataRecords}*/
+public List<GridData> getGridDataRecords()
{
return gridDataRecords;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- environmentalSimulationApplicationID.marshal(dos);
- dos.writeShort(fieldNumber);
- dos.writeShort(pduNumber);
- dos.writeShort(pduTotal);
- coordinateSystem.marshal(dos);
- dos.writeByte(gridDataRecords.size());
- constantGrid.marshal(dos);
- environmentType.marshal(dos);
- orientation.marshal(dos);
- sampleTime.marshal(dos);
- dos.writeInt(totalValues);
- dos.writeByte(vectorDimension);
- dos.writeByte(padding1);
- dos.writeShort(padding2);
-
- for(int idx = 0; idx < gridAxisDescriptors.size(); idx++)
- {
- GridAxisDescriptor aGridAxisDescriptor = gridAxisDescriptors.get(idx);
- aGridAxisDescriptor.marshal(dos);
- }
-
-
- for(int idx = 0; idx < gridDataRecords.size(); idx++)
- {
- GridData aGridData = gridDataRecords.get(idx);
- aGridData.marshal(dos);
- }
-
+ {
+ environmentalSimulationApplicationID.marshal(dos);
+ dos.writeShort(fieldNumber);
+ dos.writeShort(pduNumber);
+ dos.writeShort(pduTotal);
+ coordinateSystem.marshal(dos);
+ dos.writeByte(gridDataRecords.size());
+ constantGrid.marshal(dos);
+ environmentType.marshal(dos);
+ orientation.marshal(dos);
+ sampleTime.marshal(dos);
+ dos.writeInt(totalValues);
+ dos.writeByte(vectorDimension);
+ dos.writeByte(padding1);
+ dos.writeShort(padding2);
+
+ for(int idx = 0; idx < gridAxisDescriptors.size(); idx++)
+ {
+ GridAxisDescriptor aGridAxisDescriptor = gridAxisDescriptors.get(idx);
+ aGridAxisDescriptor.marshal(dos);
+ }
+
+
+ for(int idx = 0; idx < gridDataRecords.size(); idx++)
+ {
+ GridData aGridData = gridDataRecords.get(idx);
+ aGridData.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += environmentalSimulationApplicationID.unmarshal(dis);
- fieldNumber = (short)dis.readUnsignedShort();
- uPosition += 2;
- pduNumber = (short)dis.readUnsignedShort();
- uPosition += 2;
- pduTotal = (short)dis.readUnsignedShort();
- uPosition += 2;
- coordinateSystem = GriddedDataCoordinateSystem.unmarshalEnum(dis);
- uPosition += coordinateSystem.getMarshalledSize();
- numberOfGridAxes = (byte)dis.readUnsignedByte();
- uPosition += 1;
- constantGrid = GriddedDataConstantGrid.unmarshalEnum(dis);
- uPosition += constantGrid.getMarshalledSize();
- uPosition += environmentType.unmarshal(dis);
- uPosition += orientation.unmarshal(dis);
- uPosition += sampleTime.unmarshal(dis);
- totalValues = dis.readInt();
- uPosition += 4;
- vectorDimension = (byte)dis.readUnsignedByte();
- uPosition += 1;
- padding1 = (byte)dis.readUnsignedByte();
- uPosition += 1;
- padding2 = (short)dis.readUnsignedShort();
- uPosition += 2;
- for(int idx = 0; idx < numberOfGridAxes; idx++)
- {
- GridAxisDescriptor anX = new GridAxisDescriptor();
- uPosition += anX.unmarshal(dis);
- gridAxisDescriptors.add(anX);
- }
-
- for(int idx = 0; idx < numberOfGridAxes; idx++)
- {
- GridData anX = new GridData();
- uPosition += anX.unmarshal(dis);
- gridDataRecords.add(anX);
- }
-
+ {
+ uPosition += environmentalSimulationApplicationID.unmarshal(dis);
+ fieldNumber = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ pduNumber = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ pduTotal = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ coordinateSystem = GriddedDataCoordinateSystem.unmarshalEnum(dis);
+ uPosition += coordinateSystem.getMarshalledSize();
+ numberOfGridAxes = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ constantGrid = GriddedDataConstantGrid.unmarshalEnum(dis);
+ uPosition += constantGrid.getMarshalledSize();
+ uPosition += environmentType.unmarshal(dis);
+ uPosition += orientation.unmarshal(dis);
+ uPosition += sampleTime.unmarshal(dis);
+ totalValues = dis.readInt();
+ uPosition += 4;
+ vectorDimension = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ padding1 = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ padding2 = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ for(int idx = 0; idx < numberOfGridAxes; idx++)
+ {
+ GridAxisDescriptor anX = new GridAxisDescriptor();
+ uPosition += anX.unmarshal(dis);
+ gridAxisDescriptors.add(anX);
+ }
+
+ for(int idx = 0; idx < numberOfGridAxes; idx++)
+ {
+ GridData anX = new GridData();
+ uPosition += anX.unmarshal(dis);
+ gridDataRecords.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- environmentalSimulationApplicationID.marshal(buff);
- buff.putShort( (short)fieldNumber);
- buff.putShort( (short)pduNumber);
- buff.putShort( (short)pduTotal);
- coordinateSystem.marshal(buff);
- buff.put( (byte)gridDataRecords.size());
- constantGrid.marshal(buff);
- environmentType.marshal(buff);
- orientation.marshal(buff);
- sampleTime.marshal(buff);
- buff.putInt( (int)totalValues);
- buff.put( (byte)vectorDimension);
- buff.put( (byte)padding1);
- buff.putShort( (short)padding2);
-
- for(int idx = 0; idx < gridAxisDescriptors.size(); idx++)
- {
- GridAxisDescriptor aGridAxisDescriptor = gridAxisDescriptors.get(idx);
- aGridAxisDescriptor.marshal(buff);
- }
-
-
- for(int idx = 0; idx < gridDataRecords.size(); idx++)
- {
- GridData aGridData = gridDataRecords.get(idx);
- aGridData.marshal(buff);
- }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+ }
+ return getMarshalledSize();
+}
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ environmentalSimulationApplicationID.marshal(buff);
+ buff.putShort( (short)fieldNumber);
+ buff.putShort( (short)pduNumber);
+ buff.putShort( (short)pduTotal);
+ coordinateSystem.marshal(buff);
+ buff.put( (byte)gridDataRecords.size());
+ constantGrid.marshal(buff);
+ environmentType.marshal(buff);
+ orientation.marshal(buff);
+ sampleTime.marshal(buff);
+ buff.putInt( (int)totalValues);
+ buff.put( (byte)vectorDimension);
+ buff.put( (byte)padding1);
+ buff.putShort( (short)padding2);
+
+ for(int idx = 0; idx < gridAxisDescriptors.size(); idx++)
+ {
+ GridAxisDescriptor aGridAxisDescriptor = gridAxisDescriptors.get(idx);
+ aGridAxisDescriptor.marshal(buff);
+ }
+
+
+ for(int idx = 0; idx < gridDataRecords.size(); idx++)
+ {
+ GridData aGridData = gridDataRecords.get(idx);
+ aGridData.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- environmentalSimulationApplicationID.unmarshal(buff);
- fieldNumber = (short)(buff.getShort() & 0xFFFF);
- pduNumber = (short)(buff.getShort() & 0xFFFF);
- pduTotal = (short)(buff.getShort() & 0xFFFF);
- coordinateSystem = GriddedDataCoordinateSystem.unmarshalEnum(buff);
- numberOfGridAxes = (byte)(buff.get() & 0xFF);
- constantGrid = GriddedDataConstantGrid.unmarshalEnum(buff);
- environmentType.unmarshal(buff);
- orientation.unmarshal(buff);
- sampleTime.unmarshal(buff);
- totalValues = buff.getInt();
- vectorDimension = (byte)(buff.get() & 0xFF);
- padding1 = (byte)(buff.get() & 0xFF);
- padding2 = (short)(buff.getShort() & 0xFFFF);
- for(int idx = 0; idx < numberOfGridAxes; idx++)
- {
- GridAxisDescriptor anX = new GridAxisDescriptor();
- anX.unmarshal(buff);
- gridAxisDescriptors.add(anX);
- }
-
- for(int idx = 0; idx < numberOfGridAxes; idx++)
- {
- GridData anX = new GridData();
- anX.unmarshal(buff);
- gridDataRecords.add(anX);
- }
-
- return getMarshalledSize();
-}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final GriddedDataPdu rhs = (GriddedDataPdu)obj;
-
- if( ! (environmentalSimulationApplicationID.equals( rhs.environmentalSimulationApplicationID) )) ivarsEqual = false;
- if( ! (fieldNumber == rhs.fieldNumber)) ivarsEqual = false;
- if( ! (pduNumber == rhs.pduNumber)) ivarsEqual = false;
- if( ! (pduTotal == rhs.pduTotal)) ivarsEqual = false;
- if( ! (coordinateSystem == rhs.coordinateSystem)) ivarsEqual = false;
- if( ! (constantGrid == rhs.constantGrid)) ivarsEqual = false;
- if( ! (environmentType.equals( rhs.environmentType) )) ivarsEqual = false;
- if( ! (orientation.equals( rhs.orientation) )) ivarsEqual = false;
- if( ! (sampleTime.equals( rhs.sampleTime) )) ivarsEqual = false;
- if( ! (totalValues == rhs.totalValues)) ivarsEqual = false;
- if( ! (vectorDimension == rhs.vectorDimension)) ivarsEqual = false;
- if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
- if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
-
- for(int idx = 0; idx < gridAxisDescriptors.size(); idx++)
- if( ! ( gridAxisDescriptors.get(idx).equals(rhs.gridAxisDescriptors.get(idx)))) ivarsEqual = false;
-
-
- for(int idx = 0; idx < gridDataRecords.size(); idx++)
- if( ! ( gridDataRecords.get(idx).equals(rhs.gridDataRecords.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ environmentalSimulationApplicationID.unmarshal(buff);
+ fieldNumber = (short)(buff.getShort() & 0xFFFF);
+ pduNumber = (short)(buff.getShort() & 0xFFFF);
+ pduTotal = (short)(buff.getShort() & 0xFFFF);
+ coordinateSystem = GriddedDataCoordinateSystem.unmarshalEnum(buff);
+ numberOfGridAxes = (byte)(buff.get() & 0xFF);
+ constantGrid = GriddedDataConstantGrid.unmarshalEnum(buff);
+ environmentType.unmarshal(buff);
+ orientation.unmarshal(buff);
+ sampleTime.unmarshal(buff);
+ totalValues = buff.getInt();
+ vectorDimension = (byte)(buff.get() & 0xFF);
+ padding1 = (byte)(buff.get() & 0xFF);
+ padding2 = (short)(buff.getShort() & 0xFFFF);
+ for(int idx = 0; idx < numberOfGridAxes; idx++)
+ {
+ GridAxisDescriptor anX = new GridAxisDescriptor();
+ anX.unmarshal(buff);
+ gridAxisDescriptors.add(anX);
+ }
+
+ for(int idx = 0; idx < numberOfGridAxes; idx++)
+ {
+ GridData anX = new GridData();
+ anX.unmarshal(buff);
+ gridDataRecords.add(anX);
+ }
+
+ return getMarshalledSize();
+}
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final GriddedDataPdu rhs = (GriddedDataPdu)obj;
+
+ if( ! (environmentalSimulationApplicationID.equals( rhs.environmentalSimulationApplicationID) )) ivarsEqual = false;
+ if( ! (fieldNumber == rhs.fieldNumber)) ivarsEqual = false;
+ if( ! (pduNumber == rhs.pduNumber)) ivarsEqual = false;
+ if( ! (pduTotal == rhs.pduTotal)) ivarsEqual = false;
+ if( ! (coordinateSystem == rhs.coordinateSystem)) ivarsEqual = false;
+ if( ! (constantGrid == rhs.constantGrid)) ivarsEqual = false;
+ if( ! (environmentType.equals( rhs.environmentType) )) ivarsEqual = false;
+ if( ! (orientation.equals( rhs.orientation) )) ivarsEqual = false;
+ if( ! (sampleTime.equals( rhs.sampleTime) )) ivarsEqual = false;
+ if( ! (totalValues == rhs.totalValues)) ivarsEqual = false;
+ if( ! (vectorDimension == rhs.vectorDimension)) ivarsEqual = false;
+ if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
+ if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
+
+ for(int idx = 0; idx < gridAxisDescriptors.size(); idx++)
+ if( ! ( gridAxisDescriptors.get(idx).equals(rhs.gridAxisDescriptors.get(idx)))) ivarsEqual = false;
+
+
+ for(int idx = 0; idx < gridDataRecords.size(); idx++)
+ if( ! ( gridDataRecords.get(idx).equals(rhs.gridDataRecords.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" environmentalSimulationApplicationID: ").append(environmentalSimulationApplicationID).append("\n");
- sb.append(" fieldNumber: ").append(fieldNumber).append("\n");
- sb.append(" pduNumber: ").append(pduNumber).append("\n");
- sb.append(" pduTotal: ").append(pduTotal).append("\n");
- sb.append(" coordinateSystem: ").append(coordinateSystem).append("\n");
- sb.append(" constantGrid: ").append(constantGrid).append("\n");
- sb.append(" environmentType: ").append(environmentType).append("\n");
- sb.append(" orientation: ").append(orientation).append("\n");
- sb.append(" sampleTime: ").append(sampleTime).append("\n");
- sb.append(" totalValues: ").append(totalValues).append("\n");
- sb.append(" vectorDimension: ").append(vectorDimension).append("\n");
- sb.append(" padding1: ").append(padding1).append("\n");
- sb.append(" padding2: ").append(padding2).append("\n");
- sb.append(" gridAxisDescriptors: ").append("\n");
- gridAxisDescriptors.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
- sb.append(" gridDataRecords: ").append("\n");
- gridDataRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" environmentalSimulationApplicationID: ").append(environmentalSimulationApplicationID).append("\n");
+ sb.append(" fieldNumber: ").append(fieldNumber).append("\n");
+ sb.append(" pduNumber: ").append(pduNumber).append("\n");
+ sb.append(" pduTotal: ").append(pduTotal).append("\n");
+ sb.append(" coordinateSystem: ").append(coordinateSystem).append("\n");
+ sb.append(" constantGrid: ").append(constantGrid).append("\n");
+ sb.append(" environmentType: ").append(environmentType).append("\n");
+ sb.append(" orientation: ").append(orientation).append("\n");
+ sb.append(" sampleTime: ").append(sampleTime).append("\n");
+ sb.append(" totalValues: ").append(totalValues).append("\n");
+ sb.append(" vectorDimension: ").append(vectorDimension).append("\n");
+ sb.append(" padding1: ").append(padding1).append("\n");
+ sb.append(" padding2: ").append(padding2).append("\n");
+ sb.append(" gridAxisDescriptors: ").append("\n");
+ gridAxisDescriptors.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+ sb.append(" gridDataRecords: ").append("\n");
+ gridDataRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/GroupID.java b/src-generated/edu/nps/moves/dis7/GroupID.java
index e40a1a31c7afb74c79b96930894ebe42b633966b..8683fac54827dedae57c037e64d9c9fbdc305cb0 100644
--- a/src-generated/edu/nps/moves/dis7/GroupID.java
+++ b/src-generated/edu/nps/moves/dis7/GroupID.java
@@ -1,185 +1,185 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Unique designation of a group of entities contained in the isGroupOfPdu. Represents a group of entities rather than a single entity. Section 6.2.43
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class GroupID extends Object implements Serializable
-{
- /** Simulation address (site and application number) */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Unique designation of a group of entities contained in the isGroupOfPdu. Represents a group of entities rather than a single entity. Section 6.2.43
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class GroupID extends Object implements Serializable
+{
+ /** Simulation address (site and application number) */
protected SimulationAddress simulationAddress = new SimulationAddress();
-
- /** group number */
+
+ /** group number */
protected short groupNumber;
-
-
-/** Constructor */
- public GroupID()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += simulationAddress.getMarshalledSize();
- marshalSize += 2; // groupNumber
-
- return marshalSize;
-}
-
-
-/** Setter for {@link GroupID#simulationAddress}*/
-public GroupID setSimulationAddress(SimulationAddress pSimulationAddress)
+
+
+/** Constructor */
+ public GroupID()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += simulationAddress.getMarshalledSize();
+ marshalSize += 2; // groupNumber
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link GroupID#simulationAddress}*/
+public GroupID setSimulationAddress(SimulationAddress pSimulationAddress)
{
- simulationAddress = pSimulationAddress;
- return this;
-}
-
-/** Getter for {@link GroupID#simulationAddress}*/
-public SimulationAddress getSimulationAddress()
+ simulationAddress = pSimulationAddress;
+ return this;
+}
+
+/** Getter for {@link GroupID#simulationAddress}*/
+public SimulationAddress getSimulationAddress()
{
return simulationAddress;
-}
-
-/** Setter for {@link GroupID#groupNumber}*/
-public GroupID setGroupNumber(short pGroupNumber)
+}
+
+/** Setter for {@link GroupID#groupNumber}*/
+public GroupID setGroupNumber(short pGroupNumber)
{
- groupNumber = pGroupNumber;
- return this;
-}
-
-/** Getter for {@link GroupID#groupNumber}*/
-public short getGroupNumber()
+ groupNumber = pGroupNumber;
+ return this;
+}
+
+/** Getter for {@link GroupID#groupNumber}*/
+public short getGroupNumber()
{
return groupNumber;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- simulationAddress.marshal(dos);
- dos.writeShort(groupNumber);
+ {
+ simulationAddress.marshal(dos);
+ dos.writeShort(groupNumber);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- uPosition += simulationAddress.unmarshal(dis);
- groupNumber = (short)dis.readUnsignedShort();
- uPosition += 2;
+ {
+ uPosition += simulationAddress.unmarshal(dis);
+ groupNumber = (short)dis.readUnsignedShort();
+ uPosition += 2;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- simulationAddress.marshal(buff);
- buff.putShort( (short)groupNumber);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- simulationAddress.unmarshal(buff);
- groupNumber = (short)(buff.getShort() & 0xFFFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ simulationAddress.marshal(buff);
+ buff.putShort( (short)groupNumber);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ simulationAddress.unmarshal(buff);
+ groupNumber = (short)(buff.getShort() & 0xFFFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final GroupID rhs = (GroupID)obj;
-
- if( ! (simulationAddress.equals( rhs.simulationAddress) )) ivarsEqual = false;
- if( ! (groupNumber == rhs.groupNumber)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final GroupID rhs = (GroupID)obj;
+
+ if( ! (simulationAddress.equals( rhs.simulationAddress) )) ivarsEqual = false;
+ if( ! (groupNumber == rhs.groupNumber)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
- sb.append(" groupNumber: ").append(groupNumber).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
+ sb.append(" groupNumber: ").append(groupNumber).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/IFFData.java b/src-generated/edu/nps/moves/dis7/IFFData.java
index 2d4afb40702269fe405675a431679a3c090d5f9c..016f4acccc2e44bffb682edf85e89f38d333afd7 100644
--- a/src-generated/edu/nps/moves/dis7/IFFData.java
+++ b/src-generated/edu/nps/moves/dis7/IFFData.java
@@ -1,232 +1,232 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * repeating element in IFF Data specification record
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class IFFData extends Object implements Serializable
-{
- /** enumeration for type of record uid 66 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * repeating element in IFF Data specification record
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class IFFData extends Object implements Serializable
+{
+ /** enumeration for type of record uid 66 */
protected VariableRecordType recordType = VariableRecordType.values()[0];
-
- /** length of record, including padding */
+
+ /** length of record, including padding */
protected short recordLength;
-
+
protected byte[] recordSpecificFields = new byte[0];
-
+
private byte[] padding = new byte[0]; // pad to 32-bit boundary
-
-
-/** Constructor */
- public IFFData()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += recordType.getMarshalledSize();
- marshalSize += 2; // recordLength
- marshalSize += recordSpecificFields.length * 1;
- marshalSize += padding.length;
-
- return marshalSize;
-}
-
-
-/** Setter for {@link IFFData#recordType}*/
-public IFFData setRecordType(VariableRecordType pRecordType)
+
+
+/** Constructor */
+ public IFFData()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += recordType.getMarshalledSize();
+ marshalSize += 2; // recordLength
+ marshalSize += recordSpecificFields.length * 1;
+ marshalSize += padding.length;
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link IFFData#recordType}*/
+public IFFData setRecordType(VariableRecordType pRecordType)
{
- recordType = pRecordType;
- return this;
-}
-
-/** Getter for {@link IFFData#recordType}*/
-public VariableRecordType getRecordType()
+ recordType = pRecordType;
+ return this;
+}
+
+/** Getter for {@link IFFData#recordType}*/
+public VariableRecordType getRecordType()
{
return recordType;
-}
-
-/** Setter for {@link IFFData#recordLength}*/
-public IFFData setRecordLength(short pRecordLength)
+}
+
+/** Setter for {@link IFFData#recordLength}*/
+public IFFData setRecordLength(short pRecordLength)
{
- recordLength = pRecordLength;
- return this;
-}
-
-/** Getter for {@link IFFData#recordLength}*/
-public short getRecordLength()
+ recordLength = pRecordLength;
+ return this;
+}
+
+/** Getter for {@link IFFData#recordLength}*/
+public short getRecordLength()
{
return recordLength;
-}
-
-/** Setter for {@link IFFData#recordSpecificFields}*/
-public IFFData setRecordSpecificFields(byte[] pRecordSpecificFields)
+}
+
+/** Setter for {@link IFFData#recordSpecificFields}*/
+public IFFData setRecordSpecificFields(byte[] pRecordSpecificFields)
{
- recordSpecificFields = pRecordSpecificFields;
- return this;
-}
-
-/** Getter for {@link IFFData#recordSpecificFields}*/
-public byte[] getRecordSpecificFields()
+ recordSpecificFields = pRecordSpecificFields;
+ return this;
+}
+
+/** Getter for {@link IFFData#recordSpecificFields}*/
+public byte[] getRecordSpecificFields()
{
return recordSpecificFields;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- recordType.marshal(dos);
- dos.writeShort(recordLength);
-
- for(int idx = 0; idx < recordSpecificFields.length; idx++)
- dos.writeByte(recordSpecificFields[idx]);
-
- padding = new byte[Align.to32bits(dos)];
+ {
+ recordType.marshal(dos);
+ dos.writeShort(recordLength);
+
+ for(int idx = 0; idx < recordSpecificFields.length; idx++)
+ dos.writeByte(recordSpecificFields[idx]);
+
+ padding = new byte[Align.to32bits(dos)];
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- recordType = VariableRecordType.unmarshalEnum(dis);
- uPosition += recordType.getMarshalledSize();
- recordLength = (short)dis.readUnsignedShort();
- uPosition += 2;
- for(int idx = 0; idx < recordSpecificFields.length; idx++)
- recordSpecificFields[idx] = dis.readByte();
- uPosition += (recordSpecificFields.length * 1);
- padding = new byte[Align.from32bits(uPosition,dis)];
- uPosition += padding.length;
+ {
+ recordType = VariableRecordType.unmarshalEnum(dis);
+ uPosition += recordType.getMarshalledSize();
+ recordLength = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ for(int idx = 0; idx < recordSpecificFields.length; idx++)
+ recordSpecificFields[idx] = dis.readByte();
+ uPosition += (recordSpecificFields.length * 1);
+ padding = new byte[Align.from32bits(uPosition,dis)];
+ uPosition += padding.length;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- recordType.marshal(buff);
- buff.putShort( (short)recordLength);
-
- for(int idx = 0; idx < recordSpecificFields.length; idx++)
- buff.put((byte)recordSpecificFields[idx]);
-
- padding = new byte[Align.to32bits(buff)];
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- recordType = VariableRecordType.unmarshalEnum(buff);
- recordLength = (short)(buff.getShort() & 0xFFFF);
- for(int idx = 0; idx < recordSpecificFields.length; idx++)
- recordSpecificFields[idx] = buff.get();
- padding = new byte[Align.from32bits(buff)];
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ recordType.marshal(buff);
+ buff.putShort( (short)recordLength);
+
+ for(int idx = 0; idx < recordSpecificFields.length; idx++)
+ buff.put((byte)recordSpecificFields[idx]);
+
+ padding = new byte[Align.to32bits(buff)];
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ recordType = VariableRecordType.unmarshalEnum(buff);
+ recordLength = (short)(buff.getShort() & 0xFFFF);
+ for(int idx = 0; idx < recordSpecificFields.length; idx++)
+ recordSpecificFields[idx] = buff.get();
+ padding = new byte[Align.from32bits(buff)];
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final IFFData rhs = (IFFData)obj;
-
- if( ! (recordType == rhs.recordType)) ivarsEqual = false;
- if( ! (recordLength == rhs.recordLength)) ivarsEqual = false;
-
- for(int idx = 0; idx < 0; idx++)
- {
- if(!(recordSpecificFields[idx] == rhs.recordSpecificFields[idx])) ivarsEqual = false;
- }
-
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final IFFData rhs = (IFFData)obj;
+
+ if( ! (recordType == rhs.recordType)) ivarsEqual = false;
+ if( ! (recordLength == rhs.recordLength)) ivarsEqual = false;
+
+ for(int idx = 0; idx < 0; idx++)
+ {
+ if(!(recordSpecificFields[idx] == rhs.recordSpecificFields[idx])) ivarsEqual = false;
+ }
+
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" recordType: ").append(recordType).append("\n");
- sb.append(" recordLength: ").append(recordLength).append("\n");
- sb.append(" recordSpecificFields: ").append("\n");
- sb.append(Arrays.toString(recordSpecificFields)).append("\n");
- sb.append(" padding: ").append(padding).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" recordType: ").append(recordType).append("\n");
+ sb.append(" recordLength: ").append(recordLength).append("\n");
+ sb.append(" recordSpecificFields: ").append("\n");
+ sb.append(Arrays.toString(recordSpecificFields)).append("\n");
+ sb.append(" padding: ").append(padding).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/IFFFundamentalParameterData.java b/src-generated/edu/nps/moves/dis7/IFFFundamentalParameterData.java
index d5c5bf4590be967b739dc998486e7d29287d4710..d5a7adf6af420df3abd8d61cc053bb34eea907a0 100644
--- a/src-generated/edu/nps/moves/dis7/IFFFundamentalParameterData.java
+++ b/src-generated/edu/nps/moves/dis7/IFFFundamentalParameterData.java
@@ -1,320 +1,320 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Fundamental IFF atc data. Section 6.2.45
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class IFFFundamentalParameterData extends Object implements Serializable
-{
- /** ERP */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Fundamental IFF atc data. Section 6.2.45
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class IFFFundamentalParameterData extends Object implements Serializable
+{
+ /** ERP */
protected float erp;
-
- /** frequency */
+
+ /** frequency */
protected float frequency;
-
- /** pgrf */
+
+ /** pgrf */
protected float pgrf;
-
- /** Pulse width */
+
+ /** Pulse width */
protected float pulseWidth;
-
- /** Burst length */
+
+ /** Burst length */
protected int burstLength;
-
- /** Applicable modes enumeration uid 339 */
+
+ /** Applicable modes enumeration uid 339 */
protected IFFApplicableModes applicableModes = IFFApplicableModes.values()[0];
-
- /** System-specific data */
+
+ /** System-specific data */
protected byte[] systemSpecificData = new byte[3];
-
-
-/** Constructor */
- public IFFFundamentalParameterData()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += 4; // erp
- marshalSize += 4; // frequency
- marshalSize += 4; // pgrf
- marshalSize += 4; // pulseWidth
- marshalSize += 4; // burstLength
- marshalSize += applicableModes.getMarshalledSize();
- marshalSize += systemSpecificData.length * 1;
-
- return marshalSize;
-}
-
-
-/** Setter for {@link IFFFundamentalParameterData#erp}*/
-public IFFFundamentalParameterData setErp(float pErp)
+
+
+/** Constructor */
+ public IFFFundamentalParameterData()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 4; // erp
+ marshalSize += 4; // frequency
+ marshalSize += 4; // pgrf
+ marshalSize += 4; // pulseWidth
+ marshalSize += 4; // burstLength
+ marshalSize += applicableModes.getMarshalledSize();
+ marshalSize += systemSpecificData.length * 1;
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link IFFFundamentalParameterData#erp}*/
+public IFFFundamentalParameterData setErp(float pErp)
{
- erp = pErp;
- return this;
-}
-
-/** Getter for {@link IFFFundamentalParameterData#erp}*/
-public float getErp()
+ erp = pErp;
+ return this;
+}
+
+/** Getter for {@link IFFFundamentalParameterData#erp}*/
+public float getErp()
{
return erp;
-}
-
-/** Setter for {@link IFFFundamentalParameterData#frequency}*/
-public IFFFundamentalParameterData setFrequency(float pFrequency)
+}
+
+/** Setter for {@link IFFFundamentalParameterData#frequency}*/
+public IFFFundamentalParameterData setFrequency(float pFrequency)
{
- frequency = pFrequency;
- return this;
-}
-
-/** Getter for {@link IFFFundamentalParameterData#frequency}*/
-public float getFrequency()
+ frequency = pFrequency;
+ return this;
+}
+
+/** Getter for {@link IFFFundamentalParameterData#frequency}*/
+public float getFrequency()
{
return frequency;
-}
-
-/** Setter for {@link IFFFundamentalParameterData#pgrf}*/
-public IFFFundamentalParameterData setPgrf(float pPgrf)
+}
+
+/** Setter for {@link IFFFundamentalParameterData#pgrf}*/
+public IFFFundamentalParameterData setPgrf(float pPgrf)
{
- pgrf = pPgrf;
- return this;
-}
-
-/** Getter for {@link IFFFundamentalParameterData#pgrf}*/
-public float getPgrf()
+ pgrf = pPgrf;
+ return this;
+}
+
+/** Getter for {@link IFFFundamentalParameterData#pgrf}*/
+public float getPgrf()
{
return pgrf;
-}
-
-/** Setter for {@link IFFFundamentalParameterData#pulseWidth}*/
-public IFFFundamentalParameterData setPulseWidth(float pPulseWidth)
+}
+
+/** Setter for {@link IFFFundamentalParameterData#pulseWidth}*/
+public IFFFundamentalParameterData setPulseWidth(float pPulseWidth)
{
- pulseWidth = pPulseWidth;
- return this;
-}
-
-/** Getter for {@link IFFFundamentalParameterData#pulseWidth}*/
-public float getPulseWidth()
+ pulseWidth = pPulseWidth;
+ return this;
+}
+
+/** Getter for {@link IFFFundamentalParameterData#pulseWidth}*/
+public float getPulseWidth()
{
return pulseWidth;
-}
-
-/** Setter for {@link IFFFundamentalParameterData#burstLength}*/
-public IFFFundamentalParameterData setBurstLength(int pBurstLength)
+}
+
+/** Setter for {@link IFFFundamentalParameterData#burstLength}*/
+public IFFFundamentalParameterData setBurstLength(int pBurstLength)
{
- burstLength = pBurstLength;
- return this;
-}
-
-/** Getter for {@link IFFFundamentalParameterData#burstLength}*/
-public int getBurstLength()
+ burstLength = pBurstLength;
+ return this;
+}
+
+/** Getter for {@link IFFFundamentalParameterData#burstLength}*/
+public int getBurstLength()
{
return burstLength;
-}
-
-/** Setter for {@link IFFFundamentalParameterData#applicableModes}*/
-public IFFFundamentalParameterData setApplicableModes(IFFApplicableModes pApplicableModes)
+}
+
+/** Setter for {@link IFFFundamentalParameterData#applicableModes}*/
+public IFFFundamentalParameterData setApplicableModes(IFFApplicableModes pApplicableModes)
{
- applicableModes = pApplicableModes;
- return this;
-}
-
-/** Getter for {@link IFFFundamentalParameterData#applicableModes}*/
-public IFFApplicableModes getApplicableModes()
+ applicableModes = pApplicableModes;
+ return this;
+}
+
+/** Getter for {@link IFFFundamentalParameterData#applicableModes}*/
+public IFFApplicableModes getApplicableModes()
{
return applicableModes;
-}
-
-/** Setter for {@link IFFFundamentalParameterData#systemSpecificData}*/
-public IFFFundamentalParameterData setSystemSpecificData(byte[] pSystemSpecificData)
+}
+
+/** Setter for {@link IFFFundamentalParameterData#systemSpecificData}*/
+public IFFFundamentalParameterData setSystemSpecificData(byte[] pSystemSpecificData)
{
- systemSpecificData = pSystemSpecificData;
- return this;
-}
-
-/** Getter for {@link IFFFundamentalParameterData#systemSpecificData}*/
-public byte[] getSystemSpecificData()
+ systemSpecificData = pSystemSpecificData;
+ return this;
+}
+
+/** Getter for {@link IFFFundamentalParameterData#systemSpecificData}*/
+public byte[] getSystemSpecificData()
{
return systemSpecificData;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeFloat(erp);
- dos.writeFloat(frequency);
- dos.writeFloat(pgrf);
- dos.writeFloat(pulseWidth);
- dos.writeInt(burstLength);
- applicableModes.marshal(dos);
-
- for(int idx = 0; idx < systemSpecificData.length; idx++)
- dos.writeByte(systemSpecificData[idx]);
-
+ {
+ dos.writeFloat(erp);
+ dos.writeFloat(frequency);
+ dos.writeFloat(pgrf);
+ dos.writeFloat(pulseWidth);
+ dos.writeInt(burstLength);
+ applicableModes.marshal(dos);
+
+ for(int idx = 0; idx < systemSpecificData.length; idx++)
+ dos.writeByte(systemSpecificData[idx]);
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- erp = dis.readFloat();
- uPosition += 4;
- frequency = dis.readFloat();
- uPosition += 4;
- pgrf = dis.readFloat();
- uPosition += 4;
- pulseWidth = dis.readFloat();
- uPosition += 4;
- burstLength = dis.readInt();
- uPosition += 4;
- applicableModes = IFFApplicableModes.unmarshalEnum(dis);
- uPosition += applicableModes.getMarshalledSize();
- for(int idx = 0; idx < systemSpecificData.length; idx++)
- systemSpecificData[idx] = dis.readByte();
- uPosition += (systemSpecificData.length * 1);
+ {
+ erp = dis.readFloat();
+ uPosition += 4;
+ frequency = dis.readFloat();
+ uPosition += 4;
+ pgrf = dis.readFloat();
+ uPosition += 4;
+ pulseWidth = dis.readFloat();
+ uPosition += 4;
+ burstLength = dis.readInt();
+ uPosition += 4;
+ applicableModes = IFFApplicableModes.unmarshalEnum(dis);
+ uPosition += applicableModes.getMarshalledSize();
+ for(int idx = 0; idx < systemSpecificData.length; idx++)
+ systemSpecificData[idx] = dis.readByte();
+ uPosition += (systemSpecificData.length * 1);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putFloat( (float)erp);
- buff.putFloat( (float)frequency);
- buff.putFloat( (float)pgrf);
- buff.putFloat( (float)pulseWidth);
- buff.putInt( (int)burstLength);
- applicableModes.marshal(buff);
-
- for(int idx = 0; idx < systemSpecificData.length; idx++)
- buff.put((byte)systemSpecificData[idx]);
-
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- erp = buff.getFloat();
- frequency = buff.getFloat();
- pgrf = buff.getFloat();
- pulseWidth = buff.getFloat();
- burstLength = buff.getInt();
- applicableModes = IFFApplicableModes.unmarshalEnum(buff);
- for(int idx = 0; idx < systemSpecificData.length; idx++)
- systemSpecificData[idx] = buff.get();
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putFloat( (float)erp);
+ buff.putFloat( (float)frequency);
+ buff.putFloat( (float)pgrf);
+ buff.putFloat( (float)pulseWidth);
+ buff.putInt( (int)burstLength);
+ applicableModes.marshal(buff);
+
+ for(int idx = 0; idx < systemSpecificData.length; idx++)
+ buff.put((byte)systemSpecificData[idx]);
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ erp = buff.getFloat();
+ frequency = buff.getFloat();
+ pgrf = buff.getFloat();
+ pulseWidth = buff.getFloat();
+ burstLength = buff.getInt();
+ applicableModes = IFFApplicableModes.unmarshalEnum(buff);
+ for(int idx = 0; idx < systemSpecificData.length; idx++)
+ systemSpecificData[idx] = buff.get();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final IFFFundamentalParameterData rhs = (IFFFundamentalParameterData)obj;
-
- if( ! (erp == rhs.erp)) ivarsEqual = false;
- if( ! (frequency == rhs.frequency)) ivarsEqual = false;
- if( ! (pgrf == rhs.pgrf)) ivarsEqual = false;
- if( ! (pulseWidth == rhs.pulseWidth)) ivarsEqual = false;
- if( ! (burstLength == rhs.burstLength)) ivarsEqual = false;
- if( ! (applicableModes == rhs.applicableModes)) ivarsEqual = false;
-
- for(int idx = 0; idx < 3; idx++)
- {
- if(!(systemSpecificData[idx] == rhs.systemSpecificData[idx])) ivarsEqual = false;
- }
-
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final IFFFundamentalParameterData rhs = (IFFFundamentalParameterData)obj;
+
+ if( ! (erp == rhs.erp)) ivarsEqual = false;
+ if( ! (frequency == rhs.frequency)) ivarsEqual = false;
+ if( ! (pgrf == rhs.pgrf)) ivarsEqual = false;
+ if( ! (pulseWidth == rhs.pulseWidth)) ivarsEqual = false;
+ if( ! (burstLength == rhs.burstLength)) ivarsEqual = false;
+ if( ! (applicableModes == rhs.applicableModes)) ivarsEqual = false;
+
+ for(int idx = 0; idx < 3; idx++)
+ {
+ if(!(systemSpecificData[idx] == rhs.systemSpecificData[idx])) ivarsEqual = false;
+ }
+
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" erp: ").append(erp).append("\n");
- sb.append(" frequency: ").append(frequency).append("\n");
- sb.append(" pgrf: ").append(pgrf).append("\n");
- sb.append(" pulseWidth: ").append(pulseWidth).append("\n");
- sb.append(" burstLength: ").append(burstLength).append("\n");
- sb.append(" applicableModes: ").append(applicableModes).append("\n");
- sb.append(" systemSpecificData: ").append("\n");
- sb.append(Arrays.toString(systemSpecificData)).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" erp: ").append(erp).append("\n");
+ sb.append(" frequency: ").append(frequency).append("\n");
+ sb.append(" pgrf: ").append(pgrf).append("\n");
+ sb.append(" pulseWidth: ").append(pulseWidth).append("\n");
+ sb.append(" burstLength: ").append(burstLength).append("\n");
+ sb.append(" applicableModes: ").append(applicableModes).append("\n");
+ sb.append(" systemSpecificData: ").append("\n");
+ sb.append(Arrays.toString(systemSpecificData)).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/IFFLayer2Pdu.java b/src-generated/edu/nps/moves/dis7/IFFLayer2Pdu.java
index 6360ec5721e6a99a0a91c41e32a75d95d26caecf..3d0aa3395da5638b5855c68fc86e4ca323b759ee 100644
--- a/src-generated/edu/nps/moves/dis7/IFFLayer2Pdu.java
+++ b/src-generated/edu/nps/moves/dis7/IFFLayer2Pdu.java
@@ -1,295 +1,295 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Section 5.3.7.4.2 When present, layer 2 should follow layer 1 and have the following fields. This requires manual cleanup. the beamData attribute semantics are used in multiple ways. UNFINSISHED
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class IFFLayer2Pdu extends IFFPdu implements Serializable
-{
- /** layer header */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Section 5.3.7.4.2 When present, layer 2 should follow layer 1 and have the following fields. This requires manual cleanup. the beamData attribute semantics are used in multiple ways. UNFINSISHED
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class IFFLayer2Pdu extends IFFPdu implements Serializable
+{
+ /** layer header */
protected LayerHeader layerHeader = new LayerHeader();
-
- /** beam data */
+
+ /** beam data */
protected BeamData beamData = new BeamData();
-
+
protected byte secondaryOpParameter1;
-
+
protected byte secondaryOpParameter2;
-
+
protected short numberOfParameters;
-
- /** variable length list of fundamental parameters. */
+
+ /** variable length list of fundamental parameters. */
protected List< IFFFundamentalParameterData > fundamentalIFFParameters = new ArrayList< IFFFundamentalParameterData >();
-
-
-/** Constructor */
- public IFFLayer2Pdu()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += layerHeader.getMarshalledSize();
- marshalSize += beamData.getMarshalledSize();
- marshalSize += 1; // secondaryOpParameter1
- marshalSize += 1; // secondaryOpParameter2
- marshalSize += 2; // numberOfParameters
- for(int idx=0; idx < fundamentalIFFParameters.size(); idx++)
- {
- IFFFundamentalParameterData listElement = fundamentalIFFParameters.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link IFFLayer2Pdu#layerHeader}*/
-public IFFLayer2Pdu setLayerHeader(LayerHeader pLayerHeader)
+
+
+/** Constructor */
+ public IFFLayer2Pdu()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += layerHeader.getMarshalledSize();
+ marshalSize += beamData.getMarshalledSize();
+ marshalSize += 1; // secondaryOpParameter1
+ marshalSize += 1; // secondaryOpParameter2
+ marshalSize += 2; // numberOfParameters
+ for(int idx=0; idx < fundamentalIFFParameters.size(); idx++)
+ {
+ IFFFundamentalParameterData listElement = fundamentalIFFParameters.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link IFFLayer2Pdu#layerHeader}*/
+public IFFLayer2Pdu setLayerHeader(LayerHeader pLayerHeader)
{
- layerHeader = pLayerHeader;
- return this;
-}
-
-/** Getter for {@link IFFLayer2Pdu#layerHeader}*/
-public LayerHeader getLayerHeader()
+ layerHeader = pLayerHeader;
+ return this;
+}
+
+/** Getter for {@link IFFLayer2Pdu#layerHeader}*/
+public LayerHeader getLayerHeader()
{
return layerHeader;
-}
-
-/** Setter for {@link IFFLayer2Pdu#beamData}*/
-public IFFLayer2Pdu setBeamData(BeamData pBeamData)
+}
+
+/** Setter for {@link IFFLayer2Pdu#beamData}*/
+public IFFLayer2Pdu setBeamData(BeamData pBeamData)
{
- beamData = pBeamData;
- return this;
-}
-
-/** Getter for {@link IFFLayer2Pdu#beamData}*/
-public BeamData getBeamData()
+ beamData = pBeamData;
+ return this;
+}
+
+/** Getter for {@link IFFLayer2Pdu#beamData}*/
+public BeamData getBeamData()
{
return beamData;
-}
-
-/** Setter for {@link IFFLayer2Pdu#secondaryOpParameter1}*/
-public IFFLayer2Pdu setSecondaryOpParameter1(byte pSecondaryOpParameter1)
+}
+
+/** Setter for {@link IFFLayer2Pdu#secondaryOpParameter1}*/
+public IFFLayer2Pdu setSecondaryOpParameter1(byte pSecondaryOpParameter1)
{
- secondaryOpParameter1 = pSecondaryOpParameter1;
- return this;
-}
-
-/** Getter for {@link IFFLayer2Pdu#secondaryOpParameter1}*/
-public byte getSecondaryOpParameter1()
+ secondaryOpParameter1 = pSecondaryOpParameter1;
+ return this;
+}
+
+/** Getter for {@link IFFLayer2Pdu#secondaryOpParameter1}*/
+public byte getSecondaryOpParameter1()
{
return secondaryOpParameter1;
-}
-
-/** Setter for {@link IFFLayer2Pdu#secondaryOpParameter2}*/
-public IFFLayer2Pdu setSecondaryOpParameter2(byte pSecondaryOpParameter2)
+}
+
+/** Setter for {@link IFFLayer2Pdu#secondaryOpParameter2}*/
+public IFFLayer2Pdu setSecondaryOpParameter2(byte pSecondaryOpParameter2)
{
- secondaryOpParameter2 = pSecondaryOpParameter2;
- return this;
-}
-
-/** Getter for {@link IFFLayer2Pdu#secondaryOpParameter2}*/
-public byte getSecondaryOpParameter2()
+ secondaryOpParameter2 = pSecondaryOpParameter2;
+ return this;
+}
+
+/** Getter for {@link IFFLayer2Pdu#secondaryOpParameter2}*/
+public byte getSecondaryOpParameter2()
{
return secondaryOpParameter2;
-}
-
-/** Setter for {@link IFFLayer2Pdu#fundamentalIFFParameters}*/
-public IFFLayer2Pdu setFundamentalIFFParameters(List<IFFFundamentalParameterData> pFundamentalIFFParameters)
+}
+
+/** Setter for {@link IFFLayer2Pdu#fundamentalIFFParameters}*/
+public IFFLayer2Pdu setFundamentalIFFParameters(List<IFFFundamentalParameterData> pFundamentalIFFParameters)
{
- fundamentalIFFParameters = pFundamentalIFFParameters;
- return this;
-}
-
-/** Getter for {@link IFFLayer2Pdu#fundamentalIFFParameters}*/
-public List<IFFFundamentalParameterData> getFundamentalIFFParameters()
+ fundamentalIFFParameters = pFundamentalIFFParameters;
+ return this;
+}
+
+/** Getter for {@link IFFLayer2Pdu#fundamentalIFFParameters}*/
+public List<IFFFundamentalParameterData> getFundamentalIFFParameters()
{
return fundamentalIFFParameters;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- layerHeader.marshal(dos);
- beamData.marshal(dos);
- dos.writeByte(secondaryOpParameter1);
- dos.writeByte(secondaryOpParameter2);
- dos.writeShort(fundamentalIFFParameters.size());
-
- for(int idx = 0; idx < fundamentalIFFParameters.size(); idx++)
- {
- IFFFundamentalParameterData aIFFFundamentalParameterData = fundamentalIFFParameters.get(idx);
- aIFFFundamentalParameterData.marshal(dos);
- }
-
+ {
+ layerHeader.marshal(dos);
+ beamData.marshal(dos);
+ dos.writeByte(secondaryOpParameter1);
+ dos.writeByte(secondaryOpParameter2);
+ dos.writeShort(fundamentalIFFParameters.size());
+
+ for(int idx = 0; idx < fundamentalIFFParameters.size(); idx++)
+ {
+ IFFFundamentalParameterData aIFFFundamentalParameterData = fundamentalIFFParameters.get(idx);
+ aIFFFundamentalParameterData.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += layerHeader.unmarshal(dis);
- uPosition += beamData.unmarshal(dis);
- secondaryOpParameter1 = (byte)dis.readUnsignedByte();
- uPosition += 1;
- secondaryOpParameter2 = (byte)dis.readUnsignedByte();
- uPosition += 1;
- numberOfParameters = (short)dis.readUnsignedShort();
- uPosition += 2;
- for(int idx = 0; idx < numberOfParameters; idx++)
- {
- IFFFundamentalParameterData anX = new IFFFundamentalParameterData();
- uPosition += anX.unmarshal(dis);
- fundamentalIFFParameters.add(anX);
- }
-
+ {
+ uPosition += layerHeader.unmarshal(dis);
+ uPosition += beamData.unmarshal(dis);
+ secondaryOpParameter1 = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ secondaryOpParameter2 = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ numberOfParameters = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ for(int idx = 0; idx < numberOfParameters; idx++)
+ {
+ IFFFundamentalParameterData anX = new IFFFundamentalParameterData();
+ uPosition += anX.unmarshal(dis);
+ fundamentalIFFParameters.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- layerHeader.marshal(buff);
- beamData.marshal(buff);
- buff.put( (byte)secondaryOpParameter1);
- buff.put( (byte)secondaryOpParameter2);
- buff.putShort( (short)fundamentalIFFParameters.size());
-
- for(int idx = 0; idx < fundamentalIFFParameters.size(); idx++)
- {
- IFFFundamentalParameterData aIFFFundamentalParameterData = fundamentalIFFParameters.get(idx);
- aIFFFundamentalParameterData.marshal(buff);
- }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ layerHeader.marshal(buff);
+ beamData.marshal(buff);
+ buff.put( (byte)secondaryOpParameter1);
+ buff.put( (byte)secondaryOpParameter2);
+ buff.putShort( (short)fundamentalIFFParameters.size());
+
+ for(int idx = 0; idx < fundamentalIFFParameters.size(); idx++)
+ {
+ IFFFundamentalParameterData aIFFFundamentalParameterData = fundamentalIFFParameters.get(idx);
+ aIFFFundamentalParameterData.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- layerHeader.unmarshal(buff);
- beamData.unmarshal(buff);
- secondaryOpParameter1 = (byte)(buff.get() & 0xFF);
- secondaryOpParameter2 = (byte)(buff.get() & 0xFF);
- numberOfParameters = (short)(buff.getShort() & 0xFFFF);
- for(int idx = 0; idx < numberOfParameters; idx++)
- {
- IFFFundamentalParameterData anX = new IFFFundamentalParameterData();
- anX.unmarshal(buff);
- fundamentalIFFParameters.add(anX);
- }
-
- return getMarshalledSize();
+
+ layerHeader.unmarshal(buff);
+ beamData.unmarshal(buff);
+ secondaryOpParameter1 = (byte)(buff.get() & 0xFF);
+ secondaryOpParameter2 = (byte)(buff.get() & 0xFF);
+ numberOfParameters = (short)(buff.getShort() & 0xFFFF);
+ for(int idx = 0; idx < numberOfParameters; idx++)
+ {
+ IFFFundamentalParameterData anX = new IFFFundamentalParameterData();
+ anX.unmarshal(buff);
+ fundamentalIFFParameters.add(anX);
+ }
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final IFFLayer2Pdu rhs = (IFFLayer2Pdu)obj;
-
- if( ! (layerHeader.equals( rhs.layerHeader) )) ivarsEqual = false;
- if( ! (beamData.equals( rhs.beamData) )) ivarsEqual = false;
- if( ! (secondaryOpParameter1 == rhs.secondaryOpParameter1)) ivarsEqual = false;
- if( ! (secondaryOpParameter2 == rhs.secondaryOpParameter2)) ivarsEqual = false;
-
- for(int idx = 0; idx < fundamentalIFFParameters.size(); idx++)
- if( ! ( fundamentalIFFParameters.get(idx).equals(rhs.fundamentalIFFParameters.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final IFFLayer2Pdu rhs = (IFFLayer2Pdu)obj;
+
+ if( ! (layerHeader.equals( rhs.layerHeader) )) ivarsEqual = false;
+ if( ! (beamData.equals( rhs.beamData) )) ivarsEqual = false;
+ if( ! (secondaryOpParameter1 == rhs.secondaryOpParameter1)) ivarsEqual = false;
+ if( ! (secondaryOpParameter2 == rhs.secondaryOpParameter2)) ivarsEqual = false;
+
+ for(int idx = 0; idx < fundamentalIFFParameters.size(); idx++)
+ if( ! ( fundamentalIFFParameters.get(idx).equals(rhs.fundamentalIFFParameters.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" layerHeader: ").append(layerHeader).append("\n");
- sb.append(" beamData: ").append(beamData).append("\n");
- sb.append(" secondaryOpParameter1: ").append(secondaryOpParameter1).append("\n");
- sb.append(" secondaryOpParameter2: ").append(secondaryOpParameter2).append("\n");
- sb.append(" fundamentalIFFParameters: ").append("\n");
- fundamentalIFFParameters.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" layerHeader: ").append(layerHeader).append("\n");
+ sb.append(" beamData: ").append(beamData).append("\n");
+ sb.append(" secondaryOpParameter1: ").append(secondaryOpParameter1).append("\n");
+ sb.append(" secondaryOpParameter2: ").append(secondaryOpParameter2).append("\n");
+ sb.append(" fundamentalIFFParameters: ").append("\n");
+ fundamentalIFFParameters.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/IFFPdu.java b/src-generated/edu/nps/moves/dis7/IFFPdu.java
index 2025f435b8e7d9ce241ddc6bb99ae4fa8f08871c..c76fa15c824175176d3686b3af0769cd2c4ad42d 100644
--- a/src-generated/edu/nps/moves/dis7/IFFPdu.java
+++ b/src-generated/edu/nps/moves/dis7/IFFPdu.java
@@ -1,301 +1,301 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class IFFPdu extends DistributedEmissionsFamilyPdu implements Serializable
-{
- /** ID of the entity that is the source of the emissions */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class IFFPdu extends DistributedEmissionsFamilyPdu implements Serializable
+{
+ /** ID of the entity that is the source of the emissions */
protected EntityID emittingEntityId = new EntityID();
-
- /** Number generated by the issuing simulation to associate realted events. */
+
+ /** Number generated by the issuing simulation to associate realted events. */
protected EventIdentifier eventID = new EventIdentifier();
-
- /** Location wrt entity. There is some ambiguity in the standard here, but this is the order it is listed in the table. */
+
+ /** Location wrt entity. There is some ambiguity in the standard here, but this is the order it is listed in the table. */
protected Vector3Float location = new Vector3Float();
-
- /** System ID information */
+
+ /** System ID information */
protected SystemIdentifier systemID = new SystemIdentifier();
-
+
protected byte systemDesignator;
-
+
protected byte systemSpecificData;
-
- /** fundamental parameters */
+
+ /** fundamental parameters */
protected FundamentalOperationalData fundamentalParameters = new FundamentalOperationalData();
-
-
-/** Constructor */
- public IFFPdu()
- {
- setPduType( DISPDUType.IDENTIFICATION_FRIEND_OR_FOE );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += emittingEntityId.getMarshalledSize();
- marshalSize += eventID.getMarshalledSize();
- marshalSize += location.getMarshalledSize();
- marshalSize += systemID.getMarshalledSize();
- marshalSize += 1; // systemDesignator
- marshalSize += 1; // systemSpecificData
- marshalSize += fundamentalParameters.getMarshalledSize();
-
- return marshalSize;
-}
-
-
-/** Setter for {@link IFFPdu#emittingEntityId}*/
-public IFFPdu setEmittingEntityId(EntityID pEmittingEntityId)
+
+
+/** Constructor */
+ public IFFPdu()
+ {
+ setPduType( DISPDUType.IDENTIFICATION_FRIEND_OR_FOE );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += emittingEntityId.getMarshalledSize();
+ marshalSize += eventID.getMarshalledSize();
+ marshalSize += location.getMarshalledSize();
+ marshalSize += systemID.getMarshalledSize();
+ marshalSize += 1; // systemDesignator
+ marshalSize += 1; // systemSpecificData
+ marshalSize += fundamentalParameters.getMarshalledSize();
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link IFFPdu#emittingEntityId}*/
+public IFFPdu setEmittingEntityId(EntityID pEmittingEntityId)
{
- emittingEntityId = pEmittingEntityId;
- return this;
-}
-
-/** Getter for {@link IFFPdu#emittingEntityId}*/
-public EntityID getEmittingEntityId()
+ emittingEntityId = pEmittingEntityId;
+ return this;
+}
+
+/** Getter for {@link IFFPdu#emittingEntityId}*/
+public EntityID getEmittingEntityId()
{
return emittingEntityId;
-}
-
-/** Setter for {@link IFFPdu#eventID}*/
-public IFFPdu setEventID(EventIdentifier pEventID)
+}
+
+/** Setter for {@link IFFPdu#eventID}*/
+public IFFPdu setEventID(EventIdentifier pEventID)
{
- eventID = pEventID;
- return this;
-}
-
-/** Getter for {@link IFFPdu#eventID}*/
-public EventIdentifier getEventID()
+ eventID = pEventID;
+ return this;
+}
+
+/** Getter for {@link IFFPdu#eventID}*/
+public EventIdentifier getEventID()
{
return eventID;
-}
-
-/** Setter for {@link IFFPdu#location}*/
-public IFFPdu setLocation(Vector3Float pLocation)
+}
+
+/** Setter for {@link IFFPdu#location}*/
+public IFFPdu setLocation(Vector3Float pLocation)
{
- location = pLocation;
- return this;
-}
-
-/** Getter for {@link IFFPdu#location}*/
-public Vector3Float getLocation()
+ location = pLocation;
+ return this;
+}
+
+/** Getter for {@link IFFPdu#location}*/
+public Vector3Float getLocation()
{
return location;
-}
-
-/** Setter for {@link IFFPdu#systemID}*/
-public IFFPdu setSystemID(SystemIdentifier pSystemID)
+}
+
+/** Setter for {@link IFFPdu#systemID}*/
+public IFFPdu setSystemID(SystemIdentifier pSystemID)
{
- systemID = pSystemID;
- return this;
-}
-
-/** Getter for {@link IFFPdu#systemID}*/
-public SystemIdentifier getSystemID()
+ systemID = pSystemID;
+ return this;
+}
+
+/** Getter for {@link IFFPdu#systemID}*/
+public SystemIdentifier getSystemID()
{
return systemID;
-}
-
-/** Setter for {@link IFFPdu#systemDesignator}*/
-public IFFPdu setSystemDesignator(byte pSystemDesignator)
+}
+
+/** Setter for {@link IFFPdu#systemDesignator}*/
+public IFFPdu setSystemDesignator(byte pSystemDesignator)
{
- systemDesignator = pSystemDesignator;
- return this;
-}
-
-/** Getter for {@link IFFPdu#systemDesignator}*/
-public byte getSystemDesignator()
+ systemDesignator = pSystemDesignator;
+ return this;
+}
+
+/** Getter for {@link IFFPdu#systemDesignator}*/
+public byte getSystemDesignator()
{
return systemDesignator;
-}
-
-/** Setter for {@link IFFPdu#systemSpecificData}*/
-public IFFPdu setSystemSpecificData(byte pSystemSpecificData)
+}
+
+/** Setter for {@link IFFPdu#systemSpecificData}*/
+public IFFPdu setSystemSpecificData(byte pSystemSpecificData)
{
- systemSpecificData = pSystemSpecificData;
- return this;
-}
-
-/** Getter for {@link IFFPdu#systemSpecificData}*/
-public byte getSystemSpecificData()
+ systemSpecificData = pSystemSpecificData;
+ return this;
+}
+
+/** Getter for {@link IFFPdu#systemSpecificData}*/
+public byte getSystemSpecificData()
{
return systemSpecificData;
-}
-
-/** Setter for {@link IFFPdu#fundamentalParameters}*/
-public IFFPdu setFundamentalParameters(FundamentalOperationalData pFundamentalParameters)
+}
+
+/** Setter for {@link IFFPdu#fundamentalParameters}*/
+public IFFPdu setFundamentalParameters(FundamentalOperationalData pFundamentalParameters)
{
- fundamentalParameters = pFundamentalParameters;
- return this;
-}
-
-/** Getter for {@link IFFPdu#fundamentalParameters}*/
-public FundamentalOperationalData getFundamentalParameters()
+ fundamentalParameters = pFundamentalParameters;
+ return this;
+}
+
+/** Getter for {@link IFFPdu#fundamentalParameters}*/
+public FundamentalOperationalData getFundamentalParameters()
{
return fundamentalParameters;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- emittingEntityId.marshal(dos);
- eventID.marshal(dos);
- location.marshal(dos);
- systemID.marshal(dos);
- dos.writeByte(systemDesignator);
- dos.writeByte(systemSpecificData);
- fundamentalParameters.marshal(dos);
+ {
+ emittingEntityId.marshal(dos);
+ eventID.marshal(dos);
+ location.marshal(dos);
+ systemID.marshal(dos);
+ dos.writeByte(systemDesignator);
+ dos.writeByte(systemSpecificData);
+ fundamentalParameters.marshal(dos);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += emittingEntityId.unmarshal(dis);
- uPosition += eventID.unmarshal(dis);
- uPosition += location.unmarshal(dis);
- uPosition += systemID.unmarshal(dis);
- systemDesignator = (byte)dis.readUnsignedByte();
- uPosition += 1;
- systemSpecificData = (byte)dis.readUnsignedByte();
- uPosition += 1;
- uPosition += fundamentalParameters.unmarshal(dis);
+ {
+ uPosition += emittingEntityId.unmarshal(dis);
+ uPosition += eventID.unmarshal(dis);
+ uPosition += location.unmarshal(dis);
+ uPosition += systemID.unmarshal(dis);
+ systemDesignator = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ systemSpecificData = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ uPosition += fundamentalParameters.unmarshal(dis);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- emittingEntityId.marshal(buff);
- eventID.marshal(buff);
- location.marshal(buff);
- systemID.marshal(buff);
- buff.put( (byte)systemDesignator);
- buff.put( (byte)systemSpecificData);
- fundamentalParameters.marshal(buff);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ emittingEntityId.marshal(buff);
+ eventID.marshal(buff);
+ location.marshal(buff);
+ systemID.marshal(buff);
+ buff.put( (byte)systemDesignator);
+ buff.put( (byte)systemSpecificData);
+ fundamentalParameters.marshal(buff);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- emittingEntityId.unmarshal(buff);
- eventID.unmarshal(buff);
- location.unmarshal(buff);
- systemID.unmarshal(buff);
- systemDesignator = (byte)(buff.get() & 0xFF);
- systemSpecificData = (byte)(buff.get() & 0xFF);
- fundamentalParameters.unmarshal(buff);
- return getMarshalledSize();
+
+ emittingEntityId.unmarshal(buff);
+ eventID.unmarshal(buff);
+ location.unmarshal(buff);
+ systemID.unmarshal(buff);
+ systemDesignator = (byte)(buff.get() & 0xFF);
+ systemSpecificData = (byte)(buff.get() & 0xFF);
+ fundamentalParameters.unmarshal(buff);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final IFFPdu rhs = (IFFPdu)obj;
-
- if( ! (emittingEntityId.equals( rhs.emittingEntityId) )) ivarsEqual = false;
- if( ! (eventID.equals( rhs.eventID) )) ivarsEqual = false;
- if( ! (location.equals( rhs.location) )) ivarsEqual = false;
- if( ! (systemID.equals( rhs.systemID) )) ivarsEqual = false;
- if( ! (systemDesignator == rhs.systemDesignator)) ivarsEqual = false;
- if( ! (systemSpecificData == rhs.systemSpecificData)) ivarsEqual = false;
- if( ! (fundamentalParameters.equals( rhs.fundamentalParameters) )) ivarsEqual = false;
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final IFFPdu rhs = (IFFPdu)obj;
+
+ if( ! (emittingEntityId.equals( rhs.emittingEntityId) )) ivarsEqual = false;
+ if( ! (eventID.equals( rhs.eventID) )) ivarsEqual = false;
+ if( ! (location.equals( rhs.location) )) ivarsEqual = false;
+ if( ! (systemID.equals( rhs.systemID) )) ivarsEqual = false;
+ if( ! (systemDesignator == rhs.systemDesignator)) ivarsEqual = false;
+ if( ! (systemSpecificData == rhs.systemSpecificData)) ivarsEqual = false;
+ if( ! (fundamentalParameters.equals( rhs.fundamentalParameters) )) ivarsEqual = false;
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" emittingEntityId: ").append(emittingEntityId).append("\n");
- sb.append(" eventID: ").append(eventID).append("\n");
- sb.append(" location: ").append(location).append("\n");
- sb.append(" systemID: ").append(systemID).append("\n");
- sb.append(" systemDesignator: ").append(systemDesignator).append("\n");
- sb.append(" systemSpecificData: ").append(systemSpecificData).append("\n");
- sb.append(" fundamentalParameters: ").append(fundamentalParameters).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" emittingEntityId: ").append(emittingEntityId).append("\n");
+ sb.append(" eventID: ").append(eventID).append("\n");
+ sb.append(" location: ").append(location).append("\n");
+ sb.append(" systemID: ").append(systemID).append("\n");
+ sb.append(" systemDesignator: ").append(systemDesignator).append("\n");
+ sb.append(" systemSpecificData: ").append(systemSpecificData).append("\n");
+ sb.append(" fundamentalParameters: ").append(fundamentalParameters).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/IOCommsNodeRecord.java b/src-generated/edu/nps/moves/dis7/IOCommsNodeRecord.java
index 39aa6e18fe439aa362787659e8ccdee33a255204..997137b97287fc8a97d124ca9672a89256e93059 100644
--- a/src-generated/edu/nps/moves/dis7/IOCommsNodeRecord.java
+++ b/src-generated/edu/nps/moves/dis7/IOCommsNodeRecord.java
@@ -1,256 +1,256 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 6.2.48.2
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class IOCommsNodeRecord extends IORecord implements Serializable
-{
- /** uid 66 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 6.2.48.2
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class IOCommsNodeRecord extends IORecord implements Serializable
+{
+ /** uid 66 */
protected VariableRecordType recordType = VariableRecordType.IO_COMMUNICATIONS_NODE;
-
+
protected short recordLength;
-
- /** uid 294 */
+
+ /** uid 294 */
protected IOCommsNodeRecordCommsNodeType commsNodeType = IOCommsNodeRecordCommsNodeType.values()[0];
-
+
protected byte padding;
-
+
protected CommunicationsNodeID commsNodeId = new CommunicationsNodeID();
-
-
-/** Constructor */
- public IOCommsNodeRecord()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public IOCommsNodeRecord()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += recordType.getMarshalledSize();
+ marshalSize += 2; // recordLength
+ marshalSize += commsNodeType.getMarshalledSize();
+ marshalSize += 1; // padding
+ marshalSize += commsNodeId.getMarshalledSize();
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link IOCommsNodeRecord#recordType}*/
+public IOCommsNodeRecord setRecordType(VariableRecordType pRecordType)
{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += recordType.getMarshalledSize();
- marshalSize += 2; // recordLength
- marshalSize += commsNodeType.getMarshalledSize();
- marshalSize += 1; // padding
- marshalSize += commsNodeId.getMarshalledSize();
-
- return marshalSize;
-}
-
-
-/** Setter for {@link IOCommsNodeRecord#recordType}*/
-public IOCommsNodeRecord setRecordType(VariableRecordType pRecordType)
-{
- recordType = pRecordType;
- return this;
-}
-
-/** Getter for {@link IOCommsNodeRecord#recordType}*/
-public VariableRecordType getRecordType()
+ recordType = pRecordType;
+ return this;
+}
+
+/** Getter for {@link IOCommsNodeRecord#recordType}*/
+public VariableRecordType getRecordType()
{
return recordType;
-}
-
-/** Setter for {@link IOCommsNodeRecord#recordLength}*/
-public IOCommsNodeRecord setRecordLength(short pRecordLength)
+}
+
+/** Setter for {@link IOCommsNodeRecord#recordLength}*/
+public IOCommsNodeRecord setRecordLength(short pRecordLength)
{
- recordLength = pRecordLength;
- return this;
-}
-
-/** Getter for {@link IOCommsNodeRecord#recordLength}*/
-public short getRecordLength()
+ recordLength = pRecordLength;
+ return this;
+}
+
+/** Getter for {@link IOCommsNodeRecord#recordLength}*/
+public short getRecordLength()
{
return recordLength;
-}
-
-/** Setter for {@link IOCommsNodeRecord#commsNodeType}*/
-public IOCommsNodeRecord setCommsNodeType(IOCommsNodeRecordCommsNodeType pCommsNodeType)
+}
+
+/** Setter for {@link IOCommsNodeRecord#commsNodeType}*/
+public IOCommsNodeRecord setCommsNodeType(IOCommsNodeRecordCommsNodeType pCommsNodeType)
{
- commsNodeType = pCommsNodeType;
- return this;
-}
-
-/** Getter for {@link IOCommsNodeRecord#commsNodeType}*/
-public IOCommsNodeRecordCommsNodeType getCommsNodeType()
+ commsNodeType = pCommsNodeType;
+ return this;
+}
+
+/** Getter for {@link IOCommsNodeRecord#commsNodeType}*/
+public IOCommsNodeRecordCommsNodeType getCommsNodeType()
{
return commsNodeType;
-}
-
-/** Setter for {@link IOCommsNodeRecord#padding}*/
-public IOCommsNodeRecord setPadding(byte pPadding)
+}
+
+/** Setter for {@link IOCommsNodeRecord#padding}*/
+public IOCommsNodeRecord setPadding(byte pPadding)
{
- padding = pPadding;
- return this;
-}
-
-/** Getter for {@link IOCommsNodeRecord#padding}*/
-public byte getPadding()
+ padding = pPadding;
+ return this;
+}
+
+/** Getter for {@link IOCommsNodeRecord#padding}*/
+public byte getPadding()
{
return padding;
-}
-
-/** Setter for {@link IOCommsNodeRecord#commsNodeId}*/
-public IOCommsNodeRecord setCommsNodeId(CommunicationsNodeID pCommsNodeId)
+}
+
+/** Setter for {@link IOCommsNodeRecord#commsNodeId}*/
+public IOCommsNodeRecord setCommsNodeId(CommunicationsNodeID pCommsNodeId)
{
- commsNodeId = pCommsNodeId;
- return this;
-}
-
-/** Getter for {@link IOCommsNodeRecord#commsNodeId}*/
-public CommunicationsNodeID getCommsNodeId()
+ commsNodeId = pCommsNodeId;
+ return this;
+}
+
+/** Getter for {@link IOCommsNodeRecord#commsNodeId}*/
+public CommunicationsNodeID getCommsNodeId()
{
return commsNodeId;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- recordType.marshal(dos);
- dos.writeShort(recordLength);
- commsNodeType.marshal(dos);
- dos.writeByte(padding);
- commsNodeId.marshal(dos);
+ {
+ recordType.marshal(dos);
+ dos.writeShort(recordLength);
+ commsNodeType.marshal(dos);
+ dos.writeByte(padding);
+ commsNodeId.marshal(dos);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- recordType = VariableRecordType.unmarshalEnum(dis);
- uPosition += recordType.getMarshalledSize();
- recordLength = (short)dis.readUnsignedShort();
- uPosition += 2;
- commsNodeType = IOCommsNodeRecordCommsNodeType.unmarshalEnum(dis);
- uPosition += commsNodeType.getMarshalledSize();
- padding = (byte)dis.readUnsignedByte();
- uPosition += 1;
- uPosition += commsNodeId.unmarshal(dis);
+ {
+ recordType = VariableRecordType.unmarshalEnum(dis);
+ uPosition += recordType.getMarshalledSize();
+ recordLength = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ commsNodeType = IOCommsNodeRecordCommsNodeType.unmarshalEnum(dis);
+ uPosition += commsNodeType.getMarshalledSize();
+ padding = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ uPosition += commsNodeId.unmarshal(dis);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- recordType.marshal(buff);
- buff.putShort( (short)recordLength);
- commsNodeType.marshal(buff);
- buff.put( (byte)padding);
- commsNodeId.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ recordType.marshal(buff);
+ buff.putShort( (short)recordLength);
+ commsNodeType.marshal(buff);
+ buff.put( (byte)padding);
+ commsNodeId.marshal(buff);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- recordType = VariableRecordType.unmarshalEnum(buff);
- recordLength = (short)(buff.getShort() & 0xFFFF);
- commsNodeType = IOCommsNodeRecordCommsNodeType.unmarshalEnum(buff);
- padding = (byte)(buff.get() & 0xFF);
- commsNodeId.unmarshal(buff);
- return getMarshalledSize();
+
+ recordType = VariableRecordType.unmarshalEnum(buff);
+ recordLength = (short)(buff.getShort() & 0xFFFF);
+ commsNodeType = IOCommsNodeRecordCommsNodeType.unmarshalEnum(buff);
+ padding = (byte)(buff.get() & 0xFF);
+ commsNodeId.unmarshal(buff);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final IOCommsNodeRecord rhs = (IOCommsNodeRecord)obj;
-
- if( ! (recordType == rhs.recordType)) ivarsEqual = false;
- if( ! (recordLength == rhs.recordLength)) ivarsEqual = false;
- if( ! (commsNodeType == rhs.commsNodeType)) ivarsEqual = false;
- if( ! (padding == rhs.padding)) ivarsEqual = false;
- if( ! (commsNodeId.equals( rhs.commsNodeId) )) ivarsEqual = false;
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final IOCommsNodeRecord rhs = (IOCommsNodeRecord)obj;
+
+ if( ! (recordType == rhs.recordType)) ivarsEqual = false;
+ if( ! (recordLength == rhs.recordLength)) ivarsEqual = false;
+ if( ! (commsNodeType == rhs.commsNodeType)) ivarsEqual = false;
+ if( ! (padding == rhs.padding)) ivarsEqual = false;
+ if( ! (commsNodeId.equals( rhs.commsNodeId) )) ivarsEqual = false;
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" recordType: ").append(recordType).append("\n");
- sb.append(" recordLength: ").append(recordLength).append("\n");
- sb.append(" commsNodeType: ").append(commsNodeType).append("\n");
- sb.append(" padding: ").append(padding).append("\n");
- sb.append(" commsNodeId: ").append(commsNodeId).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" recordType: ").append(recordType).append("\n");
+ sb.append(" recordLength: ").append(recordLength).append("\n");
+ sb.append(" commsNodeType: ").append(commsNodeType).append("\n");
+ sb.append(" padding: ").append(padding).append("\n");
+ sb.append(" commsNodeId: ").append(commsNodeId).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/IOEffectRecord.java b/src-generated/edu/nps/moves/dis7/IOEffectRecord.java
index 780273000b72b83f43b81e95a9d556e6f342d431..087c3a9e369a7e287c0b877cd366b4fd88cc686d 100644
--- a/src-generated/edu/nps/moves/dis7/IOEffectRecord.java
+++ b/src-generated/edu/nps/moves/dis7/IOEffectRecord.java
@@ -1,352 +1,352 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 6.2.48.3
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class IOEffectRecord extends IORecord implements Serializable
-{
- /** uid 66 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 6.2.48.3
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class IOEffectRecord extends IORecord implements Serializable
+{
+ /** uid 66 */
protected VariableRecordType recordType = VariableRecordType.IO_EFFECT;
-
+
protected short recordLength;
-
- /** uid 290 */
+
+ /** uid 290 */
protected IOEffectsRecordIOStatus ioStatus = IOEffectsRecordIOStatus.values()[0];
-
- /** uid 291 */
+
+ /** uid 291 */
protected IOEffectsRecordIOLinkType ioLinkType = IOEffectsRecordIOLinkType.values()[0];
-
- /** uid 292 */
+
+ /** uid 292 */
protected IOEffectsRecordIOEffect ioEffect = IOEffectsRecordIOEffect.values()[0];
-
+
protected byte ioEffectDutyCycle;
-
+
protected short ioEffectDuration;
-
- /** uid 293 */
+
+ /** uid 293 */
protected IOEffectsRecordIOProcess ioProcess = IOEffectsRecordIOProcess.values()[0];
-
+
protected short padding;
-
-
-/** Constructor */
- public IOEffectRecord()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public IOEffectRecord()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += recordType.getMarshalledSize();
+ marshalSize += 2; // recordLength
+ marshalSize += ioStatus.getMarshalledSize();
+ marshalSize += ioLinkType.getMarshalledSize();
+ marshalSize += ioEffect.getMarshalledSize();
+ marshalSize += 1; // ioEffectDutyCycle
+ marshalSize += 2; // ioEffectDuration
+ marshalSize += ioProcess.getMarshalledSize();
+ marshalSize += 2; // padding
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link IOEffectRecord#recordType}*/
+public IOEffectRecord setRecordType(VariableRecordType pRecordType)
{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += recordType.getMarshalledSize();
- marshalSize += 2; // recordLength
- marshalSize += ioStatus.getMarshalledSize();
- marshalSize += ioLinkType.getMarshalledSize();
- marshalSize += ioEffect.getMarshalledSize();
- marshalSize += 1; // ioEffectDutyCycle
- marshalSize += 2; // ioEffectDuration
- marshalSize += ioProcess.getMarshalledSize();
- marshalSize += 2; // padding
-
- return marshalSize;
-}
-
-
-/** Setter for {@link IOEffectRecord#recordType}*/
-public IOEffectRecord setRecordType(VariableRecordType pRecordType)
-{
- recordType = pRecordType;
- return this;
-}
-
-/** Getter for {@link IOEffectRecord#recordType}*/
-public VariableRecordType getRecordType()
+ recordType = pRecordType;
+ return this;
+}
+
+/** Getter for {@link IOEffectRecord#recordType}*/
+public VariableRecordType getRecordType()
{
return recordType;
-}
-
-/** Setter for {@link IOEffectRecord#recordLength}*/
-public IOEffectRecord setRecordLength(short pRecordLength)
+}
+
+/** Setter for {@link IOEffectRecord#recordLength}*/
+public IOEffectRecord setRecordLength(short pRecordLength)
{
- recordLength = pRecordLength;
- return this;
-}
-
-/** Getter for {@link IOEffectRecord#recordLength}*/
-public short getRecordLength()
+ recordLength = pRecordLength;
+ return this;
+}
+
+/** Getter for {@link IOEffectRecord#recordLength}*/
+public short getRecordLength()
{
return recordLength;
-}
-
-/** Setter for {@link IOEffectRecord#ioStatus}*/
-public IOEffectRecord setIoStatus(IOEffectsRecordIOStatus pIoStatus)
+}
+
+/** Setter for {@link IOEffectRecord#ioStatus}*/
+public IOEffectRecord setIoStatus(IOEffectsRecordIOStatus pIoStatus)
{
- ioStatus = pIoStatus;
- return this;
-}
-
-/** Getter for {@link IOEffectRecord#ioStatus}*/
-public IOEffectsRecordIOStatus getIoStatus()
+ ioStatus = pIoStatus;
+ return this;
+}
+
+/** Getter for {@link IOEffectRecord#ioStatus}*/
+public IOEffectsRecordIOStatus getIoStatus()
{
return ioStatus;
-}
-
-/** Setter for {@link IOEffectRecord#ioLinkType}*/
-public IOEffectRecord setIoLinkType(IOEffectsRecordIOLinkType pIoLinkType)
+}
+
+/** Setter for {@link IOEffectRecord#ioLinkType}*/
+public IOEffectRecord setIoLinkType(IOEffectsRecordIOLinkType pIoLinkType)
{
- ioLinkType = pIoLinkType;
- return this;
-}
-
-/** Getter for {@link IOEffectRecord#ioLinkType}*/
-public IOEffectsRecordIOLinkType getIoLinkType()
+ ioLinkType = pIoLinkType;
+ return this;
+}
+
+/** Getter for {@link IOEffectRecord#ioLinkType}*/
+public IOEffectsRecordIOLinkType getIoLinkType()
{
return ioLinkType;
-}
-
-/** Setter for {@link IOEffectRecord#ioEffect}*/
-public IOEffectRecord setIoEffect(IOEffectsRecordIOEffect pIoEffect)
+}
+
+/** Setter for {@link IOEffectRecord#ioEffect}*/
+public IOEffectRecord setIoEffect(IOEffectsRecordIOEffect pIoEffect)
{
- ioEffect = pIoEffect;
- return this;
-}
-
-/** Getter for {@link IOEffectRecord#ioEffect}*/
-public IOEffectsRecordIOEffect getIoEffect()
+ ioEffect = pIoEffect;
+ return this;
+}
+
+/** Getter for {@link IOEffectRecord#ioEffect}*/
+public IOEffectsRecordIOEffect getIoEffect()
{
return ioEffect;
-}
-
-/** Setter for {@link IOEffectRecord#ioEffectDutyCycle}*/
-public IOEffectRecord setIoEffectDutyCycle(byte pIoEffectDutyCycle)
+}
+
+/** Setter for {@link IOEffectRecord#ioEffectDutyCycle}*/
+public IOEffectRecord setIoEffectDutyCycle(byte pIoEffectDutyCycle)
{
- ioEffectDutyCycle = pIoEffectDutyCycle;
- return this;
-}
-
-/** Getter for {@link IOEffectRecord#ioEffectDutyCycle}*/
-public byte getIoEffectDutyCycle()
+ ioEffectDutyCycle = pIoEffectDutyCycle;
+ return this;
+}
+
+/** Getter for {@link IOEffectRecord#ioEffectDutyCycle}*/
+public byte getIoEffectDutyCycle()
{
return ioEffectDutyCycle;
-}
-
-/** Setter for {@link IOEffectRecord#ioEffectDuration}*/
-public IOEffectRecord setIoEffectDuration(short pIoEffectDuration)
+}
+
+/** Setter for {@link IOEffectRecord#ioEffectDuration}*/
+public IOEffectRecord setIoEffectDuration(short pIoEffectDuration)
{
- ioEffectDuration = pIoEffectDuration;
- return this;
-}
-
-/** Getter for {@link IOEffectRecord#ioEffectDuration}*/
-public short getIoEffectDuration()
+ ioEffectDuration = pIoEffectDuration;
+ return this;
+}
+
+/** Getter for {@link IOEffectRecord#ioEffectDuration}*/
+public short getIoEffectDuration()
{
return ioEffectDuration;
-}
-
-/** Setter for {@link IOEffectRecord#ioProcess}*/
-public IOEffectRecord setIoProcess(IOEffectsRecordIOProcess pIoProcess)
+}
+
+/** Setter for {@link IOEffectRecord#ioProcess}*/
+public IOEffectRecord setIoProcess(IOEffectsRecordIOProcess pIoProcess)
{
- ioProcess = pIoProcess;
- return this;
-}
-
-/** Getter for {@link IOEffectRecord#ioProcess}*/
-public IOEffectsRecordIOProcess getIoProcess()
+ ioProcess = pIoProcess;
+ return this;
+}
+
+/** Getter for {@link IOEffectRecord#ioProcess}*/
+public IOEffectsRecordIOProcess getIoProcess()
{
return ioProcess;
-}
-
-/** Setter for {@link IOEffectRecord#padding}*/
-public IOEffectRecord setPadding(short pPadding)
+}
+
+/** Setter for {@link IOEffectRecord#padding}*/
+public IOEffectRecord setPadding(short pPadding)
{
- padding = pPadding;
- return this;
-}
-
-/** Getter for {@link IOEffectRecord#padding}*/
-public short getPadding()
+ padding = pPadding;
+ return this;
+}
+
+/** Getter for {@link IOEffectRecord#padding}*/
+public short getPadding()
{
return padding;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- recordType.marshal(dos);
- dos.writeShort(recordLength);
- ioStatus.marshal(dos);
- ioLinkType.marshal(dos);
- ioEffect.marshal(dos);
- dos.writeByte(ioEffectDutyCycle);
- dos.writeShort(ioEffectDuration);
- ioProcess.marshal(dos);
- dos.writeShort(padding);
+ {
+ recordType.marshal(dos);
+ dos.writeShort(recordLength);
+ ioStatus.marshal(dos);
+ ioLinkType.marshal(dos);
+ ioEffect.marshal(dos);
+ dos.writeByte(ioEffectDutyCycle);
+ dos.writeShort(ioEffectDuration);
+ ioProcess.marshal(dos);
+ dos.writeShort(padding);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- recordType = VariableRecordType.unmarshalEnum(dis);
- uPosition += recordType.getMarshalledSize();
- recordLength = (short)dis.readUnsignedShort();
- uPosition += 2;
- ioStatus = IOEffectsRecordIOStatus.unmarshalEnum(dis);
- uPosition += ioStatus.getMarshalledSize();
- ioLinkType = IOEffectsRecordIOLinkType.unmarshalEnum(dis);
- uPosition += ioLinkType.getMarshalledSize();
- ioEffect = IOEffectsRecordIOEffect.unmarshalEnum(dis);
- uPosition += ioEffect.getMarshalledSize();
- ioEffectDutyCycle = (byte)dis.readUnsignedByte();
- uPosition += 1;
- ioEffectDuration = (short)dis.readUnsignedShort();
- uPosition += 2;
- ioProcess = IOEffectsRecordIOProcess.unmarshalEnum(dis);
- uPosition += ioProcess.getMarshalledSize();
- padding = (short)dis.readUnsignedShort();
- uPosition += 2;
+ {
+ recordType = VariableRecordType.unmarshalEnum(dis);
+ uPosition += recordType.getMarshalledSize();
+ recordLength = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ ioStatus = IOEffectsRecordIOStatus.unmarshalEnum(dis);
+ uPosition += ioStatus.getMarshalledSize();
+ ioLinkType = IOEffectsRecordIOLinkType.unmarshalEnum(dis);
+ uPosition += ioLinkType.getMarshalledSize();
+ ioEffect = IOEffectsRecordIOEffect.unmarshalEnum(dis);
+ uPosition += ioEffect.getMarshalledSize();
+ ioEffectDutyCycle = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ ioEffectDuration = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ ioProcess = IOEffectsRecordIOProcess.unmarshalEnum(dis);
+ uPosition += ioProcess.getMarshalledSize();
+ padding = (short)dis.readUnsignedShort();
+ uPosition += 2;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- recordType.marshal(buff);
- buff.putShort( (short)recordLength);
- ioStatus.marshal(buff);
- ioLinkType.marshal(buff);
- ioEffect.marshal(buff);
- buff.put( (byte)ioEffectDutyCycle);
- buff.putShort( (short)ioEffectDuration);
- ioProcess.marshal(buff);
- buff.putShort( (short)padding);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ recordType.marshal(buff);
+ buff.putShort( (short)recordLength);
+ ioStatus.marshal(buff);
+ ioLinkType.marshal(buff);
+ ioEffect.marshal(buff);
+ buff.put( (byte)ioEffectDutyCycle);
+ buff.putShort( (short)ioEffectDuration);
+ ioProcess.marshal(buff);
+ buff.putShort( (short)padding);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- recordType = VariableRecordType.unmarshalEnum(buff);
- recordLength = (short)(buff.getShort() & 0xFFFF);
- ioStatus = IOEffectsRecordIOStatus.unmarshalEnum(buff);
- ioLinkType = IOEffectsRecordIOLinkType.unmarshalEnum(buff);
- ioEffect = IOEffectsRecordIOEffect.unmarshalEnum(buff);
- ioEffectDutyCycle = (byte)(buff.get() & 0xFF);
- ioEffectDuration = (short)(buff.getShort() & 0xFFFF);
- ioProcess = IOEffectsRecordIOProcess.unmarshalEnum(buff);
- padding = (short)(buff.getShort() & 0xFFFF);
- return getMarshalledSize();
+
+ recordType = VariableRecordType.unmarshalEnum(buff);
+ recordLength = (short)(buff.getShort() & 0xFFFF);
+ ioStatus = IOEffectsRecordIOStatus.unmarshalEnum(buff);
+ ioLinkType = IOEffectsRecordIOLinkType.unmarshalEnum(buff);
+ ioEffect = IOEffectsRecordIOEffect.unmarshalEnum(buff);
+ ioEffectDutyCycle = (byte)(buff.get() & 0xFF);
+ ioEffectDuration = (short)(buff.getShort() & 0xFFFF);
+ ioProcess = IOEffectsRecordIOProcess.unmarshalEnum(buff);
+ padding = (short)(buff.getShort() & 0xFFFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final IOEffectRecord rhs = (IOEffectRecord)obj;
-
- if( ! (recordType == rhs.recordType)) ivarsEqual = false;
- if( ! (recordLength == rhs.recordLength)) ivarsEqual = false;
- if( ! (ioStatus == rhs.ioStatus)) ivarsEqual = false;
- if( ! (ioLinkType == rhs.ioLinkType)) ivarsEqual = false;
- if( ! (ioEffect == rhs.ioEffect)) ivarsEqual = false;
- if( ! (ioEffectDutyCycle == rhs.ioEffectDutyCycle)) ivarsEqual = false;
- if( ! (ioEffectDuration == rhs.ioEffectDuration)) ivarsEqual = false;
- if( ! (ioProcess == rhs.ioProcess)) ivarsEqual = false;
- if( ! (padding == rhs.padding)) ivarsEqual = false;
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final IOEffectRecord rhs = (IOEffectRecord)obj;
+
+ if( ! (recordType == rhs.recordType)) ivarsEqual = false;
+ if( ! (recordLength == rhs.recordLength)) ivarsEqual = false;
+ if( ! (ioStatus == rhs.ioStatus)) ivarsEqual = false;
+ if( ! (ioLinkType == rhs.ioLinkType)) ivarsEqual = false;
+ if( ! (ioEffect == rhs.ioEffect)) ivarsEqual = false;
+ if( ! (ioEffectDutyCycle == rhs.ioEffectDutyCycle)) ivarsEqual = false;
+ if( ! (ioEffectDuration == rhs.ioEffectDuration)) ivarsEqual = false;
+ if( ! (ioProcess == rhs.ioProcess)) ivarsEqual = false;
+ if( ! (padding == rhs.padding)) ivarsEqual = false;
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" recordType: ").append(recordType).append("\n");
- sb.append(" recordLength: ").append(recordLength).append("\n");
- sb.append(" ioStatus: ").append(ioStatus).append("\n");
- sb.append(" ioLinkType: ").append(ioLinkType).append("\n");
- sb.append(" ioEffect: ").append(ioEffect).append("\n");
- sb.append(" ioEffectDutyCycle: ").append(ioEffectDutyCycle).append("\n");
- sb.append(" ioEffectDuration: ").append(ioEffectDuration).append("\n");
- sb.append(" ioProcess: ").append(ioProcess).append("\n");
- sb.append(" padding: ").append(padding).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" recordType: ").append(recordType).append("\n");
+ sb.append(" recordLength: ").append(recordLength).append("\n");
+ sb.append(" ioStatus: ").append(ioStatus).append("\n");
+ sb.append(" ioLinkType: ").append(ioLinkType).append("\n");
+ sb.append(" ioEffect: ").append(ioEffect).append("\n");
+ sb.append(" ioEffectDutyCycle: ").append(ioEffectDutyCycle).append("\n");
+ sb.append(" ioEffectDuration: ").append(ioEffectDuration).append("\n");
+ sb.append(" ioProcess: ").append(ioProcess).append("\n");
+ sb.append(" padding: ").append(padding).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/IORecord.java b/src-generated/edu/nps/moves/dis7/IORecord.java
index f0251c841c591e86bd9e9eb77a06febe49627ecf..89d29fcbdb988a5a78331b6c4af7771820e713dc 100644
--- a/src-generated/edu/nps/moves/dis7/IORecord.java
+++ b/src-generated/edu/nps/moves/dis7/IORecord.java
@@ -1,138 +1,138 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 6.2.48
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class IORecord extends Object implements Serializable
-{
-
-/** Constructor */
- public IORecord()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
-
- return marshalSize;
-}
-
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 6.2.48
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class IORecord extends Object implements Serializable
+{
+
+/** Constructor */
+ public IORecord()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+
+ return marshalSize;
+}
+
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
+ {
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
+ {
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final IORecord rhs = (IORecord)obj;
-
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final IORecord rhs = (IORecord)obj;
+
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
-
- return sb.toString();
- }
-} // end of class
+
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/IdentificationFriendOrFoePdu.java b/src-generated/edu/nps/moves/dis7/IdentificationFriendOrFoePdu.java
index 160e0e5192c3fced12811cfc7c909c7ed6c44cec..7d412aecfa9dd4c5860fa595c38b604827e87b69 100644
--- a/src-generated/edu/nps/moves/dis7/IdentificationFriendOrFoePdu.java
+++ b/src-generated/edu/nps/moves/dis7/IdentificationFriendOrFoePdu.java
@@ -1,17 +1,17 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * more descriptive name for an IFFPdu
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class IdentificationFriendOrFoePdu extends IFFPdu
-{}
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * more descriptive name for an IFFPdu
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class IdentificationFriendOrFoePdu extends IFFPdu
+{}
diff --git a/src-generated/edu/nps/moves/dis7/IffDataSpecification.java b/src-generated/edu/nps/moves/dis7/IffDataSpecification.java
index 3978de5caeed1acb48a4c6324c90288ef6712e11..4c5e7b875967c8ea3f5421b74fd513b6d074d5fe 100644
--- a/src-generated/edu/nps/moves/dis7/IffDataSpecification.java
+++ b/src-generated/edu/nps/moves/dis7/IffDataSpecification.java
@@ -1,202 +1,202 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Requires hand coding to be useful. Section 6.2.43
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class IffDataSpecification extends Object implements Serializable
-{
- /** Number of iff records */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Requires hand coding to be useful. Section 6.2.43
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class IffDataSpecification extends Object implements Serializable
+{
+ /** Number of iff records */
protected short numberOfIffDataRecords;
-
- /** IFF data records */
+
+ /** IFF data records */
protected List< IFFData > iffDataRecords = new ArrayList< IFFData >();
-
-
-/** Constructor */
- public IffDataSpecification()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += 2; // numberOfIffDataRecords
- for(int idx=0; idx < iffDataRecords.size(); idx++)
- {
- IFFData listElement = iffDataRecords.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link IffDataSpecification#iffDataRecords}*/
-public IffDataSpecification setIffDataRecords(List<IFFData> pIffDataRecords)
+
+
+/** Constructor */
+ public IffDataSpecification()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 2; // numberOfIffDataRecords
+ for(int idx=0; idx < iffDataRecords.size(); idx++)
+ {
+ IFFData listElement = iffDataRecords.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link IffDataSpecification#iffDataRecords}*/
+public IffDataSpecification setIffDataRecords(List<IFFData> pIffDataRecords)
{
- iffDataRecords = pIffDataRecords;
- return this;
-}
-
-/** Getter for {@link IffDataSpecification#iffDataRecords}*/
-public List<IFFData> getIffDataRecords()
+ iffDataRecords = pIffDataRecords;
+ return this;
+}
+
+/** Getter for {@link IffDataSpecification#iffDataRecords}*/
+public List<IFFData> getIffDataRecords()
{
return iffDataRecords;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeShort(iffDataRecords.size());
-
- for(int idx = 0; idx < iffDataRecords.size(); idx++)
- {
- IFFData aIFFData = iffDataRecords.get(idx);
- aIFFData.marshal(dos);
- }
-
+ {
+ dos.writeShort(iffDataRecords.size());
+
+ for(int idx = 0; idx < iffDataRecords.size(); idx++)
+ {
+ IFFData aIFFData = iffDataRecords.get(idx);
+ aIFFData.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- numberOfIffDataRecords = (short)dis.readUnsignedShort();
- uPosition += 2;
- for(int idx = 0; idx < numberOfIffDataRecords; idx++)
- {
- IFFData anX = new IFFData();
- uPosition += anX.unmarshal(dis);
- iffDataRecords.add(anX);
- }
-
+ {
+ numberOfIffDataRecords = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ for(int idx = 0; idx < numberOfIffDataRecords; idx++)
+ {
+ IFFData anX = new IFFData();
+ uPosition += anX.unmarshal(dis);
+ iffDataRecords.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putShort( (short)iffDataRecords.size());
-
- for(int idx = 0; idx < iffDataRecords.size(); idx++)
- {
- IFFData aIFFData = iffDataRecords.get(idx);
- aIFFData.marshal(buff);
- }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- numberOfIffDataRecords = (short)(buff.getShort() & 0xFFFF);
- for(int idx = 0; idx < numberOfIffDataRecords; idx++)
- {
- IFFData anX = new IFFData();
- anX.unmarshal(buff);
- iffDataRecords.add(anX);
- }
-
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putShort( (short)iffDataRecords.size());
+
+ for(int idx = 0; idx < iffDataRecords.size(); idx++)
+ {
+ IFFData aIFFData = iffDataRecords.get(idx);
+ aIFFData.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ numberOfIffDataRecords = (short)(buff.getShort() & 0xFFFF);
+ for(int idx = 0; idx < numberOfIffDataRecords; idx++)
+ {
+ IFFData anX = new IFFData();
+ anX.unmarshal(buff);
+ iffDataRecords.add(anX);
+ }
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final IffDataSpecification rhs = (IffDataSpecification)obj;
-
-
- for(int idx = 0; idx < iffDataRecords.size(); idx++)
- if( ! ( iffDataRecords.get(idx).equals(rhs.iffDataRecords.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final IffDataSpecification rhs = (IffDataSpecification)obj;
+
+
+ for(int idx = 0; idx < iffDataRecords.size(); idx++)
+ if( ! ( iffDataRecords.get(idx).equals(rhs.iffDataRecords.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" iffDataRecords: ").append("\n");
- iffDataRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" iffDataRecords: ").append("\n");
+ iffDataRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/InformationOperationsActionPdu.java b/src-generated/edu/nps/moves/dis7/InformationOperationsActionPdu.java
index 1dd5645c134cf47f6e0f6a61c31a8b7f4dbf65fe..a49aeaed4884c2c97bc4c40d640ad3f37b05b7cf 100644
--- a/src-generated/edu/nps/moves/dis7/InformationOperationsActionPdu.java
+++ b/src-generated/edu/nps/moves/dis7/InformationOperationsActionPdu.java
@@ -1,436 +1,436 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.13.3.1 Used to communicate an IO attack or the effects of an IO attack on one or more target entities.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class InformationOperationsActionPdu extends InformationOperationsFamilyPdu implements Serializable
-{
- /** the simulation to which this PDU is addressed */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 5.13.3.1 Used to communicate an IO attack or the effects of an IO attack on one or more target entities.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class InformationOperationsActionPdu extends InformationOperationsFamilyPdu implements Serializable
+{
+ /** the simulation to which this PDU is addressed */
protected EntityID receivingSimID = new EntityID();
-
- /** request ID */
+
+ /** request ID */
protected int requestID;
-
- /** uid 285 */
+
+ /** uid 285 */
protected IOActionIOWarfareType IOWarfareType = IOActionIOWarfareType.values()[0];
-
- /** uid 286 */
+
+ /** uid 286 */
protected IOActionIOSimulationSource IOSimulationSource = IOActionIOSimulationSource.values()[0];
-
- /** uid 287 */
+
+ /** uid 287 */
protected IOActionIOActionType IOActionType = IOActionIOActionType.values()[0];
-
- /** uid 288 */
+
+ /** uid 288 */
protected IOActionIOActionPhase IOActionPhase = IOActionIOActionPhase.values()[0];
-
+
protected int padding1;
-
+
protected EntityID ioAttackerID = new EntityID();
-
+
protected EntityID ioPrimaryTargetID = new EntityID();
-
+
protected short padding2;
-
+
protected short numberOfIORecords;
-
+
protected List< IORecord > ioRecords = new ArrayList< IORecord >();
-
-
-/** Constructor */
- public InformationOperationsActionPdu()
- {
- setPduType( DISPDUType.INFORMATION_OPERATIONS_ACTION );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += receivingSimID.getMarshalledSize();
- marshalSize += 4; // requestID
- marshalSize += IOWarfareType.getMarshalledSize();
- marshalSize += IOSimulationSource.getMarshalledSize();
- marshalSize += IOActionType.getMarshalledSize();
- marshalSize += IOActionPhase.getMarshalledSize();
- marshalSize += 4; // padding1
- marshalSize += ioAttackerID.getMarshalledSize();
- marshalSize += ioPrimaryTargetID.getMarshalledSize();
- marshalSize += 2; // padding2
- marshalSize += 2; // numberOfIORecords
- for(int idx=0; idx < ioRecords.size(); idx++)
- {
- IORecord listElement = ioRecords.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link InformationOperationsActionPdu#receivingSimID}*/
-public InformationOperationsActionPdu setReceivingSimID(EntityID pReceivingSimID)
+
+
+/** Constructor */
+ public InformationOperationsActionPdu()
+ {
+ setPduType( DISPDUType.INFORMATION_OPERATIONS_ACTION );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += receivingSimID.getMarshalledSize();
+ marshalSize += 4; // requestID
+ marshalSize += IOWarfareType.getMarshalledSize();
+ marshalSize += IOSimulationSource.getMarshalledSize();
+ marshalSize += IOActionType.getMarshalledSize();
+ marshalSize += IOActionPhase.getMarshalledSize();
+ marshalSize += 4; // padding1
+ marshalSize += ioAttackerID.getMarshalledSize();
+ marshalSize += ioPrimaryTargetID.getMarshalledSize();
+ marshalSize += 2; // padding2
+ marshalSize += 2; // numberOfIORecords
+ for(int idx=0; idx < ioRecords.size(); idx++)
+ {
+ IORecord listElement = ioRecords.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link InformationOperationsActionPdu#receivingSimID}*/
+public InformationOperationsActionPdu setReceivingSimID(EntityID pReceivingSimID)
{
- receivingSimID = pReceivingSimID;
- return this;
-}
-
-/** Getter for {@link InformationOperationsActionPdu#receivingSimID}*/
-public EntityID getReceivingSimID()
+ receivingSimID = pReceivingSimID;
+ return this;
+}
+
+/** Getter for {@link InformationOperationsActionPdu#receivingSimID}*/
+public EntityID getReceivingSimID()
{
return receivingSimID;
-}
-
-/** Setter for {@link InformationOperationsActionPdu#requestID}*/
-public InformationOperationsActionPdu setRequestID(int pRequestID)
+}
+
+/** Setter for {@link InformationOperationsActionPdu#requestID}*/
+public InformationOperationsActionPdu setRequestID(int pRequestID)
{
- requestID = pRequestID;
- return this;
-}
-
-/** Getter for {@link InformationOperationsActionPdu#requestID}*/
-public int getRequestID()
+ requestID = pRequestID;
+ return this;
+}
+
+/** Getter for {@link InformationOperationsActionPdu#requestID}*/
+public int getRequestID()
{
return requestID;
-}
-
-/** Setter for {@link InformationOperationsActionPdu#IOWarfareType}*/
-public InformationOperationsActionPdu setIOWarfareType(IOActionIOWarfareType pIOWarfareType)
+}
+
+/** Setter for {@link InformationOperationsActionPdu#IOWarfareType}*/
+public InformationOperationsActionPdu setIOWarfareType(IOActionIOWarfareType pIOWarfareType)
{
- IOWarfareType = pIOWarfareType;
- return this;
-}
-
-/** Getter for {@link InformationOperationsActionPdu#IOWarfareType}*/
-public IOActionIOWarfareType getIOWarfareType()
+ IOWarfareType = pIOWarfareType;
+ return this;
+}
+
+/** Getter for {@link InformationOperationsActionPdu#IOWarfareType}*/
+public IOActionIOWarfareType getIOWarfareType()
{
return IOWarfareType;
-}
-
-/** Setter for {@link InformationOperationsActionPdu#IOSimulationSource}*/
-public InformationOperationsActionPdu setIOSimulationSource(IOActionIOSimulationSource pIOSimulationSource)
+}
+
+/** Setter for {@link InformationOperationsActionPdu#IOSimulationSource}*/
+public InformationOperationsActionPdu setIOSimulationSource(IOActionIOSimulationSource pIOSimulationSource)
{
- IOSimulationSource = pIOSimulationSource;
- return this;
-}
-
-/** Getter for {@link InformationOperationsActionPdu#IOSimulationSource}*/
-public IOActionIOSimulationSource getIOSimulationSource()
+ IOSimulationSource = pIOSimulationSource;
+ return this;
+}
+
+/** Getter for {@link InformationOperationsActionPdu#IOSimulationSource}*/
+public IOActionIOSimulationSource getIOSimulationSource()
{
return IOSimulationSource;
-}
-
-/** Setter for {@link InformationOperationsActionPdu#IOActionType}*/
-public InformationOperationsActionPdu setIOActionType(IOActionIOActionType pIOActionType)
+}
+
+/** Setter for {@link InformationOperationsActionPdu#IOActionType}*/
+public InformationOperationsActionPdu setIOActionType(IOActionIOActionType pIOActionType)
{
- IOActionType = pIOActionType;
- return this;
-}
-
-/** Getter for {@link InformationOperationsActionPdu#IOActionType}*/
-public IOActionIOActionType getIOActionType()
+ IOActionType = pIOActionType;
+ return this;
+}
+
+/** Getter for {@link InformationOperationsActionPdu#IOActionType}*/
+public IOActionIOActionType getIOActionType()
{
return IOActionType;
-}
-
-/** Setter for {@link InformationOperationsActionPdu#IOActionPhase}*/
-public InformationOperationsActionPdu setIOActionPhase(IOActionIOActionPhase pIOActionPhase)
+}
+
+/** Setter for {@link InformationOperationsActionPdu#IOActionPhase}*/
+public InformationOperationsActionPdu setIOActionPhase(IOActionIOActionPhase pIOActionPhase)
{
- IOActionPhase = pIOActionPhase;
- return this;
-}
-
-/** Getter for {@link InformationOperationsActionPdu#IOActionPhase}*/
-public IOActionIOActionPhase getIOActionPhase()
+ IOActionPhase = pIOActionPhase;
+ return this;
+}
+
+/** Getter for {@link InformationOperationsActionPdu#IOActionPhase}*/
+public IOActionIOActionPhase getIOActionPhase()
{
return IOActionPhase;
-}
-
-/** Setter for {@link InformationOperationsActionPdu#padding1}*/
-public InformationOperationsActionPdu setPadding1(int pPadding1)
+}
+
+/** Setter for {@link InformationOperationsActionPdu#padding1}*/
+public InformationOperationsActionPdu setPadding1(int pPadding1)
{
- padding1 = pPadding1;
- return this;
-}
-
-/** Getter for {@link InformationOperationsActionPdu#padding1}*/
-public int getPadding1()
+ padding1 = pPadding1;
+ return this;
+}
+
+/** Getter for {@link InformationOperationsActionPdu#padding1}*/
+public int getPadding1()
{
return padding1;
-}
-
-/** Setter for {@link InformationOperationsActionPdu#ioAttackerID}*/
-public InformationOperationsActionPdu setIoAttackerID(EntityID pIoAttackerID)
+}
+
+/** Setter for {@link InformationOperationsActionPdu#ioAttackerID}*/
+public InformationOperationsActionPdu setIoAttackerID(EntityID pIoAttackerID)
{
- ioAttackerID = pIoAttackerID;
- return this;
-}
-
-/** Getter for {@link InformationOperationsActionPdu#ioAttackerID}*/
-public EntityID getIoAttackerID()
+ ioAttackerID = pIoAttackerID;
+ return this;
+}
+
+/** Getter for {@link InformationOperationsActionPdu#ioAttackerID}*/
+public EntityID getIoAttackerID()
{
return ioAttackerID;
-}
-
-/** Setter for {@link InformationOperationsActionPdu#ioPrimaryTargetID}*/
-public InformationOperationsActionPdu setIoPrimaryTargetID(EntityID pIoPrimaryTargetID)
+}
+
+/** Setter for {@link InformationOperationsActionPdu#ioPrimaryTargetID}*/
+public InformationOperationsActionPdu setIoPrimaryTargetID(EntityID pIoPrimaryTargetID)
{
- ioPrimaryTargetID = pIoPrimaryTargetID;
- return this;
-}
-
-/** Getter for {@link InformationOperationsActionPdu#ioPrimaryTargetID}*/
-public EntityID getIoPrimaryTargetID()
+ ioPrimaryTargetID = pIoPrimaryTargetID;
+ return this;
+}
+
+/** Getter for {@link InformationOperationsActionPdu#ioPrimaryTargetID}*/
+public EntityID getIoPrimaryTargetID()
{
return ioPrimaryTargetID;
-}
-
-/** Setter for {@link InformationOperationsActionPdu#padding2}*/
-public InformationOperationsActionPdu setPadding2(short pPadding2)
+}
+
+/** Setter for {@link InformationOperationsActionPdu#padding2}*/
+public InformationOperationsActionPdu setPadding2(short pPadding2)
{
- padding2 = pPadding2;
- return this;
-}
-
-/** Getter for {@link InformationOperationsActionPdu#padding2}*/
-public short getPadding2()
+ padding2 = pPadding2;
+ return this;
+}
+
+/** Getter for {@link InformationOperationsActionPdu#padding2}*/
+public short getPadding2()
{
return padding2;
-}
-
-/** Setter for {@link InformationOperationsActionPdu#ioRecords}*/
-public InformationOperationsActionPdu setIoRecords(List<IORecord> pIoRecords)
+}
+
+/** Setter for {@link InformationOperationsActionPdu#ioRecords}*/
+public InformationOperationsActionPdu setIoRecords(List<IORecord> pIoRecords)
{
- ioRecords = pIoRecords;
- return this;
-}
-
-/** Getter for {@link InformationOperationsActionPdu#ioRecords}*/
-public List<IORecord> getIoRecords()
+ ioRecords = pIoRecords;
+ return this;
+}
+
+/** Getter for {@link InformationOperationsActionPdu#ioRecords}*/
+public List<IORecord> getIoRecords()
{
return ioRecords;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- receivingSimID.marshal(dos);
- dos.writeInt(requestID);
- IOWarfareType.marshal(dos);
- IOSimulationSource.marshal(dos);
- IOActionType.marshal(dos);
- IOActionPhase.marshal(dos);
- dos.writeInt(padding1);
- ioAttackerID.marshal(dos);
- ioPrimaryTargetID.marshal(dos);
- dos.writeShort(padding2);
- dos.writeShort(ioRecords.size());
-
- for(int idx = 0; idx < ioRecords.size(); idx++)
- {
- IORecord aIORecord = ioRecords.get(idx);
- aIORecord.marshal(dos);
- }
-
+ {
+ receivingSimID.marshal(dos);
+ dos.writeInt(requestID);
+ IOWarfareType.marshal(dos);
+ IOSimulationSource.marshal(dos);
+ IOActionType.marshal(dos);
+ IOActionPhase.marshal(dos);
+ dos.writeInt(padding1);
+ ioAttackerID.marshal(dos);
+ ioPrimaryTargetID.marshal(dos);
+ dos.writeShort(padding2);
+ dos.writeShort(ioRecords.size());
+
+ for(int idx = 0; idx < ioRecords.size(); idx++)
+ {
+ IORecord aIORecord = ioRecords.get(idx);
+ aIORecord.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += receivingSimID.unmarshal(dis);
- requestID = dis.readInt();
- uPosition += 4;
- IOWarfareType = IOActionIOWarfareType.unmarshalEnum(dis);
- uPosition += IOWarfareType.getMarshalledSize();
- IOSimulationSource = IOActionIOSimulationSource.unmarshalEnum(dis);
- uPosition += IOSimulationSource.getMarshalledSize();
- IOActionType = IOActionIOActionType.unmarshalEnum(dis);
- uPosition += IOActionType.getMarshalledSize();
- IOActionPhase = IOActionIOActionPhase.unmarshalEnum(dis);
- uPosition += IOActionPhase.getMarshalledSize();
- padding1 = dis.readInt();
- uPosition += 4;
- uPosition += ioAttackerID.unmarshal(dis);
- uPosition += ioPrimaryTargetID.unmarshal(dis);
- padding2 = (short)dis.readUnsignedShort();
- uPosition += 2;
- numberOfIORecords = (short)dis.readUnsignedShort();
- uPosition += 2;
- for(int idx = 0; idx < numberOfIORecords; idx++)
- {
- IORecord anX = new IORecord();
- uPosition += anX.unmarshal(dis);
- ioRecords.add(anX);
- }
-
+ {
+ uPosition += receivingSimID.unmarshal(dis);
+ requestID = dis.readInt();
+ uPosition += 4;
+ IOWarfareType = IOActionIOWarfareType.unmarshalEnum(dis);
+ uPosition += IOWarfareType.getMarshalledSize();
+ IOSimulationSource = IOActionIOSimulationSource.unmarshalEnum(dis);
+ uPosition += IOSimulationSource.getMarshalledSize();
+ IOActionType = IOActionIOActionType.unmarshalEnum(dis);
+ uPosition += IOActionType.getMarshalledSize();
+ IOActionPhase = IOActionIOActionPhase.unmarshalEnum(dis);
+ uPosition += IOActionPhase.getMarshalledSize();
+ padding1 = dis.readInt();
+ uPosition += 4;
+ uPosition += ioAttackerID.unmarshal(dis);
+ uPosition += ioPrimaryTargetID.unmarshal(dis);
+ padding2 = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ numberOfIORecords = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ for(int idx = 0; idx < numberOfIORecords; idx++)
+ {
+ IORecord anX = new IORecord();
+ uPosition += anX.unmarshal(dis);
+ ioRecords.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- receivingSimID.marshal(buff);
- buff.putInt( (int)requestID);
- IOWarfareType.marshal(buff);
- IOSimulationSource.marshal(buff);
- IOActionType.marshal(buff);
- IOActionPhase.marshal(buff);
- buff.putInt( (int)padding1);
- ioAttackerID.marshal(buff);
- ioPrimaryTargetID.marshal(buff);
- buff.putShort( (short)padding2);
- buff.putShort( (short)ioRecords.size());
-
- for(int idx = 0; idx < ioRecords.size(); idx++)
- {
- IORecord aIORecord = ioRecords.get(idx);
- aIORecord.marshal(buff);
- }
-
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ receivingSimID.marshal(buff);
+ buff.putInt( (int)requestID);
+ IOWarfareType.marshal(buff);
+ IOSimulationSource.marshal(buff);
+ IOActionType.marshal(buff);
+ IOActionPhase.marshal(buff);
+ buff.putInt( (int)padding1);
+ ioAttackerID.marshal(buff);
+ ioPrimaryTargetID.marshal(buff);
+ buff.putShort( (short)padding2);
+ buff.putShort( (short)ioRecords.size());
+
+ for(int idx = 0; idx < ioRecords.size(); idx++)
+ {
+ IORecord aIORecord = ioRecords.get(idx);
+ aIORecord.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- receivingSimID.unmarshal(buff);
- requestID = buff.getInt();
- IOWarfareType = IOActionIOWarfareType.unmarshalEnum(buff);
- IOSimulationSource = IOActionIOSimulationSource.unmarshalEnum(buff);
- IOActionType = IOActionIOActionType.unmarshalEnum(buff);
- IOActionPhase = IOActionIOActionPhase.unmarshalEnum(buff);
- padding1 = buff.getInt();
- ioAttackerID.unmarshal(buff);
- ioPrimaryTargetID.unmarshal(buff);
- padding2 = (short)(buff.getShort() & 0xFFFF);
- numberOfIORecords = (short)(buff.getShort() & 0xFFFF);
- for(int idx = 0; idx < numberOfIORecords; idx++)
- {
- IORecord anX = new IORecord();
- anX.unmarshal(buff);
- ioRecords.add(anX);
- }
-
- return getMarshalledSize();
+
+ receivingSimID.unmarshal(buff);
+ requestID = buff.getInt();
+ IOWarfareType = IOActionIOWarfareType.unmarshalEnum(buff);
+ IOSimulationSource = IOActionIOSimulationSource.unmarshalEnum(buff);
+ IOActionType = IOActionIOActionType.unmarshalEnum(buff);
+ IOActionPhase = IOActionIOActionPhase.unmarshalEnum(buff);
+ padding1 = buff.getInt();
+ ioAttackerID.unmarshal(buff);
+ ioPrimaryTargetID.unmarshal(buff);
+ padding2 = (short)(buff.getShort() & 0xFFFF);
+ numberOfIORecords = (short)(buff.getShort() & 0xFFFF);
+ for(int idx = 0; idx < numberOfIORecords; idx++)
+ {
+ IORecord anX = new IORecord();
+ anX.unmarshal(buff);
+ ioRecords.add(anX);
+ }
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final InformationOperationsActionPdu rhs = (InformationOperationsActionPdu)obj;
-
- if( ! (receivingSimID.equals( rhs.receivingSimID) )) ivarsEqual = false;
- if( ! (requestID == rhs.requestID)) ivarsEqual = false;
- if( ! (IOWarfareType == rhs.IOWarfareType)) ivarsEqual = false;
- if( ! (IOSimulationSource == rhs.IOSimulationSource)) ivarsEqual = false;
- if( ! (IOActionType == rhs.IOActionType)) ivarsEqual = false;
- if( ! (IOActionPhase == rhs.IOActionPhase)) ivarsEqual = false;
- if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
- if( ! (ioAttackerID.equals( rhs.ioAttackerID) )) ivarsEqual = false;
- if( ! (ioPrimaryTargetID.equals( rhs.ioPrimaryTargetID) )) ivarsEqual = false;
- if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
-
- for(int idx = 0; idx < ioRecords.size(); idx++)
- if( ! ( ioRecords.get(idx).equals(rhs.ioRecords.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final InformationOperationsActionPdu rhs = (InformationOperationsActionPdu)obj;
+
+ if( ! (receivingSimID.equals( rhs.receivingSimID) )) ivarsEqual = false;
+ if( ! (requestID == rhs.requestID)) ivarsEqual = false;
+ if( ! (IOWarfareType == rhs.IOWarfareType)) ivarsEqual = false;
+ if( ! (IOSimulationSource == rhs.IOSimulationSource)) ivarsEqual = false;
+ if( ! (IOActionType == rhs.IOActionType)) ivarsEqual = false;
+ if( ! (IOActionPhase == rhs.IOActionPhase)) ivarsEqual = false;
+ if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
+ if( ! (ioAttackerID.equals( rhs.ioAttackerID) )) ivarsEqual = false;
+ if( ! (ioPrimaryTargetID.equals( rhs.ioPrimaryTargetID) )) ivarsEqual = false;
+ if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
+
+ for(int idx = 0; idx < ioRecords.size(); idx++)
+ if( ! ( ioRecords.get(idx).equals(rhs.ioRecords.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" receivingSimID: ").append(receivingSimID).append("\n");
- sb.append(" requestID: ").append(requestID).append("\n");
- sb.append(" IOWarfareType: ").append(IOWarfareType).append("\n");
- sb.append(" IOSimulationSource: ").append(IOSimulationSource).append("\n");
- sb.append(" IOActionType: ").append(IOActionType).append("\n");
- sb.append(" IOActionPhase: ").append(IOActionPhase).append("\n");
- sb.append(" padding1: ").append(padding1).append("\n");
- sb.append(" ioAttackerID: ").append(ioAttackerID).append("\n");
- sb.append(" ioPrimaryTargetID: ").append(ioPrimaryTargetID).append("\n");
- sb.append(" padding2: ").append(padding2).append("\n");
- sb.append(" ioRecords: ").append("\n");
- ioRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" receivingSimID: ").append(receivingSimID).append("\n");
+ sb.append(" requestID: ").append(requestID).append("\n");
+ sb.append(" IOWarfareType: ").append(IOWarfareType).append("\n");
+ sb.append(" IOSimulationSource: ").append(IOSimulationSource).append("\n");
+ sb.append(" IOActionType: ").append(IOActionType).append("\n");
+ sb.append(" IOActionPhase: ").append(IOActionPhase).append("\n");
+ sb.append(" padding1: ").append(padding1).append("\n");
+ sb.append(" ioAttackerID: ").append(ioAttackerID).append("\n");
+ sb.append(" ioPrimaryTargetID: ").append(ioPrimaryTargetID).append("\n");
+ sb.append(" padding2: ").append(padding2).append("\n");
+ sb.append(" ioRecords: ").append("\n");
+ ioRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/InformationOperationsFamilyPdu.java b/src-generated/edu/nps/moves/dis7/InformationOperationsFamilyPdu.java
index fc309f8d499e021e8c7259540afd67615963816b..1f71cac39fcfff23a139ab34f884cfa3bed693ed 100644
--- a/src-generated/edu/nps/moves/dis7/InformationOperationsFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/InformationOperationsFamilyPdu.java
@@ -1,163 +1,163 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public abstract class InformationOperationsFamilyPdu extends PduBase implements Serializable
-{
- /** Object originating the request */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public abstract class InformationOperationsFamilyPdu extends PduBase implements Serializable
+{
+ /** Object originating the request */
protected EntityID originatingSimID = new EntityID();
-
-
-/** Constructor */
- public InformationOperationsFamilyPdu()
- {
- setProtocolFamily( DISProtocolFamily.INFORMATION_OPERATIONS );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public InformationOperationsFamilyPdu()
+ {
+ setProtocolFamily( DISProtocolFamily.INFORMATION_OPERATIONS );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += originatingSimID.getMarshalledSize();
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link InformationOperationsFamilyPdu#originatingSimID}*/
+public InformationOperationsFamilyPdu setOriginatingSimID(EntityID pOriginatingSimID)
{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += originatingSimID.getMarshalledSize();
-
- return marshalSize;
-}
-
-
-/** Setter for {@link InformationOperationsFamilyPdu#originatingSimID}*/
-public InformationOperationsFamilyPdu setOriginatingSimID(EntityID pOriginatingSimID)
-{
- originatingSimID = pOriginatingSimID;
- return this;
-}
-
-/** Getter for {@link InformationOperationsFamilyPdu#originatingSimID}*/
-public EntityID getOriginatingSimID()
+ originatingSimID = pOriginatingSimID;
+ return this;
+}
+
+/** Getter for {@link InformationOperationsFamilyPdu#originatingSimID}*/
+public EntityID getOriginatingSimID()
{
return originatingSimID;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- originatingSimID.marshal(dos);
+ {
+ originatingSimID.marshal(dos);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += originatingSimID.unmarshal(dis);
+ {
+ uPosition += originatingSimID.unmarshal(dis);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- originatingSimID.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ originatingSimID.marshal(buff);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- originatingSimID.unmarshal(buff);
- return getMarshalledSize();
+
+ originatingSimID.unmarshal(buff);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final InformationOperationsFamilyPdu rhs = (InformationOperationsFamilyPdu)obj;
-
- if( ! (originatingSimID.equals( rhs.originatingSimID) )) ivarsEqual = false;
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final InformationOperationsFamilyPdu rhs = (InformationOperationsFamilyPdu)obj;
+
+ if( ! (originatingSimID.equals( rhs.originatingSimID) )) ivarsEqual = false;
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" originatingSimID: ").append(originatingSimID).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" originatingSimID: ").append(originatingSimID).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/InformationOperationsReportPdu.java b/src-generated/edu/nps/moves/dis7/InformationOperationsReportPdu.java
index 849ecc52b30c101c0d8ccf3ce05f19fc1b4d8118..6cee86a9bb6dfc849513fc3dd6854f9bf27d9d02 100644
--- a/src-generated/edu/nps/moves/dis7/InformationOperationsReportPdu.java
+++ b/src-generated/edu/nps/moves/dis7/InformationOperationsReportPdu.java
@@ -1,364 +1,364 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.13.4.1 Used to communicate the effects of an IO attack on one or more target entities.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class InformationOperationsReportPdu extends InformationOperationsFamilyPdu implements Serializable
-{
- /** uid 286 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 5.13.4.1 Used to communicate the effects of an IO attack on one or more target entities.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class InformationOperationsReportPdu extends InformationOperationsFamilyPdu implements Serializable
+{
+ /** uid 286 */
protected IOActionIOSimulationSource ioSimSource = IOActionIOSimulationSource.values()[0];
-
- /** request ID uid 289 */
+
+ /** request ID uid 289 */
protected IOReportIOReportType ioReportType = IOReportIOReportType.values()[0];
-
+
protected byte padding1;
-
+
protected EntityID ioAttackerID = new EntityID();
-
+
protected EntityID ioPrimaryTargetID = new EntityID();
-
+
protected short padding2;
-
+
protected short padding3;
-
+
protected short numberOfIORecords;
-
+
protected List< IORecord > ioRecords = new ArrayList< IORecord >();
-
-
-/** Constructor */
- public InformationOperationsReportPdu()
- {
- setPduType( DISPDUType.INFORMATION_OPERATIONS_REPORT );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public InformationOperationsReportPdu()
+ {
+ setPduType( DISPDUType.INFORMATION_OPERATIONS_REPORT );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += ioSimSource.getMarshalledSize();
+ marshalSize += ioReportType.getMarshalledSize();
+ marshalSize += 1; // padding1
+ marshalSize += ioAttackerID.getMarshalledSize();
+ marshalSize += ioPrimaryTargetID.getMarshalledSize();
+ marshalSize += 2; // padding2
+ marshalSize += 2; // padding3
+ marshalSize += 2; // numberOfIORecords
+ for(int idx=0; idx < ioRecords.size(); idx++)
+ {
+ IORecord listElement = ioRecords.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link InformationOperationsReportPdu#ioSimSource}*/
+public InformationOperationsReportPdu setIoSimSource(IOActionIOSimulationSource pIoSimSource)
{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += ioSimSource.getMarshalledSize();
- marshalSize += ioReportType.getMarshalledSize();
- marshalSize += 1; // padding1
- marshalSize += ioAttackerID.getMarshalledSize();
- marshalSize += ioPrimaryTargetID.getMarshalledSize();
- marshalSize += 2; // padding2
- marshalSize += 2; // padding3
- marshalSize += 2; // numberOfIORecords
- for(int idx=0; idx < ioRecords.size(); idx++)
- {
- IORecord listElement = ioRecords.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link InformationOperationsReportPdu#ioSimSource}*/
-public InformationOperationsReportPdu setIoSimSource(IOActionIOSimulationSource pIoSimSource)
-{
- ioSimSource = pIoSimSource;
- return this;
-}
-
-/** Getter for {@link InformationOperationsReportPdu#ioSimSource}*/
-public IOActionIOSimulationSource getIoSimSource()
+ ioSimSource = pIoSimSource;
+ return this;
+}
+
+/** Getter for {@link InformationOperationsReportPdu#ioSimSource}*/
+public IOActionIOSimulationSource getIoSimSource()
{
return ioSimSource;
-}
-
-/** Setter for {@link InformationOperationsReportPdu#ioReportType}*/
-public InformationOperationsReportPdu setIoReportType(IOReportIOReportType pIoReportType)
+}
+
+/** Setter for {@link InformationOperationsReportPdu#ioReportType}*/
+public InformationOperationsReportPdu setIoReportType(IOReportIOReportType pIoReportType)
{
- ioReportType = pIoReportType;
- return this;
-}
-
-/** Getter for {@link InformationOperationsReportPdu#ioReportType}*/
-public IOReportIOReportType getIoReportType()
+ ioReportType = pIoReportType;
+ return this;
+}
+
+/** Getter for {@link InformationOperationsReportPdu#ioReportType}*/
+public IOReportIOReportType getIoReportType()
{
return ioReportType;
-}
-
-/** Setter for {@link InformationOperationsReportPdu#padding1}*/
-public InformationOperationsReportPdu setPadding1(byte pPadding1)
+}
+
+/** Setter for {@link InformationOperationsReportPdu#padding1}*/
+public InformationOperationsReportPdu setPadding1(byte pPadding1)
{
- padding1 = pPadding1;
- return this;
-}
-
-/** Getter for {@link InformationOperationsReportPdu#padding1}*/
-public byte getPadding1()
+ padding1 = pPadding1;
+ return this;
+}
+
+/** Getter for {@link InformationOperationsReportPdu#padding1}*/
+public byte getPadding1()
{
return padding1;
-}
-
-/** Setter for {@link InformationOperationsReportPdu#ioAttackerID}*/
-public InformationOperationsReportPdu setIoAttackerID(EntityID pIoAttackerID)
+}
+
+/** Setter for {@link InformationOperationsReportPdu#ioAttackerID}*/
+public InformationOperationsReportPdu setIoAttackerID(EntityID pIoAttackerID)
{
- ioAttackerID = pIoAttackerID;
- return this;
-}
-
-/** Getter for {@link InformationOperationsReportPdu#ioAttackerID}*/
-public EntityID getIoAttackerID()
+ ioAttackerID = pIoAttackerID;
+ return this;
+}
+
+/** Getter for {@link InformationOperationsReportPdu#ioAttackerID}*/
+public EntityID getIoAttackerID()
{
return ioAttackerID;
-}
-
-/** Setter for {@link InformationOperationsReportPdu#ioPrimaryTargetID}*/
-public InformationOperationsReportPdu setIoPrimaryTargetID(EntityID pIoPrimaryTargetID)
+}
+
+/** Setter for {@link InformationOperationsReportPdu#ioPrimaryTargetID}*/
+public InformationOperationsReportPdu setIoPrimaryTargetID(EntityID pIoPrimaryTargetID)
{
- ioPrimaryTargetID = pIoPrimaryTargetID;
- return this;
-}
-
-/** Getter for {@link InformationOperationsReportPdu#ioPrimaryTargetID}*/
-public EntityID getIoPrimaryTargetID()
+ ioPrimaryTargetID = pIoPrimaryTargetID;
+ return this;
+}
+
+/** Getter for {@link InformationOperationsReportPdu#ioPrimaryTargetID}*/
+public EntityID getIoPrimaryTargetID()
{
return ioPrimaryTargetID;
-}
-
-/** Setter for {@link InformationOperationsReportPdu#padding2}*/
-public InformationOperationsReportPdu setPadding2(short pPadding2)
+}
+
+/** Setter for {@link InformationOperationsReportPdu#padding2}*/
+public InformationOperationsReportPdu setPadding2(short pPadding2)
{
- padding2 = pPadding2;
- return this;
-}
-
-/** Getter for {@link InformationOperationsReportPdu#padding2}*/
-public short getPadding2()
+ padding2 = pPadding2;
+ return this;
+}
+
+/** Getter for {@link InformationOperationsReportPdu#padding2}*/
+public short getPadding2()
{
return padding2;
-}
-
-/** Setter for {@link InformationOperationsReportPdu#padding3}*/
-public InformationOperationsReportPdu setPadding3(short pPadding3)
+}
+
+/** Setter for {@link InformationOperationsReportPdu#padding3}*/
+public InformationOperationsReportPdu setPadding3(short pPadding3)
{
- padding3 = pPadding3;
- return this;
-}
-
-/** Getter for {@link InformationOperationsReportPdu#padding3}*/
-public short getPadding3()
+ padding3 = pPadding3;
+ return this;
+}
+
+/** Getter for {@link InformationOperationsReportPdu#padding3}*/
+public short getPadding3()
{
return padding3;
-}
-
-/** Setter for {@link InformationOperationsReportPdu#ioRecords}*/
-public InformationOperationsReportPdu setIoRecords(List<IORecord> pIoRecords)
+}
+
+/** Setter for {@link InformationOperationsReportPdu#ioRecords}*/
+public InformationOperationsReportPdu setIoRecords(List<IORecord> pIoRecords)
{
- ioRecords = pIoRecords;
- return this;
-}
-
-/** Getter for {@link InformationOperationsReportPdu#ioRecords}*/
-public List<IORecord> getIoRecords()
+ ioRecords = pIoRecords;
+ return this;
+}
+
+/** Getter for {@link InformationOperationsReportPdu#ioRecords}*/
+public List<IORecord> getIoRecords()
{
return ioRecords;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- ioSimSource.marshal(dos);
- ioReportType.marshal(dos);
- dos.writeByte(padding1);
- ioAttackerID.marshal(dos);
- ioPrimaryTargetID.marshal(dos);
- dos.writeShort(padding2);
- dos.writeShort(padding3);
- dos.writeShort(ioRecords.size());
-
- for(int idx = 0; idx < ioRecords.size(); idx++)
- {
- IORecord aIORecord = ioRecords.get(idx);
- aIORecord.marshal(dos);
- }
-
+ {
+ ioSimSource.marshal(dos);
+ ioReportType.marshal(dos);
+ dos.writeByte(padding1);
+ ioAttackerID.marshal(dos);
+ ioPrimaryTargetID.marshal(dos);
+ dos.writeShort(padding2);
+ dos.writeShort(padding3);
+ dos.writeShort(ioRecords.size());
+
+ for(int idx = 0; idx < ioRecords.size(); idx++)
+ {
+ IORecord aIORecord = ioRecords.get(idx);
+ aIORecord.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- ioSimSource = IOActionIOSimulationSource.unmarshalEnum(dis);
- uPosition += ioSimSource.getMarshalledSize();
- ioReportType = IOReportIOReportType.unmarshalEnum(dis);
- uPosition += ioReportType.getMarshalledSize();
- padding1 = (byte)dis.readUnsignedByte();
- uPosition += 1;
- uPosition += ioAttackerID.unmarshal(dis);
- uPosition += ioPrimaryTargetID.unmarshal(dis);
- padding2 = (short)dis.readUnsignedShort();
- uPosition += 2;
- padding3 = (short)dis.readUnsignedShort();
- uPosition += 2;
- numberOfIORecords = (short)dis.readUnsignedShort();
- uPosition += 2;
- for(int idx = 0; idx < numberOfIORecords; idx++)
- {
- IORecord anX = new IORecord();
- uPosition += anX.unmarshal(dis);
- ioRecords.add(anX);
- }
-
+ {
+ ioSimSource = IOActionIOSimulationSource.unmarshalEnum(dis);
+ uPosition += ioSimSource.getMarshalledSize();
+ ioReportType = IOReportIOReportType.unmarshalEnum(dis);
+ uPosition += ioReportType.getMarshalledSize();
+ padding1 = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ uPosition += ioAttackerID.unmarshal(dis);
+ uPosition += ioPrimaryTargetID.unmarshal(dis);
+ padding2 = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ padding3 = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ numberOfIORecords = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ for(int idx = 0; idx < numberOfIORecords; idx++)
+ {
+ IORecord anX = new IORecord();
+ uPosition += anX.unmarshal(dis);
+ ioRecords.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- ioSimSource.marshal(buff);
- ioReportType.marshal(buff);
- buff.put( (byte)padding1);
- ioAttackerID.marshal(buff);
- ioPrimaryTargetID.marshal(buff);
- buff.putShort( (short)padding2);
- buff.putShort( (short)padding3);
- buff.putShort( (short)ioRecords.size());
-
- for(int idx = 0; idx < ioRecords.size(); idx++)
- {
- IORecord aIORecord = ioRecords.get(idx);
- aIORecord.marshal(buff);
- }
-
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ ioSimSource.marshal(buff);
+ ioReportType.marshal(buff);
+ buff.put( (byte)padding1);
+ ioAttackerID.marshal(buff);
+ ioPrimaryTargetID.marshal(buff);
+ buff.putShort( (short)padding2);
+ buff.putShort( (short)padding3);
+ buff.putShort( (short)ioRecords.size());
+
+ for(int idx = 0; idx < ioRecords.size(); idx++)
+ {
+ IORecord aIORecord = ioRecords.get(idx);
+ aIORecord.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- ioSimSource = IOActionIOSimulationSource.unmarshalEnum(buff);
- ioReportType = IOReportIOReportType.unmarshalEnum(buff);
- padding1 = (byte)(buff.get() & 0xFF);
- ioAttackerID.unmarshal(buff);
- ioPrimaryTargetID.unmarshal(buff);
- padding2 = (short)(buff.getShort() & 0xFFFF);
- padding3 = (short)(buff.getShort() & 0xFFFF);
- numberOfIORecords = (short)(buff.getShort() & 0xFFFF);
- for(int idx = 0; idx < numberOfIORecords; idx++)
- {
- IORecord anX = new IORecord();
- anX.unmarshal(buff);
- ioRecords.add(anX);
- }
-
- return getMarshalledSize();
+
+ ioSimSource = IOActionIOSimulationSource.unmarshalEnum(buff);
+ ioReportType = IOReportIOReportType.unmarshalEnum(buff);
+ padding1 = (byte)(buff.get() & 0xFF);
+ ioAttackerID.unmarshal(buff);
+ ioPrimaryTargetID.unmarshal(buff);
+ padding2 = (short)(buff.getShort() & 0xFFFF);
+ padding3 = (short)(buff.getShort() & 0xFFFF);
+ numberOfIORecords = (short)(buff.getShort() & 0xFFFF);
+ for(int idx = 0; idx < numberOfIORecords; idx++)
+ {
+ IORecord anX = new IORecord();
+ anX.unmarshal(buff);
+ ioRecords.add(anX);
+ }
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final InformationOperationsReportPdu rhs = (InformationOperationsReportPdu)obj;
-
- if( ! (ioSimSource == rhs.ioSimSource)) ivarsEqual = false;
- if( ! (ioReportType == rhs.ioReportType)) ivarsEqual = false;
- if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
- if( ! (ioAttackerID.equals( rhs.ioAttackerID) )) ivarsEqual = false;
- if( ! (ioPrimaryTargetID.equals( rhs.ioPrimaryTargetID) )) ivarsEqual = false;
- if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
- if( ! (padding3 == rhs.padding3)) ivarsEqual = false;
-
- for(int idx = 0; idx < ioRecords.size(); idx++)
- if( ! ( ioRecords.get(idx).equals(rhs.ioRecords.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final InformationOperationsReportPdu rhs = (InformationOperationsReportPdu)obj;
+
+ if( ! (ioSimSource == rhs.ioSimSource)) ivarsEqual = false;
+ if( ! (ioReportType == rhs.ioReportType)) ivarsEqual = false;
+ if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
+ if( ! (ioAttackerID.equals( rhs.ioAttackerID) )) ivarsEqual = false;
+ if( ! (ioPrimaryTargetID.equals( rhs.ioPrimaryTargetID) )) ivarsEqual = false;
+ if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
+ if( ! (padding3 == rhs.padding3)) ivarsEqual = false;
+
+ for(int idx = 0; idx < ioRecords.size(); idx++)
+ if( ! ( ioRecords.get(idx).equals(rhs.ioRecords.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" ioSimSource: ").append(ioSimSource).append("\n");
- sb.append(" ioReportType: ").append(ioReportType).append("\n");
- sb.append(" padding1: ").append(padding1).append("\n");
- sb.append(" ioAttackerID: ").append(ioAttackerID).append("\n");
- sb.append(" ioPrimaryTargetID: ").append(ioPrimaryTargetID).append("\n");
- sb.append(" padding2: ").append(padding2).append("\n");
- sb.append(" padding3: ").append(padding3).append("\n");
- sb.append(" ioRecords: ").append("\n");
- ioRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" ioSimSource: ").append(ioSimSource).append("\n");
+ sb.append(" ioReportType: ").append(ioReportType).append("\n");
+ sb.append(" padding1: ").append(padding1).append("\n");
+ sb.append(" ioAttackerID: ").append(ioAttackerID).append("\n");
+ sb.append(" ioPrimaryTargetID: ").append(ioPrimaryTargetID).append("\n");
+ sb.append(" padding2: ").append(padding2).append("\n");
+ sb.append(" padding3: ").append(padding3).append("\n");
+ sb.append(" ioRecords: ").append("\n");
+ ioRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/IntercomCommunicationsParameters.java b/src-generated/edu/nps/moves/dis7/IntercomCommunicationsParameters.java
index 8395b47317cd8247ab8dcafee39c585ab8f997f2..ead1e6d6319d302bdd06aa45c88ec361a2b71e94 100644
--- a/src-generated/edu/nps/moves/dis7/IntercomCommunicationsParameters.java
+++ b/src-generated/edu/nps/moves/dis7/IntercomCommunicationsParameters.java
@@ -1,233 +1,233 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Intercom communications parameters. Section 6.2.46
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class IntercomCommunicationsParameters extends Object implements Serializable
-{
- /** Type of intercom parameters record uid 185 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Intercom communications parameters. Section 6.2.46
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class IntercomCommunicationsParameters extends Object implements Serializable
+{
+ /** Type of intercom parameters record uid 185 */
protected IntercomControlRecordType recordType = IntercomControlRecordType.values()[0];
-
- /** length of record */
+
+ /** length of record */
protected short recordLength;
-
- /** This is a placeholder. */
+
+ /** This is a placeholder. */
protected byte[] recordSpecificField = new byte[0];
-
+
private byte[] padding = new byte[0]; // pad to 32-bit boundary
-
-
-/** Constructor */
- public IntercomCommunicationsParameters()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += recordType.getMarshalledSize();
- marshalSize += 2; // recordLength
- marshalSize += recordSpecificField.length * 1;
- marshalSize += padding.length;
-
- return marshalSize;
-}
-
-
-/** Setter for {@link IntercomCommunicationsParameters#recordType}*/
-public IntercomCommunicationsParameters setRecordType(IntercomControlRecordType pRecordType)
+
+
+/** Constructor */
+ public IntercomCommunicationsParameters()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += recordType.getMarshalledSize();
+ marshalSize += 2; // recordLength
+ marshalSize += recordSpecificField.length * 1;
+ marshalSize += padding.length;
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link IntercomCommunicationsParameters#recordType}*/
+public IntercomCommunicationsParameters setRecordType(IntercomControlRecordType pRecordType)
{
- recordType = pRecordType;
- return this;
-}
-
-/** Getter for {@link IntercomCommunicationsParameters#recordType}*/
-public IntercomControlRecordType getRecordType()
+ recordType = pRecordType;
+ return this;
+}
+
+/** Getter for {@link IntercomCommunicationsParameters#recordType}*/
+public IntercomControlRecordType getRecordType()
{
return recordType;
-}
-
-/** Setter for {@link IntercomCommunicationsParameters#recordLength}*/
-public IntercomCommunicationsParameters setRecordLength(short pRecordLength)
+}
+
+/** Setter for {@link IntercomCommunicationsParameters#recordLength}*/
+public IntercomCommunicationsParameters setRecordLength(short pRecordLength)
{
- recordLength = pRecordLength;
- return this;
-}
-
-/** Getter for {@link IntercomCommunicationsParameters#recordLength}*/
-public short getRecordLength()
+ recordLength = pRecordLength;
+ return this;
+}
+
+/** Getter for {@link IntercomCommunicationsParameters#recordLength}*/
+public short getRecordLength()
{
return recordLength;
-}
-
-/** Setter for {@link IntercomCommunicationsParameters#recordSpecificField}*/
-public IntercomCommunicationsParameters setRecordSpecificField(byte[] pRecordSpecificField)
+}
+
+/** Setter for {@link IntercomCommunicationsParameters#recordSpecificField}*/
+public IntercomCommunicationsParameters setRecordSpecificField(byte[] pRecordSpecificField)
{
- recordSpecificField = pRecordSpecificField;
- return this;
-}
-
-/** Getter for {@link IntercomCommunicationsParameters#recordSpecificField}*/
-public byte[] getRecordSpecificField()
+ recordSpecificField = pRecordSpecificField;
+ return this;
+}
+
+/** Getter for {@link IntercomCommunicationsParameters#recordSpecificField}*/
+public byte[] getRecordSpecificField()
{
return recordSpecificField;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- recordType.marshal(dos);
- dos.writeShort(recordLength);
-
- for(int idx = 0; idx < recordSpecificField.length; idx++)
- dos.writeByte(recordSpecificField[idx]);
-
- padding = new byte[Align.to32bits(dos)];
+ {
+ recordType.marshal(dos);
+ dos.writeShort(recordLength);
+
+ for(int idx = 0; idx < recordSpecificField.length; idx++)
+ dos.writeByte(recordSpecificField[idx]);
+
+ padding = new byte[Align.to32bits(dos)];
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- recordType = IntercomControlRecordType.unmarshalEnum(dis);
- uPosition += recordType.getMarshalledSize();
- recordLength = (short)dis.readUnsignedShort();
- uPosition += 2;
- for(int idx = 0; idx < recordSpecificField.length; idx++)
- recordSpecificField[idx] = dis.readByte();
- uPosition += (recordSpecificField.length * 1);
- padding = new byte[Align.from32bits(uPosition,dis)];
- uPosition += padding.length;
+ {
+ recordType = IntercomControlRecordType.unmarshalEnum(dis);
+ uPosition += recordType.getMarshalledSize();
+ recordLength = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ for(int idx = 0; idx < recordSpecificField.length; idx++)
+ recordSpecificField[idx] = dis.readByte();
+ uPosition += (recordSpecificField.length * 1);
+ padding = new byte[Align.from32bits(uPosition,dis)];
+ uPosition += padding.length;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- recordType.marshal(buff);
- buff.putShort( (short)recordLength);
-
- for(int idx = 0; idx < recordSpecificField.length; idx++)
- buff.put((byte)recordSpecificField[idx]);
-
- padding = new byte[Align.to32bits(buff)];
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- recordType = IntercomControlRecordType.unmarshalEnum(buff);
- recordLength = (short)(buff.getShort() & 0xFFFF);
- for(int idx = 0; idx < recordSpecificField.length; idx++)
- recordSpecificField[idx] = buff.get();
- padding = new byte[Align.from32bits(buff)];
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ recordType.marshal(buff);
+ buff.putShort( (short)recordLength);
+
+ for(int idx = 0; idx < recordSpecificField.length; idx++)
+ buff.put((byte)recordSpecificField[idx]);
+
+ padding = new byte[Align.to32bits(buff)];
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ recordType = IntercomControlRecordType.unmarshalEnum(buff);
+ recordLength = (short)(buff.getShort() & 0xFFFF);
+ for(int idx = 0; idx < recordSpecificField.length; idx++)
+ recordSpecificField[idx] = buff.get();
+ padding = new byte[Align.from32bits(buff)];
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final IntercomCommunicationsParameters rhs = (IntercomCommunicationsParameters)obj;
-
- if( ! (recordType == rhs.recordType)) ivarsEqual = false;
- if( ! (recordLength == rhs.recordLength)) ivarsEqual = false;
-
- for(int idx = 0; idx < 0; idx++)
- {
- if(!(recordSpecificField[idx] == rhs.recordSpecificField[idx])) ivarsEqual = false;
- }
-
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final IntercomCommunicationsParameters rhs = (IntercomCommunicationsParameters)obj;
+
+ if( ! (recordType == rhs.recordType)) ivarsEqual = false;
+ if( ! (recordLength == rhs.recordLength)) ivarsEqual = false;
+
+ for(int idx = 0; idx < 0; idx++)
+ {
+ if(!(recordSpecificField[idx] == rhs.recordSpecificField[idx])) ivarsEqual = false;
+ }
+
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" recordType: ").append(recordType).append("\n");
- sb.append(" recordLength: ").append(recordLength).append("\n");
- sb.append(" recordSpecificField: ").append("\n");
- sb.append(Arrays.toString(recordSpecificField)).append("\n");
- sb.append(" padding: ").append(padding).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" recordType: ").append(recordType).append("\n");
+ sb.append(" recordLength: ").append(recordLength).append("\n");
+ sb.append(" recordSpecificField: ").append("\n");
+ sb.append(Arrays.toString(recordSpecificField)).append("\n");
+ sb.append(" padding: ").append(padding).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/IntercomControlPdu.java b/src-generated/edu/nps/moves/dis7/IntercomControlPdu.java
index acbfc74452645b06eade37c2fc83cc424a5c318b..d6f14cb863a3a01b66f7c0f76376bb632030a9f8 100644
--- a/src-generated/edu/nps/moves/dis7/IntercomControlPdu.java
+++ b/src-generated/edu/nps/moves/dis7/IntercomControlPdu.java
@@ -1,465 +1,465 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.8.7 Communicates the state of a particular intercom device, request an action of another intercom device, or respond to an action request.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class IntercomControlPdu extends RadioCommunicationsFamilyPdu implements Serializable
-{
- /** control type uid 180 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 5.8.7 Communicates the state of a particular intercom device, request an action of another intercom device, or respond to an action request.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class IntercomControlPdu extends RadioCommunicationsFamilyPdu implements Serializable
+{
+ /** control type uid 180 */
protected IntercomControlControlType controlType = IntercomControlControlType.values()[0];
-
- /** control type */
+
+ /** control type */
protected byte communicationsChannelType;
-
- /** Source entity ID, this can also be ObjectIdentifier or UnattachedIdentifier */
+
+ /** Source entity ID, this can also be ObjectIdentifier or UnattachedIdentifier */
protected EntityID sourceEntityID = new EntityID();
-
- /** The specific intercom device being simulated within an entity. */
+
+ /** The specific intercom device being simulated within an entity. */
protected short sourceIntercomNumber;
-
- /** Line number to which the intercom control refers */
+
+ /** Line number to which the intercom control refers */
protected byte sourceLineID;
-
- /** priority of this message relative to transmissons from other intercom devices */
+
+ /** priority of this message relative to transmissons from other intercom devices */
protected byte transmitPriority;
-
- /** current transmit state of the line uid 183 */
+
+ /** current transmit state of the line uid 183 */
protected IntercomControlTransmitLineState transmitLineState = IntercomControlTransmitLineState.values()[0];
-
- /** detailed type requested. uid 182 */
+
+ /** detailed type requested. uid 182 */
protected IntercomControlCommand command = IntercomControlCommand.values()[0];
-
- /** eid of the entity that has created this intercom channel, same comments as sourceEntityId */
+
+ /** eid of the entity that has created this intercom channel, same comments as sourceEntityId */
protected EntityID masterIntercomReferenceID = new EntityID();
-
- /** specific intercom device that has created this intercom channel */
+
+ /** specific intercom device that has created this intercom channel */
protected short masterIntercomNumber;
-
+
protected short masterChannelID;
-
- /** number of intercom parameters */
+
+ /** number of intercom parameters */
protected int intercomParametersLength;
-
+
protected List< IntercomCommunicationsParameters > intercomParameters = new ArrayList< IntercomCommunicationsParameters >();
-
-
-/** Constructor */
- public IntercomControlPdu()
- {
- setPduType( DISPDUType.INTERCOM_CONTROL );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += controlType.getMarshalledSize();
- marshalSize += 1; // communicationsChannelType
- marshalSize += sourceEntityID.getMarshalledSize();
- marshalSize += 2; // sourceIntercomNumber
- marshalSize += 1; // sourceLineID
- marshalSize += 1; // transmitPriority
- marshalSize += transmitLineState.getMarshalledSize();
- marshalSize += command.getMarshalledSize();
- marshalSize += masterIntercomReferenceID.getMarshalledSize();
- marshalSize += 2; // masterIntercomNumber
- marshalSize += 2; // masterChannelID
- marshalSize += 4; // intercomParametersLength
- for(int idx=0; idx < intercomParameters.size(); idx++)
- {
- IntercomCommunicationsParameters listElement = intercomParameters.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link IntercomControlPdu#controlType}*/
-public IntercomControlPdu setControlType(IntercomControlControlType pControlType)
+
+
+/** Constructor */
+ public IntercomControlPdu()
+ {
+ setPduType( DISPDUType.INTERCOM_CONTROL );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += controlType.getMarshalledSize();
+ marshalSize += 1; // communicationsChannelType
+ marshalSize += sourceEntityID.getMarshalledSize();
+ marshalSize += 2; // sourceIntercomNumber
+ marshalSize += 1; // sourceLineID
+ marshalSize += 1; // transmitPriority
+ marshalSize += transmitLineState.getMarshalledSize();
+ marshalSize += command.getMarshalledSize();
+ marshalSize += masterIntercomReferenceID.getMarshalledSize();
+ marshalSize += 2; // masterIntercomNumber
+ marshalSize += 2; // masterChannelID
+ marshalSize += 4; // intercomParametersLength
+ for(int idx=0; idx < intercomParameters.size(); idx++)
+ {
+ IntercomCommunicationsParameters listElement = intercomParameters.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link IntercomControlPdu#controlType}*/
+public IntercomControlPdu setControlType(IntercomControlControlType pControlType)
{
- controlType = pControlType;
- return this;
-}
-
-/** Getter for {@link IntercomControlPdu#controlType}*/
-public IntercomControlControlType getControlType()
+ controlType = pControlType;
+ return this;
+}
+
+/** Getter for {@link IntercomControlPdu#controlType}*/
+public IntercomControlControlType getControlType()
{
return controlType;
-}
-
-/** Setter for {@link IntercomControlPdu#communicationsChannelType}*/
-public IntercomControlPdu setCommunicationsChannelType(byte pCommunicationsChannelType)
+}
+
+/** Setter for {@link IntercomControlPdu#communicationsChannelType}*/
+public IntercomControlPdu setCommunicationsChannelType(byte pCommunicationsChannelType)
{
- communicationsChannelType = pCommunicationsChannelType;
- return this;
-}
-
-/** Getter for {@link IntercomControlPdu#communicationsChannelType}*/
-public byte getCommunicationsChannelType()
+ communicationsChannelType = pCommunicationsChannelType;
+ return this;
+}
+
+/** Getter for {@link IntercomControlPdu#communicationsChannelType}*/
+public byte getCommunicationsChannelType()
{
return communicationsChannelType;
-}
-
-/** Setter for {@link IntercomControlPdu#sourceEntityID}*/
-public IntercomControlPdu setSourceEntityID(EntityID pSourceEntityID)
+}
+
+/** Setter for {@link IntercomControlPdu#sourceEntityID}*/
+public IntercomControlPdu setSourceEntityID(EntityID pSourceEntityID)
{
- sourceEntityID = pSourceEntityID;
- return this;
-}
-
-/** Getter for {@link IntercomControlPdu#sourceEntityID}*/
-public EntityID getSourceEntityID()
+ sourceEntityID = pSourceEntityID;
+ return this;
+}
+
+/** Getter for {@link IntercomControlPdu#sourceEntityID}*/
+public EntityID getSourceEntityID()
{
return sourceEntityID;
-}
-
-/** Setter for {@link IntercomControlPdu#sourceIntercomNumber}*/
-public IntercomControlPdu setSourceIntercomNumber(short pSourceIntercomNumber)
+}
+
+/** Setter for {@link IntercomControlPdu#sourceIntercomNumber}*/
+public IntercomControlPdu setSourceIntercomNumber(short pSourceIntercomNumber)
{
- sourceIntercomNumber = pSourceIntercomNumber;
- return this;
-}
-
-/** Getter for {@link IntercomControlPdu#sourceIntercomNumber}*/
-public short getSourceIntercomNumber()
+ sourceIntercomNumber = pSourceIntercomNumber;
+ return this;
+}
+
+/** Getter for {@link IntercomControlPdu#sourceIntercomNumber}*/
+public short getSourceIntercomNumber()
{
return sourceIntercomNumber;
-}
-
-/** Setter for {@link IntercomControlPdu#sourceLineID}*/
-public IntercomControlPdu setSourceLineID(byte pSourceLineID)
+}
+
+/** Setter for {@link IntercomControlPdu#sourceLineID}*/
+public IntercomControlPdu setSourceLineID(byte pSourceLineID)
{
- sourceLineID = pSourceLineID;
- return this;
-}
-
-/** Getter for {@link IntercomControlPdu#sourceLineID}*/
-public byte getSourceLineID()
+ sourceLineID = pSourceLineID;
+ return this;
+}
+
+/** Getter for {@link IntercomControlPdu#sourceLineID}*/
+public byte getSourceLineID()
{
return sourceLineID;
-}
-
-/** Setter for {@link IntercomControlPdu#transmitPriority}*/
-public IntercomControlPdu setTransmitPriority(byte pTransmitPriority)
+}
+
+/** Setter for {@link IntercomControlPdu#transmitPriority}*/
+public IntercomControlPdu setTransmitPriority(byte pTransmitPriority)
{
- transmitPriority = pTransmitPriority;
- return this;
-}
-
-/** Getter for {@link IntercomControlPdu#transmitPriority}*/
-public byte getTransmitPriority()
+ transmitPriority = pTransmitPriority;
+ return this;
+}
+
+/** Getter for {@link IntercomControlPdu#transmitPriority}*/
+public byte getTransmitPriority()
{
return transmitPriority;
-}
-
-/** Setter for {@link IntercomControlPdu#transmitLineState}*/
-public IntercomControlPdu setTransmitLineState(IntercomControlTransmitLineState pTransmitLineState)
+}
+
+/** Setter for {@link IntercomControlPdu#transmitLineState}*/
+public IntercomControlPdu setTransmitLineState(IntercomControlTransmitLineState pTransmitLineState)
{
- transmitLineState = pTransmitLineState;
- return this;
-}
-
-/** Getter for {@link IntercomControlPdu#transmitLineState}*/
-public IntercomControlTransmitLineState getTransmitLineState()
+ transmitLineState = pTransmitLineState;
+ return this;
+}
+
+/** Getter for {@link IntercomControlPdu#transmitLineState}*/
+public IntercomControlTransmitLineState getTransmitLineState()
{
return transmitLineState;
-}
-
-/** Setter for {@link IntercomControlPdu#command}*/
-public IntercomControlPdu setCommand(IntercomControlCommand pCommand)
+}
+
+/** Setter for {@link IntercomControlPdu#command}*/
+public IntercomControlPdu setCommand(IntercomControlCommand pCommand)
{
- command = pCommand;
- return this;
-}
-
-/** Getter for {@link IntercomControlPdu#command}*/
-public IntercomControlCommand getCommand()
+ command = pCommand;
+ return this;
+}
+
+/** Getter for {@link IntercomControlPdu#command}*/
+public IntercomControlCommand getCommand()
{
return command;
-}
-
-/** Setter for {@link IntercomControlPdu#masterIntercomReferenceID}*/
-public IntercomControlPdu setMasterIntercomReferenceID(EntityID pMasterIntercomReferenceID)
+}
+
+/** Setter for {@link IntercomControlPdu#masterIntercomReferenceID}*/
+public IntercomControlPdu setMasterIntercomReferenceID(EntityID pMasterIntercomReferenceID)
{
- masterIntercomReferenceID = pMasterIntercomReferenceID;
- return this;
-}
-
-/** Getter for {@link IntercomControlPdu#masterIntercomReferenceID}*/
-public EntityID getMasterIntercomReferenceID()
+ masterIntercomReferenceID = pMasterIntercomReferenceID;
+ return this;
+}
+
+/** Getter for {@link IntercomControlPdu#masterIntercomReferenceID}*/
+public EntityID getMasterIntercomReferenceID()
{
return masterIntercomReferenceID;
-}
-
-/** Setter for {@link IntercomControlPdu#masterIntercomNumber}*/
-public IntercomControlPdu setMasterIntercomNumber(short pMasterIntercomNumber)
+}
+
+/** Setter for {@link IntercomControlPdu#masterIntercomNumber}*/
+public IntercomControlPdu setMasterIntercomNumber(short pMasterIntercomNumber)
{
- masterIntercomNumber = pMasterIntercomNumber;
- return this;
-}
-
-/** Getter for {@link IntercomControlPdu#masterIntercomNumber}*/
-public short getMasterIntercomNumber()
+ masterIntercomNumber = pMasterIntercomNumber;
+ return this;
+}
+
+/** Getter for {@link IntercomControlPdu#masterIntercomNumber}*/
+public short getMasterIntercomNumber()
{
return masterIntercomNumber;
-}
-
-/** Setter for {@link IntercomControlPdu#masterChannelID}*/
-public IntercomControlPdu setMasterChannelID(short pMasterChannelID)
+}
+
+/** Setter for {@link IntercomControlPdu#masterChannelID}*/
+public IntercomControlPdu setMasterChannelID(short pMasterChannelID)
{
- masterChannelID = pMasterChannelID;
- return this;
-}
-
-/** Getter for {@link IntercomControlPdu#masterChannelID}*/
-public short getMasterChannelID()
+ masterChannelID = pMasterChannelID;
+ return this;
+}
+
+/** Getter for {@link IntercomControlPdu#masterChannelID}*/
+public short getMasterChannelID()
{
return masterChannelID;
-}
-
-/** Setter for {@link IntercomControlPdu#intercomParameters}*/
-public IntercomControlPdu setIntercomParameters(List<IntercomCommunicationsParameters> pIntercomParameters)
+}
+
+/** Setter for {@link IntercomControlPdu#intercomParameters}*/
+public IntercomControlPdu setIntercomParameters(List<IntercomCommunicationsParameters> pIntercomParameters)
{
- intercomParameters = pIntercomParameters;
- return this;
-}
-
-/** Getter for {@link IntercomControlPdu#intercomParameters}*/
-public List<IntercomCommunicationsParameters> getIntercomParameters()
+ intercomParameters = pIntercomParameters;
+ return this;
+}
+
+/** Getter for {@link IntercomControlPdu#intercomParameters}*/
+public List<IntercomCommunicationsParameters> getIntercomParameters()
{
return intercomParameters;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- controlType.marshal(dos);
- dos.writeByte(communicationsChannelType);
- sourceEntityID.marshal(dos);
- dos.writeShort(sourceIntercomNumber);
- dos.writeByte(sourceLineID);
- dos.writeByte(transmitPriority);
- transmitLineState.marshal(dos);
- command.marshal(dos);
- masterIntercomReferenceID.marshal(dos);
- dos.writeShort(masterIntercomNumber);
- dos.writeShort(masterChannelID);
- dos.writeInt(intercomParameters.size());
-
- for(int idx = 0; idx < intercomParameters.size(); idx++)
- {
- IntercomCommunicationsParameters aIntercomCommunicationsParameters = intercomParameters.get(idx);
- aIntercomCommunicationsParameters.marshal(dos);
- }
-
+ {
+ controlType.marshal(dos);
+ dos.writeByte(communicationsChannelType);
+ sourceEntityID.marshal(dos);
+ dos.writeShort(sourceIntercomNumber);
+ dos.writeByte(sourceLineID);
+ dos.writeByte(transmitPriority);
+ transmitLineState.marshal(dos);
+ command.marshal(dos);
+ masterIntercomReferenceID.marshal(dos);
+ dos.writeShort(masterIntercomNumber);
+ dos.writeShort(masterChannelID);
+ dos.writeInt(intercomParameters.size());
+
+ for(int idx = 0; idx < intercomParameters.size(); idx++)
+ {
+ IntercomCommunicationsParameters aIntercomCommunicationsParameters = intercomParameters.get(idx);
+ aIntercomCommunicationsParameters.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- controlType = IntercomControlControlType.unmarshalEnum(dis);
- uPosition += controlType.getMarshalledSize();
- communicationsChannelType = (byte)dis.readUnsignedByte();
- uPosition += 1;
- uPosition += sourceEntityID.unmarshal(dis);
- sourceIntercomNumber = (short)dis.readUnsignedShort();
- uPosition += 2;
- sourceLineID = (byte)dis.readUnsignedByte();
- uPosition += 1;
- transmitPriority = (byte)dis.readUnsignedByte();
- uPosition += 1;
- transmitLineState = IntercomControlTransmitLineState.unmarshalEnum(dis);
- uPosition += transmitLineState.getMarshalledSize();
- command = IntercomControlCommand.unmarshalEnum(dis);
- uPosition += command.getMarshalledSize();
- uPosition += masterIntercomReferenceID.unmarshal(dis);
- masterIntercomNumber = (short)dis.readUnsignedShort();
- uPosition += 2;
- masterChannelID = (short)dis.readUnsignedShort();
- uPosition += 2;
- intercomParametersLength = dis.readInt();
- uPosition += 4;
- for(int idx = 0; idx < intercomParametersLength; idx++)
- {
- IntercomCommunicationsParameters anX = new IntercomCommunicationsParameters();
- uPosition += anX.unmarshal(dis);
- intercomParameters.add(anX);
- }
-
+ {
+ controlType = IntercomControlControlType.unmarshalEnum(dis);
+ uPosition += controlType.getMarshalledSize();
+ communicationsChannelType = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ uPosition += sourceEntityID.unmarshal(dis);
+ sourceIntercomNumber = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ sourceLineID = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ transmitPriority = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ transmitLineState = IntercomControlTransmitLineState.unmarshalEnum(dis);
+ uPosition += transmitLineState.getMarshalledSize();
+ command = IntercomControlCommand.unmarshalEnum(dis);
+ uPosition += command.getMarshalledSize();
+ uPosition += masterIntercomReferenceID.unmarshal(dis);
+ masterIntercomNumber = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ masterChannelID = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ intercomParametersLength = dis.readInt();
+ uPosition += 4;
+ for(int idx = 0; idx < intercomParametersLength; idx++)
+ {
+ IntercomCommunicationsParameters anX = new IntercomCommunicationsParameters();
+ uPosition += anX.unmarshal(dis);
+ intercomParameters.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- controlType.marshal(buff);
- buff.put( (byte)communicationsChannelType);
- sourceEntityID.marshal(buff);
- buff.putShort( (short)sourceIntercomNumber);
- buff.put( (byte)sourceLineID);
- buff.put( (byte)transmitPriority);
- transmitLineState.marshal(buff);
- command.marshal(buff);
- masterIntercomReferenceID.marshal(buff);
- buff.putShort( (short)masterIntercomNumber);
- buff.putShort( (short)masterChannelID);
- buff.putInt( (int)intercomParameters.size());
-
- for(int idx = 0; idx < intercomParameters.size(); idx++)
- {
- IntercomCommunicationsParameters aIntercomCommunicationsParameters = intercomParameters.get(idx);
- aIntercomCommunicationsParameters.marshal(buff);
- }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ controlType.marshal(buff);
+ buff.put( (byte)communicationsChannelType);
+ sourceEntityID.marshal(buff);
+ buff.putShort( (short)sourceIntercomNumber);
+ buff.put( (byte)sourceLineID);
+ buff.put( (byte)transmitPriority);
+ transmitLineState.marshal(buff);
+ command.marshal(buff);
+ masterIntercomReferenceID.marshal(buff);
+ buff.putShort( (short)masterIntercomNumber);
+ buff.putShort( (short)masterChannelID);
+ buff.putInt( (int)intercomParameters.size());
+
+ for(int idx = 0; idx < intercomParameters.size(); idx++)
+ {
+ IntercomCommunicationsParameters aIntercomCommunicationsParameters = intercomParameters.get(idx);
+ aIntercomCommunicationsParameters.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- controlType = IntercomControlControlType.unmarshalEnum(buff);
- communicationsChannelType = (byte)(buff.get() & 0xFF);
- sourceEntityID.unmarshal(buff);
- sourceIntercomNumber = (short)(buff.getShort() & 0xFFFF);
- sourceLineID = (byte)(buff.get() & 0xFF);
- transmitPriority = (byte)(buff.get() & 0xFF);
- transmitLineState = IntercomControlTransmitLineState.unmarshalEnum(buff);
- command = IntercomControlCommand.unmarshalEnum(buff);
- masterIntercomReferenceID.unmarshal(buff);
- masterIntercomNumber = (short)(buff.getShort() & 0xFFFF);
- masterChannelID = (short)(buff.getShort() & 0xFFFF);
- intercomParametersLength = buff.getInt();
- for(int idx = 0; idx < intercomParametersLength; idx++)
- {
- IntercomCommunicationsParameters anX = new IntercomCommunicationsParameters();
- anX.unmarshal(buff);
- intercomParameters.add(anX);
- }
-
- return getMarshalledSize();
+
+ controlType = IntercomControlControlType.unmarshalEnum(buff);
+ communicationsChannelType = (byte)(buff.get() & 0xFF);
+ sourceEntityID.unmarshal(buff);
+ sourceIntercomNumber = (short)(buff.getShort() & 0xFFFF);
+ sourceLineID = (byte)(buff.get() & 0xFF);
+ transmitPriority = (byte)(buff.get() & 0xFF);
+ transmitLineState = IntercomControlTransmitLineState.unmarshalEnum(buff);
+ command = IntercomControlCommand.unmarshalEnum(buff);
+ masterIntercomReferenceID.unmarshal(buff);
+ masterIntercomNumber = (short)(buff.getShort() & 0xFFFF);
+ masterChannelID = (short)(buff.getShort() & 0xFFFF);
+ intercomParametersLength = buff.getInt();
+ for(int idx = 0; idx < intercomParametersLength; idx++)
+ {
+ IntercomCommunicationsParameters anX = new IntercomCommunicationsParameters();
+ anX.unmarshal(buff);
+ intercomParameters.add(anX);
+ }
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final IntercomControlPdu rhs = (IntercomControlPdu)obj;
-
- if( ! (controlType == rhs.controlType)) ivarsEqual = false;
- if( ! (communicationsChannelType == rhs.communicationsChannelType)) ivarsEqual = false;
- if( ! (sourceEntityID.equals( rhs.sourceEntityID) )) ivarsEqual = false;
- if( ! (sourceIntercomNumber == rhs.sourceIntercomNumber)) ivarsEqual = false;
- if( ! (sourceLineID == rhs.sourceLineID)) ivarsEqual = false;
- if( ! (transmitPriority == rhs.transmitPriority)) ivarsEqual = false;
- if( ! (transmitLineState == rhs.transmitLineState)) ivarsEqual = false;
- if( ! (command == rhs.command)) ivarsEqual = false;
- if( ! (masterIntercomReferenceID.equals( rhs.masterIntercomReferenceID) )) ivarsEqual = false;
- if( ! (masterIntercomNumber == rhs.masterIntercomNumber)) ivarsEqual = false;
- if( ! (masterChannelID == rhs.masterChannelID)) ivarsEqual = false;
-
- for(int idx = 0; idx < intercomParameters.size(); idx++)
- if( ! ( intercomParameters.get(idx).equals(rhs.intercomParameters.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final IntercomControlPdu rhs = (IntercomControlPdu)obj;
+
+ if( ! (controlType == rhs.controlType)) ivarsEqual = false;
+ if( ! (communicationsChannelType == rhs.communicationsChannelType)) ivarsEqual = false;
+ if( ! (sourceEntityID.equals( rhs.sourceEntityID) )) ivarsEqual = false;
+ if( ! (sourceIntercomNumber == rhs.sourceIntercomNumber)) ivarsEqual = false;
+ if( ! (sourceLineID == rhs.sourceLineID)) ivarsEqual = false;
+ if( ! (transmitPriority == rhs.transmitPriority)) ivarsEqual = false;
+ if( ! (transmitLineState == rhs.transmitLineState)) ivarsEqual = false;
+ if( ! (command == rhs.command)) ivarsEqual = false;
+ if( ! (masterIntercomReferenceID.equals( rhs.masterIntercomReferenceID) )) ivarsEqual = false;
+ if( ! (masterIntercomNumber == rhs.masterIntercomNumber)) ivarsEqual = false;
+ if( ! (masterChannelID == rhs.masterChannelID)) ivarsEqual = false;
+
+ for(int idx = 0; idx < intercomParameters.size(); idx++)
+ if( ! ( intercomParameters.get(idx).equals(rhs.intercomParameters.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" controlType: ").append(controlType).append("\n");
- sb.append(" communicationsChannelType: ").append(communicationsChannelType).append("\n");
- sb.append(" sourceEntityID: ").append(sourceEntityID).append("\n");
- sb.append(" sourceIntercomNumber: ").append(sourceIntercomNumber).append("\n");
- sb.append(" sourceLineID: ").append(sourceLineID).append("\n");
- sb.append(" transmitPriority: ").append(transmitPriority).append("\n");
- sb.append(" transmitLineState: ").append(transmitLineState).append("\n");
- sb.append(" command: ").append(command).append("\n");
- sb.append(" masterIntercomReferenceID: ").append(masterIntercomReferenceID).append("\n");
- sb.append(" masterIntercomNumber: ").append(masterIntercomNumber).append("\n");
- sb.append(" masterChannelID: ").append(masterChannelID).append("\n");
- sb.append(" intercomParameters: ").append("\n");
- intercomParameters.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" controlType: ").append(controlType).append("\n");
+ sb.append(" communicationsChannelType: ").append(communicationsChannelType).append("\n");
+ sb.append(" sourceEntityID: ").append(sourceEntityID).append("\n");
+ sb.append(" sourceIntercomNumber: ").append(sourceIntercomNumber).append("\n");
+ sb.append(" sourceLineID: ").append(sourceLineID).append("\n");
+ sb.append(" transmitPriority: ").append(transmitPriority).append("\n");
+ sb.append(" transmitLineState: ").append(transmitLineState).append("\n");
+ sb.append(" command: ").append(command).append("\n");
+ sb.append(" masterIntercomReferenceID: ").append(masterIntercomReferenceID).append("\n");
+ sb.append(" masterIntercomNumber: ").append(masterIntercomNumber).append("\n");
+ sb.append(" masterChannelID: ").append(masterChannelID).append("\n");
+ sb.append(" intercomParameters: ").append("\n");
+ intercomParameters.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/IntercomIdentifier.java b/src-generated/edu/nps/moves/dis7/IntercomIdentifier.java
index 55e3de7ad3fff023d0d22c0388cbc037fec216bc..3dd653aaa0c8bbb91ccdfa929fe8e58b1257fddf 100644
--- a/src-generated/edu/nps/moves/dis7/IntercomIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/IntercomIdentifier.java
@@ -1,230 +1,230 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Unique designation of an attached or unattached intercom in an event or exercirse. Section 6.2.48
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class IntercomIdentifier extends Object implements Serializable
-{
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Unique designation of an attached or unattached intercom in an event or exercirse. Section 6.2.48
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class IntercomIdentifier extends Object implements Serializable
+{
protected short siteNumber;
-
+
protected short applicationNumber;
-
+
protected short referenceNumber;
-
+
protected short intercomNumber;
-
-
-/** Constructor */
- public IntercomIdentifier()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public IntercomIdentifier()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 2; // siteNumber
+ marshalSize += 2; // applicationNumber
+ marshalSize += 2; // referenceNumber
+ marshalSize += 2; // intercomNumber
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link IntercomIdentifier#siteNumber}*/
+public IntercomIdentifier setSiteNumber(short pSiteNumber)
{
- int marshalSize = 0;
-
- marshalSize += 2; // siteNumber
- marshalSize += 2; // applicationNumber
- marshalSize += 2; // referenceNumber
- marshalSize += 2; // intercomNumber
-
- return marshalSize;
-}
-
-
-/** Setter for {@link IntercomIdentifier#siteNumber}*/
-public IntercomIdentifier setSiteNumber(short pSiteNumber)
-{
- siteNumber = pSiteNumber;
- return this;
-}
-
-/** Getter for {@link IntercomIdentifier#siteNumber}*/
-public short getSiteNumber()
+ siteNumber = pSiteNumber;
+ return this;
+}
+
+/** Getter for {@link IntercomIdentifier#siteNumber}*/
+public short getSiteNumber()
{
return siteNumber;
-}
-
-/** Setter for {@link IntercomIdentifier#applicationNumber}*/
-public IntercomIdentifier setApplicationNumber(short pApplicationNumber)
+}
+
+/** Setter for {@link IntercomIdentifier#applicationNumber}*/
+public IntercomIdentifier setApplicationNumber(short pApplicationNumber)
{
- applicationNumber = pApplicationNumber;
- return this;
-}
-
-/** Getter for {@link IntercomIdentifier#applicationNumber}*/
-public short getApplicationNumber()
+ applicationNumber = pApplicationNumber;
+ return this;
+}
+
+/** Getter for {@link IntercomIdentifier#applicationNumber}*/
+public short getApplicationNumber()
{
return applicationNumber;
-}
-
-/** Setter for {@link IntercomIdentifier#referenceNumber}*/
-public IntercomIdentifier setReferenceNumber(short pReferenceNumber)
+}
+
+/** Setter for {@link IntercomIdentifier#referenceNumber}*/
+public IntercomIdentifier setReferenceNumber(short pReferenceNumber)
{
- referenceNumber = pReferenceNumber;
- return this;
-}
-
-/** Getter for {@link IntercomIdentifier#referenceNumber}*/
-public short getReferenceNumber()
+ referenceNumber = pReferenceNumber;
+ return this;
+}
+
+/** Getter for {@link IntercomIdentifier#referenceNumber}*/
+public short getReferenceNumber()
{
return referenceNumber;
-}
-
-/** Setter for {@link IntercomIdentifier#intercomNumber}*/
-public IntercomIdentifier setIntercomNumber(short pIntercomNumber)
+}
+
+/** Setter for {@link IntercomIdentifier#intercomNumber}*/
+public IntercomIdentifier setIntercomNumber(short pIntercomNumber)
{
- intercomNumber = pIntercomNumber;
- return this;
-}
-
-/** Getter for {@link IntercomIdentifier#intercomNumber}*/
-public short getIntercomNumber()
+ intercomNumber = pIntercomNumber;
+ return this;
+}
+
+/** Getter for {@link IntercomIdentifier#intercomNumber}*/
+public short getIntercomNumber()
{
return intercomNumber;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeShort(siteNumber);
- dos.writeShort(applicationNumber);
- dos.writeShort(referenceNumber);
- dos.writeShort(intercomNumber);
+ {
+ dos.writeShort(siteNumber);
+ dos.writeShort(applicationNumber);
+ dos.writeShort(referenceNumber);
+ dos.writeShort(intercomNumber);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- siteNumber = (short)dis.readUnsignedShort();
- uPosition += 2;
- applicationNumber = (short)dis.readUnsignedShort();
- uPosition += 2;
- referenceNumber = (short)dis.readUnsignedShort();
- uPosition += 2;
- intercomNumber = (short)dis.readUnsignedShort();
- uPosition += 2;
+ {
+ siteNumber = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ applicationNumber = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ referenceNumber = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ intercomNumber = (short)dis.readUnsignedShort();
+ uPosition += 2;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putShort( (short)siteNumber);
- buff.putShort( (short)applicationNumber);
- buff.putShort( (short)referenceNumber);
- buff.putShort( (short)intercomNumber);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- siteNumber = (short)(buff.getShort() & 0xFFFF);
- applicationNumber = (short)(buff.getShort() & 0xFFFF);
- referenceNumber = (short)(buff.getShort() & 0xFFFF);
- intercomNumber = (short)(buff.getShort() & 0xFFFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putShort( (short)siteNumber);
+ buff.putShort( (short)applicationNumber);
+ buff.putShort( (short)referenceNumber);
+ buff.putShort( (short)intercomNumber);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ siteNumber = (short)(buff.getShort() & 0xFFFF);
+ applicationNumber = (short)(buff.getShort() & 0xFFFF);
+ referenceNumber = (short)(buff.getShort() & 0xFFFF);
+ intercomNumber = (short)(buff.getShort() & 0xFFFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final IntercomIdentifier rhs = (IntercomIdentifier)obj;
-
- if( ! (siteNumber == rhs.siteNumber)) ivarsEqual = false;
- if( ! (applicationNumber == rhs.applicationNumber)) ivarsEqual = false;
- if( ! (referenceNumber == rhs.referenceNumber)) ivarsEqual = false;
- if( ! (intercomNumber == rhs.intercomNumber)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final IntercomIdentifier rhs = (IntercomIdentifier)obj;
+
+ if( ! (siteNumber == rhs.siteNumber)) ivarsEqual = false;
+ if( ! (applicationNumber == rhs.applicationNumber)) ivarsEqual = false;
+ if( ! (referenceNumber == rhs.referenceNumber)) ivarsEqual = false;
+ if( ! (intercomNumber == rhs.intercomNumber)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" siteNumber: ").append(siteNumber).append("\n");
- sb.append(" applicationNumber: ").append(applicationNumber).append("\n");
- sb.append(" referenceNumber: ").append(referenceNumber).append("\n");
- sb.append(" intercomNumber: ").append(intercomNumber).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" siteNumber: ").append(siteNumber).append("\n");
+ sb.append(" applicationNumber: ").append(applicationNumber).append("\n");
+ sb.append(" referenceNumber: ").append(referenceNumber).append("\n");
+ sb.append(" intercomNumber: ").append(intercomNumber).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/IntercomReferenceID.java b/src-generated/edu/nps/moves/dis7/IntercomReferenceID.java
index 21b7c969207781a14b3cb5b65dbcbc6f4c6fed22..54a8080b58c2a1664c493f25bb6ba165887db914 100644
--- a/src-generated/edu/nps/moves/dis7/IntercomReferenceID.java
+++ b/src-generated/edu/nps/moves/dis7/IntercomReferenceID.java
@@ -1,206 +1,206 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class IntercomReferenceID extends Object implements Serializable
-{
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class IntercomReferenceID extends Object implements Serializable
+{
protected short siteNumber;
-
+
protected short applicationNumber;
-
+
protected short referenceNumber;
-
-
-/** Constructor */
- public IntercomReferenceID()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += 2; // siteNumber
- marshalSize += 2; // applicationNumber
- marshalSize += 2; // referenceNumber
-
- return marshalSize;
-}
-
-
-/** Setter for {@link IntercomReferenceID#siteNumber}*/
-public IntercomReferenceID setSiteNumber(short pSiteNumber)
+
+
+/** Constructor */
+ public IntercomReferenceID()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 2; // siteNumber
+ marshalSize += 2; // applicationNumber
+ marshalSize += 2; // referenceNumber
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link IntercomReferenceID#siteNumber}*/
+public IntercomReferenceID setSiteNumber(short pSiteNumber)
{
- siteNumber = pSiteNumber;
- return this;
-}
-
-/** Getter for {@link IntercomReferenceID#siteNumber}*/
-public short getSiteNumber()
+ siteNumber = pSiteNumber;
+ return this;
+}
+
+/** Getter for {@link IntercomReferenceID#siteNumber}*/
+public short getSiteNumber()
{
return siteNumber;
-}
-
-/** Setter for {@link IntercomReferenceID#applicationNumber}*/
-public IntercomReferenceID setApplicationNumber(short pApplicationNumber)
+}
+
+/** Setter for {@link IntercomReferenceID#applicationNumber}*/
+public IntercomReferenceID setApplicationNumber(short pApplicationNumber)
{
- applicationNumber = pApplicationNumber;
- return this;
-}
-
-/** Getter for {@link IntercomReferenceID#applicationNumber}*/
-public short getApplicationNumber()
+ applicationNumber = pApplicationNumber;
+ return this;
+}
+
+/** Getter for {@link IntercomReferenceID#applicationNumber}*/
+public short getApplicationNumber()
{
return applicationNumber;
-}
-
-/** Setter for {@link IntercomReferenceID#referenceNumber}*/
-public IntercomReferenceID setReferenceNumber(short pReferenceNumber)
+}
+
+/** Setter for {@link IntercomReferenceID#referenceNumber}*/
+public IntercomReferenceID setReferenceNumber(short pReferenceNumber)
{
- referenceNumber = pReferenceNumber;
- return this;
-}
-
-/** Getter for {@link IntercomReferenceID#referenceNumber}*/
-public short getReferenceNumber()
+ referenceNumber = pReferenceNumber;
+ return this;
+}
+
+/** Getter for {@link IntercomReferenceID#referenceNumber}*/
+public short getReferenceNumber()
{
return referenceNumber;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeShort(siteNumber);
- dos.writeShort(applicationNumber);
- dos.writeShort(referenceNumber);
+ {
+ dos.writeShort(siteNumber);
+ dos.writeShort(applicationNumber);
+ dos.writeShort(referenceNumber);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- siteNumber = (short)dis.readUnsignedShort();
- uPosition += 2;
- applicationNumber = (short)dis.readUnsignedShort();
- uPosition += 2;
- referenceNumber = (short)dis.readUnsignedShort();
- uPosition += 2;
+ {
+ siteNumber = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ applicationNumber = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ referenceNumber = (short)dis.readUnsignedShort();
+ uPosition += 2;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putShort( (short)siteNumber);
- buff.putShort( (short)applicationNumber);
- buff.putShort( (short)referenceNumber);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- siteNumber = (short)(buff.getShort() & 0xFFFF);
- applicationNumber = (short)(buff.getShort() & 0xFFFF);
- referenceNumber = (short)(buff.getShort() & 0xFFFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putShort( (short)siteNumber);
+ buff.putShort( (short)applicationNumber);
+ buff.putShort( (short)referenceNumber);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ siteNumber = (short)(buff.getShort() & 0xFFFF);
+ applicationNumber = (short)(buff.getShort() & 0xFFFF);
+ referenceNumber = (short)(buff.getShort() & 0xFFFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final IntercomReferenceID rhs = (IntercomReferenceID)obj;
-
- if( ! (siteNumber == rhs.siteNumber)) ivarsEqual = false;
- if( ! (applicationNumber == rhs.applicationNumber)) ivarsEqual = false;
- if( ! (referenceNumber == rhs.referenceNumber)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final IntercomReferenceID rhs = (IntercomReferenceID)obj;
+
+ if( ! (siteNumber == rhs.siteNumber)) ivarsEqual = false;
+ if( ! (applicationNumber == rhs.applicationNumber)) ivarsEqual = false;
+ if( ! (referenceNumber == rhs.referenceNumber)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" siteNumber: ").append(siteNumber).append("\n");
- sb.append(" applicationNumber: ").append(applicationNumber).append("\n");
- sb.append(" referenceNumber: ").append(referenceNumber).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" siteNumber: ").append(siteNumber).append("\n");
+ sb.append(" applicationNumber: ").append(applicationNumber).append("\n");
+ sb.append(" referenceNumber: ").append(referenceNumber).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/IntercomSignalPdu.java b/src-generated/edu/nps/moves/dis7/IntercomSignalPdu.java
index 2bae5ec883f463edf21d012e193caebf37974554..84b153c14950cea6e9e0593ebfb2df098eb68157 100644
--- a/src-generated/edu/nps/moves/dis7/IntercomSignalPdu.java
+++ b/src-generated/edu/nps/moves/dis7/IntercomSignalPdu.java
@@ -14,10 +14,10 @@ import edu.nps.moves.dis7.enumerations.*;
public class IntercomSignalPdu extends RadioCommunicationsFamilyPdu implements Serializable
{
- /**
- *
- */
- protected IntercomReferenceID intercomReferenceID = new IntercomReferenceID();
+ /**
+ *
+ */
+ protected IntercomReferenceID intercomReferenceID = new IntercomReferenceID();
/**
* ID of communications device
diff --git a/src-generated/edu/nps/moves/dis7/IsGroupOfPdu.java b/src-generated/edu/nps/moves/dis7/IsGroupOfPdu.java
index 6c377f764fcf0c654623963a2283408902c056f4..fce9d131f7d1ce0e17bdca6b4e00eae71055c069 100644
--- a/src-generated/edu/nps/moves/dis7/IsGroupOfPdu.java
+++ b/src-generated/edu/nps/moves/dis7/IsGroupOfPdu.java
@@ -1,324 +1,324 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.9.3.1 The IsGroupOf PDU shall communicate information about the individual states of a group of entities, including state information that is necessary for the receiving simulation applications to represent the issuing group of entities in the simulation applications’ own simulation.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class IsGroupOfPdu extends EntityManagementFamilyPdu implements Serializable
-{
- /** ID of aggregated entities */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 5.9.3.1 The IsGroupOf PDU shall communicate information about the individual states of a group of entities, including state information that is necessary for the receiving simulation applications to represent the issuing group of entities in the simulation applications’ own simulation.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class IsGroupOfPdu extends EntityManagementFamilyPdu implements Serializable
+{
+ /** ID of aggregated entities */
protected EntityID groupEntityID = new EntityID();
-
- /** type of entities constituting the group uid 213 */
+
+ /** type of entities constituting the group uid 213 */
protected IsGroupOfGroupedEntityCategory groupedEntityCategory = IsGroupOfGroupedEntityCategory.values()[0];
-
- /** Number of individual entities constituting the group */
+
+ /** Number of individual entities constituting the group */
protected byte numberOfGroupedEntities;
-
- /** padding */
+
+ /** padding */
protected int pad;
-
- /** latitude */
+
+ /** latitude */
protected double latitude;
-
- /** longitude */
+
+ /** longitude */
protected double longitude;
-
- /** GED records about each individual entity in the group. Bad specing--the Group Entity Descriptions are not described. */
+
+ /** GED records about each individual entity in the group. Bad specing--the Group Entity Descriptions are not described. */
protected List< VariableDatum > groupedEntityDescriptions = new ArrayList< VariableDatum >();
-
-
-/** Constructor */
- public IsGroupOfPdu()
- {
- setPduType( DISPDUType.ISGROUPOF );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += groupEntityID.getMarshalledSize();
- marshalSize += groupedEntityCategory.getMarshalledSize();
- marshalSize += 1; // numberOfGroupedEntities
- marshalSize += 4; // pad
- marshalSize += 8; // latitude
- marshalSize += 8; // longitude
- for(int idx=0; idx < groupedEntityDescriptions.size(); idx++)
- {
- VariableDatum listElement = groupedEntityDescriptions.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link IsGroupOfPdu#groupEntityID}*/
-public IsGroupOfPdu setGroupEntityID(EntityID pGroupEntityID)
+
+
+/** Constructor */
+ public IsGroupOfPdu()
+ {
+ setPduType( DISPDUType.ISGROUPOF );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += groupEntityID.getMarshalledSize();
+ marshalSize += groupedEntityCategory.getMarshalledSize();
+ marshalSize += 1; // numberOfGroupedEntities
+ marshalSize += 4; // pad
+ marshalSize += 8; // latitude
+ marshalSize += 8; // longitude
+ for(int idx=0; idx < groupedEntityDescriptions.size(); idx++)
+ {
+ VariableDatum listElement = groupedEntityDescriptions.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link IsGroupOfPdu#groupEntityID}*/
+public IsGroupOfPdu setGroupEntityID(EntityID pGroupEntityID)
{
- groupEntityID = pGroupEntityID;
- return this;
-}
-
-/** Getter for {@link IsGroupOfPdu#groupEntityID}*/
-public EntityID getGroupEntityID()
+ groupEntityID = pGroupEntityID;
+ return this;
+}
+
+/** Getter for {@link IsGroupOfPdu#groupEntityID}*/
+public EntityID getGroupEntityID()
{
return groupEntityID;
-}
-
-/** Setter for {@link IsGroupOfPdu#groupedEntityCategory}*/
-public IsGroupOfPdu setGroupedEntityCategory(IsGroupOfGroupedEntityCategory pGroupedEntityCategory)
+}
+
+/** Setter for {@link IsGroupOfPdu#groupedEntityCategory}*/
+public IsGroupOfPdu setGroupedEntityCategory(IsGroupOfGroupedEntityCategory pGroupedEntityCategory)
{
- groupedEntityCategory = pGroupedEntityCategory;
- return this;
-}
-
-/** Getter for {@link IsGroupOfPdu#groupedEntityCategory}*/
-public IsGroupOfGroupedEntityCategory getGroupedEntityCategory()
+ groupedEntityCategory = pGroupedEntityCategory;
+ return this;
+}
+
+/** Getter for {@link IsGroupOfPdu#groupedEntityCategory}*/
+public IsGroupOfGroupedEntityCategory getGroupedEntityCategory()
{
return groupedEntityCategory;
-}
-
-/** Setter for {@link IsGroupOfPdu#pad}*/
-public IsGroupOfPdu setPad(int pPad)
+}
+
+/** Setter for {@link IsGroupOfPdu#pad}*/
+public IsGroupOfPdu setPad(int pPad)
{
- pad = pPad;
- return this;
-}
-
-/** Getter for {@link IsGroupOfPdu#pad}*/
-public int getPad()
+ pad = pPad;
+ return this;
+}
+
+/** Getter for {@link IsGroupOfPdu#pad}*/
+public int getPad()
{
return pad;
-}
-
-/** Setter for {@link IsGroupOfPdu#latitude}*/
-public IsGroupOfPdu setLatitude(double pLatitude)
+}
+
+/** Setter for {@link IsGroupOfPdu#latitude}*/
+public IsGroupOfPdu setLatitude(double pLatitude)
{
- latitude = pLatitude;
- return this;
-}
-
-/** Getter for {@link IsGroupOfPdu#latitude}*/
-public double getLatitude()
+ latitude = pLatitude;
+ return this;
+}
+
+/** Getter for {@link IsGroupOfPdu#latitude}*/
+public double getLatitude()
{
return latitude;
-}
-
-/** Setter for {@link IsGroupOfPdu#longitude}*/
-public IsGroupOfPdu setLongitude(double pLongitude)
+}
+
+/** Setter for {@link IsGroupOfPdu#longitude}*/
+public IsGroupOfPdu setLongitude(double pLongitude)
{
- longitude = pLongitude;
- return this;
-}
-
-/** Getter for {@link IsGroupOfPdu#longitude}*/
-public double getLongitude()
+ longitude = pLongitude;
+ return this;
+}
+
+/** Getter for {@link IsGroupOfPdu#longitude}*/
+public double getLongitude()
{
return longitude;
-}
-
-/** Setter for {@link IsGroupOfPdu#groupedEntityDescriptions}*/
-public IsGroupOfPdu setGroupedEntityDescriptions(List<VariableDatum> pGroupedEntityDescriptions)
+}
+
+/** Setter for {@link IsGroupOfPdu#groupedEntityDescriptions}*/
+public IsGroupOfPdu setGroupedEntityDescriptions(List<VariableDatum> pGroupedEntityDescriptions)
{
- groupedEntityDescriptions = pGroupedEntityDescriptions;
- return this;
-}
-
-/** Getter for {@link IsGroupOfPdu#groupedEntityDescriptions}*/
-public List<VariableDatum> getGroupedEntityDescriptions()
+ groupedEntityDescriptions = pGroupedEntityDescriptions;
+ return this;
+}
+
+/** Getter for {@link IsGroupOfPdu#groupedEntityDescriptions}*/
+public List<VariableDatum> getGroupedEntityDescriptions()
{
return groupedEntityDescriptions;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- groupEntityID.marshal(dos);
- groupedEntityCategory.marshal(dos);
- dos.writeByte(groupedEntityDescriptions.size());
- dos.writeInt(pad);
- dos.writeDouble(latitude);
- dos.writeDouble(longitude);
-
- for(int idx = 0; idx < groupedEntityDescriptions.size(); idx++)
- {
- VariableDatum aVariableDatum = groupedEntityDescriptions.get(idx);
- aVariableDatum.marshal(dos);
- }
-
+ {
+ groupEntityID.marshal(dos);
+ groupedEntityCategory.marshal(dos);
+ dos.writeByte(groupedEntityDescriptions.size());
+ dos.writeInt(pad);
+ dos.writeDouble(latitude);
+ dos.writeDouble(longitude);
+
+ for(int idx = 0; idx < groupedEntityDescriptions.size(); idx++)
+ {
+ VariableDatum aVariableDatum = groupedEntityDescriptions.get(idx);
+ aVariableDatum.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += groupEntityID.unmarshal(dis);
- groupedEntityCategory = IsGroupOfGroupedEntityCategory.unmarshalEnum(dis);
- uPosition += groupedEntityCategory.getMarshalledSize();
- numberOfGroupedEntities = (byte)dis.readUnsignedByte();
- uPosition += 1;
- pad = dis.readInt();
- uPosition += 4;
- latitude = dis.readDouble();
- uPosition += 4;
- longitude = dis.readDouble();
- uPosition += 4;
- for(int idx = 0; idx < numberOfGroupedEntities; idx++)
- {
- VariableDatum anX = new VariableDatum();
- uPosition += anX.unmarshal(dis);
- groupedEntityDescriptions.add(anX);
- }
-
+ {
+ uPosition += groupEntityID.unmarshal(dis);
+ groupedEntityCategory = IsGroupOfGroupedEntityCategory.unmarshalEnum(dis);
+ uPosition += groupedEntityCategory.getMarshalledSize();
+ numberOfGroupedEntities = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ pad = dis.readInt();
+ uPosition += 4;
+ latitude = dis.readDouble();
+ uPosition += 4;
+ longitude = dis.readDouble();
+ uPosition += 4;
+ for(int idx = 0; idx < numberOfGroupedEntities; idx++)
+ {
+ VariableDatum anX = new VariableDatum();
+ uPosition += anX.unmarshal(dis);
+ groupedEntityDescriptions.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- groupEntityID.marshal(buff);
- groupedEntityCategory.marshal(buff);
- buff.put( (byte)groupedEntityDescriptions.size());
- buff.putInt( (int)pad);
- buff.putDouble( (double)latitude);
- buff.putDouble( (double)longitude);
-
- for(int idx = 0; idx < groupedEntityDescriptions.size(); idx++)
- {
- VariableDatum aVariableDatum = groupedEntityDescriptions.get(idx);
- aVariableDatum.marshal(buff);
- }
-
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ groupEntityID.marshal(buff);
+ groupedEntityCategory.marshal(buff);
+ buff.put( (byte)groupedEntityDescriptions.size());
+ buff.putInt( (int)pad);
+ buff.putDouble( (double)latitude);
+ buff.putDouble( (double)longitude);
+
+ for(int idx = 0; idx < groupedEntityDescriptions.size(); idx++)
+ {
+ VariableDatum aVariableDatum = groupedEntityDescriptions.get(idx);
+ aVariableDatum.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- groupEntityID.unmarshal(buff);
- groupedEntityCategory = IsGroupOfGroupedEntityCategory.unmarshalEnum(buff);
- numberOfGroupedEntities = (byte)(buff.get() & 0xFF);
- pad = buff.getInt();
- latitude = buff.getDouble();
- longitude = buff.getDouble();
- for(int idx = 0; idx < numberOfGroupedEntities; idx++)
- {
- VariableDatum anX = new VariableDatum();
- anX.unmarshal(buff);
- groupedEntityDescriptions.add(anX);
- }
-
- return getMarshalledSize();
+
+ groupEntityID.unmarshal(buff);
+ groupedEntityCategory = IsGroupOfGroupedEntityCategory.unmarshalEnum(buff);
+ numberOfGroupedEntities = (byte)(buff.get() & 0xFF);
+ pad = buff.getInt();
+ latitude = buff.getDouble();
+ longitude = buff.getDouble();
+ for(int idx = 0; idx < numberOfGroupedEntities; idx++)
+ {
+ VariableDatum anX = new VariableDatum();
+ anX.unmarshal(buff);
+ groupedEntityDescriptions.add(anX);
+ }
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final IsGroupOfPdu rhs = (IsGroupOfPdu)obj;
-
- if( ! (groupEntityID.equals( rhs.groupEntityID) )) ivarsEqual = false;
- if( ! (groupedEntityCategory == rhs.groupedEntityCategory)) ivarsEqual = false;
- if( ! (pad == rhs.pad)) ivarsEqual = false;
- if( ! (latitude == rhs.latitude)) ivarsEqual = false;
- if( ! (longitude == rhs.longitude)) ivarsEqual = false;
-
- for(int idx = 0; idx < groupedEntityDescriptions.size(); idx++)
- if( ! ( groupedEntityDescriptions.get(idx).equals(rhs.groupedEntityDescriptions.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final IsGroupOfPdu rhs = (IsGroupOfPdu)obj;
+
+ if( ! (groupEntityID.equals( rhs.groupEntityID) )) ivarsEqual = false;
+ if( ! (groupedEntityCategory == rhs.groupedEntityCategory)) ivarsEqual = false;
+ if( ! (pad == rhs.pad)) ivarsEqual = false;
+ if( ! (latitude == rhs.latitude)) ivarsEqual = false;
+ if( ! (longitude == rhs.longitude)) ivarsEqual = false;
+
+ for(int idx = 0; idx < groupedEntityDescriptions.size(); idx++)
+ if( ! ( groupedEntityDescriptions.get(idx).equals(rhs.groupedEntityDescriptions.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" groupEntityID: ").append(groupEntityID).append("\n");
- sb.append(" groupedEntityCategory: ").append(groupedEntityCategory).append("\n");
- sb.append(" pad: ").append(pad).append("\n");
- sb.append(" latitude: ").append(latitude).append("\n");
- sb.append(" longitude: ").append(longitude).append("\n");
- sb.append(" groupedEntityDescriptions: ").append("\n");
- groupedEntityDescriptions.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" groupEntityID: ").append(groupEntityID).append("\n");
+ sb.append(" groupedEntityCategory: ").append(groupedEntityCategory).append("\n");
+ sb.append(" pad: ").append(pad).append("\n");
+ sb.append(" latitude: ").append(latitude).append("\n");
+ sb.append(" longitude: ").append(longitude).append("\n");
+ sb.append(" groupedEntityDescriptions: ").append("\n");
+ groupedEntityDescriptions.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/IsPartOfPdu.java b/src-generated/edu/nps/moves/dis7/IsPartOfPdu.java
index be3a927964cf774d9dd1dcc76d0405706c32bf6c..d932c67024f7b2db90bdcc0f29fff16f9d40c126 100644
--- a/src-generated/edu/nps/moves/dis7/IsPartOfPdu.java
+++ b/src-generated/edu/nps/moves/dis7/IsPartOfPdu.java
@@ -1,279 +1,279 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.9.5 Used to request hierarchical linkage of separately hosted simulation entities
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class IsPartOfPdu extends EntityManagementFamilyPdu implements Serializable
-{
- /** ID of entity originating PDU */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 5.9.5 Used to request hierarchical linkage of separately hosted simulation entities
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class IsPartOfPdu extends EntityManagementFamilyPdu implements Serializable
+{
+ /** ID of entity originating PDU */
protected EntityID orginatingEntityID = new EntityID();
-
- /** ID of entity receiving PDU */
+
+ /** ID of entity receiving PDU */
protected EntityID receivingEntityID = new EntityID();
-
- /** relationship of joined parts */
+
+ /** relationship of joined parts */
protected Relationship relationship = new Relationship();
-
- /** location of part; centroid of part in host's coordinate system. x=range, y=bearing, z=0 */
+
+ /** location of part; centroid of part in host's coordinate system. x=range, y=bearing, z=0 */
protected Vector3Float partLocation = new Vector3Float();
-
- /** named location */
+
+ /** named location */
protected NamedLocationIdentification namedLocationID = new NamedLocationIdentification();
-
- /** entity type */
+
+ /** entity type */
protected EntityType partEntityType = new EntityType();
-
-
-/** Constructor */
- public IsPartOfPdu()
- {
- setPduType( DISPDUType.ISPARTOF );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += orginatingEntityID.getMarshalledSize();
- marshalSize += receivingEntityID.getMarshalledSize();
- marshalSize += relationship.getMarshalledSize();
- marshalSize += partLocation.getMarshalledSize();
- marshalSize += namedLocationID.getMarshalledSize();
- marshalSize += partEntityType.getMarshalledSize();
-
- return marshalSize;
-}
-
-
-/** Setter for {@link IsPartOfPdu#orginatingEntityID}*/
-public IsPartOfPdu setOrginatingEntityID(EntityID pOrginatingEntityID)
+
+
+/** Constructor */
+ public IsPartOfPdu()
+ {
+ setPduType( DISPDUType.ISPARTOF );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += orginatingEntityID.getMarshalledSize();
+ marshalSize += receivingEntityID.getMarshalledSize();
+ marshalSize += relationship.getMarshalledSize();
+ marshalSize += partLocation.getMarshalledSize();
+ marshalSize += namedLocationID.getMarshalledSize();
+ marshalSize += partEntityType.getMarshalledSize();
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link IsPartOfPdu#orginatingEntityID}*/
+public IsPartOfPdu setOrginatingEntityID(EntityID pOrginatingEntityID)
{
- orginatingEntityID = pOrginatingEntityID;
- return this;
-}
-
-/** Getter for {@link IsPartOfPdu#orginatingEntityID}*/
-public EntityID getOrginatingEntityID()
+ orginatingEntityID = pOrginatingEntityID;
+ return this;
+}
+
+/** Getter for {@link IsPartOfPdu#orginatingEntityID}*/
+public EntityID getOrginatingEntityID()
{
return orginatingEntityID;
-}
-
-/** Setter for {@link IsPartOfPdu#receivingEntityID}*/
-public IsPartOfPdu setReceivingEntityID(EntityID pReceivingEntityID)
+}
+
+/** Setter for {@link IsPartOfPdu#receivingEntityID}*/
+public IsPartOfPdu setReceivingEntityID(EntityID pReceivingEntityID)
{
- receivingEntityID = pReceivingEntityID;
- return this;
-}
-
-/** Getter for {@link IsPartOfPdu#receivingEntityID}*/
-public EntityID getReceivingEntityID()
+ receivingEntityID = pReceivingEntityID;
+ return this;
+}
+
+/** Getter for {@link IsPartOfPdu#receivingEntityID}*/
+public EntityID getReceivingEntityID()
{
return receivingEntityID;
-}
-
-/** Setter for {@link IsPartOfPdu#relationship}*/
-public IsPartOfPdu setRelationship(Relationship pRelationship)
+}
+
+/** Setter for {@link IsPartOfPdu#relationship}*/
+public IsPartOfPdu setRelationship(Relationship pRelationship)
{
- relationship = pRelationship;
- return this;
-}
-
-/** Getter for {@link IsPartOfPdu#relationship}*/
-public Relationship getRelationship()
+ relationship = pRelationship;
+ return this;
+}
+
+/** Getter for {@link IsPartOfPdu#relationship}*/
+public Relationship getRelationship()
{
return relationship;
-}
-
-/** Setter for {@link IsPartOfPdu#partLocation}*/
-public IsPartOfPdu setPartLocation(Vector3Float pPartLocation)
+}
+
+/** Setter for {@link IsPartOfPdu#partLocation}*/
+public IsPartOfPdu setPartLocation(Vector3Float pPartLocation)
{
- partLocation = pPartLocation;
- return this;
-}
-
-/** Getter for {@link IsPartOfPdu#partLocation}*/
-public Vector3Float getPartLocation()
+ partLocation = pPartLocation;
+ return this;
+}
+
+/** Getter for {@link IsPartOfPdu#partLocation}*/
+public Vector3Float getPartLocation()
{
return partLocation;
-}
-
-/** Setter for {@link IsPartOfPdu#namedLocationID}*/
-public IsPartOfPdu setNamedLocationID(NamedLocationIdentification pNamedLocationID)
+}
+
+/** Setter for {@link IsPartOfPdu#namedLocationID}*/
+public IsPartOfPdu setNamedLocationID(NamedLocationIdentification pNamedLocationID)
{
- namedLocationID = pNamedLocationID;
- return this;
-}
-
-/** Getter for {@link IsPartOfPdu#namedLocationID}*/
-public NamedLocationIdentification getNamedLocationID()
+ namedLocationID = pNamedLocationID;
+ return this;
+}
+
+/** Getter for {@link IsPartOfPdu#namedLocationID}*/
+public NamedLocationIdentification getNamedLocationID()
{
return namedLocationID;
-}
-
-/** Setter for {@link IsPartOfPdu#partEntityType}*/
-public IsPartOfPdu setPartEntityType(EntityType pPartEntityType)
+}
+
+/** Setter for {@link IsPartOfPdu#partEntityType}*/
+public IsPartOfPdu setPartEntityType(EntityType pPartEntityType)
{
- partEntityType = pPartEntityType;
- return this;
-}
-
-/** Getter for {@link IsPartOfPdu#partEntityType}*/
-public EntityType getPartEntityType()
+ partEntityType = pPartEntityType;
+ return this;
+}
+
+/** Getter for {@link IsPartOfPdu#partEntityType}*/
+public EntityType getPartEntityType()
{
return partEntityType;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- orginatingEntityID.marshal(dos);
- receivingEntityID.marshal(dos);
- relationship.marshal(dos);
- partLocation.marshal(dos);
- namedLocationID.marshal(dos);
- partEntityType.marshal(dos);
+ {
+ orginatingEntityID.marshal(dos);
+ receivingEntityID.marshal(dos);
+ relationship.marshal(dos);
+ partLocation.marshal(dos);
+ namedLocationID.marshal(dos);
+ partEntityType.marshal(dos);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += orginatingEntityID.unmarshal(dis);
- uPosition += receivingEntityID.unmarshal(dis);
- uPosition += relationship.unmarshal(dis);
- uPosition += partLocation.unmarshal(dis);
- uPosition += namedLocationID.unmarshal(dis);
- uPosition += partEntityType.unmarshal(dis);
+ {
+ uPosition += orginatingEntityID.unmarshal(dis);
+ uPosition += receivingEntityID.unmarshal(dis);
+ uPosition += relationship.unmarshal(dis);
+ uPosition += partLocation.unmarshal(dis);
+ uPosition += namedLocationID.unmarshal(dis);
+ uPosition += partEntityType.unmarshal(dis);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- orginatingEntityID.marshal(buff);
- receivingEntityID.marshal(buff);
- relationship.marshal(buff);
- partLocation.marshal(buff);
- namedLocationID.marshal(buff);
- partEntityType.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ orginatingEntityID.marshal(buff);
+ receivingEntityID.marshal(buff);
+ relationship.marshal(buff);
+ partLocation.marshal(buff);
+ namedLocationID.marshal(buff);
+ partEntityType.marshal(buff);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- orginatingEntityID.unmarshal(buff);
- receivingEntityID.unmarshal(buff);
- relationship.unmarshal(buff);
- partLocation.unmarshal(buff);
- namedLocationID.unmarshal(buff);
- partEntityType.unmarshal(buff);
- return getMarshalledSize();
+
+ orginatingEntityID.unmarshal(buff);
+ receivingEntityID.unmarshal(buff);
+ relationship.unmarshal(buff);
+ partLocation.unmarshal(buff);
+ namedLocationID.unmarshal(buff);
+ partEntityType.unmarshal(buff);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final IsPartOfPdu rhs = (IsPartOfPdu)obj;
-
- if( ! (orginatingEntityID.equals( rhs.orginatingEntityID) )) ivarsEqual = false;
- if( ! (receivingEntityID.equals( rhs.receivingEntityID) )) ivarsEqual = false;
- if( ! (relationship.equals( rhs.relationship) )) ivarsEqual = false;
- if( ! (partLocation.equals( rhs.partLocation) )) ivarsEqual = false;
- if( ! (namedLocationID.equals( rhs.namedLocationID) )) ivarsEqual = false;
- if( ! (partEntityType.equals( rhs.partEntityType) )) ivarsEqual = false;
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final IsPartOfPdu rhs = (IsPartOfPdu)obj;
+
+ if( ! (orginatingEntityID.equals( rhs.orginatingEntityID) )) ivarsEqual = false;
+ if( ! (receivingEntityID.equals( rhs.receivingEntityID) )) ivarsEqual = false;
+ if( ! (relationship.equals( rhs.relationship) )) ivarsEqual = false;
+ if( ! (partLocation.equals( rhs.partLocation) )) ivarsEqual = false;
+ if( ! (namedLocationID.equals( rhs.namedLocationID) )) ivarsEqual = false;
+ if( ! (partEntityType.equals( rhs.partEntityType) )) ivarsEqual = false;
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" orginatingEntityID: ").append(orginatingEntityID).append("\n");
- sb.append(" receivingEntityID: ").append(receivingEntityID).append("\n");
- sb.append(" relationship: ").append(relationship).append("\n");
- sb.append(" partLocation: ").append(partLocation).append("\n");
- sb.append(" namedLocationID: ").append(namedLocationID).append("\n");
- sb.append(" partEntityType: ").append(partEntityType).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" orginatingEntityID: ").append(orginatingEntityID).append("\n");
+ sb.append(" receivingEntityID: ").append(receivingEntityID).append("\n");
+ sb.append(" relationship: ").append(relationship).append("\n");
+ sb.append(" partLocation: ").append(partLocation).append("\n");
+ sb.append(" namedLocationID: ").append(namedLocationID).append("\n");
+ sb.append(" partEntityType: ").append(partEntityType).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/JammingTechnique.java b/src-generated/edu/nps/moves/dis7/JammingTechnique.java
index fe9ef1c598ae4b237559580ab0a2da196bed4d99..a1b1b2a7c6dd0ce008f29f1873186bd2aa9238d2 100644
--- a/src-generated/edu/nps/moves/dis7/JammingTechnique.java
+++ b/src-generated/edu/nps/moves/dis7/JammingTechnique.java
@@ -1,230 +1,230 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Jamming technique. Section 6.2.49, uid 284
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class JammingTechnique extends Object implements Serializable
-{
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Jamming technique. Section 6.2.49, uid 284
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class JammingTechnique extends Object implements Serializable
+{
protected byte kind;
-
+
protected byte category;
-
+
protected byte subCategory;
-
+
protected byte specific;
-
-
-/** Constructor */
- public JammingTechnique()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public JammingTechnique()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 1; // kind
+ marshalSize += 1; // category
+ marshalSize += 1; // subCategory
+ marshalSize += 1; // specific
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link JammingTechnique#kind}*/
+public JammingTechnique setKind(byte pKind)
{
- int marshalSize = 0;
-
- marshalSize += 1; // kind
- marshalSize += 1; // category
- marshalSize += 1; // subCategory
- marshalSize += 1; // specific
-
- return marshalSize;
-}
-
-
-/** Setter for {@link JammingTechnique#kind}*/
-public JammingTechnique setKind(byte pKind)
-{
- kind = pKind;
- return this;
-}
-
-/** Getter for {@link JammingTechnique#kind}*/
-public byte getKind()
+ kind = pKind;
+ return this;
+}
+
+/** Getter for {@link JammingTechnique#kind}*/
+public byte getKind()
{
return kind;
-}
-
-/** Setter for {@link JammingTechnique#category}*/
-public JammingTechnique setCategory(byte pCategory)
+}
+
+/** Setter for {@link JammingTechnique#category}*/
+public JammingTechnique setCategory(byte pCategory)
{
- category = pCategory;
- return this;
-}
-
-/** Getter for {@link JammingTechnique#category}*/
-public byte getCategory()
+ category = pCategory;
+ return this;
+}
+
+/** Getter for {@link JammingTechnique#category}*/
+public byte getCategory()
{
return category;
-}
-
-/** Setter for {@link JammingTechnique#subCategory}*/
-public JammingTechnique setSubCategory(byte pSubCategory)
+}
+
+/** Setter for {@link JammingTechnique#subCategory}*/
+public JammingTechnique setSubCategory(byte pSubCategory)
{
- subCategory = pSubCategory;
- return this;
-}
-
-/** Getter for {@link JammingTechnique#subCategory}*/
-public byte getSubCategory()
+ subCategory = pSubCategory;
+ return this;
+}
+
+/** Getter for {@link JammingTechnique#subCategory}*/
+public byte getSubCategory()
{
return subCategory;
-}
-
-/** Setter for {@link JammingTechnique#specific}*/
-public JammingTechnique setSpecific(byte pSpecific)
+}
+
+/** Setter for {@link JammingTechnique#specific}*/
+public JammingTechnique setSpecific(byte pSpecific)
{
- specific = pSpecific;
- return this;
-}
-
-/** Getter for {@link JammingTechnique#specific}*/
-public byte getSpecific()
+ specific = pSpecific;
+ return this;
+}
+
+/** Getter for {@link JammingTechnique#specific}*/
+public byte getSpecific()
{
return specific;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeByte(kind);
- dos.writeByte(category);
- dos.writeByte(subCategory);
- dos.writeByte(specific);
+ {
+ dos.writeByte(kind);
+ dos.writeByte(category);
+ dos.writeByte(subCategory);
+ dos.writeByte(specific);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- kind = (byte)dis.readUnsignedByte();
- uPosition += 1;
- category = (byte)dis.readUnsignedByte();
- uPosition += 1;
- subCategory = (byte)dis.readUnsignedByte();
- uPosition += 1;
- specific = (byte)dis.readUnsignedByte();
- uPosition += 1;
+ {
+ kind = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ category = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ subCategory = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ specific = (byte)dis.readUnsignedByte();
+ uPosition += 1;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.put( (byte)kind);
- buff.put( (byte)category);
- buff.put( (byte)subCategory);
- buff.put( (byte)specific);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- kind = (byte)(buff.get() & 0xFF);
- category = (byte)(buff.get() & 0xFF);
- subCategory = (byte)(buff.get() & 0xFF);
- specific = (byte)(buff.get() & 0xFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.put( (byte)kind);
+ buff.put( (byte)category);
+ buff.put( (byte)subCategory);
+ buff.put( (byte)specific);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ kind = (byte)(buff.get() & 0xFF);
+ category = (byte)(buff.get() & 0xFF);
+ subCategory = (byte)(buff.get() & 0xFF);
+ specific = (byte)(buff.get() & 0xFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final JammingTechnique rhs = (JammingTechnique)obj;
-
- if( ! (kind == rhs.kind)) ivarsEqual = false;
- if( ! (category == rhs.category)) ivarsEqual = false;
- if( ! (subCategory == rhs.subCategory)) ivarsEqual = false;
- if( ! (specific == rhs.specific)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final JammingTechnique rhs = (JammingTechnique)obj;
+
+ if( ! (kind == rhs.kind)) ivarsEqual = false;
+ if( ! (category == rhs.category)) ivarsEqual = false;
+ if( ! (subCategory == rhs.subCategory)) ivarsEqual = false;
+ if( ! (specific == rhs.specific)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" kind: ").append(kind).append("\n");
- sb.append(" category: ").append(category).append("\n");
- sb.append(" subCategory: ").append(subCategory).append("\n");
- sb.append(" specific: ").append(specific).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" kind: ").append(kind).append("\n");
+ sb.append(" category: ").append(category).append("\n");
+ sb.append(" subCategory: ").append(subCategory).append("\n");
+ sb.append(" specific: ").append(specific).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LEDetonationPdu.java b/src-generated/edu/nps/moves/dis7/LEDetonationPdu.java
index f78db40982f7870da0b14fdd4ca9f30608da1bdc..e71b6b4110e4ae7bf2453d2669b446c19694ee5c 100644
--- a/src-generated/edu/nps/moves/dis7/LEDetonationPdu.java
+++ b/src-generated/edu/nps/moves/dis7/LEDetonationPdu.java
@@ -1,409 +1,409 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 9.4.6 Communicate information associated with the impact or detonation of a munition.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class LEDetonationPdu extends LiveEntityFamilyPdu implements Serializable
-{
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 9.4.6 Communicate information associated with the impact or detonation of a munition.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class LEDetonationPdu extends LiveEntityFamilyPdu implements Serializable
+{
protected EntityID firingLiveEntityId = new EntityID();
-
+
protected byte detonationFlag1;
-
+
protected byte detonationFlag2;
-
+
protected EntityID targetLiveEntityId = new EntityID();
-
+
protected EntityID munitionLiveEntityId = new EntityID();
-
+
protected EventIdentifier eventId = new EventIdentifier();
-
+
protected LiveEntityRelativeWorldCoordinates worldLocation = new LiveEntityRelativeWorldCoordinates();
-
+
protected LiveEntityLinearVelocity velocity = new LiveEntityLinearVelocity();
-
- /** spec error? 16-bit fields vs. 8-bit in TspiPdu? */
+
+ /** spec error? 16-bit fields vs. 8-bit in TspiPdu? */
protected LiveEntityOrientation16 munitionOrientation = new LiveEntityOrientation16();
-
+
protected MunitionDescriptor munitionDescriptor = new MunitionDescriptor();
-
+
protected LiveEntityLinearVelocity entityLocation = new LiveEntityLinearVelocity();
-
+
protected byte detonationResult;
-
-
-/** Constructor */
- public LEDetonationPdu()
- {
- setPduType( DISPDUType.LIVE_ENTITY_DETONATION );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += firingLiveEntityId.getMarshalledSize();
- marshalSize += 1; // detonationFlag1
- marshalSize += 1; // detonationFlag2
- marshalSize += targetLiveEntityId.getMarshalledSize();
- marshalSize += munitionLiveEntityId.getMarshalledSize();
- marshalSize += eventId.getMarshalledSize();
- marshalSize += worldLocation.getMarshalledSize();
- marshalSize += velocity.getMarshalledSize();
- marshalSize += munitionOrientation.getMarshalledSize();
- marshalSize += munitionDescriptor.getMarshalledSize();
- marshalSize += entityLocation.getMarshalledSize();
- marshalSize += 1; // detonationResult
-
- return marshalSize;
-}
-
-
-/** Setter for {@link LEDetonationPdu#firingLiveEntityId}*/
-public LEDetonationPdu setFiringLiveEntityId(EntityID pFiringLiveEntityId)
+
+
+/** Constructor */
+ public LEDetonationPdu()
+ {
+ setPduType( DISPDUType.LIVE_ENTITY_DETONATION );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += firingLiveEntityId.getMarshalledSize();
+ marshalSize += 1; // detonationFlag1
+ marshalSize += 1; // detonationFlag2
+ marshalSize += targetLiveEntityId.getMarshalledSize();
+ marshalSize += munitionLiveEntityId.getMarshalledSize();
+ marshalSize += eventId.getMarshalledSize();
+ marshalSize += worldLocation.getMarshalledSize();
+ marshalSize += velocity.getMarshalledSize();
+ marshalSize += munitionOrientation.getMarshalledSize();
+ marshalSize += munitionDescriptor.getMarshalledSize();
+ marshalSize += entityLocation.getMarshalledSize();
+ marshalSize += 1; // detonationResult
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link LEDetonationPdu#firingLiveEntityId}*/
+public LEDetonationPdu setFiringLiveEntityId(EntityID pFiringLiveEntityId)
{
- firingLiveEntityId = pFiringLiveEntityId;
- return this;
-}
-
-/** Getter for {@link LEDetonationPdu#firingLiveEntityId}*/
-public EntityID getFiringLiveEntityId()
+ firingLiveEntityId = pFiringLiveEntityId;
+ return this;
+}
+
+/** Getter for {@link LEDetonationPdu#firingLiveEntityId}*/
+public EntityID getFiringLiveEntityId()
{
return firingLiveEntityId;
-}
-
-/** Setter for {@link LEDetonationPdu#detonationFlag1}*/
-public LEDetonationPdu setDetonationFlag1(byte pDetonationFlag1)
+}
+
+/** Setter for {@link LEDetonationPdu#detonationFlag1}*/
+public LEDetonationPdu setDetonationFlag1(byte pDetonationFlag1)
{
- detonationFlag1 = pDetonationFlag1;
- return this;
-}
-
-/** Getter for {@link LEDetonationPdu#detonationFlag1}*/
-public byte getDetonationFlag1()
+ detonationFlag1 = pDetonationFlag1;
+ return this;
+}
+
+/** Getter for {@link LEDetonationPdu#detonationFlag1}*/
+public byte getDetonationFlag1()
{
return detonationFlag1;
-}
-
-/** Setter for {@link LEDetonationPdu#detonationFlag2}*/
-public LEDetonationPdu setDetonationFlag2(byte pDetonationFlag2)
+}
+
+/** Setter for {@link LEDetonationPdu#detonationFlag2}*/
+public LEDetonationPdu setDetonationFlag2(byte pDetonationFlag2)
{
- detonationFlag2 = pDetonationFlag2;
- return this;
-}
-
-/** Getter for {@link LEDetonationPdu#detonationFlag2}*/
-public byte getDetonationFlag2()
+ detonationFlag2 = pDetonationFlag2;
+ return this;
+}
+
+/** Getter for {@link LEDetonationPdu#detonationFlag2}*/
+public byte getDetonationFlag2()
{
return detonationFlag2;
-}
-
-/** Setter for {@link LEDetonationPdu#targetLiveEntityId}*/
-public LEDetonationPdu setTargetLiveEntityId(EntityID pTargetLiveEntityId)
+}
+
+/** Setter for {@link LEDetonationPdu#targetLiveEntityId}*/
+public LEDetonationPdu setTargetLiveEntityId(EntityID pTargetLiveEntityId)
{
- targetLiveEntityId = pTargetLiveEntityId;
- return this;
-}
-
-/** Getter for {@link LEDetonationPdu#targetLiveEntityId}*/
-public EntityID getTargetLiveEntityId()
+ targetLiveEntityId = pTargetLiveEntityId;
+ return this;
+}
+
+/** Getter for {@link LEDetonationPdu#targetLiveEntityId}*/
+public EntityID getTargetLiveEntityId()
{
return targetLiveEntityId;
-}
-
-/** Setter for {@link LEDetonationPdu#munitionLiveEntityId}*/
-public LEDetonationPdu setMunitionLiveEntityId(EntityID pMunitionLiveEntityId)
+}
+
+/** Setter for {@link LEDetonationPdu#munitionLiveEntityId}*/
+public LEDetonationPdu setMunitionLiveEntityId(EntityID pMunitionLiveEntityId)
{
- munitionLiveEntityId = pMunitionLiveEntityId;
- return this;
-}
-
-/** Getter for {@link LEDetonationPdu#munitionLiveEntityId}*/
-public EntityID getMunitionLiveEntityId()
+ munitionLiveEntityId = pMunitionLiveEntityId;
+ return this;
+}
+
+/** Getter for {@link LEDetonationPdu#munitionLiveEntityId}*/
+public EntityID getMunitionLiveEntityId()
{
return munitionLiveEntityId;
-}
-
-/** Setter for {@link LEDetonationPdu#eventId}*/
-public LEDetonationPdu setEventId(EventIdentifier pEventId)
+}
+
+/** Setter for {@link LEDetonationPdu#eventId}*/
+public LEDetonationPdu setEventId(EventIdentifier pEventId)
{
- eventId = pEventId;
- return this;
-}
-
-/** Getter for {@link LEDetonationPdu#eventId}*/
-public EventIdentifier getEventId()
+ eventId = pEventId;
+ return this;
+}
+
+/** Getter for {@link LEDetonationPdu#eventId}*/
+public EventIdentifier getEventId()
{
return eventId;
-}
-
-/** Setter for {@link LEDetonationPdu#worldLocation}*/
-public LEDetonationPdu setWorldLocation(LiveEntityRelativeWorldCoordinates pWorldLocation)
+}
+
+/** Setter for {@link LEDetonationPdu#worldLocation}*/
+public LEDetonationPdu setWorldLocation(LiveEntityRelativeWorldCoordinates pWorldLocation)
{
- worldLocation = pWorldLocation;
- return this;
-}
-
-/** Getter for {@link LEDetonationPdu#worldLocation}*/
-public LiveEntityRelativeWorldCoordinates getWorldLocation()
+ worldLocation = pWorldLocation;
+ return this;
+}
+
+/** Getter for {@link LEDetonationPdu#worldLocation}*/
+public LiveEntityRelativeWorldCoordinates getWorldLocation()
{
return worldLocation;
-}
-
-/** Setter for {@link LEDetonationPdu#velocity}*/
-public LEDetonationPdu setVelocity(LiveEntityLinearVelocity pVelocity)
+}
+
+/** Setter for {@link LEDetonationPdu#velocity}*/
+public LEDetonationPdu setVelocity(LiveEntityLinearVelocity pVelocity)
{
- velocity = pVelocity;
- return this;
-}
-
-/** Getter for {@link LEDetonationPdu#velocity}*/
-public LiveEntityLinearVelocity getVelocity()
+ velocity = pVelocity;
+ return this;
+}
+
+/** Getter for {@link LEDetonationPdu#velocity}*/
+public LiveEntityLinearVelocity getVelocity()
{
return velocity;
-}
-
-/** Setter for {@link LEDetonationPdu#munitionOrientation}*/
-public LEDetonationPdu setMunitionOrientation(LiveEntityOrientation16 pMunitionOrientation)
+}
+
+/** Setter for {@link LEDetonationPdu#munitionOrientation}*/
+public LEDetonationPdu setMunitionOrientation(LiveEntityOrientation16 pMunitionOrientation)
{
- munitionOrientation = pMunitionOrientation;
- return this;
-}
-
-/** Getter for {@link LEDetonationPdu#munitionOrientation}*/
-public LiveEntityOrientation16 getMunitionOrientation()
+ munitionOrientation = pMunitionOrientation;
+ return this;
+}
+
+/** Getter for {@link LEDetonationPdu#munitionOrientation}*/
+public LiveEntityOrientation16 getMunitionOrientation()
{
return munitionOrientation;
-}
-
-/** Setter for {@link LEDetonationPdu#munitionDescriptor}*/
-public LEDetonationPdu setMunitionDescriptor(MunitionDescriptor pMunitionDescriptor)
+}
+
+/** Setter for {@link LEDetonationPdu#munitionDescriptor}*/
+public LEDetonationPdu setMunitionDescriptor(MunitionDescriptor pMunitionDescriptor)
{
- munitionDescriptor = pMunitionDescriptor;
- return this;
-}
-
-/** Getter for {@link LEDetonationPdu#munitionDescriptor}*/
-public MunitionDescriptor getMunitionDescriptor()
+ munitionDescriptor = pMunitionDescriptor;
+ return this;
+}
+
+/** Getter for {@link LEDetonationPdu#munitionDescriptor}*/
+public MunitionDescriptor getMunitionDescriptor()
{
return munitionDescriptor;
-}
-
-/** Setter for {@link LEDetonationPdu#entityLocation}*/
-public LEDetonationPdu setEntityLocation(LiveEntityLinearVelocity pEntityLocation)
+}
+
+/** Setter for {@link LEDetonationPdu#entityLocation}*/
+public LEDetonationPdu setEntityLocation(LiveEntityLinearVelocity pEntityLocation)
{
- entityLocation = pEntityLocation;
- return this;
-}
-
-/** Getter for {@link LEDetonationPdu#entityLocation}*/
-public LiveEntityLinearVelocity getEntityLocation()
+ entityLocation = pEntityLocation;
+ return this;
+}
+
+/** Getter for {@link LEDetonationPdu#entityLocation}*/
+public LiveEntityLinearVelocity getEntityLocation()
{
return entityLocation;
-}
-
-/** Setter for {@link LEDetonationPdu#detonationResult}*/
-public LEDetonationPdu setDetonationResult(byte pDetonationResult)
+}
+
+/** Setter for {@link LEDetonationPdu#detonationResult}*/
+public LEDetonationPdu setDetonationResult(byte pDetonationResult)
{
- detonationResult = pDetonationResult;
- return this;
-}
-
-/** Getter for {@link LEDetonationPdu#detonationResult}*/
-public byte getDetonationResult()
+ detonationResult = pDetonationResult;
+ return this;
+}
+
+/** Getter for {@link LEDetonationPdu#detonationResult}*/
+public byte getDetonationResult()
{
return detonationResult;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- firingLiveEntityId.marshal(dos);
- dos.writeByte(detonationFlag1);
- dos.writeByte(detonationFlag2);
- targetLiveEntityId.marshal(dos);
- munitionLiveEntityId.marshal(dos);
- eventId.marshal(dos);
- worldLocation.marshal(dos);
- velocity.marshal(dos);
- munitionOrientation.marshal(dos);
- munitionDescriptor.marshal(dos);
- entityLocation.marshal(dos);
- dos.writeByte(detonationResult);
+ {
+ firingLiveEntityId.marshal(dos);
+ dos.writeByte(detonationFlag1);
+ dos.writeByte(detonationFlag2);
+ targetLiveEntityId.marshal(dos);
+ munitionLiveEntityId.marshal(dos);
+ eventId.marshal(dos);
+ worldLocation.marshal(dos);
+ velocity.marshal(dos);
+ munitionOrientation.marshal(dos);
+ munitionDescriptor.marshal(dos);
+ entityLocation.marshal(dos);
+ dos.writeByte(detonationResult);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += firingLiveEntityId.unmarshal(dis);
- detonationFlag1 = (byte)dis.readUnsignedByte();
- uPosition += 1;
- detonationFlag2 = (byte)dis.readUnsignedByte();
- uPosition += 1;
- uPosition += targetLiveEntityId.unmarshal(dis);
- uPosition += munitionLiveEntityId.unmarshal(dis);
- uPosition += eventId.unmarshal(dis);
- uPosition += worldLocation.unmarshal(dis);
- uPosition += velocity.unmarshal(dis);
- uPosition += munitionOrientation.unmarshal(dis);
- uPosition += munitionDescriptor.unmarshal(dis);
- uPosition += entityLocation.unmarshal(dis);
- detonationResult = (byte)dis.readUnsignedByte();
- uPosition += 1;
+ {
+ uPosition += firingLiveEntityId.unmarshal(dis);
+ detonationFlag1 = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ detonationFlag2 = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ uPosition += targetLiveEntityId.unmarshal(dis);
+ uPosition += munitionLiveEntityId.unmarshal(dis);
+ uPosition += eventId.unmarshal(dis);
+ uPosition += worldLocation.unmarshal(dis);
+ uPosition += velocity.unmarshal(dis);
+ uPosition += munitionOrientation.unmarshal(dis);
+ uPosition += munitionDescriptor.unmarshal(dis);
+ uPosition += entityLocation.unmarshal(dis);
+ detonationResult = (byte)dis.readUnsignedByte();
+ uPosition += 1;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- firingLiveEntityId.marshal(buff);
- buff.put( (byte)detonationFlag1);
- buff.put( (byte)detonationFlag2);
- targetLiveEntityId.marshal(buff);
- munitionLiveEntityId.marshal(buff);
- eventId.marshal(buff);
- worldLocation.marshal(buff);
- velocity.marshal(buff);
- munitionOrientation.marshal(buff);
- munitionDescriptor.marshal(buff);
- entityLocation.marshal(buff);
- buff.put( (byte)detonationResult);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ firingLiveEntityId.marshal(buff);
+ buff.put( (byte)detonationFlag1);
+ buff.put( (byte)detonationFlag2);
+ targetLiveEntityId.marshal(buff);
+ munitionLiveEntityId.marshal(buff);
+ eventId.marshal(buff);
+ worldLocation.marshal(buff);
+ velocity.marshal(buff);
+ munitionOrientation.marshal(buff);
+ munitionDescriptor.marshal(buff);
+ entityLocation.marshal(buff);
+ buff.put( (byte)detonationResult);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- firingLiveEntityId.unmarshal(buff);
- detonationFlag1 = (byte)(buff.get() & 0xFF);
- detonationFlag2 = (byte)(buff.get() & 0xFF);
- targetLiveEntityId.unmarshal(buff);
- munitionLiveEntityId.unmarshal(buff);
- eventId.unmarshal(buff);
- worldLocation.unmarshal(buff);
- velocity.unmarshal(buff);
- munitionOrientation.unmarshal(buff);
- munitionDescriptor.unmarshal(buff);
- entityLocation.unmarshal(buff);
- detonationResult = (byte)(buff.get() & 0xFF);
- return getMarshalledSize();
+
+ firingLiveEntityId.unmarshal(buff);
+ detonationFlag1 = (byte)(buff.get() & 0xFF);
+ detonationFlag2 = (byte)(buff.get() & 0xFF);
+ targetLiveEntityId.unmarshal(buff);
+ munitionLiveEntityId.unmarshal(buff);
+ eventId.unmarshal(buff);
+ worldLocation.unmarshal(buff);
+ velocity.unmarshal(buff);
+ munitionOrientation.unmarshal(buff);
+ munitionDescriptor.unmarshal(buff);
+ entityLocation.unmarshal(buff);
+ detonationResult = (byte)(buff.get() & 0xFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final LEDetonationPdu rhs = (LEDetonationPdu)obj;
-
- if( ! (firingLiveEntityId.equals( rhs.firingLiveEntityId) )) ivarsEqual = false;
- if( ! (detonationFlag1 == rhs.detonationFlag1)) ivarsEqual = false;
- if( ! (detonationFlag2 == rhs.detonationFlag2)) ivarsEqual = false;
- if( ! (targetLiveEntityId.equals( rhs.targetLiveEntityId) )) ivarsEqual = false;
- if( ! (munitionLiveEntityId.equals( rhs.munitionLiveEntityId) )) ivarsEqual = false;
- if( ! (eventId.equals( rhs.eventId) )) ivarsEqual = false;
- if( ! (worldLocation.equals( rhs.worldLocation) )) ivarsEqual = false;
- if( ! (velocity.equals( rhs.velocity) )) ivarsEqual = false;
- if( ! (munitionOrientation.equals( rhs.munitionOrientation) )) ivarsEqual = false;
- if( ! (munitionDescriptor.equals( rhs.munitionDescriptor) )) ivarsEqual = false;
- if( ! (entityLocation.equals( rhs.entityLocation) )) ivarsEqual = false;
- if( ! (detonationResult == rhs.detonationResult)) ivarsEqual = false;
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final LEDetonationPdu rhs = (LEDetonationPdu)obj;
+
+ if( ! (firingLiveEntityId.equals( rhs.firingLiveEntityId) )) ivarsEqual = false;
+ if( ! (detonationFlag1 == rhs.detonationFlag1)) ivarsEqual = false;
+ if( ! (detonationFlag2 == rhs.detonationFlag2)) ivarsEqual = false;
+ if( ! (targetLiveEntityId.equals( rhs.targetLiveEntityId) )) ivarsEqual = false;
+ if( ! (munitionLiveEntityId.equals( rhs.munitionLiveEntityId) )) ivarsEqual = false;
+ if( ! (eventId.equals( rhs.eventId) )) ivarsEqual = false;
+ if( ! (worldLocation.equals( rhs.worldLocation) )) ivarsEqual = false;
+ if( ! (velocity.equals( rhs.velocity) )) ivarsEqual = false;
+ if( ! (munitionOrientation.equals( rhs.munitionOrientation) )) ivarsEqual = false;
+ if( ! (munitionDescriptor.equals( rhs.munitionDescriptor) )) ivarsEqual = false;
+ if( ! (entityLocation.equals( rhs.entityLocation) )) ivarsEqual = false;
+ if( ! (detonationResult == rhs.detonationResult)) ivarsEqual = false;
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" firingLiveEntityId: ").append(firingLiveEntityId).append("\n");
- sb.append(" detonationFlag1: ").append(detonationFlag1).append("\n");
- sb.append(" detonationFlag2: ").append(detonationFlag2).append("\n");
- sb.append(" targetLiveEntityId: ").append(targetLiveEntityId).append("\n");
- sb.append(" munitionLiveEntityId: ").append(munitionLiveEntityId).append("\n");
- sb.append(" eventId: ").append(eventId).append("\n");
- sb.append(" worldLocation: ").append(worldLocation).append("\n");
- sb.append(" velocity: ").append(velocity).append("\n");
- sb.append(" munitionOrientation: ").append(munitionOrientation).append("\n");
- sb.append(" munitionDescriptor: ").append(munitionDescriptor).append("\n");
- sb.append(" entityLocation: ").append(entityLocation).append("\n");
- sb.append(" detonationResult: ").append(detonationResult).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" firingLiveEntityId: ").append(firingLiveEntityId).append("\n");
+ sb.append(" detonationFlag1: ").append(detonationFlag1).append("\n");
+ sb.append(" detonationFlag2: ").append(detonationFlag2).append("\n");
+ sb.append(" targetLiveEntityId: ").append(targetLiveEntityId).append("\n");
+ sb.append(" munitionLiveEntityId: ").append(munitionLiveEntityId).append("\n");
+ sb.append(" eventId: ").append(eventId).append("\n");
+ sb.append(" worldLocation: ").append(worldLocation).append("\n");
+ sb.append(" velocity: ").append(velocity).append("\n");
+ sb.append(" munitionOrientation: ").append(munitionOrientation).append("\n");
+ sb.append(" munitionDescriptor: ").append(munitionDescriptor).append("\n");
+ sb.append(" entityLocation: ").append(entityLocation).append("\n");
+ sb.append(" detonationResult: ").append(detonationResult).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LEFirePdu.java b/src-generated/edu/nps/moves/dis7/LEFirePdu.java
index 83ebe2bd15f26e3f7f01c8c59b291650b1517829..bbbe6e4039736c5dbec9ef704c0ce3a81ec2c949 100644
--- a/src-generated/edu/nps/moves/dis7/LEFirePdu.java
+++ b/src-generated/edu/nps/moves/dis7/LEFirePdu.java
@@ -1,342 +1,342 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 9.4.5 Representation of weapons fire in a DIS exercise involving LEs.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class LEFirePdu extends LiveEntityFamilyPdu implements Serializable
-{
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 9.4.5 Representation of weapons fire in a DIS exercise involving LEs.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class LEFirePdu extends LiveEntityFamilyPdu implements Serializable
+{
protected EntityID firingLiveEntityId = new EntityID();
-
- /** Bits defined in IEEE Standard */
+
+ /** Bits defined in IEEE Standard */
protected byte flags;
-
+
protected EntityID targetLiveEntityId = new EntityID();
-
+
protected EntityID munitionLiveEntityId = new EntityID();
-
+
protected EventIdentifier eventId = new EventIdentifier();
-
+
protected LiveEntityRelativeWorldCoordinates location = new LiveEntityRelativeWorldCoordinates();
-
+
protected MunitionDescriptor munitionDescriptor = new MunitionDescriptor();
-
+
protected LiveEntityLinearVelocity velocity = new LiveEntityLinearVelocity();
-
+
protected short range;
-
-
-/** Constructor */
- public LEFirePdu()
- {
- setPduType( DISPDUType.LIVE_ENTITY_FIRE );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public LEFirePdu()
+ {
+ setPduType( DISPDUType.LIVE_ENTITY_FIRE );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += firingLiveEntityId.getMarshalledSize();
+ marshalSize += 1; // flags
+ marshalSize += targetLiveEntityId.getMarshalledSize();
+ marshalSize += munitionLiveEntityId.getMarshalledSize();
+ marshalSize += eventId.getMarshalledSize();
+ marshalSize += location.getMarshalledSize();
+ marshalSize += munitionDescriptor.getMarshalledSize();
+ marshalSize += velocity.getMarshalledSize();
+ marshalSize += 2; // range
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link LEFirePdu#firingLiveEntityId}*/
+public LEFirePdu setFiringLiveEntityId(EntityID pFiringLiveEntityId)
{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += firingLiveEntityId.getMarshalledSize();
- marshalSize += 1; // flags
- marshalSize += targetLiveEntityId.getMarshalledSize();
- marshalSize += munitionLiveEntityId.getMarshalledSize();
- marshalSize += eventId.getMarshalledSize();
- marshalSize += location.getMarshalledSize();
- marshalSize += munitionDescriptor.getMarshalledSize();
- marshalSize += velocity.getMarshalledSize();
- marshalSize += 2; // range
-
- return marshalSize;
-}
-
-
-/** Setter for {@link LEFirePdu#firingLiveEntityId}*/
-public LEFirePdu setFiringLiveEntityId(EntityID pFiringLiveEntityId)
-{
- firingLiveEntityId = pFiringLiveEntityId;
- return this;
-}
-
-/** Getter for {@link LEFirePdu#firingLiveEntityId}*/
-public EntityID getFiringLiveEntityId()
+ firingLiveEntityId = pFiringLiveEntityId;
+ return this;
+}
+
+/** Getter for {@link LEFirePdu#firingLiveEntityId}*/
+public EntityID getFiringLiveEntityId()
{
return firingLiveEntityId;
-}
-
-/** Setter for {@link LEFirePdu#flags}*/
-public LEFirePdu setFlags(byte pFlags)
+}
+
+/** Setter for {@link LEFirePdu#flags}*/
+public LEFirePdu setFlags(byte pFlags)
{
- flags = pFlags;
- return this;
-}
-
-/** Getter for {@link LEFirePdu#flags}*/
-public byte getFlags()
+ flags = pFlags;
+ return this;
+}
+
+/** Getter for {@link LEFirePdu#flags}*/
+public byte getFlags()
{
return flags;
-}
-
-/** Setter for {@link LEFirePdu#targetLiveEntityId}*/
-public LEFirePdu setTargetLiveEntityId(EntityID pTargetLiveEntityId)
+}
+
+/** Setter for {@link LEFirePdu#targetLiveEntityId}*/
+public LEFirePdu setTargetLiveEntityId(EntityID pTargetLiveEntityId)
{
- targetLiveEntityId = pTargetLiveEntityId;
- return this;
-}
-
-/** Getter for {@link LEFirePdu#targetLiveEntityId}*/
-public EntityID getTargetLiveEntityId()
+ targetLiveEntityId = pTargetLiveEntityId;
+ return this;
+}
+
+/** Getter for {@link LEFirePdu#targetLiveEntityId}*/
+public EntityID getTargetLiveEntityId()
{
return targetLiveEntityId;
-}
-
-/** Setter for {@link LEFirePdu#munitionLiveEntityId}*/
-public LEFirePdu setMunitionLiveEntityId(EntityID pMunitionLiveEntityId)
+}
+
+/** Setter for {@link LEFirePdu#munitionLiveEntityId}*/
+public LEFirePdu setMunitionLiveEntityId(EntityID pMunitionLiveEntityId)
{
- munitionLiveEntityId = pMunitionLiveEntityId;
- return this;
-}
-
-/** Getter for {@link LEFirePdu#munitionLiveEntityId}*/
-public EntityID getMunitionLiveEntityId()
+ munitionLiveEntityId = pMunitionLiveEntityId;
+ return this;
+}
+
+/** Getter for {@link LEFirePdu#munitionLiveEntityId}*/
+public EntityID getMunitionLiveEntityId()
{
return munitionLiveEntityId;
-}
-
-/** Setter for {@link LEFirePdu#eventId}*/
-public LEFirePdu setEventId(EventIdentifier pEventId)
+}
+
+/** Setter for {@link LEFirePdu#eventId}*/
+public LEFirePdu setEventId(EventIdentifier pEventId)
{
- eventId = pEventId;
- return this;
-}
-
-/** Getter for {@link LEFirePdu#eventId}*/
-public EventIdentifier getEventId()
+ eventId = pEventId;
+ return this;
+}
+
+/** Getter for {@link LEFirePdu#eventId}*/
+public EventIdentifier getEventId()
{
return eventId;
-}
-
-/** Setter for {@link LEFirePdu#location}*/
-public LEFirePdu setLocation(LiveEntityRelativeWorldCoordinates pLocation)
+}
+
+/** Setter for {@link LEFirePdu#location}*/
+public LEFirePdu setLocation(LiveEntityRelativeWorldCoordinates pLocation)
{
- location = pLocation;
- return this;
-}
-
-/** Getter for {@link LEFirePdu#location}*/
-public LiveEntityRelativeWorldCoordinates getLocation()
+ location = pLocation;
+ return this;
+}
+
+/** Getter for {@link LEFirePdu#location}*/
+public LiveEntityRelativeWorldCoordinates getLocation()
{
return location;
-}
-
-/** Setter for {@link LEFirePdu#munitionDescriptor}*/
-public LEFirePdu setMunitionDescriptor(MunitionDescriptor pMunitionDescriptor)
+}
+
+/** Setter for {@link LEFirePdu#munitionDescriptor}*/
+public LEFirePdu setMunitionDescriptor(MunitionDescriptor pMunitionDescriptor)
{
- munitionDescriptor = pMunitionDescriptor;
- return this;
-}
-
-/** Getter for {@link LEFirePdu#munitionDescriptor}*/
-public MunitionDescriptor getMunitionDescriptor()
+ munitionDescriptor = pMunitionDescriptor;
+ return this;
+}
+
+/** Getter for {@link LEFirePdu#munitionDescriptor}*/
+public MunitionDescriptor getMunitionDescriptor()
{
return munitionDescriptor;
-}
-
-/** Setter for {@link LEFirePdu#velocity}*/
-public LEFirePdu setVelocity(LiveEntityLinearVelocity pVelocity)
+}
+
+/** Setter for {@link LEFirePdu#velocity}*/
+public LEFirePdu setVelocity(LiveEntityLinearVelocity pVelocity)
{
- velocity = pVelocity;
- return this;
-}
-
-/** Getter for {@link LEFirePdu#velocity}*/
-public LiveEntityLinearVelocity getVelocity()
+ velocity = pVelocity;
+ return this;
+}
+
+/** Getter for {@link LEFirePdu#velocity}*/
+public LiveEntityLinearVelocity getVelocity()
{
return velocity;
-}
-
-/** Setter for {@link LEFirePdu#range}*/
-public LEFirePdu setRange(short pRange)
+}
+
+/** Setter for {@link LEFirePdu#range}*/
+public LEFirePdu setRange(short pRange)
{
- range = pRange;
- return this;
-}
-
-/** Getter for {@link LEFirePdu#range}*/
-public short getRange()
+ range = pRange;
+ return this;
+}
+
+/** Getter for {@link LEFirePdu#range}*/
+public short getRange()
{
return range;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- firingLiveEntityId.marshal(dos);
- dos.writeByte(flags);
- targetLiveEntityId.marshal(dos);
- munitionLiveEntityId.marshal(dos);
- eventId.marshal(dos);
- location.marshal(dos);
- munitionDescriptor.marshal(dos);
- velocity.marshal(dos);
- dos.writeShort(range);
+ {
+ firingLiveEntityId.marshal(dos);
+ dos.writeByte(flags);
+ targetLiveEntityId.marshal(dos);
+ munitionLiveEntityId.marshal(dos);
+ eventId.marshal(dos);
+ location.marshal(dos);
+ munitionDescriptor.marshal(dos);
+ velocity.marshal(dos);
+ dos.writeShort(range);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += firingLiveEntityId.unmarshal(dis);
- flags = (byte)dis.readUnsignedByte();
- uPosition += 1;
- uPosition += targetLiveEntityId.unmarshal(dis);
- uPosition += munitionLiveEntityId.unmarshal(dis);
- uPosition += eventId.unmarshal(dis);
- uPosition += location.unmarshal(dis);
- uPosition += munitionDescriptor.unmarshal(dis);
- uPosition += velocity.unmarshal(dis);
- range = (short)dis.readUnsignedShort();
- uPosition += 2;
+ {
+ uPosition += firingLiveEntityId.unmarshal(dis);
+ flags = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ uPosition += targetLiveEntityId.unmarshal(dis);
+ uPosition += munitionLiveEntityId.unmarshal(dis);
+ uPosition += eventId.unmarshal(dis);
+ uPosition += location.unmarshal(dis);
+ uPosition += munitionDescriptor.unmarshal(dis);
+ uPosition += velocity.unmarshal(dis);
+ range = (short)dis.readUnsignedShort();
+ uPosition += 2;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- firingLiveEntityId.marshal(buff);
- buff.put( (byte)flags);
- targetLiveEntityId.marshal(buff);
- munitionLiveEntityId.marshal(buff);
- eventId.marshal(buff);
- location.marshal(buff);
- munitionDescriptor.marshal(buff);
- velocity.marshal(buff);
- buff.putShort( (short)range);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ firingLiveEntityId.marshal(buff);
+ buff.put( (byte)flags);
+ targetLiveEntityId.marshal(buff);
+ munitionLiveEntityId.marshal(buff);
+ eventId.marshal(buff);
+ location.marshal(buff);
+ munitionDescriptor.marshal(buff);
+ velocity.marshal(buff);
+ buff.putShort( (short)range);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- firingLiveEntityId.unmarshal(buff);
- flags = (byte)(buff.get() & 0xFF);
- targetLiveEntityId.unmarshal(buff);
- munitionLiveEntityId.unmarshal(buff);
- eventId.unmarshal(buff);
- location.unmarshal(buff);
- munitionDescriptor.unmarshal(buff);
- velocity.unmarshal(buff);
- range = (short)(buff.getShort() & 0xFFFF);
- return getMarshalledSize();
+
+ firingLiveEntityId.unmarshal(buff);
+ flags = (byte)(buff.get() & 0xFF);
+ targetLiveEntityId.unmarshal(buff);
+ munitionLiveEntityId.unmarshal(buff);
+ eventId.unmarshal(buff);
+ location.unmarshal(buff);
+ munitionDescriptor.unmarshal(buff);
+ velocity.unmarshal(buff);
+ range = (short)(buff.getShort() & 0xFFFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final LEFirePdu rhs = (LEFirePdu)obj;
-
- if( ! (firingLiveEntityId.equals( rhs.firingLiveEntityId) )) ivarsEqual = false;
- if( ! (flags == rhs.flags)) ivarsEqual = false;
- if( ! (targetLiveEntityId.equals( rhs.targetLiveEntityId) )) ivarsEqual = false;
- if( ! (munitionLiveEntityId.equals( rhs.munitionLiveEntityId) )) ivarsEqual = false;
- if( ! (eventId.equals( rhs.eventId) )) ivarsEqual = false;
- if( ! (location.equals( rhs.location) )) ivarsEqual = false;
- if( ! (munitionDescriptor.equals( rhs.munitionDescriptor) )) ivarsEqual = false;
- if( ! (velocity.equals( rhs.velocity) )) ivarsEqual = false;
- if( ! (range == rhs.range)) ivarsEqual = false;
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final LEFirePdu rhs = (LEFirePdu)obj;
+
+ if( ! (firingLiveEntityId.equals( rhs.firingLiveEntityId) )) ivarsEqual = false;
+ if( ! (flags == rhs.flags)) ivarsEqual = false;
+ if( ! (targetLiveEntityId.equals( rhs.targetLiveEntityId) )) ivarsEqual = false;
+ if( ! (munitionLiveEntityId.equals( rhs.munitionLiveEntityId) )) ivarsEqual = false;
+ if( ! (eventId.equals( rhs.eventId) )) ivarsEqual = false;
+ if( ! (location.equals( rhs.location) )) ivarsEqual = false;
+ if( ! (munitionDescriptor.equals( rhs.munitionDescriptor) )) ivarsEqual = false;
+ if( ! (velocity.equals( rhs.velocity) )) ivarsEqual = false;
+ if( ! (range == rhs.range)) ivarsEqual = false;
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" firingLiveEntityId: ").append(firingLiveEntityId).append("\n");
- sb.append(" flags: ").append(flags).append("\n");
- sb.append(" targetLiveEntityId: ").append(targetLiveEntityId).append("\n");
- sb.append(" munitionLiveEntityId: ").append(munitionLiveEntityId).append("\n");
- sb.append(" eventId: ").append(eventId).append("\n");
- sb.append(" location: ").append(location).append("\n");
- sb.append(" munitionDescriptor: ").append(munitionDescriptor).append("\n");
- sb.append(" velocity: ").append(velocity).append("\n");
- sb.append(" range: ").append(range).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" firingLiveEntityId: ").append(firingLiveEntityId).append("\n");
+ sb.append(" flags: ").append(flags).append("\n");
+ sb.append(" targetLiveEntityId: ").append(targetLiveEntityId).append("\n");
+ sb.append(" munitionLiveEntityId: ").append(munitionLiveEntityId).append("\n");
+ sb.append(" eventId: ").append(eventId).append("\n");
+ sb.append(" location: ").append(location).append("\n");
+ sb.append(" munitionDescriptor: ").append(munitionDescriptor).append("\n");
+ sb.append(" velocity: ").append(velocity).append("\n");
+ sb.append(" range: ").append(range).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LEVector3FixedByte.java b/src-generated/edu/nps/moves/dis7/LEVector3FixedByte.java
index a0b17ab73e80d62349e9c0c64a82ab895af3ebbf..9b4ec45c329dbf6e30f4409274613b71585ff7f8 100644
--- a/src-generated/edu/nps/moves/dis7/LEVector3FixedByte.java
+++ b/src-generated/edu/nps/moves/dis7/LEVector3FixedByte.java
@@ -1,210 +1,210 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 3 x 8-bit fixed binary
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class LEVector3FixedByte extends Object implements Serializable
-{
- /** X value */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 3 x 8-bit fixed binary
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class LEVector3FixedByte extends Object implements Serializable
+{
+ /** X value */
protected byte x;
-
- /** y Value */
+
+ /** y Value */
protected byte y;
-
- /** Z value */
+
+ /** Z value */
protected byte z;
-
-
-/** Constructor */
- public LEVector3FixedByte()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += 1; // x
- marshalSize += 1; // y
- marshalSize += 1; // z
-
- return marshalSize;
-}
-
-
-/** Setter for {@link LEVector3FixedByte#x}*/
-public LEVector3FixedByte setX(byte pX)
+
+
+/** Constructor */
+ public LEVector3FixedByte()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 1; // x
+ marshalSize += 1; // y
+ marshalSize += 1; // z
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link LEVector3FixedByte#x}*/
+public LEVector3FixedByte setX(byte pX)
{
- x = pX;
- return this;
-}
-
-/** Getter for {@link LEVector3FixedByte#x}*/
-public byte getX()
+ x = pX;
+ return this;
+}
+
+/** Getter for {@link LEVector3FixedByte#x}*/
+public byte getX()
{
return x;
-}
-
-/** Setter for {@link LEVector3FixedByte#y}*/
-public LEVector3FixedByte setY(byte pY)
+}
+
+/** Setter for {@link LEVector3FixedByte#y}*/
+public LEVector3FixedByte setY(byte pY)
{
- y = pY;
- return this;
-}
-
-/** Getter for {@link LEVector3FixedByte#y}*/
-public byte getY()
+ y = pY;
+ return this;
+}
+
+/** Getter for {@link LEVector3FixedByte#y}*/
+public byte getY()
{
return y;
-}
-
-/** Setter for {@link LEVector3FixedByte#z}*/
-public LEVector3FixedByte setZ(byte pZ)
+}
+
+/** Setter for {@link LEVector3FixedByte#z}*/
+public LEVector3FixedByte setZ(byte pZ)
{
- z = pZ;
- return this;
-}
-
-/** Getter for {@link LEVector3FixedByte#z}*/
-public byte getZ()
+ z = pZ;
+ return this;
+}
+
+/** Getter for {@link LEVector3FixedByte#z}*/
+public byte getZ()
{
return z;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeByte(x);
- dos.writeByte(y);
- dos.writeByte(z);
+ {
+ dos.writeByte(x);
+ dos.writeByte(y);
+ dos.writeByte(z);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- x = (byte)dis.readUnsignedByte();
- uPosition += 1;
- y = (byte)dis.readUnsignedByte();
- uPosition += 1;
- z = (byte)dis.readUnsignedByte();
- uPosition += 1;
+ {
+ x = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ y = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ z = (byte)dis.readUnsignedByte();
+ uPosition += 1;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.put( (byte)x);
- buff.put( (byte)y);
- buff.put( (byte)z);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- x = (byte)(buff.get() & 0xFF);
- y = (byte)(buff.get() & 0xFF);
- z = (byte)(buff.get() & 0xFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.put( (byte)x);
+ buff.put( (byte)y);
+ buff.put( (byte)z);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ x = (byte)(buff.get() & 0xFF);
+ y = (byte)(buff.get() & 0xFF);
+ z = (byte)(buff.get() & 0xFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final LEVector3FixedByte rhs = (LEVector3FixedByte)obj;
-
- if( ! (x == rhs.x)) ivarsEqual = false;
- if( ! (y == rhs.y)) ivarsEqual = false;
- if( ! (z == rhs.z)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final LEVector3FixedByte rhs = (LEVector3FixedByte)obj;
+
+ if( ! (x == rhs.x)) ivarsEqual = false;
+ if( ! (y == rhs.y)) ivarsEqual = false;
+ if( ! (z == rhs.z)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" x: ").append(x).append("\n");
- sb.append(" y: ").append(y).append("\n");
- sb.append(" z: ").append(z).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" x: ").append(x).append("\n");
+ sb.append(" y: ").append(y).append("\n");
+ sb.append(" z: ").append(z).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LaunchedMunitionRecord.java b/src-generated/edu/nps/moves/dis7/LaunchedMunitionRecord.java
index 56fd58213de600fe39e8545ad301efc3c4cadef1..e16f9f7a9fc6007ae917f89f484517f17c841b6c 100644
--- a/src-generated/edu/nps/moves/dis7/LaunchedMunitionRecord.java
+++ b/src-generated/edu/nps/moves/dis7/LaunchedMunitionRecord.java
@@ -1,295 +1,295 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Identity of a communications node. Section 6.2.50
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class LaunchedMunitionRecord extends Object implements Serializable
-{
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Identity of a communications node. Section 6.2.50
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class LaunchedMunitionRecord extends Object implements Serializable
+{
protected EventIdentifier fireEventID = new EventIdentifier();
-
+
protected short padding;
-
+
protected EntityID firingEntityID = new EntityID();
-
+
protected short padding2;
-
+
protected EntityID targetEntityID = new EntityID();
-
+
protected short padding3;
-
+
protected Vector3Double targetLocation = new Vector3Double();
-
-
-/** Constructor */
- public LaunchedMunitionRecord()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += fireEventID.getMarshalledSize();
- marshalSize += 2; // padding
- marshalSize += firingEntityID.getMarshalledSize();
- marshalSize += 2; // padding2
- marshalSize += targetEntityID.getMarshalledSize();
- marshalSize += 2; // padding3
- marshalSize += targetLocation.getMarshalledSize();
-
- return marshalSize;
-}
-
-
-/** Setter for {@link LaunchedMunitionRecord#fireEventID}*/
-public LaunchedMunitionRecord setFireEventID(EventIdentifier pFireEventID)
+
+
+/** Constructor */
+ public LaunchedMunitionRecord()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += fireEventID.getMarshalledSize();
+ marshalSize += 2; // padding
+ marshalSize += firingEntityID.getMarshalledSize();
+ marshalSize += 2; // padding2
+ marshalSize += targetEntityID.getMarshalledSize();
+ marshalSize += 2; // padding3
+ marshalSize += targetLocation.getMarshalledSize();
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link LaunchedMunitionRecord#fireEventID}*/
+public LaunchedMunitionRecord setFireEventID(EventIdentifier pFireEventID)
{
- fireEventID = pFireEventID;
- return this;
-}
-
-/** Getter for {@link LaunchedMunitionRecord#fireEventID}*/
-public EventIdentifier getFireEventID()
+ fireEventID = pFireEventID;
+ return this;
+}
+
+/** Getter for {@link LaunchedMunitionRecord#fireEventID}*/
+public EventIdentifier getFireEventID()
{
return fireEventID;
-}
-
-/** Setter for {@link LaunchedMunitionRecord#padding}*/
-public LaunchedMunitionRecord setPadding(short pPadding)
+}
+
+/** Setter for {@link LaunchedMunitionRecord#padding}*/
+public LaunchedMunitionRecord setPadding(short pPadding)
{
- padding = pPadding;
- return this;
-}
-
-/** Getter for {@link LaunchedMunitionRecord#padding}*/
-public short getPadding()
+ padding = pPadding;
+ return this;
+}
+
+/** Getter for {@link LaunchedMunitionRecord#padding}*/
+public short getPadding()
{
return padding;
-}
-
-/** Setter for {@link LaunchedMunitionRecord#firingEntityID}*/
-public LaunchedMunitionRecord setFiringEntityID(EntityID pFiringEntityID)
+}
+
+/** Setter for {@link LaunchedMunitionRecord#firingEntityID}*/
+public LaunchedMunitionRecord setFiringEntityID(EntityID pFiringEntityID)
{
- firingEntityID = pFiringEntityID;
- return this;
-}
-
-/** Getter for {@link LaunchedMunitionRecord#firingEntityID}*/
-public EntityID getFiringEntityID()
+ firingEntityID = pFiringEntityID;
+ return this;
+}
+
+/** Getter for {@link LaunchedMunitionRecord#firingEntityID}*/
+public EntityID getFiringEntityID()
{
return firingEntityID;
-}
-
-/** Setter for {@link LaunchedMunitionRecord#padding2}*/
-public LaunchedMunitionRecord setPadding2(short pPadding2)
+}
+
+/** Setter for {@link LaunchedMunitionRecord#padding2}*/
+public LaunchedMunitionRecord setPadding2(short pPadding2)
{
- padding2 = pPadding2;
- return this;
-}
-
-/** Getter for {@link LaunchedMunitionRecord#padding2}*/
-public short getPadding2()
+ padding2 = pPadding2;
+ return this;
+}
+
+/** Getter for {@link LaunchedMunitionRecord#padding2}*/
+public short getPadding2()
{
return padding2;
-}
-
-/** Setter for {@link LaunchedMunitionRecord#targetEntityID}*/
-public LaunchedMunitionRecord setTargetEntityID(EntityID pTargetEntityID)
+}
+
+/** Setter for {@link LaunchedMunitionRecord#targetEntityID}*/
+public LaunchedMunitionRecord setTargetEntityID(EntityID pTargetEntityID)
{
- targetEntityID = pTargetEntityID;
- return this;
-}
-
-/** Getter for {@link LaunchedMunitionRecord#targetEntityID}*/
-public EntityID getTargetEntityID()
+ targetEntityID = pTargetEntityID;
+ return this;
+}
+
+/** Getter for {@link LaunchedMunitionRecord#targetEntityID}*/
+public EntityID getTargetEntityID()
{
return targetEntityID;
-}
-
-/** Setter for {@link LaunchedMunitionRecord#padding3}*/
-public LaunchedMunitionRecord setPadding3(short pPadding3)
+}
+
+/** Setter for {@link LaunchedMunitionRecord#padding3}*/
+public LaunchedMunitionRecord setPadding3(short pPadding3)
{
- padding3 = pPadding3;
- return this;
-}
-
-/** Getter for {@link LaunchedMunitionRecord#padding3}*/
-public short getPadding3()
+ padding3 = pPadding3;
+ return this;
+}
+
+/** Getter for {@link LaunchedMunitionRecord#padding3}*/
+public short getPadding3()
{
return padding3;
-}
-
-/** Setter for {@link LaunchedMunitionRecord#targetLocation}*/
-public LaunchedMunitionRecord setTargetLocation(Vector3Double pTargetLocation)
+}
+
+/** Setter for {@link LaunchedMunitionRecord#targetLocation}*/
+public LaunchedMunitionRecord setTargetLocation(Vector3Double pTargetLocation)
{
- targetLocation = pTargetLocation;
- return this;
-}
-
-/** Getter for {@link LaunchedMunitionRecord#targetLocation}*/
-public Vector3Double getTargetLocation()
+ targetLocation = pTargetLocation;
+ return this;
+}
+
+/** Getter for {@link LaunchedMunitionRecord#targetLocation}*/
+public Vector3Double getTargetLocation()
{
return targetLocation;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- fireEventID.marshal(dos);
- dos.writeShort(padding);
- firingEntityID.marshal(dos);
- dos.writeShort(padding2);
- targetEntityID.marshal(dos);
- dos.writeShort(padding3);
- targetLocation.marshal(dos);
+ {
+ fireEventID.marshal(dos);
+ dos.writeShort(padding);
+ firingEntityID.marshal(dos);
+ dos.writeShort(padding2);
+ targetEntityID.marshal(dos);
+ dos.writeShort(padding3);
+ targetLocation.marshal(dos);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- uPosition += fireEventID.unmarshal(dis);
- padding = (short)dis.readUnsignedShort();
- uPosition += 2;
- uPosition += firingEntityID.unmarshal(dis);
- padding2 = (short)dis.readUnsignedShort();
- uPosition += 2;
- uPosition += targetEntityID.unmarshal(dis);
- padding3 = (short)dis.readUnsignedShort();
- uPosition += 2;
- uPosition += targetLocation.unmarshal(dis);
+ {
+ uPosition += fireEventID.unmarshal(dis);
+ padding = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ uPosition += firingEntityID.unmarshal(dis);
+ padding2 = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ uPosition += targetEntityID.unmarshal(dis);
+ padding3 = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ uPosition += targetLocation.unmarshal(dis);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- fireEventID.marshal(buff);
- buff.putShort( (short)padding);
- firingEntityID.marshal(buff);
- buff.putShort( (short)padding2);
- targetEntityID.marshal(buff);
- buff.putShort( (short)padding3);
- targetLocation.marshal(buff);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- fireEventID.unmarshal(buff);
- padding = (short)(buff.getShort() & 0xFFFF);
- firingEntityID.unmarshal(buff);
- padding2 = (short)(buff.getShort() & 0xFFFF);
- targetEntityID.unmarshal(buff);
- padding3 = (short)(buff.getShort() & 0xFFFF);
- targetLocation.unmarshal(buff);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ fireEventID.marshal(buff);
+ buff.putShort( (short)padding);
+ firingEntityID.marshal(buff);
+ buff.putShort( (short)padding2);
+ targetEntityID.marshal(buff);
+ buff.putShort( (short)padding3);
+ targetLocation.marshal(buff);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ fireEventID.unmarshal(buff);
+ padding = (short)(buff.getShort() & 0xFFFF);
+ firingEntityID.unmarshal(buff);
+ padding2 = (short)(buff.getShort() & 0xFFFF);
+ targetEntityID.unmarshal(buff);
+ padding3 = (short)(buff.getShort() & 0xFFFF);
+ targetLocation.unmarshal(buff);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final LaunchedMunitionRecord rhs = (LaunchedMunitionRecord)obj;
-
- if( ! (fireEventID.equals( rhs.fireEventID) )) ivarsEqual = false;
- if( ! (padding == rhs.padding)) ivarsEqual = false;
- if( ! (firingEntityID.equals( rhs.firingEntityID) )) ivarsEqual = false;
- if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
- if( ! (targetEntityID.equals( rhs.targetEntityID) )) ivarsEqual = false;
- if( ! (padding3 == rhs.padding3)) ivarsEqual = false;
- if( ! (targetLocation.equals( rhs.targetLocation) )) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final LaunchedMunitionRecord rhs = (LaunchedMunitionRecord)obj;
+
+ if( ! (fireEventID.equals( rhs.fireEventID) )) ivarsEqual = false;
+ if( ! (padding == rhs.padding)) ivarsEqual = false;
+ if( ! (firingEntityID.equals( rhs.firingEntityID) )) ivarsEqual = false;
+ if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
+ if( ! (targetEntityID.equals( rhs.targetEntityID) )) ivarsEqual = false;
+ if( ! (padding3 == rhs.padding3)) ivarsEqual = false;
+ if( ! (targetLocation.equals( rhs.targetLocation) )) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" fireEventID: ").append(fireEventID).append("\n");
- sb.append(" padding: ").append(padding).append("\n");
- sb.append(" firingEntityID: ").append(firingEntityID).append("\n");
- sb.append(" padding2: ").append(padding2).append("\n");
- sb.append(" targetEntityID: ").append(targetEntityID).append("\n");
- sb.append(" padding3: ").append(padding3).append("\n");
- sb.append(" targetLocation: ").append(targetLocation).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" fireEventID: ").append(fireEventID).append("\n");
+ sb.append(" padding: ").append(padding).append("\n");
+ sb.append(" firingEntityID: ").append(firingEntityID).append("\n");
+ sb.append(" padding2: ").append(padding2).append("\n");
+ sb.append(" targetEntityID: ").append(targetEntityID).append("\n");
+ sb.append(" padding3: ").append(padding3).append("\n");
+ sb.append(" targetLocation: ").append(targetLocation).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LayerHeader.java b/src-generated/edu/nps/moves/dis7/LayerHeader.java
index 875dff2dda2e10d37f23d4707b4fca92f8643253..6e3c743fb2a8327e7a294a3cbbfad4320b9914e5 100644
--- a/src-generated/edu/nps/moves/dis7/LayerHeader.java
+++ b/src-generated/edu/nps/moves/dis7/LayerHeader.java
@@ -1,209 +1,209 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * The identification of the additional information layer number, layer-specific information, and the length of the layer. Section 6.2.51
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class LayerHeader extends Object implements Serializable
-{
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * The identification of the additional information layer number, layer-specific information, and the length of the layer. Section 6.2.51
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class LayerHeader extends Object implements Serializable
+{
protected byte layerNumber;
-
- /** field shall specify layer-specific information that varies by System Type (see 6.2.86) and Layer Number. */
+
+ /** field shall specify layer-specific information that varies by System Type (see 6.2.86) and Layer Number. */
protected byte layerSpecificInformation;
-
- /** This field shall specify the length in octets of the layer, including the Layer Header record */
+
+ /** This field shall specify the length in octets of the layer, including the Layer Header record */
protected short length;
-
-
-/** Constructor */
- public LayerHeader()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += 1; // layerNumber
- marshalSize += 1; // layerSpecificInformation
- marshalSize += 2; // length
-
- return marshalSize;
-}
-
-
-/** Setter for {@link LayerHeader#layerNumber}*/
-public LayerHeader setLayerNumber(byte pLayerNumber)
+
+
+/** Constructor */
+ public LayerHeader()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 1; // layerNumber
+ marshalSize += 1; // layerSpecificInformation
+ marshalSize += 2; // length
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link LayerHeader#layerNumber}*/
+public LayerHeader setLayerNumber(byte pLayerNumber)
{
- layerNumber = pLayerNumber;
- return this;
-}
-
-/** Getter for {@link LayerHeader#layerNumber}*/
-public byte getLayerNumber()
+ layerNumber = pLayerNumber;
+ return this;
+}
+
+/** Getter for {@link LayerHeader#layerNumber}*/
+public byte getLayerNumber()
{
return layerNumber;
-}
-
-/** Setter for {@link LayerHeader#layerSpecificInformation}*/
-public LayerHeader setLayerSpecificInformation(byte pLayerSpecificInformation)
+}
+
+/** Setter for {@link LayerHeader#layerSpecificInformation}*/
+public LayerHeader setLayerSpecificInformation(byte pLayerSpecificInformation)
{
- layerSpecificInformation = pLayerSpecificInformation;
- return this;
-}
-
-/** Getter for {@link LayerHeader#layerSpecificInformation}*/
-public byte getLayerSpecificInformation()
+ layerSpecificInformation = pLayerSpecificInformation;
+ return this;
+}
+
+/** Getter for {@link LayerHeader#layerSpecificInformation}*/
+public byte getLayerSpecificInformation()
{
return layerSpecificInformation;
-}
-
-/** Setter for {@link LayerHeader#length}*/
-public LayerHeader setLength(short pLength)
+}
+
+/** Setter for {@link LayerHeader#length}*/
+public LayerHeader setLength(short pLength)
{
- length = pLength;
- return this;
-}
-
-/** Getter for {@link LayerHeader#length}*/
-public short getLength()
+ length = pLength;
+ return this;
+}
+
+/** Getter for {@link LayerHeader#length}*/
+public short getLength()
{
return length;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeByte(layerNumber);
- dos.writeByte(layerSpecificInformation);
- dos.writeShort(length);
+ {
+ dos.writeByte(layerNumber);
+ dos.writeByte(layerSpecificInformation);
+ dos.writeShort(length);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- layerNumber = (byte)dis.readUnsignedByte();
- uPosition += 1;
- layerSpecificInformation = (byte)dis.readUnsignedByte();
- uPosition += 1;
- length = (short)dis.readUnsignedShort();
- uPosition += 2;
+ {
+ layerNumber = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ layerSpecificInformation = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ length = (short)dis.readUnsignedShort();
+ uPosition += 2;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.put( (byte)layerNumber);
- buff.put( (byte)layerSpecificInformation);
- buff.putShort( (short)length);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- layerNumber = (byte)(buff.get() & 0xFF);
- layerSpecificInformation = (byte)(buff.get() & 0xFF);
- length = (short)(buff.getShort() & 0xFFFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.put( (byte)layerNumber);
+ buff.put( (byte)layerSpecificInformation);
+ buff.putShort( (short)length);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ layerNumber = (byte)(buff.get() & 0xFF);
+ layerSpecificInformation = (byte)(buff.get() & 0xFF);
+ length = (short)(buff.getShort() & 0xFFFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final LayerHeader rhs = (LayerHeader)obj;
-
- if( ! (layerNumber == rhs.layerNumber)) ivarsEqual = false;
- if( ! (layerSpecificInformation == rhs.layerSpecificInformation)) ivarsEqual = false;
- if( ! (length == rhs.length)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final LayerHeader rhs = (LayerHeader)obj;
+
+ if( ! (layerNumber == rhs.layerNumber)) ivarsEqual = false;
+ if( ! (layerSpecificInformation == rhs.layerSpecificInformation)) ivarsEqual = false;
+ if( ! (length == rhs.length)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" layerNumber: ").append(layerNumber).append("\n");
- sb.append(" layerSpecificInformation: ").append(layerSpecificInformation).append("\n");
- sb.append(" length: ").append(length).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" layerNumber: ").append(layerNumber).append("\n");
+ sb.append(" layerSpecificInformation: ").append(layerSpecificInformation).append("\n");
+ sb.append(" length: ").append(length).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LinearObjectStatePdu.java b/src-generated/edu/nps/moves/dis7/LinearObjectStatePdu.java
index d3ce4125aa2919da4ed3af4998d8c221b15269c3..33ab3f15bb204ae919020b8e02acb2387eb9074e 100644
--- a/src-generated/edu/nps/moves/dis7/LinearObjectStatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/LinearObjectStatePdu.java
@@ -1,368 +1,368 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 7.10.5 Used to communicate detailed information about the addition/modification of a synthetic environment object that is geometrically anchored to the terrain with one point and has size and orientation.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class LinearObjectStatePdu extends SyntheticEnvironmentFamilyPdu implements Serializable
-{
- /** Object in synthetic environment */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 7.10.5 Used to communicate detailed information about the addition/modification of a synthetic environment object that is geometrically anchored to the terrain with one point and has size and orientation.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class LinearObjectStatePdu extends SyntheticEnvironmentFamilyPdu implements Serializable
+{
+ /** Object in synthetic environment */
protected ObjectIdentifier objectID = new ObjectIdentifier();
-
- /** Object with which this point object is associated */
+
+ /** Object with which this point object is associated */
protected ObjectIdentifier referencedObjectID = new ObjectIdentifier();
-
- /** unique update number of each state transition of an object */
+
+ /** unique update number of each state transition of an object */
protected short updateNumber;
-
- /** force ID uid 6 */
+
+ /** force ID uid 6 */
protected ForceID forceID = ForceID.values()[0];
-
- /** number of linear segment parameters */
+
+ /** number of linear segment parameters */
protected byte numberOfLinearSegments;
-
- /** requesterID */
+
+ /** requesterID */
protected SimulationAddress requesterID = new SimulationAddress();
-
- /** receiver ID */
+
+ /** receiver ID */
protected SimulationAddress receivingID = new SimulationAddress();
-
- /** Object type */
+
+ /** Object type */
protected ObjectType objectType = new ObjectType();
-
- /** Linear segment parameters */
+
+ /** Linear segment parameters */
protected List< LinearSegmentParameter > linearSegmentParameters = new ArrayList< LinearSegmentParameter >();
-
-
-/** Constructor */
- public LinearObjectStatePdu()
- {
- setPduType( DISPDUType.LINEAR_OBJECT_STATE );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public LinearObjectStatePdu()
+ {
+ setPduType( DISPDUType.LINEAR_OBJECT_STATE );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += objectID.getMarshalledSize();
+ marshalSize += referencedObjectID.getMarshalledSize();
+ marshalSize += 2; // updateNumber
+ marshalSize += forceID.getMarshalledSize();
+ marshalSize += 1; // numberOfLinearSegments
+ marshalSize += requesterID.getMarshalledSize();
+ marshalSize += receivingID.getMarshalledSize();
+ marshalSize += objectType.getMarshalledSize();
+ for(int idx=0; idx < linearSegmentParameters.size(); idx++)
+ {
+ LinearSegmentParameter listElement = linearSegmentParameters.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link LinearObjectStatePdu#objectID}*/
+public LinearObjectStatePdu setObjectID(ObjectIdentifier pObjectID)
{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += objectID.getMarshalledSize();
- marshalSize += referencedObjectID.getMarshalledSize();
- marshalSize += 2; // updateNumber
- marshalSize += forceID.getMarshalledSize();
- marshalSize += 1; // numberOfLinearSegments
- marshalSize += requesterID.getMarshalledSize();
- marshalSize += receivingID.getMarshalledSize();
- marshalSize += objectType.getMarshalledSize();
- for(int idx=0; idx < linearSegmentParameters.size(); idx++)
- {
- LinearSegmentParameter listElement = linearSegmentParameters.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link LinearObjectStatePdu#objectID}*/
-public LinearObjectStatePdu setObjectID(ObjectIdentifier pObjectID)
-{
- objectID = pObjectID;
- return this;
-}
-
-/** Getter for {@link LinearObjectStatePdu#objectID}*/
-public ObjectIdentifier getObjectID()
+ objectID = pObjectID;
+ return this;
+}
+
+/** Getter for {@link LinearObjectStatePdu#objectID}*/
+public ObjectIdentifier getObjectID()
{
return objectID;
-}
-
-/** Setter for {@link LinearObjectStatePdu#referencedObjectID}*/
-public LinearObjectStatePdu setReferencedObjectID(ObjectIdentifier pReferencedObjectID)
+}
+
+/** Setter for {@link LinearObjectStatePdu#referencedObjectID}*/
+public LinearObjectStatePdu setReferencedObjectID(ObjectIdentifier pReferencedObjectID)
{
- referencedObjectID = pReferencedObjectID;
- return this;
-}
-
-/** Getter for {@link LinearObjectStatePdu#referencedObjectID}*/
-public ObjectIdentifier getReferencedObjectID()
+ referencedObjectID = pReferencedObjectID;
+ return this;
+}
+
+/** Getter for {@link LinearObjectStatePdu#referencedObjectID}*/
+public ObjectIdentifier getReferencedObjectID()
{
return referencedObjectID;
-}
-
-/** Setter for {@link LinearObjectStatePdu#updateNumber}*/
-public LinearObjectStatePdu setUpdateNumber(short pUpdateNumber)
+}
+
+/** Setter for {@link LinearObjectStatePdu#updateNumber}*/
+public LinearObjectStatePdu setUpdateNumber(short pUpdateNumber)
{
- updateNumber = pUpdateNumber;
- return this;
-}
-
-/** Getter for {@link LinearObjectStatePdu#updateNumber}*/
-public short getUpdateNumber()
+ updateNumber = pUpdateNumber;
+ return this;
+}
+
+/** Getter for {@link LinearObjectStatePdu#updateNumber}*/
+public short getUpdateNumber()
{
return updateNumber;
-}
-
-/** Setter for {@link LinearObjectStatePdu#forceID}*/
-public LinearObjectStatePdu setForceID(ForceID pForceID)
+}
+
+/** Setter for {@link LinearObjectStatePdu#forceID}*/
+public LinearObjectStatePdu setForceID(ForceID pForceID)
{
- forceID = pForceID;
- return this;
-}
-
-/** Getter for {@link LinearObjectStatePdu#forceID}*/
-public ForceID getForceID()
+ forceID = pForceID;
+ return this;
+}
+
+/** Getter for {@link LinearObjectStatePdu#forceID}*/
+public ForceID getForceID()
{
return forceID;
-}
-
-/** Setter for {@link LinearObjectStatePdu#requesterID}*/
-public LinearObjectStatePdu setRequesterID(SimulationAddress pRequesterID)
+}
+
+/** Setter for {@link LinearObjectStatePdu#requesterID}*/
+public LinearObjectStatePdu setRequesterID(SimulationAddress pRequesterID)
{
- requesterID = pRequesterID;
- return this;
-}
-
-/** Getter for {@link LinearObjectStatePdu#requesterID}*/
-public SimulationAddress getRequesterID()
+ requesterID = pRequesterID;
+ return this;
+}
+
+/** Getter for {@link LinearObjectStatePdu#requesterID}*/
+public SimulationAddress getRequesterID()
{
return requesterID;
-}
-
-/** Setter for {@link LinearObjectStatePdu#receivingID}*/
-public LinearObjectStatePdu setReceivingID(SimulationAddress pReceivingID)
+}
+
+/** Setter for {@link LinearObjectStatePdu#receivingID}*/
+public LinearObjectStatePdu setReceivingID(SimulationAddress pReceivingID)
{
- receivingID = pReceivingID;
- return this;
-}
-
-/** Getter for {@link LinearObjectStatePdu#receivingID}*/
-public SimulationAddress getReceivingID()
+ receivingID = pReceivingID;
+ return this;
+}
+
+/** Getter for {@link LinearObjectStatePdu#receivingID}*/
+public SimulationAddress getReceivingID()
{
return receivingID;
-}
-
-/** Setter for {@link LinearObjectStatePdu#objectType}*/
-public LinearObjectStatePdu setObjectType(ObjectType pObjectType)
+}
+
+/** Setter for {@link LinearObjectStatePdu#objectType}*/
+public LinearObjectStatePdu setObjectType(ObjectType pObjectType)
{
- objectType = pObjectType;
- return this;
-}
-
-/** Getter for {@link LinearObjectStatePdu#objectType}*/
-public ObjectType getObjectType()
+ objectType = pObjectType;
+ return this;
+}
+
+/** Getter for {@link LinearObjectStatePdu#objectType}*/
+public ObjectType getObjectType()
{
return objectType;
-}
-
-/** Setter for {@link LinearObjectStatePdu#linearSegmentParameters}*/
-public LinearObjectStatePdu setLinearSegmentParameters(List<LinearSegmentParameter> pLinearSegmentParameters)
+}
+
+/** Setter for {@link LinearObjectStatePdu#linearSegmentParameters}*/
+public LinearObjectStatePdu setLinearSegmentParameters(List<LinearSegmentParameter> pLinearSegmentParameters)
{
- linearSegmentParameters = pLinearSegmentParameters;
- return this;
-}
-
-/** Getter for {@link LinearObjectStatePdu#linearSegmentParameters}*/
-public List<LinearSegmentParameter> getLinearSegmentParameters()
+ linearSegmentParameters = pLinearSegmentParameters;
+ return this;
+}
+
+/** Getter for {@link LinearObjectStatePdu#linearSegmentParameters}*/
+public List<LinearSegmentParameter> getLinearSegmentParameters()
{
return linearSegmentParameters;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- objectID.marshal(dos);
- referencedObjectID.marshal(dos);
- dos.writeShort(updateNumber);
- forceID.marshal(dos);
- dos.writeByte(linearSegmentParameters.size());
- requesterID.marshal(dos);
- receivingID.marshal(dos);
- objectType.marshal(dos);
-
- for(int idx = 0; idx < linearSegmentParameters.size(); idx++)
- {
- LinearSegmentParameter aLinearSegmentParameter = linearSegmentParameters.get(idx);
- aLinearSegmentParameter.marshal(dos);
- }
-
+ {
+ objectID.marshal(dos);
+ referencedObjectID.marshal(dos);
+ dos.writeShort(updateNumber);
+ forceID.marshal(dos);
+ dos.writeByte(linearSegmentParameters.size());
+ requesterID.marshal(dos);
+ receivingID.marshal(dos);
+ objectType.marshal(dos);
+
+ for(int idx = 0; idx < linearSegmentParameters.size(); idx++)
+ {
+ LinearSegmentParameter aLinearSegmentParameter = linearSegmentParameters.get(idx);
+ aLinearSegmentParameter.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += objectID.unmarshal(dis);
- uPosition += referencedObjectID.unmarshal(dis);
- updateNumber = (short)dis.readUnsignedShort();
- uPosition += 2;
- forceID = ForceID.unmarshalEnum(dis);
- uPosition += forceID.getMarshalledSize();
- numberOfLinearSegments = (byte)dis.readUnsignedByte();
- uPosition += 1;
- uPosition += requesterID.unmarshal(dis);
- uPosition += receivingID.unmarshal(dis);
- uPosition += objectType.unmarshal(dis);
- for(int idx = 0; idx < numberOfLinearSegments; idx++)
- {
- LinearSegmentParameter anX = new LinearSegmentParameter();
- uPosition += anX.unmarshal(dis);
- linearSegmentParameters.add(anX);
- }
-
+ {
+ uPosition += objectID.unmarshal(dis);
+ uPosition += referencedObjectID.unmarshal(dis);
+ updateNumber = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ forceID = ForceID.unmarshalEnum(dis);
+ uPosition += forceID.getMarshalledSize();
+ numberOfLinearSegments = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ uPosition += requesterID.unmarshal(dis);
+ uPosition += receivingID.unmarshal(dis);
+ uPosition += objectType.unmarshal(dis);
+ for(int idx = 0; idx < numberOfLinearSegments; idx++)
+ {
+ LinearSegmentParameter anX = new LinearSegmentParameter();
+ uPosition += anX.unmarshal(dis);
+ linearSegmentParameters.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- objectID.marshal(buff);
- referencedObjectID.marshal(buff);
- buff.putShort( (short)updateNumber);
- forceID.marshal(buff);
- buff.put( (byte)linearSegmentParameters.size());
- requesterID.marshal(buff);
- receivingID.marshal(buff);
- objectType.marshal(buff);
-
- for(int idx = 0; idx < linearSegmentParameters.size(); idx++)
- {
- LinearSegmentParameter aLinearSegmentParameter = linearSegmentParameters.get(idx);
- aLinearSegmentParameter.marshal(buff);
- }
-
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ objectID.marshal(buff);
+ referencedObjectID.marshal(buff);
+ buff.putShort( (short)updateNumber);
+ forceID.marshal(buff);
+ buff.put( (byte)linearSegmentParameters.size());
+ requesterID.marshal(buff);
+ receivingID.marshal(buff);
+ objectType.marshal(buff);
+
+ for(int idx = 0; idx < linearSegmentParameters.size(); idx++)
+ {
+ LinearSegmentParameter aLinearSegmentParameter = linearSegmentParameters.get(idx);
+ aLinearSegmentParameter.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- objectID.unmarshal(buff);
- referencedObjectID.unmarshal(buff);
- updateNumber = (short)(buff.getShort() & 0xFFFF);
- forceID = ForceID.unmarshalEnum(buff);
- numberOfLinearSegments = (byte)(buff.get() & 0xFF);
- requesterID.unmarshal(buff);
- receivingID.unmarshal(buff);
- objectType.unmarshal(buff);
- for(int idx = 0; idx < numberOfLinearSegments; idx++)
- {
- LinearSegmentParameter anX = new LinearSegmentParameter();
- anX.unmarshal(buff);
- linearSegmentParameters.add(anX);
- }
-
- return getMarshalledSize();
+
+ objectID.unmarshal(buff);
+ referencedObjectID.unmarshal(buff);
+ updateNumber = (short)(buff.getShort() & 0xFFFF);
+ forceID = ForceID.unmarshalEnum(buff);
+ numberOfLinearSegments = (byte)(buff.get() & 0xFF);
+ requesterID.unmarshal(buff);
+ receivingID.unmarshal(buff);
+ objectType.unmarshal(buff);
+ for(int idx = 0; idx < numberOfLinearSegments; idx++)
+ {
+ LinearSegmentParameter anX = new LinearSegmentParameter();
+ anX.unmarshal(buff);
+ linearSegmentParameters.add(anX);
+ }
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final LinearObjectStatePdu rhs = (LinearObjectStatePdu)obj;
-
- if( ! (objectID.equals( rhs.objectID) )) ivarsEqual = false;
- if( ! (referencedObjectID.equals( rhs.referencedObjectID) )) ivarsEqual = false;
- if( ! (updateNumber == rhs.updateNumber)) ivarsEqual = false;
- if( ! (forceID == rhs.forceID)) ivarsEqual = false;
- if( ! (requesterID.equals( rhs.requesterID) )) ivarsEqual = false;
- if( ! (receivingID.equals( rhs.receivingID) )) ivarsEqual = false;
- if( ! (objectType.equals( rhs.objectType) )) ivarsEqual = false;
-
- for(int idx = 0; idx < linearSegmentParameters.size(); idx++)
- if( ! ( linearSegmentParameters.get(idx).equals(rhs.linearSegmentParameters.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final LinearObjectStatePdu rhs = (LinearObjectStatePdu)obj;
+
+ if( ! (objectID.equals( rhs.objectID) )) ivarsEqual = false;
+ if( ! (referencedObjectID.equals( rhs.referencedObjectID) )) ivarsEqual = false;
+ if( ! (updateNumber == rhs.updateNumber)) ivarsEqual = false;
+ if( ! (forceID == rhs.forceID)) ivarsEqual = false;
+ if( ! (requesterID.equals( rhs.requesterID) )) ivarsEqual = false;
+ if( ! (receivingID.equals( rhs.receivingID) )) ivarsEqual = false;
+ if( ! (objectType.equals( rhs.objectType) )) ivarsEqual = false;
+
+ for(int idx = 0; idx < linearSegmentParameters.size(); idx++)
+ if( ! ( linearSegmentParameters.get(idx).equals(rhs.linearSegmentParameters.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" objectID: ").append(objectID).append("\n");
- sb.append(" referencedObjectID: ").append(referencedObjectID).append("\n");
- sb.append(" updateNumber: ").append(updateNumber).append("\n");
- sb.append(" forceID: ").append(forceID).append("\n");
- sb.append(" requesterID: ").append(requesterID).append("\n");
- sb.append(" receivingID: ").append(receivingID).append("\n");
- sb.append(" objectType: ").append(objectType).append("\n");
- sb.append(" linearSegmentParameters: ").append("\n");
- linearSegmentParameters.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" objectID: ").append(objectID).append("\n");
+ sb.append(" referencedObjectID: ").append(referencedObjectID).append("\n");
+ sb.append(" updateNumber: ").append(updateNumber).append("\n");
+ sb.append(" forceID: ").append(forceID).append("\n");
+ sb.append(" requesterID: ").append(requesterID).append("\n");
+ sb.append(" receivingID: ").append(receivingID).append("\n");
+ sb.append(" objectType: ").append(objectType).append("\n");
+ sb.append(" linearSegmentParameters: ").append("\n");
+ linearSegmentParameters.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LinearSegmentParameter.java b/src-generated/edu/nps/moves/dis7/LinearSegmentParameter.java
index 936381a091a3ad4e4ee0db4e31cef8669a640ae5..a94ab594ed605a69b009b4bcc05056281b747344 100644
--- a/src-generated/edu/nps/moves/dis7/LinearSegmentParameter.java
+++ b/src-generated/edu/nps/moves/dis7/LinearSegmentParameter.java
@@ -1,398 +1,398 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * The specification of an individual segment of a linear segment synthetic environment object in a Linear Object State PDU Section 6.2.52
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class LinearSegmentParameter extends Object implements Serializable
-{
- /** the individual segment of the linear segment */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * The specification of an individual segment of a linear segment synthetic environment object in a Linear Object State PDU Section 6.2.52
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class LinearSegmentParameter extends Object implements Serializable
+{
+ /** the individual segment of the linear segment */
protected byte segmentNumber;
-
- /** whether a modification has been made to the point object's location or orientation UID 241 */
+
+ /** whether a modification has been made to the point object's location or orientation UID 241 */
protected ObjectStateModificationLinearObject segmentModification = new ObjectStateModificationLinearObject();
-
- /** general dynamic appearance attributes of the segment. This record shall be defined as a 16-bit record of enumerations. The values defined for this record are included in Section 12 of SISO-REF-010. UID 229 */
+
+ /** general dynamic appearance attributes of the segment. This record shall be defined as a 16-bit record of enumerations. The values defined for this record are included in Section 12 of SISO-REF-010. UID 229 */
protected ObjectStateAppearanceGeneral generalSegmentAppearance = new ObjectStateAppearanceGeneral();
-
- /** This field shall specify specific dynamic appearance attributes of the segment. This record shall be defined as a 32-bit record of enumerations. */
+
+ /** This field shall specify specific dynamic appearance attributes of the segment. This record shall be defined as a 32-bit record of enumerations. */
protected int specificSegmentAppearance;
-
- /** This field shall specify the location of the linear segment in the simulated world and shall be represented by a World Coordinates record */
+
+ /** This field shall specify the location of the linear segment in the simulated world and shall be represented by a World Coordinates record */
protected Vector3Double segmentLocation = new Vector3Double();
-
- /** orientation of the linear segment about the segment location and shall be represented by a Euler Angles record */
+
+ /** orientation of the linear segment about the segment location and shall be represented by a Euler Angles record */
protected EulerAngles segmentOrientation = new EulerAngles();
-
- /** length of the linear segment, in meters, extending in the positive X direction */
+
+ /** length of the linear segment, in meters, extending in the positive X direction */
protected float segmentLength;
-
- /** The total width of the linear segment, in meters, shall be specified by a 16-bit unsigned integer. One-half of the width shall extend in the positive Y direction, and one-half of the width shall extend in the negative Y direction. */
+
+ /** The total width of the linear segment, in meters, shall be specified by a 16-bit unsigned integer. One-half of the width shall extend in the positive Y direction, and one-half of the width shall extend in the negative Y direction. */
protected float segmentWidth;
-
- /** The height of the linear segment, in meters, above ground shall be specified by a 16-bit unsigned integer. */
+
+ /** The height of the linear segment, in meters, above ground shall be specified by a 16-bit unsigned integer. */
protected float segmentHeight;
-
- /** The depth of the linear segment, in meters, below ground level */
+
+ /** The depth of the linear segment, in meters, below ground level */
protected float segmentDepth;
-
- /** padding */
+
+ /** padding */
protected int padding;
-
-
-/** Constructor */
- public LinearSegmentParameter()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public LinearSegmentParameter()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 1; // segmentNumber
+ marshalSize += segmentModification.getMarshalledSize();
+ marshalSize += generalSegmentAppearance.getMarshalledSize();
+ marshalSize += 4; // specificSegmentAppearance
+ marshalSize += segmentLocation.getMarshalledSize();
+ marshalSize += segmentOrientation.getMarshalledSize();
+ marshalSize += 4; // segmentLength
+ marshalSize += 4; // segmentWidth
+ marshalSize += 4; // segmentHeight
+ marshalSize += 4; // segmentDepth
+ marshalSize += 4; // padding
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link LinearSegmentParameter#segmentNumber}*/
+public LinearSegmentParameter setSegmentNumber(byte pSegmentNumber)
{
- int marshalSize = 0;
-
- marshalSize += 1; // segmentNumber
- marshalSize += segmentModification.getMarshalledSize();
- marshalSize += generalSegmentAppearance.getMarshalledSize();
- marshalSize += 4; // specificSegmentAppearance
- marshalSize += segmentLocation.getMarshalledSize();
- marshalSize += segmentOrientation.getMarshalledSize();
- marshalSize += 4; // segmentLength
- marshalSize += 4; // segmentWidth
- marshalSize += 4; // segmentHeight
- marshalSize += 4; // segmentDepth
- marshalSize += 4; // padding
-
- return marshalSize;
-}
-
-
-/** Setter for {@link LinearSegmentParameter#segmentNumber}*/
-public LinearSegmentParameter setSegmentNumber(byte pSegmentNumber)
-{
- segmentNumber = pSegmentNumber;
- return this;
-}
-
-/** Getter for {@link LinearSegmentParameter#segmentNumber}*/
-public byte getSegmentNumber()
+ segmentNumber = pSegmentNumber;
+ return this;
+}
+
+/** Getter for {@link LinearSegmentParameter#segmentNumber}*/
+public byte getSegmentNumber()
{
return segmentNumber;
-}
-
-/** Setter for {@link LinearSegmentParameter#segmentModification}*/
-public LinearSegmentParameter setSegmentModification(ObjectStateModificationLinearObject pSegmentModification)
+}
+
+/** Setter for {@link LinearSegmentParameter#segmentModification}*/
+public LinearSegmentParameter setSegmentModification(ObjectStateModificationLinearObject pSegmentModification)
{
- segmentModification = pSegmentModification;
- return this;
-}
-
-/** Setter for {@link LinearSegmentParameter#segmentModification}*/
-public ObjectStateModificationLinearObject getSegmentModification()
+ segmentModification = pSegmentModification;
+ return this;
+}
+
+/** Setter for {@link LinearSegmentParameter#segmentModification}*/
+public ObjectStateModificationLinearObject getSegmentModification()
{
return segmentModification;
-}
-
-/** Setter for {@link LinearSegmentParameter#generalSegmentAppearance}*/
-public LinearSegmentParameter setGeneralSegmentAppearance(ObjectStateAppearanceGeneral pGeneralSegmentAppearance)
+}
+
+/** Setter for {@link LinearSegmentParameter#generalSegmentAppearance}*/
+public LinearSegmentParameter setGeneralSegmentAppearance(ObjectStateAppearanceGeneral pGeneralSegmentAppearance)
{
- generalSegmentAppearance = pGeneralSegmentAppearance;
- return this;
-}
-
-/** Setter for {@link LinearSegmentParameter#generalSegmentAppearance}*/
-public ObjectStateAppearanceGeneral getGeneralSegmentAppearance()
+ generalSegmentAppearance = pGeneralSegmentAppearance;
+ return this;
+}
+
+/** Setter for {@link LinearSegmentParameter#generalSegmentAppearance}*/
+public ObjectStateAppearanceGeneral getGeneralSegmentAppearance()
{
return generalSegmentAppearance;
-}
-
-/** Setter for {@link LinearSegmentParameter#specificSegmentAppearance}*/
-public LinearSegmentParameter setSpecificSegmentAppearance(int pSpecificSegmentAppearance)
+}
+
+/** Setter for {@link LinearSegmentParameter#specificSegmentAppearance}*/
+public LinearSegmentParameter setSpecificSegmentAppearance(int pSpecificSegmentAppearance)
{
- specificSegmentAppearance = pSpecificSegmentAppearance;
- return this;
-}
-
-/** Getter for {@link LinearSegmentParameter#specificSegmentAppearance}*/
-public int getSpecificSegmentAppearance()
+ specificSegmentAppearance = pSpecificSegmentAppearance;
+ return this;
+}
+
+/** Getter for {@link LinearSegmentParameter#specificSegmentAppearance}*/
+public int getSpecificSegmentAppearance()
{
return specificSegmentAppearance;
-}
-
-/** Setter for {@link LinearSegmentParameter#segmentLocation}*/
-public LinearSegmentParameter setSegmentLocation(Vector3Double pSegmentLocation)
+}
+
+/** Setter for {@link LinearSegmentParameter#segmentLocation}*/
+public LinearSegmentParameter setSegmentLocation(Vector3Double pSegmentLocation)
{
- segmentLocation = pSegmentLocation;
- return this;
-}
-
-/** Getter for {@link LinearSegmentParameter#segmentLocation}*/
-public Vector3Double getSegmentLocation()
+ segmentLocation = pSegmentLocation;
+ return this;
+}
+
+/** Getter for {@link LinearSegmentParameter#segmentLocation}*/
+public Vector3Double getSegmentLocation()
{
return segmentLocation;
-}
-
-/** Setter for {@link LinearSegmentParameter#segmentOrientation}*/
-public LinearSegmentParameter setSegmentOrientation(EulerAngles pSegmentOrientation)
+}
+
+/** Setter for {@link LinearSegmentParameter#segmentOrientation}*/
+public LinearSegmentParameter setSegmentOrientation(EulerAngles pSegmentOrientation)
{
- segmentOrientation = pSegmentOrientation;
- return this;
-}
-
-/** Getter for {@link LinearSegmentParameter#segmentOrientation}*/
-public EulerAngles getSegmentOrientation()
+ segmentOrientation = pSegmentOrientation;
+ return this;
+}
+
+/** Getter for {@link LinearSegmentParameter#segmentOrientation}*/
+public EulerAngles getSegmentOrientation()
{
return segmentOrientation;
-}
-
-/** Setter for {@link LinearSegmentParameter#segmentLength}*/
-public LinearSegmentParameter setSegmentLength(float pSegmentLength)
+}
+
+/** Setter for {@link LinearSegmentParameter#segmentLength}*/
+public LinearSegmentParameter setSegmentLength(float pSegmentLength)
{
- segmentLength = pSegmentLength;
- return this;
-}
-
-/** Getter for {@link LinearSegmentParameter#segmentLength}*/
-public float getSegmentLength()
+ segmentLength = pSegmentLength;
+ return this;
+}
+
+/** Getter for {@link LinearSegmentParameter#segmentLength}*/
+public float getSegmentLength()
{
return segmentLength;
-}
-
-/** Setter for {@link LinearSegmentParameter#segmentWidth}*/
-public LinearSegmentParameter setSegmentWidth(float pSegmentWidth)
+}
+
+/** Setter for {@link LinearSegmentParameter#segmentWidth}*/
+public LinearSegmentParameter setSegmentWidth(float pSegmentWidth)
{
- segmentWidth = pSegmentWidth;
- return this;
-}
-
-/** Getter for {@link LinearSegmentParameter#segmentWidth}*/
-public float getSegmentWidth()
+ segmentWidth = pSegmentWidth;
+ return this;
+}
+
+/** Getter for {@link LinearSegmentParameter#segmentWidth}*/
+public float getSegmentWidth()
{
return segmentWidth;
-}
-
-/** Setter for {@link LinearSegmentParameter#segmentHeight}*/
-public LinearSegmentParameter setSegmentHeight(float pSegmentHeight)
+}
+
+/** Setter for {@link LinearSegmentParameter#segmentHeight}*/
+public LinearSegmentParameter setSegmentHeight(float pSegmentHeight)
{
- segmentHeight = pSegmentHeight;
- return this;
-}
-
-/** Getter for {@link LinearSegmentParameter#segmentHeight}*/
-public float getSegmentHeight()
+ segmentHeight = pSegmentHeight;
+ return this;
+}
+
+/** Getter for {@link LinearSegmentParameter#segmentHeight}*/
+public float getSegmentHeight()
{
return segmentHeight;
-}
-
-/** Setter for {@link LinearSegmentParameter#segmentDepth}*/
-public LinearSegmentParameter setSegmentDepth(float pSegmentDepth)
+}
+
+/** Setter for {@link LinearSegmentParameter#segmentDepth}*/
+public LinearSegmentParameter setSegmentDepth(float pSegmentDepth)
{
- segmentDepth = pSegmentDepth;
- return this;
-}
-
-/** Getter for {@link LinearSegmentParameter#segmentDepth}*/
-public float getSegmentDepth()
+ segmentDepth = pSegmentDepth;
+ return this;
+}
+
+/** Getter for {@link LinearSegmentParameter#segmentDepth}*/
+public float getSegmentDepth()
{
return segmentDepth;
-}
-
-/** Setter for {@link LinearSegmentParameter#padding}*/
-public LinearSegmentParameter setPadding(int pPadding)
+}
+
+/** Setter for {@link LinearSegmentParameter#padding}*/
+public LinearSegmentParameter setPadding(int pPadding)
{
- padding = pPadding;
- return this;
-}
-
-/** Getter for {@link LinearSegmentParameter#padding}*/
-public int getPadding()
+ padding = pPadding;
+ return this;
+}
+
+/** Getter for {@link LinearSegmentParameter#padding}*/
+public int getPadding()
{
return padding;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeByte(segmentNumber);
- segmentModification.marshal(dos);
- generalSegmentAppearance.marshal(dos);
- dos.writeInt(specificSegmentAppearance);
- segmentLocation.marshal(dos);
- segmentOrientation.marshal(dos);
- dos.writeFloat(segmentLength);
- dos.writeFloat(segmentWidth);
- dos.writeFloat(segmentHeight);
- dos.writeFloat(segmentDepth);
- dos.writeInt(padding);
+ {
+ dos.writeByte(segmentNumber);
+ segmentModification.marshal(dos);
+ generalSegmentAppearance.marshal(dos);
+ dos.writeInt(specificSegmentAppearance);
+ segmentLocation.marshal(dos);
+ segmentOrientation.marshal(dos);
+ dos.writeFloat(segmentLength);
+ dos.writeFloat(segmentWidth);
+ dos.writeFloat(segmentHeight);
+ dos.writeFloat(segmentDepth);
+ dos.writeInt(padding);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- segmentNumber = (byte)dis.readUnsignedByte();
- uPosition += 1;
- uPosition += segmentModification.unmarshal(dis);
- uPosition += generalSegmentAppearance.unmarshal(dis);
- specificSegmentAppearance = dis.readInt();
- uPosition += 4;
- uPosition += segmentLocation.unmarshal(dis);
- uPosition += segmentOrientation.unmarshal(dis);
- segmentLength = dis.readFloat();
- uPosition += 4;
- segmentWidth = dis.readFloat();
- uPosition += 4;
- segmentHeight = dis.readFloat();
- uPosition += 4;
- segmentDepth = dis.readFloat();
- uPosition += 4;
- padding = dis.readInt();
- uPosition += 4;
+ {
+ segmentNumber = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ uPosition += segmentModification.unmarshal(dis);
+ uPosition += generalSegmentAppearance.unmarshal(dis);
+ specificSegmentAppearance = dis.readInt();
+ uPosition += 4;
+ uPosition += segmentLocation.unmarshal(dis);
+ uPosition += segmentOrientation.unmarshal(dis);
+ segmentLength = dis.readFloat();
+ uPosition += 4;
+ segmentWidth = dis.readFloat();
+ uPosition += 4;
+ segmentHeight = dis.readFloat();
+ uPosition += 4;
+ segmentDepth = dis.readFloat();
+ uPosition += 4;
+ padding = dis.readInt();
+ uPosition += 4;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.put( (byte)segmentNumber);
- segmentModification.marshal(buff);
- generalSegmentAppearance.marshal(buff);
- buff.putInt( (int)specificSegmentAppearance);
- segmentLocation.marshal(buff);
- segmentOrientation.marshal(buff);
- buff.putFloat( (float)segmentLength);
- buff.putFloat( (float)segmentWidth);
- buff.putFloat( (float)segmentHeight);
- buff.putFloat( (float)segmentDepth);
- buff.putInt( (int)padding);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- segmentNumber = (byte)(buff.get() & 0xFF);
- segmentModification.unmarshal(buff);
- generalSegmentAppearance.unmarshal(buff);
- specificSegmentAppearance = buff.getInt();
- segmentLocation.unmarshal(buff);
- segmentOrientation.unmarshal(buff);
- segmentLength = buff.getFloat();
- segmentWidth = buff.getFloat();
- segmentHeight = buff.getFloat();
- segmentDepth = buff.getFloat();
- padding = buff.getInt();
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.put( (byte)segmentNumber);
+ segmentModification.marshal(buff);
+ generalSegmentAppearance.marshal(buff);
+ buff.putInt( (int)specificSegmentAppearance);
+ segmentLocation.marshal(buff);
+ segmentOrientation.marshal(buff);
+ buff.putFloat( (float)segmentLength);
+ buff.putFloat( (float)segmentWidth);
+ buff.putFloat( (float)segmentHeight);
+ buff.putFloat( (float)segmentDepth);
+ buff.putInt( (int)padding);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ segmentNumber = (byte)(buff.get() & 0xFF);
+ segmentModification.unmarshal(buff);
+ generalSegmentAppearance.unmarshal(buff);
+ specificSegmentAppearance = buff.getInt();
+ segmentLocation.unmarshal(buff);
+ segmentOrientation.unmarshal(buff);
+ segmentLength = buff.getFloat();
+ segmentWidth = buff.getFloat();
+ segmentHeight = buff.getFloat();
+ segmentDepth = buff.getFloat();
+ padding = buff.getInt();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final LinearSegmentParameter rhs = (LinearSegmentParameter)obj;
-
- if( ! (segmentNumber == rhs.segmentNumber)) ivarsEqual = false;
- if( ! (segmentModification.equals( rhs.segmentModification) )) ivarsEqual = false;
- if( ! (generalSegmentAppearance.equals( rhs.generalSegmentAppearance) )) ivarsEqual = false;
- if( ! (specificSegmentAppearance == rhs.specificSegmentAppearance)) ivarsEqual = false;
- if( ! (segmentLocation.equals( rhs.segmentLocation) )) ivarsEqual = false;
- if( ! (segmentOrientation.equals( rhs.segmentOrientation) )) ivarsEqual = false;
- if( ! (segmentLength == rhs.segmentLength)) ivarsEqual = false;
- if( ! (segmentWidth == rhs.segmentWidth)) ivarsEqual = false;
- if( ! (segmentHeight == rhs.segmentHeight)) ivarsEqual = false;
- if( ! (segmentDepth == rhs.segmentDepth)) ivarsEqual = false;
- if( ! (padding == rhs.padding)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final LinearSegmentParameter rhs = (LinearSegmentParameter)obj;
+
+ if( ! (segmentNumber == rhs.segmentNumber)) ivarsEqual = false;
+ if( ! (segmentModification.equals( rhs.segmentModification) )) ivarsEqual = false;
+ if( ! (generalSegmentAppearance.equals( rhs.generalSegmentAppearance) )) ivarsEqual = false;
+ if( ! (specificSegmentAppearance == rhs.specificSegmentAppearance)) ivarsEqual = false;
+ if( ! (segmentLocation.equals( rhs.segmentLocation) )) ivarsEqual = false;
+ if( ! (segmentOrientation.equals( rhs.segmentOrientation) )) ivarsEqual = false;
+ if( ! (segmentLength == rhs.segmentLength)) ivarsEqual = false;
+ if( ! (segmentWidth == rhs.segmentWidth)) ivarsEqual = false;
+ if( ! (segmentHeight == rhs.segmentHeight)) ivarsEqual = false;
+ if( ! (segmentDepth == rhs.segmentDepth)) ivarsEqual = false;
+ if( ! (padding == rhs.padding)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" segmentNumber: ").append(segmentNumber).append("\n");
- sb.append(" segmentModification: ").append(segmentModification).append("\n");
- sb.append(" generalSegmentAppearance: ").append(generalSegmentAppearance).append("\n");
- sb.append(" specificSegmentAppearance: ").append(specificSegmentAppearance).append("\n");
- sb.append(" segmentLocation: ").append(segmentLocation).append("\n");
- sb.append(" segmentOrientation: ").append(segmentOrientation).append("\n");
- sb.append(" segmentLength: ").append(segmentLength).append("\n");
- sb.append(" segmentWidth: ").append(segmentWidth).append("\n");
- sb.append(" segmentHeight: ").append(segmentHeight).append("\n");
- sb.append(" segmentDepth: ").append(segmentDepth).append("\n");
- sb.append(" padding: ").append(padding).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" segmentNumber: ").append(segmentNumber).append("\n");
+ sb.append(" segmentModification: ").append(segmentModification).append("\n");
+ sb.append(" generalSegmentAppearance: ").append(generalSegmentAppearance).append("\n");
+ sb.append(" specificSegmentAppearance: ").append(specificSegmentAppearance).append("\n");
+ sb.append(" segmentLocation: ").append(segmentLocation).append("\n");
+ sb.append(" segmentOrientation: ").append(segmentOrientation).append("\n");
+ sb.append(" segmentLength: ").append(segmentLength).append("\n");
+ sb.append(" segmentWidth: ").append(segmentWidth).append("\n");
+ sb.append(" segmentHeight: ").append(segmentHeight).append("\n");
+ sb.append(" segmentDepth: ").append(segmentDepth).append("\n");
+ sb.append(" padding: ").append(padding).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LiveDeadReckoningParameters.java b/src-generated/edu/nps/moves/dis7/LiveDeadReckoningParameters.java
index a9132621e50677226c3316f22564720128b0fae3..1d948457fbfd66713a71104168ece463833178db 100644
--- a/src-generated/edu/nps/moves/dis7/LiveDeadReckoningParameters.java
+++ b/src-generated/edu/nps/moves/dis7/LiveDeadReckoningParameters.java
@@ -1,206 +1,206 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 16 bit fixed binaries
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class LiveDeadReckoningParameters extends Object implements Serializable
-{
- /** uid 44 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 16 bit fixed binaries
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class LiveDeadReckoningParameters extends Object implements Serializable
+{
+ /** uid 44 */
protected DeadReckoningAlgorithm deadReckoningAlgorithm = DeadReckoningAlgorithm.values()[0];
-
+
protected LEVector3FixedByte entityLinearAcceleration = new LEVector3FixedByte();
-
+
protected LEVector3FixedByte entityAngularVelocity = new LEVector3FixedByte();
-
-
-/** Constructor */
- public LiveDeadReckoningParameters()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += deadReckoningAlgorithm.getMarshalledSize();
- marshalSize += entityLinearAcceleration.getMarshalledSize();
- marshalSize += entityAngularVelocity.getMarshalledSize();
-
- return marshalSize;
-}
-
-
-/** Setter for {@link LiveDeadReckoningParameters#deadReckoningAlgorithm}*/
-public LiveDeadReckoningParameters setDeadReckoningAlgorithm(DeadReckoningAlgorithm pDeadReckoningAlgorithm)
+
+
+/** Constructor */
+ public LiveDeadReckoningParameters()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += deadReckoningAlgorithm.getMarshalledSize();
+ marshalSize += entityLinearAcceleration.getMarshalledSize();
+ marshalSize += entityAngularVelocity.getMarshalledSize();
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link LiveDeadReckoningParameters#deadReckoningAlgorithm}*/
+public LiveDeadReckoningParameters setDeadReckoningAlgorithm(DeadReckoningAlgorithm pDeadReckoningAlgorithm)
{
- deadReckoningAlgorithm = pDeadReckoningAlgorithm;
- return this;
-}
-
-/** Getter for {@link LiveDeadReckoningParameters#deadReckoningAlgorithm}*/
-public DeadReckoningAlgorithm getDeadReckoningAlgorithm()
+ deadReckoningAlgorithm = pDeadReckoningAlgorithm;
+ return this;
+}
+
+/** Getter for {@link LiveDeadReckoningParameters#deadReckoningAlgorithm}*/
+public DeadReckoningAlgorithm getDeadReckoningAlgorithm()
{
return deadReckoningAlgorithm;
-}
-
-/** Setter for {@link LiveDeadReckoningParameters#entityLinearAcceleration}*/
-public LiveDeadReckoningParameters setEntityLinearAcceleration(LEVector3FixedByte pEntityLinearAcceleration)
+}
+
+/** Setter for {@link LiveDeadReckoningParameters#entityLinearAcceleration}*/
+public LiveDeadReckoningParameters setEntityLinearAcceleration(LEVector3FixedByte pEntityLinearAcceleration)
{
- entityLinearAcceleration = pEntityLinearAcceleration;
- return this;
-}
-
-/** Getter for {@link LiveDeadReckoningParameters#entityLinearAcceleration}*/
-public LEVector3FixedByte getEntityLinearAcceleration()
+ entityLinearAcceleration = pEntityLinearAcceleration;
+ return this;
+}
+
+/** Getter for {@link LiveDeadReckoningParameters#entityLinearAcceleration}*/
+public LEVector3FixedByte getEntityLinearAcceleration()
{
return entityLinearAcceleration;
-}
-
-/** Setter for {@link LiveDeadReckoningParameters#entityAngularVelocity}*/
-public LiveDeadReckoningParameters setEntityAngularVelocity(LEVector3FixedByte pEntityAngularVelocity)
+}
+
+/** Setter for {@link LiveDeadReckoningParameters#entityAngularVelocity}*/
+public LiveDeadReckoningParameters setEntityAngularVelocity(LEVector3FixedByte pEntityAngularVelocity)
{
- entityAngularVelocity = pEntityAngularVelocity;
- return this;
-}
-
-/** Getter for {@link LiveDeadReckoningParameters#entityAngularVelocity}*/
-public LEVector3FixedByte getEntityAngularVelocity()
+ entityAngularVelocity = pEntityAngularVelocity;
+ return this;
+}
+
+/** Getter for {@link LiveDeadReckoningParameters#entityAngularVelocity}*/
+public LEVector3FixedByte getEntityAngularVelocity()
{
return entityAngularVelocity;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- deadReckoningAlgorithm.marshal(dos);
- entityLinearAcceleration.marshal(dos);
- entityAngularVelocity.marshal(dos);
+ {
+ deadReckoningAlgorithm.marshal(dos);
+ entityLinearAcceleration.marshal(dos);
+ entityAngularVelocity.marshal(dos);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- deadReckoningAlgorithm = DeadReckoningAlgorithm.unmarshalEnum(dis);
- uPosition += deadReckoningAlgorithm.getMarshalledSize();
- uPosition += entityLinearAcceleration.unmarshal(dis);
- uPosition += entityAngularVelocity.unmarshal(dis);
+ {
+ deadReckoningAlgorithm = DeadReckoningAlgorithm.unmarshalEnum(dis);
+ uPosition += deadReckoningAlgorithm.getMarshalledSize();
+ uPosition += entityLinearAcceleration.unmarshal(dis);
+ uPosition += entityAngularVelocity.unmarshal(dis);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- deadReckoningAlgorithm.marshal(buff);
- entityLinearAcceleration.marshal(buff);
- entityAngularVelocity.marshal(buff);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- deadReckoningAlgorithm = DeadReckoningAlgorithm.unmarshalEnum(buff);
- entityLinearAcceleration.unmarshal(buff);
- entityAngularVelocity.unmarshal(buff);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ deadReckoningAlgorithm.marshal(buff);
+ entityLinearAcceleration.marshal(buff);
+ entityAngularVelocity.marshal(buff);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ deadReckoningAlgorithm = DeadReckoningAlgorithm.unmarshalEnum(buff);
+ entityLinearAcceleration.unmarshal(buff);
+ entityAngularVelocity.unmarshal(buff);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final LiveDeadReckoningParameters rhs = (LiveDeadReckoningParameters)obj;
-
- if( ! (deadReckoningAlgorithm == rhs.deadReckoningAlgorithm)) ivarsEqual = false;
- if( ! (entityLinearAcceleration.equals( rhs.entityLinearAcceleration) )) ivarsEqual = false;
- if( ! (entityAngularVelocity.equals( rhs.entityAngularVelocity) )) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final LiveDeadReckoningParameters rhs = (LiveDeadReckoningParameters)obj;
+
+ if( ! (deadReckoningAlgorithm == rhs.deadReckoningAlgorithm)) ivarsEqual = false;
+ if( ! (entityLinearAcceleration.equals( rhs.entityLinearAcceleration) )) ivarsEqual = false;
+ if( ! (entityAngularVelocity.equals( rhs.entityAngularVelocity) )) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" deadReckoningAlgorithm: ").append(deadReckoningAlgorithm).append("\n");
- sb.append(" entityLinearAcceleration: ").append(entityLinearAcceleration).append("\n");
- sb.append(" entityAngularVelocity: ").append(entityAngularVelocity).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" deadReckoningAlgorithm: ").append(deadReckoningAlgorithm).append("\n");
+ sb.append(" entityLinearAcceleration: ").append(entityLinearAcceleration).append("\n");
+ sb.append(" entityAngularVelocity: ").append(entityAngularVelocity).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityDetonationPdu.java b/src-generated/edu/nps/moves/dis7/LiveEntityDetonationPdu.java
index 3ad54a609f44f139e3a80473b083c1f95083f57e..7a154e2a9fb5c13089d660810dee384493cfc61c 100644
--- a/src-generated/edu/nps/moves/dis7/LiveEntityDetonationPdu.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityDetonationPdu.java
@@ -1,17 +1,17 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * more descriptive name for a LEDetonationPdu
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class LiveEntityDetonationPdu extends LEDetonationPdu
-{}
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * more descriptive name for a LEDetonationPdu
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class LiveEntityDetonationPdu extends LEDetonationPdu
+{}
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityFamilyPdu.java b/src-generated/edu/nps/moves/dis7/LiveEntityFamilyPdu.java
index 675d3e8740fdd3ab413217a420b1845cc9929782..6247921c8523763c37839a8119af11f6777861d5 100644
--- a/src-generated/edu/nps/moves/dis7/LiveEntityFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityFamilyPdu.java
@@ -1,140 +1,140 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public abstract class LiveEntityFamilyPdu extends LiveEntityPdu implements Serializable
-{
-
-/** Constructor */
- public LiveEntityFamilyPdu()
- {
- setProtocolFamily( DISProtocolFamily.LIVE_ENTITY_LE_INFORMATION_INTERACTION );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
-
- return marshalSize;
-}
-
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public abstract class LiveEntityFamilyPdu extends LiveEntityPdu implements Serializable
+{
+
+/** Constructor */
+ public LiveEntityFamilyPdu()
+ {
+ setProtocolFamily( DISProtocolFamily.LIVE_ENTITY_LE_INFORMATION_INTERACTION );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+
+ return marshalSize;
+}
+
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
+ {
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
+ {
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- return getMarshalledSize();
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final LiveEntityFamilyPdu rhs = (LiveEntityFamilyPdu)obj;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final LiveEntityFamilyPdu rhs = (LiveEntityFamilyPdu)obj;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
-
- return sb.toString();
- }
-} // end of class
+
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityFirePdu.java b/src-generated/edu/nps/moves/dis7/LiveEntityFirePdu.java
index 90f8d8b1c0366b965ae7bfa0bfd2088a96f5d517..3c09ea0cecc167c43e5338a9695a632af90a028d 100644
--- a/src-generated/edu/nps/moves/dis7/LiveEntityFirePdu.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityFirePdu.java
@@ -1,17 +1,17 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * more descriptive name for a LEFirePdu
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class LiveEntityFirePdu extends LEFirePdu
-{}
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * more descriptive name for a LEFirePdu
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class LiveEntityFirePdu extends LEFirePdu
+{}
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityIdentifier.java b/src-generated/edu/nps/moves/dis7/LiveEntityIdentifier.java
index e6aac2f40dd8334db6bf14b6c2337d713bf8ffbe..60f3763f2b7c2d503b13ad472318004ff86ee989 100644
--- a/src-generated/edu/nps/moves/dis7/LiveEntityIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityIdentifier.java
@@ -1,185 +1,185 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * The unique designation of each entity in an event or exercise that is contained in a Live Entity PDU. Section 6.2.54
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class LiveEntityIdentifier extends Object implements Serializable
-{
- /** Live Simulation Address record (see 6.2.54) */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * The unique designation of each entity in an event or exercise that is contained in a Live Entity PDU. Section 6.2.54
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class LiveEntityIdentifier extends Object implements Serializable
+{
+ /** Live Simulation Address record (see 6.2.54) */
protected LiveSimulationAddress liveSimulationAddress = new LiveSimulationAddress();
-
- /** Live entity number */
+
+ /** Live entity number */
protected short entityNumber;
-
-
-/** Constructor */
- public LiveEntityIdentifier()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += liveSimulationAddress.getMarshalledSize();
- marshalSize += 2; // entityNumber
-
- return marshalSize;
-}
-
-
-/** Setter for {@link LiveEntityIdentifier#liveSimulationAddress}*/
-public LiveEntityIdentifier setLiveSimulationAddress(LiveSimulationAddress pLiveSimulationAddress)
+
+
+/** Constructor */
+ public LiveEntityIdentifier()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += liveSimulationAddress.getMarshalledSize();
+ marshalSize += 2; // entityNumber
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link LiveEntityIdentifier#liveSimulationAddress}*/
+public LiveEntityIdentifier setLiveSimulationAddress(LiveSimulationAddress pLiveSimulationAddress)
{
- liveSimulationAddress = pLiveSimulationAddress;
- return this;
-}
-
-/** Getter for {@link LiveEntityIdentifier#liveSimulationAddress}*/
-public LiveSimulationAddress getLiveSimulationAddress()
+ liveSimulationAddress = pLiveSimulationAddress;
+ return this;
+}
+
+/** Getter for {@link LiveEntityIdentifier#liveSimulationAddress}*/
+public LiveSimulationAddress getLiveSimulationAddress()
{
return liveSimulationAddress;
-}
-
-/** Setter for {@link LiveEntityIdentifier#entityNumber}*/
-public LiveEntityIdentifier setEntityNumber(short pEntityNumber)
+}
+
+/** Setter for {@link LiveEntityIdentifier#entityNumber}*/
+public LiveEntityIdentifier setEntityNumber(short pEntityNumber)
{
- entityNumber = pEntityNumber;
- return this;
-}
-
-/** Getter for {@link LiveEntityIdentifier#entityNumber}*/
-public short getEntityNumber()
+ entityNumber = pEntityNumber;
+ return this;
+}
+
+/** Getter for {@link LiveEntityIdentifier#entityNumber}*/
+public short getEntityNumber()
{
return entityNumber;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- liveSimulationAddress.marshal(dos);
- dos.writeShort(entityNumber);
+ {
+ liveSimulationAddress.marshal(dos);
+ dos.writeShort(entityNumber);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- uPosition += liveSimulationAddress.unmarshal(dis);
- entityNumber = (short)dis.readUnsignedShort();
- uPosition += 2;
+ {
+ uPosition += liveSimulationAddress.unmarshal(dis);
+ entityNumber = (short)dis.readUnsignedShort();
+ uPosition += 2;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- liveSimulationAddress.marshal(buff);
- buff.putShort( (short)entityNumber);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- liveSimulationAddress.unmarshal(buff);
- entityNumber = (short)(buff.getShort() & 0xFFFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ liveSimulationAddress.marshal(buff);
+ buff.putShort( (short)entityNumber);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ liveSimulationAddress.unmarshal(buff);
+ entityNumber = (short)(buff.getShort() & 0xFFFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final LiveEntityIdentifier rhs = (LiveEntityIdentifier)obj;
-
- if( ! (liveSimulationAddress.equals( rhs.liveSimulationAddress) )) ivarsEqual = false;
- if( ! (entityNumber == rhs.entityNumber)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final LiveEntityIdentifier rhs = (LiveEntityIdentifier)obj;
+
+ if( ! (liveSimulationAddress.equals( rhs.liveSimulationAddress) )) ivarsEqual = false;
+ if( ! (entityNumber == rhs.entityNumber)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" liveSimulationAddress: ").append(liveSimulationAddress).append("\n");
- sb.append(" entityNumber: ").append(entityNumber).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" liveSimulationAddress: ").append(liveSimulationAddress).append("\n");
+ sb.append(" entityNumber: ").append(entityNumber).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityLinearVelocity.java b/src-generated/edu/nps/moves/dis7/LiveEntityLinearVelocity.java
index ec5c7ccb736d5c65162128404d4984b6016f4ac7..bd455ac989ce3a02eabbd6f308996545d55f1b90 100644
--- a/src-generated/edu/nps/moves/dis7/LiveEntityLinearVelocity.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityLinearVelocity.java
@@ -1,207 +1,207 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 16 bit fixed binaries
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class LiveEntityLinearVelocity extends Object implements Serializable
-{
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 16 bit fixed binaries
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class LiveEntityLinearVelocity extends Object implements Serializable
+{
protected short xComponent;
-
+
protected short yComponent;
-
+
protected short zComponent;
-
-
-/** Constructor */
- public LiveEntityLinearVelocity()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += 2; // xComponent
- marshalSize += 2; // yComponent
- marshalSize += 2; // zComponent
-
- return marshalSize;
-}
-
-
-/** Setter for {@link LiveEntityLinearVelocity#xComponent}*/
-public LiveEntityLinearVelocity setXComponent(short pXComponent)
+
+
+/** Constructor */
+ public LiveEntityLinearVelocity()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 2; // xComponent
+ marshalSize += 2; // yComponent
+ marshalSize += 2; // zComponent
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link LiveEntityLinearVelocity#xComponent}*/
+public LiveEntityLinearVelocity setXComponent(short pXComponent)
{
- xComponent = pXComponent;
- return this;
-}
-
-/** Getter for {@link LiveEntityLinearVelocity#xComponent}*/
-public short getXComponent()
+ xComponent = pXComponent;
+ return this;
+}
+
+/** Getter for {@link LiveEntityLinearVelocity#xComponent}*/
+public short getXComponent()
{
return xComponent;
-}
-
-/** Setter for {@link LiveEntityLinearVelocity#yComponent}*/
-public LiveEntityLinearVelocity setYComponent(short pYComponent)
+}
+
+/** Setter for {@link LiveEntityLinearVelocity#yComponent}*/
+public LiveEntityLinearVelocity setYComponent(short pYComponent)
{
- yComponent = pYComponent;
- return this;
-}
-
-/** Getter for {@link LiveEntityLinearVelocity#yComponent}*/
-public short getYComponent()
+ yComponent = pYComponent;
+ return this;
+}
+
+/** Getter for {@link LiveEntityLinearVelocity#yComponent}*/
+public short getYComponent()
{
return yComponent;
-}
-
-/** Setter for {@link LiveEntityLinearVelocity#zComponent}*/
-public LiveEntityLinearVelocity setZComponent(short pZComponent)
+}
+
+/** Setter for {@link LiveEntityLinearVelocity#zComponent}*/
+public LiveEntityLinearVelocity setZComponent(short pZComponent)
{
- zComponent = pZComponent;
- return this;
-}
-
-/** Getter for {@link LiveEntityLinearVelocity#zComponent}*/
-public short getZComponent()
+ zComponent = pZComponent;
+ return this;
+}
+
+/** Getter for {@link LiveEntityLinearVelocity#zComponent}*/
+public short getZComponent()
{
return zComponent;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeShort(xComponent);
- dos.writeShort(yComponent);
- dos.writeShort(zComponent);
+ {
+ dos.writeShort(xComponent);
+ dos.writeShort(yComponent);
+ dos.writeShort(zComponent);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- xComponent = (short)dis.readUnsignedShort();
- uPosition += 2;
- yComponent = (short)dis.readUnsignedShort();
- uPosition += 2;
- zComponent = (short)dis.readUnsignedShort();
- uPosition += 2;
+ {
+ xComponent = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ yComponent = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ zComponent = (short)dis.readUnsignedShort();
+ uPosition += 2;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putShort( (short)xComponent);
- buff.putShort( (short)yComponent);
- buff.putShort( (short)zComponent);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- xComponent = (short)(buff.getShort() & 0xFFFF);
- yComponent = (short)(buff.getShort() & 0xFFFF);
- zComponent = (short)(buff.getShort() & 0xFFFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putShort( (short)xComponent);
+ buff.putShort( (short)yComponent);
+ buff.putShort( (short)zComponent);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ xComponent = (short)(buff.getShort() & 0xFFFF);
+ yComponent = (short)(buff.getShort() & 0xFFFF);
+ zComponent = (short)(buff.getShort() & 0xFFFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final LiveEntityLinearVelocity rhs = (LiveEntityLinearVelocity)obj;
-
- if( ! (xComponent == rhs.xComponent)) ivarsEqual = false;
- if( ! (yComponent == rhs.yComponent)) ivarsEqual = false;
- if( ! (zComponent == rhs.zComponent)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final LiveEntityLinearVelocity rhs = (LiveEntityLinearVelocity)obj;
+
+ if( ! (xComponent == rhs.xComponent)) ivarsEqual = false;
+ if( ! (yComponent == rhs.yComponent)) ivarsEqual = false;
+ if( ! (zComponent == rhs.zComponent)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" xComponent: ").append(xComponent).append("\n");
- sb.append(" yComponent: ").append(yComponent).append("\n");
- sb.append(" zComponent: ").append(zComponent).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" xComponent: ").append(xComponent).append("\n");
+ sb.append(" yComponent: ").append(yComponent).append("\n");
+ sb.append(" zComponent: ").append(zComponent).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityOrientation.java b/src-generated/edu/nps/moves/dis7/LiveEntityOrientation.java
index b928c05663c18388e9d11974c11870c48060c187..4681182d95583b817a35effcf26e49b5202b7721 100644
--- a/src-generated/edu/nps/moves/dis7/LiveEntityOrientation.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityOrientation.java
@@ -1,207 +1,207 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 8 bit fixed binaries
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class LiveEntityOrientation extends Object implements Serializable
-{
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 8 bit fixed binaries
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class LiveEntityOrientation extends Object implements Serializable
+{
protected byte psi;
-
+
protected byte theta;
-
+
protected byte phi;
-
-
-/** Constructor */
- public LiveEntityOrientation()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += 1; // psi
- marshalSize += 1; // theta
- marshalSize += 1; // phi
-
- return marshalSize;
-}
-
-
-/** Setter for {@link LiveEntityOrientation#psi}*/
-public LiveEntityOrientation setPsi(byte pPsi)
+
+
+/** Constructor */
+ public LiveEntityOrientation()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 1; // psi
+ marshalSize += 1; // theta
+ marshalSize += 1; // phi
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link LiveEntityOrientation#psi}*/
+public LiveEntityOrientation setPsi(byte pPsi)
{
- psi = pPsi;
- return this;
-}
-
-/** Getter for {@link LiveEntityOrientation#psi}*/
-public byte getPsi()
+ psi = pPsi;
+ return this;
+}
+
+/** Getter for {@link LiveEntityOrientation#psi}*/
+public byte getPsi()
{
return psi;
-}
-
-/** Setter for {@link LiveEntityOrientation#theta}*/
-public LiveEntityOrientation setTheta(byte pTheta)
+}
+
+/** Setter for {@link LiveEntityOrientation#theta}*/
+public LiveEntityOrientation setTheta(byte pTheta)
{
- theta = pTheta;
- return this;
-}
-
-/** Getter for {@link LiveEntityOrientation#theta}*/
-public byte getTheta()
+ theta = pTheta;
+ return this;
+}
+
+/** Getter for {@link LiveEntityOrientation#theta}*/
+public byte getTheta()
{
return theta;
-}
-
-/** Setter for {@link LiveEntityOrientation#phi}*/
-public LiveEntityOrientation setPhi(byte pPhi)
+}
+
+/** Setter for {@link LiveEntityOrientation#phi}*/
+public LiveEntityOrientation setPhi(byte pPhi)
{
- phi = pPhi;
- return this;
-}
-
-/** Getter for {@link LiveEntityOrientation#phi}*/
-public byte getPhi()
+ phi = pPhi;
+ return this;
+}
+
+/** Getter for {@link LiveEntityOrientation#phi}*/
+public byte getPhi()
{
return phi;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeByte(psi);
- dos.writeByte(theta);
- dos.writeByte(phi);
+ {
+ dos.writeByte(psi);
+ dos.writeByte(theta);
+ dos.writeByte(phi);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- psi = (byte)dis.readUnsignedByte();
- uPosition += 1;
- theta = (byte)dis.readUnsignedByte();
- uPosition += 1;
- phi = (byte)dis.readUnsignedByte();
- uPosition += 1;
+ {
+ psi = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ theta = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ phi = (byte)dis.readUnsignedByte();
+ uPosition += 1;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.put( (byte)psi);
- buff.put( (byte)theta);
- buff.put( (byte)phi);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- psi = (byte)(buff.get() & 0xFF);
- theta = (byte)(buff.get() & 0xFF);
- phi = (byte)(buff.get() & 0xFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.put( (byte)psi);
+ buff.put( (byte)theta);
+ buff.put( (byte)phi);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ psi = (byte)(buff.get() & 0xFF);
+ theta = (byte)(buff.get() & 0xFF);
+ phi = (byte)(buff.get() & 0xFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final LiveEntityOrientation rhs = (LiveEntityOrientation)obj;
-
- if( ! (psi == rhs.psi)) ivarsEqual = false;
- if( ! (theta == rhs.theta)) ivarsEqual = false;
- if( ! (phi == rhs.phi)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final LiveEntityOrientation rhs = (LiveEntityOrientation)obj;
+
+ if( ! (psi == rhs.psi)) ivarsEqual = false;
+ if( ! (theta == rhs.theta)) ivarsEqual = false;
+ if( ! (phi == rhs.phi)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" psi: ").append(psi).append("\n");
- sb.append(" theta: ").append(theta).append("\n");
- sb.append(" phi: ").append(phi).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" psi: ").append(psi).append("\n");
+ sb.append(" theta: ").append(theta).append("\n");
+ sb.append(" phi: ").append(phi).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityOrientation16.java b/src-generated/edu/nps/moves/dis7/LiveEntityOrientation16.java
index 3f1b69d8b33ccbea5054b4bba4365819afa85e17..a1764e8797a070fec15d53ea50b3fc9c65d041f1 100644
--- a/src-generated/edu/nps/moves/dis7/LiveEntityOrientation16.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityOrientation16.java
@@ -1,207 +1,207 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 16 bit fixed binaries
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class LiveEntityOrientation16 extends Object implements Serializable
-{
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 16 bit fixed binaries
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class LiveEntityOrientation16 extends Object implements Serializable
+{
protected short psi;
-
+
protected short theta;
-
+
protected short phi;
-
-
-/** Constructor */
- public LiveEntityOrientation16()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += 2; // psi
- marshalSize += 2; // theta
- marshalSize += 2; // phi
-
- return marshalSize;
-}
-
-
-/** Setter for {@link LiveEntityOrientation16#psi}*/
-public LiveEntityOrientation16 setPsi(short pPsi)
+
+
+/** Constructor */
+ public LiveEntityOrientation16()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 2; // psi
+ marshalSize += 2; // theta
+ marshalSize += 2; // phi
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link LiveEntityOrientation16#psi}*/
+public LiveEntityOrientation16 setPsi(short pPsi)
{
- psi = pPsi;
- return this;
-}
-
-/** Getter for {@link LiveEntityOrientation16#psi}*/
-public short getPsi()
+ psi = pPsi;
+ return this;
+}
+
+/** Getter for {@link LiveEntityOrientation16#psi}*/
+public short getPsi()
{
return psi;
-}
-
-/** Setter for {@link LiveEntityOrientation16#theta}*/
-public LiveEntityOrientation16 setTheta(short pTheta)
+}
+
+/** Setter for {@link LiveEntityOrientation16#theta}*/
+public LiveEntityOrientation16 setTheta(short pTheta)
{
- theta = pTheta;
- return this;
-}
-
-/** Getter for {@link LiveEntityOrientation16#theta}*/
-public short getTheta()
+ theta = pTheta;
+ return this;
+}
+
+/** Getter for {@link LiveEntityOrientation16#theta}*/
+public short getTheta()
{
return theta;
-}
-
-/** Setter for {@link LiveEntityOrientation16#phi}*/
-public LiveEntityOrientation16 setPhi(short pPhi)
+}
+
+/** Setter for {@link LiveEntityOrientation16#phi}*/
+public LiveEntityOrientation16 setPhi(short pPhi)
{
- phi = pPhi;
- return this;
-}
-
-/** Getter for {@link LiveEntityOrientation16#phi}*/
-public short getPhi()
+ phi = pPhi;
+ return this;
+}
+
+/** Getter for {@link LiveEntityOrientation16#phi}*/
+public short getPhi()
{
return phi;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeShort(psi);
- dos.writeShort(theta);
- dos.writeShort(phi);
+ {
+ dos.writeShort(psi);
+ dos.writeShort(theta);
+ dos.writeShort(phi);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- psi = (short)dis.readUnsignedShort();
- uPosition += 2;
- theta = (short)dis.readUnsignedShort();
- uPosition += 2;
- phi = (short)dis.readUnsignedShort();
- uPosition += 2;
+ {
+ psi = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ theta = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ phi = (short)dis.readUnsignedShort();
+ uPosition += 2;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putShort( (short)psi);
- buff.putShort( (short)theta);
- buff.putShort( (short)phi);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- psi = (short)(buff.getShort() & 0xFFFF);
- theta = (short)(buff.getShort() & 0xFFFF);
- phi = (short)(buff.getShort() & 0xFFFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putShort( (short)psi);
+ buff.putShort( (short)theta);
+ buff.putShort( (short)phi);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ psi = (short)(buff.getShort() & 0xFFFF);
+ theta = (short)(buff.getShort() & 0xFFFF);
+ phi = (short)(buff.getShort() & 0xFFFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final LiveEntityOrientation16 rhs = (LiveEntityOrientation16)obj;
-
- if( ! (psi == rhs.psi)) ivarsEqual = false;
- if( ! (theta == rhs.theta)) ivarsEqual = false;
- if( ! (phi == rhs.phi)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final LiveEntityOrientation16 rhs = (LiveEntityOrientation16)obj;
+
+ if( ! (psi == rhs.psi)) ivarsEqual = false;
+ if( ! (theta == rhs.theta)) ivarsEqual = false;
+ if( ! (phi == rhs.phi)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" psi: ").append(psi).append("\n");
- sb.append(" theta: ").append(theta).append("\n");
- sb.append(" phi: ").append(phi).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" psi: ").append(psi).append("\n");
+ sb.append(" theta: ").append(theta).append("\n");
+ sb.append(" phi: ").append(phi).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityOrientationError.java b/src-generated/edu/nps/moves/dis7/LiveEntityOrientationError.java
index 6d05b2d994f6176786dd4cfcbeffc20683c6e60b..3f0e6b5007b5a100bc9b76c89d6215996d662f49 100644
--- a/src-generated/edu/nps/moves/dis7/LiveEntityOrientationError.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityOrientationError.java
@@ -1,207 +1,207 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 16 bit fixed binaries
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class LiveEntityOrientationError extends Object implements Serializable
-{
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 16 bit fixed binaries
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class LiveEntityOrientationError extends Object implements Serializable
+{
protected short azimuthError;
-
+
protected short elevationError;
-
+
protected short rotationError;
-
-
-/** Constructor */
- public LiveEntityOrientationError()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += 2; // azimuthError
- marshalSize += 2; // elevationError
- marshalSize += 2; // rotationError
-
- return marshalSize;
-}
-
-
-/** Setter for {@link LiveEntityOrientationError#azimuthError}*/
-public LiveEntityOrientationError setAzimuthError(short pAzimuthError)
+
+
+/** Constructor */
+ public LiveEntityOrientationError()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 2; // azimuthError
+ marshalSize += 2; // elevationError
+ marshalSize += 2; // rotationError
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link LiveEntityOrientationError#azimuthError}*/
+public LiveEntityOrientationError setAzimuthError(short pAzimuthError)
{
- azimuthError = pAzimuthError;
- return this;
-}
-
-/** Getter for {@link LiveEntityOrientationError#azimuthError}*/
-public short getAzimuthError()
+ azimuthError = pAzimuthError;
+ return this;
+}
+
+/** Getter for {@link LiveEntityOrientationError#azimuthError}*/
+public short getAzimuthError()
{
return azimuthError;
-}
-
-/** Setter for {@link LiveEntityOrientationError#elevationError}*/
-public LiveEntityOrientationError setElevationError(short pElevationError)
+}
+
+/** Setter for {@link LiveEntityOrientationError#elevationError}*/
+public LiveEntityOrientationError setElevationError(short pElevationError)
{
- elevationError = pElevationError;
- return this;
-}
-
-/** Getter for {@link LiveEntityOrientationError#elevationError}*/
-public short getElevationError()
+ elevationError = pElevationError;
+ return this;
+}
+
+/** Getter for {@link LiveEntityOrientationError#elevationError}*/
+public short getElevationError()
{
return elevationError;
-}
-
-/** Setter for {@link LiveEntityOrientationError#rotationError}*/
-public LiveEntityOrientationError setRotationError(short pRotationError)
+}
+
+/** Setter for {@link LiveEntityOrientationError#rotationError}*/
+public LiveEntityOrientationError setRotationError(short pRotationError)
{
- rotationError = pRotationError;
- return this;
-}
-
-/** Getter for {@link LiveEntityOrientationError#rotationError}*/
-public short getRotationError()
+ rotationError = pRotationError;
+ return this;
+}
+
+/** Getter for {@link LiveEntityOrientationError#rotationError}*/
+public short getRotationError()
{
return rotationError;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeShort(azimuthError);
- dos.writeShort(elevationError);
- dos.writeShort(rotationError);
+ {
+ dos.writeShort(azimuthError);
+ dos.writeShort(elevationError);
+ dos.writeShort(rotationError);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- azimuthError = (short)dis.readUnsignedShort();
- uPosition += 2;
- elevationError = (short)dis.readUnsignedShort();
- uPosition += 2;
- rotationError = (short)dis.readUnsignedShort();
- uPosition += 2;
+ {
+ azimuthError = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ elevationError = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ rotationError = (short)dis.readUnsignedShort();
+ uPosition += 2;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putShort( (short)azimuthError);
- buff.putShort( (short)elevationError);
- buff.putShort( (short)rotationError);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- azimuthError = (short)(buff.getShort() & 0xFFFF);
- elevationError = (short)(buff.getShort() & 0xFFFF);
- rotationError = (short)(buff.getShort() & 0xFFFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putShort( (short)azimuthError);
+ buff.putShort( (short)elevationError);
+ buff.putShort( (short)rotationError);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ azimuthError = (short)(buff.getShort() & 0xFFFF);
+ elevationError = (short)(buff.getShort() & 0xFFFF);
+ rotationError = (short)(buff.getShort() & 0xFFFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final LiveEntityOrientationError rhs = (LiveEntityOrientationError)obj;
-
- if( ! (azimuthError == rhs.azimuthError)) ivarsEqual = false;
- if( ! (elevationError == rhs.elevationError)) ivarsEqual = false;
- if( ! (rotationError == rhs.rotationError)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final LiveEntityOrientationError rhs = (LiveEntityOrientationError)obj;
+
+ if( ! (azimuthError == rhs.azimuthError)) ivarsEqual = false;
+ if( ! (elevationError == rhs.elevationError)) ivarsEqual = false;
+ if( ! (rotationError == rhs.rotationError)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" azimuthError: ").append(azimuthError).append("\n");
- sb.append(" elevationError: ").append(elevationError).append("\n");
- sb.append(" rotationError: ").append(rotationError).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" azimuthError: ").append(azimuthError).append("\n");
+ sb.append(" elevationError: ").append(elevationError).append("\n");
+ sb.append(" rotationError: ").append(rotationError).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityPdu.java b/src-generated/edu/nps/moves/dis7/LiveEntityPdu.java
index e1ca309b4e53d01dab43650ef53b91455257c138..25cca0201a23805c77b90486f225274c2415d77f 100644
--- a/src-generated/edu/nps/moves/dis7/LiveEntityPdu.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityPdu.java
@@ -1,188 +1,188 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * The live entity PDUs have a slightly different header
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public abstract class LiveEntityPdu extends Pdu implements Serializable
-{
- /** Subprotocol used to decode the PDU. Section 13 of EBV. uid 417 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * The live entity PDUs have a slightly different header
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public abstract class LiveEntityPdu extends Pdu implements Serializable
+{
+ /** Subprotocol used to decode the PDU. Section 13 of EBV. uid 417 */
protected DISLiveEntitySubprotocolNumber subprotocolNumber = DISLiveEntitySubprotocolNumber.values()[0];
-
- /** zero-filled array of padding */
+
+ /** zero-filled array of padding */
protected byte padding = (byte)0;
-
-
-/** Constructor */
- public LiveEntityPdu()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += subprotocolNumber.getMarshalledSize();
- marshalSize += 1; // padding
-
- return marshalSize;
-}
-
-
-/** Setter for {@link LiveEntityPdu#subprotocolNumber}*/
-public LiveEntityPdu setSubprotocolNumber(DISLiveEntitySubprotocolNumber pSubprotocolNumber)
+
+
+/** Constructor */
+ public LiveEntityPdu()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += subprotocolNumber.getMarshalledSize();
+ marshalSize += 1; // padding
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link LiveEntityPdu#subprotocolNumber}*/
+public LiveEntityPdu setSubprotocolNumber(DISLiveEntitySubprotocolNumber pSubprotocolNumber)
{
- subprotocolNumber = pSubprotocolNumber;
- return this;
-}
-
-/** Getter for {@link LiveEntityPdu#subprotocolNumber}*/
-public DISLiveEntitySubprotocolNumber getSubprotocolNumber()
+ subprotocolNumber = pSubprotocolNumber;
+ return this;
+}
+
+/** Getter for {@link LiveEntityPdu#subprotocolNumber}*/
+public DISLiveEntitySubprotocolNumber getSubprotocolNumber()
{
return subprotocolNumber;
-}
-
-/** Setter for {@link LiveEntityPdu#padding}*/
-public LiveEntityPdu setPadding(byte pPadding)
+}
+
+/** Setter for {@link LiveEntityPdu#padding}*/
+public LiveEntityPdu setPadding(byte pPadding)
{
- padding = pPadding;
- return this;
-}
-
-/** Getter for {@link LiveEntityPdu#padding}*/
-public byte getPadding()
+ padding = pPadding;
+ return this;
+}
+
+/** Getter for {@link LiveEntityPdu#padding}*/
+public byte getPadding()
{
return padding;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- subprotocolNumber.marshal(dos);
- dos.writeByte(padding);
+ {
+ subprotocolNumber.marshal(dos);
+ dos.writeByte(padding);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- subprotocolNumber = DISLiveEntitySubprotocolNumber.unmarshalEnum(dis);
- uPosition += subprotocolNumber.getMarshalledSize();
- padding = (byte)dis.readUnsignedByte();
- uPosition += 1;
+ {
+ subprotocolNumber = DISLiveEntitySubprotocolNumber.unmarshalEnum(dis);
+ uPosition += subprotocolNumber.getMarshalledSize();
+ padding = (byte)dis.readUnsignedByte();
+ uPosition += 1;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- subprotocolNumber.marshal(buff);
- buff.put( (byte)padding);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ subprotocolNumber.marshal(buff);
+ buff.put( (byte)padding);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- subprotocolNumber = DISLiveEntitySubprotocolNumber.unmarshalEnum(buff);
- padding = (byte)(buff.get() & 0xFF);
- return getMarshalledSize();
+
+ subprotocolNumber = DISLiveEntitySubprotocolNumber.unmarshalEnum(buff);
+ padding = (byte)(buff.get() & 0xFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final LiveEntityPdu rhs = (LiveEntityPdu)obj;
-
- if( ! (subprotocolNumber == rhs.subprotocolNumber)) ivarsEqual = false;
- if( ! (padding == rhs.padding)) ivarsEqual = false;
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final LiveEntityPdu rhs = (LiveEntityPdu)obj;
+
+ if( ! (subprotocolNumber == rhs.subprotocolNumber)) ivarsEqual = false;
+ if( ! (padding == rhs.padding)) ivarsEqual = false;
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" subprotocolNumber: ").append(subprotocolNumber).append("\n");
- sb.append(" padding: ").append(padding).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" subprotocolNumber: ").append(subprotocolNumber).append("\n");
+ sb.append(" padding: ").append(padding).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityPositionError.java b/src-generated/edu/nps/moves/dis7/LiveEntityPositionError.java
index 5184cf3395bb495abe82f5027cd215f5d0687cec..993317d5aa5c238ba03058505677f0dc2eaeec26 100644
--- a/src-generated/edu/nps/moves/dis7/LiveEntityPositionError.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityPositionError.java
@@ -1,184 +1,184 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 16 bit fixed binaries
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class LiveEntityPositionError extends Object implements Serializable
-{
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 16 bit fixed binaries
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class LiveEntityPositionError extends Object implements Serializable
+{
protected short horizontalError;
-
+
protected short verticalError;
-
-
-/** Constructor */
- public LiveEntityPositionError()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += 2; // horizontalError
- marshalSize += 2; // verticalError
-
- return marshalSize;
-}
-
-
-/** Setter for {@link LiveEntityPositionError#horizontalError}*/
-public LiveEntityPositionError setHorizontalError(short pHorizontalError)
+
+
+/** Constructor */
+ public LiveEntityPositionError()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 2; // horizontalError
+ marshalSize += 2; // verticalError
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link LiveEntityPositionError#horizontalError}*/
+public LiveEntityPositionError setHorizontalError(short pHorizontalError)
{
- horizontalError = pHorizontalError;
- return this;
-}
-
-/** Getter for {@link LiveEntityPositionError#horizontalError}*/
-public short getHorizontalError()
+ horizontalError = pHorizontalError;
+ return this;
+}
+
+/** Getter for {@link LiveEntityPositionError#horizontalError}*/
+public short getHorizontalError()
{
return horizontalError;
-}
-
-/** Setter for {@link LiveEntityPositionError#verticalError}*/
-public LiveEntityPositionError setVerticalError(short pVerticalError)
+}
+
+/** Setter for {@link LiveEntityPositionError#verticalError}*/
+public LiveEntityPositionError setVerticalError(short pVerticalError)
{
- verticalError = pVerticalError;
- return this;
-}
-
-/** Getter for {@link LiveEntityPositionError#verticalError}*/
-public short getVerticalError()
+ verticalError = pVerticalError;
+ return this;
+}
+
+/** Getter for {@link LiveEntityPositionError#verticalError}*/
+public short getVerticalError()
{
return verticalError;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeShort(horizontalError);
- dos.writeShort(verticalError);
+ {
+ dos.writeShort(horizontalError);
+ dos.writeShort(verticalError);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- horizontalError = (short)dis.readUnsignedShort();
- uPosition += 2;
- verticalError = (short)dis.readUnsignedShort();
- uPosition += 2;
+ {
+ horizontalError = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ verticalError = (short)dis.readUnsignedShort();
+ uPosition += 2;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putShort( (short)horizontalError);
- buff.putShort( (short)verticalError);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- horizontalError = (short)(buff.getShort() & 0xFFFF);
- verticalError = (short)(buff.getShort() & 0xFFFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putShort( (short)horizontalError);
+ buff.putShort( (short)verticalError);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ horizontalError = (short)(buff.getShort() & 0xFFFF);
+ verticalError = (short)(buff.getShort() & 0xFFFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final LiveEntityPositionError rhs = (LiveEntityPositionError)obj;
-
- if( ! (horizontalError == rhs.horizontalError)) ivarsEqual = false;
- if( ! (verticalError == rhs.verticalError)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final LiveEntityPositionError rhs = (LiveEntityPositionError)obj;
+
+ if( ! (horizontalError == rhs.horizontalError)) ivarsEqual = false;
+ if( ! (verticalError == rhs.verticalError)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" horizontalError: ").append(horizontalError).append("\n");
- sb.append(" verticalError: ").append(verticalError).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" horizontalError: ").append(horizontalError).append("\n");
+ sb.append(" verticalError: ").append(verticalError).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityRelativeWorldCoordinates.java b/src-generated/edu/nps/moves/dis7/LiveEntityRelativeWorldCoordinates.java
index d1c260598b1ee5f30c6551b368191a01e63eb65e..9fcc89dbbbcaa1e0eb3fbe62165837f64ca87c19 100644
--- a/src-generated/edu/nps/moves/dis7/LiveEntityRelativeWorldCoordinates.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityRelativeWorldCoordinates.java
@@ -1,230 +1,230 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 16 bit fixed binaries
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class LiveEntityRelativeWorldCoordinates extends Object implements Serializable
-{
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 16 bit fixed binaries
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class LiveEntityRelativeWorldCoordinates extends Object implements Serializable
+{
protected short referencePoint;
-
+
protected short deltaX;
-
+
protected short deltaY;
-
+
protected short deltaZ;
-
-
-/** Constructor */
- public LiveEntityRelativeWorldCoordinates()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public LiveEntityRelativeWorldCoordinates()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 2; // referencePoint
+ marshalSize += 2; // deltaX
+ marshalSize += 2; // deltaY
+ marshalSize += 2; // deltaZ
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link LiveEntityRelativeWorldCoordinates#referencePoint}*/
+public LiveEntityRelativeWorldCoordinates setReferencePoint(short pReferencePoint)
{
- int marshalSize = 0;
-
- marshalSize += 2; // referencePoint
- marshalSize += 2; // deltaX
- marshalSize += 2; // deltaY
- marshalSize += 2; // deltaZ
-
- return marshalSize;
-}
-
-
-/** Setter for {@link LiveEntityRelativeWorldCoordinates#referencePoint}*/
-public LiveEntityRelativeWorldCoordinates setReferencePoint(short pReferencePoint)
-{
- referencePoint = pReferencePoint;
- return this;
-}
-
-/** Getter for {@link LiveEntityRelativeWorldCoordinates#referencePoint}*/
-public short getReferencePoint()
+ referencePoint = pReferencePoint;
+ return this;
+}
+
+/** Getter for {@link LiveEntityRelativeWorldCoordinates#referencePoint}*/
+public short getReferencePoint()
{
return referencePoint;
-}
-
-/** Setter for {@link LiveEntityRelativeWorldCoordinates#deltaX}*/
-public LiveEntityRelativeWorldCoordinates setDeltaX(short pDeltaX)
+}
+
+/** Setter for {@link LiveEntityRelativeWorldCoordinates#deltaX}*/
+public LiveEntityRelativeWorldCoordinates setDeltaX(short pDeltaX)
{
- deltaX = pDeltaX;
- return this;
-}
-
-/** Getter for {@link LiveEntityRelativeWorldCoordinates#deltaX}*/
-public short getDeltaX()
+ deltaX = pDeltaX;
+ return this;
+}
+
+/** Getter for {@link LiveEntityRelativeWorldCoordinates#deltaX}*/
+public short getDeltaX()
{
return deltaX;
-}
-
-/** Setter for {@link LiveEntityRelativeWorldCoordinates#deltaY}*/
-public LiveEntityRelativeWorldCoordinates setDeltaY(short pDeltaY)
+}
+
+/** Setter for {@link LiveEntityRelativeWorldCoordinates#deltaY}*/
+public LiveEntityRelativeWorldCoordinates setDeltaY(short pDeltaY)
{
- deltaY = pDeltaY;
- return this;
-}
-
-/** Getter for {@link LiveEntityRelativeWorldCoordinates#deltaY}*/
-public short getDeltaY()
+ deltaY = pDeltaY;
+ return this;
+}
+
+/** Getter for {@link LiveEntityRelativeWorldCoordinates#deltaY}*/
+public short getDeltaY()
{
return deltaY;
-}
-
-/** Setter for {@link LiveEntityRelativeWorldCoordinates#deltaZ}*/
-public LiveEntityRelativeWorldCoordinates setDeltaZ(short pDeltaZ)
+}
+
+/** Setter for {@link LiveEntityRelativeWorldCoordinates#deltaZ}*/
+public LiveEntityRelativeWorldCoordinates setDeltaZ(short pDeltaZ)
{
- deltaZ = pDeltaZ;
- return this;
-}
-
-/** Getter for {@link LiveEntityRelativeWorldCoordinates#deltaZ}*/
-public short getDeltaZ()
+ deltaZ = pDeltaZ;
+ return this;
+}
+
+/** Getter for {@link LiveEntityRelativeWorldCoordinates#deltaZ}*/
+public short getDeltaZ()
{
return deltaZ;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeShort(referencePoint);
- dos.writeShort(deltaX);
- dos.writeShort(deltaY);
- dos.writeShort(deltaZ);
+ {
+ dos.writeShort(referencePoint);
+ dos.writeShort(deltaX);
+ dos.writeShort(deltaY);
+ dos.writeShort(deltaZ);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- referencePoint = (short)dis.readUnsignedShort();
- uPosition += 2;
- deltaX = (short)dis.readUnsignedShort();
- uPosition += 2;
- deltaY = (short)dis.readUnsignedShort();
- uPosition += 2;
- deltaZ = (short)dis.readUnsignedShort();
- uPosition += 2;
+ {
+ referencePoint = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ deltaX = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ deltaY = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ deltaZ = (short)dis.readUnsignedShort();
+ uPosition += 2;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putShort( (short)referencePoint);
- buff.putShort( (short)deltaX);
- buff.putShort( (short)deltaY);
- buff.putShort( (short)deltaZ);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- referencePoint = (short)(buff.getShort() & 0xFFFF);
- deltaX = (short)(buff.getShort() & 0xFFFF);
- deltaY = (short)(buff.getShort() & 0xFFFF);
- deltaZ = (short)(buff.getShort() & 0xFFFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putShort( (short)referencePoint);
+ buff.putShort( (short)deltaX);
+ buff.putShort( (short)deltaY);
+ buff.putShort( (short)deltaZ);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ referencePoint = (short)(buff.getShort() & 0xFFFF);
+ deltaX = (short)(buff.getShort() & 0xFFFF);
+ deltaY = (short)(buff.getShort() & 0xFFFF);
+ deltaZ = (short)(buff.getShort() & 0xFFFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final LiveEntityRelativeWorldCoordinates rhs = (LiveEntityRelativeWorldCoordinates)obj;
-
- if( ! (referencePoint == rhs.referencePoint)) ivarsEqual = false;
- if( ! (deltaX == rhs.deltaX)) ivarsEqual = false;
- if( ! (deltaY == rhs.deltaY)) ivarsEqual = false;
- if( ! (deltaZ == rhs.deltaZ)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final LiveEntityRelativeWorldCoordinates rhs = (LiveEntityRelativeWorldCoordinates)obj;
+
+ if( ! (referencePoint == rhs.referencePoint)) ivarsEqual = false;
+ if( ! (deltaX == rhs.deltaX)) ivarsEqual = false;
+ if( ! (deltaY == rhs.deltaY)) ivarsEqual = false;
+ if( ! (deltaZ == rhs.deltaZ)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" referencePoint: ").append(referencePoint).append("\n");
- sb.append(" deltaX: ").append(deltaX).append("\n");
- sb.append(" deltaY: ").append(deltaY).append("\n");
- sb.append(" deltaZ: ").append(deltaZ).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" referencePoint: ").append(referencePoint).append("\n");
+ sb.append(" deltaX: ").append(deltaX).append("\n");
+ sb.append(" deltaY: ").append(deltaY).append("\n");
+ sb.append(" deltaZ: ").append(deltaZ).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LiveSimulationAddress.java b/src-generated/edu/nps/moves/dis7/LiveSimulationAddress.java
index 87849104c8cf262907f8c19eecb9ed6bda2047ec..1610247037fa640c4dd973c1ed8210e2bab2af70 100644
--- a/src-generated/edu/nps/moves/dis7/LiveSimulationAddress.java
+++ b/src-generated/edu/nps/moves/dis7/LiveSimulationAddress.java
@@ -1,186 +1,186 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * A simulation's designation associated with all Live Entity IDs contained in Live Entity PDUs. Section 6.2.55
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class LiveSimulationAddress extends Object implements Serializable
-{
- /** facility, installation, organizational unit or geographic location may have multiple sites associated with it. The Site Number is the first component of the Live Simulation Address, which defines a live simulation. */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * A simulation's designation associated with all Live Entity IDs contained in Live Entity PDUs. Section 6.2.55
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class LiveSimulationAddress extends Object implements Serializable
+{
+ /** facility, installation, organizational unit or geographic location may have multiple sites associated with it. The Site Number is the first component of the Live Simulation Address, which defines a live simulation. */
protected byte liveSiteNumber;
-
- /** An application associated with a live site is termed a live application. Each live application participating in an event */
+
+ /** An application associated with a live site is termed a live application. Each live application participating in an event */
protected byte liveApplicationNumber;
-
-
-/** Constructor */
- public LiveSimulationAddress()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += 1; // liveSiteNumber
- marshalSize += 1; // liveApplicationNumber
-
- return marshalSize;
-}
-
-
-/** Setter for {@link LiveSimulationAddress#liveSiteNumber}*/
-public LiveSimulationAddress setLiveSiteNumber(byte pLiveSiteNumber)
+
+
+/** Constructor */
+ public LiveSimulationAddress()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 1; // liveSiteNumber
+ marshalSize += 1; // liveApplicationNumber
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link LiveSimulationAddress#liveSiteNumber}*/
+public LiveSimulationAddress setLiveSiteNumber(byte pLiveSiteNumber)
{
- liveSiteNumber = pLiveSiteNumber;
- return this;
-}
-
-/** Getter for {@link LiveSimulationAddress#liveSiteNumber}*/
-public byte getLiveSiteNumber()
+ liveSiteNumber = pLiveSiteNumber;
+ return this;
+}
+
+/** Getter for {@link LiveSimulationAddress#liveSiteNumber}*/
+public byte getLiveSiteNumber()
{
return liveSiteNumber;
-}
-
-/** Setter for {@link LiveSimulationAddress#liveApplicationNumber}*/
-public LiveSimulationAddress setLiveApplicationNumber(byte pLiveApplicationNumber)
+}
+
+/** Setter for {@link LiveSimulationAddress#liveApplicationNumber}*/
+public LiveSimulationAddress setLiveApplicationNumber(byte pLiveApplicationNumber)
{
- liveApplicationNumber = pLiveApplicationNumber;
- return this;
-}
-
-/** Getter for {@link LiveSimulationAddress#liveApplicationNumber}*/
-public byte getLiveApplicationNumber()
+ liveApplicationNumber = pLiveApplicationNumber;
+ return this;
+}
+
+/** Getter for {@link LiveSimulationAddress#liveApplicationNumber}*/
+public byte getLiveApplicationNumber()
{
return liveApplicationNumber;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeByte(liveSiteNumber);
- dos.writeByte(liveApplicationNumber);
+ {
+ dos.writeByte(liveSiteNumber);
+ dos.writeByte(liveApplicationNumber);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- liveSiteNumber = (byte)dis.readUnsignedByte();
- uPosition += 1;
- liveApplicationNumber = (byte)dis.readUnsignedByte();
- uPosition += 1;
+ {
+ liveSiteNumber = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ liveApplicationNumber = (byte)dis.readUnsignedByte();
+ uPosition += 1;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.put( (byte)liveSiteNumber);
- buff.put( (byte)liveApplicationNumber);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- liveSiteNumber = (byte)(buff.get() & 0xFF);
- liveApplicationNumber = (byte)(buff.get() & 0xFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.put( (byte)liveSiteNumber);
+ buff.put( (byte)liveApplicationNumber);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ liveSiteNumber = (byte)(buff.get() & 0xFF);
+ liveApplicationNumber = (byte)(buff.get() & 0xFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final LiveSimulationAddress rhs = (LiveSimulationAddress)obj;
-
- if( ! (liveSiteNumber == rhs.liveSiteNumber)) ivarsEqual = false;
- if( ! (liveApplicationNumber == rhs.liveApplicationNumber)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final LiveSimulationAddress rhs = (LiveSimulationAddress)obj;
+
+ if( ! (liveSiteNumber == rhs.liveSiteNumber)) ivarsEqual = false;
+ if( ! (liveApplicationNumber == rhs.liveApplicationNumber)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" liveSiteNumber: ").append(liveSiteNumber).append("\n");
- sb.append(" liveApplicationNumber: ").append(liveApplicationNumber).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" liveSiteNumber: ").append(liveSiteNumber).append("\n");
+ sb.append(" liveApplicationNumber: ").append(liveApplicationNumber).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/LogisticsFamilyPdu.java b/src-generated/edu/nps/moves/dis7/LogisticsFamilyPdu.java
index a673eb7ecab4d77ac86e619ebe91fe9772e88530..a340fe88bfb2d4f0f64dc5cca202dbc37deddd5d 100644
--- a/src-generated/edu/nps/moves/dis7/LogisticsFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/LogisticsFamilyPdu.java
@@ -1,141 +1,141 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Abstract superclass for logistics PDUs. Section 7.4
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public abstract class LogisticsFamilyPdu extends PduBase implements Serializable
-{
-
-/** Constructor */
- public LogisticsFamilyPdu()
- {
- setProtocolFamily( DISProtocolFamily.LOGISTICS );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
-
- return marshalSize;
-}
-
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Abstract superclass for logistics PDUs. Section 7.4
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public abstract class LogisticsFamilyPdu extends PduBase implements Serializable
+{
+
+/** Constructor */
+ public LogisticsFamilyPdu()
+ {
+ setProtocolFamily( DISProtocolFamily.LOGISTICS );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+
+ return marshalSize;
+}
+
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
+ {
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
+ {
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- return getMarshalledSize();
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final LogisticsFamilyPdu rhs = (LogisticsFamilyPdu)obj;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final LogisticsFamilyPdu rhs = (LogisticsFamilyPdu)obj;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
-
- return sb.toString();
- }
-} // end of class
+
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/MineEmplacementTime.java b/src-generated/edu/nps/moves/dis7/MineEmplacementTime.java
index eb18094d0c1eef1fa85b5824163282ae79bbe6d7..c933bba40e5eb117fdcfb2e5f23000baaab0ea6d 100644
--- a/src-generated/edu/nps/moves/dis7/MineEmplacementTime.java
+++ b/src-generated/edu/nps/moves/dis7/MineEmplacementTime.java
@@ -1,183 +1,183 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class MineEmplacementTime extends Object implements Serializable
-{
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class MineEmplacementTime extends Object implements Serializable
+{
protected int hour;
-
+
protected int timePastTheHour;
-
-
-/** Constructor */
- public MineEmplacementTime()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += 4; // hour
- marshalSize += 4; // timePastTheHour
-
- return marshalSize;
-}
-
-
-/** Setter for {@link MineEmplacementTime#hour}*/
-public MineEmplacementTime setHour(int pHour)
+
+
+/** Constructor */
+ public MineEmplacementTime()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 4; // hour
+ marshalSize += 4; // timePastTheHour
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link MineEmplacementTime#hour}*/
+public MineEmplacementTime setHour(int pHour)
{
- hour = pHour;
- return this;
-}
-
-/** Getter for {@link MineEmplacementTime#hour}*/
-public int getHour()
+ hour = pHour;
+ return this;
+}
+
+/** Getter for {@link MineEmplacementTime#hour}*/
+public int getHour()
{
return hour;
-}
-
-/** Setter for {@link MineEmplacementTime#timePastTheHour}*/
-public MineEmplacementTime setTimePastTheHour(int pTimePastTheHour)
+}
+
+/** Setter for {@link MineEmplacementTime#timePastTheHour}*/
+public MineEmplacementTime setTimePastTheHour(int pTimePastTheHour)
{
- timePastTheHour = pTimePastTheHour;
- return this;
-}
-
-/** Getter for {@link MineEmplacementTime#timePastTheHour}*/
-public int getTimePastTheHour()
+ timePastTheHour = pTimePastTheHour;
+ return this;
+}
+
+/** Getter for {@link MineEmplacementTime#timePastTheHour}*/
+public int getTimePastTheHour()
{
return timePastTheHour;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeInt(hour);
- dos.writeInt(timePastTheHour);
+ {
+ dos.writeInt(hour);
+ dos.writeInt(timePastTheHour);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- hour = dis.readInt();
- uPosition += 4;
- timePastTheHour = dis.readInt();
- uPosition += 4;
+ {
+ hour = dis.readInt();
+ uPosition += 4;
+ timePastTheHour = dis.readInt();
+ uPosition += 4;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putInt( (int)hour);
- buff.putInt( (int)timePastTheHour);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- hour = buff.getInt();
- timePastTheHour = buff.getInt();
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putInt( (int)hour);
+ buff.putInt( (int)timePastTheHour);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ hour = buff.getInt();
+ timePastTheHour = buff.getInt();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final MineEmplacementTime rhs = (MineEmplacementTime)obj;
-
- if( ! (hour == rhs.hour)) ivarsEqual = false;
- if( ! (timePastTheHour == rhs.timePastTheHour)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final MineEmplacementTime rhs = (MineEmplacementTime)obj;
+
+ if( ! (hour == rhs.hour)) ivarsEqual = false;
+ if( ! (timePastTheHour == rhs.timePastTheHour)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" hour: ").append(hour).append("\n");
- sb.append(" timePastTheHour: ").append(timePastTheHour).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" hour: ").append(hour).append("\n");
+ sb.append(" timePastTheHour: ").append(timePastTheHour).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/MineEntityIdentifier.java b/src-generated/edu/nps/moves/dis7/MineEntityIdentifier.java
index 7d202eac6a97b3d951fd9dffdace484681d07a62..a613529b2b7b58051d6fce3484fe23df8dcad2f2 100644
--- a/src-generated/edu/nps/moves/dis7/MineEntityIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/MineEntityIdentifier.java
@@ -1,185 +1,185 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * The unique designation of a mine contained in the Minefield Data PDU. No espdus are issued for mine entities. Section 6.2.55
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class MineEntityIdentifier extends Object implements Serializable
-{
- /** */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * The unique designation of a mine contained in the Minefield Data PDU. No espdus are issued for mine entities. Section 6.2.55
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class MineEntityIdentifier extends Object implements Serializable
+{
+ /** */
protected SimulationAddress simulationAddress = new SimulationAddress();
-
- /** */
+
+ /** */
protected short mineEntityNumber;
-
-
-/** Constructor */
- public MineEntityIdentifier()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += simulationAddress.getMarshalledSize();
- marshalSize += 2; // mineEntityNumber
-
- return marshalSize;
-}
-
-
-/** Setter for {@link MineEntityIdentifier#simulationAddress}*/
-public MineEntityIdentifier setSimulationAddress(SimulationAddress pSimulationAddress)
+
+
+/** Constructor */
+ public MineEntityIdentifier()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += simulationAddress.getMarshalledSize();
+ marshalSize += 2; // mineEntityNumber
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link MineEntityIdentifier#simulationAddress}*/
+public MineEntityIdentifier setSimulationAddress(SimulationAddress pSimulationAddress)
{
- simulationAddress = pSimulationAddress;
- return this;
-}
-
-/** Getter for {@link MineEntityIdentifier#simulationAddress}*/
-public SimulationAddress getSimulationAddress()
+ simulationAddress = pSimulationAddress;
+ return this;
+}
+
+/** Getter for {@link MineEntityIdentifier#simulationAddress}*/
+public SimulationAddress getSimulationAddress()
{
return simulationAddress;
-}
-
-/** Setter for {@link MineEntityIdentifier#mineEntityNumber}*/
-public MineEntityIdentifier setMineEntityNumber(short pMineEntityNumber)
+}
+
+/** Setter for {@link MineEntityIdentifier#mineEntityNumber}*/
+public MineEntityIdentifier setMineEntityNumber(short pMineEntityNumber)
{
- mineEntityNumber = pMineEntityNumber;
- return this;
-}
-
-/** Getter for {@link MineEntityIdentifier#mineEntityNumber}*/
-public short getMineEntityNumber()
+ mineEntityNumber = pMineEntityNumber;
+ return this;
+}
+
+/** Getter for {@link MineEntityIdentifier#mineEntityNumber}*/
+public short getMineEntityNumber()
{
return mineEntityNumber;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- simulationAddress.marshal(dos);
- dos.writeShort(mineEntityNumber);
+ {
+ simulationAddress.marshal(dos);
+ dos.writeShort(mineEntityNumber);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- uPosition += simulationAddress.unmarshal(dis);
- mineEntityNumber = (short)dis.readUnsignedShort();
- uPosition += 2;
+ {
+ uPosition += simulationAddress.unmarshal(dis);
+ mineEntityNumber = (short)dis.readUnsignedShort();
+ uPosition += 2;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- simulationAddress.marshal(buff);
- buff.putShort( (short)mineEntityNumber);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- simulationAddress.unmarshal(buff);
- mineEntityNumber = (short)(buff.getShort() & 0xFFFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ simulationAddress.marshal(buff);
+ buff.putShort( (short)mineEntityNumber);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ simulationAddress.unmarshal(buff);
+ mineEntityNumber = (short)(buff.getShort() & 0xFFFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final MineEntityIdentifier rhs = (MineEntityIdentifier)obj;
-
- if( ! (simulationAddress.equals( rhs.simulationAddress) )) ivarsEqual = false;
- if( ! (mineEntityNumber == rhs.mineEntityNumber)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final MineEntityIdentifier rhs = (MineEntityIdentifier)obj;
+
+ if( ! (simulationAddress.equals( rhs.simulationAddress) )) ivarsEqual = false;
+ if( ! (mineEntityNumber == rhs.mineEntityNumber)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
- sb.append(" mineEntityNumber: ").append(mineEntityNumber).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
+ sb.append(" mineEntityNumber: ").append(mineEntityNumber).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/MinefieldDataPdu.java b/src-generated/edu/nps/moves/dis7/MinefieldDataPdu.java
index d4f757fd1b0375fd4246c7b4a5aaf7a81ca56594..ceafd81703c3f9635c8a06278cb1e166c85650b1 100644
--- a/src-generated/edu/nps/moves/dis7/MinefieldDataPdu.java
+++ b/src-generated/edu/nps/moves/dis7/MinefieldDataPdu.java
@@ -1,1059 +1,1059 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.10.4 Information about the location and status of a collection of mines in a minefield is conveyed through the Minefield Data PDU on an individual mine basis.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class MinefieldDataPdu extends MinefieldFamilyPdu implements Serializable
-{
- /** Minefield ID */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 5.10.4 Information about the location and status of a collection of mines in a minefield is conveyed through the Minefield Data PDU on an individual mine basis.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class MinefieldDataPdu extends MinefieldFamilyPdu implements Serializable
+{
+ /** Minefield ID */
protected MinefieldIdentifier minefieldID = new MinefieldIdentifier();
-
- /** ID of entity making request */
+
+ /** ID of entity making request */
protected SimulationIdentifier requestingEntityID = new SimulationIdentifier();
-
- /** Minefield sequence number */
+
+ /** Minefield sequence number */
protected short minefieldSequenceNumbeer;
-
- /** request ID */
+
+ /** request ID */
protected byte requestID;
-
- /** pdu sequence number */
+
+ /** pdu sequence number */
protected byte pduSequenceNumber;
-
- /** number of pdus in response */
+
+ /** number of pdus in response */
protected byte numberOfPdus;
-
- /** how many mines are in this PDU */
+
+ /** how many mines are in this PDU */
protected byte numberOfMinesInThisPdu;
-
- /** how many sensor type are in this PDU */
+
+ /** how many sensor type are in this PDU */
protected byte numberOfSensorTypes;
-
- /** padding */
+
+ /** padding */
protected byte padding = (byte)0;
-
- /** 32 boolean field */
+
+ /** 32 boolean field */
protected DataFilterRecord dataFilter = new DataFilterRecord();
-
- /** Mine type */
+
+ /** Mine type */
protected EntityType mineType = new EntityType();
-
- /** Sensor types, each 16 bits long */
+
+ /** Sensor types, each 16 bits long */
protected List< MinefieldSensorType > sensorTypes = new ArrayList< MinefieldSensorType >();
-
+
private byte[] padTo32 = new byte[0]; // pad to 32-bit boundary
-
- /** Mine locations */
+
+ /** Mine locations */
protected List< Vector3Float > mineLocation = new ArrayList< Vector3Float >();
-
+
protected float[] groundBurialDepthOffset = new float[0];
-
+
protected float[] waterBurialDepthOffset = new float[0];
-
+
protected float[] snowBurialDepthOffset = new float[0];
-
+
protected List< EulerAngles > mineOrientation = new ArrayList< EulerAngles >();
-
+
protected float[] thermalContrast = new float[0];
-
+
protected float[] reflectance = new float[0];
-
+
protected List< MineEmplacementTime > mineEmplacementTime = new ArrayList< MineEmplacementTime >();
-
+
protected short[] mineEntityNumber = new short[0];
-
- /** uid 192 */
+
+ /** uid 192 */
protected List< MinefieldDataFusing > fusing = new ArrayList< MinefieldDataFusing >();
-
+
protected byte[] scalarDetectionCoefficient = new byte[0];
-
- /** uid 202 */
+
+ /** uid 202 */
protected List< MinefieldDataPaintScheme > paintScheme = new ArrayList< MinefieldDataPaintScheme >();
-
+
private byte[] padTo32_2 = new byte[0]; // pad to 32-bit boundary
-
+
protected byte[] numberOfTripDetonationWires = new byte[0];
-
+
private byte[] padTo32_3 = new byte[0]; // pad to 32-bit boundary
-
+
protected byte[] numberOfVertices = new byte[0];
-
-
-/** Constructor */
- public MinefieldDataPdu()
- {
- setPduType( DISPDUType.MINEFIELD_DATA );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public MinefieldDataPdu()
+ {
+ setPduType( DISPDUType.MINEFIELD_DATA );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += minefieldID.getMarshalledSize();
+ marshalSize += requestingEntityID.getMarshalledSize();
+ marshalSize += 2; // minefieldSequenceNumbeer
+ marshalSize += 1; // requestID
+ marshalSize += 1; // pduSequenceNumber
+ marshalSize += 1; // numberOfPdus
+ marshalSize += 1; // numberOfMinesInThisPdu
+ marshalSize += 1; // numberOfSensorTypes
+ marshalSize += 1; // padding
+ marshalSize += dataFilter.getMarshalledSize();
+ marshalSize += mineType.getMarshalledSize();
+ for(int idx=0; idx < sensorTypes.size(); idx++)
+ {
+ MinefieldSensorType listElement = sensorTypes.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+ marshalSize += padTo32.length;
+ for(int idx=0; idx < mineLocation.size(); idx++)
+ {
+ Vector3Float listElement = mineLocation.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+ marshalSize += groundBurialDepthOffset.length * 4;
+ marshalSize += waterBurialDepthOffset.length * 4;
+ marshalSize += snowBurialDepthOffset.length * 4;
+ for(int idx=0; idx < mineOrientation.size(); idx++)
+ {
+ EulerAngles listElement = mineOrientation.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+ marshalSize += thermalContrast.length * 4;
+ marshalSize += reflectance.length * 4;
+ for(int idx=0; idx < mineEmplacementTime.size(); idx++)
+ {
+ MineEmplacementTime listElement = mineEmplacementTime.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+ marshalSize += mineEntityNumber.length * 2;
+ for(int idx=0; idx < fusing.size(); idx++)
+ {
+ MinefieldDataFusing listElement = fusing.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+ marshalSize += scalarDetectionCoefficient.length * 1;
+ for(int idx=0; idx < paintScheme.size(); idx++)
+ {
+ MinefieldDataPaintScheme listElement = paintScheme.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+ marshalSize += padTo32_2.length;
+ marshalSize += numberOfTripDetonationWires.length * 1;
+ marshalSize += padTo32_3.length;
+ marshalSize += numberOfVertices.length * 1;
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link MinefieldDataPdu#minefieldID}*/
+public MinefieldDataPdu setMinefieldID(MinefieldIdentifier pMinefieldID)
{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += minefieldID.getMarshalledSize();
- marshalSize += requestingEntityID.getMarshalledSize();
- marshalSize += 2; // minefieldSequenceNumbeer
- marshalSize += 1; // requestID
- marshalSize += 1; // pduSequenceNumber
- marshalSize += 1; // numberOfPdus
- marshalSize += 1; // numberOfMinesInThisPdu
- marshalSize += 1; // numberOfSensorTypes
- marshalSize += 1; // padding
- marshalSize += dataFilter.getMarshalledSize();
- marshalSize += mineType.getMarshalledSize();
- for(int idx=0; idx < sensorTypes.size(); idx++)
- {
- MinefieldSensorType listElement = sensorTypes.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
- marshalSize += padTo32.length;
- for(int idx=0; idx < mineLocation.size(); idx++)
- {
- Vector3Float listElement = mineLocation.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
- marshalSize += groundBurialDepthOffset.length * 4;
- marshalSize += waterBurialDepthOffset.length * 4;
- marshalSize += snowBurialDepthOffset.length * 4;
- for(int idx=0; idx < mineOrientation.size(); idx++)
- {
- EulerAngles listElement = mineOrientation.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
- marshalSize += thermalContrast.length * 4;
- marshalSize += reflectance.length * 4;
- for(int idx=0; idx < mineEmplacementTime.size(); idx++)
- {
- MineEmplacementTime listElement = mineEmplacementTime.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
- marshalSize += mineEntityNumber.length * 2;
- for(int idx=0; idx < fusing.size(); idx++)
- {
- MinefieldDataFusing listElement = fusing.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
- marshalSize += scalarDetectionCoefficient.length * 1;
- for(int idx=0; idx < paintScheme.size(); idx++)
- {
- MinefieldDataPaintScheme listElement = paintScheme.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
- marshalSize += padTo32_2.length;
- marshalSize += numberOfTripDetonationWires.length * 1;
- marshalSize += padTo32_3.length;
- marshalSize += numberOfVertices.length * 1;
-
- return marshalSize;
-}
-
-
-/** Setter for {@link MinefieldDataPdu#minefieldID}*/
-public MinefieldDataPdu setMinefieldID(MinefieldIdentifier pMinefieldID)
-{
- minefieldID = pMinefieldID;
- return this;
-}
-
-/** Getter for {@link MinefieldDataPdu#minefieldID}*/
-public MinefieldIdentifier getMinefieldID()
+ minefieldID = pMinefieldID;
+ return this;
+}
+
+/** Getter for {@link MinefieldDataPdu#minefieldID}*/
+public MinefieldIdentifier getMinefieldID()
{
return minefieldID;
-}
-
-/** Setter for {@link MinefieldDataPdu#requestingEntityID}*/
-public MinefieldDataPdu setRequestingEntityID(SimulationIdentifier pRequestingEntityID)
+}
+
+/** Setter for {@link MinefieldDataPdu#requestingEntityID}*/
+public MinefieldDataPdu setRequestingEntityID(SimulationIdentifier pRequestingEntityID)
{
- requestingEntityID = pRequestingEntityID;
- return this;
-}
-
-/** Getter for {@link MinefieldDataPdu#requestingEntityID}*/
-public SimulationIdentifier getRequestingEntityID()
+ requestingEntityID = pRequestingEntityID;
+ return this;
+}
+
+/** Getter for {@link MinefieldDataPdu#requestingEntityID}*/
+public SimulationIdentifier getRequestingEntityID()
{
return requestingEntityID;
-}
-
-/** Setter for {@link MinefieldDataPdu#minefieldSequenceNumbeer}*/
-public MinefieldDataPdu setMinefieldSequenceNumbeer(short pMinefieldSequenceNumbeer)
+}
+
+/** Setter for {@link MinefieldDataPdu#minefieldSequenceNumbeer}*/
+public MinefieldDataPdu setMinefieldSequenceNumbeer(short pMinefieldSequenceNumbeer)
{
- minefieldSequenceNumbeer = pMinefieldSequenceNumbeer;
- return this;
-}
-
-/** Getter for {@link MinefieldDataPdu#minefieldSequenceNumbeer}*/
-public short getMinefieldSequenceNumbeer()
+ minefieldSequenceNumbeer = pMinefieldSequenceNumbeer;
+ return this;
+}
+
+/** Getter for {@link MinefieldDataPdu#minefieldSequenceNumbeer}*/
+public short getMinefieldSequenceNumbeer()
{
return minefieldSequenceNumbeer;
-}
-
-/** Setter for {@link MinefieldDataPdu#requestID}*/
-public MinefieldDataPdu setRequestID(byte pRequestID)
+}
+
+/** Setter for {@link MinefieldDataPdu#requestID}*/
+public MinefieldDataPdu setRequestID(byte pRequestID)
{
- requestID = pRequestID;
- return this;
-}
-
-/** Getter for {@link MinefieldDataPdu#requestID}*/
-public byte getRequestID()
+ requestID = pRequestID;
+ return this;
+}
+
+/** Getter for {@link MinefieldDataPdu#requestID}*/
+public byte getRequestID()
{
return requestID;
-}
-
-/** Setter for {@link MinefieldDataPdu#pduSequenceNumber}*/
-public MinefieldDataPdu setPduSequenceNumber(byte pPduSequenceNumber)
+}
+
+/** Setter for {@link MinefieldDataPdu#pduSequenceNumber}*/
+public MinefieldDataPdu setPduSequenceNumber(byte pPduSequenceNumber)
{
- pduSequenceNumber = pPduSequenceNumber;
- return this;
-}
-
-/** Getter for {@link MinefieldDataPdu#pduSequenceNumber}*/
-public byte getPduSequenceNumber()
+ pduSequenceNumber = pPduSequenceNumber;
+ return this;
+}
+
+/** Getter for {@link MinefieldDataPdu#pduSequenceNumber}*/
+public byte getPduSequenceNumber()
{
return pduSequenceNumber;
-}
-
-/** Setter for {@link MinefieldDataPdu#numberOfPdus}*/
-public MinefieldDataPdu setNumberOfPdus(byte pNumberOfPdus)
+}
+
+/** Setter for {@link MinefieldDataPdu#numberOfPdus}*/
+public MinefieldDataPdu setNumberOfPdus(byte pNumberOfPdus)
{
- numberOfPdus = pNumberOfPdus;
- return this;
-}
-
-/** Getter for {@link MinefieldDataPdu#numberOfPdus}*/
-public byte getNumberOfPdus()
+ numberOfPdus = pNumberOfPdus;
+ return this;
+}
+
+/** Getter for {@link MinefieldDataPdu#numberOfPdus}*/
+public byte getNumberOfPdus()
{
return numberOfPdus;
-}
-
-/** Setter for {@link MinefieldDataPdu#padding}*/
-public MinefieldDataPdu setPadding(byte pPadding)
+}
+
+/** Setter for {@link MinefieldDataPdu#padding}*/
+public MinefieldDataPdu setPadding(byte pPadding)
{
- padding = pPadding;
- return this;
-}
-
-/** Getter for {@link MinefieldDataPdu#padding}*/
-public byte getPadding()
+ padding = pPadding;
+ return this;
+}
+
+/** Getter for {@link MinefieldDataPdu#padding}*/
+public byte getPadding()
{
return padding;
-}
-
-/** Setter for {@link MinefieldDataPdu#dataFilter}*/
-public MinefieldDataPdu setDataFilter(DataFilterRecord pDataFilter)
+}
+
+/** Setter for {@link MinefieldDataPdu#dataFilter}*/
+public MinefieldDataPdu setDataFilter(DataFilterRecord pDataFilter)
{
- dataFilter = pDataFilter;
- return this;
-}
-
-/** Getter for {@link MinefieldDataPdu#dataFilter}*/
-public DataFilterRecord getDataFilter()
+ dataFilter = pDataFilter;
+ return this;
+}
+
+/** Getter for {@link MinefieldDataPdu#dataFilter}*/
+public DataFilterRecord getDataFilter()
{
return dataFilter;
-}
-
-/** Setter for {@link MinefieldDataPdu#mineType}*/
-public MinefieldDataPdu setMineType(EntityType pMineType)
+}
+
+/** Setter for {@link MinefieldDataPdu#mineType}*/
+public MinefieldDataPdu setMineType(EntityType pMineType)
{
- mineType = pMineType;
- return this;
-}
-
-/** Getter for {@link MinefieldDataPdu#mineType}*/
-public EntityType getMineType()
+ mineType = pMineType;
+ return this;
+}
+
+/** Getter for {@link MinefieldDataPdu#mineType}*/
+public EntityType getMineType()
{
return mineType;
-}
-
-/** Setter for {@link MinefieldDataPdu#sensorTypes}*/
-public MinefieldDataPdu setSensorTypes(List<MinefieldSensorType> pSensorTypes)
+}
+
+/** Setter for {@link MinefieldDataPdu#sensorTypes}*/
+public MinefieldDataPdu setSensorTypes(List<MinefieldSensorType> pSensorTypes)
{
- sensorTypes = pSensorTypes;
- return this;
-}
-
-/** Getter for {@link MinefieldDataPdu#sensorTypes}*/
-public List<MinefieldSensorType> getSensorTypes()
+ sensorTypes = pSensorTypes;
+ return this;
+}
+
+/** Getter for {@link MinefieldDataPdu#sensorTypes}*/
+public List<MinefieldSensorType> getSensorTypes()
{
return sensorTypes;
-}
-
-/** Setter for {@link MinefieldDataPdu#mineLocation}*/
-public MinefieldDataPdu setMineLocation(List<Vector3Float> pMineLocation)
+}
+
+/** Setter for {@link MinefieldDataPdu#mineLocation}*/
+public MinefieldDataPdu setMineLocation(List<Vector3Float> pMineLocation)
{
- mineLocation = pMineLocation;
- return this;
-}
-
-/** Getter for {@link MinefieldDataPdu#mineLocation}*/
-public List<Vector3Float> getMineLocation()
+ mineLocation = pMineLocation;
+ return this;
+}
+
+/** Getter for {@link MinefieldDataPdu#mineLocation}*/
+public List<Vector3Float> getMineLocation()
{
return mineLocation;
-}
-
-/** Setter for {@link MinefieldDataPdu#groundBurialDepthOffset}*/
-public MinefieldDataPdu setGroundBurialDepthOffset(float[] pGroundBurialDepthOffset)
+}
+
+/** Setter for {@link MinefieldDataPdu#groundBurialDepthOffset}*/
+public MinefieldDataPdu setGroundBurialDepthOffset(float[] pGroundBurialDepthOffset)
{
- groundBurialDepthOffset = pGroundBurialDepthOffset;
- return this;
-}
-
-/** Getter for {@link MinefieldDataPdu#groundBurialDepthOffset}*/
-public float[] getGroundBurialDepthOffset()
+ groundBurialDepthOffset = pGroundBurialDepthOffset;
+ return this;
+}
+
+/** Getter for {@link MinefieldDataPdu#groundBurialDepthOffset}*/
+public float[] getGroundBurialDepthOffset()
{
return groundBurialDepthOffset;
-}
-
-/** Setter for {@link MinefieldDataPdu#waterBurialDepthOffset}*/
-public MinefieldDataPdu setWaterBurialDepthOffset(float[] pWaterBurialDepthOffset)
+}
+
+/** Setter for {@link MinefieldDataPdu#waterBurialDepthOffset}*/
+public MinefieldDataPdu setWaterBurialDepthOffset(float[] pWaterBurialDepthOffset)
{
- waterBurialDepthOffset = pWaterBurialDepthOffset;
- return this;
-}
-
-/** Getter for {@link MinefieldDataPdu#waterBurialDepthOffset}*/
-public float[] getWaterBurialDepthOffset()
+ waterBurialDepthOffset = pWaterBurialDepthOffset;
+ return this;
+}
+
+/** Getter for {@link MinefieldDataPdu#waterBurialDepthOffset}*/
+public float[] getWaterBurialDepthOffset()
{
return waterBurialDepthOffset;
-}
-
-/** Setter for {@link MinefieldDataPdu#snowBurialDepthOffset}*/
-public MinefieldDataPdu setSnowBurialDepthOffset(float[] pSnowBurialDepthOffset)
+}
+
+/** Setter for {@link MinefieldDataPdu#snowBurialDepthOffset}*/
+public MinefieldDataPdu setSnowBurialDepthOffset(float[] pSnowBurialDepthOffset)
{
- snowBurialDepthOffset = pSnowBurialDepthOffset;
- return this;
-}
-
-/** Getter for {@link MinefieldDataPdu#snowBurialDepthOffset}*/
-public float[] getSnowBurialDepthOffset()
+ snowBurialDepthOffset = pSnowBurialDepthOffset;
+ return this;
+}
+
+/** Getter for {@link MinefieldDataPdu#snowBurialDepthOffset}*/
+public float[] getSnowBurialDepthOffset()
{
return snowBurialDepthOffset;
-}
-
-/** Setter for {@link MinefieldDataPdu#mineOrientation}*/
-public MinefieldDataPdu setMineOrientation(List<EulerAngles> pMineOrientation)
+}
+
+/** Setter for {@link MinefieldDataPdu#mineOrientation}*/
+public MinefieldDataPdu setMineOrientation(List<EulerAngles> pMineOrientation)
{
- mineOrientation = pMineOrientation;
- return this;
-}
-
-/** Getter for {@link MinefieldDataPdu#mineOrientation}*/
-public List<EulerAngles> getMineOrientation()
+ mineOrientation = pMineOrientation;
+ return this;
+}
+
+/** Getter for {@link MinefieldDataPdu#mineOrientation}*/
+public List<EulerAngles> getMineOrientation()
{
return mineOrientation;
-}
-
-/** Setter for {@link MinefieldDataPdu#thermalContrast}*/
-public MinefieldDataPdu setThermalContrast(float[] pThermalContrast)
+}
+
+/** Setter for {@link MinefieldDataPdu#thermalContrast}*/
+public MinefieldDataPdu setThermalContrast(float[] pThermalContrast)
{
- thermalContrast = pThermalContrast;
- return this;
-}
-
-/** Getter for {@link MinefieldDataPdu#thermalContrast}*/
-public float[] getThermalContrast()
+ thermalContrast = pThermalContrast;
+ return this;
+}
+
+/** Getter for {@link MinefieldDataPdu#thermalContrast}*/
+public float[] getThermalContrast()
{
return thermalContrast;
-}
-
-/** Setter for {@link MinefieldDataPdu#reflectance}*/
-public MinefieldDataPdu setReflectance(float[] pReflectance)
+}
+
+/** Setter for {@link MinefieldDataPdu#reflectance}*/
+public MinefieldDataPdu setReflectance(float[] pReflectance)
{
- reflectance = pReflectance;
- return this;
-}
-
-/** Getter for {@link MinefieldDataPdu#reflectance}*/
-public float[] getReflectance()
+ reflectance = pReflectance;
+ return this;
+}
+
+/** Getter for {@link MinefieldDataPdu#reflectance}*/
+public float[] getReflectance()
{
return reflectance;
-}
-
-/** Setter for {@link MinefieldDataPdu#mineEmplacementTime}*/
-public MinefieldDataPdu setMineEmplacementTime(List<MineEmplacementTime> pMineEmplacementTime)
+}
+
+/** Setter for {@link MinefieldDataPdu#mineEmplacementTime}*/
+public MinefieldDataPdu setMineEmplacementTime(List<MineEmplacementTime> pMineEmplacementTime)
{
- mineEmplacementTime = pMineEmplacementTime;
- return this;
-}
-
-/** Getter for {@link MinefieldDataPdu#mineEmplacementTime}*/
-public List<MineEmplacementTime> getMineEmplacementTime()
+ mineEmplacementTime = pMineEmplacementTime;
+ return this;
+}
+
+/** Getter for {@link MinefieldDataPdu#mineEmplacementTime}*/
+public List<MineEmplacementTime> getMineEmplacementTime()
{
return mineEmplacementTime;
-}
-
-/** Setter for {@link MinefieldDataPdu#mineEntityNumber}*/
-public MinefieldDataPdu setMineEntityNumber(short[] pMineEntityNumber)
+}
+
+/** Setter for {@link MinefieldDataPdu#mineEntityNumber}*/
+public MinefieldDataPdu setMineEntityNumber(short[] pMineEntityNumber)
{
- mineEntityNumber = pMineEntityNumber;
- return this;
-}
-
-/** Getter for {@link MinefieldDataPdu#mineEntityNumber}*/
-public short[] getMineEntityNumber()
+ mineEntityNumber = pMineEntityNumber;
+ return this;
+}
+
+/** Getter for {@link MinefieldDataPdu#mineEntityNumber}*/
+public short[] getMineEntityNumber()
{
return mineEntityNumber;
-}
-
-/** Setter for {@link MinefieldDataPdu#fusing}*/
-public MinefieldDataPdu setFusing(List<MinefieldDataFusing> pFusing)
+}
+
+/** Setter for {@link MinefieldDataPdu#fusing}*/
+public MinefieldDataPdu setFusing(List<MinefieldDataFusing> pFusing)
{
- fusing = pFusing;
- return this;
-}
-
-/** Getter for {@link MinefieldDataPdu#fusing}*/
-public List<MinefieldDataFusing> getFusing()
+ fusing = pFusing;
+ return this;
+}
+
+/** Getter for {@link MinefieldDataPdu#fusing}*/
+public List<MinefieldDataFusing> getFusing()
{
return fusing;
-}
-
-/** Setter for {@link MinefieldDataPdu#scalarDetectionCoefficient}*/
-public MinefieldDataPdu setScalarDetectionCoefficient(byte[] pScalarDetectionCoefficient)
+}
+
+/** Setter for {@link MinefieldDataPdu#scalarDetectionCoefficient}*/
+public MinefieldDataPdu setScalarDetectionCoefficient(byte[] pScalarDetectionCoefficient)
{
- scalarDetectionCoefficient = pScalarDetectionCoefficient;
- return this;
-}
-
-/** Getter for {@link MinefieldDataPdu#scalarDetectionCoefficient}*/
-public byte[] getScalarDetectionCoefficient()
+ scalarDetectionCoefficient = pScalarDetectionCoefficient;
+ return this;
+}
+
+/** Getter for {@link MinefieldDataPdu#scalarDetectionCoefficient}*/
+public byte[] getScalarDetectionCoefficient()
{
return scalarDetectionCoefficient;
-}
-
-/** Setter for {@link MinefieldDataPdu#paintScheme}*/
-public MinefieldDataPdu setPaintScheme(List<MinefieldDataPaintScheme> pPaintScheme)
+}
+
+/** Setter for {@link MinefieldDataPdu#paintScheme}*/
+public MinefieldDataPdu setPaintScheme(List<MinefieldDataPaintScheme> pPaintScheme)
{
- paintScheme = pPaintScheme;
- return this;
-}
-
-/** Getter for {@link MinefieldDataPdu#paintScheme}*/
-public List<MinefieldDataPaintScheme> getPaintScheme()
+ paintScheme = pPaintScheme;
+ return this;
+}
+
+/** Getter for {@link MinefieldDataPdu#paintScheme}*/
+public List<MinefieldDataPaintScheme> getPaintScheme()
{
return paintScheme;
-}
-
-/** Setter for {@link MinefieldDataPdu#numberOfTripDetonationWires}*/
-public MinefieldDataPdu setNumberOfTripDetonationWires(byte[] pNumberOfTripDetonationWires)
+}
+
+/** Setter for {@link MinefieldDataPdu#numberOfTripDetonationWires}*/
+public MinefieldDataPdu setNumberOfTripDetonationWires(byte[] pNumberOfTripDetonationWires)
{
- numberOfTripDetonationWires = pNumberOfTripDetonationWires;
- return this;
-}
-
-/** Getter for {@link MinefieldDataPdu#numberOfTripDetonationWires}*/
-public byte[] getNumberOfTripDetonationWires()
+ numberOfTripDetonationWires = pNumberOfTripDetonationWires;
+ return this;
+}
+
+/** Getter for {@link MinefieldDataPdu#numberOfTripDetonationWires}*/
+public byte[] getNumberOfTripDetonationWires()
{
return numberOfTripDetonationWires;
-}
-
-/** Setter for {@link MinefieldDataPdu#numberOfVertices}*/
-public MinefieldDataPdu setNumberOfVertices(byte[] pNumberOfVertices)
+}
+
+/** Setter for {@link MinefieldDataPdu#numberOfVertices}*/
+public MinefieldDataPdu setNumberOfVertices(byte[] pNumberOfVertices)
{
- numberOfVertices = pNumberOfVertices;
- return this;
-}
-
-/** Getter for {@link MinefieldDataPdu#numberOfVertices}*/
-public byte[] getNumberOfVertices()
+ numberOfVertices = pNumberOfVertices;
+ return this;
+}
+
+/** Getter for {@link MinefieldDataPdu#numberOfVertices}*/
+public byte[] getNumberOfVertices()
{
return numberOfVertices;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- minefieldID.marshal(dos);
- requestingEntityID.marshal(dos);
- dos.writeShort(minefieldSequenceNumbeer);
- dos.writeByte(requestID);
- dos.writeByte(pduSequenceNumber);
- dos.writeByte(numberOfPdus);
- dos.writeByte(numberOfVertices.length);
- dos.writeByte(sensorTypes.size());
- dos.writeByte(padding);
- dataFilter.marshal(dos);
- mineType.marshal(dos);
-
- for(int idx = 0; idx < sensorTypes.size(); idx++)
- {
- MinefieldSensorType aMinefieldSensorType = sensorTypes.get(idx);
- aMinefieldSensorType.marshal(dos);
- }
-
- padTo32 = new byte[Align.to32bits(dos)];
-
- for(int idx = 0; idx < mineLocation.size(); idx++)
- {
- Vector3Float aVector3Float = mineLocation.get(idx);
- aVector3Float.marshal(dos);
- }
-
-
- for(int idx = 0; idx < groundBurialDepthOffset.length; idx++)
- dos.writeFloat(groundBurialDepthOffset[idx]);
-
-
- for(int idx = 0; idx < waterBurialDepthOffset.length; idx++)
- dos.writeFloat(waterBurialDepthOffset[idx]);
-
-
- for(int idx = 0; idx < snowBurialDepthOffset.length; idx++)
- dos.writeFloat(snowBurialDepthOffset[idx]);
-
-
- for(int idx = 0; idx < mineOrientation.size(); idx++)
- {
- EulerAngles aEulerAngles = mineOrientation.get(idx);
- aEulerAngles.marshal(dos);
- }
-
-
- for(int idx = 0; idx < thermalContrast.length; idx++)
- dos.writeFloat(thermalContrast[idx]);
-
-
- for(int idx = 0; idx < reflectance.length; idx++)
- dos.writeFloat(reflectance[idx]);
-
-
- for(int idx = 0; idx < mineEmplacementTime.size(); idx++)
- {
- MineEmplacementTime aMineEmplacementTime = mineEmplacementTime.get(idx);
- aMineEmplacementTime.marshal(dos);
- }
-
-
- for(int idx = 0; idx < mineEntityNumber.length; idx++)
- dos.writeShort(mineEntityNumber[idx]);
-
-
- for(int idx = 0; idx < fusing.size(); idx++)
- {
- MinefieldDataFusing aMinefieldDataFusing = fusing.get(idx);
- aMinefieldDataFusing.marshal(dos);
- }
-
-
- for(int idx = 0; idx < scalarDetectionCoefficient.length; idx++)
- dos.writeByte(scalarDetectionCoefficient[idx]);
-
-
- for(int idx = 0; idx < paintScheme.size(); idx++)
- {
- MinefieldDataPaintScheme aMinefieldDataPaintScheme = paintScheme.get(idx);
- aMinefieldDataPaintScheme.marshal(dos);
- }
-
- padTo32_2 = new byte[Align.to32bits(dos)];
-
- for(int idx = 0; idx < numberOfTripDetonationWires.length; idx++)
- dos.writeByte(numberOfTripDetonationWires[idx]);
-
- padTo32_3 = new byte[Align.to32bits(dos)];
-
- for(int idx = 0; idx < numberOfVertices.length; idx++)
- dos.writeByte(numberOfVertices[idx]);
-
+ {
+ minefieldID.marshal(dos);
+ requestingEntityID.marshal(dos);
+ dos.writeShort(minefieldSequenceNumbeer);
+ dos.writeByte(requestID);
+ dos.writeByte(pduSequenceNumber);
+ dos.writeByte(numberOfPdus);
+ dos.writeByte(numberOfVertices.length);
+ dos.writeByte(sensorTypes.size());
+ dos.writeByte(padding);
+ dataFilter.marshal(dos);
+ mineType.marshal(dos);
+
+ for(int idx = 0; idx < sensorTypes.size(); idx++)
+ {
+ MinefieldSensorType aMinefieldSensorType = sensorTypes.get(idx);
+ aMinefieldSensorType.marshal(dos);
+ }
+
+ padTo32 = new byte[Align.to32bits(dos)];
+
+ for(int idx = 0; idx < mineLocation.size(); idx++)
+ {
+ Vector3Float aVector3Float = mineLocation.get(idx);
+ aVector3Float.marshal(dos);
+ }
+
+
+ for(int idx = 0; idx < groundBurialDepthOffset.length; idx++)
+ dos.writeFloat(groundBurialDepthOffset[idx]);
+
+
+ for(int idx = 0; idx < waterBurialDepthOffset.length; idx++)
+ dos.writeFloat(waterBurialDepthOffset[idx]);
+
+
+ for(int idx = 0; idx < snowBurialDepthOffset.length; idx++)
+ dos.writeFloat(snowBurialDepthOffset[idx]);
+
+
+ for(int idx = 0; idx < mineOrientation.size(); idx++)
+ {
+ EulerAngles aEulerAngles = mineOrientation.get(idx);
+ aEulerAngles.marshal(dos);
+ }
+
+
+ for(int idx = 0; idx < thermalContrast.length; idx++)
+ dos.writeFloat(thermalContrast[idx]);
+
+
+ for(int idx = 0; idx < reflectance.length; idx++)
+ dos.writeFloat(reflectance[idx]);
+
+
+ for(int idx = 0; idx < mineEmplacementTime.size(); idx++)
+ {
+ MineEmplacementTime aMineEmplacementTime = mineEmplacementTime.get(idx);
+ aMineEmplacementTime.marshal(dos);
+ }
+
+
+ for(int idx = 0; idx < mineEntityNumber.length; idx++)
+ dos.writeShort(mineEntityNumber[idx]);
+
+
+ for(int idx = 0; idx < fusing.size(); idx++)
+ {
+ MinefieldDataFusing aMinefieldDataFusing = fusing.get(idx);
+ aMinefieldDataFusing.marshal(dos);
+ }
+
+
+ for(int idx = 0; idx < scalarDetectionCoefficient.length; idx++)
+ dos.writeByte(scalarDetectionCoefficient[idx]);
+
+
+ for(int idx = 0; idx < paintScheme.size(); idx++)
+ {
+ MinefieldDataPaintScheme aMinefieldDataPaintScheme = paintScheme.get(idx);
+ aMinefieldDataPaintScheme.marshal(dos);
+ }
+
+ padTo32_2 = new byte[Align.to32bits(dos)];
+
+ for(int idx = 0; idx < numberOfTripDetonationWires.length; idx++)
+ dos.writeByte(numberOfTripDetonationWires[idx]);
+
+ padTo32_3 = new byte[Align.to32bits(dos)];
+
+ for(int idx = 0; idx < numberOfVertices.length; idx++)
+ dos.writeByte(numberOfVertices[idx]);
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += minefieldID.unmarshal(dis);
- uPosition += requestingEntityID.unmarshal(dis);
- minefieldSequenceNumbeer = (short)dis.readUnsignedShort();
- uPosition += 2;
- requestID = (byte)dis.readUnsignedByte();
- uPosition += 1;
- pduSequenceNumber = (byte)dis.readUnsignedByte();
- uPosition += 1;
- numberOfPdus = (byte)dis.readUnsignedByte();
- uPosition += 1;
- numberOfMinesInThisPdu = (byte)dis.readUnsignedByte();
- uPosition += 1;
- numberOfSensorTypes = (byte)dis.readUnsignedByte();
- uPosition += 1;
- padding = (byte)dis.readUnsignedByte();
- uPosition += 1;
- uPosition += dataFilter.unmarshal(dis);
- uPosition += mineType.unmarshal(dis);
- for(int idx = 0; idx < numberOfSensorTypes; idx++)
- {
- MinefieldSensorType anX = new MinefieldSensorType();
- uPosition += anX.unmarshal(dis);
- sensorTypes.add(anX);
- }
-
- padTo32 = new byte[Align.from32bits(uPosition,dis)];
- uPosition += padTo32.length;
- for(int idx = 0; idx < numberOfMinesInThisPdu; idx++)
- {
- Vector3Float anX = new Vector3Float();
- uPosition += anX.unmarshal(dis);
- mineLocation.add(anX);
- }
-
- for(int idx = 0; idx < groundBurialDepthOffset.length; idx++)
- groundBurialDepthOffset[idx] = dis.readFloat();
- uPosition += (groundBurialDepthOffset.length * 4);
- for(int idx = 0; idx < waterBurialDepthOffset.length; idx++)
- waterBurialDepthOffset[idx] = dis.readFloat();
- uPosition += (waterBurialDepthOffset.length * 4);
- for(int idx = 0; idx < snowBurialDepthOffset.length; idx++)
- snowBurialDepthOffset[idx] = dis.readFloat();
- uPosition += (snowBurialDepthOffset.length * 4);
- for(int idx = 0; idx < numberOfMinesInThisPdu; idx++)
- {
- EulerAngles anX = new EulerAngles();
- uPosition += anX.unmarshal(dis);
- mineOrientation.add(anX);
- }
-
- for(int idx = 0; idx < thermalContrast.length; idx++)
- thermalContrast[idx] = dis.readFloat();
- uPosition += (thermalContrast.length * 4);
- for(int idx = 0; idx < reflectance.length; idx++)
- reflectance[idx] = dis.readFloat();
- uPosition += (reflectance.length * 4);
- for(int idx = 0; idx < numberOfMinesInThisPdu; idx++)
- {
- MineEmplacementTime anX = new MineEmplacementTime();
- uPosition += anX.unmarshal(dis);
- mineEmplacementTime.add(anX);
- }
-
- for(int idx = 0; idx < mineEntityNumber.length; idx++)
- mineEntityNumber[idx] = dis.readShort();
- uPosition += (mineEntityNumber.length * 2);
- for(int idx = 0; idx < numberOfMinesInThisPdu; idx++)
- {
- MinefieldDataFusing anX = new MinefieldDataFusing();
- uPosition += anX.unmarshal(dis);
- fusing.add(anX);
- }
-
- for(int idx = 0; idx < scalarDetectionCoefficient.length; idx++)
- scalarDetectionCoefficient[idx] = dis.readByte();
- uPosition += (scalarDetectionCoefficient.length * 1);
- for(int idx = 0; idx < numberOfMinesInThisPdu; idx++)
- {
- MinefieldDataPaintScheme anX = new MinefieldDataPaintScheme();
- uPosition += anX.unmarshal(dis);
- paintScheme.add(anX);
- }
-
- padTo32_2 = new byte[Align.from32bits(uPosition,dis)];
- uPosition += padTo32_2.length;
- for(int idx = 0; idx < numberOfTripDetonationWires.length; idx++)
- numberOfTripDetonationWires[idx] = dis.readByte();
- uPosition += (numberOfTripDetonationWires.length * 1);
- padTo32_3 = new byte[Align.from32bits(uPosition,dis)];
- uPosition += padTo32_3.length;
- for(int idx = 0; idx < numberOfVertices.length; idx++)
- numberOfVertices[idx] = dis.readByte();
- uPosition += (numberOfVertices.length * 1);
+ {
+ uPosition += minefieldID.unmarshal(dis);
+ uPosition += requestingEntityID.unmarshal(dis);
+ minefieldSequenceNumbeer = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ requestID = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ pduSequenceNumber = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ numberOfPdus = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ numberOfMinesInThisPdu = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ numberOfSensorTypes = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ padding = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ uPosition += dataFilter.unmarshal(dis);
+ uPosition += mineType.unmarshal(dis);
+ for(int idx = 0; idx < numberOfSensorTypes; idx++)
+ {
+ MinefieldSensorType anX = new MinefieldSensorType();
+ uPosition += anX.unmarshal(dis);
+ sensorTypes.add(anX);
+ }
+
+ padTo32 = new byte[Align.from32bits(uPosition,dis)];
+ uPosition += padTo32.length;
+ for(int idx = 0; idx < numberOfMinesInThisPdu; idx++)
+ {
+ Vector3Float anX = new Vector3Float();
+ uPosition += anX.unmarshal(dis);
+ mineLocation.add(anX);
+ }
+
+ for(int idx = 0; idx < groundBurialDepthOffset.length; idx++)
+ groundBurialDepthOffset[idx] = dis.readFloat();
+ uPosition += (groundBurialDepthOffset.length * 4);
+ for(int idx = 0; idx < waterBurialDepthOffset.length; idx++)
+ waterBurialDepthOffset[idx] = dis.readFloat();
+ uPosition += (waterBurialDepthOffset.length * 4);
+ for(int idx = 0; idx < snowBurialDepthOffset.length; idx++)
+ snowBurialDepthOffset[idx] = dis.readFloat();
+ uPosition += (snowBurialDepthOffset.length * 4);
+ for(int idx = 0; idx < numberOfMinesInThisPdu; idx++)
+ {
+ EulerAngles anX = new EulerAngles();
+ uPosition += anX.unmarshal(dis);
+ mineOrientation.add(anX);
+ }
+
+ for(int idx = 0; idx < thermalContrast.length; idx++)
+ thermalContrast[idx] = dis.readFloat();
+ uPosition += (thermalContrast.length * 4);
+ for(int idx = 0; idx < reflectance.length; idx++)
+ reflectance[idx] = dis.readFloat();
+ uPosition += (reflectance.length * 4);
+ for(int idx = 0; idx < numberOfMinesInThisPdu; idx++)
+ {
+ MineEmplacementTime anX = new MineEmplacementTime();
+ uPosition += anX.unmarshal(dis);
+ mineEmplacementTime.add(anX);
+ }
+
+ for(int idx = 0; idx < mineEntityNumber.length; idx++)
+ mineEntityNumber[idx] = dis.readShort();
+ uPosition += (mineEntityNumber.length * 2);
+ for(int idx = 0; idx < numberOfMinesInThisPdu; idx++)
+ {
+ MinefieldDataFusing anX = new MinefieldDataFusing();
+ uPosition += anX.unmarshal(dis);
+ fusing.add(anX);
+ }
+
+ for(int idx = 0; idx < scalarDetectionCoefficient.length; idx++)
+ scalarDetectionCoefficient[idx] = dis.readByte();
+ uPosition += (scalarDetectionCoefficient.length * 1);
+ for(int idx = 0; idx < numberOfMinesInThisPdu; idx++)
+ {
+ MinefieldDataPaintScheme anX = new MinefieldDataPaintScheme();
+ uPosition += anX.unmarshal(dis);
+ paintScheme.add(anX);
+ }
+
+ padTo32_2 = new byte[Align.from32bits(uPosition,dis)];
+ uPosition += padTo32_2.length;
+ for(int idx = 0; idx < numberOfTripDetonationWires.length; idx++)
+ numberOfTripDetonationWires[idx] = dis.readByte();
+ uPosition += (numberOfTripDetonationWires.length * 1);
+ padTo32_3 = new byte[Align.from32bits(uPosition,dis)];
+ uPosition += padTo32_3.length;
+ for(int idx = 0; idx < numberOfVertices.length; idx++)
+ numberOfVertices[idx] = dis.readByte();
+ uPosition += (numberOfVertices.length * 1);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- minefieldID.marshal(buff);
- requestingEntityID.marshal(buff);
- buff.putShort( (short)minefieldSequenceNumbeer);
- buff.put( (byte)requestID);
- buff.put( (byte)pduSequenceNumber);
- buff.put( (byte)numberOfPdus);
- buff.put( (byte)numberOfVertices.length);
- buff.put( (byte)sensorTypes.size());
- buff.put( (byte)padding);
- dataFilter.marshal(buff);
- mineType.marshal(buff);
-
- for(int idx = 0; idx < sensorTypes.size(); idx++)
- {
- MinefieldSensorType aMinefieldSensorType = sensorTypes.get(idx);
- aMinefieldSensorType.marshal(buff);
- }
-
- padTo32 = new byte[Align.to32bits(buff)];
-
- for(int idx = 0; idx < mineLocation.size(); idx++)
- {
- Vector3Float aVector3Float = mineLocation.get(idx);
- aVector3Float.marshal(buff);
- }
-
-
- for(int idx = 0; idx < groundBurialDepthOffset.length; idx++)
- buff.putFloat((float)groundBurialDepthOffset[idx]);
-
-
- for(int idx = 0; idx < waterBurialDepthOffset.length; idx++)
- buff.putFloat((float)waterBurialDepthOffset[idx]);
-
-
- for(int idx = 0; idx < snowBurialDepthOffset.length; idx++)
- buff.putFloat((float)snowBurialDepthOffset[idx]);
-
-
- for(int idx = 0; idx < mineOrientation.size(); idx++)
- {
- EulerAngles aEulerAngles = mineOrientation.get(idx);
- aEulerAngles.marshal(buff);
- }
-
-
- for(int idx = 0; idx < thermalContrast.length; idx++)
- buff.putFloat((float)thermalContrast[idx]);
-
-
- for(int idx = 0; idx < reflectance.length; idx++)
- buff.putFloat((float)reflectance[idx]);
-
-
- for(int idx = 0; idx < mineEmplacementTime.size(); idx++)
- {
- MineEmplacementTime aMineEmplacementTime = mineEmplacementTime.get(idx);
- aMineEmplacementTime.marshal(buff);
- }
-
-
- for(int idx = 0; idx < mineEntityNumber.length; idx++)
- buff.putShort((short)mineEntityNumber[idx]);
-
-
- for(int idx = 0; idx < fusing.size(); idx++)
- {
- MinefieldDataFusing aMinefieldDataFusing = fusing.get(idx);
- aMinefieldDataFusing.marshal(buff);
- }
-
-
- for(int idx = 0; idx < scalarDetectionCoefficient.length; idx++)
- buff.put((byte)scalarDetectionCoefficient[idx]);
-
-
- for(int idx = 0; idx < paintScheme.size(); idx++)
- {
- MinefieldDataPaintScheme aMinefieldDataPaintScheme = paintScheme.get(idx);
- aMinefieldDataPaintScheme.marshal(buff);
- }
-
- padTo32_2 = new byte[Align.to32bits(buff)];
-
- for(int idx = 0; idx < numberOfTripDetonationWires.length; idx++)
- buff.put((byte)numberOfTripDetonationWires[idx]);
-
- padTo32_3 = new byte[Align.to32bits(buff)];
-
- for(int idx = 0; idx < numberOfVertices.length; idx++)
- buff.put((byte)numberOfVertices[idx]);
-
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ minefieldID.marshal(buff);
+ requestingEntityID.marshal(buff);
+ buff.putShort( (short)minefieldSequenceNumbeer);
+ buff.put( (byte)requestID);
+ buff.put( (byte)pduSequenceNumber);
+ buff.put( (byte)numberOfPdus);
+ buff.put( (byte)numberOfVertices.length);
+ buff.put( (byte)sensorTypes.size());
+ buff.put( (byte)padding);
+ dataFilter.marshal(buff);
+ mineType.marshal(buff);
+
+ for(int idx = 0; idx < sensorTypes.size(); idx++)
+ {
+ MinefieldSensorType aMinefieldSensorType = sensorTypes.get(idx);
+ aMinefieldSensorType.marshal(buff);
+ }
+
+ padTo32 = new byte[Align.to32bits(buff)];
+
+ for(int idx = 0; idx < mineLocation.size(); idx++)
+ {
+ Vector3Float aVector3Float = mineLocation.get(idx);
+ aVector3Float.marshal(buff);
+ }
+
+
+ for(int idx = 0; idx < groundBurialDepthOffset.length; idx++)
+ buff.putFloat((float)groundBurialDepthOffset[idx]);
+
+
+ for(int idx = 0; idx < waterBurialDepthOffset.length; idx++)
+ buff.putFloat((float)waterBurialDepthOffset[idx]);
+
+
+ for(int idx = 0; idx < snowBurialDepthOffset.length; idx++)
+ buff.putFloat((float)snowBurialDepthOffset[idx]);
+
+
+ for(int idx = 0; idx < mineOrientation.size(); idx++)
+ {
+ EulerAngles aEulerAngles = mineOrientation.get(idx);
+ aEulerAngles.marshal(buff);
+ }
+
+
+ for(int idx = 0; idx < thermalContrast.length; idx++)
+ buff.putFloat((float)thermalContrast[idx]);
+
+
+ for(int idx = 0; idx < reflectance.length; idx++)
+ buff.putFloat((float)reflectance[idx]);
+
+
+ for(int idx = 0; idx < mineEmplacementTime.size(); idx++)
+ {
+ MineEmplacementTime aMineEmplacementTime = mineEmplacementTime.get(idx);
+ aMineEmplacementTime.marshal(buff);
+ }
+
+
+ for(int idx = 0; idx < mineEntityNumber.length; idx++)
+ buff.putShort((short)mineEntityNumber[idx]);
+
+
+ for(int idx = 0; idx < fusing.size(); idx++)
+ {
+ MinefieldDataFusing aMinefieldDataFusing = fusing.get(idx);
+ aMinefieldDataFusing.marshal(buff);
+ }
+
+
+ for(int idx = 0; idx < scalarDetectionCoefficient.length; idx++)
+ buff.put((byte)scalarDetectionCoefficient[idx]);
+
+
+ for(int idx = 0; idx < paintScheme.size(); idx++)
+ {
+ MinefieldDataPaintScheme aMinefieldDataPaintScheme = paintScheme.get(idx);
+ aMinefieldDataPaintScheme.marshal(buff);
+ }
+
+ padTo32_2 = new byte[Align.to32bits(buff)];
+
+ for(int idx = 0; idx < numberOfTripDetonationWires.length; idx++)
+ buff.put((byte)numberOfTripDetonationWires[idx]);
+
+ padTo32_3 = new byte[Align.to32bits(buff)];
+
+ for(int idx = 0; idx < numberOfVertices.length; idx++)
+ buff.put((byte)numberOfVertices[idx]);
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- minefieldID.unmarshal(buff);
- requestingEntityID.unmarshal(buff);
- minefieldSequenceNumbeer = (short)(buff.getShort() & 0xFFFF);
- requestID = (byte)(buff.get() & 0xFF);
- pduSequenceNumber = (byte)(buff.get() & 0xFF);
- numberOfPdus = (byte)(buff.get() & 0xFF);
- numberOfMinesInThisPdu = (byte)(buff.get() & 0xFF);
- numberOfSensorTypes = (byte)(buff.get() & 0xFF);
- padding = (byte)(buff.get() & 0xFF);
- dataFilter.unmarshal(buff);
- mineType.unmarshal(buff);
- for(int idx = 0; idx < numberOfSensorTypes; idx++)
- {
- MinefieldSensorType anX = new MinefieldSensorType();
- anX.unmarshal(buff);
- sensorTypes.add(anX);
- }
-
- padTo32 = new byte[Align.from32bits(buff)];
- for(int idx = 0; idx < numberOfMinesInThisPdu; idx++)
- {
- Vector3Float anX = new Vector3Float();
- anX.unmarshal(buff);
- mineLocation.add(anX);
- }
-
- for(int idx = 0; idx < groundBurialDepthOffset.length; idx++)
- groundBurialDepthOffset[idx] = buff.getFloat();
- for(int idx = 0; idx < waterBurialDepthOffset.length; idx++)
- waterBurialDepthOffset[idx] = buff.getFloat();
- for(int idx = 0; idx < snowBurialDepthOffset.length; idx++)
- snowBurialDepthOffset[idx] = buff.getFloat();
- for(int idx = 0; idx < numberOfMinesInThisPdu; idx++)
- {
- EulerAngles anX = new EulerAngles();
- anX.unmarshal(buff);
- mineOrientation.add(anX);
- }
-
- for(int idx = 0; idx < thermalContrast.length; idx++)
- thermalContrast[idx] = buff.getFloat();
- for(int idx = 0; idx < reflectance.length; idx++)
- reflectance[idx] = buff.getFloat();
- for(int idx = 0; idx < numberOfMinesInThisPdu; idx++)
- {
- MineEmplacementTime anX = new MineEmplacementTime();
- anX.unmarshal(buff);
- mineEmplacementTime.add(anX);
- }
-
- for(int idx = 0; idx < mineEntityNumber.length; idx++)
- mineEntityNumber[idx] = buff.getShort();
- for(int idx = 0; idx < numberOfMinesInThisPdu; idx++)
- {
- MinefieldDataFusing anX = new MinefieldDataFusing();
- anX.unmarshal(buff);
- fusing.add(anX);
- }
-
- for(int idx = 0; idx < scalarDetectionCoefficient.length; idx++)
- scalarDetectionCoefficient[idx] = buff.get();
- for(int idx = 0; idx < numberOfMinesInThisPdu; idx++)
- {
- MinefieldDataPaintScheme anX = new MinefieldDataPaintScheme();
- anX.unmarshal(buff);
- paintScheme.add(anX);
- }
-
- padTo32_2 = new byte[Align.from32bits(buff)];
- for(int idx = 0; idx < numberOfTripDetonationWires.length; idx++)
- numberOfTripDetonationWires[idx] = buff.get();
- padTo32_3 = new byte[Align.from32bits(buff)];
- for(int idx = 0; idx < numberOfVertices.length; idx++)
- numberOfVertices[idx] = buff.get();
- return getMarshalledSize();
+
+ minefieldID.unmarshal(buff);
+ requestingEntityID.unmarshal(buff);
+ minefieldSequenceNumbeer = (short)(buff.getShort() & 0xFFFF);
+ requestID = (byte)(buff.get() & 0xFF);
+ pduSequenceNumber = (byte)(buff.get() & 0xFF);
+ numberOfPdus = (byte)(buff.get() & 0xFF);
+ numberOfMinesInThisPdu = (byte)(buff.get() & 0xFF);
+ numberOfSensorTypes = (byte)(buff.get() & 0xFF);
+ padding = (byte)(buff.get() & 0xFF);
+ dataFilter.unmarshal(buff);
+ mineType.unmarshal(buff);
+ for(int idx = 0; idx < numberOfSensorTypes; idx++)
+ {
+ MinefieldSensorType anX = new MinefieldSensorType();
+ anX.unmarshal(buff);
+ sensorTypes.add(anX);
+ }
+
+ padTo32 = new byte[Align.from32bits(buff)];
+ for(int idx = 0; idx < numberOfMinesInThisPdu; idx++)
+ {
+ Vector3Float anX = new Vector3Float();
+ anX.unmarshal(buff);
+ mineLocation.add(anX);
+ }
+
+ for(int idx = 0; idx < groundBurialDepthOffset.length; idx++)
+ groundBurialDepthOffset[idx] = buff.getFloat();
+ for(int idx = 0; idx < waterBurialDepthOffset.length; idx++)
+ waterBurialDepthOffset[idx] = buff.getFloat();
+ for(int idx = 0; idx < snowBurialDepthOffset.length; idx++)
+ snowBurialDepthOffset[idx] = buff.getFloat();
+ for(int idx = 0; idx < numberOfMinesInThisPdu; idx++)
+ {
+ EulerAngles anX = new EulerAngles();
+ anX.unmarshal(buff);
+ mineOrientation.add(anX);
+ }
+
+ for(int idx = 0; idx < thermalContrast.length; idx++)
+ thermalContrast[idx] = buff.getFloat();
+ for(int idx = 0; idx < reflectance.length; idx++)
+ reflectance[idx] = buff.getFloat();
+ for(int idx = 0; idx < numberOfMinesInThisPdu; idx++)
+ {
+ MineEmplacementTime anX = new MineEmplacementTime();
+ anX.unmarshal(buff);
+ mineEmplacementTime.add(anX);
+ }
+
+ for(int idx = 0; idx < mineEntityNumber.length; idx++)
+ mineEntityNumber[idx] = buff.getShort();
+ for(int idx = 0; idx < numberOfMinesInThisPdu; idx++)
+ {
+ MinefieldDataFusing anX = new MinefieldDataFusing();
+ anX.unmarshal(buff);
+ fusing.add(anX);
+ }
+
+ for(int idx = 0; idx < scalarDetectionCoefficient.length; idx++)
+ scalarDetectionCoefficient[idx] = buff.get();
+ for(int idx = 0; idx < numberOfMinesInThisPdu; idx++)
+ {
+ MinefieldDataPaintScheme anX = new MinefieldDataPaintScheme();
+ anX.unmarshal(buff);
+ paintScheme.add(anX);
+ }
+
+ padTo32_2 = new byte[Align.from32bits(buff)];
+ for(int idx = 0; idx < numberOfTripDetonationWires.length; idx++)
+ numberOfTripDetonationWires[idx] = buff.get();
+ padTo32_3 = new byte[Align.from32bits(buff)];
+ for(int idx = 0; idx < numberOfVertices.length; idx++)
+ numberOfVertices[idx] = buff.get();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final MinefieldDataPdu rhs = (MinefieldDataPdu)obj;
-
- if( ! (minefieldID.equals( rhs.minefieldID) )) ivarsEqual = false;
- if( ! (requestingEntityID.equals( rhs.requestingEntityID) )) ivarsEqual = false;
- if( ! (minefieldSequenceNumbeer == rhs.minefieldSequenceNumbeer)) ivarsEqual = false;
- if( ! (requestID == rhs.requestID)) ivarsEqual = false;
- if( ! (pduSequenceNumber == rhs.pduSequenceNumber)) ivarsEqual = false;
- if( ! (numberOfPdus == rhs.numberOfPdus)) ivarsEqual = false;
- if( ! (padding == rhs.padding)) ivarsEqual = false;
- if( ! (dataFilter.equals( rhs.dataFilter) )) ivarsEqual = false;
- if( ! (mineType.equals( rhs.mineType) )) ivarsEqual = false;
-
- for(int idx = 0; idx < sensorTypes.size(); idx++)
- if( ! ( sensorTypes.get(idx).equals(rhs.sensorTypes.get(idx)))) ivarsEqual = false;
-
-
- for(int idx = 0; idx < mineLocation.size(); idx++)
- if( ! ( mineLocation.get(idx).equals(rhs.mineLocation.get(idx)))) ivarsEqual = false;
-
-
- for(int idx = 0; idx < 0; idx++)
- {
- if(!(groundBurialDepthOffset[idx] == rhs.groundBurialDepthOffset[idx])) ivarsEqual = false;
- }
-
-
- for(int idx = 0; idx < 0; idx++)
- {
- if(!(waterBurialDepthOffset[idx] == rhs.waterBurialDepthOffset[idx])) ivarsEqual = false;
- }
-
-
- for(int idx = 0; idx < 0; idx++)
- {
- if(!(snowBurialDepthOffset[idx] == rhs.snowBurialDepthOffset[idx])) ivarsEqual = false;
- }
-
-
- for(int idx = 0; idx < mineOrientation.size(); idx++)
- if( ! ( mineOrientation.get(idx).equals(rhs.mineOrientation.get(idx)))) ivarsEqual = false;
-
-
- for(int idx = 0; idx < 0; idx++)
- {
- if(!(thermalContrast[idx] == rhs.thermalContrast[idx])) ivarsEqual = false;
- }
-
-
- for(int idx = 0; idx < 0; idx++)
- {
- if(!(reflectance[idx] == rhs.reflectance[idx])) ivarsEqual = false;
- }
-
-
- for(int idx = 0; idx < mineEmplacementTime.size(); idx++)
- if( ! ( mineEmplacementTime.get(idx).equals(rhs.mineEmplacementTime.get(idx)))) ivarsEqual = false;
-
-
- for(int idx = 0; idx < 0; idx++)
- {
- if(!(mineEntityNumber[idx] == rhs.mineEntityNumber[idx])) ivarsEqual = false;
- }
-
-
- for(int idx = 0; idx < fusing.size(); idx++)
- if( ! ( fusing.get(idx).equals(rhs.fusing.get(idx)))) ivarsEqual = false;
-
-
- for(int idx = 0; idx < 0; idx++)
- {
- if(!(scalarDetectionCoefficient[idx] == rhs.scalarDetectionCoefficient[idx])) ivarsEqual = false;
- }
-
-
- for(int idx = 0; idx < paintScheme.size(); idx++)
- if( ! ( paintScheme.get(idx).equals(rhs.paintScheme.get(idx)))) ivarsEqual = false;
-
-
- for(int idx = 0; idx < 0; idx++)
- {
- if(!(numberOfTripDetonationWires[idx] == rhs.numberOfTripDetonationWires[idx])) ivarsEqual = false;
- }
-
-
- for(int idx = 0; idx < 0; idx++)
- {
- if(!(numberOfVertices[idx] == rhs.numberOfVertices[idx])) ivarsEqual = false;
- }
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final MinefieldDataPdu rhs = (MinefieldDataPdu)obj;
+
+ if( ! (minefieldID.equals( rhs.minefieldID) )) ivarsEqual = false;
+ if( ! (requestingEntityID.equals( rhs.requestingEntityID) )) ivarsEqual = false;
+ if( ! (minefieldSequenceNumbeer == rhs.minefieldSequenceNumbeer)) ivarsEqual = false;
+ if( ! (requestID == rhs.requestID)) ivarsEqual = false;
+ if( ! (pduSequenceNumber == rhs.pduSequenceNumber)) ivarsEqual = false;
+ if( ! (numberOfPdus == rhs.numberOfPdus)) ivarsEqual = false;
+ if( ! (padding == rhs.padding)) ivarsEqual = false;
+ if( ! (dataFilter.equals( rhs.dataFilter) )) ivarsEqual = false;
+ if( ! (mineType.equals( rhs.mineType) )) ivarsEqual = false;
+
+ for(int idx = 0; idx < sensorTypes.size(); idx++)
+ if( ! ( sensorTypes.get(idx).equals(rhs.sensorTypes.get(idx)))) ivarsEqual = false;
+
+
+ for(int idx = 0; idx < mineLocation.size(); idx++)
+ if( ! ( mineLocation.get(idx).equals(rhs.mineLocation.get(idx)))) ivarsEqual = false;
+
+
+ for(int idx = 0; idx < 0; idx++)
+ {
+ if(!(groundBurialDepthOffset[idx] == rhs.groundBurialDepthOffset[idx])) ivarsEqual = false;
+ }
+
+
+ for(int idx = 0; idx < 0; idx++)
+ {
+ if(!(waterBurialDepthOffset[idx] == rhs.waterBurialDepthOffset[idx])) ivarsEqual = false;
+ }
+
+
+ for(int idx = 0; idx < 0; idx++)
+ {
+ if(!(snowBurialDepthOffset[idx] == rhs.snowBurialDepthOffset[idx])) ivarsEqual = false;
+ }
+
+
+ for(int idx = 0; idx < mineOrientation.size(); idx++)
+ if( ! ( mineOrientation.get(idx).equals(rhs.mineOrientation.get(idx)))) ivarsEqual = false;
+
+
+ for(int idx = 0; idx < 0; idx++)
+ {
+ if(!(thermalContrast[idx] == rhs.thermalContrast[idx])) ivarsEqual = false;
+ }
+
+
+ for(int idx = 0; idx < 0; idx++)
+ {
+ if(!(reflectance[idx] == rhs.reflectance[idx])) ivarsEqual = false;
+ }
+
+
+ for(int idx = 0; idx < mineEmplacementTime.size(); idx++)
+ if( ! ( mineEmplacementTime.get(idx).equals(rhs.mineEmplacementTime.get(idx)))) ivarsEqual = false;
+
+
+ for(int idx = 0; idx < 0; idx++)
+ {
+ if(!(mineEntityNumber[idx] == rhs.mineEntityNumber[idx])) ivarsEqual = false;
+ }
+
+
+ for(int idx = 0; idx < fusing.size(); idx++)
+ if( ! ( fusing.get(idx).equals(rhs.fusing.get(idx)))) ivarsEqual = false;
+
+
+ for(int idx = 0; idx < 0; idx++)
+ {
+ if(!(scalarDetectionCoefficient[idx] == rhs.scalarDetectionCoefficient[idx])) ivarsEqual = false;
+ }
+
+
+ for(int idx = 0; idx < paintScheme.size(); idx++)
+ if( ! ( paintScheme.get(idx).equals(rhs.paintScheme.get(idx)))) ivarsEqual = false;
+
+
+ for(int idx = 0; idx < 0; idx++)
+ {
+ if(!(numberOfTripDetonationWires[idx] == rhs.numberOfTripDetonationWires[idx])) ivarsEqual = false;
+ }
+
+
+ for(int idx = 0; idx < 0; idx++)
+ {
+ if(!(numberOfVertices[idx] == rhs.numberOfVertices[idx])) ivarsEqual = false;
+ }
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" minefieldID: ").append(minefieldID).append("\n");
- sb.append(" requestingEntityID: ").append(requestingEntityID).append("\n");
- sb.append(" minefieldSequenceNumbeer: ").append(minefieldSequenceNumbeer).append("\n");
- sb.append(" requestID: ").append(requestID).append("\n");
- sb.append(" pduSequenceNumber: ").append(pduSequenceNumber).append("\n");
- sb.append(" numberOfPdus: ").append(numberOfPdus).append("\n");
- sb.append(" padding: ").append(padding).append("\n");
- sb.append(" dataFilter: ").append(dataFilter).append("\n");
- sb.append(" mineType: ").append(mineType).append("\n");
- sb.append(" padTo32: ").append(padTo32).append("\n");
- sb.append(" groundBurialDepthOffset: ").append("\n");
- sb.append(Arrays.toString(groundBurialDepthOffset)).append("\n");
- sb.append(" waterBurialDepthOffset: ").append("\n");
- sb.append(Arrays.toString(waterBurialDepthOffset)).append("\n");
- sb.append(" snowBurialDepthOffset: ").append("\n");
- sb.append(Arrays.toString(snowBurialDepthOffset)).append("\n");
- sb.append(" thermalContrast: ").append("\n");
- sb.append(Arrays.toString(thermalContrast)).append("\n");
- sb.append(" reflectance: ").append("\n");
- sb.append(Arrays.toString(reflectance)).append("\n");
- sb.append(" mineEntityNumber: ").append("\n");
- sb.append(Arrays.toString(mineEntityNumber)).append("\n");
- sb.append(" scalarDetectionCoefficient: ").append("\n");
- sb.append(Arrays.toString(scalarDetectionCoefficient)).append("\n");
- sb.append(" padTo32_2: ").append(padTo32_2).append("\n");
- sb.append(" numberOfTripDetonationWires: ").append("\n");
- sb.append(Arrays.toString(numberOfTripDetonationWires)).append("\n");
- sb.append(" padTo32_3: ").append(padTo32_3).append("\n");
- sb.append(" numberOfVertices: ").append("\n");
- sb.append(Arrays.toString(numberOfVertices)).append("\n");
- sb.append(" sensorTypes: ").append("\n");
- sensorTypes.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
- sb.append(" mineLocation: ").append("\n");
- mineLocation.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
- sb.append(" mineOrientation: ").append("\n");
- mineOrientation.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
- sb.append(" mineEmplacementTime: ").append("\n");
- mineEmplacementTime.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
- sb.append(" fusing: ").append("\n");
- fusing.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
- sb.append(" paintScheme: ").append("\n");
- paintScheme.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" minefieldID: ").append(minefieldID).append("\n");
+ sb.append(" requestingEntityID: ").append(requestingEntityID).append("\n");
+ sb.append(" minefieldSequenceNumbeer: ").append(minefieldSequenceNumbeer).append("\n");
+ sb.append(" requestID: ").append(requestID).append("\n");
+ sb.append(" pduSequenceNumber: ").append(pduSequenceNumber).append("\n");
+ sb.append(" numberOfPdus: ").append(numberOfPdus).append("\n");
+ sb.append(" padding: ").append(padding).append("\n");
+ sb.append(" dataFilter: ").append(dataFilter).append("\n");
+ sb.append(" mineType: ").append(mineType).append("\n");
+ sb.append(" padTo32: ").append(padTo32).append("\n");
+ sb.append(" groundBurialDepthOffset: ").append("\n");
+ sb.append(Arrays.toString(groundBurialDepthOffset)).append("\n");
+ sb.append(" waterBurialDepthOffset: ").append("\n");
+ sb.append(Arrays.toString(waterBurialDepthOffset)).append("\n");
+ sb.append(" snowBurialDepthOffset: ").append("\n");
+ sb.append(Arrays.toString(snowBurialDepthOffset)).append("\n");
+ sb.append(" thermalContrast: ").append("\n");
+ sb.append(Arrays.toString(thermalContrast)).append("\n");
+ sb.append(" reflectance: ").append("\n");
+ sb.append(Arrays.toString(reflectance)).append("\n");
+ sb.append(" mineEntityNumber: ").append("\n");
+ sb.append(Arrays.toString(mineEntityNumber)).append("\n");
+ sb.append(" scalarDetectionCoefficient: ").append("\n");
+ sb.append(Arrays.toString(scalarDetectionCoefficient)).append("\n");
+ sb.append(" padTo32_2: ").append(padTo32_2).append("\n");
+ sb.append(" numberOfTripDetonationWires: ").append("\n");
+ sb.append(Arrays.toString(numberOfTripDetonationWires)).append("\n");
+ sb.append(" padTo32_3: ").append(padTo32_3).append("\n");
+ sb.append(" numberOfVertices: ").append("\n");
+ sb.append(Arrays.toString(numberOfVertices)).append("\n");
+ sb.append(" sensorTypes: ").append("\n");
+ sensorTypes.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+ sb.append(" mineLocation: ").append("\n");
+ mineLocation.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+ sb.append(" mineOrientation: ").append("\n");
+ mineOrientation.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+ sb.append(" mineEmplacementTime: ").append("\n");
+ mineEmplacementTime.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+ sb.append(" fusing: ").append("\n");
+ fusing.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+ sb.append(" paintScheme: ").append("\n");
+ paintScheme.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/MinefieldFamilyPdu.java b/src-generated/edu/nps/moves/dis7/MinefieldFamilyPdu.java
index d2e171db1b0792831fbf036cfbf6da20821afc19..a8393d99ad5b3a789898ce4ec423fd6bea296cfa 100644
--- a/src-generated/edu/nps/moves/dis7/MinefieldFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/MinefieldFamilyPdu.java
@@ -1,141 +1,141 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Abstract superclass for PDUs relating to minefields. Section 7.9
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public abstract class MinefieldFamilyPdu extends PduBase implements Serializable
-{
-
-/** Constructor */
- public MinefieldFamilyPdu()
- {
- setProtocolFamily( DISProtocolFamily.MINEFIELD );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
-
- return marshalSize;
-}
-
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Abstract superclass for PDUs relating to minefields. Section 7.9
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public abstract class MinefieldFamilyPdu extends PduBase implements Serializable
+{
+
+/** Constructor */
+ public MinefieldFamilyPdu()
+ {
+ setProtocolFamily( DISProtocolFamily.MINEFIELD );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+
+ return marshalSize;
+}
+
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
+ {
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
+ {
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- return getMarshalledSize();
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final MinefieldFamilyPdu rhs = (MinefieldFamilyPdu)obj;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final MinefieldFamilyPdu rhs = (MinefieldFamilyPdu)obj;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
-
- return sb.toString();
- }
-} // end of class
+
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/MinefieldIdentifier.java b/src-generated/edu/nps/moves/dis7/MinefieldIdentifier.java
index 3c55bb5794efab06bd169b0e18bc320da721d92a..62fb5d63443b20874365ed769947a30d258e4e68 100644
--- a/src-generated/edu/nps/moves/dis7/MinefieldIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/MinefieldIdentifier.java
@@ -1,185 +1,185 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * The unique designation of a minefield Section 6.2.56
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class MinefieldIdentifier extends Object implements Serializable
-{
- /** */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * The unique designation of a minefield Section 6.2.56
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class MinefieldIdentifier extends Object implements Serializable
+{
+ /** */
protected SimulationAddress simulationAddress = new SimulationAddress();
-
- /** */
+
+ /** */
protected short minefieldNumber;
-
-
-/** Constructor */
- public MinefieldIdentifier()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += simulationAddress.getMarshalledSize();
- marshalSize += 2; // minefieldNumber
-
- return marshalSize;
-}
-
-
-/** Setter for {@link MinefieldIdentifier#simulationAddress}*/
-public MinefieldIdentifier setSimulationAddress(SimulationAddress pSimulationAddress)
+
+
+/** Constructor */
+ public MinefieldIdentifier()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += simulationAddress.getMarshalledSize();
+ marshalSize += 2; // minefieldNumber
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link MinefieldIdentifier#simulationAddress}*/
+public MinefieldIdentifier setSimulationAddress(SimulationAddress pSimulationAddress)
{
- simulationAddress = pSimulationAddress;
- return this;
-}
-
-/** Getter for {@link MinefieldIdentifier#simulationAddress}*/
-public SimulationAddress getSimulationAddress()
+ simulationAddress = pSimulationAddress;
+ return this;
+}
+
+/** Getter for {@link MinefieldIdentifier#simulationAddress}*/
+public SimulationAddress getSimulationAddress()
{
return simulationAddress;
-}
-
-/** Setter for {@link MinefieldIdentifier#minefieldNumber}*/
-public MinefieldIdentifier setMinefieldNumber(short pMinefieldNumber)
+}
+
+/** Setter for {@link MinefieldIdentifier#minefieldNumber}*/
+public MinefieldIdentifier setMinefieldNumber(short pMinefieldNumber)
{
- minefieldNumber = pMinefieldNumber;
- return this;
-}
-
-/** Getter for {@link MinefieldIdentifier#minefieldNumber}*/
-public short getMinefieldNumber()
+ minefieldNumber = pMinefieldNumber;
+ return this;
+}
+
+/** Getter for {@link MinefieldIdentifier#minefieldNumber}*/
+public short getMinefieldNumber()
{
return minefieldNumber;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- simulationAddress.marshal(dos);
- dos.writeShort(minefieldNumber);
+ {
+ simulationAddress.marshal(dos);
+ dos.writeShort(minefieldNumber);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- uPosition += simulationAddress.unmarshal(dis);
- minefieldNumber = (short)dis.readUnsignedShort();
- uPosition += 2;
+ {
+ uPosition += simulationAddress.unmarshal(dis);
+ minefieldNumber = (short)dis.readUnsignedShort();
+ uPosition += 2;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- simulationAddress.marshal(buff);
- buff.putShort( (short)minefieldNumber);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- simulationAddress.unmarshal(buff);
- minefieldNumber = (short)(buff.getShort() & 0xFFFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ simulationAddress.marshal(buff);
+ buff.putShort( (short)minefieldNumber);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ simulationAddress.unmarshal(buff);
+ minefieldNumber = (short)(buff.getShort() & 0xFFFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final MinefieldIdentifier rhs = (MinefieldIdentifier)obj;
-
- if( ! (simulationAddress.equals( rhs.simulationAddress) )) ivarsEqual = false;
- if( ! (minefieldNumber == rhs.minefieldNumber)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final MinefieldIdentifier rhs = (MinefieldIdentifier)obj;
+
+ if( ! (simulationAddress.equals( rhs.simulationAddress) )) ivarsEqual = false;
+ if( ! (minefieldNumber == rhs.minefieldNumber)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
- sb.append(" minefieldNumber: ").append(minefieldNumber).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
+ sb.append(" minefieldNumber: ").append(minefieldNumber).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/MinefieldQueryPdu.java b/src-generated/edu/nps/moves/dis7/MinefieldQueryPdu.java
index 9140550b80e5b066c1c75753a6f3837f379f9926..e5b0b053edebc593cd3c07fa9e44aa29a155849b 100644
--- a/src-generated/edu/nps/moves/dis7/MinefieldQueryPdu.java
+++ b/src-generated/edu/nps/moves/dis7/MinefieldQueryPdu.java
@@ -1,408 +1,408 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.10.3 Contains information about the requesting entity and the region and mine types of interest to the requesting entity.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class MinefieldQueryPdu extends MinefieldFamilyPdu implements Serializable
-{
- /** Minefield ID */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 5.10.3 Contains information about the requesting entity and the region and mine types of interest to the requesting entity.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class MinefieldQueryPdu extends MinefieldFamilyPdu implements Serializable
+{
+ /** Minefield ID */
protected MinefieldIdentifier minefieldID = new MinefieldIdentifier();
-
- /** EID of entity making the request */
+
+ /** EID of entity making the request */
protected EntityID requestingEntityID = new EntityID();
-
- /** request ID */
+
+ /** request ID */
protected byte requestID;
-
- /** Number of perimeter points for the minefield */
+
+ /** Number of perimeter points for the minefield */
protected byte numberOfPerimeterPoints;
-
+
protected byte padding;
-
- /** Number of sensor types */
+
+ /** Number of sensor types */
protected byte numberOfSensorTypes;
-
- /** data filter, 32 boolean fields */
+
+ /** data filter, 32 boolean fields */
protected DataFilterRecord dataFilter = new DataFilterRecord();
-
- /** Entity type of mine being requested */
+
+ /** Entity type of mine being requested */
protected EntityType requestedMineType = new EntityType();
-
- /** perimeter points of request */
+
+ /** perimeter points of request */
protected List< Vector2Float > requestedPerimeterPoints = new ArrayList< Vector2Float >();
-
- /** Sensor types, each 16 bits long */
+
+ /** Sensor types, each 16 bits long */
protected List< MinefieldSensorType > sensorTypes = new ArrayList< MinefieldSensorType >();
-
-
-/** Constructor */
- public MinefieldQueryPdu()
- {
- setPduType( DISPDUType.MINEFIELD_QUERY );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public MinefieldQueryPdu()
+ {
+ setPduType( DISPDUType.MINEFIELD_QUERY );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += minefieldID.getMarshalledSize();
+ marshalSize += requestingEntityID.getMarshalledSize();
+ marshalSize += 1; // requestID
+ marshalSize += 1; // numberOfPerimeterPoints
+ marshalSize += 1; // padding
+ marshalSize += 1; // numberOfSensorTypes
+ marshalSize += dataFilter.getMarshalledSize();
+ marshalSize += requestedMineType.getMarshalledSize();
+ for(int idx=0; idx < requestedPerimeterPoints.size(); idx++)
+ {
+ Vector2Float listElement = requestedPerimeterPoints.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+ for(int idx=0; idx < sensorTypes.size(); idx++)
+ {
+ MinefieldSensorType listElement = sensorTypes.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link MinefieldQueryPdu#minefieldID}*/
+public MinefieldQueryPdu setMinefieldID(MinefieldIdentifier pMinefieldID)
{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += minefieldID.getMarshalledSize();
- marshalSize += requestingEntityID.getMarshalledSize();
- marshalSize += 1; // requestID
- marshalSize += 1; // numberOfPerimeterPoints
- marshalSize += 1; // padding
- marshalSize += 1; // numberOfSensorTypes
- marshalSize += dataFilter.getMarshalledSize();
- marshalSize += requestedMineType.getMarshalledSize();
- for(int idx=0; idx < requestedPerimeterPoints.size(); idx++)
- {
- Vector2Float listElement = requestedPerimeterPoints.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
- for(int idx=0; idx < sensorTypes.size(); idx++)
- {
- MinefieldSensorType listElement = sensorTypes.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link MinefieldQueryPdu#minefieldID}*/
-public MinefieldQueryPdu setMinefieldID(MinefieldIdentifier pMinefieldID)
-{
- minefieldID = pMinefieldID;
- return this;
-}
-
-/** Getter for {@link MinefieldQueryPdu#minefieldID}*/
-public MinefieldIdentifier getMinefieldID()
+ minefieldID = pMinefieldID;
+ return this;
+}
+
+/** Getter for {@link MinefieldQueryPdu#minefieldID}*/
+public MinefieldIdentifier getMinefieldID()
{
return minefieldID;
-}
-
-/** Setter for {@link MinefieldQueryPdu#requestingEntityID}*/
-public MinefieldQueryPdu setRequestingEntityID(EntityID pRequestingEntityID)
+}
+
+/** Setter for {@link MinefieldQueryPdu#requestingEntityID}*/
+public MinefieldQueryPdu setRequestingEntityID(EntityID pRequestingEntityID)
{
- requestingEntityID = pRequestingEntityID;
- return this;
-}
-
-/** Getter for {@link MinefieldQueryPdu#requestingEntityID}*/
-public EntityID getRequestingEntityID()
+ requestingEntityID = pRequestingEntityID;
+ return this;
+}
+
+/** Getter for {@link MinefieldQueryPdu#requestingEntityID}*/
+public EntityID getRequestingEntityID()
{
return requestingEntityID;
-}
-
-/** Setter for {@link MinefieldQueryPdu#requestID}*/
-public MinefieldQueryPdu setRequestID(byte pRequestID)
+}
+
+/** Setter for {@link MinefieldQueryPdu#requestID}*/
+public MinefieldQueryPdu setRequestID(byte pRequestID)
{
- requestID = pRequestID;
- return this;
-}
-
-/** Getter for {@link MinefieldQueryPdu#requestID}*/
-public byte getRequestID()
+ requestID = pRequestID;
+ return this;
+}
+
+/** Getter for {@link MinefieldQueryPdu#requestID}*/
+public byte getRequestID()
{
return requestID;
-}
-
-/** Setter for {@link MinefieldQueryPdu#padding}*/
-public MinefieldQueryPdu setPadding(byte pPadding)
+}
+
+/** Setter for {@link MinefieldQueryPdu#padding}*/
+public MinefieldQueryPdu setPadding(byte pPadding)
{
- padding = pPadding;
- return this;
-}
-
-/** Getter for {@link MinefieldQueryPdu#padding}*/
-public byte getPadding()
+ padding = pPadding;
+ return this;
+}
+
+/** Getter for {@link MinefieldQueryPdu#padding}*/
+public byte getPadding()
{
return padding;
-}
-
-/** Setter for {@link MinefieldQueryPdu#dataFilter}*/
-public MinefieldQueryPdu setDataFilter(DataFilterRecord pDataFilter)
+}
+
+/** Setter for {@link MinefieldQueryPdu#dataFilter}*/
+public MinefieldQueryPdu setDataFilter(DataFilterRecord pDataFilter)
{
- dataFilter = pDataFilter;
- return this;
-}
-
-/** Getter for {@link MinefieldQueryPdu#dataFilter}*/
-public DataFilterRecord getDataFilter()
+ dataFilter = pDataFilter;
+ return this;
+}
+
+/** Getter for {@link MinefieldQueryPdu#dataFilter}*/
+public DataFilterRecord getDataFilter()
{
return dataFilter;
-}
-
-/** Setter for {@link MinefieldQueryPdu#requestedMineType}*/
-public MinefieldQueryPdu setRequestedMineType(EntityType pRequestedMineType)
+}
+
+/** Setter for {@link MinefieldQueryPdu#requestedMineType}*/
+public MinefieldQueryPdu setRequestedMineType(EntityType pRequestedMineType)
{
- requestedMineType = pRequestedMineType;
- return this;
-}
-
-/** Getter for {@link MinefieldQueryPdu#requestedMineType}*/
-public EntityType getRequestedMineType()
+ requestedMineType = pRequestedMineType;
+ return this;
+}
+
+/** Getter for {@link MinefieldQueryPdu#requestedMineType}*/
+public EntityType getRequestedMineType()
{
return requestedMineType;
-}
-
-/** Setter for {@link MinefieldQueryPdu#requestedPerimeterPoints}*/
-public MinefieldQueryPdu setRequestedPerimeterPoints(List<Vector2Float> pRequestedPerimeterPoints)
+}
+
+/** Setter for {@link MinefieldQueryPdu#requestedPerimeterPoints}*/
+public MinefieldQueryPdu setRequestedPerimeterPoints(List<Vector2Float> pRequestedPerimeterPoints)
{
- requestedPerimeterPoints = pRequestedPerimeterPoints;
- return this;
-}
-
-/** Getter for {@link MinefieldQueryPdu#requestedPerimeterPoints}*/
-public List<Vector2Float> getRequestedPerimeterPoints()
+ requestedPerimeterPoints = pRequestedPerimeterPoints;
+ return this;
+}
+
+/** Getter for {@link MinefieldQueryPdu#requestedPerimeterPoints}*/
+public List<Vector2Float> getRequestedPerimeterPoints()
{
return requestedPerimeterPoints;
-}
-
-/** Setter for {@link MinefieldQueryPdu#sensorTypes}*/
-public MinefieldQueryPdu setSensorTypes(List<MinefieldSensorType> pSensorTypes)
+}
+
+/** Setter for {@link MinefieldQueryPdu#sensorTypes}*/
+public MinefieldQueryPdu setSensorTypes(List<MinefieldSensorType> pSensorTypes)
{
- sensorTypes = pSensorTypes;
- return this;
-}
-
-/** Getter for {@link MinefieldQueryPdu#sensorTypes}*/
-public List<MinefieldSensorType> getSensorTypes()
+ sensorTypes = pSensorTypes;
+ return this;
+}
+
+/** Getter for {@link MinefieldQueryPdu#sensorTypes}*/
+public List<MinefieldSensorType> getSensorTypes()
{
return sensorTypes;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- minefieldID.marshal(dos);
- requestingEntityID.marshal(dos);
- dos.writeByte(requestID);
- dos.writeByte(requestedPerimeterPoints.size());
- dos.writeByte(padding);
- dos.writeByte(sensorTypes.size());
- dataFilter.marshal(dos);
- requestedMineType.marshal(dos);
-
- for(int idx = 0; idx < requestedPerimeterPoints.size(); idx++)
- {
- Vector2Float aVector2Float = requestedPerimeterPoints.get(idx);
- aVector2Float.marshal(dos);
- }
-
-
- for(int idx = 0; idx < sensorTypes.size(); idx++)
- {
- MinefieldSensorType aMinefieldSensorType = sensorTypes.get(idx);
- aMinefieldSensorType.marshal(dos);
- }
-
+ {
+ minefieldID.marshal(dos);
+ requestingEntityID.marshal(dos);
+ dos.writeByte(requestID);
+ dos.writeByte(requestedPerimeterPoints.size());
+ dos.writeByte(padding);
+ dos.writeByte(sensorTypes.size());
+ dataFilter.marshal(dos);
+ requestedMineType.marshal(dos);
+
+ for(int idx = 0; idx < requestedPerimeterPoints.size(); idx++)
+ {
+ Vector2Float aVector2Float = requestedPerimeterPoints.get(idx);
+ aVector2Float.marshal(dos);
+ }
+
+
+ for(int idx = 0; idx < sensorTypes.size(); idx++)
+ {
+ MinefieldSensorType aMinefieldSensorType = sensorTypes.get(idx);
+ aMinefieldSensorType.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += minefieldID.unmarshal(dis);
- uPosition += requestingEntityID.unmarshal(dis);
- requestID = (byte)dis.readUnsignedByte();
- uPosition += 1;
- numberOfPerimeterPoints = (byte)dis.readUnsignedByte();
- uPosition += 1;
- padding = (byte)dis.readUnsignedByte();
- uPosition += 1;
- numberOfSensorTypes = (byte)dis.readUnsignedByte();
- uPosition += 1;
- uPosition += dataFilter.unmarshal(dis);
- uPosition += requestedMineType.unmarshal(dis);
- for(int idx = 0; idx < numberOfPerimeterPoints; idx++)
- {
- Vector2Float anX = new Vector2Float();
- uPosition += anX.unmarshal(dis);
- requestedPerimeterPoints.add(anX);
- }
-
- for(int idx = 0; idx < numberOfSensorTypes; idx++)
- {
- MinefieldSensorType anX = new MinefieldSensorType();
- uPosition += anX.unmarshal(dis);
- sensorTypes.add(anX);
- }
-
+ {
+ uPosition += minefieldID.unmarshal(dis);
+ uPosition += requestingEntityID.unmarshal(dis);
+ requestID = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ numberOfPerimeterPoints = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ padding = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ numberOfSensorTypes = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ uPosition += dataFilter.unmarshal(dis);
+ uPosition += requestedMineType.unmarshal(dis);
+ for(int idx = 0; idx < numberOfPerimeterPoints; idx++)
+ {
+ Vector2Float anX = new Vector2Float();
+ uPosition += anX.unmarshal(dis);
+ requestedPerimeterPoints.add(anX);
+ }
+
+ for(int idx = 0; idx < numberOfSensorTypes; idx++)
+ {
+ MinefieldSensorType anX = new MinefieldSensorType();
+ uPosition += anX.unmarshal(dis);
+ sensorTypes.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- minefieldID.marshal(buff);
- requestingEntityID.marshal(buff);
- buff.put( (byte)requestID);
- buff.put( (byte)requestedPerimeterPoints.size());
- buff.put( (byte)padding);
- buff.put( (byte)sensorTypes.size());
- dataFilter.marshal(buff);
- requestedMineType.marshal(buff);
-
- for(int idx = 0; idx < requestedPerimeterPoints.size(); idx++)
- {
- Vector2Float aVector2Float = requestedPerimeterPoints.get(idx);
- aVector2Float.marshal(buff);
- }
-
-
- for(int idx = 0; idx < sensorTypes.size(); idx++)
- {
- MinefieldSensorType aMinefieldSensorType = sensorTypes.get(idx);
- aMinefieldSensorType.marshal(buff);
- }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ minefieldID.marshal(buff);
+ requestingEntityID.marshal(buff);
+ buff.put( (byte)requestID);
+ buff.put( (byte)requestedPerimeterPoints.size());
+ buff.put( (byte)padding);
+ buff.put( (byte)sensorTypes.size());
+ dataFilter.marshal(buff);
+ requestedMineType.marshal(buff);
+
+ for(int idx = 0; idx < requestedPerimeterPoints.size(); idx++)
+ {
+ Vector2Float aVector2Float = requestedPerimeterPoints.get(idx);
+ aVector2Float.marshal(buff);
+ }
+
+
+ for(int idx = 0; idx < sensorTypes.size(); idx++)
+ {
+ MinefieldSensorType aMinefieldSensorType = sensorTypes.get(idx);
+ aMinefieldSensorType.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- minefieldID.unmarshal(buff);
- requestingEntityID.unmarshal(buff);
- requestID = (byte)(buff.get() & 0xFF);
- numberOfPerimeterPoints = (byte)(buff.get() & 0xFF);
- padding = (byte)(buff.get() & 0xFF);
- numberOfSensorTypes = (byte)(buff.get() & 0xFF);
- dataFilter.unmarshal(buff);
- requestedMineType.unmarshal(buff);
- for(int idx = 0; idx < numberOfPerimeterPoints; idx++)
- {
- Vector2Float anX = new Vector2Float();
- anX.unmarshal(buff);
- requestedPerimeterPoints.add(anX);
- }
-
- for(int idx = 0; idx < numberOfSensorTypes; idx++)
- {
- MinefieldSensorType anX = new MinefieldSensorType();
- anX.unmarshal(buff);
- sensorTypes.add(anX);
- }
-
- return getMarshalledSize();
+
+ minefieldID.unmarshal(buff);
+ requestingEntityID.unmarshal(buff);
+ requestID = (byte)(buff.get() & 0xFF);
+ numberOfPerimeterPoints = (byte)(buff.get() & 0xFF);
+ padding = (byte)(buff.get() & 0xFF);
+ numberOfSensorTypes = (byte)(buff.get() & 0xFF);
+ dataFilter.unmarshal(buff);
+ requestedMineType.unmarshal(buff);
+ for(int idx = 0; idx < numberOfPerimeterPoints; idx++)
+ {
+ Vector2Float anX = new Vector2Float();
+ anX.unmarshal(buff);
+ requestedPerimeterPoints.add(anX);
+ }
+
+ for(int idx = 0; idx < numberOfSensorTypes; idx++)
+ {
+ MinefieldSensorType anX = new MinefieldSensorType();
+ anX.unmarshal(buff);
+ sensorTypes.add(anX);
+ }
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final MinefieldQueryPdu rhs = (MinefieldQueryPdu)obj;
-
- if( ! (minefieldID.equals( rhs.minefieldID) )) ivarsEqual = false;
- if( ! (requestingEntityID.equals( rhs.requestingEntityID) )) ivarsEqual = false;
- if( ! (requestID == rhs.requestID)) ivarsEqual = false;
- if( ! (padding == rhs.padding)) ivarsEqual = false;
- if( ! (dataFilter.equals( rhs.dataFilter) )) ivarsEqual = false;
- if( ! (requestedMineType.equals( rhs.requestedMineType) )) ivarsEqual = false;
-
- for(int idx = 0; idx < requestedPerimeterPoints.size(); idx++)
- if( ! ( requestedPerimeterPoints.get(idx).equals(rhs.requestedPerimeterPoints.get(idx)))) ivarsEqual = false;
-
-
- for(int idx = 0; idx < sensorTypes.size(); idx++)
- if( ! ( sensorTypes.get(idx).equals(rhs.sensorTypes.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final MinefieldQueryPdu rhs = (MinefieldQueryPdu)obj;
+
+ if( ! (minefieldID.equals( rhs.minefieldID) )) ivarsEqual = false;
+ if( ! (requestingEntityID.equals( rhs.requestingEntityID) )) ivarsEqual = false;
+ if( ! (requestID == rhs.requestID)) ivarsEqual = false;
+ if( ! (padding == rhs.padding)) ivarsEqual = false;
+ if( ! (dataFilter.equals( rhs.dataFilter) )) ivarsEqual = false;
+ if( ! (requestedMineType.equals( rhs.requestedMineType) )) ivarsEqual = false;
+
+ for(int idx = 0; idx < requestedPerimeterPoints.size(); idx++)
+ if( ! ( requestedPerimeterPoints.get(idx).equals(rhs.requestedPerimeterPoints.get(idx)))) ivarsEqual = false;
+
+
+ for(int idx = 0; idx < sensorTypes.size(); idx++)
+ if( ! ( sensorTypes.get(idx).equals(rhs.sensorTypes.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" minefieldID: ").append(minefieldID).append("\n");
- sb.append(" requestingEntityID: ").append(requestingEntityID).append("\n");
- sb.append(" requestID: ").append(requestID).append("\n");
- sb.append(" padding: ").append(padding).append("\n");
- sb.append(" dataFilter: ").append(dataFilter).append("\n");
- sb.append(" requestedMineType: ").append(requestedMineType).append("\n");
- sb.append(" requestedPerimeterPoints: ").append("\n");
- requestedPerimeterPoints.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
- sb.append(" sensorTypes: ").append("\n");
- sensorTypes.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" minefieldID: ").append(minefieldID).append("\n");
+ sb.append(" requestingEntityID: ").append(requestingEntityID).append("\n");
+ sb.append(" requestID: ").append(requestID).append("\n");
+ sb.append(" padding: ").append(padding).append("\n");
+ sb.append(" dataFilter: ").append(dataFilter).append("\n");
+ sb.append(" requestedMineType: ").append(requestedMineType).append("\n");
+ sb.append(" requestedPerimeterPoints: ").append("\n");
+ requestedPerimeterPoints.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+ sb.append(" sensorTypes: ").append("\n");
+ sensorTypes.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/MinefieldResponseNACKPdu.java b/src-generated/edu/nps/moves/dis7/MinefieldResponseNACKPdu.java
index 7507c25132b7e4d08820203cd13ce8fa1d189281..dada21071c456c92f6a01324185647e87accd9d7 100644
--- a/src-generated/edu/nps/moves/dis7/MinefieldResponseNACKPdu.java
+++ b/src-generated/edu/nps/moves/dis7/MinefieldResponseNACKPdu.java
@@ -1,258 +1,258 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.10.5 Contains information about the requesting entity and the PDU(s) that were not received in response to a query.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class MinefieldResponseNACKPdu extends MinefieldFamilyPdu implements Serializable
-{
- /** Minefield ID */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 5.10.5 Contains information about the requesting entity and the PDU(s) that were not received in response to a query.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class MinefieldResponseNACKPdu extends MinefieldFamilyPdu implements Serializable
+{
+ /** Minefield ID */
protected MinefieldIdentifier minefieldID = new MinefieldIdentifier();
-
- /** entity ID making the request */
+
+ /** entity ID making the request */
protected SimulationIdentifier requestingEntityID = new SimulationIdentifier();
-
- /** request ID */
+
+ /** request ID */
protected byte requestID;
-
- /** how many pdus were missing */
+
+ /** how many pdus were missing */
protected byte numberOfMissingPdus;
-
- /** PDU sequence numbers that were missing */
+
+ /** PDU sequence numbers that were missing */
protected byte[] missingPduSequenceNumbers = new byte[0];
-
-
-/** Constructor */
- public MinefieldResponseNACKPdu()
- {
- setPduType( DISPDUType.MINEFIELD_RESPONSE_NACK );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public MinefieldResponseNACKPdu()
+ {
+ setPduType( DISPDUType.MINEFIELD_RESPONSE_NACK );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += minefieldID.getMarshalledSize();
+ marshalSize += requestingEntityID.getMarshalledSize();
+ marshalSize += 1; // requestID
+ marshalSize += 1; // numberOfMissingPdus
+ marshalSize += missingPduSequenceNumbers.length * 1;
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link MinefieldResponseNACKPdu#minefieldID}*/
+public MinefieldResponseNACKPdu setMinefieldID(MinefieldIdentifier pMinefieldID)
{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += minefieldID.getMarshalledSize();
- marshalSize += requestingEntityID.getMarshalledSize();
- marshalSize += 1; // requestID
- marshalSize += 1; // numberOfMissingPdus
- marshalSize += missingPduSequenceNumbers.length * 1;
-
- return marshalSize;
-}
-
-
-/** Setter for {@link MinefieldResponseNACKPdu#minefieldID}*/
-public MinefieldResponseNACKPdu setMinefieldID(MinefieldIdentifier pMinefieldID)
-{
- minefieldID = pMinefieldID;
- return this;
-}
-
-/** Getter for {@link MinefieldResponseNACKPdu#minefieldID}*/
-public MinefieldIdentifier getMinefieldID()
+ minefieldID = pMinefieldID;
+ return this;
+}
+
+/** Getter for {@link MinefieldResponseNACKPdu#minefieldID}*/
+public MinefieldIdentifier getMinefieldID()
{
return minefieldID;
-}
-
-/** Setter for {@link MinefieldResponseNACKPdu#requestingEntityID}*/
-public MinefieldResponseNACKPdu setRequestingEntityID(SimulationIdentifier pRequestingEntityID)
+}
+
+/** Setter for {@link MinefieldResponseNACKPdu#requestingEntityID}*/
+public MinefieldResponseNACKPdu setRequestingEntityID(SimulationIdentifier pRequestingEntityID)
{
- requestingEntityID = pRequestingEntityID;
- return this;
-}
-
-/** Getter for {@link MinefieldResponseNACKPdu#requestingEntityID}*/
-public SimulationIdentifier getRequestingEntityID()
+ requestingEntityID = pRequestingEntityID;
+ return this;
+}
+
+/** Getter for {@link MinefieldResponseNACKPdu#requestingEntityID}*/
+public SimulationIdentifier getRequestingEntityID()
{
return requestingEntityID;
-}
-
-/** Setter for {@link MinefieldResponseNACKPdu#requestID}*/
-public MinefieldResponseNACKPdu setRequestID(byte pRequestID)
+}
+
+/** Setter for {@link MinefieldResponseNACKPdu#requestID}*/
+public MinefieldResponseNACKPdu setRequestID(byte pRequestID)
{
- requestID = pRequestID;
- return this;
-}
-
-/** Getter for {@link MinefieldResponseNACKPdu#requestID}*/
-public byte getRequestID()
+ requestID = pRequestID;
+ return this;
+}
+
+/** Getter for {@link MinefieldResponseNACKPdu#requestID}*/
+public byte getRequestID()
{
return requestID;
-}
-
-/** Setter for {@link MinefieldResponseNACKPdu#missingPduSequenceNumbers}*/
-public MinefieldResponseNACKPdu setMissingPduSequenceNumbers(byte[] pMissingPduSequenceNumbers)
+}
+
+/** Setter for {@link MinefieldResponseNACKPdu#missingPduSequenceNumbers}*/
+public MinefieldResponseNACKPdu setMissingPduSequenceNumbers(byte[] pMissingPduSequenceNumbers)
{
- missingPduSequenceNumbers = pMissingPduSequenceNumbers;
- return this;
-}
-
-/** Getter for {@link MinefieldResponseNACKPdu#missingPduSequenceNumbers}*/
-public byte[] getMissingPduSequenceNumbers()
+ missingPduSequenceNumbers = pMissingPduSequenceNumbers;
+ return this;
+}
+
+/** Getter for {@link MinefieldResponseNACKPdu#missingPduSequenceNumbers}*/
+public byte[] getMissingPduSequenceNumbers()
{
return missingPduSequenceNumbers;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- minefieldID.marshal(dos);
- requestingEntityID.marshal(dos);
- dos.writeByte(requestID);
- dos.writeByte(missingPduSequenceNumbers.length);
-
- for(int idx = 0; idx < missingPduSequenceNumbers.length; idx++)
- dos.writeByte(missingPduSequenceNumbers[idx]);
-
+ {
+ minefieldID.marshal(dos);
+ requestingEntityID.marshal(dos);
+ dos.writeByte(requestID);
+ dos.writeByte(missingPduSequenceNumbers.length);
+
+ for(int idx = 0; idx < missingPduSequenceNumbers.length; idx++)
+ dos.writeByte(missingPduSequenceNumbers[idx]);
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += minefieldID.unmarshal(dis);
- uPosition += requestingEntityID.unmarshal(dis);
- requestID = (byte)dis.readUnsignedByte();
- uPosition += 1;
- numberOfMissingPdus = (byte)dis.readUnsignedByte();
- uPosition += 1;
- for(int idx = 0; idx < missingPduSequenceNumbers.length; idx++)
- missingPduSequenceNumbers[idx] = dis.readByte();
- uPosition += (missingPduSequenceNumbers.length * 1);
+ {
+ uPosition += minefieldID.unmarshal(dis);
+ uPosition += requestingEntityID.unmarshal(dis);
+ requestID = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ numberOfMissingPdus = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ for(int idx = 0; idx < missingPduSequenceNumbers.length; idx++)
+ missingPduSequenceNumbers[idx] = dis.readByte();
+ uPosition += (missingPduSequenceNumbers.length * 1);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- minefieldID.marshal(buff);
- requestingEntityID.marshal(buff);
- buff.put( (byte)requestID);
- buff.put( (byte)missingPduSequenceNumbers.length);
-
- for(int idx = 0; idx < missingPduSequenceNumbers.length; idx++)
- buff.put((byte)missingPduSequenceNumbers[idx]);
-
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ minefieldID.marshal(buff);
+ requestingEntityID.marshal(buff);
+ buff.put( (byte)requestID);
+ buff.put( (byte)missingPduSequenceNumbers.length);
+
+ for(int idx = 0; idx < missingPduSequenceNumbers.length; idx++)
+ buff.put((byte)missingPduSequenceNumbers[idx]);
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- minefieldID.unmarshal(buff);
- requestingEntityID.unmarshal(buff);
- requestID = (byte)(buff.get() & 0xFF);
- numberOfMissingPdus = (byte)(buff.get() & 0xFF);
- for(int idx = 0; idx < missingPduSequenceNumbers.length; idx++)
- missingPduSequenceNumbers[idx] = buff.get();
- return getMarshalledSize();
+
+ minefieldID.unmarshal(buff);
+ requestingEntityID.unmarshal(buff);
+ requestID = (byte)(buff.get() & 0xFF);
+ numberOfMissingPdus = (byte)(buff.get() & 0xFF);
+ for(int idx = 0; idx < missingPduSequenceNumbers.length; idx++)
+ missingPduSequenceNumbers[idx] = buff.get();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final MinefieldResponseNACKPdu rhs = (MinefieldResponseNACKPdu)obj;
-
- if( ! (minefieldID.equals( rhs.minefieldID) )) ivarsEqual = false;
- if( ! (requestingEntityID.equals( rhs.requestingEntityID) )) ivarsEqual = false;
- if( ! (requestID == rhs.requestID)) ivarsEqual = false;
-
- for(int idx = 0; idx < 0; idx++)
- {
- if(!(missingPduSequenceNumbers[idx] == rhs.missingPduSequenceNumbers[idx])) ivarsEqual = false;
- }
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final MinefieldResponseNACKPdu rhs = (MinefieldResponseNACKPdu)obj;
+
+ if( ! (minefieldID.equals( rhs.minefieldID) )) ivarsEqual = false;
+ if( ! (requestingEntityID.equals( rhs.requestingEntityID) )) ivarsEqual = false;
+ if( ! (requestID == rhs.requestID)) ivarsEqual = false;
+
+ for(int idx = 0; idx < 0; idx++)
+ {
+ if(!(missingPduSequenceNumbers[idx] == rhs.missingPduSequenceNumbers[idx])) ivarsEqual = false;
+ }
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" minefieldID: ").append(minefieldID).append("\n");
- sb.append(" requestingEntityID: ").append(requestingEntityID).append("\n");
- sb.append(" requestID: ").append(requestID).append("\n");
- sb.append(" missingPduSequenceNumbers: ").append("\n");
- sb.append(Arrays.toString(missingPduSequenceNumbers)).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" minefieldID: ").append(minefieldID).append("\n");
+ sb.append(" requestingEntityID: ").append(requestingEntityID).append("\n");
+ sb.append(" requestID: ").append(requestID).append("\n");
+ sb.append(" missingPduSequenceNumbers: ").append("\n");
+ sb.append(Arrays.toString(missingPduSequenceNumbers)).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/MinefieldSensorType.java b/src-generated/edu/nps/moves/dis7/MinefieldSensorType.java
index 10dce71cbeb2d376b2f37a01e9a6518a545d3190..283d26286c0a6447f0dbb40e01b4ea4ebc22fb41 100644
--- a/src-generated/edu/nps/moves/dis7/MinefieldSensorType.java
+++ b/src-generated/edu/nps/moves/dis7/MinefieldSensorType.java
@@ -1,162 +1,162 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Information about a minefield sensor. Section 6.2.57
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class MinefieldSensorType extends Object implements Serializable
-{
- /** sensor type. bit fields 0-3 are the type category, 4-15 are teh subcategory */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Information about a minefield sensor. Section 6.2.57
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class MinefieldSensorType extends Object implements Serializable
+{
+ /** sensor type. bit fields 0-3 are the type category, 4-15 are teh subcategory */
protected short sensorType;
-
-
-/** Constructor */
- public MinefieldSensorType()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public MinefieldSensorType()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 2; // sensorType
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link MinefieldSensorType#sensorType}*/
+public MinefieldSensorType setSensorType(short pSensorType)
{
- int marshalSize = 0;
-
- marshalSize += 2; // sensorType
-
- return marshalSize;
-}
-
-
-/** Setter for {@link MinefieldSensorType#sensorType}*/
-public MinefieldSensorType setSensorType(short pSensorType)
-{
- sensorType = pSensorType;
- return this;
-}
-
-/** Getter for {@link MinefieldSensorType#sensorType}*/
-public short getSensorType()
+ sensorType = pSensorType;
+ return this;
+}
+
+/** Getter for {@link MinefieldSensorType#sensorType}*/
+public short getSensorType()
{
return sensorType;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeShort(sensorType);
+ {
+ dos.writeShort(sensorType);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- sensorType = (short)dis.readUnsignedShort();
- uPosition += 2;
+ {
+ sensorType = (short)dis.readUnsignedShort();
+ uPosition += 2;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putShort( (short)sensorType);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- sensorType = (short)(buff.getShort() & 0xFFFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putShort( (short)sensorType);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ sensorType = (short)(buff.getShort() & 0xFFFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final MinefieldSensorType rhs = (MinefieldSensorType)obj;
-
- if( ! (sensorType == rhs.sensorType)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final MinefieldSensorType rhs = (MinefieldSensorType)obj;
+
+ if( ! (sensorType == rhs.sensorType)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" sensorType: ").append(sensorType).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" sensorType: ").append(sensorType).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/MinefieldStatePdu.java b/src-generated/edu/nps/moves/dis7/MinefieldStatePdu.java
index 1764ea52d468360e3be3f62fb1e658439e454564..9afb5ce50ece7063901548287d8731b0f65d0964 100644
--- a/src-generated/edu/nps/moves/dis7/MinefieldStatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/MinefieldStatePdu.java
@@ -1,455 +1,455 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.10.2 Communicate information about the minefield, including the location, perimeter, and types of mines contained within it.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class MinefieldStatePdu extends MinefieldFamilyPdu implements Serializable
-{
- /** Minefield ID */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 5.10.2 Communicate information about the minefield, including the location, perimeter, and types of mines contained within it.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class MinefieldStatePdu extends MinefieldFamilyPdu implements Serializable
+{
+ /** Minefield ID */
protected MinefieldIdentifier minefieldID = new MinefieldIdentifier();
-
- /** Minefield sequence */
+
+ /** Minefield sequence */
protected short minefieldSequence;
-
- /** force ID uid 6 */
+
+ /** force ID uid 6 */
protected ForceID forceID = ForceID.values()[0];
-
- /** Number of permieter points */
+
+ /** Number of permieter points */
protected byte numberOfPerimeterPoints;
-
- /** type of minefield */
+
+ /** type of minefield */
protected EntityType minefieldType = new EntityType();
-
- /** how many mine types */
+
+ /** how many mine types */
protected short numberOfMineTypes;
-
- /** location of center of minefield in world coords */
+
+ /** location of center of minefield in world coords */
protected Vector3Double minefieldLocation = new Vector3Double();
-
- /** orientation of minefield */
+
+ /** orientation of minefield */
protected EulerAngles minefieldOrientation = new EulerAngles();
-
- /** appearance bitflags uid 190 */
+
+ /** appearance bitflags uid 190 */
protected MinefieldStateAppearanceBitMap appearance = new MinefieldStateAppearanceBitMap();
-
- /** protocolMode. First two bits are the protocol mode, 14 bits reserved. */
+
+ /** protocolMode. First two bits are the protocol mode, 14 bits reserved. */
protected ProtocolMode protocolMode = new ProtocolMode();
-
- /** perimeter points for the minefield */
+
+ /** perimeter points for the minefield */
protected List< Vector2Float > perimeterPoints = new ArrayList< Vector2Float >();
-
- /** Type of mines */
+
+ /** Type of mines */
protected List< EntityType > mineType = new ArrayList< EntityType >();
-
-
-/** Constructor */
- public MinefieldStatePdu()
- {
- setPduType( DISPDUType.MINEFIELD_STATE );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += minefieldID.getMarshalledSize();
- marshalSize += 2; // minefieldSequence
- marshalSize += forceID.getMarshalledSize();
- marshalSize += 1; // numberOfPerimeterPoints
- marshalSize += minefieldType.getMarshalledSize();
- marshalSize += 2; // numberOfMineTypes
- marshalSize += minefieldLocation.getMarshalledSize();
- marshalSize += minefieldOrientation.getMarshalledSize();
- marshalSize += appearance.getMarshalledSize();
- marshalSize += protocolMode.getMarshalledSize();
- for(int idx=0; idx < perimeterPoints.size(); idx++)
- {
- Vector2Float listElement = perimeterPoints.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
- for(int idx=0; idx < mineType.size(); idx++)
- {
- EntityType listElement = mineType.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link MinefieldStatePdu#minefieldID}*/
-public MinefieldStatePdu setMinefieldID(MinefieldIdentifier pMinefieldID)
+
+
+/** Constructor */
+ public MinefieldStatePdu()
+ {
+ setPduType( DISPDUType.MINEFIELD_STATE );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += minefieldID.getMarshalledSize();
+ marshalSize += 2; // minefieldSequence
+ marshalSize += forceID.getMarshalledSize();
+ marshalSize += 1; // numberOfPerimeterPoints
+ marshalSize += minefieldType.getMarshalledSize();
+ marshalSize += 2; // numberOfMineTypes
+ marshalSize += minefieldLocation.getMarshalledSize();
+ marshalSize += minefieldOrientation.getMarshalledSize();
+ marshalSize += appearance.getMarshalledSize();
+ marshalSize += protocolMode.getMarshalledSize();
+ for(int idx=0; idx < perimeterPoints.size(); idx++)
+ {
+ Vector2Float listElement = perimeterPoints.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+ for(int idx=0; idx < mineType.size(); idx++)
+ {
+ EntityType listElement = mineType.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link MinefieldStatePdu#minefieldID}*/
+public MinefieldStatePdu setMinefieldID(MinefieldIdentifier pMinefieldID)
{
- minefieldID = pMinefieldID;
- return this;
-}
-
-/** Getter for {@link MinefieldStatePdu#minefieldID}*/
-public MinefieldIdentifier getMinefieldID()
+ minefieldID = pMinefieldID;
+ return this;
+}
+
+/** Getter for {@link MinefieldStatePdu#minefieldID}*/
+public MinefieldIdentifier getMinefieldID()
{
return minefieldID;
-}
-
-/** Setter for {@link MinefieldStatePdu#minefieldSequence}*/
-public MinefieldStatePdu setMinefieldSequence(short pMinefieldSequence)
+}
+
+/** Setter for {@link MinefieldStatePdu#minefieldSequence}*/
+public MinefieldStatePdu setMinefieldSequence(short pMinefieldSequence)
{
- minefieldSequence = pMinefieldSequence;
- return this;
-}
-
-/** Getter for {@link MinefieldStatePdu#minefieldSequence}*/
-public short getMinefieldSequence()
+ minefieldSequence = pMinefieldSequence;
+ return this;
+}
+
+/** Getter for {@link MinefieldStatePdu#minefieldSequence}*/
+public short getMinefieldSequence()
{
return minefieldSequence;
-}
-
-/** Setter for {@link MinefieldStatePdu#forceID}*/
-public MinefieldStatePdu setForceID(ForceID pForceID)
+}
+
+/** Setter for {@link MinefieldStatePdu#forceID}*/
+public MinefieldStatePdu setForceID(ForceID pForceID)
{
- forceID = pForceID;
- return this;
-}
-
-/** Getter for {@link MinefieldStatePdu#forceID}*/
-public ForceID getForceID()
+ forceID = pForceID;
+ return this;
+}
+
+/** Getter for {@link MinefieldStatePdu#forceID}*/
+public ForceID getForceID()
{
return forceID;
-}
-
-/** Setter for {@link MinefieldStatePdu#minefieldType}*/
-public MinefieldStatePdu setMinefieldType(EntityType pMinefieldType)
+}
+
+/** Setter for {@link MinefieldStatePdu#minefieldType}*/
+public MinefieldStatePdu setMinefieldType(EntityType pMinefieldType)
{
- minefieldType = pMinefieldType;
- return this;
-}
-
-/** Getter for {@link MinefieldStatePdu#minefieldType}*/
-public EntityType getMinefieldType()
+ minefieldType = pMinefieldType;
+ return this;
+}
+
+/** Getter for {@link MinefieldStatePdu#minefieldType}*/
+public EntityType getMinefieldType()
{
return minefieldType;
-}
-
-/** Setter for {@link MinefieldStatePdu#minefieldLocation}*/
-public MinefieldStatePdu setMinefieldLocation(Vector3Double pMinefieldLocation)
+}
+
+/** Setter for {@link MinefieldStatePdu#minefieldLocation}*/
+public MinefieldStatePdu setMinefieldLocation(Vector3Double pMinefieldLocation)
{
- minefieldLocation = pMinefieldLocation;
- return this;
-}
-
-/** Getter for {@link MinefieldStatePdu#minefieldLocation}*/
-public Vector3Double getMinefieldLocation()
+ minefieldLocation = pMinefieldLocation;
+ return this;
+}
+
+/** Getter for {@link MinefieldStatePdu#minefieldLocation}*/
+public Vector3Double getMinefieldLocation()
{
return minefieldLocation;
-}
-
-/** Setter for {@link MinefieldStatePdu#minefieldOrientation}*/
-public MinefieldStatePdu setMinefieldOrientation(EulerAngles pMinefieldOrientation)
+}
+
+/** Setter for {@link MinefieldStatePdu#minefieldOrientation}*/
+public MinefieldStatePdu setMinefieldOrientation(EulerAngles pMinefieldOrientation)
{
- minefieldOrientation = pMinefieldOrientation;
- return this;
-}
-
-/** Getter for {@link MinefieldStatePdu#minefieldOrientation}*/
-public EulerAngles getMinefieldOrientation()
+ minefieldOrientation = pMinefieldOrientation;
+ return this;
+}
+
+/** Getter for {@link MinefieldStatePdu#minefieldOrientation}*/
+public EulerAngles getMinefieldOrientation()
{
return minefieldOrientation;
-}
-
-/** Setter for {@link MinefieldStatePdu#appearance}*/
-public MinefieldStatePdu setAppearance(MinefieldStateAppearanceBitMap pAppearance)
+}
+
+/** Setter for {@link MinefieldStatePdu#appearance}*/
+public MinefieldStatePdu setAppearance(MinefieldStateAppearanceBitMap pAppearance)
{
- appearance = pAppearance;
- return this;
-}
-
-/** Setter for {@link MinefieldStatePdu#appearance}*/
-public MinefieldStateAppearanceBitMap getAppearance()
+ appearance = pAppearance;
+ return this;
+}
+
+/** Setter for {@link MinefieldStatePdu#appearance}*/
+public MinefieldStateAppearanceBitMap getAppearance()
{
return appearance;
-}
-
-/** Setter for {@link MinefieldStatePdu#protocolMode}*/
-public MinefieldStatePdu setProtocolMode(ProtocolMode pProtocolMode)
+}
+
+/** Setter for {@link MinefieldStatePdu#protocolMode}*/
+public MinefieldStatePdu setProtocolMode(ProtocolMode pProtocolMode)
{
- protocolMode = pProtocolMode;
- return this;
-}
-
-/** Getter for {@link MinefieldStatePdu#protocolMode}*/
-public ProtocolMode getProtocolMode()
+ protocolMode = pProtocolMode;
+ return this;
+}
+
+/** Getter for {@link MinefieldStatePdu#protocolMode}*/
+public ProtocolMode getProtocolMode()
{
return protocolMode;
-}
-
-/** Setter for {@link MinefieldStatePdu#perimeterPoints}*/
-public MinefieldStatePdu setPerimeterPoints(List<Vector2Float> pPerimeterPoints)
+}
+
+/** Setter for {@link MinefieldStatePdu#perimeterPoints}*/
+public MinefieldStatePdu setPerimeterPoints(List<Vector2Float> pPerimeterPoints)
{
- perimeterPoints = pPerimeterPoints;
- return this;
-}
-
-/** Getter for {@link MinefieldStatePdu#perimeterPoints}*/
-public List<Vector2Float> getPerimeterPoints()
+ perimeterPoints = pPerimeterPoints;
+ return this;
+}
+
+/** Getter for {@link MinefieldStatePdu#perimeterPoints}*/
+public List<Vector2Float> getPerimeterPoints()
{
return perimeterPoints;
-}
-
-/** Setter for {@link MinefieldStatePdu#mineType}*/
-public MinefieldStatePdu setMineType(List<EntityType> pMineType)
+}
+
+/** Setter for {@link MinefieldStatePdu#mineType}*/
+public MinefieldStatePdu setMineType(List<EntityType> pMineType)
{
- mineType = pMineType;
- return this;
-}
-
-/** Getter for {@link MinefieldStatePdu#mineType}*/
-public List<EntityType> getMineType()
+ mineType = pMineType;
+ return this;
+}
+
+/** Getter for {@link MinefieldStatePdu#mineType}*/
+public List<EntityType> getMineType()
{
return mineType;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- minefieldID.marshal(dos);
- dos.writeShort(minefieldSequence);
- forceID.marshal(dos);
- dos.writeByte(perimeterPoints.size());
- minefieldType.marshal(dos);
- dos.writeShort(mineType.size());
- minefieldLocation.marshal(dos);
- minefieldOrientation.marshal(dos);
- appearance.marshal(dos);
- protocolMode.marshal(dos);
-
- for(int idx = 0; idx < perimeterPoints.size(); idx++)
- {
- Vector2Float aVector2Float = perimeterPoints.get(idx);
- aVector2Float.marshal(dos);
- }
-
-
- for(int idx = 0; idx < mineType.size(); idx++)
- {
- EntityType aEntityType = mineType.get(idx);
- aEntityType.marshal(dos);
- }
-
+ {
+ minefieldID.marshal(dos);
+ dos.writeShort(minefieldSequence);
+ forceID.marshal(dos);
+ dos.writeByte(perimeterPoints.size());
+ minefieldType.marshal(dos);
+ dos.writeShort(mineType.size());
+ minefieldLocation.marshal(dos);
+ minefieldOrientation.marshal(dos);
+ appearance.marshal(dos);
+ protocolMode.marshal(dos);
+
+ for(int idx = 0; idx < perimeterPoints.size(); idx++)
+ {
+ Vector2Float aVector2Float = perimeterPoints.get(idx);
+ aVector2Float.marshal(dos);
+ }
+
+
+ for(int idx = 0; idx < mineType.size(); idx++)
+ {
+ EntityType aEntityType = mineType.get(idx);
+ aEntityType.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += minefieldID.unmarshal(dis);
- minefieldSequence = (short)dis.readUnsignedShort();
- uPosition += 2;
- forceID = ForceID.unmarshalEnum(dis);
- uPosition += forceID.getMarshalledSize();
- numberOfPerimeterPoints = (byte)dis.readUnsignedByte();
- uPosition += 1;
- uPosition += minefieldType.unmarshal(dis);
- numberOfMineTypes = (short)dis.readUnsignedShort();
- uPosition += 2;
- uPosition += minefieldLocation.unmarshal(dis);
- uPosition += minefieldOrientation.unmarshal(dis);
- uPosition += appearance.unmarshal(dis);
- uPosition += protocolMode.unmarshal(dis);
- for(int idx = 0; idx < numberOfPerimeterPoints; idx++)
- {
- Vector2Float anX = new Vector2Float();
- uPosition += anX.unmarshal(dis);
- perimeterPoints.add(anX);
- }
-
- for(int idx = 0; idx < numberOfMineTypes; idx++)
- {
- EntityType anX = new EntityType();
- uPosition += anX.unmarshal(dis);
- mineType.add(anX);
- }
-
+ {
+ uPosition += minefieldID.unmarshal(dis);
+ minefieldSequence = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ forceID = ForceID.unmarshalEnum(dis);
+ uPosition += forceID.getMarshalledSize();
+ numberOfPerimeterPoints = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ uPosition += minefieldType.unmarshal(dis);
+ numberOfMineTypes = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ uPosition += minefieldLocation.unmarshal(dis);
+ uPosition += minefieldOrientation.unmarshal(dis);
+ uPosition += appearance.unmarshal(dis);
+ uPosition += protocolMode.unmarshal(dis);
+ for(int idx = 0; idx < numberOfPerimeterPoints; idx++)
+ {
+ Vector2Float anX = new Vector2Float();
+ uPosition += anX.unmarshal(dis);
+ perimeterPoints.add(anX);
+ }
+
+ for(int idx = 0; idx < numberOfMineTypes; idx++)
+ {
+ EntityType anX = new EntityType();
+ uPosition += anX.unmarshal(dis);
+ mineType.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- minefieldID.marshal(buff);
- buff.putShort( (short)minefieldSequence);
- forceID.marshal(buff);
- buff.put( (byte)perimeterPoints.size());
- minefieldType.marshal(buff);
- buff.putShort( (short)mineType.size());
- minefieldLocation.marshal(buff);
- minefieldOrientation.marshal(buff);
- appearance.marshal(buff);
- protocolMode.marshal(buff);
-
- for(int idx = 0; idx < perimeterPoints.size(); idx++)
- {
- Vector2Float aVector2Float = perimeterPoints.get(idx);
- aVector2Float.marshal(buff);
- }
-
-
- for(int idx = 0; idx < mineType.size(); idx++)
- {
- EntityType aEntityType = mineType.get(idx);
- aEntityType.marshal(buff);
- }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ minefieldID.marshal(buff);
+ buff.putShort( (short)minefieldSequence);
+ forceID.marshal(buff);
+ buff.put( (byte)perimeterPoints.size());
+ minefieldType.marshal(buff);
+ buff.putShort( (short)mineType.size());
+ minefieldLocation.marshal(buff);
+ minefieldOrientation.marshal(buff);
+ appearance.marshal(buff);
+ protocolMode.marshal(buff);
+
+ for(int idx = 0; idx < perimeterPoints.size(); idx++)
+ {
+ Vector2Float aVector2Float = perimeterPoints.get(idx);
+ aVector2Float.marshal(buff);
+ }
+
+
+ for(int idx = 0; idx < mineType.size(); idx++)
+ {
+ EntityType aEntityType = mineType.get(idx);
+ aEntityType.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- minefieldID.unmarshal(buff);
- minefieldSequence = (short)(buff.getShort() & 0xFFFF);
- forceID = ForceID.unmarshalEnum(buff);
- numberOfPerimeterPoints = (byte)(buff.get() & 0xFF);
- minefieldType.unmarshal(buff);
- numberOfMineTypes = (short)(buff.getShort() & 0xFFFF);
- minefieldLocation.unmarshal(buff);
- minefieldOrientation.unmarshal(buff);
- appearance.unmarshal(buff);
- protocolMode.unmarshal(buff);
- for(int idx = 0; idx < numberOfPerimeterPoints; idx++)
- {
- Vector2Float anX = new Vector2Float();
- anX.unmarshal(buff);
- perimeterPoints.add(anX);
- }
-
- for(int idx = 0; idx < numberOfMineTypes; idx++)
- {
- EntityType anX = new EntityType();
- anX.unmarshal(buff);
- mineType.add(anX);
- }
-
- return getMarshalledSize();
+
+ minefieldID.unmarshal(buff);
+ minefieldSequence = (short)(buff.getShort() & 0xFFFF);
+ forceID = ForceID.unmarshalEnum(buff);
+ numberOfPerimeterPoints = (byte)(buff.get() & 0xFF);
+ minefieldType.unmarshal(buff);
+ numberOfMineTypes = (short)(buff.getShort() & 0xFFFF);
+ minefieldLocation.unmarshal(buff);
+ minefieldOrientation.unmarshal(buff);
+ appearance.unmarshal(buff);
+ protocolMode.unmarshal(buff);
+ for(int idx = 0; idx < numberOfPerimeterPoints; idx++)
+ {
+ Vector2Float anX = new Vector2Float();
+ anX.unmarshal(buff);
+ perimeterPoints.add(anX);
+ }
+
+ for(int idx = 0; idx < numberOfMineTypes; idx++)
+ {
+ EntityType anX = new EntityType();
+ anX.unmarshal(buff);
+ mineType.add(anX);
+ }
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final MinefieldStatePdu rhs = (MinefieldStatePdu)obj;
-
- if( ! (minefieldID.equals( rhs.minefieldID) )) ivarsEqual = false;
- if( ! (minefieldSequence == rhs.minefieldSequence)) ivarsEqual = false;
- if( ! (forceID == rhs.forceID)) ivarsEqual = false;
- if( ! (minefieldType.equals( rhs.minefieldType) )) ivarsEqual = false;
- if( ! (minefieldLocation.equals( rhs.minefieldLocation) )) ivarsEqual = false;
- if( ! (minefieldOrientation.equals( rhs.minefieldOrientation) )) ivarsEqual = false;
- if( ! (appearance.equals( rhs.appearance) )) ivarsEqual = false;
- if( ! (protocolMode.equals( rhs.protocolMode) )) ivarsEqual = false;
-
- for(int idx = 0; idx < perimeterPoints.size(); idx++)
- if( ! ( perimeterPoints.get(idx).equals(rhs.perimeterPoints.get(idx)))) ivarsEqual = false;
-
-
- for(int idx = 0; idx < mineType.size(); idx++)
- if( ! ( mineType.get(idx).equals(rhs.mineType.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final MinefieldStatePdu rhs = (MinefieldStatePdu)obj;
+
+ if( ! (minefieldID.equals( rhs.minefieldID) )) ivarsEqual = false;
+ if( ! (minefieldSequence == rhs.minefieldSequence)) ivarsEqual = false;
+ if( ! (forceID == rhs.forceID)) ivarsEqual = false;
+ if( ! (minefieldType.equals( rhs.minefieldType) )) ivarsEqual = false;
+ if( ! (minefieldLocation.equals( rhs.minefieldLocation) )) ivarsEqual = false;
+ if( ! (minefieldOrientation.equals( rhs.minefieldOrientation) )) ivarsEqual = false;
+ if( ! (appearance.equals( rhs.appearance) )) ivarsEqual = false;
+ if( ! (protocolMode.equals( rhs.protocolMode) )) ivarsEqual = false;
+
+ for(int idx = 0; idx < perimeterPoints.size(); idx++)
+ if( ! ( perimeterPoints.get(idx).equals(rhs.perimeterPoints.get(idx)))) ivarsEqual = false;
+
+
+ for(int idx = 0; idx < mineType.size(); idx++)
+ if( ! ( mineType.get(idx).equals(rhs.mineType.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" minefieldID: ").append(minefieldID).append("\n");
- sb.append(" minefieldSequence: ").append(minefieldSequence).append("\n");
- sb.append(" forceID: ").append(forceID).append("\n");
- sb.append(" minefieldType: ").append(minefieldType).append("\n");
- sb.append(" minefieldLocation: ").append(minefieldLocation).append("\n");
- sb.append(" minefieldOrientation: ").append(minefieldOrientation).append("\n");
- sb.append(" appearance: ").append(appearance).append("\n");
- sb.append(" protocolMode: ").append(protocolMode).append("\n");
- sb.append(" perimeterPoints: ").append("\n");
- perimeterPoints.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
- sb.append(" mineType: ").append("\n");
- mineType.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" minefieldID: ").append(minefieldID).append("\n");
+ sb.append(" minefieldSequence: ").append(minefieldSequence).append("\n");
+ sb.append(" forceID: ").append(forceID).append("\n");
+ sb.append(" minefieldType: ").append(minefieldType).append("\n");
+ sb.append(" minefieldLocation: ").append(minefieldLocation).append("\n");
+ sb.append(" minefieldOrientation: ").append(minefieldOrientation).append("\n");
+ sb.append(" appearance: ").append(appearance).append("\n");
+ sb.append(" protocolMode: ").append(protocolMode).append("\n");
+ sb.append(" perimeterPoints: ").append("\n");
+ perimeterPoints.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+ sb.append(" mineType: ").append("\n");
+ mineType.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ModulationParameters.java b/src-generated/edu/nps/moves/dis7/ModulationParameters.java
index 0d89118b1585b262878d1c7870775feadd82c605..312a29b7dbc3adb538faf7eb0fb6d39bbdce4fe8 100644
--- a/src-generated/edu/nps/moves/dis7/ModulationParameters.java
+++ b/src-generated/edu/nps/moves/dis7/ModulationParameters.java
@@ -1,184 +1,184 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Modulation parameters associated with a specific radio system. 6.2.58
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class ModulationParameters extends Object implements Serializable
-{
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Modulation parameters associated with a specific radio system. 6.2.58
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class ModulationParameters extends Object implements Serializable
+{
protected byte[] recordSpecificFields = new byte[0];
-
+
private byte[] padding = new byte[0]; // pad to 64-bit boundary
-
-
-/** Constructor */
- public ModulationParameters()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public ModulationParameters()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += recordSpecificFields.length * 1;
+ marshalSize += padding.length;
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link ModulationParameters#recordSpecificFields}*/
+public ModulationParameters setRecordSpecificFields(byte[] pRecordSpecificFields)
{
- int marshalSize = 0;
-
- marshalSize += recordSpecificFields.length * 1;
- marshalSize += padding.length;
-
- return marshalSize;
-}
-
-
-/** Setter for {@link ModulationParameters#recordSpecificFields}*/
-public ModulationParameters setRecordSpecificFields(byte[] pRecordSpecificFields)
-{
- recordSpecificFields = pRecordSpecificFields;
- return this;
-}
-
-/** Getter for {@link ModulationParameters#recordSpecificFields}*/
-public byte[] getRecordSpecificFields()
+ recordSpecificFields = pRecordSpecificFields;
+ return this;
+}
+
+/** Getter for {@link ModulationParameters#recordSpecificFields}*/
+public byte[] getRecordSpecificFields()
{
return recordSpecificFields;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
-
- for(int idx = 0; idx < recordSpecificFields.length; idx++)
- dos.writeByte(recordSpecificFields[idx]);
-
- padding = new byte[Align.to64bits(dos)];
+ {
+
+ for(int idx = 0; idx < recordSpecificFields.length; idx++)
+ dos.writeByte(recordSpecificFields[idx]);
+
+ padding = new byte[Align.to64bits(dos)];
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- for(int idx = 0; idx < recordSpecificFields.length; idx++)
- recordSpecificFields[idx] = dis.readByte();
- uPosition += (recordSpecificFields.length * 1);
- padding = new byte[Align.from64bits(uPosition,dis)];
- uPosition += padding.length;
+ {
+ for(int idx = 0; idx < recordSpecificFields.length; idx++)
+ recordSpecificFields[idx] = dis.readByte();
+ uPosition += (recordSpecificFields.length * 1);
+ padding = new byte[Align.from64bits(uPosition,dis)];
+ uPosition += padding.length;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
-
- for(int idx = 0; idx < recordSpecificFields.length; idx++)
- buff.put((byte)recordSpecificFields[idx]);
-
- padding = new byte[Align.to64bits(buff)];
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- for(int idx = 0; idx < recordSpecificFields.length; idx++)
- recordSpecificFields[idx] = buff.get();
- padding = new byte[Align.from64bits(buff)];
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+
+ for(int idx = 0; idx < recordSpecificFields.length; idx++)
+ buff.put((byte)recordSpecificFields[idx]);
+
+ padding = new byte[Align.to64bits(buff)];
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ for(int idx = 0; idx < recordSpecificFields.length; idx++)
+ recordSpecificFields[idx] = buff.get();
+ padding = new byte[Align.from64bits(buff)];
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final ModulationParameters rhs = (ModulationParameters)obj;
-
-
- for(int idx = 0; idx < 0; idx++)
- {
- if(!(recordSpecificFields[idx] == rhs.recordSpecificFields[idx])) ivarsEqual = false;
- }
-
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final ModulationParameters rhs = (ModulationParameters)obj;
+
+
+ for(int idx = 0; idx < 0; idx++)
+ {
+ if(!(recordSpecificFields[idx] == rhs.recordSpecificFields[idx])) ivarsEqual = false;
+ }
+
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" recordSpecificFields: ").append("\n");
- sb.append(Arrays.toString(recordSpecificFields)).append("\n");
- sb.append(" padding: ").append(padding).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" recordSpecificFields: ").append("\n");
+ sb.append(Arrays.toString(recordSpecificFields)).append("\n");
+ sb.append(" padding: ").append(padding).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ModulationType.java b/src-generated/edu/nps/moves/dis7/ModulationType.java
index bba818a273418fec936060c5dfc378fb81a64962..4e60f082b0740e4ca1fdf6fc076294b33249ed95 100644
--- a/src-generated/edu/nps/moves/dis7/ModulationType.java
+++ b/src-generated/edu/nps/moves/dis7/ModulationType.java
@@ -1,234 +1,234 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Information about the type of modulation used for radio transmission. 6.2.59
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class ModulationType extends Object implements Serializable
-{
- /** This field shall indicate the spread spectrum technique or combination of spread spectrum techniques in use. Bit field. 0=freq hopping, 1=psuedo noise, time hopping=2, reamining bits unused */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Information about the type of modulation used for radio transmission. 6.2.59
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class ModulationType extends Object implements Serializable
+{
+ /** This field shall indicate the spread spectrum technique or combination of spread spectrum techniques in use. Bit field. 0=freq hopping, 1=psuedo noise, time hopping=2, reamining bits unused */
protected short spreadSpectrum;
-
- /** the major classification of the modulation type. UID 155 */
+
+ /** the major classification of the modulation type. UID 155 */
protected TransmitterMajorModulation majorModulation = TransmitterMajorModulation.values()[0];
-
- /** provide certain detailed information depending upon the major modulation type, uid 156-162 */
+
+ /** provide certain detailed information depending upon the major modulation type, uid 156-162 */
protected short detail;
-
- /** the radio system associated with this Transmitter PDU and shall be used as the basis to interpret other fields whose values depend on a specific radio system. uid =163 */
+
+ /** the radio system associated with this Transmitter PDU and shall be used as the basis to interpret other fields whose values depend on a specific radio system. uid =163 */
protected TransmitterModulationTypeSystem radioSystem = TransmitterModulationTypeSystem.values()[0];
-
-
-/** Constructor */
- public ModulationType()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public ModulationType()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 2; // spreadSpectrum
+ marshalSize += majorModulation.getMarshalledSize();
+ marshalSize += 2; // detail
+ marshalSize += radioSystem.getMarshalledSize();
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link ModulationType#spreadSpectrum}*/
+public ModulationType setSpreadSpectrum(short pSpreadSpectrum)
{
- int marshalSize = 0;
-
- marshalSize += 2; // spreadSpectrum
- marshalSize += majorModulation.getMarshalledSize();
- marshalSize += 2; // detail
- marshalSize += radioSystem.getMarshalledSize();
-
- return marshalSize;
-}
-
-
-/** Setter for {@link ModulationType#spreadSpectrum}*/
-public ModulationType setSpreadSpectrum(short pSpreadSpectrum)
-{
- spreadSpectrum = pSpreadSpectrum;
- return this;
-}
-
-/** Getter for {@link ModulationType#spreadSpectrum}*/
-public short getSpreadSpectrum()
+ spreadSpectrum = pSpreadSpectrum;
+ return this;
+}
+
+/** Getter for {@link ModulationType#spreadSpectrum}*/
+public short getSpreadSpectrum()
{
return spreadSpectrum;
-}
-
-/** Setter for {@link ModulationType#majorModulation}*/
-public ModulationType setMajorModulation(TransmitterMajorModulation pMajorModulation)
+}
+
+/** Setter for {@link ModulationType#majorModulation}*/
+public ModulationType setMajorModulation(TransmitterMajorModulation pMajorModulation)
{
- majorModulation = pMajorModulation;
- return this;
-}
-
-/** Getter for {@link ModulationType#majorModulation}*/
-public TransmitterMajorModulation getMajorModulation()
+ majorModulation = pMajorModulation;
+ return this;
+}
+
+/** Getter for {@link ModulationType#majorModulation}*/
+public TransmitterMajorModulation getMajorModulation()
{
return majorModulation;
-}
-
-/** Setter for {@link ModulationType#detail}*/
-public ModulationType setDetail(short pDetail)
+}
+
+/** Setter for {@link ModulationType#detail}*/
+public ModulationType setDetail(short pDetail)
{
- detail = pDetail;
- return this;
-}
-
-/** Getter for {@link ModulationType#detail}*/
-public short getDetail()
+ detail = pDetail;
+ return this;
+}
+
+/** Getter for {@link ModulationType#detail}*/
+public short getDetail()
{
return detail;
-}
-
-/** Setter for {@link ModulationType#radioSystem}*/
-public ModulationType setRadioSystem(TransmitterModulationTypeSystem pRadioSystem)
+}
+
+/** Setter for {@link ModulationType#radioSystem}*/
+public ModulationType setRadioSystem(TransmitterModulationTypeSystem pRadioSystem)
{
- radioSystem = pRadioSystem;
- return this;
-}
-
-/** Getter for {@link ModulationType#radioSystem}*/
-public TransmitterModulationTypeSystem getRadioSystem()
+ radioSystem = pRadioSystem;
+ return this;
+}
+
+/** Getter for {@link ModulationType#radioSystem}*/
+public TransmitterModulationTypeSystem getRadioSystem()
{
return radioSystem;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeShort(spreadSpectrum);
- majorModulation.marshal(dos);
- dos.writeShort(detail);
- radioSystem.marshal(dos);
+ {
+ dos.writeShort(spreadSpectrum);
+ majorModulation.marshal(dos);
+ dos.writeShort(detail);
+ radioSystem.marshal(dos);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- spreadSpectrum = (short)dis.readUnsignedShort();
- uPosition += 2;
- majorModulation = TransmitterMajorModulation.unmarshalEnum(dis);
- uPosition += majorModulation.getMarshalledSize();
- detail = (short)dis.readUnsignedShort();
- uPosition += 2;
- radioSystem = TransmitterModulationTypeSystem.unmarshalEnum(dis);
- uPosition += radioSystem.getMarshalledSize();
+ {
+ spreadSpectrum = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ majorModulation = TransmitterMajorModulation.unmarshalEnum(dis);
+ uPosition += majorModulation.getMarshalledSize();
+ detail = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ radioSystem = TransmitterModulationTypeSystem.unmarshalEnum(dis);
+ uPosition += radioSystem.getMarshalledSize();
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putShort( (short)spreadSpectrum);
- majorModulation.marshal(buff);
- buff.putShort( (short)detail);
- radioSystem.marshal(buff);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- spreadSpectrum = (short)(buff.getShort() & 0xFFFF);
- majorModulation = TransmitterMajorModulation.unmarshalEnum(buff);
- detail = (short)(buff.getShort() & 0xFFFF);
- radioSystem = TransmitterModulationTypeSystem.unmarshalEnum(buff);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putShort( (short)spreadSpectrum);
+ majorModulation.marshal(buff);
+ buff.putShort( (short)detail);
+ radioSystem.marshal(buff);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ spreadSpectrum = (short)(buff.getShort() & 0xFFFF);
+ majorModulation = TransmitterMajorModulation.unmarshalEnum(buff);
+ detail = (short)(buff.getShort() & 0xFFFF);
+ radioSystem = TransmitterModulationTypeSystem.unmarshalEnum(buff);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final ModulationType rhs = (ModulationType)obj;
-
- if( ! (spreadSpectrum == rhs.spreadSpectrum)) ivarsEqual = false;
- if( ! (majorModulation == rhs.majorModulation)) ivarsEqual = false;
- if( ! (detail == rhs.detail)) ivarsEqual = false;
- if( ! (radioSystem == rhs.radioSystem)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final ModulationType rhs = (ModulationType)obj;
+
+ if( ! (spreadSpectrum == rhs.spreadSpectrum)) ivarsEqual = false;
+ if( ! (majorModulation == rhs.majorModulation)) ivarsEqual = false;
+ if( ! (detail == rhs.detail)) ivarsEqual = false;
+ if( ! (radioSystem == rhs.radioSystem)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" spreadSpectrum: ").append(spreadSpectrum).append("\n");
- sb.append(" majorModulation: ").append(majorModulation).append("\n");
- sb.append(" detail: ").append(detail).append("\n");
- sb.append(" radioSystem: ").append(radioSystem).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" spreadSpectrum: ").append(spreadSpectrum).append("\n");
+ sb.append(" majorModulation: ").append(majorModulation).append("\n");
+ sb.append(" detail: ").append(detail).append("\n");
+ sb.append(" radioSystem: ").append(radioSystem).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/Munition.java b/src-generated/edu/nps/moves/dis7/Munition.java
index 95e855e0ba04377cf5bd816c2ceef49d4a48b9d3..78d9d8e35cb4f79321a6879ce0fbe86548d012b7 100644
--- a/src-generated/edu/nps/moves/dis7/Munition.java
+++ b/src-generated/edu/nps/moves/dis7/Munition.java
@@ -1,257 +1,257 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * An entity's munition (e.g., bomb, missile) information shall be represented by one or more Munition records. For each type or location of munition, this record shall specify the type, location, quantity and status of munitions that an entity contains. Section 6.2.60
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class Munition extends Object implements Serializable
-{
- /** This field shall identify the entity type of the munition. See section 6.2.30. */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * An entity's munition (e.g., bomb, missile) information shall be represented by one or more Munition records. For each type or location of munition, this record shall specify the type, location, quantity and status of munitions that an entity contains. Section 6.2.60
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class Munition extends Object implements Serializable
+{
+ /** This field shall identify the entity type of the munition. See section 6.2.30. */
protected EntityType munitionType = new EntityType();
-
- /** the station or launcher to which the munition is assigned. See Annex I */
+
+ /** the station or launcher to which the munition is assigned. See Annex I */
protected int station;
-
- /** the quantity remaining of this munition. */
+
+ /** the quantity remaining of this munition. */
protected short quantity;
-
- /** the status of the munition. It shall be represented by an 8-bit enumeration. uid 327 */
+
+ /** the status of the munition. It shall be represented by an 8-bit enumeration. uid 327 */
protected MunitionExpendableStatus munitionStatus = MunitionExpendableStatus.values()[0];
-
- /** padding */
+
+ /** padding */
protected byte padding = (byte)0;
-
-
-/** Constructor */
- public Munition()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public Munition()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += munitionType.getMarshalledSize();
+ marshalSize += 4; // station
+ marshalSize += 2; // quantity
+ marshalSize += munitionStatus.getMarshalledSize();
+ marshalSize += 1; // padding
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link Munition#munitionType}*/
+public Munition setMunitionType(EntityType pMunitionType)
{
- int marshalSize = 0;
-
- marshalSize += munitionType.getMarshalledSize();
- marshalSize += 4; // station
- marshalSize += 2; // quantity
- marshalSize += munitionStatus.getMarshalledSize();
- marshalSize += 1; // padding
-
- return marshalSize;
-}
-
-
-/** Setter for {@link Munition#munitionType}*/
-public Munition setMunitionType(EntityType pMunitionType)
-{
- munitionType = pMunitionType;
- return this;
-}
-
-/** Getter for {@link Munition#munitionType}*/
-public EntityType getMunitionType()
+ munitionType = pMunitionType;
+ return this;
+}
+
+/** Getter for {@link Munition#munitionType}*/
+public EntityType getMunitionType()
{
return munitionType;
-}
-
-/** Setter for {@link Munition#station}*/
-public Munition setStation(int pStation)
+}
+
+/** Setter for {@link Munition#station}*/
+public Munition setStation(int pStation)
{
- station = pStation;
- return this;
-}
-
-/** Getter for {@link Munition#station}*/
-public int getStation()
+ station = pStation;
+ return this;
+}
+
+/** Getter for {@link Munition#station}*/
+public int getStation()
{
return station;
-}
-
-/** Setter for {@link Munition#quantity}*/
-public Munition setQuantity(short pQuantity)
+}
+
+/** Setter for {@link Munition#quantity}*/
+public Munition setQuantity(short pQuantity)
{
- quantity = pQuantity;
- return this;
-}
-
-/** Getter for {@link Munition#quantity}*/
-public short getQuantity()
+ quantity = pQuantity;
+ return this;
+}
+
+/** Getter for {@link Munition#quantity}*/
+public short getQuantity()
{
return quantity;
-}
-
-/** Setter for {@link Munition#munitionStatus}*/
-public Munition setMunitionStatus(MunitionExpendableStatus pMunitionStatus)
+}
+
+/** Setter for {@link Munition#munitionStatus}*/
+public Munition setMunitionStatus(MunitionExpendableStatus pMunitionStatus)
{
- munitionStatus = pMunitionStatus;
- return this;
-}
-
-/** Getter for {@link Munition#munitionStatus}*/
-public MunitionExpendableStatus getMunitionStatus()
+ munitionStatus = pMunitionStatus;
+ return this;
+}
+
+/** Getter for {@link Munition#munitionStatus}*/
+public MunitionExpendableStatus getMunitionStatus()
{
return munitionStatus;
-}
-
-/** Setter for {@link Munition#padding}*/
-public Munition setPadding(byte pPadding)
+}
+
+/** Setter for {@link Munition#padding}*/
+public Munition setPadding(byte pPadding)
{
- padding = pPadding;
- return this;
-}
-
-/** Getter for {@link Munition#padding}*/
-public byte getPadding()
+ padding = pPadding;
+ return this;
+}
+
+/** Getter for {@link Munition#padding}*/
+public byte getPadding()
{
return padding;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- munitionType.marshal(dos);
- dos.writeInt(station);
- dos.writeShort(quantity);
- munitionStatus.marshal(dos);
- dos.writeByte(padding);
+ {
+ munitionType.marshal(dos);
+ dos.writeInt(station);
+ dos.writeShort(quantity);
+ munitionStatus.marshal(dos);
+ dos.writeByte(padding);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- uPosition += munitionType.unmarshal(dis);
- station = dis.readInt();
- uPosition += 4;
- quantity = (short)dis.readUnsignedShort();
- uPosition += 2;
- munitionStatus = MunitionExpendableStatus.unmarshalEnum(dis);
- uPosition += munitionStatus.getMarshalledSize();
- padding = (byte)dis.readUnsignedByte();
- uPosition += 1;
+ {
+ uPosition += munitionType.unmarshal(dis);
+ station = dis.readInt();
+ uPosition += 4;
+ quantity = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ munitionStatus = MunitionExpendableStatus.unmarshalEnum(dis);
+ uPosition += munitionStatus.getMarshalledSize();
+ padding = (byte)dis.readUnsignedByte();
+ uPosition += 1;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- munitionType.marshal(buff);
- buff.putInt( (int)station);
- buff.putShort( (short)quantity);
- munitionStatus.marshal(buff);
- buff.put( (byte)padding);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- munitionType.unmarshal(buff);
- station = buff.getInt();
- quantity = (short)(buff.getShort() & 0xFFFF);
- munitionStatus = MunitionExpendableStatus.unmarshalEnum(buff);
- padding = (byte)(buff.get() & 0xFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ munitionType.marshal(buff);
+ buff.putInt( (int)station);
+ buff.putShort( (short)quantity);
+ munitionStatus.marshal(buff);
+ buff.put( (byte)padding);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ munitionType.unmarshal(buff);
+ station = buff.getInt();
+ quantity = (short)(buff.getShort() & 0xFFFF);
+ munitionStatus = MunitionExpendableStatus.unmarshalEnum(buff);
+ padding = (byte)(buff.get() & 0xFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final Munition rhs = (Munition)obj;
-
- if( ! (munitionType.equals( rhs.munitionType) )) ivarsEqual = false;
- if( ! (station == rhs.station)) ivarsEqual = false;
- if( ! (quantity == rhs.quantity)) ivarsEqual = false;
- if( ! (munitionStatus == rhs.munitionStatus)) ivarsEqual = false;
- if( ! (padding == rhs.padding)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final Munition rhs = (Munition)obj;
+
+ if( ! (munitionType.equals( rhs.munitionType) )) ivarsEqual = false;
+ if( ! (station == rhs.station)) ivarsEqual = false;
+ if( ! (quantity == rhs.quantity)) ivarsEqual = false;
+ if( ! (munitionStatus == rhs.munitionStatus)) ivarsEqual = false;
+ if( ! (padding == rhs.padding)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" munitionType: ").append(munitionType).append("\n");
- sb.append(" station: ").append(station).append("\n");
- sb.append(" quantity: ").append(quantity).append("\n");
- sb.append(" munitionStatus: ").append(munitionStatus).append("\n");
- sb.append(" padding: ").append(padding).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" munitionType: ").append(munitionType).append("\n");
+ sb.append(" station: ").append(station).append("\n");
+ sb.append(" quantity: ").append(quantity).append("\n");
+ sb.append(" munitionStatus: ").append(munitionStatus).append("\n");
+ sb.append(" padding: ").append(padding).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/MunitionDescriptor.java b/src-generated/edu/nps/moves/dis7/MunitionDescriptor.java
index 34cb216bd788bc469a627b63dcc634ed2acbfbdd..679ab3153dec9d343b35880fbbd440461b969e45 100644
--- a/src-generated/edu/nps/moves/dis7/MunitionDescriptor.java
+++ b/src-generated/edu/nps/moves/dis7/MunitionDescriptor.java
@@ -1,257 +1,257 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Represents the firing or detonation of a munition. Section 6.2.19.2
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class MunitionDescriptor extends Object implements Serializable
-{
- /** What munition was used in the burst */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Represents the firing or detonation of a munition. Section 6.2.19.2
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class MunitionDescriptor extends Object implements Serializable
+{
+ /** What munition was used in the burst */
protected EntityType munitionType = new EntityType();
-
- /** type of warhead enumeration uid 60 */
+
+ /** type of warhead enumeration uid 60 */
protected MunitionDescriptorWarhead warhead = MunitionDescriptorWarhead.values()[0];
-
- /** type of fuse used enumeration uid 61 */
+
+ /** type of fuse used enumeration uid 61 */
protected MunitionDescriptorFuse fuse = MunitionDescriptorFuse.values()[0];
-
- /** how many of the munition were fired */
+
+ /** how many of the munition were fired */
protected short quantity;
-
- /** rate at which the munition was fired */
+
+ /** rate at which the munition was fired */
protected short rate;
-
-
-/** Constructor */
- public MunitionDescriptor()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public MunitionDescriptor()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += munitionType.getMarshalledSize();
+ marshalSize += warhead.getMarshalledSize();
+ marshalSize += fuse.getMarshalledSize();
+ marshalSize += 2; // quantity
+ marshalSize += 2; // rate
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link MunitionDescriptor#munitionType}*/
+public MunitionDescriptor setMunitionType(EntityType pMunitionType)
{
- int marshalSize = 0;
-
- marshalSize += munitionType.getMarshalledSize();
- marshalSize += warhead.getMarshalledSize();
- marshalSize += fuse.getMarshalledSize();
- marshalSize += 2; // quantity
- marshalSize += 2; // rate
-
- return marshalSize;
-}
-
-
-/** Setter for {@link MunitionDescriptor#munitionType}*/
-public MunitionDescriptor setMunitionType(EntityType pMunitionType)
-{
- munitionType = pMunitionType;
- return this;
-}
-
-/** Getter for {@link MunitionDescriptor#munitionType}*/
-public EntityType getMunitionType()
+ munitionType = pMunitionType;
+ return this;
+}
+
+/** Getter for {@link MunitionDescriptor#munitionType}*/
+public EntityType getMunitionType()
{
return munitionType;
-}
-
-/** Setter for {@link MunitionDescriptor#warhead}*/
-public MunitionDescriptor setWarhead(MunitionDescriptorWarhead pWarhead)
+}
+
+/** Setter for {@link MunitionDescriptor#warhead}*/
+public MunitionDescriptor setWarhead(MunitionDescriptorWarhead pWarhead)
{
- warhead = pWarhead;
- return this;
-}
-
-/** Getter for {@link MunitionDescriptor#warhead}*/
-public MunitionDescriptorWarhead getWarhead()
+ warhead = pWarhead;
+ return this;
+}
+
+/** Getter for {@link MunitionDescriptor#warhead}*/
+public MunitionDescriptorWarhead getWarhead()
{
return warhead;
-}
-
-/** Setter for {@link MunitionDescriptor#fuse}*/
-public MunitionDescriptor setFuse(MunitionDescriptorFuse pFuse)
+}
+
+/** Setter for {@link MunitionDescriptor#fuse}*/
+public MunitionDescriptor setFuse(MunitionDescriptorFuse pFuse)
{
- fuse = pFuse;
- return this;
-}
-
-/** Getter for {@link MunitionDescriptor#fuse}*/
-public MunitionDescriptorFuse getFuse()
+ fuse = pFuse;
+ return this;
+}
+
+/** Getter for {@link MunitionDescriptor#fuse}*/
+public MunitionDescriptorFuse getFuse()
{
return fuse;
-}
-
-/** Setter for {@link MunitionDescriptor#quantity}*/
-public MunitionDescriptor setQuantity(short pQuantity)
+}
+
+/** Setter for {@link MunitionDescriptor#quantity}*/
+public MunitionDescriptor setQuantity(short pQuantity)
{
- quantity = pQuantity;
- return this;
-}
-
-/** Getter for {@link MunitionDescriptor#quantity}*/
-public short getQuantity()
+ quantity = pQuantity;
+ return this;
+}
+
+/** Getter for {@link MunitionDescriptor#quantity}*/
+public short getQuantity()
{
return quantity;
-}
-
-/** Setter for {@link MunitionDescriptor#rate}*/
-public MunitionDescriptor setRate(short pRate)
+}
+
+/** Setter for {@link MunitionDescriptor#rate}*/
+public MunitionDescriptor setRate(short pRate)
{
- rate = pRate;
- return this;
-}
-
-/** Getter for {@link MunitionDescriptor#rate}*/
-public short getRate()
+ rate = pRate;
+ return this;
+}
+
+/** Getter for {@link MunitionDescriptor#rate}*/
+public short getRate()
{
return rate;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- munitionType.marshal(dos);
- warhead.marshal(dos);
- fuse.marshal(dos);
- dos.writeShort(quantity);
- dos.writeShort(rate);
+ {
+ munitionType.marshal(dos);
+ warhead.marshal(dos);
+ fuse.marshal(dos);
+ dos.writeShort(quantity);
+ dos.writeShort(rate);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- uPosition += munitionType.unmarshal(dis);
- warhead = MunitionDescriptorWarhead.unmarshalEnum(dis);
- uPosition += warhead.getMarshalledSize();
- fuse = MunitionDescriptorFuse.unmarshalEnum(dis);
- uPosition += fuse.getMarshalledSize();
- quantity = (short)dis.readUnsignedShort();
- uPosition += 2;
- rate = (short)dis.readUnsignedShort();
- uPosition += 2;
+ {
+ uPosition += munitionType.unmarshal(dis);
+ warhead = MunitionDescriptorWarhead.unmarshalEnum(dis);
+ uPosition += warhead.getMarshalledSize();
+ fuse = MunitionDescriptorFuse.unmarshalEnum(dis);
+ uPosition += fuse.getMarshalledSize();
+ quantity = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ rate = (short)dis.readUnsignedShort();
+ uPosition += 2;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- munitionType.marshal(buff);
- warhead.marshal(buff);
- fuse.marshal(buff);
- buff.putShort( (short)quantity);
- buff.putShort( (short)rate);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- munitionType.unmarshal(buff);
- warhead = MunitionDescriptorWarhead.unmarshalEnum(buff);
- fuse = MunitionDescriptorFuse.unmarshalEnum(buff);
- quantity = (short)(buff.getShort() & 0xFFFF);
- rate = (short)(buff.getShort() & 0xFFFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ munitionType.marshal(buff);
+ warhead.marshal(buff);
+ fuse.marshal(buff);
+ buff.putShort( (short)quantity);
+ buff.putShort( (short)rate);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ munitionType.unmarshal(buff);
+ warhead = MunitionDescriptorWarhead.unmarshalEnum(buff);
+ fuse = MunitionDescriptorFuse.unmarshalEnum(buff);
+ quantity = (short)(buff.getShort() & 0xFFFF);
+ rate = (short)(buff.getShort() & 0xFFFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final MunitionDescriptor rhs = (MunitionDescriptor)obj;
-
- if( ! (munitionType.equals( rhs.munitionType) )) ivarsEqual = false;
- if( ! (warhead == rhs.warhead)) ivarsEqual = false;
- if( ! (fuse == rhs.fuse)) ivarsEqual = false;
- if( ! (quantity == rhs.quantity)) ivarsEqual = false;
- if( ! (rate == rhs.rate)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final MunitionDescriptor rhs = (MunitionDescriptor)obj;
+
+ if( ! (munitionType.equals( rhs.munitionType) )) ivarsEqual = false;
+ if( ! (warhead == rhs.warhead)) ivarsEqual = false;
+ if( ! (fuse == rhs.fuse)) ivarsEqual = false;
+ if( ! (quantity == rhs.quantity)) ivarsEqual = false;
+ if( ! (rate == rhs.rate)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" munitionType: ").append(munitionType).append("\n");
- sb.append(" warhead: ").append(warhead).append("\n");
- sb.append(" fuse: ").append(fuse).append("\n");
- sb.append(" quantity: ").append(quantity).append("\n");
- sb.append(" rate: ").append(rate).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" munitionType: ").append(munitionType).append("\n");
+ sb.append(" warhead: ").append(warhead).append("\n");
+ sb.append(" fuse: ").append(fuse).append("\n");
+ sb.append(" quantity: ").append(quantity).append("\n");
+ sb.append(" rate: ").append(rate).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/MunitionReload.java b/src-generated/edu/nps/moves/dis7/MunitionReload.java
index 408625f36d140aeed47f6157c2639310380d2a45..1b7bcb45f386cce68f5a1b0c3c9095a7b5af591b 100644
--- a/src-generated/edu/nps/moves/dis7/MunitionReload.java
+++ b/src-generated/edu/nps/moves/dis7/MunitionReload.java
@@ -1,281 +1,281 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * indicate weapons (munitions) previously communicated via the Munition record. Section 6.2.61
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class MunitionReload extends Object implements Serializable
-{
- /** This field shall identify the entity type of the munition. See section 6.2.30. */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * indicate weapons (munitions) previously communicated via the Munition record. Section 6.2.61
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class MunitionReload extends Object implements Serializable
+{
+ /** This field shall identify the entity type of the munition. See section 6.2.30. */
protected EntityType munitionType = new EntityType();
-
- /** the station or launcher to which the munition is assigned. See Annex I */
+
+ /** the station or launcher to which the munition is assigned. See Annex I */
protected int station;
-
- /** the standard quantity of this munition type normally loaded at this station/launcher if a station/launcher is specified. */
+
+ /** the standard quantity of this munition type normally loaded at this station/launcher if a station/launcher is specified. */
protected short standardQuantity;
-
- /** the maximum quantity of this munition type that this station/launcher is capable of holding when a station/launcher is specified */
+
+ /** the maximum quantity of this munition type that this station/launcher is capable of holding when a station/launcher is specified */
protected short maximumQuantity;
-
- /** numer of seconds of sim time required to reload the std qty */
+
+ /** numer of seconds of sim time required to reload the std qty */
protected int standardQuantityReloadTime;
-
- /** the number of seconds of sim time required to reload the max possible quantity */
+
+ /** the number of seconds of sim time required to reload the max possible quantity */
protected int maximumQuantityReloadTime;
-
-
-/** Constructor */
- public MunitionReload()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += munitionType.getMarshalledSize();
- marshalSize += 4; // station
- marshalSize += 2; // standardQuantity
- marshalSize += 2; // maximumQuantity
- marshalSize += 4; // standardQuantityReloadTime
- marshalSize += 4; // maximumQuantityReloadTime
-
- return marshalSize;
-}
-
-
-/** Setter for {@link MunitionReload#munitionType}*/
-public MunitionReload setMunitionType(EntityType pMunitionType)
+
+
+/** Constructor */
+ public MunitionReload()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += munitionType.getMarshalledSize();
+ marshalSize += 4; // station
+ marshalSize += 2; // standardQuantity
+ marshalSize += 2; // maximumQuantity
+ marshalSize += 4; // standardQuantityReloadTime
+ marshalSize += 4; // maximumQuantityReloadTime
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link MunitionReload#munitionType}*/
+public MunitionReload setMunitionType(EntityType pMunitionType)
{
- munitionType = pMunitionType;
- return this;
-}
-
-/** Getter for {@link MunitionReload#munitionType}*/
-public EntityType getMunitionType()
+ munitionType = pMunitionType;
+ return this;
+}
+
+/** Getter for {@link MunitionReload#munitionType}*/
+public EntityType getMunitionType()
{
return munitionType;
-}
-
-/** Setter for {@link MunitionReload#station}*/
-public MunitionReload setStation(int pStation)
+}
+
+/** Setter for {@link MunitionReload#station}*/
+public MunitionReload setStation(int pStation)
{
- station = pStation;
- return this;
-}
-
-/** Getter for {@link MunitionReload#station}*/
-public int getStation()
+ station = pStation;
+ return this;
+}
+
+/** Getter for {@link MunitionReload#station}*/
+public int getStation()
{
return station;
-}
-
-/** Setter for {@link MunitionReload#standardQuantity}*/
-public MunitionReload setStandardQuantity(short pStandardQuantity)
+}
+
+/** Setter for {@link MunitionReload#standardQuantity}*/
+public MunitionReload setStandardQuantity(short pStandardQuantity)
{
- standardQuantity = pStandardQuantity;
- return this;
-}
-
-/** Getter for {@link MunitionReload#standardQuantity}*/
-public short getStandardQuantity()
+ standardQuantity = pStandardQuantity;
+ return this;
+}
+
+/** Getter for {@link MunitionReload#standardQuantity}*/
+public short getStandardQuantity()
{
return standardQuantity;
-}
-
-/** Setter for {@link MunitionReload#maximumQuantity}*/
-public MunitionReload setMaximumQuantity(short pMaximumQuantity)
+}
+
+/** Setter for {@link MunitionReload#maximumQuantity}*/
+public MunitionReload setMaximumQuantity(short pMaximumQuantity)
{
- maximumQuantity = pMaximumQuantity;
- return this;
-}
-
-/** Getter for {@link MunitionReload#maximumQuantity}*/
-public short getMaximumQuantity()
+ maximumQuantity = pMaximumQuantity;
+ return this;
+}
+
+/** Getter for {@link MunitionReload#maximumQuantity}*/
+public short getMaximumQuantity()
{
return maximumQuantity;
-}
-
-/** Setter for {@link MunitionReload#standardQuantityReloadTime}*/
-public MunitionReload setStandardQuantityReloadTime(int pStandardQuantityReloadTime)
+}
+
+/** Setter for {@link MunitionReload#standardQuantityReloadTime}*/
+public MunitionReload setStandardQuantityReloadTime(int pStandardQuantityReloadTime)
{
- standardQuantityReloadTime = pStandardQuantityReloadTime;
- return this;
-}
-
-/** Getter for {@link MunitionReload#standardQuantityReloadTime}*/
-public int getStandardQuantityReloadTime()
+ standardQuantityReloadTime = pStandardQuantityReloadTime;
+ return this;
+}
+
+/** Getter for {@link MunitionReload#standardQuantityReloadTime}*/
+public int getStandardQuantityReloadTime()
{
return standardQuantityReloadTime;
-}
-
-/** Setter for {@link MunitionReload#maximumQuantityReloadTime}*/
-public MunitionReload setMaximumQuantityReloadTime(int pMaximumQuantityReloadTime)
+}
+
+/** Setter for {@link MunitionReload#maximumQuantityReloadTime}*/
+public MunitionReload setMaximumQuantityReloadTime(int pMaximumQuantityReloadTime)
{
- maximumQuantityReloadTime = pMaximumQuantityReloadTime;
- return this;
-}
-
-/** Getter for {@link MunitionReload#maximumQuantityReloadTime}*/
-public int getMaximumQuantityReloadTime()
+ maximumQuantityReloadTime = pMaximumQuantityReloadTime;
+ return this;
+}
+
+/** Getter for {@link MunitionReload#maximumQuantityReloadTime}*/
+public int getMaximumQuantityReloadTime()
{
return maximumQuantityReloadTime;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- munitionType.marshal(dos);
- dos.writeInt(station);
- dos.writeShort(standardQuantity);
- dos.writeShort(maximumQuantity);
- dos.writeInt(standardQuantityReloadTime);
- dos.writeInt(maximumQuantityReloadTime);
+ {
+ munitionType.marshal(dos);
+ dos.writeInt(station);
+ dos.writeShort(standardQuantity);
+ dos.writeShort(maximumQuantity);
+ dos.writeInt(standardQuantityReloadTime);
+ dos.writeInt(maximumQuantityReloadTime);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- uPosition += munitionType.unmarshal(dis);
- station = dis.readInt();
- uPosition += 4;
- standardQuantity = (short)dis.readUnsignedShort();
- uPosition += 2;
- maximumQuantity = (short)dis.readUnsignedShort();
- uPosition += 2;
- standardQuantityReloadTime = dis.readInt();
- uPosition += 4;
- maximumQuantityReloadTime = dis.readInt();
- uPosition += 4;
+ {
+ uPosition += munitionType.unmarshal(dis);
+ station = dis.readInt();
+ uPosition += 4;
+ standardQuantity = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ maximumQuantity = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ standardQuantityReloadTime = dis.readInt();
+ uPosition += 4;
+ maximumQuantityReloadTime = dis.readInt();
+ uPosition += 4;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- munitionType.marshal(buff);
- buff.putInt( (int)station);
- buff.putShort( (short)standardQuantity);
- buff.putShort( (short)maximumQuantity);
- buff.putInt( (int)standardQuantityReloadTime);
- buff.putInt( (int)maximumQuantityReloadTime);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- munitionType.unmarshal(buff);
- station = buff.getInt();
- standardQuantity = (short)(buff.getShort() & 0xFFFF);
- maximumQuantity = (short)(buff.getShort() & 0xFFFF);
- standardQuantityReloadTime = buff.getInt();
- maximumQuantityReloadTime = buff.getInt();
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ munitionType.marshal(buff);
+ buff.putInt( (int)station);
+ buff.putShort( (short)standardQuantity);
+ buff.putShort( (short)maximumQuantity);
+ buff.putInt( (int)standardQuantityReloadTime);
+ buff.putInt( (int)maximumQuantityReloadTime);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ munitionType.unmarshal(buff);
+ station = buff.getInt();
+ standardQuantity = (short)(buff.getShort() & 0xFFFF);
+ maximumQuantity = (short)(buff.getShort() & 0xFFFF);
+ standardQuantityReloadTime = buff.getInt();
+ maximumQuantityReloadTime = buff.getInt();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final MunitionReload rhs = (MunitionReload)obj;
-
- if( ! (munitionType.equals( rhs.munitionType) )) ivarsEqual = false;
- if( ! (station == rhs.station)) ivarsEqual = false;
- if( ! (standardQuantity == rhs.standardQuantity)) ivarsEqual = false;
- if( ! (maximumQuantity == rhs.maximumQuantity)) ivarsEqual = false;
- if( ! (standardQuantityReloadTime == rhs.standardQuantityReloadTime)) ivarsEqual = false;
- if( ! (maximumQuantityReloadTime == rhs.maximumQuantityReloadTime)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final MunitionReload rhs = (MunitionReload)obj;
+
+ if( ! (munitionType.equals( rhs.munitionType) )) ivarsEqual = false;
+ if( ! (station == rhs.station)) ivarsEqual = false;
+ if( ! (standardQuantity == rhs.standardQuantity)) ivarsEqual = false;
+ if( ! (maximumQuantity == rhs.maximumQuantity)) ivarsEqual = false;
+ if( ! (standardQuantityReloadTime == rhs.standardQuantityReloadTime)) ivarsEqual = false;
+ if( ! (maximumQuantityReloadTime == rhs.maximumQuantityReloadTime)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" munitionType: ").append(munitionType).append("\n");
- sb.append(" station: ").append(station).append("\n");
- sb.append(" standardQuantity: ").append(standardQuantity).append("\n");
- sb.append(" maximumQuantity: ").append(maximumQuantity).append("\n");
- sb.append(" standardQuantityReloadTime: ").append(standardQuantityReloadTime).append("\n");
- sb.append(" maximumQuantityReloadTime: ").append(maximumQuantityReloadTime).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" munitionType: ").append(munitionType).append("\n");
+ sb.append(" station: ").append(station).append("\n");
+ sb.append(" standardQuantity: ").append(standardQuantity).append("\n");
+ sb.append(" maximumQuantity: ").append(maximumQuantity).append("\n");
+ sb.append(" standardQuantityReloadTime: ").append(standardQuantityReloadTime).append("\n");
+ sb.append(" maximumQuantityReloadTime: ").append(maximumQuantityReloadTime).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/NamedLocationIdentification.java b/src-generated/edu/nps/moves/dis7/NamedLocationIdentification.java
index 3a15cdd9ee864a8373ede730a93edfe6b98011fc..6c31177d4fa646e86d060df366c89369dad0afc6 100644
--- a/src-generated/edu/nps/moves/dis7/NamedLocationIdentification.java
+++ b/src-generated/edu/nps/moves/dis7/NamedLocationIdentification.java
@@ -1,186 +1,186 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Information about the discrete positional relationship of the part entity with respect to the its host entity Section 6.2.62
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class NamedLocationIdentification extends Object implements Serializable
-{
- /** the station name within the host at which the part entity is located. If the part entity is On Station, this field shall specify the representation of the part's location data fields. This field shall be specified by a 16-bit enumeration uid 212 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Information about the discrete positional relationship of the part entity with respect to the its host entity Section 6.2.62
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class NamedLocationIdentification extends Object implements Serializable
+{
+ /** the station name within the host at which the part entity is located. If the part entity is On Station, this field shall specify the representation of the part's location data fields. This field shall be specified by a 16-bit enumeration uid 212 */
protected IsPartOfStationName stationName = IsPartOfStationName.values()[0];
-
- /** the number of the particular wing station, cargo hold etc., at which the part is attached. */
+
+ /** the number of the particular wing station, cargo hold etc., at which the part is attached. */
protected short stationNumber;
-
-
-/** Constructor */
- public NamedLocationIdentification()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += stationName.getMarshalledSize();
- marshalSize += 2; // stationNumber
-
- return marshalSize;
-}
-
-
-/** Setter for {@link NamedLocationIdentification#stationName}*/
-public NamedLocationIdentification setStationName(IsPartOfStationName pStationName)
+
+
+/** Constructor */
+ public NamedLocationIdentification()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += stationName.getMarshalledSize();
+ marshalSize += 2; // stationNumber
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link NamedLocationIdentification#stationName}*/
+public NamedLocationIdentification setStationName(IsPartOfStationName pStationName)
{
- stationName = pStationName;
- return this;
-}
-
-/** Getter for {@link NamedLocationIdentification#stationName}*/
-public IsPartOfStationName getStationName()
+ stationName = pStationName;
+ return this;
+}
+
+/** Getter for {@link NamedLocationIdentification#stationName}*/
+public IsPartOfStationName getStationName()
{
return stationName;
-}
-
-/** Setter for {@link NamedLocationIdentification#stationNumber}*/
-public NamedLocationIdentification setStationNumber(short pStationNumber)
+}
+
+/** Setter for {@link NamedLocationIdentification#stationNumber}*/
+public NamedLocationIdentification setStationNumber(short pStationNumber)
{
- stationNumber = pStationNumber;
- return this;
-}
-
-/** Getter for {@link NamedLocationIdentification#stationNumber}*/
-public short getStationNumber()
+ stationNumber = pStationNumber;
+ return this;
+}
+
+/** Getter for {@link NamedLocationIdentification#stationNumber}*/
+public short getStationNumber()
{
return stationNumber;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- stationName.marshal(dos);
- dos.writeShort(stationNumber);
+ {
+ stationName.marshal(dos);
+ dos.writeShort(stationNumber);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- stationName = IsPartOfStationName.unmarshalEnum(dis);
- uPosition += stationName.getMarshalledSize();
- stationNumber = (short)dis.readUnsignedShort();
- uPosition += 2;
+ {
+ stationName = IsPartOfStationName.unmarshalEnum(dis);
+ uPosition += stationName.getMarshalledSize();
+ stationNumber = (short)dis.readUnsignedShort();
+ uPosition += 2;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- stationName.marshal(buff);
- buff.putShort( (short)stationNumber);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- stationName = IsPartOfStationName.unmarshalEnum(buff);
- stationNumber = (short)(buff.getShort() & 0xFFFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ stationName.marshal(buff);
+ buff.putShort( (short)stationNumber);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ stationName = IsPartOfStationName.unmarshalEnum(buff);
+ stationNumber = (short)(buff.getShort() & 0xFFFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final NamedLocationIdentification rhs = (NamedLocationIdentification)obj;
-
- if( ! (stationName == rhs.stationName)) ivarsEqual = false;
- if( ! (stationNumber == rhs.stationNumber)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final NamedLocationIdentification rhs = (NamedLocationIdentification)obj;
+
+ if( ! (stationName == rhs.stationName)) ivarsEqual = false;
+ if( ! (stationNumber == rhs.stationNumber)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" stationName: ").append(stationName).append("\n");
- sb.append(" stationNumber: ").append(stationNumber).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" stationName: ").append(stationName).append("\n");
+ sb.append(" stationNumber: ").append(stationNumber).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ObjectIdentifier.java b/src-generated/edu/nps/moves/dis7/ObjectIdentifier.java
index 3be8c0a74f7ab25eba55328730dc99d8e2daf58f..50e75520c2727efa4867e9da7d8d05fb5d028d63 100644
--- a/src-generated/edu/nps/moves/dis7/ObjectIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/ObjectIdentifier.java
@@ -1,185 +1,185 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * The unique designation of an environmental object. Section 6.2.63
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class ObjectIdentifier extends Object implements Serializable
-{
- /** Simulation Address */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * The unique designation of an environmental object. Section 6.2.63
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class ObjectIdentifier extends Object implements Serializable
+{
+ /** Simulation Address */
protected SimulationAddress simulationAddress = new SimulationAddress();
-
- /** object number */
+
+ /** object number */
protected short objectNumber;
-
-
-/** Constructor */
- public ObjectIdentifier()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += simulationAddress.getMarshalledSize();
- marshalSize += 2; // objectNumber
-
- return marshalSize;
-}
-
-
-/** Setter for {@link ObjectIdentifier#simulationAddress}*/
-public ObjectIdentifier setSimulationAddress(SimulationAddress pSimulationAddress)
+
+
+/** Constructor */
+ public ObjectIdentifier()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += simulationAddress.getMarshalledSize();
+ marshalSize += 2; // objectNumber
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link ObjectIdentifier#simulationAddress}*/
+public ObjectIdentifier setSimulationAddress(SimulationAddress pSimulationAddress)
{
- simulationAddress = pSimulationAddress;
- return this;
-}
-
-/** Getter for {@link ObjectIdentifier#simulationAddress}*/
-public SimulationAddress getSimulationAddress()
+ simulationAddress = pSimulationAddress;
+ return this;
+}
+
+/** Getter for {@link ObjectIdentifier#simulationAddress}*/
+public SimulationAddress getSimulationAddress()
{
return simulationAddress;
-}
-
-/** Setter for {@link ObjectIdentifier#objectNumber}*/
-public ObjectIdentifier setObjectNumber(short pObjectNumber)
+}
+
+/** Setter for {@link ObjectIdentifier#objectNumber}*/
+public ObjectIdentifier setObjectNumber(short pObjectNumber)
{
- objectNumber = pObjectNumber;
- return this;
-}
-
-/** Getter for {@link ObjectIdentifier#objectNumber}*/
-public short getObjectNumber()
+ objectNumber = pObjectNumber;
+ return this;
+}
+
+/** Getter for {@link ObjectIdentifier#objectNumber}*/
+public short getObjectNumber()
{
return objectNumber;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- simulationAddress.marshal(dos);
- dos.writeShort(objectNumber);
+ {
+ simulationAddress.marshal(dos);
+ dos.writeShort(objectNumber);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- uPosition += simulationAddress.unmarshal(dis);
- objectNumber = (short)dis.readUnsignedShort();
- uPosition += 2;
+ {
+ uPosition += simulationAddress.unmarshal(dis);
+ objectNumber = (short)dis.readUnsignedShort();
+ uPosition += 2;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- simulationAddress.marshal(buff);
- buff.putShort( (short)objectNumber);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- simulationAddress.unmarshal(buff);
- objectNumber = (short)(buff.getShort() & 0xFFFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ simulationAddress.marshal(buff);
+ buff.putShort( (short)objectNumber);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ simulationAddress.unmarshal(buff);
+ objectNumber = (short)(buff.getShort() & 0xFFFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final ObjectIdentifier rhs = (ObjectIdentifier)obj;
-
- if( ! (simulationAddress.equals( rhs.simulationAddress) )) ivarsEqual = false;
- if( ! (objectNumber == rhs.objectNumber)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final ObjectIdentifier rhs = (ObjectIdentifier)obj;
+
+ if( ! (simulationAddress.equals( rhs.simulationAddress) )) ivarsEqual = false;
+ if( ! (objectNumber == rhs.objectNumber)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
- sb.append(" objectNumber: ").append(objectNumber).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
+ sb.append(" objectNumber: ").append(objectNumber).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ObjectType.java b/src-generated/edu/nps/moves/dis7/ObjectType.java
index 6a19da3fbba947f037a900693729255d27065c55..047a786052f66dce26d60e9dc0a807bdd1890c46 100644
--- a/src-generated/edu/nps/moves/dis7/ObjectType.java
+++ b/src-generated/edu/nps/moves/dis7/ObjectType.java
@@ -1,234 +1,234 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * The unique designation of an environmental object. Section 6.2.64
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class ObjectType extends Object implements Serializable
-{
- /** Domain of entity (air, surface, subsurface, space, etc) uid 8 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * The unique designation of an environmental object. Section 6.2.64
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class ObjectType extends Object implements Serializable
+{
+ /** Domain of entity (air, surface, subsurface, space, etc) uid 8 */
protected PlatformDomain domain = PlatformDomain.values()[0];
-
- /** country to which the design of the entity is attributed uid 225 */
+
+ /** country to which the design of the entity is attributed uid 225 */
protected ObjectKind objectKind = ObjectKind.values()[0];
-
- /** category of entity */
+
+ /** category of entity */
protected byte category;
-
- /** subcategory of entity */
+
+ /** subcategory of entity */
protected byte subCategory;
-
-
-/** Constructor */
- public ObjectType()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public ObjectType()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += domain.getMarshalledSize();
+ marshalSize += objectKind.getMarshalledSize();
+ marshalSize += 1; // category
+ marshalSize += 1; // subCategory
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link ObjectType#domain}*/
+public ObjectType setDomain(PlatformDomain pDomain)
{
- int marshalSize = 0;
-
- marshalSize += domain.getMarshalledSize();
- marshalSize += objectKind.getMarshalledSize();
- marshalSize += 1; // category
- marshalSize += 1; // subCategory
-
- return marshalSize;
-}
-
-
-/** Setter for {@link ObjectType#domain}*/
-public ObjectType setDomain(PlatformDomain pDomain)
-{
- domain = pDomain;
- return this;
-}
-
-/** Getter for {@link ObjectType#domain}*/
-public PlatformDomain getDomain()
+ domain = pDomain;
+ return this;
+}
+
+/** Getter for {@link ObjectType#domain}*/
+public PlatformDomain getDomain()
{
return domain;
-}
-
-/** Setter for {@link ObjectType#objectKind}*/
-public ObjectType setObjectKind(ObjectKind pObjectKind)
+}
+
+/** Setter for {@link ObjectType#objectKind}*/
+public ObjectType setObjectKind(ObjectKind pObjectKind)
{
- objectKind = pObjectKind;
- return this;
-}
-
-/** Getter for {@link ObjectType#objectKind}*/
-public ObjectKind getObjectKind()
+ objectKind = pObjectKind;
+ return this;
+}
+
+/** Getter for {@link ObjectType#objectKind}*/
+public ObjectKind getObjectKind()
{
return objectKind;
-}
-
-/** Setter for {@link ObjectType#category}*/
-public ObjectType setCategory(byte pCategory)
+}
+
+/** Setter for {@link ObjectType#category}*/
+public ObjectType setCategory(byte pCategory)
{
- category = pCategory;
- return this;
-}
-
-/** Getter for {@link ObjectType#category}*/
-public byte getCategory()
+ category = pCategory;
+ return this;
+}
+
+/** Getter for {@link ObjectType#category}*/
+public byte getCategory()
{
return category;
-}
-
-/** Setter for {@link ObjectType#subCategory}*/
-public ObjectType setSubCategory(byte pSubCategory)
+}
+
+/** Setter for {@link ObjectType#subCategory}*/
+public ObjectType setSubCategory(byte pSubCategory)
{
- subCategory = pSubCategory;
- return this;
-}
-
-/** Getter for {@link ObjectType#subCategory}*/
-public byte getSubCategory()
+ subCategory = pSubCategory;
+ return this;
+}
+
+/** Getter for {@link ObjectType#subCategory}*/
+public byte getSubCategory()
{
return subCategory;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- domain.marshal(dos);
- objectKind.marshal(dos);
- dos.writeByte(category);
- dos.writeByte(subCategory);
+ {
+ domain.marshal(dos);
+ objectKind.marshal(dos);
+ dos.writeByte(category);
+ dos.writeByte(subCategory);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- domain = PlatformDomain.unmarshalEnum(dis);
- uPosition += domain.getMarshalledSize();
- objectKind = ObjectKind.unmarshalEnum(dis);
- uPosition += objectKind.getMarshalledSize();
- category = (byte)dis.readUnsignedByte();
- uPosition += 1;
- subCategory = (byte)dis.readUnsignedByte();
- uPosition += 1;
+ {
+ domain = PlatformDomain.unmarshalEnum(dis);
+ uPosition += domain.getMarshalledSize();
+ objectKind = ObjectKind.unmarshalEnum(dis);
+ uPosition += objectKind.getMarshalledSize();
+ category = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ subCategory = (byte)dis.readUnsignedByte();
+ uPosition += 1;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- domain.marshal(buff);
- objectKind.marshal(buff);
- buff.put( (byte)category);
- buff.put( (byte)subCategory);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- domain = PlatformDomain.unmarshalEnum(buff);
- objectKind = ObjectKind.unmarshalEnum(buff);
- category = (byte)(buff.get() & 0xFF);
- subCategory = (byte)(buff.get() & 0xFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ domain.marshal(buff);
+ objectKind.marshal(buff);
+ buff.put( (byte)category);
+ buff.put( (byte)subCategory);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ domain = PlatformDomain.unmarshalEnum(buff);
+ objectKind = ObjectKind.unmarshalEnum(buff);
+ category = (byte)(buff.get() & 0xFF);
+ subCategory = (byte)(buff.get() & 0xFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final ObjectType rhs = (ObjectType)obj;
-
- if( ! (domain == rhs.domain)) ivarsEqual = false;
- if( ! (objectKind == rhs.objectKind)) ivarsEqual = false;
- if( ! (category == rhs.category)) ivarsEqual = false;
- if( ! (subCategory == rhs.subCategory)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final ObjectType rhs = (ObjectType)obj;
+
+ if( ! (domain == rhs.domain)) ivarsEqual = false;
+ if( ! (objectKind == rhs.objectKind)) ivarsEqual = false;
+ if( ! (category == rhs.category)) ivarsEqual = false;
+ if( ! (subCategory == rhs.subCategory)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" domain: ").append(domain).append("\n");
- sb.append(" objectKind: ").append(objectKind).append("\n");
- sb.append(" category: ").append(category).append("\n");
- sb.append(" subCategory: ").append(subCategory).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" domain: ").append(domain).append("\n");
+ sb.append(" objectKind: ").append(objectKind).append("\n");
+ sb.append(" category: ").append(category).append("\n");
+ sb.append(" subCategory: ").append(subCategory).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/OwnershipStatusRecord.java b/src-generated/edu/nps/moves/dis7/OwnershipStatusRecord.java
index 87436637146118de23498153742781911eb4cb6d..48de4996248241993ad97175b47434a695beafc6 100644
--- a/src-generated/edu/nps/moves/dis7/OwnershipStatusRecord.java
+++ b/src-generated/edu/nps/moves/dis7/OwnershipStatusRecord.java
@@ -1,209 +1,209 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * used to convey entity and conflict status information associated with transferring ownership of an entity. Section 6.2.65
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class OwnershipStatusRecord extends Object implements Serializable
-{
- /** EntityID */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * used to convey entity and conflict status information associated with transferring ownership of an entity. Section 6.2.65
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class OwnershipStatusRecord extends Object implements Serializable
+{
+ /** EntityID */
protected EntityID entityId = new EntityID();
-
- /** The ownership and/or ownership conflict status of the entity represented by the Entity ID field. uid 332 */
+
+ /** The ownership and/or ownership conflict status of the entity represented by the Entity ID field. uid 332 */
protected OwnershipStatus ownershipStatus = OwnershipStatus.values()[0];
-
- /** padding */
+
+ /** padding */
protected byte padding = (byte)0;
-
-
-/** Constructor */
- public OwnershipStatusRecord()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += entityId.getMarshalledSize();
- marshalSize += ownershipStatus.getMarshalledSize();
- marshalSize += 1; // padding
-
- return marshalSize;
-}
-
-
-/** Setter for {@link OwnershipStatusRecord#entityId}*/
-public OwnershipStatusRecord setEntityId(EntityID pEntityId)
+
+
+/** Constructor */
+ public OwnershipStatusRecord()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += entityId.getMarshalledSize();
+ marshalSize += ownershipStatus.getMarshalledSize();
+ marshalSize += 1; // padding
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link OwnershipStatusRecord#entityId}*/
+public OwnershipStatusRecord setEntityId(EntityID pEntityId)
{
- entityId = pEntityId;
- return this;
-}
-
-/** Getter for {@link OwnershipStatusRecord#entityId}*/
-public EntityID getEntityId()
+ entityId = pEntityId;
+ return this;
+}
+
+/** Getter for {@link OwnershipStatusRecord#entityId}*/
+public EntityID getEntityId()
{
return entityId;
-}
-
-/** Setter for {@link OwnershipStatusRecord#ownershipStatus}*/
-public OwnershipStatusRecord setOwnershipStatus(OwnershipStatus pOwnershipStatus)
+}
+
+/** Setter for {@link OwnershipStatusRecord#ownershipStatus}*/
+public OwnershipStatusRecord setOwnershipStatus(OwnershipStatus pOwnershipStatus)
{
- ownershipStatus = pOwnershipStatus;
- return this;
-}
-
-/** Getter for {@link OwnershipStatusRecord#ownershipStatus}*/
-public OwnershipStatus getOwnershipStatus()
+ ownershipStatus = pOwnershipStatus;
+ return this;
+}
+
+/** Getter for {@link OwnershipStatusRecord#ownershipStatus}*/
+public OwnershipStatus getOwnershipStatus()
{
return ownershipStatus;
-}
-
-/** Setter for {@link OwnershipStatusRecord#padding}*/
-public OwnershipStatusRecord setPadding(byte pPadding)
+}
+
+/** Setter for {@link OwnershipStatusRecord#padding}*/
+public OwnershipStatusRecord setPadding(byte pPadding)
{
- padding = pPadding;
- return this;
-}
-
-/** Getter for {@link OwnershipStatusRecord#padding}*/
-public byte getPadding()
+ padding = pPadding;
+ return this;
+}
+
+/** Getter for {@link OwnershipStatusRecord#padding}*/
+public byte getPadding()
{
return padding;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- entityId.marshal(dos);
- ownershipStatus.marshal(dos);
- dos.writeByte(padding);
+ {
+ entityId.marshal(dos);
+ ownershipStatus.marshal(dos);
+ dos.writeByte(padding);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- uPosition += entityId.unmarshal(dis);
- ownershipStatus = OwnershipStatus.unmarshalEnum(dis);
- uPosition += ownershipStatus.getMarshalledSize();
- padding = (byte)dis.readUnsignedByte();
- uPosition += 1;
+ {
+ uPosition += entityId.unmarshal(dis);
+ ownershipStatus = OwnershipStatus.unmarshalEnum(dis);
+ uPosition += ownershipStatus.getMarshalledSize();
+ padding = (byte)dis.readUnsignedByte();
+ uPosition += 1;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- entityId.marshal(buff);
- ownershipStatus.marshal(buff);
- buff.put( (byte)padding);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- entityId.unmarshal(buff);
- ownershipStatus = OwnershipStatus.unmarshalEnum(buff);
- padding = (byte)(buff.get() & 0xFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ entityId.marshal(buff);
+ ownershipStatus.marshal(buff);
+ buff.put( (byte)padding);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ entityId.unmarshal(buff);
+ ownershipStatus = OwnershipStatus.unmarshalEnum(buff);
+ padding = (byte)(buff.get() & 0xFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final OwnershipStatusRecord rhs = (OwnershipStatusRecord)obj;
-
- if( ! (entityId.equals( rhs.entityId) )) ivarsEqual = false;
- if( ! (ownershipStatus == rhs.ownershipStatus)) ivarsEqual = false;
- if( ! (padding == rhs.padding)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final OwnershipStatusRecord rhs = (OwnershipStatusRecord)obj;
+
+ if( ! (entityId.equals( rhs.entityId) )) ivarsEqual = false;
+ if( ! (ownershipStatus == rhs.ownershipStatus)) ivarsEqual = false;
+ if( ! (padding == rhs.padding)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" entityId: ").append(entityId).append("\n");
- sb.append(" ownershipStatus: ").append(ownershipStatus).append("\n");
- sb.append(" padding: ").append(padding).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" entityId: ").append(entityId).append("\n");
+ sb.append(" ownershipStatus: ").append(ownershipStatus).append("\n");
+ sb.append(" padding: ").append(padding).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/Pdu.java b/src-generated/edu/nps/moves/dis7/Pdu.java
index ffe517e637d9851b1860e418ac50de111e9df2b6..c7c32fa3a33fd36133c78afae0118ea6e956d510 100644
--- a/src-generated/edu/nps/moves/dis7/Pdu.java
+++ b/src-generated/edu/nps/moves/dis7/Pdu.java
@@ -1,296 +1,296 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Base class of PduBase and LiveEntityPdu
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public abstract class Pdu extends Object implements Serializable,Marshaller
-{
- /** The version of the protocol. 5=DIS-1995, 6=DIS-1998, 7=DIS-2012 uid 3 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Base class of PduBase and LiveEntityPdu
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public abstract class Pdu extends Object implements Serializable,Marshaller
+{
+ /** The version of the protocol. 5=DIS-1995, 6=DIS-1998, 7=DIS-2012 uid 3 */
protected DISProtocolVersion protocolVersion = DISProtocolVersion.IEEE_12781_2012;
-
- /** Exercise ID */
+
+ /** Exercise ID */
protected byte exerciseID = (byte)0;
-
- /** Type of pdu, unique for each PDU class uid 4 */
+
+ /** Type of pdu, unique for each PDU class uid 4 */
protected DISPDUType pduType = DISPDUType.values()[0];
-
- /** value that refers to the protocol family, eg SimulationManagement, et uid 5 */
+
+ /** value that refers to the protocol family, eg SimulationManagement, et uid 5 */
protected DISProtocolFamily protocolFamily = DISProtocolFamily.values()[0];
-
- /** Timestamp value */
+
+ /** Timestamp value */
protected int timestamp;
-
- /** Length, in bytes, of the PDU */
+
+ /** Length, in bytes, of the PDU */
protected short length;
-
-
-/** Constructor */
- public Pdu()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public Pdu()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += protocolVersion.getMarshalledSize();
+ marshalSize += 1; // exerciseID
+ marshalSize += pduType.getMarshalledSize();
+ marshalSize += protocolFamily.getMarshalledSize();
+ marshalSize += 4; // timestamp
+ marshalSize += 2; // length
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link Pdu#protocolVersion}*/
+public Pdu setProtocolVersion(DISProtocolVersion pProtocolVersion)
{
- int marshalSize = 0;
-
- marshalSize += protocolVersion.getMarshalledSize();
- marshalSize += 1; // exerciseID
- marshalSize += pduType.getMarshalledSize();
- marshalSize += protocolFamily.getMarshalledSize();
- marshalSize += 4; // timestamp
- marshalSize += 2; // length
-
- return marshalSize;
-}
-
-
-/** Setter for {@link Pdu#protocolVersion}*/
-public Pdu setProtocolVersion(DISProtocolVersion pProtocolVersion)
-{
- protocolVersion = pProtocolVersion;
- return this;
-}
-
-/** Getter for {@link Pdu#protocolVersion}*/
-public DISProtocolVersion getProtocolVersion()
+ protocolVersion = pProtocolVersion;
+ return this;
+}
+
+/** Getter for {@link Pdu#protocolVersion}*/
+public DISProtocolVersion getProtocolVersion()
{
return protocolVersion;
-}
-
-/** Setter for {@link Pdu#exerciseID}*/
-public Pdu setExerciseID(byte pExerciseID)
+}
+
+/** Setter for {@link Pdu#exerciseID}*/
+public Pdu setExerciseID(byte pExerciseID)
{
- exerciseID = pExerciseID;
- return this;
-}
-
-/** Getter for {@link Pdu#exerciseID}*/
-public byte getExerciseID()
+ exerciseID = pExerciseID;
+ return this;
+}
+
+/** Getter for {@link Pdu#exerciseID}*/
+public byte getExerciseID()
{
return exerciseID;
-}
-
-/** Setter for {@link Pdu#pduType}*/
-public Pdu setPduType(DISPDUType pPduType)
+}
+
+/** Setter for {@link Pdu#pduType}*/
+public Pdu setPduType(DISPDUType pPduType)
{
- pduType = pPduType;
- return this;
-}
-
-/** Getter for {@link Pdu#pduType}*/
-public DISPDUType getPduType()
+ pduType = pPduType;
+ return this;
+}
+
+/** Getter for {@link Pdu#pduType}*/
+public DISPDUType getPduType()
{
return pduType;
-}
-
-/** Setter for {@link Pdu#protocolFamily}*/
-public Pdu setProtocolFamily(DISProtocolFamily pProtocolFamily)
+}
+
+/** Setter for {@link Pdu#protocolFamily}*/
+public Pdu setProtocolFamily(DISProtocolFamily pProtocolFamily)
{
- protocolFamily = pProtocolFamily;
- return this;
-}
-
-/** Getter for {@link Pdu#protocolFamily}*/
-public DISProtocolFamily getProtocolFamily()
+ protocolFamily = pProtocolFamily;
+ return this;
+}
+
+/** Getter for {@link Pdu#protocolFamily}*/
+public DISProtocolFamily getProtocolFamily()
{
return protocolFamily;
-}
-
-/** Setter for {@link Pdu#timestamp}*/
-public Pdu setTimestamp(int pTimestamp)
+}
+
+/** Setter for {@link Pdu#timestamp}*/
+public Pdu setTimestamp(int pTimestamp)
{
- timestamp = pTimestamp;
- return this;
-}
-
-/** Getter for {@link Pdu#timestamp}*/
-public int getTimestamp()
+ timestamp = pTimestamp;
+ return this;
+}
+
+/** Getter for {@link Pdu#timestamp}*/
+public int getTimestamp()
{
return timestamp;
-}
-
-/** Setter for {@link Pdu#length}*/
-public Pdu setLength(short pLength)
+}
+
+/** Setter for {@link Pdu#length}*/
+public Pdu setLength(short pLength)
{
- length = pLength;
- return this;
-}
-
-/** Getter for {@link Pdu#length}*/
-public short getLength()
+ length = pLength;
+ return this;
+}
+
+/** Getter for {@link Pdu#length}*/
+public short getLength()
{
return length;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- protocolVersion.marshal(dos);
- dos.writeByte(exerciseID);
- pduType.marshal(dos);
- protocolFamily.marshal(dos);
- dos.writeInt(timestamp);
- dos.writeShort(length);
+ {
+ protocolVersion.marshal(dos);
+ dos.writeByte(exerciseID);
+ pduType.marshal(dos);
+ protocolFamily.marshal(dos);
+ dos.writeInt(timestamp);
+ dos.writeShort(length);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- protocolVersion = DISProtocolVersion.unmarshalEnum(dis);
- uPosition += protocolVersion.getMarshalledSize();
- exerciseID = (byte)dis.readUnsignedByte();
- uPosition += 1;
- pduType = DISPDUType.unmarshalEnum(dis);
- uPosition += pduType.getMarshalledSize();
- protocolFamily = DISProtocolFamily.unmarshalEnum(dis);
- uPosition += protocolFamily.getMarshalledSize();
- timestamp = dis.readInt();
- uPosition += 4;
- length = (short)dis.readUnsignedShort();
- uPosition += 2;
+ {
+ protocolVersion = DISProtocolVersion.unmarshalEnum(dis);
+ uPosition += protocolVersion.getMarshalledSize();
+ exerciseID = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ pduType = DISPDUType.unmarshalEnum(dis);
+ uPosition += pduType.getMarshalledSize();
+ protocolFamily = DISProtocolFamily.unmarshalEnum(dis);
+ uPosition += protocolFamily.getMarshalledSize();
+ timestamp = dis.readInt();
+ uPosition += 4;
+ length = (short)dis.readUnsignedShort();
+ uPosition += 2;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- protocolVersion.marshal(buff);
- buff.put( (byte)exerciseID);
- pduType.marshal(buff);
- protocolFamily.marshal(buff);
- buff.putInt( (int)timestamp);
- buff.putShort( (short)length);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- protocolVersion = DISProtocolVersion.unmarshalEnum(buff);
- exerciseID = (byte)(buff.get() & 0xFF);
- pduType = DISPDUType.unmarshalEnum(buff);
- protocolFamily = DISProtocolFamily.unmarshalEnum(buff);
- timestamp = buff.getInt();
- length = (short)(buff.getShort() & 0xFFFF);
- return getMarshalledSize();
-}
-
-
-/**
- * A convenience method for marshalling to a byte array.
- * This is not as efficient as reusing a ByteBuffer, but it <em>is</em> easy.
- * @return a byte array with the marshalled {@link Pdu}
- * @throws Exception ByteBuffer-generated exception
- */
-public byte[] marshal() throws Exception
-{
- byte[] data = new byte[getMarshalledSize()];
- java.nio.ByteBuffer buff = java.nio.ByteBuffer.wrap(data);
- marshal(buff);
- return data;
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ protocolVersion.marshal(buff);
+ buff.put( (byte)exerciseID);
+ pduType.marshal(buff);
+ protocolFamily.marshal(buff);
+ buff.putInt( (int)timestamp);
+ buff.putShort( (short)length);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ protocolVersion = DISProtocolVersion.unmarshalEnum(buff);
+ exerciseID = (byte)(buff.get() & 0xFF);
+ pduType = DISPDUType.unmarshalEnum(buff);
+ protocolFamily = DISProtocolFamily.unmarshalEnum(buff);
+ timestamp = buff.getInt();
+ length = (short)(buff.getShort() & 0xFFFF);
+ return getMarshalledSize();
}
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final Pdu rhs = (Pdu)obj;
-
- if( ! (protocolVersion == rhs.protocolVersion)) ivarsEqual = false;
- if( ! (exerciseID == rhs.exerciseID)) ivarsEqual = false;
- if( ! (pduType == rhs.pduType)) ivarsEqual = false;
- if( ! (protocolFamily == rhs.protocolFamily)) ivarsEqual = false;
- if( ! (timestamp == rhs.timestamp)) ivarsEqual = false;
- if( ! (length == rhs.length)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+
+/**
+ * A convenience method for marshalling to a byte array.
+ * This is not as efficient as reusing a ByteBuffer, but it <em>is</em> easy.
+ * @return a byte array with the marshalled {@link Pdu}
+ * @throws Exception ByteBuffer-generated exception
+ */
+public byte[] marshal() throws Exception
+{
+ byte[] data = new byte[getMarshalledSize()];
+ java.nio.ByteBuffer buff = java.nio.ByteBuffer.wrap(data);
+ marshal(buff);
+ return data;
+}
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final Pdu rhs = (Pdu)obj;
+
+ if( ! (protocolVersion == rhs.protocolVersion)) ivarsEqual = false;
+ if( ! (exerciseID == rhs.exerciseID)) ivarsEqual = false;
+ if( ! (pduType == rhs.pduType)) ivarsEqual = false;
+ if( ! (protocolFamily == rhs.protocolFamily)) ivarsEqual = false;
+ if( ! (timestamp == rhs.timestamp)) ivarsEqual = false;
+ if( ! (length == rhs.length)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" protocolVersion: ").append(protocolVersion).append("\n");
- sb.append(" exerciseID: ").append(exerciseID).append("\n");
- sb.append(" pduType: ").append(pduType).append("\n");
- sb.append(" protocolFamily: ").append(protocolFamily).append("\n");
- sb.append(" timestamp: ").append(timestamp).append("\n");
- sb.append(" length: ").append(length).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" protocolVersion: ").append(protocolVersion).append("\n");
+ sb.append(" exerciseID: ").append(exerciseID).append("\n");
+ sb.append(" pduType: ").append(pduType).append("\n");
+ sb.append(" protocolFamily: ").append(protocolFamily).append("\n");
+ sb.append(" timestamp: ").append(timestamp).append("\n");
+ sb.append(" length: ").append(length).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/PduBase.java b/src-generated/edu/nps/moves/dis7/PduBase.java
index fa313efd1c8908d775da0461a78fd083d825054d..257a573aa933ace52483fdfd12f16ccd3a3c7692 100644
--- a/src-generated/edu/nps/moves/dis7/PduBase.java
+++ b/src-generated/edu/nps/moves/dis7/PduBase.java
@@ -1,187 +1,187 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * The superclass for all PDUs except LiveEntitys. This incorporates the PduHeader record, section 7.2.2
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public abstract class PduBase extends Pdu implements Serializable
-{
- /** PDU Status Record. Described in 6.2.67. This field is not present in earlier DIS versions */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * The superclass for all PDUs except LiveEntitys. This incorporates the PduHeader record, section 7.2.2
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public abstract class PduBase extends Pdu implements Serializable
+{
+ /** PDU Status Record. Described in 6.2.67. This field is not present in earlier DIS versions */
protected PduStatus pduStatus = new PduStatus();
-
- /** zero-filled array of padding */
+
+ /** zero-filled array of padding */
protected byte padding = (byte)0;
-
-
-/** Constructor */
- public PduBase()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += pduStatus.getMarshalledSize();
- marshalSize += 1; // padding
-
- return marshalSize;
-}
-
-
-/** Setter for {@link PduBase#pduStatus}*/
-public PduBase setPduStatus(PduStatus pPduStatus)
+
+
+/** Constructor */
+ public PduBase()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += pduStatus.getMarshalledSize();
+ marshalSize += 1; // padding
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link PduBase#pduStatus}*/
+public PduBase setPduStatus(PduStatus pPduStatus)
{
- pduStatus = pPduStatus;
- return this;
-}
-
-/** Getter for {@link PduBase#pduStatus}*/
-public PduStatus getPduStatus()
+ pduStatus = pPduStatus;
+ return this;
+}
+
+/** Getter for {@link PduBase#pduStatus}*/
+public PduStatus getPduStatus()
{
return pduStatus;
-}
-
-/** Setter for {@link PduBase#padding}*/
-public PduBase setPadding(byte pPadding)
+}
+
+/** Setter for {@link PduBase#padding}*/
+public PduBase setPadding(byte pPadding)
{
- padding = pPadding;
- return this;
-}
-
-/** Getter for {@link PduBase#padding}*/
-public byte getPadding()
+ padding = pPadding;
+ return this;
+}
+
+/** Getter for {@link PduBase#padding}*/
+public byte getPadding()
{
return padding;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- pduStatus.marshal(dos);
- dos.writeByte(padding);
+ {
+ pduStatus.marshal(dos);
+ dos.writeByte(padding);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += pduStatus.unmarshal(dis);
- padding = (byte)dis.readUnsignedByte();
- uPosition += 1;
+ {
+ uPosition += pduStatus.unmarshal(dis);
+ padding = (byte)dis.readUnsignedByte();
+ uPosition += 1;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- pduStatus.marshal(buff);
- buff.put( (byte)padding);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ pduStatus.marshal(buff);
+ buff.put( (byte)padding);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- pduStatus.unmarshal(buff);
- padding = (byte)(buff.get() & 0xFF);
- return getMarshalledSize();
+
+ pduStatus.unmarshal(buff);
+ padding = (byte)(buff.get() & 0xFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final PduBase rhs = (PduBase)obj;
-
- if( ! (pduStatus.equals( rhs.pduStatus) )) ivarsEqual = false;
- if( ! (padding == rhs.padding)) ivarsEqual = false;
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final PduBase rhs = (PduBase)obj;
+
+ if( ! (pduStatus.equals( rhs.pduStatus) )) ivarsEqual = false;
+ if( ! (padding == rhs.padding)) ivarsEqual = false;
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" pduStatus: ").append(pduStatus).append("\n");
- sb.append(" padding: ").append(padding).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" pduStatus: ").append(pduStatus).append("\n");
+ sb.append(" padding: ").append(padding).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/PointObjectStatePdu.java b/src-generated/edu/nps/moves/dis7/PointObjectStatePdu.java
index 08e0e6def251ab9a4d6318e89ad3323e4140c503..ac082a5ccbca971bfb707b6b6314b0e10c586ca8 100644
--- a/src-generated/edu/nps/moves/dis7/PointObjectStatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/PointObjectStatePdu.java
@@ -1,467 +1,467 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 7.10.4 Used to communicate detailed information about the addition/modification of a synthetic environment object that is geometrically anchored to the terrain with a single point.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class PointObjectStatePdu extends SyntheticEnvironmentFamilyPdu implements Serializable
-{
- /** Object in synthetic environment */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 7.10.4 Used to communicate detailed information about the addition/modification of a synthetic environment object that is geometrically anchored to the terrain with a single point.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class PointObjectStatePdu extends SyntheticEnvironmentFamilyPdu implements Serializable
+{
+ /** Object in synthetic environment */
protected EntityID objectID = new EntityID();
-
- /** Object with which this point object is associated */
+
+ /** Object with which this point object is associated */
protected ObjectIdentifier referencedObjectID = new ObjectIdentifier();
-
- /** unique update number of each state transition of an object */
+
+ /** unique update number of each state transition of an object */
protected int updateNumber;
-
- /** force ID uid 6 */
+
+ /** force ID uid 6 */
protected ForceID forceID = ForceID.values()[0];
-
- /** modifications uid 240 */
+
+ /** modifications uid 240 */
protected ObjectStateModificationPointObject modifications = new ObjectStateModificationPointObject();
-
- /** Object type */
+
+ /** Object type */
protected ObjectType objectType = new ObjectType();
-
- /** Object location */
+
+ /** Object location */
protected Vector3Double objectLocation = new Vector3Double();
-
- /** Object orientation */
+
+ /** Object orientation */
protected EulerAngles objectOrientation = new EulerAngles();
-
- /** Specific object apperance */
+
+ /** Specific object apperance */
protected int specificObjectAppearance;
-
- /** General object apperance uid 229 */
+
+ /** General object apperance uid 229 */
protected ObjectStateAppearanceGeneral generObjectAppearance = new ObjectStateAppearanceGeneral();
-
+
protected short padding1;
-
- /** requesterID */
+
+ /** requesterID */
protected SimulationAddress requesterID = new SimulationAddress();
-
- /** receiver ID */
+
+ /** receiver ID */
protected SimulationAddress receivingID = new SimulationAddress();
-
- /** padding */
+
+ /** padding */
protected int pad2;
-
-
-/** Constructor */
- public PointObjectStatePdu()
- {
- setPduType( DISPDUType.POINT_OBJECT_STATE );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += objectID.getMarshalledSize();
- marshalSize += referencedObjectID.getMarshalledSize();
- marshalSize += 4; // updateNumber
- marshalSize += forceID.getMarshalledSize();
- marshalSize += modifications.getMarshalledSize();
- marshalSize += objectType.getMarshalledSize();
- marshalSize += objectLocation.getMarshalledSize();
- marshalSize += objectOrientation.getMarshalledSize();
- marshalSize += 4; // specificObjectAppearance
- marshalSize += generObjectAppearance.getMarshalledSize();
- marshalSize += 2; // padding1
- marshalSize += requesterID.getMarshalledSize();
- marshalSize += receivingID.getMarshalledSize();
- marshalSize += 4; // pad2
-
- return marshalSize;
-}
-
-
-/** Setter for {@link PointObjectStatePdu#objectID}*/
-public PointObjectStatePdu setObjectID(EntityID pObjectID)
-{
- objectID = pObjectID;
- return this;
-}
-
-/** Getter for {@link PointObjectStatePdu#objectID}*/
-public EntityID getObjectID()
+
+
+/** Constructor */
+ public PointObjectStatePdu()
+ {
+ setPduType( DISPDUType.POINT_OBJECT_STATE );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += objectID.getMarshalledSize();
+ marshalSize += referencedObjectID.getMarshalledSize();
+ marshalSize += 4; // updateNumber
+ marshalSize += forceID.getMarshalledSize();
+ marshalSize += modifications.getMarshalledSize();
+ marshalSize += objectType.getMarshalledSize();
+ marshalSize += objectLocation.getMarshalledSize();
+ marshalSize += objectOrientation.getMarshalledSize();
+ marshalSize += 4; // specificObjectAppearance
+ marshalSize += generObjectAppearance.getMarshalledSize();
+ marshalSize += 2; // padding1
+ marshalSize += requesterID.getMarshalledSize();
+ marshalSize += receivingID.getMarshalledSize();
+ marshalSize += 4; // pad2
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link PointObjectStatePdu#objectID}*/
+public PointObjectStatePdu setObjectID(EntityID pObjectID)
+{
+ objectID = pObjectID;
+ return this;
+}
+
+/** Getter for {@link PointObjectStatePdu#objectID}*/
+public EntityID getObjectID()
{
return objectID;
-}
-
-/** Setter for {@link PointObjectStatePdu#referencedObjectID}*/
-public PointObjectStatePdu setReferencedObjectID(ObjectIdentifier pReferencedObjectID)
-{
- referencedObjectID = pReferencedObjectID;
- return this;
-}
-
-/** Getter for {@link PointObjectStatePdu#referencedObjectID}*/
-public ObjectIdentifier getReferencedObjectID()
+}
+
+/** Setter for {@link PointObjectStatePdu#referencedObjectID}*/
+public PointObjectStatePdu setReferencedObjectID(ObjectIdentifier pReferencedObjectID)
+{
+ referencedObjectID = pReferencedObjectID;
+ return this;
+}
+
+/** Getter for {@link PointObjectStatePdu#referencedObjectID}*/
+public ObjectIdentifier getReferencedObjectID()
{
return referencedObjectID;
-}
-
-/** Setter for {@link PointObjectStatePdu#updateNumber}*/
-public PointObjectStatePdu setUpdateNumber(int pUpdateNumber)
-{
- updateNumber = pUpdateNumber;
- return this;
-}
-
-/** Getter for {@link PointObjectStatePdu#updateNumber}*/
-public int getUpdateNumber()
+}
+
+/** Setter for {@link PointObjectStatePdu#updateNumber}*/
+public PointObjectStatePdu setUpdateNumber(int pUpdateNumber)
+{
+ updateNumber = pUpdateNumber;
+ return this;
+}
+
+/** Getter for {@link PointObjectStatePdu#updateNumber}*/
+public int getUpdateNumber()
{
return updateNumber;
-}
-
-/** Setter for {@link PointObjectStatePdu#forceID}*/
-public PointObjectStatePdu setForceID(ForceID pForceID)
-{
- forceID = pForceID;
- return this;
-}
-
-/** Getter for {@link PointObjectStatePdu#forceID}*/
-public ForceID getForceID()
+}
+
+/** Setter for {@link PointObjectStatePdu#forceID}*/
+public PointObjectStatePdu setForceID(ForceID pForceID)
+{
+ forceID = pForceID;
+ return this;
+}
+
+/** Getter for {@link PointObjectStatePdu#forceID}*/
+public ForceID getForceID()
{
return forceID;
-}
-
-/** Setter for {@link PointObjectStatePdu#modifications}*/
-public PointObjectStatePdu setModifications(ObjectStateModificationPointObject pModifications)
-{
- modifications = pModifications;
- return this;
-}
-
-/** Setter for {@link PointObjectStatePdu#modifications}*/
-public ObjectStateModificationPointObject getModifications()
+}
+
+/** Setter for {@link PointObjectStatePdu#modifications}*/
+public PointObjectStatePdu setModifications(ObjectStateModificationPointObject pModifications)
+{
+ modifications = pModifications;
+ return this;
+}
+
+/** Setter for {@link PointObjectStatePdu#modifications}*/
+public ObjectStateModificationPointObject getModifications()
{
return modifications;
-}
-
-/** Setter for {@link PointObjectStatePdu#objectType}*/
-public PointObjectStatePdu setObjectType(ObjectType pObjectType)
-{
- objectType = pObjectType;
- return this;
-}
-
-/** Getter for {@link PointObjectStatePdu#objectType}*/
-public ObjectType getObjectType()
+}
+
+/** Setter for {@link PointObjectStatePdu#objectType}*/
+public PointObjectStatePdu setObjectType(ObjectType pObjectType)
+{
+ objectType = pObjectType;
+ return this;
+}
+
+/** Getter for {@link PointObjectStatePdu#objectType}*/
+public ObjectType getObjectType()
{
return objectType;
-}
-
-/** Setter for {@link PointObjectStatePdu#objectLocation}*/
-public PointObjectStatePdu setObjectLocation(Vector3Double pObjectLocation)
-{
- objectLocation = pObjectLocation;
- return this;
-}
-
-/** Getter for {@link PointObjectStatePdu#objectLocation}*/
-public Vector3Double getObjectLocation()
+}
+
+/** Setter for {@link PointObjectStatePdu#objectLocation}*/
+public PointObjectStatePdu setObjectLocation(Vector3Double pObjectLocation)
+{
+ objectLocation = pObjectLocation;
+ return this;
+}
+
+/** Getter for {@link PointObjectStatePdu#objectLocation}*/
+public Vector3Double getObjectLocation()
{
return objectLocation;
-}
-
-/** Setter for {@link PointObjectStatePdu#objectOrientation}*/
-public PointObjectStatePdu setObjectOrientation(EulerAngles pObjectOrientation)
-{
- objectOrientation = pObjectOrientation;
- return this;
-}
-
-/** Getter for {@link PointObjectStatePdu#objectOrientation}*/
-public EulerAngles getObjectOrientation()
+}
+
+/** Setter for {@link PointObjectStatePdu#objectOrientation}*/
+public PointObjectStatePdu setObjectOrientation(EulerAngles pObjectOrientation)
+{
+ objectOrientation = pObjectOrientation;
+ return this;
+}
+
+/** Getter for {@link PointObjectStatePdu#objectOrientation}*/
+public EulerAngles getObjectOrientation()
{
return objectOrientation;
-}
-
-/** Setter for {@link PointObjectStatePdu#specificObjectAppearance}*/
-public PointObjectStatePdu setSpecificObjectAppearance(int pSpecificObjectAppearance)
-{
- specificObjectAppearance = pSpecificObjectAppearance;
- return this;
-}
-
-/** Getter for {@link PointObjectStatePdu#specificObjectAppearance}*/
-public int getSpecificObjectAppearance()
+}
+
+/** Setter for {@link PointObjectStatePdu#specificObjectAppearance}*/
+public PointObjectStatePdu setSpecificObjectAppearance(int pSpecificObjectAppearance)
+{
+ specificObjectAppearance = pSpecificObjectAppearance;
+ return this;
+}
+
+/** Getter for {@link PointObjectStatePdu#specificObjectAppearance}*/
+public int getSpecificObjectAppearance()
{
return specificObjectAppearance;
-}
-
-/** Setter for {@link PointObjectStatePdu#generObjectAppearance}*/
-public PointObjectStatePdu setGenerObjectAppearance(ObjectStateAppearanceGeneral pGenerObjectAppearance)
-{
- generObjectAppearance = pGenerObjectAppearance;
- return this;
-}
-
-/** Setter for {@link PointObjectStatePdu#generObjectAppearance}*/
-public ObjectStateAppearanceGeneral getGenerObjectAppearance()
+}
+
+/** Setter for {@link PointObjectStatePdu#generObjectAppearance}*/
+public PointObjectStatePdu setGenerObjectAppearance(ObjectStateAppearanceGeneral pGenerObjectAppearance)
+{
+ generObjectAppearance = pGenerObjectAppearance;
+ return this;
+}
+
+/** Setter for {@link PointObjectStatePdu#generObjectAppearance}*/
+public ObjectStateAppearanceGeneral getGenerObjectAppearance()
{
return generObjectAppearance;
-}
-
-/** Setter for {@link PointObjectStatePdu#padding1}*/
-public PointObjectStatePdu setPadding1(short pPadding1)
-{
- padding1 = pPadding1;
- return this;
-}
-
-/** Getter for {@link PointObjectStatePdu#padding1}*/
-public short getPadding1()
+}
+
+/** Setter for {@link PointObjectStatePdu#padding1}*/
+public PointObjectStatePdu setPadding1(short pPadding1)
+{
+ padding1 = pPadding1;
+ return this;
+}
+
+/** Getter for {@link PointObjectStatePdu#padding1}*/
+public short getPadding1()
{
return padding1;
-}
-
-/** Setter for {@link PointObjectStatePdu#requesterID}*/
-public PointObjectStatePdu setRequesterID(SimulationAddress pRequesterID)
-{
- requesterID = pRequesterID;
- return this;
-}
-
-/** Getter for {@link PointObjectStatePdu#requesterID}*/
-public SimulationAddress getRequesterID()
+}
+
+/** Setter for {@link PointObjectStatePdu#requesterID}*/
+public PointObjectStatePdu setRequesterID(SimulationAddress pRequesterID)
+{
+ requesterID = pRequesterID;
+ return this;
+}
+
+/** Getter for {@link PointObjectStatePdu#requesterID}*/
+public SimulationAddress getRequesterID()
{
return requesterID;
-}
-
-/** Setter for {@link PointObjectStatePdu#receivingID}*/
-public PointObjectStatePdu setReceivingID(SimulationAddress pReceivingID)
-{
- receivingID = pReceivingID;
- return this;
-}
-
-/** Getter for {@link PointObjectStatePdu#receivingID}*/
-public SimulationAddress getReceivingID()
+}
+
+/** Setter for {@link PointObjectStatePdu#receivingID}*/
+public PointObjectStatePdu setReceivingID(SimulationAddress pReceivingID)
+{
+ receivingID = pReceivingID;
+ return this;
+}
+
+/** Getter for {@link PointObjectStatePdu#receivingID}*/
+public SimulationAddress getReceivingID()
{
return receivingID;
-}
-
-/** Setter for {@link PointObjectStatePdu#pad2}*/
-public PointObjectStatePdu setPad2(int pPad2)
-{
- pad2 = pPad2;
- return this;
-}
-
-/** Getter for {@link PointObjectStatePdu#pad2}*/
-public int getPad2()
+}
+
+/** Setter for {@link PointObjectStatePdu#pad2}*/
+public PointObjectStatePdu setPad2(int pPad2)
+{
+ pad2 = pPad2;
+ return this;
+}
+
+/** Getter for {@link PointObjectStatePdu#pad2}*/
+public int getPad2()
{
return pad2;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- objectID.marshal(dos);
- referencedObjectID.marshal(dos);
- dos.writeInt(updateNumber);
- forceID.marshal(dos);
- modifications.marshal(dos);
- objectType.marshal(dos);
- objectLocation.marshal(dos);
- objectOrientation.marshal(dos);
- dos.writeInt(specificObjectAppearance);
- generObjectAppearance.marshal(dos);
- dos.writeShort(padding1);
- requesterID.marshal(dos);
- receivingID.marshal(dos);
- dos.writeInt(pad2);
+ {
+ objectID.marshal(dos);
+ referencedObjectID.marshal(dos);
+ dos.writeInt(updateNumber);
+ forceID.marshal(dos);
+ modifications.marshal(dos);
+ objectType.marshal(dos);
+ objectLocation.marshal(dos);
+ objectOrientation.marshal(dos);
+ dos.writeInt(specificObjectAppearance);
+ generObjectAppearance.marshal(dos);
+ dos.writeShort(padding1);
+ requesterID.marshal(dos);
+ receivingID.marshal(dos);
+ dos.writeInt(pad2);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += objectID.unmarshal(dis);
- uPosition += referencedObjectID.unmarshal(dis);
- updateNumber = dis.readInt();
- uPosition += 4;
- forceID = ForceID.unmarshalEnum(dis);
- uPosition += forceID.getMarshalledSize();
- uPosition += modifications.unmarshal(dis);
- uPosition += objectType.unmarshal(dis);
- uPosition += objectLocation.unmarshal(dis);
- uPosition += objectOrientation.unmarshal(dis);
- specificObjectAppearance = dis.readInt();
- uPosition += 4;
- uPosition += generObjectAppearance.unmarshal(dis);
- padding1 = (short)dis.readUnsignedShort();
- uPosition += 2;
- uPosition += requesterID.unmarshal(dis);
- uPosition += receivingID.unmarshal(dis);
- pad2 = dis.readInt();
- uPosition += 4;
+ {
+ uPosition += objectID.unmarshal(dis);
+ uPosition += referencedObjectID.unmarshal(dis);
+ updateNumber = dis.readInt();
+ uPosition += 4;
+ forceID = ForceID.unmarshalEnum(dis);
+ uPosition += forceID.getMarshalledSize();
+ uPosition += modifications.unmarshal(dis);
+ uPosition += objectType.unmarshal(dis);
+ uPosition += objectLocation.unmarshal(dis);
+ uPosition += objectOrientation.unmarshal(dis);
+ specificObjectAppearance = dis.readInt();
+ uPosition += 4;
+ uPosition += generObjectAppearance.unmarshal(dis);
+ padding1 = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ uPosition += requesterID.unmarshal(dis);
+ uPosition += receivingID.unmarshal(dis);
+ pad2 = dis.readInt();
+ uPosition += 4;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- objectID.marshal(buff);
- referencedObjectID.marshal(buff);
- buff.putInt( (int)updateNumber);
- forceID.marshal(buff);
- modifications.marshal(buff);
- objectType.marshal(buff);
- objectLocation.marshal(buff);
- objectOrientation.marshal(buff);
- buff.putInt( (int)specificObjectAppearance);
- generObjectAppearance.marshal(buff);
- buff.putShort( (short)padding1);
- requesterID.marshal(buff);
- receivingID.marshal(buff);
- buff.putInt( (int)pad2);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+ }
+ return getMarshalledSize();
+}
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ objectID.marshal(buff);
+ referencedObjectID.marshal(buff);
+ buff.putInt( (int)updateNumber);
+ forceID.marshal(buff);
+ modifications.marshal(buff);
+ objectType.marshal(buff);
+ objectLocation.marshal(buff);
+ objectOrientation.marshal(buff);
+ buff.putInt( (int)specificObjectAppearance);
+ generObjectAppearance.marshal(buff);
+ buff.putShort( (short)padding1);
+ requesterID.marshal(buff);
+ receivingID.marshal(buff);
+ buff.putInt( (int)pad2);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- objectID.unmarshal(buff);
- referencedObjectID.unmarshal(buff);
- updateNumber = buff.getInt();
- forceID = ForceID.unmarshalEnum(buff);
- modifications.unmarshal(buff);
- objectType.unmarshal(buff);
- objectLocation.unmarshal(buff);
- objectOrientation.unmarshal(buff);
- specificObjectAppearance = buff.getInt();
- generObjectAppearance.unmarshal(buff);
- padding1 = (short)(buff.getShort() & 0xFFFF);
- requesterID.unmarshal(buff);
- receivingID.unmarshal(buff);
- pad2 = buff.getInt();
- return getMarshalledSize();
-}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final PointObjectStatePdu rhs = (PointObjectStatePdu)obj;
-
- if( ! (objectID.equals( rhs.objectID) )) ivarsEqual = false;
- if( ! (referencedObjectID.equals( rhs.referencedObjectID) )) ivarsEqual = false;
- if( ! (updateNumber == rhs.updateNumber)) ivarsEqual = false;
- if( ! (forceID == rhs.forceID)) ivarsEqual = false;
- if( ! (modifications.equals( rhs.modifications) )) ivarsEqual = false;
- if( ! (objectType.equals( rhs.objectType) )) ivarsEqual = false;
- if( ! (objectLocation.equals( rhs.objectLocation) )) ivarsEqual = false;
- if( ! (objectOrientation.equals( rhs.objectOrientation) )) ivarsEqual = false;
- if( ! (specificObjectAppearance == rhs.specificObjectAppearance)) ivarsEqual = false;
- if( ! (generObjectAppearance.equals( rhs.generObjectAppearance) )) ivarsEqual = false;
- if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
- if( ! (requesterID.equals( rhs.requesterID) )) ivarsEqual = false;
- if( ! (receivingID.equals( rhs.receivingID) )) ivarsEqual = false;
- if( ! (pad2 == rhs.pad2)) ivarsEqual = false;
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ objectID.unmarshal(buff);
+ referencedObjectID.unmarshal(buff);
+ updateNumber = buff.getInt();
+ forceID = ForceID.unmarshalEnum(buff);
+ modifications.unmarshal(buff);
+ objectType.unmarshal(buff);
+ objectLocation.unmarshal(buff);
+ objectOrientation.unmarshal(buff);
+ specificObjectAppearance = buff.getInt();
+ generObjectAppearance.unmarshal(buff);
+ padding1 = (short)(buff.getShort() & 0xFFFF);
+ requesterID.unmarshal(buff);
+ receivingID.unmarshal(buff);
+ pad2 = buff.getInt();
+ return getMarshalledSize();
+}
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final PointObjectStatePdu rhs = (PointObjectStatePdu)obj;
+
+ if( ! (objectID.equals( rhs.objectID) )) ivarsEqual = false;
+ if( ! (referencedObjectID.equals( rhs.referencedObjectID) )) ivarsEqual = false;
+ if( ! (updateNumber == rhs.updateNumber)) ivarsEqual = false;
+ if( ! (forceID == rhs.forceID)) ivarsEqual = false;
+ if( ! (modifications.equals( rhs.modifications) )) ivarsEqual = false;
+ if( ! (objectType.equals( rhs.objectType) )) ivarsEqual = false;
+ if( ! (objectLocation.equals( rhs.objectLocation) )) ivarsEqual = false;
+ if( ! (objectOrientation.equals( rhs.objectOrientation) )) ivarsEqual = false;
+ if( ! (specificObjectAppearance == rhs.specificObjectAppearance)) ivarsEqual = false;
+ if( ! (generObjectAppearance.equals( rhs.generObjectAppearance) )) ivarsEqual = false;
+ if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
+ if( ! (requesterID.equals( rhs.requesterID) )) ivarsEqual = false;
+ if( ! (receivingID.equals( rhs.receivingID) )) ivarsEqual = false;
+ if( ! (pad2 == rhs.pad2)) ivarsEqual = false;
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" objectID: ").append(objectID).append("\n");
- sb.append(" referencedObjectID: ").append(referencedObjectID).append("\n");
- sb.append(" updateNumber: ").append(updateNumber).append("\n");
- sb.append(" forceID: ").append(forceID).append("\n");
- sb.append(" modifications: ").append(modifications).append("\n");
- sb.append(" objectType: ").append(objectType).append("\n");
- sb.append(" objectLocation: ").append(objectLocation).append("\n");
- sb.append(" objectOrientation: ").append(objectOrientation).append("\n");
- sb.append(" specificObjectAppearance: ").append(specificObjectAppearance).append("\n");
- sb.append(" generObjectAppearance: ").append(generObjectAppearance).append("\n");
- sb.append(" padding1: ").append(padding1).append("\n");
- sb.append(" requesterID: ").append(requesterID).append("\n");
- sb.append(" receivingID: ").append(receivingID).append("\n");
- sb.append(" pad2: ").append(pad2).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" objectID: ").append(objectID).append("\n");
+ sb.append(" referencedObjectID: ").append(referencedObjectID).append("\n");
+ sb.append(" updateNumber: ").append(updateNumber).append("\n");
+ sb.append(" forceID: ").append(forceID).append("\n");
+ sb.append(" modifications: ").append(modifications).append("\n");
+ sb.append(" objectType: ").append(objectType).append("\n");
+ sb.append(" objectLocation: ").append(objectLocation).append("\n");
+ sb.append(" objectOrientation: ").append(objectOrientation).append("\n");
+ sb.append(" specificObjectAppearance: ").append(specificObjectAppearance).append("\n");
+ sb.append(" generObjectAppearance: ").append(generObjectAppearance).append("\n");
+ sb.append(" padding1: ").append(padding1).append("\n");
+ sb.append(" requesterID: ").append(requesterID).append("\n");
+ sb.append(" receivingID: ").append(receivingID).append("\n");
+ sb.append(" pad2: ").append(pad2).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/PropulsionSystemData.java b/src-generated/edu/nps/moves/dis7/PropulsionSystemData.java
index 02adc086472e409064d160e042770fe630e10df4..af5531af34669b1464a3ed01ad22c2554856b2ea 100644
--- a/src-generated/edu/nps/moves/dis7/PropulsionSystemData.java
+++ b/src-generated/edu/nps/moves/dis7/PropulsionSystemData.java
@@ -1,186 +1,186 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * contains information describing the propulsion systems of the entity. This information shall be provided for each active propulsion system defined. Section 6.2.68
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class PropulsionSystemData extends Object implements Serializable
-{
- /** powerSetting */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * contains information describing the propulsion systems of the entity. This information shall be provided for each active propulsion system defined. Section 6.2.68
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class PropulsionSystemData extends Object implements Serializable
+{
+ /** powerSetting */
protected float powerSetting;
-
- /** engine RPMs */
+
+ /** engine RPMs */
protected float engineRpm;
-
-
-/** Constructor */
- public PropulsionSystemData()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += 4; // powerSetting
- marshalSize += 4; // engineRpm
-
- return marshalSize;
-}
-
-
-/** Setter for {@link PropulsionSystemData#powerSetting}*/
-public PropulsionSystemData setPowerSetting(float pPowerSetting)
+
+
+/** Constructor */
+ public PropulsionSystemData()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 4; // powerSetting
+ marshalSize += 4; // engineRpm
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link PropulsionSystemData#powerSetting}*/
+public PropulsionSystemData setPowerSetting(float pPowerSetting)
{
- powerSetting = pPowerSetting;
- return this;
-}
-
-/** Getter for {@link PropulsionSystemData#powerSetting}*/
-public float getPowerSetting()
+ powerSetting = pPowerSetting;
+ return this;
+}
+
+/** Getter for {@link PropulsionSystemData#powerSetting}*/
+public float getPowerSetting()
{
return powerSetting;
-}
-
-/** Setter for {@link PropulsionSystemData#engineRpm}*/
-public PropulsionSystemData setEngineRpm(float pEngineRpm)
+}
+
+/** Setter for {@link PropulsionSystemData#engineRpm}*/
+public PropulsionSystemData setEngineRpm(float pEngineRpm)
{
- engineRpm = pEngineRpm;
- return this;
-}
-
-/** Getter for {@link PropulsionSystemData#engineRpm}*/
-public float getEngineRpm()
+ engineRpm = pEngineRpm;
+ return this;
+}
+
+/** Getter for {@link PropulsionSystemData#engineRpm}*/
+public float getEngineRpm()
{
return engineRpm;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeFloat(powerSetting);
- dos.writeFloat(engineRpm);
+ {
+ dos.writeFloat(powerSetting);
+ dos.writeFloat(engineRpm);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- powerSetting = dis.readFloat();
- uPosition += 4;
- engineRpm = dis.readFloat();
- uPosition += 4;
+ {
+ powerSetting = dis.readFloat();
+ uPosition += 4;
+ engineRpm = dis.readFloat();
+ uPosition += 4;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putFloat( (float)powerSetting);
- buff.putFloat( (float)engineRpm);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- powerSetting = buff.getFloat();
- engineRpm = buff.getFloat();
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putFloat( (float)powerSetting);
+ buff.putFloat( (float)engineRpm);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ powerSetting = buff.getFloat();
+ engineRpm = buff.getFloat();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final PropulsionSystemData rhs = (PropulsionSystemData)obj;
-
- if( ! (powerSetting == rhs.powerSetting)) ivarsEqual = false;
- if( ! (engineRpm == rhs.engineRpm)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final PropulsionSystemData rhs = (PropulsionSystemData)obj;
+
+ if( ! (powerSetting == rhs.powerSetting)) ivarsEqual = false;
+ if( ! (engineRpm == rhs.engineRpm)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" powerSetting: ").append(powerSetting).append("\n");
- sb.append(" engineRpm: ").append(engineRpm).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" powerSetting: ").append(powerSetting).append("\n");
+ sb.append(" engineRpm: ").append(engineRpm).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ProtocolMode.java b/src-generated/edu/nps/moves/dis7/ProtocolMode.java
index 7ad2500a105a8f2cac3ebc6e9327c96b3f7df149..e22ace2805759e7dd67a06737c1b4185b43b4401 100644
--- a/src-generated/edu/nps/moves/dis7/ProtocolMode.java
+++ b/src-generated/edu/nps/moves/dis7/ProtocolMode.java
@@ -1,162 +1,162 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Bit field used to identify minefield data. bits 14-15 are a 2-bit enum, other bits unused. Section 6.2.69
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class ProtocolMode extends Object implements Serializable
-{
- /** Bitfields, 14-15 contain an enum, uid 336 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Bit field used to identify minefield data. bits 14-15 are a 2-bit enum, other bits unused. Section 6.2.69
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class ProtocolMode extends Object implements Serializable
+{
+ /** Bitfields, 14-15 contain an enum, uid 336 */
protected short protocolMode;
-
-
-/** Constructor */
- public ProtocolMode()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public ProtocolMode()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 2; // protocolMode
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link ProtocolMode#protocolMode}*/
+public ProtocolMode setProtocolMode(short pProtocolMode)
{
- int marshalSize = 0;
-
- marshalSize += 2; // protocolMode
-
- return marshalSize;
-}
-
-
-/** Setter for {@link ProtocolMode#protocolMode}*/
-public ProtocolMode setProtocolMode(short pProtocolMode)
-{
- protocolMode = pProtocolMode;
- return this;
-}
-
-/** Getter for {@link ProtocolMode#protocolMode}*/
-public short getProtocolMode()
+ protocolMode = pProtocolMode;
+ return this;
+}
+
+/** Getter for {@link ProtocolMode#protocolMode}*/
+public short getProtocolMode()
{
return protocolMode;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeShort(protocolMode);
+ {
+ dos.writeShort(protocolMode);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- protocolMode = (short)dis.readUnsignedShort();
- uPosition += 2;
+ {
+ protocolMode = (short)dis.readUnsignedShort();
+ uPosition += 2;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putShort( (short)protocolMode);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- protocolMode = (short)(buff.getShort() & 0xFFFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putShort( (short)protocolMode);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ protocolMode = (short)(buff.getShort() & 0xFFFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final ProtocolMode rhs = (ProtocolMode)obj;
-
- if( ! (protocolMode == rhs.protocolMode)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final ProtocolMode rhs = (ProtocolMode)obj;
+
+ if( ! (protocolMode == rhs.protocolMode)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" protocolMode: ").append(protocolMode).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" protocolMode: ").append(protocolMode).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/RadioCommsHeader.java b/src-generated/edu/nps/moves/dis7/RadioCommsHeader.java
index 8cd2f1b6de801a03ea89400fe094ec6abb0ac662..c98b046fdb2c181c66623c6a9394e0b3dc8952a9 100644
--- a/src-generated/edu/nps/moves/dis7/RadioCommsHeader.java
+++ b/src-generated/edu/nps/moves/dis7/RadioCommsHeader.java
@@ -1,184 +1,184 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class RadioCommsHeader extends Object implements Serializable
-{
- /** ID of the entitythat is the source of the communication */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class RadioCommsHeader extends Object implements Serializable
+{
+ /** ID of the entitythat is the source of the communication */
protected EntityID radioReferenceID = new EntityID();
-
- /** particular radio within an entity */
+
+ /** particular radio within an entity */
protected short radioNumber;
-
-
-/** Constructor */
- public RadioCommsHeader()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += radioReferenceID.getMarshalledSize();
- marshalSize += 2; // radioNumber
-
- return marshalSize;
-}
-
-
-/** Setter for {@link RadioCommsHeader#radioReferenceID}*/
-public RadioCommsHeader setRadioReferenceID(EntityID pRadioReferenceID)
+
+
+/** Constructor */
+ public RadioCommsHeader()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += radioReferenceID.getMarshalledSize();
+ marshalSize += 2; // radioNumber
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link RadioCommsHeader#radioReferenceID}*/
+public RadioCommsHeader setRadioReferenceID(EntityID pRadioReferenceID)
{
- radioReferenceID = pRadioReferenceID;
- return this;
-}
-
-/** Getter for {@link RadioCommsHeader#radioReferenceID}*/
-public EntityID getRadioReferenceID()
+ radioReferenceID = pRadioReferenceID;
+ return this;
+}
+
+/** Getter for {@link RadioCommsHeader#radioReferenceID}*/
+public EntityID getRadioReferenceID()
{
return radioReferenceID;
-}
-
-/** Setter for {@link RadioCommsHeader#radioNumber}*/
-public RadioCommsHeader setRadioNumber(short pRadioNumber)
+}
+
+/** Setter for {@link RadioCommsHeader#radioNumber}*/
+public RadioCommsHeader setRadioNumber(short pRadioNumber)
{
- radioNumber = pRadioNumber;
- return this;
-}
-
-/** Getter for {@link RadioCommsHeader#radioNumber}*/
-public short getRadioNumber()
+ radioNumber = pRadioNumber;
+ return this;
+}
+
+/** Getter for {@link RadioCommsHeader#radioNumber}*/
+public short getRadioNumber()
{
return radioNumber;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- radioReferenceID.marshal(dos);
- dos.writeShort(radioNumber);
+ {
+ radioReferenceID.marshal(dos);
+ dos.writeShort(radioNumber);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- uPosition += radioReferenceID.unmarshal(dis);
- radioNumber = (short)dis.readUnsignedShort();
- uPosition += 2;
+ {
+ uPosition += radioReferenceID.unmarshal(dis);
+ radioNumber = (short)dis.readUnsignedShort();
+ uPosition += 2;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- radioReferenceID.marshal(buff);
- buff.putShort( (short)radioNumber);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- radioReferenceID.unmarshal(buff);
- radioNumber = (short)(buff.getShort() & 0xFFFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ radioReferenceID.marshal(buff);
+ buff.putShort( (short)radioNumber);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ radioReferenceID.unmarshal(buff);
+ radioNumber = (short)(buff.getShort() & 0xFFFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final RadioCommsHeader rhs = (RadioCommsHeader)obj;
-
- if( ! (radioReferenceID.equals( rhs.radioReferenceID) )) ivarsEqual = false;
- if( ! (radioNumber == rhs.radioNumber)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final RadioCommsHeader rhs = (RadioCommsHeader)obj;
+
+ if( ! (radioReferenceID.equals( rhs.radioReferenceID) )) ivarsEqual = false;
+ if( ! (radioNumber == rhs.radioNumber)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" radioReferenceID: ").append(radioReferenceID).append("\n");
- sb.append(" radioNumber: ").append(radioNumber).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" radioReferenceID: ").append(radioReferenceID).append("\n");
+ sb.append(" radioNumber: ").append(radioNumber).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/RadioCommunicationsFamilyPdu.java b/src-generated/edu/nps/moves/dis7/RadioCommunicationsFamilyPdu.java
index f617ac6b6ac212efe42c91287fd266869e7ac72d..dce627cc791f61ef988f662b20d9634393b9af61 100644
--- a/src-generated/edu/nps/moves/dis7/RadioCommunicationsFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/RadioCommunicationsFamilyPdu.java
@@ -1,141 +1,141 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Abstract superclass for radio communications PDUs. Section 7.7
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public abstract class RadioCommunicationsFamilyPdu extends PduBase implements Serializable
-{
-
-/** Constructor */
- public RadioCommunicationsFamilyPdu()
- {
- setProtocolFamily( DISProtocolFamily.RADIO_COMMUNICATIONS );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
-
- return marshalSize;
-}
-
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Abstract superclass for radio communications PDUs. Section 7.7
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public abstract class RadioCommunicationsFamilyPdu extends PduBase implements Serializable
+{
+
+/** Constructor */
+ public RadioCommunicationsFamilyPdu()
+ {
+ setProtocolFamily( DISProtocolFamily.RADIO_COMMUNICATIONS );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+
+ return marshalSize;
+}
+
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
+ {
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
+ {
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- return getMarshalledSize();
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final RadioCommunicationsFamilyPdu rhs = (RadioCommunicationsFamilyPdu)obj;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final RadioCommunicationsFamilyPdu rhs = (RadioCommunicationsFamilyPdu)obj;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
-
- return sb.toString();
- }
-} // end of class
+
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/RadioIdentifier.java b/src-generated/edu/nps/moves/dis7/RadioIdentifier.java
index 12be44ee7cb2377309c34cd18adec177e1ccdea9..e563f9761e6f71f1f40ce6dc9a37095b9b7252ab 100644
--- a/src-generated/edu/nps/moves/dis7/RadioIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/RadioIdentifier.java
@@ -1,234 +1,234 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * The unique designation of an attached or unattached radio in an event or exercise Section 6.2.70
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class RadioIdentifier extends Object implements Serializable
-{
- /** site */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * The unique designation of an attached or unattached radio in an event or exercise Section 6.2.70
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class RadioIdentifier extends Object implements Serializable
+{
+ /** site */
protected short siteNumber;
-
- /** application number */
+
+ /** application number */
protected short applicationNumber;
-
- /** reference number */
+
+ /** reference number */
protected short referenceNumber;
-
- /** Radio number */
+
+ /** Radio number */
protected short radioNumber;
-
-
-/** Constructor */
- public RadioIdentifier()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public RadioIdentifier()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 2; // siteNumber
+ marshalSize += 2; // applicationNumber
+ marshalSize += 2; // referenceNumber
+ marshalSize += 2; // radioNumber
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link RadioIdentifier#siteNumber}*/
+public RadioIdentifier setSiteNumber(short pSiteNumber)
{
- int marshalSize = 0;
-
- marshalSize += 2; // siteNumber
- marshalSize += 2; // applicationNumber
- marshalSize += 2; // referenceNumber
- marshalSize += 2; // radioNumber
-
- return marshalSize;
-}
-
-
-/** Setter for {@link RadioIdentifier#siteNumber}*/
-public RadioIdentifier setSiteNumber(short pSiteNumber)
-{
- siteNumber = pSiteNumber;
- return this;
-}
-
-/** Getter for {@link RadioIdentifier#siteNumber}*/
-public short getSiteNumber()
+ siteNumber = pSiteNumber;
+ return this;
+}
+
+/** Getter for {@link RadioIdentifier#siteNumber}*/
+public short getSiteNumber()
{
return siteNumber;
-}
-
-/** Setter for {@link RadioIdentifier#applicationNumber}*/
-public RadioIdentifier setApplicationNumber(short pApplicationNumber)
+}
+
+/** Setter for {@link RadioIdentifier#applicationNumber}*/
+public RadioIdentifier setApplicationNumber(short pApplicationNumber)
{
- applicationNumber = pApplicationNumber;
- return this;
-}
-
-/** Getter for {@link RadioIdentifier#applicationNumber}*/
-public short getApplicationNumber()
+ applicationNumber = pApplicationNumber;
+ return this;
+}
+
+/** Getter for {@link RadioIdentifier#applicationNumber}*/
+public short getApplicationNumber()
{
return applicationNumber;
-}
-
-/** Setter for {@link RadioIdentifier#referenceNumber}*/
-public RadioIdentifier setReferenceNumber(short pReferenceNumber)
+}
+
+/** Setter for {@link RadioIdentifier#referenceNumber}*/
+public RadioIdentifier setReferenceNumber(short pReferenceNumber)
{
- referenceNumber = pReferenceNumber;
- return this;
-}
-
-/** Getter for {@link RadioIdentifier#referenceNumber}*/
-public short getReferenceNumber()
+ referenceNumber = pReferenceNumber;
+ return this;
+}
+
+/** Getter for {@link RadioIdentifier#referenceNumber}*/
+public short getReferenceNumber()
{
return referenceNumber;
-}
-
-/** Setter for {@link RadioIdentifier#radioNumber}*/
-public RadioIdentifier setRadioNumber(short pRadioNumber)
+}
+
+/** Setter for {@link RadioIdentifier#radioNumber}*/
+public RadioIdentifier setRadioNumber(short pRadioNumber)
{
- radioNumber = pRadioNumber;
- return this;
-}
-
-/** Getter for {@link RadioIdentifier#radioNumber}*/
-public short getRadioNumber()
+ radioNumber = pRadioNumber;
+ return this;
+}
+
+/** Getter for {@link RadioIdentifier#radioNumber}*/
+public short getRadioNumber()
{
return radioNumber;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeShort(siteNumber);
- dos.writeShort(applicationNumber);
- dos.writeShort(referenceNumber);
- dos.writeShort(radioNumber);
+ {
+ dos.writeShort(siteNumber);
+ dos.writeShort(applicationNumber);
+ dos.writeShort(referenceNumber);
+ dos.writeShort(radioNumber);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- siteNumber = (short)dis.readUnsignedShort();
- uPosition += 2;
- applicationNumber = (short)dis.readUnsignedShort();
- uPosition += 2;
- referenceNumber = (short)dis.readUnsignedShort();
- uPosition += 2;
- radioNumber = (short)dis.readUnsignedShort();
- uPosition += 2;
+ {
+ siteNumber = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ applicationNumber = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ referenceNumber = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ radioNumber = (short)dis.readUnsignedShort();
+ uPosition += 2;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putShort( (short)siteNumber);
- buff.putShort( (short)applicationNumber);
- buff.putShort( (short)referenceNumber);
- buff.putShort( (short)radioNumber);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- siteNumber = (short)(buff.getShort() & 0xFFFF);
- applicationNumber = (short)(buff.getShort() & 0xFFFF);
- referenceNumber = (short)(buff.getShort() & 0xFFFF);
- radioNumber = (short)(buff.getShort() & 0xFFFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putShort( (short)siteNumber);
+ buff.putShort( (short)applicationNumber);
+ buff.putShort( (short)referenceNumber);
+ buff.putShort( (short)radioNumber);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ siteNumber = (short)(buff.getShort() & 0xFFFF);
+ applicationNumber = (short)(buff.getShort() & 0xFFFF);
+ referenceNumber = (short)(buff.getShort() & 0xFFFF);
+ radioNumber = (short)(buff.getShort() & 0xFFFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final RadioIdentifier rhs = (RadioIdentifier)obj;
-
- if( ! (siteNumber == rhs.siteNumber)) ivarsEqual = false;
- if( ! (applicationNumber == rhs.applicationNumber)) ivarsEqual = false;
- if( ! (referenceNumber == rhs.referenceNumber)) ivarsEqual = false;
- if( ! (radioNumber == rhs.radioNumber)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final RadioIdentifier rhs = (RadioIdentifier)obj;
+
+ if( ! (siteNumber == rhs.siteNumber)) ivarsEqual = false;
+ if( ! (applicationNumber == rhs.applicationNumber)) ivarsEqual = false;
+ if( ! (referenceNumber == rhs.referenceNumber)) ivarsEqual = false;
+ if( ! (radioNumber == rhs.radioNumber)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" siteNumber: ").append(siteNumber).append("\n");
- sb.append(" applicationNumber: ").append(applicationNumber).append("\n");
- sb.append(" referenceNumber: ").append(referenceNumber).append("\n");
- sb.append(" radioNumber: ").append(radioNumber).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" siteNumber: ").append(siteNumber).append("\n");
+ sb.append(" applicationNumber: ").append(applicationNumber).append("\n");
+ sb.append(" referenceNumber: ").append(referenceNumber).append("\n");
+ sb.append(" radioNumber: ").append(radioNumber).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/RadioType.java b/src-generated/edu/nps/moves/dis7/RadioType.java
index 4208621d231173a5ffa6af2e7b07ec883f5be570..59cea42fc090248aeef49fa569aa6e70683a71dd 100644
--- a/src-generated/edu/nps/moves/dis7/RadioType.java
+++ b/src-generated/edu/nps/moves/dis7/RadioType.java
@@ -1,304 +1,304 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Identifies the type of radio. Section 6.2.71
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class RadioType extends Object implements Serializable
-{
- /** Kind of entity uid 7 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Identifies the type of radio. Section 6.2.71
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class RadioType extends Object implements Serializable
+{
+ /** Kind of entity uid 7 */
protected EntityKind entityKind = EntityKind.RADIO;
-
- /** Domain of entity (air, surface, subsurface, space, etc) */
+
+ /** Domain of entity (air, surface, subsurface, space, etc) */
protected byte domain;
-
- /** country to which the design of the entity is attributed uid 29 */
+
+ /** country to which the design of the entity is attributed uid 29 */
protected Country country = Country.values()[0];
-
- /** category of entity uid 22 */
+
+ /** category of entity uid 22 */
protected RadioCategory category = RadioCategory.values()[0];
-
- /** specific info based on subcategory field uid 23 */
+
+ /** specific info based on subcategory field uid 23 */
protected RadioSubcategory subcategory = RadioSubcategory.values()[0];
-
+
protected byte specific;
-
+
protected byte extra;
-
-
-/** Constructor */
- public RadioType()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += entityKind.getMarshalledSize();
- marshalSize += 1; // domain
- marshalSize += country.getMarshalledSize();
- marshalSize += category.getMarshalledSize();
- marshalSize += subcategory.getMarshalledSize();
- marshalSize += 1; // specific
- marshalSize += 1; // extra
-
- return marshalSize;
-}
-
-
-/** Setter for {@link RadioType#entityKind}*/
-public RadioType setEntityKind(EntityKind pEntityKind)
+
+
+/** Constructor */
+ public RadioType()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += entityKind.getMarshalledSize();
+ marshalSize += 1; // domain
+ marshalSize += country.getMarshalledSize();
+ marshalSize += category.getMarshalledSize();
+ marshalSize += subcategory.getMarshalledSize();
+ marshalSize += 1; // specific
+ marshalSize += 1; // extra
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link RadioType#entityKind}*/
+public RadioType setEntityKind(EntityKind pEntityKind)
{
- entityKind = pEntityKind;
- return this;
-}
-
-/** Getter for {@link RadioType#entityKind}*/
-public EntityKind getEntityKind()
+ entityKind = pEntityKind;
+ return this;
+}
+
+/** Getter for {@link RadioType#entityKind}*/
+public EntityKind getEntityKind()
{
return entityKind;
-}
-
-/** Setter for {@link RadioType#domain}*/
-public RadioType setDomain(byte pDomain)
+}
+
+/** Setter for {@link RadioType#domain}*/
+public RadioType setDomain(byte pDomain)
{
- domain = pDomain;
- return this;
-}
-
-/** Getter for {@link RadioType#domain}*/
-public byte getDomain()
+ domain = pDomain;
+ return this;
+}
+
+/** Getter for {@link RadioType#domain}*/
+public byte getDomain()
{
return domain;
-}
-
-/** Setter for {@link RadioType#country}*/
-public RadioType setCountry(Country pCountry)
+}
+
+/** Setter for {@link RadioType#country}*/
+public RadioType setCountry(Country pCountry)
{
- country = pCountry;
- return this;
-}
-
-/** Getter for {@link RadioType#country}*/
-public Country getCountry()
+ country = pCountry;
+ return this;
+}
+
+/** Getter for {@link RadioType#country}*/
+public Country getCountry()
{
return country;
-}
-
-/** Setter for {@link RadioType#category}*/
-public RadioType setCategory(RadioCategory pCategory)
+}
+
+/** Setter for {@link RadioType#category}*/
+public RadioType setCategory(RadioCategory pCategory)
{
- category = pCategory;
- return this;
-}
-
-/** Getter for {@link RadioType#category}*/
-public RadioCategory getCategory()
+ category = pCategory;
+ return this;
+}
+
+/** Getter for {@link RadioType#category}*/
+public RadioCategory getCategory()
{
return category;
-}
-
-/** Setter for {@link RadioType#subcategory}*/
-public RadioType setSubcategory(RadioSubcategory pSubcategory)
+}
+
+/** Setter for {@link RadioType#subcategory}*/
+public RadioType setSubcategory(RadioSubcategory pSubcategory)
{
- subcategory = pSubcategory;
- return this;
-}
-
-/** Getter for {@link RadioType#subcategory}*/
-public RadioSubcategory getSubcategory()
+ subcategory = pSubcategory;
+ return this;
+}
+
+/** Getter for {@link RadioType#subcategory}*/
+public RadioSubcategory getSubcategory()
{
return subcategory;
-}
-
-/** Setter for {@link RadioType#specific}*/
-public RadioType setSpecific(byte pSpecific)
+}
+
+/** Setter for {@link RadioType#specific}*/
+public RadioType setSpecific(byte pSpecific)
{
- specific = pSpecific;
- return this;
-}
-
-/** Getter for {@link RadioType#specific}*/
-public byte getSpecific()
+ specific = pSpecific;
+ return this;
+}
+
+/** Getter for {@link RadioType#specific}*/
+public byte getSpecific()
{
return specific;
-}
-
-/** Setter for {@link RadioType#extra}*/
-public RadioType setExtra(byte pExtra)
+}
+
+/** Setter for {@link RadioType#extra}*/
+public RadioType setExtra(byte pExtra)
{
- extra = pExtra;
- return this;
-}
-
-/** Getter for {@link RadioType#extra}*/
-public byte getExtra()
+ extra = pExtra;
+ return this;
+}
+
+/** Getter for {@link RadioType#extra}*/
+public byte getExtra()
{
return extra;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- entityKind.marshal(dos);
- dos.writeByte(domain);
- country.marshal(dos);
- category.marshal(dos);
- subcategory.marshal(dos);
- dos.writeByte(specific);
- dos.writeByte(extra);
+ {
+ entityKind.marshal(dos);
+ dos.writeByte(domain);
+ country.marshal(dos);
+ category.marshal(dos);
+ subcategory.marshal(dos);
+ dos.writeByte(specific);
+ dos.writeByte(extra);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- entityKind = EntityKind.unmarshalEnum(dis);
- uPosition += entityKind.getMarshalledSize();
- domain = (byte)dis.readUnsignedByte();
- uPosition += 1;
- country = Country.unmarshalEnum(dis);
- uPosition += country.getMarshalledSize();
- category = RadioCategory.unmarshalEnum(dis);
- uPosition += category.getMarshalledSize();
- subcategory = RadioSubcategory.unmarshalEnum(dis);
- uPosition += subcategory.getMarshalledSize();
- specific = (byte)dis.readUnsignedByte();
- uPosition += 1;
- extra = (byte)dis.readUnsignedByte();
- uPosition += 1;
+ {
+ entityKind = EntityKind.unmarshalEnum(dis);
+ uPosition += entityKind.getMarshalledSize();
+ domain = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ country = Country.unmarshalEnum(dis);
+ uPosition += country.getMarshalledSize();
+ category = RadioCategory.unmarshalEnum(dis);
+ uPosition += category.getMarshalledSize();
+ subcategory = RadioSubcategory.unmarshalEnum(dis);
+ uPosition += subcategory.getMarshalledSize();
+ specific = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ extra = (byte)dis.readUnsignedByte();
+ uPosition += 1;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- entityKind.marshal(buff);
- buff.put( (byte)domain);
- country.marshal(buff);
- category.marshal(buff);
- subcategory.marshal(buff);
- buff.put( (byte)specific);
- buff.put( (byte)extra);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- entityKind = EntityKind.unmarshalEnum(buff);
- domain = (byte)(buff.get() & 0xFF);
- country = Country.unmarshalEnum(buff);
- category = RadioCategory.unmarshalEnum(buff);
- subcategory = RadioSubcategory.unmarshalEnum(buff);
- specific = (byte)(buff.get() & 0xFF);
- extra = (byte)(buff.get() & 0xFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ entityKind.marshal(buff);
+ buff.put( (byte)domain);
+ country.marshal(buff);
+ category.marshal(buff);
+ subcategory.marshal(buff);
+ buff.put( (byte)specific);
+ buff.put( (byte)extra);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ entityKind = EntityKind.unmarshalEnum(buff);
+ domain = (byte)(buff.get() & 0xFF);
+ country = Country.unmarshalEnum(buff);
+ category = RadioCategory.unmarshalEnum(buff);
+ subcategory = RadioSubcategory.unmarshalEnum(buff);
+ specific = (byte)(buff.get() & 0xFF);
+ extra = (byte)(buff.get() & 0xFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final RadioType rhs = (RadioType)obj;
-
- if( ! (entityKind == rhs.entityKind)) ivarsEqual = false;
- if( ! (domain == rhs.domain)) ivarsEqual = false;
- if( ! (country == rhs.country)) ivarsEqual = false;
- if( ! (category == rhs.category)) ivarsEqual = false;
- if( ! (subcategory == rhs.subcategory)) ivarsEqual = false;
- if( ! (specific == rhs.specific)) ivarsEqual = false;
- if( ! (extra == rhs.extra)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final RadioType rhs = (RadioType)obj;
+
+ if( ! (entityKind == rhs.entityKind)) ivarsEqual = false;
+ if( ! (domain == rhs.domain)) ivarsEqual = false;
+ if( ! (country == rhs.country)) ivarsEqual = false;
+ if( ! (category == rhs.category)) ivarsEqual = false;
+ if( ! (subcategory == rhs.subcategory)) ivarsEqual = false;
+ if( ! (specific == rhs.specific)) ivarsEqual = false;
+ if( ! (extra == rhs.extra)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" entityKind: ").append(entityKind).append("\n");
- sb.append(" domain: ").append(domain).append("\n");
- sb.append(" country: ").append(country).append("\n");
- sb.append(" category: ").append(category).append("\n");
- sb.append(" subcategory: ").append(subcategory).append("\n");
- sb.append(" specific: ").append(specific).append("\n");
- sb.append(" extra: ").append(extra).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" entityKind: ").append(entityKind).append("\n");
+ sb.append(" domain: ").append(domain).append("\n");
+ sb.append(" country: ").append(country).append("\n");
+ sb.append(" category: ").append(category).append("\n");
+ sb.append(" subcategory: ").append(subcategory).append("\n");
+ sb.append(" specific: ").append(specific).append("\n");
+ sb.append(" extra: ").append(extra).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ReceiverPdu.java b/src-generated/edu/nps/moves/dis7/ReceiverPdu.java
index 85e3d097532c28a06cd2cc4b5e78ce6a43cfe39c..b876312aeaadf8186536c7a9cefa9cb5e22d21a9 100644
--- a/src-generated/edu/nps/moves/dis7/ReceiverPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ReceiverPdu.java
@@ -1,281 +1,281 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.8.5 Communicates the state of a particular radio receiver. Its primary application is in communicating state information to radio network monitors, data loggers, and similar applications for use in debugging, supervision, and after-action review.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class ReceiverPdu extends RadioCommunicationsFamilyPdu implements Serializable
-{
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 5.8.5 Communicates the state of a particular radio receiver. Its primary application is in communicating state information to radio network monitors, data loggers, and similar applications for use in debugging, supervision, and after-action review.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class ReceiverPdu extends RadioCommunicationsFamilyPdu implements Serializable
+{
protected RadioCommsHeader header = new RadioCommsHeader();
-
- /** encoding scheme used, and enumeration uid 179 */
+
+ /** encoding scheme used, and enumeration uid 179 */
protected ReceiverReceiverState receiverState = ReceiverReceiverState.values()[0];
-
+
protected short padding1;
-
- /** received power */
+
+ /** received power */
protected float receivedPower;
-
- /** ID of transmitter */
+
+ /** ID of transmitter */
protected EntityID transmitterEntityId = new EntityID();
-
- /** ID of transmitting radio */
+
+ /** ID of transmitting radio */
protected short transmitterRadioId;
-
-
-/** Constructor */
- public ReceiverPdu()
- {
- setPduType( DISPDUType.RECEIVER );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += header.getMarshalledSize();
- marshalSize += receiverState.getMarshalledSize();
- marshalSize += 2; // padding1
- marshalSize += 4; // receivedPower
- marshalSize += transmitterEntityId.getMarshalledSize();
- marshalSize += 2; // transmitterRadioId
-
- return marshalSize;
-}
-
-
-/** Setter for {@link ReceiverPdu#header}*/
-public ReceiverPdu setHeader(RadioCommsHeader pHeader)
+
+
+/** Constructor */
+ public ReceiverPdu()
+ {
+ setPduType( DISPDUType.RECEIVER );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += header.getMarshalledSize();
+ marshalSize += receiverState.getMarshalledSize();
+ marshalSize += 2; // padding1
+ marshalSize += 4; // receivedPower
+ marshalSize += transmitterEntityId.getMarshalledSize();
+ marshalSize += 2; // transmitterRadioId
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link ReceiverPdu#header}*/
+public ReceiverPdu setHeader(RadioCommsHeader pHeader)
{
- header = pHeader;
- return this;
-}
-
-/** Getter for {@link ReceiverPdu#header}*/
-public RadioCommsHeader getHeader()
+ header = pHeader;
+ return this;
+}
+
+/** Getter for {@link ReceiverPdu#header}*/
+public RadioCommsHeader getHeader()
{
return header;
-}
-
-/** Setter for {@link ReceiverPdu#receiverState}*/
-public ReceiverPdu setReceiverState(ReceiverReceiverState pReceiverState)
+}
+
+/** Setter for {@link ReceiverPdu#receiverState}*/
+public ReceiverPdu setReceiverState(ReceiverReceiverState pReceiverState)
{
- receiverState = pReceiverState;
- return this;
-}
-
-/** Getter for {@link ReceiverPdu#receiverState}*/
-public ReceiverReceiverState getReceiverState()
+ receiverState = pReceiverState;
+ return this;
+}
+
+/** Getter for {@link ReceiverPdu#receiverState}*/
+public ReceiverReceiverState getReceiverState()
{
return receiverState;
-}
-
-/** Setter for {@link ReceiverPdu#padding1}*/
-public ReceiverPdu setPadding1(short pPadding1)
+}
+
+/** Setter for {@link ReceiverPdu#padding1}*/
+public ReceiverPdu setPadding1(short pPadding1)
{
- padding1 = pPadding1;
- return this;
-}
-
-/** Getter for {@link ReceiverPdu#padding1}*/
-public short getPadding1()
+ padding1 = pPadding1;
+ return this;
+}
+
+/** Getter for {@link ReceiverPdu#padding1}*/
+public short getPadding1()
{
return padding1;
-}
-
-/** Setter for {@link ReceiverPdu#receivedPower}*/
-public ReceiverPdu setReceivedPower(float pReceivedPower)
+}
+
+/** Setter for {@link ReceiverPdu#receivedPower}*/
+public ReceiverPdu setReceivedPower(float pReceivedPower)
{
- receivedPower = pReceivedPower;
- return this;
-}
-
-/** Getter for {@link ReceiverPdu#receivedPower}*/
-public float getReceivedPower()
+ receivedPower = pReceivedPower;
+ return this;
+}
+
+/** Getter for {@link ReceiverPdu#receivedPower}*/
+public float getReceivedPower()
{
return receivedPower;
-}
-
-/** Setter for {@link ReceiverPdu#transmitterEntityId}*/
-public ReceiverPdu setTransmitterEntityId(EntityID pTransmitterEntityId)
+}
+
+/** Setter for {@link ReceiverPdu#transmitterEntityId}*/
+public ReceiverPdu setTransmitterEntityId(EntityID pTransmitterEntityId)
{
- transmitterEntityId = pTransmitterEntityId;
- return this;
-}
-
-/** Getter for {@link ReceiverPdu#transmitterEntityId}*/
-public EntityID getTransmitterEntityId()
+ transmitterEntityId = pTransmitterEntityId;
+ return this;
+}
+
+/** Getter for {@link ReceiverPdu#transmitterEntityId}*/
+public EntityID getTransmitterEntityId()
{
return transmitterEntityId;
-}
-
-/** Setter for {@link ReceiverPdu#transmitterRadioId}*/
-public ReceiverPdu setTransmitterRadioId(short pTransmitterRadioId)
+}
+
+/** Setter for {@link ReceiverPdu#transmitterRadioId}*/
+public ReceiverPdu setTransmitterRadioId(short pTransmitterRadioId)
{
- transmitterRadioId = pTransmitterRadioId;
- return this;
-}
-
-/** Getter for {@link ReceiverPdu#transmitterRadioId}*/
-public short getTransmitterRadioId()
+ transmitterRadioId = pTransmitterRadioId;
+ return this;
+}
+
+/** Getter for {@link ReceiverPdu#transmitterRadioId}*/
+public short getTransmitterRadioId()
{
return transmitterRadioId;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- header.marshal(dos);
- receiverState.marshal(dos);
- dos.writeShort(padding1);
- dos.writeFloat(receivedPower);
- transmitterEntityId.marshal(dos);
- dos.writeShort(transmitterRadioId);
+ {
+ header.marshal(dos);
+ receiverState.marshal(dos);
+ dos.writeShort(padding1);
+ dos.writeFloat(receivedPower);
+ transmitterEntityId.marshal(dos);
+ dos.writeShort(transmitterRadioId);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += header.unmarshal(dis);
- receiverState = ReceiverReceiverState.unmarshalEnum(dis);
- uPosition += receiverState.getMarshalledSize();
- padding1 = (short)dis.readUnsignedShort();
- uPosition += 2;
- receivedPower = dis.readFloat();
- uPosition += 4;
- uPosition += transmitterEntityId.unmarshal(dis);
- transmitterRadioId = (short)dis.readUnsignedShort();
- uPosition += 2;
+ {
+ uPosition += header.unmarshal(dis);
+ receiverState = ReceiverReceiverState.unmarshalEnum(dis);
+ uPosition += receiverState.getMarshalledSize();
+ padding1 = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ receivedPower = dis.readFloat();
+ uPosition += 4;
+ uPosition += transmitterEntityId.unmarshal(dis);
+ transmitterRadioId = (short)dis.readUnsignedShort();
+ uPosition += 2;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- header.marshal(buff);
- receiverState.marshal(buff);
- buff.putShort( (short)padding1);
- buff.putFloat( (float)receivedPower);
- transmitterEntityId.marshal(buff);
- buff.putShort( (short)transmitterRadioId);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ header.marshal(buff);
+ receiverState.marshal(buff);
+ buff.putShort( (short)padding1);
+ buff.putFloat( (float)receivedPower);
+ transmitterEntityId.marshal(buff);
+ buff.putShort( (short)transmitterRadioId);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- header.unmarshal(buff);
- receiverState = ReceiverReceiverState.unmarshalEnum(buff);
- padding1 = (short)(buff.getShort() & 0xFFFF);
- receivedPower = buff.getFloat();
- transmitterEntityId.unmarshal(buff);
- transmitterRadioId = (short)(buff.getShort() & 0xFFFF);
- return getMarshalledSize();
+
+ header.unmarshal(buff);
+ receiverState = ReceiverReceiverState.unmarshalEnum(buff);
+ padding1 = (short)(buff.getShort() & 0xFFFF);
+ receivedPower = buff.getFloat();
+ transmitterEntityId.unmarshal(buff);
+ transmitterRadioId = (short)(buff.getShort() & 0xFFFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final ReceiverPdu rhs = (ReceiverPdu)obj;
-
- if( ! (header.equals( rhs.header) )) ivarsEqual = false;
- if( ! (receiverState == rhs.receiverState)) ivarsEqual = false;
- if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
- if( ! (receivedPower == rhs.receivedPower)) ivarsEqual = false;
- if( ! (transmitterEntityId.equals( rhs.transmitterEntityId) )) ivarsEqual = false;
- if( ! (transmitterRadioId == rhs.transmitterRadioId)) ivarsEqual = false;
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final ReceiverPdu rhs = (ReceiverPdu)obj;
+
+ if( ! (header.equals( rhs.header) )) ivarsEqual = false;
+ if( ! (receiverState == rhs.receiverState)) ivarsEqual = false;
+ if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
+ if( ! (receivedPower == rhs.receivedPower)) ivarsEqual = false;
+ if( ! (transmitterEntityId.equals( rhs.transmitterEntityId) )) ivarsEqual = false;
+ if( ! (transmitterRadioId == rhs.transmitterRadioId)) ivarsEqual = false;
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" header: ").append(header).append("\n");
- sb.append(" receiverState: ").append(receiverState).append("\n");
- sb.append(" padding1: ").append(padding1).append("\n");
- sb.append(" receivedPower: ").append(receivedPower).append("\n");
- sb.append(" transmitterEntityId: ").append(transmitterEntityId).append("\n");
- sb.append(" transmitterRadioId: ").append(transmitterRadioId).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" header: ").append(header).append("\n");
+ sb.append(" receiverState: ").append(receiverState).append("\n");
+ sb.append(" padding1: ").append(padding1).append("\n");
+ sb.append(" receivedPower: ").append(receivedPower).append("\n");
+ sb.append(" transmitterEntityId: ").append(transmitterEntityId).append("\n");
+ sb.append(" transmitterRadioId: ").append(transmitterRadioId).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/RecordQueryRPdu.java b/src-generated/edu/nps/moves/dis7/RecordQueryRPdu.java
index 71f8d3855c27b31934992c69105dce1a698bde1c..df19c345de1ce42c28fc14825c093aa20e896228 100644
--- a/src-generated/edu/nps/moves/dis7/RecordQueryRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/RecordQueryRPdu.java
@@ -1,325 +1,325 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.12.4.14 Used to communicate a request for data in record format.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class RecordQueryRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
-{
- /** request ID */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 5.12.4.14 Used to communicate a request for data in record format.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class RecordQueryRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
+{
+ /** request ID */
protected int requestID;
-
- /** level of reliability service used for this transaction uid 74 */
+
+ /** level of reliability service used for this transaction uid 74 */
protected RequiredReliabilityService requiredReliabilityService = RequiredReliabilityService.values()[0];
-
- /** padding */
+
+ /** padding */
protected byte pad1;
-
- /** event type uid 334 */
+
+ /** event type uid 334 */
protected RecordQueryREventType eventType = RecordQueryREventType.values()[0];
-
- /** time */
+
+ /** time */
protected int time;
-
- /** numberOfRecords */
+
+ /** numberOfRecords */
protected int numberOfRecords;
-
- /** record IDs */
+
+ /** record IDs */
protected List< RecordQuerySpecification > recordIDs = new ArrayList< RecordQuerySpecification >();
-
-
-/** Constructor */
- public RecordQueryRPdu()
- {
- setPduType( DISPDUType.RECORD_QUERY_RELIABLE );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += 4; // requestID
- marshalSize += requiredReliabilityService.getMarshalledSize();
- marshalSize += 1; // pad1
- marshalSize += eventType.getMarshalledSize();
- marshalSize += 4; // time
- marshalSize += 4; // numberOfRecords
- for(int idx=0; idx < recordIDs.size(); idx++)
- {
- RecordQuerySpecification listElement = recordIDs.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link RecordQueryRPdu#requestID}*/
-public RecordQueryRPdu setRequestID(int pRequestID)
+
+
+/** Constructor */
+ public RecordQueryRPdu()
+ {
+ setPduType( DISPDUType.RECORD_QUERY_RELIABLE );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += 4; // requestID
+ marshalSize += requiredReliabilityService.getMarshalledSize();
+ marshalSize += 1; // pad1
+ marshalSize += eventType.getMarshalledSize();
+ marshalSize += 4; // time
+ marshalSize += 4; // numberOfRecords
+ for(int idx=0; idx < recordIDs.size(); idx++)
+ {
+ RecordQuerySpecification listElement = recordIDs.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link RecordQueryRPdu#requestID}*/
+public RecordQueryRPdu setRequestID(int pRequestID)
{
- requestID = pRequestID;
- return this;
-}
-
-/** Getter for {@link RecordQueryRPdu#requestID}*/
-public int getRequestID()
+ requestID = pRequestID;
+ return this;
+}
+
+/** Getter for {@link RecordQueryRPdu#requestID}*/
+public int getRequestID()
{
return requestID;
-}
-
-/** Setter for {@link RecordQueryRPdu#requiredReliabilityService}*/
-public RecordQueryRPdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
+}
+
+/** Setter for {@link RecordQueryRPdu#requiredReliabilityService}*/
+public RecordQueryRPdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
{
- requiredReliabilityService = pRequiredReliabilityService;
- return this;
-}
-
-/** Getter for {@link RecordQueryRPdu#requiredReliabilityService}*/
-public RequiredReliabilityService getRequiredReliabilityService()
+ requiredReliabilityService = pRequiredReliabilityService;
+ return this;
+}
+
+/** Getter for {@link RecordQueryRPdu#requiredReliabilityService}*/
+public RequiredReliabilityService getRequiredReliabilityService()
{
return requiredReliabilityService;
-}
-
-/** Setter for {@link RecordQueryRPdu#pad1}*/
-public RecordQueryRPdu setPad1(byte pPad1)
+}
+
+/** Setter for {@link RecordQueryRPdu#pad1}*/
+public RecordQueryRPdu setPad1(byte pPad1)
{
- pad1 = pPad1;
- return this;
-}
-
-/** Getter for {@link RecordQueryRPdu#pad1}*/
-public byte getPad1()
+ pad1 = pPad1;
+ return this;
+}
+
+/** Getter for {@link RecordQueryRPdu#pad1}*/
+public byte getPad1()
{
return pad1;
-}
-
-/** Setter for {@link RecordQueryRPdu#eventType}*/
-public RecordQueryRPdu setEventType(RecordQueryREventType pEventType)
+}
+
+/** Setter for {@link RecordQueryRPdu#eventType}*/
+public RecordQueryRPdu setEventType(RecordQueryREventType pEventType)
{
- eventType = pEventType;
- return this;
-}
-
-/** Getter for {@link RecordQueryRPdu#eventType}*/
-public RecordQueryREventType getEventType()
+ eventType = pEventType;
+ return this;
+}
+
+/** Getter for {@link RecordQueryRPdu#eventType}*/
+public RecordQueryREventType getEventType()
{
return eventType;
-}
-
-/** Setter for {@link RecordQueryRPdu#time}*/
-public RecordQueryRPdu setTime(int pTime)
+}
+
+/** Setter for {@link RecordQueryRPdu#time}*/
+public RecordQueryRPdu setTime(int pTime)
{
- time = pTime;
- return this;
-}
-
-/** Getter for {@link RecordQueryRPdu#time}*/
-public int getTime()
+ time = pTime;
+ return this;
+}
+
+/** Getter for {@link RecordQueryRPdu#time}*/
+public int getTime()
{
return time;
-}
-
-/** Setter for {@link RecordQueryRPdu#recordIDs}*/
-public RecordQueryRPdu setRecordIDs(List<RecordQuerySpecification> pRecordIDs)
+}
+
+/** Setter for {@link RecordQueryRPdu#recordIDs}*/
+public RecordQueryRPdu setRecordIDs(List<RecordQuerySpecification> pRecordIDs)
{
- recordIDs = pRecordIDs;
- return this;
-}
-
-/** Getter for {@link RecordQueryRPdu#recordIDs}*/
-public List<RecordQuerySpecification> getRecordIDs()
+ recordIDs = pRecordIDs;
+ return this;
+}
+
+/** Getter for {@link RecordQueryRPdu#recordIDs}*/
+public List<RecordQuerySpecification> getRecordIDs()
{
return recordIDs;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- dos.writeInt(requestID);
- requiredReliabilityService.marshal(dos);
- dos.writeByte(pad1);
- eventType.marshal(dos);
- dos.writeInt(time);
- dos.writeInt(recordIDs.size());
-
- for(int idx = 0; idx < recordIDs.size(); idx++)
- {
- RecordQuerySpecification aRecordQuerySpecification = recordIDs.get(idx);
- aRecordQuerySpecification.marshal(dos);
- }
-
+ {
+ dos.writeInt(requestID);
+ requiredReliabilityService.marshal(dos);
+ dos.writeByte(pad1);
+ eventType.marshal(dos);
+ dos.writeInt(time);
+ dos.writeInt(recordIDs.size());
+
+ for(int idx = 0; idx < recordIDs.size(); idx++)
+ {
+ RecordQuerySpecification aRecordQuerySpecification = recordIDs.get(idx);
+ aRecordQuerySpecification.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- requestID = dis.readInt();
- uPosition += 4;
- requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(dis);
- uPosition += requiredReliabilityService.getMarshalledSize();
- pad1 = (byte)dis.readUnsignedByte();
- uPosition += 1;
- eventType = RecordQueryREventType.unmarshalEnum(dis);
- uPosition += eventType.getMarshalledSize();
- time = dis.readInt();
- uPosition += 4;
- numberOfRecords = dis.readInt();
- uPosition += 4;
- for(int idx = 0; idx < numberOfRecords; idx++)
- {
- RecordQuerySpecification anX = new RecordQuerySpecification();
- uPosition += anX.unmarshal(dis);
- recordIDs.add(anX);
- }
-
+ {
+ requestID = dis.readInt();
+ uPosition += 4;
+ requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(dis);
+ uPosition += requiredReliabilityService.getMarshalledSize();
+ pad1 = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ eventType = RecordQueryREventType.unmarshalEnum(dis);
+ uPosition += eventType.getMarshalledSize();
+ time = dis.readInt();
+ uPosition += 4;
+ numberOfRecords = dis.readInt();
+ uPosition += 4;
+ for(int idx = 0; idx < numberOfRecords; idx++)
+ {
+ RecordQuerySpecification anX = new RecordQuerySpecification();
+ uPosition += anX.unmarshal(dis);
+ recordIDs.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- buff.putInt( (int)requestID);
- requiredReliabilityService.marshal(buff);
- buff.put( (byte)pad1);
- eventType.marshal(buff);
- buff.putInt( (int)time);
- buff.putInt( (int)recordIDs.size());
-
- for(int idx = 0; idx < recordIDs.size(); idx++)
- {
- RecordQuerySpecification aRecordQuerySpecification = recordIDs.get(idx);
- aRecordQuerySpecification.marshal(buff);
- }
-
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ buff.putInt( (int)requestID);
+ requiredReliabilityService.marshal(buff);
+ buff.put( (byte)pad1);
+ eventType.marshal(buff);
+ buff.putInt( (int)time);
+ buff.putInt( (int)recordIDs.size());
+
+ for(int idx = 0; idx < recordIDs.size(); idx++)
+ {
+ RecordQuerySpecification aRecordQuerySpecification = recordIDs.get(idx);
+ aRecordQuerySpecification.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- requestID = buff.getInt();
- requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(buff);
- pad1 = (byte)(buff.get() & 0xFF);
- eventType = RecordQueryREventType.unmarshalEnum(buff);
- time = buff.getInt();
- numberOfRecords = buff.getInt();
- for(int idx = 0; idx < numberOfRecords; idx++)
- {
- RecordQuerySpecification anX = new RecordQuerySpecification();
- anX.unmarshal(buff);
- recordIDs.add(anX);
- }
-
- return getMarshalledSize();
+
+ requestID = buff.getInt();
+ requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(buff);
+ pad1 = (byte)(buff.get() & 0xFF);
+ eventType = RecordQueryREventType.unmarshalEnum(buff);
+ time = buff.getInt();
+ numberOfRecords = buff.getInt();
+ for(int idx = 0; idx < numberOfRecords; idx++)
+ {
+ RecordQuerySpecification anX = new RecordQuerySpecification();
+ anX.unmarshal(buff);
+ recordIDs.add(anX);
+ }
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final RecordQueryRPdu rhs = (RecordQueryRPdu)obj;
-
- if( ! (requestID == rhs.requestID)) ivarsEqual = false;
- if( ! (requiredReliabilityService == rhs.requiredReliabilityService)) ivarsEqual = false;
- if( ! (pad1 == rhs.pad1)) ivarsEqual = false;
- if( ! (eventType == rhs.eventType)) ivarsEqual = false;
- if( ! (time == rhs.time)) ivarsEqual = false;
-
- for(int idx = 0; idx < recordIDs.size(); idx++)
- if( ! ( recordIDs.get(idx).equals(rhs.recordIDs.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final RecordQueryRPdu rhs = (RecordQueryRPdu)obj;
+
+ if( ! (requestID == rhs.requestID)) ivarsEqual = false;
+ if( ! (requiredReliabilityService == rhs.requiredReliabilityService)) ivarsEqual = false;
+ if( ! (pad1 == rhs.pad1)) ivarsEqual = false;
+ if( ! (eventType == rhs.eventType)) ivarsEqual = false;
+ if( ! (time == rhs.time)) ivarsEqual = false;
+
+ for(int idx = 0; idx < recordIDs.size(); idx++)
+ if( ! ( recordIDs.get(idx).equals(rhs.recordIDs.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" requestID: ").append(requestID).append("\n");
- sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
- sb.append(" pad1: ").append(pad1).append("\n");
- sb.append(" eventType: ").append(eventType).append("\n");
- sb.append(" time: ").append(time).append("\n");
- sb.append(" recordIDs: ").append("\n");
- recordIDs.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" requestID: ").append(requestID).append("\n");
+ sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
+ sb.append(" pad1: ").append(pad1).append("\n");
+ sb.append(" eventType: ").append(eventType).append("\n");
+ sb.append(" time: ").append(time).append("\n");
+ sb.append(" recordIDs: ").append("\n");
+ recordIDs.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/RecordQueryReliablePdu.java b/src-generated/edu/nps/moves/dis7/RecordQueryReliablePdu.java
index e2b412b727702262459a8653341fcdc7cd8e7aba..f5fb5a6bcef0bad49619f5f3984991e22b0a7243 100644
--- a/src-generated/edu/nps/moves/dis7/RecordQueryReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/RecordQueryReliablePdu.java
@@ -1,17 +1,17 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * more descriptive name for a RecordQueryRPdu
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class RecordQueryReliablePdu extends RecordQueryRPdu
-{}
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * more descriptive name for a RecordQueryRPdu
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class RecordQueryReliablePdu extends RecordQueryRPdu
+{}
diff --git a/src-generated/edu/nps/moves/dis7/RecordQuerySpecification.java b/src-generated/edu/nps/moves/dis7/RecordQuerySpecification.java
index 07d57f6ec6d26304c85dbd5bd6ed4fb82270472e..07c59bda8dd8d976af698957e7d3220a4452c5bb 100644
--- a/src-generated/edu/nps/moves/dis7/RecordQuerySpecification.java
+++ b/src-generated/edu/nps/moves/dis7/RecordQuerySpecification.java
@@ -1,200 +1,200 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * The identification of the records being queried 6.2.72
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class RecordQuerySpecification extends Object implements Serializable
-{
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * The identification of the records being queried 6.2.72
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class RecordQuerySpecification extends Object implements Serializable
+{
protected int numberOfRecords;
-
- /** variable length list of 32 bit record types uid = 66 */
+
+ /** variable length list of 32 bit record types uid = 66 */
protected List< VariableRecordType > recordIDs = new ArrayList< VariableRecordType >();
-
-
-/** Constructor */
- public RecordQuerySpecification()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += 4; // numberOfRecords
- for(int idx=0; idx < recordIDs.size(); idx++)
- {
- VariableRecordType listElement = recordIDs.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link RecordQuerySpecification#recordIDs}*/
-public RecordQuerySpecification setRecordIDs(List<VariableRecordType> pRecordIDs)
+
+
+/** Constructor */
+ public RecordQuerySpecification()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 4; // numberOfRecords
+ for(int idx=0; idx < recordIDs.size(); idx++)
+ {
+ VariableRecordType listElement = recordIDs.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link RecordQuerySpecification#recordIDs}*/
+public RecordQuerySpecification setRecordIDs(List<VariableRecordType> pRecordIDs)
{
- recordIDs = pRecordIDs;
- return this;
-}
-
-/** Getter for {@link RecordQuerySpecification#recordIDs}*/
-public List<VariableRecordType> getRecordIDs()
+ recordIDs = pRecordIDs;
+ return this;
+}
+
+/** Getter for {@link RecordQuerySpecification#recordIDs}*/
+public List<VariableRecordType> getRecordIDs()
{
return recordIDs;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeInt(recordIDs.size());
-
- for(int idx = 0; idx < recordIDs.size(); idx++)
- {
- VariableRecordType aVariableRecordType = recordIDs.get(idx);
- aVariableRecordType.marshal(dos);
- }
-
+ {
+ dos.writeInt(recordIDs.size());
+
+ for(int idx = 0; idx < recordIDs.size(); idx++)
+ {
+ VariableRecordType aVariableRecordType = recordIDs.get(idx);
+ aVariableRecordType.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- numberOfRecords = dis.readInt();
- uPosition += 4;
- for(int idx = 0; idx < numberOfRecords; idx++)
- {
- VariableRecordType anX = VariableRecordType.unmarshalEnum(dis);
- recordIDs.add(anX);
- uPosition += anX.getMarshalledSize();
- }
-
+ {
+ numberOfRecords = dis.readInt();
+ uPosition += 4;
+ for(int idx = 0; idx < numberOfRecords; idx++)
+ {
+ VariableRecordType anX = VariableRecordType.unmarshalEnum(dis);
+ recordIDs.add(anX);
+ uPosition += anX.getMarshalledSize();
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putInt( (int)recordIDs.size());
-
- for(int idx = 0; idx < recordIDs.size(); idx++)
- {
- VariableRecordType aVariableRecordType = recordIDs.get(idx);
- aVariableRecordType.marshal(buff);
- }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- numberOfRecords = buff.getInt();
- for(int idx = 0; idx < numberOfRecords; idx++)
- {
- VariableRecordType anX = VariableRecordType.unmarshalEnum(buff);
- recordIDs.add(anX);
- }
-
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putInt( (int)recordIDs.size());
+
+ for(int idx = 0; idx < recordIDs.size(); idx++)
+ {
+ VariableRecordType aVariableRecordType = recordIDs.get(idx);
+ aVariableRecordType.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ numberOfRecords = buff.getInt();
+ for(int idx = 0; idx < numberOfRecords; idx++)
+ {
+ VariableRecordType anX = VariableRecordType.unmarshalEnum(buff);
+ recordIDs.add(anX);
+ }
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final RecordQuerySpecification rhs = (RecordQuerySpecification)obj;
-
-
- for(int idx = 0; idx < recordIDs.size(); idx++)
- if( ! ( recordIDs.get(idx).equals(rhs.recordIDs.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final RecordQuerySpecification rhs = (RecordQuerySpecification)obj;
+
+
+ for(int idx = 0; idx < recordIDs.size(); idx++)
+ if( ! ( recordIDs.get(idx).equals(rhs.recordIDs.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" recordIDs: ").append("\n");
- recordIDs.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" recordIDs: ").append("\n");
+ recordIDs.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/RecordRPdu.java b/src-generated/edu/nps/moves/dis7/RecordRPdu.java
index 8d086a075274d7b238ce7df45cc6775418c8f0c6..4750cd59403b4b1e1dc9449b73fa588f5323bbe0 100644
--- a/src-generated/edu/nps/moves/dis7/RecordRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/RecordRPdu.java
@@ -1,300 +1,300 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.12.4.16 Used to respond to a Record Query-R PDU or a Set Record-R PDU. It is used to provide information requested in a Record Query-R PDU, to confirm the information received in a Set Record-R PDU, and to confirm the receipt of a periodic or unsolicited Record-R PDU when the acknowledged service level is used.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class RecordRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
-{
- /** request ID */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 5.12.4.16 Used to respond to a Record Query-R PDU or a Set Record-R PDU. It is used to provide information requested in a Record Query-R PDU, to confirm the information received in a Set Record-R PDU, and to confirm the receipt of a periodic or unsolicited Record-R PDU when the acknowledged service level is used.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class RecordRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
+{
+ /** request ID */
protected int requestID;
-
- /** level of reliability service used for this transaction uid 74 */
+
+ /** level of reliability service used for this transaction uid 74 */
protected RequiredReliabilityService requiredReliabilityService = RequiredReliabilityService.values()[0];
-
+
protected byte pad1;
-
- /** uid 333 */
+
+ /** uid 333 */
protected RecordREventType eventType = RecordREventType.values()[0];
-
- /** Number of record sets in list */
+
+ /** Number of record sets in list */
protected int numberOfRecordSets;
-
- /** record sets */
+
+ /** record sets */
protected List< RecordSpecification > recordSets = new ArrayList< RecordSpecification >();
-
-
-/** Constructor */
- public RecordRPdu()
- {
- setPduType( DISPDUType.RECORD_RELIABLE );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += 4; // requestID
- marshalSize += requiredReliabilityService.getMarshalledSize();
- marshalSize += 1; // pad1
- marshalSize += eventType.getMarshalledSize();
- marshalSize += 4; // numberOfRecordSets
- for(int idx=0; idx < recordSets.size(); idx++)
- {
- RecordSpecification listElement = recordSets.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link RecordRPdu#requestID}*/
-public RecordRPdu setRequestID(int pRequestID)
+
+
+/** Constructor */
+ public RecordRPdu()
+ {
+ setPduType( DISPDUType.RECORD_RELIABLE );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += 4; // requestID
+ marshalSize += requiredReliabilityService.getMarshalledSize();
+ marshalSize += 1; // pad1
+ marshalSize += eventType.getMarshalledSize();
+ marshalSize += 4; // numberOfRecordSets
+ for(int idx=0; idx < recordSets.size(); idx++)
+ {
+ RecordSpecification listElement = recordSets.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link RecordRPdu#requestID}*/
+public RecordRPdu setRequestID(int pRequestID)
{
- requestID = pRequestID;
- return this;
-}
-
-/** Getter for {@link RecordRPdu#requestID}*/
-public int getRequestID()
+ requestID = pRequestID;
+ return this;
+}
+
+/** Getter for {@link RecordRPdu#requestID}*/
+public int getRequestID()
{
return requestID;
-}
-
-/** Setter for {@link RecordRPdu#requiredReliabilityService}*/
-public RecordRPdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
+}
+
+/** Setter for {@link RecordRPdu#requiredReliabilityService}*/
+public RecordRPdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
{
- requiredReliabilityService = pRequiredReliabilityService;
- return this;
-}
-
-/** Getter for {@link RecordRPdu#requiredReliabilityService}*/
-public RequiredReliabilityService getRequiredReliabilityService()
+ requiredReliabilityService = pRequiredReliabilityService;
+ return this;
+}
+
+/** Getter for {@link RecordRPdu#requiredReliabilityService}*/
+public RequiredReliabilityService getRequiredReliabilityService()
{
return requiredReliabilityService;
-}
-
-/** Setter for {@link RecordRPdu#pad1}*/
-public RecordRPdu setPad1(byte pPad1)
+}
+
+/** Setter for {@link RecordRPdu#pad1}*/
+public RecordRPdu setPad1(byte pPad1)
{
- pad1 = pPad1;
- return this;
-}
-
-/** Getter for {@link RecordRPdu#pad1}*/
-public byte getPad1()
+ pad1 = pPad1;
+ return this;
+}
+
+/** Getter for {@link RecordRPdu#pad1}*/
+public byte getPad1()
{
return pad1;
-}
-
-/** Setter for {@link RecordRPdu#eventType}*/
-public RecordRPdu setEventType(RecordREventType pEventType)
+}
+
+/** Setter for {@link RecordRPdu#eventType}*/
+public RecordRPdu setEventType(RecordREventType pEventType)
{
- eventType = pEventType;
- return this;
-}
-
-/** Getter for {@link RecordRPdu#eventType}*/
-public RecordREventType getEventType()
+ eventType = pEventType;
+ return this;
+}
+
+/** Getter for {@link RecordRPdu#eventType}*/
+public RecordREventType getEventType()
{
return eventType;
-}
-
-/** Setter for {@link RecordRPdu#recordSets}*/
-public RecordRPdu setRecordSets(List<RecordSpecification> pRecordSets)
+}
+
+/** Setter for {@link RecordRPdu#recordSets}*/
+public RecordRPdu setRecordSets(List<RecordSpecification> pRecordSets)
{
- recordSets = pRecordSets;
- return this;
-}
-
-/** Getter for {@link RecordRPdu#recordSets}*/
-public List<RecordSpecification> getRecordSets()
+ recordSets = pRecordSets;
+ return this;
+}
+
+/** Getter for {@link RecordRPdu#recordSets}*/
+public List<RecordSpecification> getRecordSets()
{
return recordSets;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- dos.writeInt(requestID);
- requiredReliabilityService.marshal(dos);
- dos.writeByte(pad1);
- eventType.marshal(dos);
- dos.writeInt(recordSets.size());
-
- for(int idx = 0; idx < recordSets.size(); idx++)
- {
- RecordSpecification aRecordSpecification = recordSets.get(idx);
- aRecordSpecification.marshal(dos);
- }
-
+ {
+ dos.writeInt(requestID);
+ requiredReliabilityService.marshal(dos);
+ dos.writeByte(pad1);
+ eventType.marshal(dos);
+ dos.writeInt(recordSets.size());
+
+ for(int idx = 0; idx < recordSets.size(); idx++)
+ {
+ RecordSpecification aRecordSpecification = recordSets.get(idx);
+ aRecordSpecification.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- requestID = dis.readInt();
- uPosition += 4;
- requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(dis);
- uPosition += requiredReliabilityService.getMarshalledSize();
- pad1 = (byte)dis.readUnsignedByte();
- uPosition += 1;
- eventType = RecordREventType.unmarshalEnum(dis);
- uPosition += eventType.getMarshalledSize();
- numberOfRecordSets = dis.readInt();
- uPosition += 4;
- for(int idx = 0; idx < numberOfRecordSets; idx++)
- {
- RecordSpecification anX = new RecordSpecification();
- uPosition += anX.unmarshal(dis);
- recordSets.add(anX);
- }
-
+ {
+ requestID = dis.readInt();
+ uPosition += 4;
+ requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(dis);
+ uPosition += requiredReliabilityService.getMarshalledSize();
+ pad1 = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ eventType = RecordREventType.unmarshalEnum(dis);
+ uPosition += eventType.getMarshalledSize();
+ numberOfRecordSets = dis.readInt();
+ uPosition += 4;
+ for(int idx = 0; idx < numberOfRecordSets; idx++)
+ {
+ RecordSpecification anX = new RecordSpecification();
+ uPosition += anX.unmarshal(dis);
+ recordSets.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- buff.putInt( (int)requestID);
- requiredReliabilityService.marshal(buff);
- buff.put( (byte)pad1);
- eventType.marshal(buff);
- buff.putInt( (int)recordSets.size());
-
- for(int idx = 0; idx < recordSets.size(); idx++)
- {
- RecordSpecification aRecordSpecification = recordSets.get(idx);
- aRecordSpecification.marshal(buff);
- }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ buff.putInt( (int)requestID);
+ requiredReliabilityService.marshal(buff);
+ buff.put( (byte)pad1);
+ eventType.marshal(buff);
+ buff.putInt( (int)recordSets.size());
+
+ for(int idx = 0; idx < recordSets.size(); idx++)
+ {
+ RecordSpecification aRecordSpecification = recordSets.get(idx);
+ aRecordSpecification.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- requestID = buff.getInt();
- requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(buff);
- pad1 = (byte)(buff.get() & 0xFF);
- eventType = RecordREventType.unmarshalEnum(buff);
- numberOfRecordSets = buff.getInt();
- for(int idx = 0; idx < numberOfRecordSets; idx++)
- {
- RecordSpecification anX = new RecordSpecification();
- anX.unmarshal(buff);
- recordSets.add(anX);
- }
-
- return getMarshalledSize();
+
+ requestID = buff.getInt();
+ requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(buff);
+ pad1 = (byte)(buff.get() & 0xFF);
+ eventType = RecordREventType.unmarshalEnum(buff);
+ numberOfRecordSets = buff.getInt();
+ for(int idx = 0; idx < numberOfRecordSets; idx++)
+ {
+ RecordSpecification anX = new RecordSpecification();
+ anX.unmarshal(buff);
+ recordSets.add(anX);
+ }
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final RecordRPdu rhs = (RecordRPdu)obj;
-
- if( ! (requestID == rhs.requestID)) ivarsEqual = false;
- if( ! (requiredReliabilityService == rhs.requiredReliabilityService)) ivarsEqual = false;
- if( ! (pad1 == rhs.pad1)) ivarsEqual = false;
- if( ! (eventType == rhs.eventType)) ivarsEqual = false;
-
- for(int idx = 0; idx < recordSets.size(); idx++)
- if( ! ( recordSets.get(idx).equals(rhs.recordSets.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final RecordRPdu rhs = (RecordRPdu)obj;
+
+ if( ! (requestID == rhs.requestID)) ivarsEqual = false;
+ if( ! (requiredReliabilityService == rhs.requiredReliabilityService)) ivarsEqual = false;
+ if( ! (pad1 == rhs.pad1)) ivarsEqual = false;
+ if( ! (eventType == rhs.eventType)) ivarsEqual = false;
+
+ for(int idx = 0; idx < recordSets.size(); idx++)
+ if( ! ( recordSets.get(idx).equals(rhs.recordSets.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" requestID: ").append(requestID).append("\n");
- sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
- sb.append(" pad1: ").append(pad1).append("\n");
- sb.append(" eventType: ").append(eventType).append("\n");
- sb.append(" recordSets: ").append("\n");
- recordSets.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" requestID: ").append(requestID).append("\n");
+ sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
+ sb.append(" pad1: ").append(pad1).append("\n");
+ sb.append(" eventType: ").append(eventType).append("\n");
+ sb.append(" recordSets: ").append("\n");
+ recordSets.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/RecordReliablePdu.java b/src-generated/edu/nps/moves/dis7/RecordReliablePdu.java
index 3381444dbb6287e600af6cc9bb5cbcd0d184dd6a..dea1d2b5314809d99e3ea1b52c70ebf7904ff715 100644
--- a/src-generated/edu/nps/moves/dis7/RecordReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/RecordReliablePdu.java
@@ -1,17 +1,17 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * more descriptive name for a RecordRPdu
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class RecordReliablePdu extends RecordRPdu
-{}
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * more descriptive name for a RecordRPdu
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class RecordReliablePdu extends RecordRPdu
+{}
diff --git a/src-generated/edu/nps/moves/dis7/RecordSpecification.java b/src-generated/edu/nps/moves/dis7/RecordSpecification.java
index 2547cfb3d7b0b9370498b8ce44372e5f80c6e616..93df98bfa26b5eef627db8b7b03525c7b884e195 100644
--- a/src-generated/edu/nps/moves/dis7/RecordSpecification.java
+++ b/src-generated/edu/nps/moves/dis7/RecordSpecification.java
@@ -1,202 +1,202 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * This record shall specify the number of record sets contained in the Record Specification record and the record details. Section 6.2.73.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class RecordSpecification extends Object implements Serializable
-{
- /** The number of record sets */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * This record shall specify the number of record sets contained in the Record Specification record and the record details. Section 6.2.73.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class RecordSpecification extends Object implements Serializable
+{
+ /** The number of record sets */
protected int numberOfRecordSets;
-
- /** variable length list record specifications. */
+
+ /** variable length list record specifications. */
protected List< RecordSpecificationElement > recordSets = new ArrayList< RecordSpecificationElement >();
-
-
-/** Constructor */
- public RecordSpecification()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += 4; // numberOfRecordSets
- for(int idx=0; idx < recordSets.size(); idx++)
- {
- RecordSpecificationElement listElement = recordSets.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link RecordSpecification#recordSets}*/
-public RecordSpecification setRecordSets(List<RecordSpecificationElement> pRecordSets)
+
+
+/** Constructor */
+ public RecordSpecification()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 4; // numberOfRecordSets
+ for(int idx=0; idx < recordSets.size(); idx++)
+ {
+ RecordSpecificationElement listElement = recordSets.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link RecordSpecification#recordSets}*/
+public RecordSpecification setRecordSets(List<RecordSpecificationElement> pRecordSets)
{
- recordSets = pRecordSets;
- return this;
-}
-
-/** Getter for {@link RecordSpecification#recordSets}*/
-public List<RecordSpecificationElement> getRecordSets()
+ recordSets = pRecordSets;
+ return this;
+}
+
+/** Getter for {@link RecordSpecification#recordSets}*/
+public List<RecordSpecificationElement> getRecordSets()
{
return recordSets;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeInt(recordSets.size());
-
- for(int idx = 0; idx < recordSets.size(); idx++)
- {
- RecordSpecificationElement aRecordSpecificationElement = recordSets.get(idx);
- aRecordSpecificationElement.marshal(dos);
- }
-
+ {
+ dos.writeInt(recordSets.size());
+
+ for(int idx = 0; idx < recordSets.size(); idx++)
+ {
+ RecordSpecificationElement aRecordSpecificationElement = recordSets.get(idx);
+ aRecordSpecificationElement.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- numberOfRecordSets = dis.readInt();
- uPosition += 4;
- for(int idx = 0; idx < numberOfRecordSets; idx++)
- {
- RecordSpecificationElement anX = new RecordSpecificationElement();
- uPosition += anX.unmarshal(dis);
- recordSets.add(anX);
- }
-
+ {
+ numberOfRecordSets = dis.readInt();
+ uPosition += 4;
+ for(int idx = 0; idx < numberOfRecordSets; idx++)
+ {
+ RecordSpecificationElement anX = new RecordSpecificationElement();
+ uPosition += anX.unmarshal(dis);
+ recordSets.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putInt( (int)recordSets.size());
-
- for(int idx = 0; idx < recordSets.size(); idx++)
- {
- RecordSpecificationElement aRecordSpecificationElement = recordSets.get(idx);
- aRecordSpecificationElement.marshal(buff);
- }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- numberOfRecordSets = buff.getInt();
- for(int idx = 0; idx < numberOfRecordSets; idx++)
- {
- RecordSpecificationElement anX = new RecordSpecificationElement();
- anX.unmarshal(buff);
- recordSets.add(anX);
- }
-
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putInt( (int)recordSets.size());
+
+ for(int idx = 0; idx < recordSets.size(); idx++)
+ {
+ RecordSpecificationElement aRecordSpecificationElement = recordSets.get(idx);
+ aRecordSpecificationElement.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ numberOfRecordSets = buff.getInt();
+ for(int idx = 0; idx < numberOfRecordSets; idx++)
+ {
+ RecordSpecificationElement anX = new RecordSpecificationElement();
+ anX.unmarshal(buff);
+ recordSets.add(anX);
+ }
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final RecordSpecification rhs = (RecordSpecification)obj;
-
-
- for(int idx = 0; idx < recordSets.size(); idx++)
- if( ! ( recordSets.get(idx).equals(rhs.recordSets.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final RecordSpecification rhs = (RecordSpecification)obj;
+
+
+ for(int idx = 0; idx < recordSets.size(); idx++)
+ if( ! ( recordSets.get(idx).equals(rhs.recordSets.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" recordSets: ").append("\n");
- recordSets.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" recordSets: ").append("\n");
+ recordSets.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/RecordSpecificationElement.java b/src-generated/edu/nps/moves/dis7/RecordSpecificationElement.java
index 88bafba7828a94d12b77dbac4702c91106ab4809..efcc7c3a5f043e80dbc785e4873725c2409a274e 100644
--- a/src-generated/edu/nps/moves/dis7/RecordSpecificationElement.java
+++ b/src-generated/edu/nps/moves/dis7/RecordSpecificationElement.java
@@ -1,333 +1,333 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Synthetic record, made up from section 6.2.73. This is used to achieve a repeating variable list element.<p>recordLength, recordCount and recordValues must be set by hand so the.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class RecordSpecificationElement extends Object implements Serializable
-{
- /** the data structure used to convey the parameter values of the record for each record. 32 bit enumeration. uid = 66 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Synthetic record, made up from section 6.2.73. This is used to achieve a repeating variable list element.<p>recordLength, recordCount and recordValues must be set by hand so the.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class RecordSpecificationElement extends Object implements Serializable
+{
+ /** the data structure used to convey the parameter values of the record for each record. 32 bit enumeration. uid = 66 */
protected VariableRecordType recordID = VariableRecordType.values()[0];
-
- /** the serial number of the first record in the block of records */
+
+ /** the serial number of the first record in the block of records */
protected int recordSetSerialNumber;
-
+
protected int padding;
-
- /** the length, in bits, of the record. Note, bits, not bytes. */
+
+ /** the length, in bits, of the record. Note, bits, not bytes. */
protected short recordLength;
-
- /** the number of records included in the record set */
+
+ /** the number of records included in the record set */
protected short recordCount;
-
- /** the concatenated records of the format specified by the Record ID field. The length of this field is the Record Length multiplied by the Record Count, in units of bits. */
+
+ /** the concatenated records of the format specified by the Record ID field. The length of this field is the Record Length multiplied by the Record Count, in units of bits. */
protected byte[] recordValues = new byte[0];
-
- /** used if required to make entire record size an even multiple of 8 bytes */
+
+ /** used if required to make entire record size an even multiple of 8 bytes */
protected byte[] padTo64 = new byte[0];
-
-
-/** Constructor */
- public RecordSpecificationElement()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += recordID.getMarshalledSize();
- marshalSize += 4; // recordSetSerialNumber
- marshalSize += 4; // padding
- marshalSize += 2; // recordLength
- marshalSize += 2; // recordCount
- marshalSize += recordValues.length * 1;
- marshalSize += padTo64.length * 1;
-
- return marshalSize;
-}
-
-
-/** Setter for {@link RecordSpecificationElement#recordID}*/
-public RecordSpecificationElement setRecordID(VariableRecordType pRecordID)
+
+
+/** Constructor */
+ public RecordSpecificationElement()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += recordID.getMarshalledSize();
+ marshalSize += 4; // recordSetSerialNumber
+ marshalSize += 4; // padding
+ marshalSize += 2; // recordLength
+ marshalSize += 2; // recordCount
+ marshalSize += recordValues.length * 1;
+ marshalSize += padTo64.length * 1;
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link RecordSpecificationElement#recordID}*/
+public RecordSpecificationElement setRecordID(VariableRecordType pRecordID)
{
- recordID = pRecordID;
- return this;
-}
-
-/** Getter for {@link RecordSpecificationElement#recordID}*/
-public VariableRecordType getRecordID()
+ recordID = pRecordID;
+ return this;
+}
+
+/** Getter for {@link RecordSpecificationElement#recordID}*/
+public VariableRecordType getRecordID()
{
return recordID;
-}
-
-/** Setter for {@link RecordSpecificationElement#recordSetSerialNumber}*/
-public RecordSpecificationElement setRecordSetSerialNumber(int pRecordSetSerialNumber)
+}
+
+/** Setter for {@link RecordSpecificationElement#recordSetSerialNumber}*/
+public RecordSpecificationElement setRecordSetSerialNumber(int pRecordSetSerialNumber)
{
- recordSetSerialNumber = pRecordSetSerialNumber;
- return this;
-}
-
-/** Getter for {@link RecordSpecificationElement#recordSetSerialNumber}*/
-public int getRecordSetSerialNumber()
+ recordSetSerialNumber = pRecordSetSerialNumber;
+ return this;
+}
+
+/** Getter for {@link RecordSpecificationElement#recordSetSerialNumber}*/
+public int getRecordSetSerialNumber()
{
return recordSetSerialNumber;
-}
-
-/** Setter for {@link RecordSpecificationElement#padding}*/
-public RecordSpecificationElement setPadding(int pPadding)
+}
+
+/** Setter for {@link RecordSpecificationElement#padding}*/
+public RecordSpecificationElement setPadding(int pPadding)
{
- padding = pPadding;
- return this;
-}
-
-/** Getter for {@link RecordSpecificationElement#padding}*/
-public int getPadding()
+ padding = pPadding;
+ return this;
+}
+
+/** Getter for {@link RecordSpecificationElement#padding}*/
+public int getPadding()
{
return padding;
-}
-
-/** Setter for {@link RecordSpecificationElement#recordLength}*/
-public RecordSpecificationElement setRecordLength(short pRecordLength)
+}
+
+/** Setter for {@link RecordSpecificationElement#recordLength}*/
+public RecordSpecificationElement setRecordLength(short pRecordLength)
{
- recordLength = pRecordLength;
- return this;
-}
-
-/** Getter for {@link RecordSpecificationElement#recordLength}*/
-public short getRecordLength()
+ recordLength = pRecordLength;
+ return this;
+}
+
+/** Getter for {@link RecordSpecificationElement#recordLength}*/
+public short getRecordLength()
{
return recordLength;
-}
-
-/** Setter for {@link RecordSpecificationElement#recordCount}*/
-public RecordSpecificationElement setRecordCount(short pRecordCount)
+}
+
+/** Setter for {@link RecordSpecificationElement#recordCount}*/
+public RecordSpecificationElement setRecordCount(short pRecordCount)
{
- recordCount = pRecordCount;
- return this;
-}
-
-/** Getter for {@link RecordSpecificationElement#recordCount}*/
-public short getRecordCount()
+ recordCount = pRecordCount;
+ return this;
+}
+
+/** Getter for {@link RecordSpecificationElement#recordCount}*/
+public short getRecordCount()
{
return recordCount;
-}
-
-/** Setter for {@link RecordSpecificationElement#recordValues}*/
-public RecordSpecificationElement setRecordValues(byte[] pRecordValues)
+}
+
+/** Setter for {@link RecordSpecificationElement#recordValues}*/
+public RecordSpecificationElement setRecordValues(byte[] pRecordValues)
{
- recordValues = pRecordValues;
- return this;
-}
-
-/** Getter for {@link RecordSpecificationElement#recordValues}*/
-public byte[] getRecordValues()
+ recordValues = pRecordValues;
+ return this;
+}
+
+/** Getter for {@link RecordSpecificationElement#recordValues}*/
+public byte[] getRecordValues()
{
return recordValues;
-}
-
-/** Setter for {@link RecordSpecificationElement#padTo64}*/
-public RecordSpecificationElement setPadTo64(byte[] pPadTo64)
+}
+
+/** Setter for {@link RecordSpecificationElement#padTo64}*/
+public RecordSpecificationElement setPadTo64(byte[] pPadTo64)
{
- padTo64 = pPadTo64;
- return this;
-}
-
-/** Getter for {@link RecordSpecificationElement#padTo64}*/
-public byte[] getPadTo64()
+ padTo64 = pPadTo64;
+ return this;
+}
+
+/** Getter for {@link RecordSpecificationElement#padTo64}*/
+public byte[] getPadTo64()
{
return padTo64;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- recordID.marshal(dos);
- dos.writeInt(recordSetSerialNumber);
- dos.writeInt(padding);
- dos.writeShort(recordLength);
- dos.writeShort(recordCount);
-
- for(int idx = 0; idx < recordValues.length; idx++)
- dos.writeByte(recordValues[idx]);
-
-
- for(int idx = 0; idx < padTo64.length; idx++)
- dos.writeByte(padTo64[idx]);
-
+ {
+ recordID.marshal(dos);
+ dos.writeInt(recordSetSerialNumber);
+ dos.writeInt(padding);
+ dos.writeShort(recordLength);
+ dos.writeShort(recordCount);
+
+ for(int idx = 0; idx < recordValues.length; idx++)
+ dos.writeByte(recordValues[idx]);
+
+
+ for(int idx = 0; idx < padTo64.length; idx++)
+ dos.writeByte(padTo64[idx]);
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- recordID = VariableRecordType.unmarshalEnum(dis);
- uPosition += recordID.getMarshalledSize();
- recordSetSerialNumber = dis.readInt();
- uPosition += 4;
- padding = dis.readInt();
- uPosition += 4;
- recordLength = (short)dis.readUnsignedShort();
- uPosition += 2;
- recordCount = (short)dis.readUnsignedShort();
- uPosition += 2;
- for(int idx = 0; idx < recordValues.length; idx++)
- recordValues[idx] = dis.readByte();
- uPosition += (recordValues.length * 1);
- for(int idx = 0; idx < padTo64.length; idx++)
- padTo64[idx] = dis.readByte();
- uPosition += (padTo64.length * 1);
+ {
+ recordID = VariableRecordType.unmarshalEnum(dis);
+ uPosition += recordID.getMarshalledSize();
+ recordSetSerialNumber = dis.readInt();
+ uPosition += 4;
+ padding = dis.readInt();
+ uPosition += 4;
+ recordLength = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ recordCount = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ for(int idx = 0; idx < recordValues.length; idx++)
+ recordValues[idx] = dis.readByte();
+ uPosition += (recordValues.length * 1);
+ for(int idx = 0; idx < padTo64.length; idx++)
+ padTo64[idx] = dis.readByte();
+ uPosition += (padTo64.length * 1);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- recordID.marshal(buff);
- buff.putInt( (int)recordSetSerialNumber);
- buff.putInt( (int)padding);
- buff.putShort( (short)recordLength);
- buff.putShort( (short)recordCount);
-
- for(int idx = 0; idx < recordValues.length; idx++)
- buff.put((byte)recordValues[idx]);
-
-
- for(int idx = 0; idx < padTo64.length; idx++)
- buff.put((byte)padTo64[idx]);
-
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- recordID = VariableRecordType.unmarshalEnum(buff);
- recordSetSerialNumber = buff.getInt();
- padding = buff.getInt();
- recordLength = (short)(buff.getShort() & 0xFFFF);
- recordCount = (short)(buff.getShort() & 0xFFFF);
- for(int idx = 0; idx < recordValues.length; idx++)
- recordValues[idx] = buff.get();
- for(int idx = 0; idx < padTo64.length; idx++)
- padTo64[idx] = buff.get();
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ recordID.marshal(buff);
+ buff.putInt( (int)recordSetSerialNumber);
+ buff.putInt( (int)padding);
+ buff.putShort( (short)recordLength);
+ buff.putShort( (short)recordCount);
+
+ for(int idx = 0; idx < recordValues.length; idx++)
+ buff.put((byte)recordValues[idx]);
+
+
+ for(int idx = 0; idx < padTo64.length; idx++)
+ buff.put((byte)padTo64[idx]);
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ recordID = VariableRecordType.unmarshalEnum(buff);
+ recordSetSerialNumber = buff.getInt();
+ padding = buff.getInt();
+ recordLength = (short)(buff.getShort() & 0xFFFF);
+ recordCount = (short)(buff.getShort() & 0xFFFF);
+ for(int idx = 0; idx < recordValues.length; idx++)
+ recordValues[idx] = buff.get();
+ for(int idx = 0; idx < padTo64.length; idx++)
+ padTo64[idx] = buff.get();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final RecordSpecificationElement rhs = (RecordSpecificationElement)obj;
-
- if( ! (recordID == rhs.recordID)) ivarsEqual = false;
- if( ! (recordSetSerialNumber == rhs.recordSetSerialNumber)) ivarsEqual = false;
- if( ! (padding == rhs.padding)) ivarsEqual = false;
- if( ! (recordLength == rhs.recordLength)) ivarsEqual = false;
- if( ! (recordCount == rhs.recordCount)) ivarsEqual = false;
-
- for(int idx = 0; idx < 0; idx++)
- {
- if(!(recordValues[idx] == rhs.recordValues[idx])) ivarsEqual = false;
- }
-
-
- for(int idx = 0; idx < 0; idx++)
- {
- if(!(padTo64[idx] == rhs.padTo64[idx])) ivarsEqual = false;
- }
-
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final RecordSpecificationElement rhs = (RecordSpecificationElement)obj;
+
+ if( ! (recordID == rhs.recordID)) ivarsEqual = false;
+ if( ! (recordSetSerialNumber == rhs.recordSetSerialNumber)) ivarsEqual = false;
+ if( ! (padding == rhs.padding)) ivarsEqual = false;
+ if( ! (recordLength == rhs.recordLength)) ivarsEqual = false;
+ if( ! (recordCount == rhs.recordCount)) ivarsEqual = false;
+
+ for(int idx = 0; idx < 0; idx++)
+ {
+ if(!(recordValues[idx] == rhs.recordValues[idx])) ivarsEqual = false;
+ }
+
+
+ for(int idx = 0; idx < 0; idx++)
+ {
+ if(!(padTo64[idx] == rhs.padTo64[idx])) ivarsEqual = false;
+ }
+
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" recordID: ").append(recordID).append("\n");
- sb.append(" recordSetSerialNumber: ").append(recordSetSerialNumber).append("\n");
- sb.append(" padding: ").append(padding).append("\n");
- sb.append(" recordLength: ").append(recordLength).append("\n");
- sb.append(" recordCount: ").append(recordCount).append("\n");
- sb.append(" recordValues: ").append("\n");
- sb.append(Arrays.toString(recordValues)).append("\n");
- sb.append(" padTo64: ").append("\n");
- sb.append(Arrays.toString(padTo64)).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" recordID: ").append(recordID).append("\n");
+ sb.append(" recordSetSerialNumber: ").append(recordSetSerialNumber).append("\n");
+ sb.append(" padding: ").append(padding).append("\n");
+ sb.append(" recordLength: ").append(recordLength).append("\n");
+ sb.append(" recordCount: ").append(recordCount).append("\n");
+ sb.append(" recordValues: ").append("\n");
+ sb.append(Arrays.toString(recordValues)).append("\n");
+ sb.append(" padTo64: ").append("\n");
+ sb.append(Arrays.toString(padTo64)).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/Relationship.java b/src-generated/edu/nps/moves/dis7/Relationship.java
index 10c7c36024a5be55e623cd65968dee17053a8708..2951938317139c256be38798707999d7c62839a0 100644
--- a/src-generated/edu/nps/moves/dis7/Relationship.java
+++ b/src-generated/edu/nps/moves/dis7/Relationship.java
@@ -1,186 +1,186 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * The relationship of the part entity to its host entity. Section 6.2.74.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class Relationship extends Object implements Serializable
-{
- /** the nature or purpose for joining of the part entity to the host entity and shall be represented by a 16-bit enumeration uid 210 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * The relationship of the part entity to its host entity. Section 6.2.74.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class Relationship extends Object implements Serializable
+{
+ /** the nature or purpose for joining of the part entity to the host entity and shall be represented by a 16-bit enumeration uid 210 */
protected IsPartOfNature nature = IsPartOfNature.values()[0];
-
- /** the position of the part entity with respect to the host entity and shall be represented by a 16-bit enumeration uid 211 */
+
+ /** the position of the part entity with respect to the host entity and shall be represented by a 16-bit enumeration uid 211 */
protected IsPartOfPosition position = IsPartOfPosition.values()[0];
-
-
-/** Constructor */
- public Relationship()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += nature.getMarshalledSize();
- marshalSize += position.getMarshalledSize();
-
- return marshalSize;
-}
-
-
-/** Setter for {@link Relationship#nature}*/
-public Relationship setNature(IsPartOfNature pNature)
+
+
+/** Constructor */
+ public Relationship()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += nature.getMarshalledSize();
+ marshalSize += position.getMarshalledSize();
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link Relationship#nature}*/
+public Relationship setNature(IsPartOfNature pNature)
{
- nature = pNature;
- return this;
-}
-
-/** Getter for {@link Relationship#nature}*/
-public IsPartOfNature getNature()
+ nature = pNature;
+ return this;
+}
+
+/** Getter for {@link Relationship#nature}*/
+public IsPartOfNature getNature()
{
return nature;
-}
-
-/** Setter for {@link Relationship#position}*/
-public Relationship setPosition(IsPartOfPosition pPosition)
+}
+
+/** Setter for {@link Relationship#position}*/
+public Relationship setPosition(IsPartOfPosition pPosition)
{
- position = pPosition;
- return this;
-}
-
-/** Getter for {@link Relationship#position}*/
-public IsPartOfPosition getPosition()
+ position = pPosition;
+ return this;
+}
+
+/** Getter for {@link Relationship#position}*/
+public IsPartOfPosition getPosition()
{
return position;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- nature.marshal(dos);
- position.marshal(dos);
+ {
+ nature.marshal(dos);
+ position.marshal(dos);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- nature = IsPartOfNature.unmarshalEnum(dis);
- uPosition += nature.getMarshalledSize();
- position = IsPartOfPosition.unmarshalEnum(dis);
- uPosition += position.getMarshalledSize();
+ {
+ nature = IsPartOfNature.unmarshalEnum(dis);
+ uPosition += nature.getMarshalledSize();
+ position = IsPartOfPosition.unmarshalEnum(dis);
+ uPosition += position.getMarshalledSize();
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- nature.marshal(buff);
- position.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- nature = IsPartOfNature.unmarshalEnum(buff);
- position = IsPartOfPosition.unmarshalEnum(buff);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ nature.marshal(buff);
+ position.marshal(buff);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ nature = IsPartOfNature.unmarshalEnum(buff);
+ position = IsPartOfPosition.unmarshalEnum(buff);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final Relationship rhs = (Relationship)obj;
-
- if( ! (nature == rhs.nature)) ivarsEqual = false;
- if( ! (position == rhs.position)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final Relationship rhs = (Relationship)obj;
+
+ if( ! (nature == rhs.nature)) ivarsEqual = false;
+ if( ! (position == rhs.position)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" nature: ").append(nature).append("\n");
- sb.append(" position: ").append(position).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" nature: ").append(nature).append("\n");
+ sb.append(" position: ").append(position).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/RemoveEntityPdu.java b/src-generated/edu/nps/moves/dis7/RemoveEntityPdu.java
index 16e80e05f39fd600f37d6591b02f9a76e15a34b0..26250f5f14198968da4052c02606946fd703c458 100644
--- a/src-generated/edu/nps/moves/dis7/RemoveEntityPdu.java
+++ b/src-generated/edu/nps/moves/dis7/RemoveEntityPdu.java
@@ -1,165 +1,165 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Section 7.5.3 The removal of an entity from an exercise shall be communicated with a Remove Entity PDU. See 5.6.5.3.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class RemoveEntityPdu extends SimulationManagementFamilyPdu implements Serializable
-{
- /** This field shall identify the specific and unique start/resume request being made by the SM */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Section 7.5.3 The removal of an entity from an exercise shall be communicated with a Remove Entity PDU. See 5.6.5.3.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class RemoveEntityPdu extends SimulationManagementFamilyPdu implements Serializable
+{
+ /** This field shall identify the specific and unique start/resume request being made by the SM */
protected int requestID;
-
-
-/** Constructor */
- public RemoveEntityPdu()
- {
- setPduType( DISPDUType.REMOVE_ENTITY );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public RemoveEntityPdu()
+ {
+ setPduType( DISPDUType.REMOVE_ENTITY );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += 4; // requestID
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link RemoveEntityPdu#requestID}*/
+public RemoveEntityPdu setRequestID(int pRequestID)
{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += 4; // requestID
-
- return marshalSize;
-}
-
-
-/** Setter for {@link RemoveEntityPdu#requestID}*/
-public RemoveEntityPdu setRequestID(int pRequestID)
-{
- requestID = pRequestID;
- return this;
-}
-
-/** Getter for {@link RemoveEntityPdu#requestID}*/
-public int getRequestID()
+ requestID = pRequestID;
+ return this;
+}
+
+/** Getter for {@link RemoveEntityPdu#requestID}*/
+public int getRequestID()
{
return requestID;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- dos.writeInt(requestID);
+ {
+ dos.writeInt(requestID);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- requestID = dis.readInt();
- uPosition += 4;
+ {
+ requestID = dis.readInt();
+ uPosition += 4;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- buff.putInt( (int)requestID);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ buff.putInt( (int)requestID);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- requestID = buff.getInt();
- return getMarshalledSize();
+
+ requestID = buff.getInt();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final RemoveEntityPdu rhs = (RemoveEntityPdu)obj;
-
- if( ! (requestID == rhs.requestID)) ivarsEqual = false;
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final RemoveEntityPdu rhs = (RemoveEntityPdu)obj;
+
+ if( ! (requestID == rhs.requestID)) ivarsEqual = false;
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" requestID: ").append(requestID).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" requestID: ").append(requestID).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/RemoveEntityRPdu.java b/src-generated/edu/nps/moves/dis7/RemoveEntityRPdu.java
index ffb721ee7c5a57b03eb1871f6bb15c5a04948f8c..162ddcce6053e38fa98506ae534f5bb5d1046ee6 100644
--- a/src-generated/edu/nps/moves/dis7/RemoveEntityRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/RemoveEntityRPdu.java
@@ -1,235 +1,235 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.12.4.3 Contains the same information as found in the Remove Entity PDU with the addition of the level of reliability service to be used for the removal action being requested.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class RemoveEntityRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
-{
- /** level of reliability service used for this transaction uid 74 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 5.12.4.3 Contains the same information as found in the Remove Entity PDU with the addition of the level of reliability service to be used for the removal action being requested.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class RemoveEntityRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
+{
+ /** level of reliability service used for this transaction uid 74 */
protected RequiredReliabilityService requiredReliabilityService = RequiredReliabilityService.values()[0];
-
+
protected byte pad1;
-
+
protected short pad2;
-
- /** Request ID */
+
+ /** Request ID */
protected int requestID;
-
-
-/** Constructor */
- public RemoveEntityRPdu()
- {
- setPduType( DISPDUType.REMOVE_ENTITY_RELIABLE );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public RemoveEntityRPdu()
+ {
+ setPduType( DISPDUType.REMOVE_ENTITY_RELIABLE );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += requiredReliabilityService.getMarshalledSize();
+ marshalSize += 1; // pad1
+ marshalSize += 2; // pad2
+ marshalSize += 4; // requestID
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link RemoveEntityRPdu#requiredReliabilityService}*/
+public RemoveEntityRPdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += requiredReliabilityService.getMarshalledSize();
- marshalSize += 1; // pad1
- marshalSize += 2; // pad2
- marshalSize += 4; // requestID
-
- return marshalSize;
-}
-
-
-/** Setter for {@link RemoveEntityRPdu#requiredReliabilityService}*/
-public RemoveEntityRPdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
-{
- requiredReliabilityService = pRequiredReliabilityService;
- return this;
-}
-
-/** Getter for {@link RemoveEntityRPdu#requiredReliabilityService}*/
-public RequiredReliabilityService getRequiredReliabilityService()
+ requiredReliabilityService = pRequiredReliabilityService;
+ return this;
+}
+
+/** Getter for {@link RemoveEntityRPdu#requiredReliabilityService}*/
+public RequiredReliabilityService getRequiredReliabilityService()
{
return requiredReliabilityService;
-}
-
-/** Setter for {@link RemoveEntityRPdu#pad1}*/
-public RemoveEntityRPdu setPad1(byte pPad1)
+}
+
+/** Setter for {@link RemoveEntityRPdu#pad1}*/
+public RemoveEntityRPdu setPad1(byte pPad1)
{
- pad1 = pPad1;
- return this;
-}
-
-/** Getter for {@link RemoveEntityRPdu#pad1}*/
-public byte getPad1()
+ pad1 = pPad1;
+ return this;
+}
+
+/** Getter for {@link RemoveEntityRPdu#pad1}*/
+public byte getPad1()
{
return pad1;
-}
-
-/** Setter for {@link RemoveEntityRPdu#pad2}*/
-public RemoveEntityRPdu setPad2(short pPad2)
+}
+
+/** Setter for {@link RemoveEntityRPdu#pad2}*/
+public RemoveEntityRPdu setPad2(short pPad2)
{
- pad2 = pPad2;
- return this;
-}
-
-/** Getter for {@link RemoveEntityRPdu#pad2}*/
-public short getPad2()
+ pad2 = pPad2;
+ return this;
+}
+
+/** Getter for {@link RemoveEntityRPdu#pad2}*/
+public short getPad2()
{
return pad2;
-}
-
-/** Setter for {@link RemoveEntityRPdu#requestID}*/
-public RemoveEntityRPdu setRequestID(int pRequestID)
+}
+
+/** Setter for {@link RemoveEntityRPdu#requestID}*/
+public RemoveEntityRPdu setRequestID(int pRequestID)
{
- requestID = pRequestID;
- return this;
-}
-
-/** Getter for {@link RemoveEntityRPdu#requestID}*/
-public int getRequestID()
+ requestID = pRequestID;
+ return this;
+}
+
+/** Getter for {@link RemoveEntityRPdu#requestID}*/
+public int getRequestID()
{
return requestID;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- requiredReliabilityService.marshal(dos);
- dos.writeByte(pad1);
- dos.writeShort(pad2);
- dos.writeInt(requestID);
+ {
+ requiredReliabilityService.marshal(dos);
+ dos.writeByte(pad1);
+ dos.writeShort(pad2);
+ dos.writeInt(requestID);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(dis);
- uPosition += requiredReliabilityService.getMarshalledSize();
- pad1 = (byte)dis.readUnsignedByte();
- uPosition += 1;
- pad2 = (short)dis.readUnsignedShort();
- uPosition += 2;
- requestID = dis.readInt();
- uPosition += 4;
+ {
+ requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(dis);
+ uPosition += requiredReliabilityService.getMarshalledSize();
+ pad1 = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ pad2 = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ requestID = dis.readInt();
+ uPosition += 4;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- requiredReliabilityService.marshal(buff);
- buff.put( (byte)pad1);
- buff.putShort( (short)pad2);
- buff.putInt( (int)requestID);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ requiredReliabilityService.marshal(buff);
+ buff.put( (byte)pad1);
+ buff.putShort( (short)pad2);
+ buff.putInt( (int)requestID);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(buff);
- pad1 = (byte)(buff.get() & 0xFF);
- pad2 = (short)(buff.getShort() & 0xFFFF);
- requestID = buff.getInt();
- return getMarshalledSize();
+
+ requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(buff);
+ pad1 = (byte)(buff.get() & 0xFF);
+ pad2 = (short)(buff.getShort() & 0xFFFF);
+ requestID = buff.getInt();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final RemoveEntityRPdu rhs = (RemoveEntityRPdu)obj;
-
- if( ! (requiredReliabilityService == rhs.requiredReliabilityService)) ivarsEqual = false;
- if( ! (pad1 == rhs.pad1)) ivarsEqual = false;
- if( ! (pad2 == rhs.pad2)) ivarsEqual = false;
- if( ! (requestID == rhs.requestID)) ivarsEqual = false;
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final RemoveEntityRPdu rhs = (RemoveEntityRPdu)obj;
+
+ if( ! (requiredReliabilityService == rhs.requiredReliabilityService)) ivarsEqual = false;
+ if( ! (pad1 == rhs.pad1)) ivarsEqual = false;
+ if( ! (pad2 == rhs.pad2)) ivarsEqual = false;
+ if( ! (requestID == rhs.requestID)) ivarsEqual = false;
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
- sb.append(" pad1: ").append(pad1).append("\n");
- sb.append(" pad2: ").append(pad2).append("\n");
- sb.append(" requestID: ").append(requestID).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
+ sb.append(" pad1: ").append(pad1).append("\n");
+ sb.append(" pad2: ").append(pad2).append("\n");
+ sb.append(" requestID: ").append(requestID).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/RemoveEntityReliablePdu.java b/src-generated/edu/nps/moves/dis7/RemoveEntityReliablePdu.java
index 30a79ffd44d8b90964c90a92c540bbbe8cf7c673..0646de8a04fac5c6a3c15fd230d4689408b10d42 100644
--- a/src-generated/edu/nps/moves/dis7/RemoveEntityReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/RemoveEntityReliablePdu.java
@@ -1,17 +1,17 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * more descriptive name for a RemoveEntityRPdu
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class RemoveEntityReliablePdu extends RemoveEntityRPdu
-{}
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * more descriptive name for a RemoveEntityRPdu
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class RemoveEntityReliablePdu extends RemoveEntityRPdu
+{}
diff --git a/src-generated/edu/nps/moves/dis7/RepairCompletePdu.java b/src-generated/edu/nps/moves/dis7/RepairCompletePdu.java
index 780f6546b3a35ea4f2b2be87c0602bf8def74fa6..803b16fbf7bbb9bd3bed46c88a0b81d6c059a42e 100644
--- a/src-generated/edu/nps/moves/dis7/RepairCompletePdu.java
+++ b/src-generated/edu/nps/moves/dis7/RepairCompletePdu.java
@@ -1,235 +1,235 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.5.10 Used by the repairing entity to communicate the repair that has been performed for the entity that requested repair service.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class RepairCompletePdu extends LogisticsFamilyPdu implements Serializable
-{
- /** Entity that is receiving service. See 6.2.28 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 5.5.10 Used by the repairing entity to communicate the repair that has been performed for the entity that requested repair service.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class RepairCompletePdu extends LogisticsFamilyPdu implements Serializable
+{
+ /** Entity that is receiving service. See 6.2.28 */
protected EntityID receivingEntityID = new EntityID();
-
- /** Entity that is supplying. See 6.2.28 */
+
+ /** Entity that is supplying. See 6.2.28 */
protected EntityID repairingEntityID = new EntityID();
-
- /** Enumeration for type of repair. See 6.2.74 uid 64 */
+
+ /** Enumeration for type of repair. See 6.2.74 uid 64 */
protected RepairCompleteRepair repair = RepairCompleteRepair.values()[0];
-
- /** padding, number prevents conflict with superclass ivar name */
+
+ /** padding, number prevents conflict with superclass ivar name */
protected short padding4 = (short)0;
-
-
-/** Constructor */
- public RepairCompletePdu()
- {
- setPduType( DISPDUType.REPAIR_COMPLETE );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public RepairCompletePdu()
+ {
+ setPduType( DISPDUType.REPAIR_COMPLETE );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += receivingEntityID.getMarshalledSize();
+ marshalSize += repairingEntityID.getMarshalledSize();
+ marshalSize += repair.getMarshalledSize();
+ marshalSize += 2; // padding4
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link RepairCompletePdu#receivingEntityID}*/
+public RepairCompletePdu setReceivingEntityID(EntityID pReceivingEntityID)
{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += receivingEntityID.getMarshalledSize();
- marshalSize += repairingEntityID.getMarshalledSize();
- marshalSize += repair.getMarshalledSize();
- marshalSize += 2; // padding4
-
- return marshalSize;
-}
-
-
-/** Setter for {@link RepairCompletePdu#receivingEntityID}*/
-public RepairCompletePdu setReceivingEntityID(EntityID pReceivingEntityID)
-{
- receivingEntityID = pReceivingEntityID;
- return this;
-}
-
-/** Getter for {@link RepairCompletePdu#receivingEntityID}*/
-public EntityID getReceivingEntityID()
+ receivingEntityID = pReceivingEntityID;
+ return this;
+}
+
+/** Getter for {@link RepairCompletePdu#receivingEntityID}*/
+public EntityID getReceivingEntityID()
{
return receivingEntityID;
-}
-
-/** Setter for {@link RepairCompletePdu#repairingEntityID}*/
-public RepairCompletePdu setRepairingEntityID(EntityID pRepairingEntityID)
+}
+
+/** Setter for {@link RepairCompletePdu#repairingEntityID}*/
+public RepairCompletePdu setRepairingEntityID(EntityID pRepairingEntityID)
{
- repairingEntityID = pRepairingEntityID;
- return this;
-}
-
-/** Getter for {@link RepairCompletePdu#repairingEntityID}*/
-public EntityID getRepairingEntityID()
+ repairingEntityID = pRepairingEntityID;
+ return this;
+}
+
+/** Getter for {@link RepairCompletePdu#repairingEntityID}*/
+public EntityID getRepairingEntityID()
{
return repairingEntityID;
-}
-
-/** Setter for {@link RepairCompletePdu#repair}*/
-public RepairCompletePdu setRepair(RepairCompleteRepair pRepair)
+}
+
+/** Setter for {@link RepairCompletePdu#repair}*/
+public RepairCompletePdu setRepair(RepairCompleteRepair pRepair)
{
- repair = pRepair;
- return this;
-}
-
-/** Getter for {@link RepairCompletePdu#repair}*/
-public RepairCompleteRepair getRepair()
+ repair = pRepair;
+ return this;
+}
+
+/** Getter for {@link RepairCompletePdu#repair}*/
+public RepairCompleteRepair getRepair()
{
return repair;
-}
-
-/** Setter for {@link RepairCompletePdu#padding4}*/
-public RepairCompletePdu setPadding4(short pPadding4)
+}
+
+/** Setter for {@link RepairCompletePdu#padding4}*/
+public RepairCompletePdu setPadding4(short pPadding4)
{
- padding4 = pPadding4;
- return this;
-}
-
-/** Getter for {@link RepairCompletePdu#padding4}*/
-public short getPadding4()
+ padding4 = pPadding4;
+ return this;
+}
+
+/** Getter for {@link RepairCompletePdu#padding4}*/
+public short getPadding4()
{
return padding4;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- receivingEntityID.marshal(dos);
- repairingEntityID.marshal(dos);
- repair.marshal(dos);
- dos.writeShort(padding4);
+ {
+ receivingEntityID.marshal(dos);
+ repairingEntityID.marshal(dos);
+ repair.marshal(dos);
+ dos.writeShort(padding4);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += receivingEntityID.unmarshal(dis);
- uPosition += repairingEntityID.unmarshal(dis);
- repair = RepairCompleteRepair.unmarshalEnum(dis);
- uPosition += repair.getMarshalledSize();
- padding4 = (short)dis.readUnsignedShort();
- uPosition += 2;
+ {
+ uPosition += receivingEntityID.unmarshal(dis);
+ uPosition += repairingEntityID.unmarshal(dis);
+ repair = RepairCompleteRepair.unmarshalEnum(dis);
+ uPosition += repair.getMarshalledSize();
+ padding4 = (short)dis.readUnsignedShort();
+ uPosition += 2;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- receivingEntityID.marshal(buff);
- repairingEntityID.marshal(buff);
- repair.marshal(buff);
- buff.putShort( (short)padding4);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ receivingEntityID.marshal(buff);
+ repairingEntityID.marshal(buff);
+ repair.marshal(buff);
+ buff.putShort( (short)padding4);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- receivingEntityID.unmarshal(buff);
- repairingEntityID.unmarshal(buff);
- repair = RepairCompleteRepair.unmarshalEnum(buff);
- padding4 = (short)(buff.getShort() & 0xFFFF);
- return getMarshalledSize();
+
+ receivingEntityID.unmarshal(buff);
+ repairingEntityID.unmarshal(buff);
+ repair = RepairCompleteRepair.unmarshalEnum(buff);
+ padding4 = (short)(buff.getShort() & 0xFFFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final RepairCompletePdu rhs = (RepairCompletePdu)obj;
-
- if( ! (receivingEntityID.equals( rhs.receivingEntityID) )) ivarsEqual = false;
- if( ! (repairingEntityID.equals( rhs.repairingEntityID) )) ivarsEqual = false;
- if( ! (repair == rhs.repair)) ivarsEqual = false;
- if( ! (padding4 == rhs.padding4)) ivarsEqual = false;
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final RepairCompletePdu rhs = (RepairCompletePdu)obj;
+
+ if( ! (receivingEntityID.equals( rhs.receivingEntityID) )) ivarsEqual = false;
+ if( ! (repairingEntityID.equals( rhs.repairingEntityID) )) ivarsEqual = false;
+ if( ! (repair == rhs.repair)) ivarsEqual = false;
+ if( ! (padding4 == rhs.padding4)) ivarsEqual = false;
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" receivingEntityID: ").append(receivingEntityID).append("\n");
- sb.append(" repairingEntityID: ").append(repairingEntityID).append("\n");
- sb.append(" repair: ").append(repair).append("\n");
- sb.append(" padding4: ").append(padding4).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" receivingEntityID: ").append(receivingEntityID).append("\n");
+ sb.append(" repairingEntityID: ").append(repairingEntityID).append("\n");
+ sb.append(" repair: ").append(repair).append("\n");
+ sb.append(" padding4: ").append(padding4).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/RepairResponsePdu.java b/src-generated/edu/nps/moves/dis7/RepairResponsePdu.java
index f09356a1ef826c88f8873bf9a4350e75974ec2e1..64ef893e75443749bb41d13909cda368489be0a9 100644
--- a/src-generated/edu/nps/moves/dis7/RepairResponsePdu.java
+++ b/src-generated/edu/nps/moves/dis7/RepairResponsePdu.java
@@ -1,259 +1,259 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.5.11 used by the receiving entity to acknowledge the receipt of a Repair Complete PDU
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class RepairResponsePdu extends LogisticsFamilyPdu implements Serializable
-{
- /** Entity that requested repairs. See 6.2.28 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 5.5.11 used by the receiving entity to acknowledge the receipt of a Repair Complete PDU
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class RepairResponsePdu extends LogisticsFamilyPdu implements Serializable
+{
+ /** Entity that requested repairs. See 6.2.28 */
protected EntityID receivingEntityID = new EntityID();
-
- /** Entity that is repairing. See 6.2.28 */
+
+ /** Entity that is repairing. See 6.2.28 */
protected EntityID repairingEntityID = new EntityID();
-
- /** Result of repair operation uid 64 */
+
+ /** Result of repair operation uid 64 */
protected RepairResponseRepairResult repairResult = RepairResponseRepairResult.values()[0];
-
- /** padding */
+
+ /** padding */
protected byte padding1 = (byte)0;
-
- /** padding */
+
+ /** padding */
protected short padding2 = (short)0;
-
-
-/** Constructor */
- public RepairResponsePdu()
- {
- setPduType( DISPDUType.REPAIR_RESPONSE );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public RepairResponsePdu()
+ {
+ setPduType( DISPDUType.REPAIR_RESPONSE );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += receivingEntityID.getMarshalledSize();
+ marshalSize += repairingEntityID.getMarshalledSize();
+ marshalSize += repairResult.getMarshalledSize();
+ marshalSize += 1; // padding1
+ marshalSize += 2; // padding2
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link RepairResponsePdu#receivingEntityID}*/
+public RepairResponsePdu setReceivingEntityID(EntityID pReceivingEntityID)
{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += receivingEntityID.getMarshalledSize();
- marshalSize += repairingEntityID.getMarshalledSize();
- marshalSize += repairResult.getMarshalledSize();
- marshalSize += 1; // padding1
- marshalSize += 2; // padding2
-
- return marshalSize;
-}
-
-
-/** Setter for {@link RepairResponsePdu#receivingEntityID}*/
-public RepairResponsePdu setReceivingEntityID(EntityID pReceivingEntityID)
-{
- receivingEntityID = pReceivingEntityID;
- return this;
-}
-
-/** Getter for {@link RepairResponsePdu#receivingEntityID}*/
-public EntityID getReceivingEntityID()
+ receivingEntityID = pReceivingEntityID;
+ return this;
+}
+
+/** Getter for {@link RepairResponsePdu#receivingEntityID}*/
+public EntityID getReceivingEntityID()
{
return receivingEntityID;
-}
-
-/** Setter for {@link RepairResponsePdu#repairingEntityID}*/
-public RepairResponsePdu setRepairingEntityID(EntityID pRepairingEntityID)
+}
+
+/** Setter for {@link RepairResponsePdu#repairingEntityID}*/
+public RepairResponsePdu setRepairingEntityID(EntityID pRepairingEntityID)
{
- repairingEntityID = pRepairingEntityID;
- return this;
-}
-
-/** Getter for {@link RepairResponsePdu#repairingEntityID}*/
-public EntityID getRepairingEntityID()
+ repairingEntityID = pRepairingEntityID;
+ return this;
+}
+
+/** Getter for {@link RepairResponsePdu#repairingEntityID}*/
+public EntityID getRepairingEntityID()
{
return repairingEntityID;
-}
-
-/** Setter for {@link RepairResponsePdu#repairResult}*/
-public RepairResponsePdu setRepairResult(RepairResponseRepairResult pRepairResult)
+}
+
+/** Setter for {@link RepairResponsePdu#repairResult}*/
+public RepairResponsePdu setRepairResult(RepairResponseRepairResult pRepairResult)
{
- repairResult = pRepairResult;
- return this;
-}
-
-/** Getter for {@link RepairResponsePdu#repairResult}*/
-public RepairResponseRepairResult getRepairResult()
+ repairResult = pRepairResult;
+ return this;
+}
+
+/** Getter for {@link RepairResponsePdu#repairResult}*/
+public RepairResponseRepairResult getRepairResult()
{
return repairResult;
-}
-
-/** Setter for {@link RepairResponsePdu#padding1}*/
-public RepairResponsePdu setPadding1(byte pPadding1)
+}
+
+/** Setter for {@link RepairResponsePdu#padding1}*/
+public RepairResponsePdu setPadding1(byte pPadding1)
{
- padding1 = pPadding1;
- return this;
-}
-
-/** Getter for {@link RepairResponsePdu#padding1}*/
-public byte getPadding1()
+ padding1 = pPadding1;
+ return this;
+}
+
+/** Getter for {@link RepairResponsePdu#padding1}*/
+public byte getPadding1()
{
return padding1;
-}
-
-/** Setter for {@link RepairResponsePdu#padding2}*/
-public RepairResponsePdu setPadding2(short pPadding2)
+}
+
+/** Setter for {@link RepairResponsePdu#padding2}*/
+public RepairResponsePdu setPadding2(short pPadding2)
{
- padding2 = pPadding2;
- return this;
-}
-
-/** Getter for {@link RepairResponsePdu#padding2}*/
-public short getPadding2()
+ padding2 = pPadding2;
+ return this;
+}
+
+/** Getter for {@link RepairResponsePdu#padding2}*/
+public short getPadding2()
{
return padding2;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- receivingEntityID.marshal(dos);
- repairingEntityID.marshal(dos);
- repairResult.marshal(dos);
- dos.writeByte(padding1);
- dos.writeShort(padding2);
+ {
+ receivingEntityID.marshal(dos);
+ repairingEntityID.marshal(dos);
+ repairResult.marshal(dos);
+ dos.writeByte(padding1);
+ dos.writeShort(padding2);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += receivingEntityID.unmarshal(dis);
- uPosition += repairingEntityID.unmarshal(dis);
- repairResult = RepairResponseRepairResult.unmarshalEnum(dis);
- uPosition += repairResult.getMarshalledSize();
- padding1 = (byte)dis.readUnsignedByte();
- uPosition += 1;
- padding2 = (short)dis.readUnsignedShort();
- uPosition += 2;
+ {
+ uPosition += receivingEntityID.unmarshal(dis);
+ uPosition += repairingEntityID.unmarshal(dis);
+ repairResult = RepairResponseRepairResult.unmarshalEnum(dis);
+ uPosition += repairResult.getMarshalledSize();
+ padding1 = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ padding2 = (short)dis.readUnsignedShort();
+ uPosition += 2;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- receivingEntityID.marshal(buff);
- repairingEntityID.marshal(buff);
- repairResult.marshal(buff);
- buff.put( (byte)padding1);
- buff.putShort( (short)padding2);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ receivingEntityID.marshal(buff);
+ repairingEntityID.marshal(buff);
+ repairResult.marshal(buff);
+ buff.put( (byte)padding1);
+ buff.putShort( (short)padding2);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- receivingEntityID.unmarshal(buff);
- repairingEntityID.unmarshal(buff);
- repairResult = RepairResponseRepairResult.unmarshalEnum(buff);
- padding1 = (byte)(buff.get() & 0xFF);
- padding2 = (short)(buff.getShort() & 0xFFFF);
- return getMarshalledSize();
+
+ receivingEntityID.unmarshal(buff);
+ repairingEntityID.unmarshal(buff);
+ repairResult = RepairResponseRepairResult.unmarshalEnum(buff);
+ padding1 = (byte)(buff.get() & 0xFF);
+ padding2 = (short)(buff.getShort() & 0xFFFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final RepairResponsePdu rhs = (RepairResponsePdu)obj;
-
- if( ! (receivingEntityID.equals( rhs.receivingEntityID) )) ivarsEqual = false;
- if( ! (repairingEntityID.equals( rhs.repairingEntityID) )) ivarsEqual = false;
- if( ! (repairResult == rhs.repairResult)) ivarsEqual = false;
- if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
- if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final RepairResponsePdu rhs = (RepairResponsePdu)obj;
+
+ if( ! (receivingEntityID.equals( rhs.receivingEntityID) )) ivarsEqual = false;
+ if( ! (repairingEntityID.equals( rhs.repairingEntityID) )) ivarsEqual = false;
+ if( ! (repairResult == rhs.repairResult)) ivarsEqual = false;
+ if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
+ if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" receivingEntityID: ").append(receivingEntityID).append("\n");
- sb.append(" repairingEntityID: ").append(repairingEntityID).append("\n");
- sb.append(" repairResult: ").append(repairResult).append("\n");
- sb.append(" padding1: ").append(padding1).append("\n");
- sb.append(" padding2: ").append(padding2).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" receivingEntityID: ").append(receivingEntityID).append("\n");
+ sb.append(" repairingEntityID: ").append(repairingEntityID).append("\n");
+ sb.append(" repairResult: ").append(repairResult).append("\n");
+ sb.append(" padding1: ").append(padding1).append("\n");
+ sb.append(" padding2: ").append(padding2).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/RequestID.java b/src-generated/edu/nps/moves/dis7/RequestID.java
index ccbe82cb109a0fd752623da8579eeb758d696eb8..ef54e1f5ce0c7abe6a829ba291d34c9a67963c47 100644
--- a/src-generated/edu/nps/moves/dis7/RequestID.java
+++ b/src-generated/edu/nps/moves/dis7/RequestID.java
@@ -1,162 +1,162 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * A monotonically increasing number inserted into all simulation managment PDUs. This should be a hand-coded thingie, maybe a singleton. Section 6.2.75
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class RequestID extends Object implements Serializable
-{
- /** monotonically increasing number */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * A monotonically increasing number inserted into all simulation managment PDUs. This should be a hand-coded thingie, maybe a singleton. Section 6.2.75
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class RequestID extends Object implements Serializable
+{
+ /** monotonically increasing number */
protected int requestID;
-
-
-/** Constructor */
- public RequestID()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public RequestID()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 4; // requestID
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link RequestID#requestID}*/
+public RequestID setRequestID(int pRequestID)
{
- int marshalSize = 0;
-
- marshalSize += 4; // requestID
-
- return marshalSize;
-}
-
-
-/** Setter for {@link RequestID#requestID}*/
-public RequestID setRequestID(int pRequestID)
-{
- requestID = pRequestID;
- return this;
-}
-
-/** Getter for {@link RequestID#requestID}*/
-public int getRequestID()
+ requestID = pRequestID;
+ return this;
+}
+
+/** Getter for {@link RequestID#requestID}*/
+public int getRequestID()
{
return requestID;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeInt(requestID);
+ {
+ dos.writeInt(requestID);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- requestID = dis.readInt();
- uPosition += 4;
+ {
+ requestID = dis.readInt();
+ uPosition += 4;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putInt( (int)requestID);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- requestID = buff.getInt();
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putInt( (int)requestID);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ requestID = buff.getInt();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final RequestID rhs = (RequestID)obj;
-
- if( ! (requestID == rhs.requestID)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final RequestID rhs = (RequestID)obj;
+
+ if( ! (requestID == rhs.requestID)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" requestID: ").append(requestID).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" requestID: ").append(requestID).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ResupplyCancelPdu.java b/src-generated/edu/nps/moves/dis7/ResupplyCancelPdu.java
index 6035e828a88ac8c42f6c1623e1e9dd974ed62b27..9d30477457d260ae33b0f3d2f1557ff9b256122a 100644
--- a/src-generated/edu/nps/moves/dis7/ResupplyCancelPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ResupplyCancelPdu.java
@@ -1,187 +1,187 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.5.8 Used to communicate the canceling of a resupply service provided through logistics support.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class ResupplyCancelPdu extends LogisticsFamilyPdu implements Serializable
-{
- /** Requesting entity, Section 7.4.5 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 5.5.8 Used to communicate the canceling of a resupply service provided through logistics support.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class ResupplyCancelPdu extends LogisticsFamilyPdu implements Serializable
+{
+ /** Requesting entity, Section 7.4.5 */
protected EntityID receivingEntityID = new EntityID();
-
- /** Supplying entity, Section 7.4.5 */
+
+ /** Supplying entity, Section 7.4.5 */
protected EntityID supplyingEntityID = new EntityID();
-
-
-/** Constructor */
- public ResupplyCancelPdu()
- {
- setPduType( DISPDUType.RESUPPLY_CANCEL );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += receivingEntityID.getMarshalledSize();
- marshalSize += supplyingEntityID.getMarshalledSize();
-
- return marshalSize;
-}
-
-
-/** Setter for {@link ResupplyCancelPdu#receivingEntityID}*/
-public ResupplyCancelPdu setReceivingEntityID(EntityID pReceivingEntityID)
+
+
+/** Constructor */
+ public ResupplyCancelPdu()
+ {
+ setPduType( DISPDUType.RESUPPLY_CANCEL );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += receivingEntityID.getMarshalledSize();
+ marshalSize += supplyingEntityID.getMarshalledSize();
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link ResupplyCancelPdu#receivingEntityID}*/
+public ResupplyCancelPdu setReceivingEntityID(EntityID pReceivingEntityID)
{
- receivingEntityID = pReceivingEntityID;
- return this;
-}
-
-/** Getter for {@link ResupplyCancelPdu#receivingEntityID}*/
-public EntityID getReceivingEntityID()
+ receivingEntityID = pReceivingEntityID;
+ return this;
+}
+
+/** Getter for {@link ResupplyCancelPdu#receivingEntityID}*/
+public EntityID getReceivingEntityID()
{
return receivingEntityID;
-}
-
-/** Setter for {@link ResupplyCancelPdu#supplyingEntityID}*/
-public ResupplyCancelPdu setSupplyingEntityID(EntityID pSupplyingEntityID)
+}
+
+/** Setter for {@link ResupplyCancelPdu#supplyingEntityID}*/
+public ResupplyCancelPdu setSupplyingEntityID(EntityID pSupplyingEntityID)
{
- supplyingEntityID = pSupplyingEntityID;
- return this;
-}
-
-/** Getter for {@link ResupplyCancelPdu#supplyingEntityID}*/
-public EntityID getSupplyingEntityID()
+ supplyingEntityID = pSupplyingEntityID;
+ return this;
+}
+
+/** Getter for {@link ResupplyCancelPdu#supplyingEntityID}*/
+public EntityID getSupplyingEntityID()
{
return supplyingEntityID;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- receivingEntityID.marshal(dos);
- supplyingEntityID.marshal(dos);
+ {
+ receivingEntityID.marshal(dos);
+ supplyingEntityID.marshal(dos);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += receivingEntityID.unmarshal(dis);
- uPosition += supplyingEntityID.unmarshal(dis);
+ {
+ uPosition += receivingEntityID.unmarshal(dis);
+ uPosition += supplyingEntityID.unmarshal(dis);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- receivingEntityID.marshal(buff);
- supplyingEntityID.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ receivingEntityID.marshal(buff);
+ supplyingEntityID.marshal(buff);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- receivingEntityID.unmarshal(buff);
- supplyingEntityID.unmarshal(buff);
- return getMarshalledSize();
+
+ receivingEntityID.unmarshal(buff);
+ supplyingEntityID.unmarshal(buff);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final ResupplyCancelPdu rhs = (ResupplyCancelPdu)obj;
-
- if( ! (receivingEntityID.equals( rhs.receivingEntityID) )) ivarsEqual = false;
- if( ! (supplyingEntityID.equals( rhs.supplyingEntityID) )) ivarsEqual = false;
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final ResupplyCancelPdu rhs = (ResupplyCancelPdu)obj;
+
+ if( ! (receivingEntityID.equals( rhs.receivingEntityID) )) ivarsEqual = false;
+ if( ! (supplyingEntityID.equals( rhs.supplyingEntityID) )) ivarsEqual = false;
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" receivingEntityID: ").append(receivingEntityID).append("\n");
- sb.append(" supplyingEntityID: ").append(supplyingEntityID).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" receivingEntityID: ").append(receivingEntityID).append("\n");
+ sb.append(" supplyingEntityID: ").append(supplyingEntityID).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ResupplyOfferPdu.java b/src-generated/edu/nps/moves/dis7/ResupplyOfferPdu.java
index 42f00f23652866c6f2ec19f7e6a78a3f68a242d3..e09564510342df1d136710bb1bb584fd227622cf 100644
--- a/src-generated/edu/nps/moves/dis7/ResupplyOfferPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ResupplyOfferPdu.java
@@ -1,299 +1,299 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.5.6 Communicate the offer of supplies by a supplying entity to a receiving entity.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class ResupplyOfferPdu extends LogisticsFamilyPdu implements Serializable
-{
- /** Field identifies the Entity and respective Entity Record ID that is receiving service (see 6.2.28), Section 7.4.3 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 5.5.6 Communicate the offer of supplies by a supplying entity to a receiving entity.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class ResupplyOfferPdu extends LogisticsFamilyPdu implements Serializable
+{
+ /** Field identifies the Entity and respective Entity Record ID that is receiving service (see 6.2.28), Section 7.4.3 */
protected EntityID receivingEntityID = new EntityID();
-
- /** Identifies the Entity and respective Entity ID Record that is supplying (see 6.2.28), Section 7.4.3 */
+
+ /** Identifies the Entity and respective Entity ID Record that is supplying (see 6.2.28), Section 7.4.3 */
protected EntityID supplyingEntityID = new EntityID();
-
- /** How many supplies types are being offered, Section 7.4.3 */
+
+ /** How many supplies types are being offered, Section 7.4.3 */
protected byte numberOfSupplyTypes;
-
- /** padding */
+
+ /** padding */
protected byte padding1 = (byte)0;
-
- /** padding */
+
+ /** padding */
protected short padding2 = (short)0;
-
- /** A Reord that Specifies the type of supply and the amount of that supply for each of the supply types in numberOfSupplyTypes (see 6.2.85), Section 7.4.3 */
+
+ /** A Reord that Specifies the type of supply and the amount of that supply for each of the supply types in numberOfSupplyTypes (see 6.2.85), Section 7.4.3 */
protected List< SupplyQuantity > supplies = new ArrayList< SupplyQuantity >();
-
-
-/** Constructor */
- public ResupplyOfferPdu()
- {
- setPduType( DISPDUType.RESUPPLY_OFFER );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += receivingEntityID.getMarshalledSize();
- marshalSize += supplyingEntityID.getMarshalledSize();
- marshalSize += 1; // numberOfSupplyTypes
- marshalSize += 1; // padding1
- marshalSize += 2; // padding2
- for(int idx=0; idx < supplies.size(); idx++)
- {
- SupplyQuantity listElement = supplies.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link ResupplyOfferPdu#receivingEntityID}*/
-public ResupplyOfferPdu setReceivingEntityID(EntityID pReceivingEntityID)
+
+
+/** Constructor */
+ public ResupplyOfferPdu()
+ {
+ setPduType( DISPDUType.RESUPPLY_OFFER );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += receivingEntityID.getMarshalledSize();
+ marshalSize += supplyingEntityID.getMarshalledSize();
+ marshalSize += 1; // numberOfSupplyTypes
+ marshalSize += 1; // padding1
+ marshalSize += 2; // padding2
+ for(int idx=0; idx < supplies.size(); idx++)
+ {
+ SupplyQuantity listElement = supplies.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link ResupplyOfferPdu#receivingEntityID}*/
+public ResupplyOfferPdu setReceivingEntityID(EntityID pReceivingEntityID)
{
- receivingEntityID = pReceivingEntityID;
- return this;
-}
-
-/** Getter for {@link ResupplyOfferPdu#receivingEntityID}*/
-public EntityID getReceivingEntityID()
+ receivingEntityID = pReceivingEntityID;
+ return this;
+}
+
+/** Getter for {@link ResupplyOfferPdu#receivingEntityID}*/
+public EntityID getReceivingEntityID()
{
return receivingEntityID;
-}
-
-/** Setter for {@link ResupplyOfferPdu#supplyingEntityID}*/
-public ResupplyOfferPdu setSupplyingEntityID(EntityID pSupplyingEntityID)
+}
+
+/** Setter for {@link ResupplyOfferPdu#supplyingEntityID}*/
+public ResupplyOfferPdu setSupplyingEntityID(EntityID pSupplyingEntityID)
{
- supplyingEntityID = pSupplyingEntityID;
- return this;
-}
-
-/** Getter for {@link ResupplyOfferPdu#supplyingEntityID}*/
-public EntityID getSupplyingEntityID()
+ supplyingEntityID = pSupplyingEntityID;
+ return this;
+}
+
+/** Getter for {@link ResupplyOfferPdu#supplyingEntityID}*/
+public EntityID getSupplyingEntityID()
{
return supplyingEntityID;
-}
-
-/** Setter for {@link ResupplyOfferPdu#padding1}*/
-public ResupplyOfferPdu setPadding1(byte pPadding1)
+}
+
+/** Setter for {@link ResupplyOfferPdu#padding1}*/
+public ResupplyOfferPdu setPadding1(byte pPadding1)
{
- padding1 = pPadding1;
- return this;
-}
-
-/** Getter for {@link ResupplyOfferPdu#padding1}*/
-public byte getPadding1()
+ padding1 = pPadding1;
+ return this;
+}
+
+/** Getter for {@link ResupplyOfferPdu#padding1}*/
+public byte getPadding1()
{
return padding1;
-}
-
-/** Setter for {@link ResupplyOfferPdu#padding2}*/
-public ResupplyOfferPdu setPadding2(short pPadding2)
+}
+
+/** Setter for {@link ResupplyOfferPdu#padding2}*/
+public ResupplyOfferPdu setPadding2(short pPadding2)
{
- padding2 = pPadding2;
- return this;
-}
-
-/** Getter for {@link ResupplyOfferPdu#padding2}*/
-public short getPadding2()
+ padding2 = pPadding2;
+ return this;
+}
+
+/** Getter for {@link ResupplyOfferPdu#padding2}*/
+public short getPadding2()
{
return padding2;
-}
-
-/** Setter for {@link ResupplyOfferPdu#supplies}*/
-public ResupplyOfferPdu setSupplies(List<SupplyQuantity> pSupplies)
+}
+
+/** Setter for {@link ResupplyOfferPdu#supplies}*/
+public ResupplyOfferPdu setSupplies(List<SupplyQuantity> pSupplies)
{
- supplies = pSupplies;
- return this;
-}
-
-/** Getter for {@link ResupplyOfferPdu#supplies}*/
-public List<SupplyQuantity> getSupplies()
+ supplies = pSupplies;
+ return this;
+}
+
+/** Getter for {@link ResupplyOfferPdu#supplies}*/
+public List<SupplyQuantity> getSupplies()
{
return supplies;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- receivingEntityID.marshal(dos);
- supplyingEntityID.marshal(dos);
- dos.writeByte(supplies.size());
- dos.writeByte(padding1);
- dos.writeShort(padding2);
-
- for(int idx = 0; idx < supplies.size(); idx++)
- {
- SupplyQuantity aSupplyQuantity = supplies.get(idx);
- aSupplyQuantity.marshal(dos);
- }
-
+ {
+ receivingEntityID.marshal(dos);
+ supplyingEntityID.marshal(dos);
+ dos.writeByte(supplies.size());
+ dos.writeByte(padding1);
+ dos.writeShort(padding2);
+
+ for(int idx = 0; idx < supplies.size(); idx++)
+ {
+ SupplyQuantity aSupplyQuantity = supplies.get(idx);
+ aSupplyQuantity.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += receivingEntityID.unmarshal(dis);
- uPosition += supplyingEntityID.unmarshal(dis);
- numberOfSupplyTypes = (byte)dis.readUnsignedByte();
- uPosition += 1;
- padding1 = (byte)dis.readUnsignedByte();
- uPosition += 1;
- padding2 = (short)dis.readUnsignedShort();
- uPosition += 2;
- for(int idx = 0; idx < numberOfSupplyTypes; idx++)
- {
- SupplyQuantity anX = new SupplyQuantity();
- uPosition += anX.unmarshal(dis);
- supplies.add(anX);
- }
-
+ {
+ uPosition += receivingEntityID.unmarshal(dis);
+ uPosition += supplyingEntityID.unmarshal(dis);
+ numberOfSupplyTypes = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ padding1 = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ padding2 = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ for(int idx = 0; idx < numberOfSupplyTypes; idx++)
+ {
+ SupplyQuantity anX = new SupplyQuantity();
+ uPosition += anX.unmarshal(dis);
+ supplies.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- receivingEntityID.marshal(buff);
- supplyingEntityID.marshal(buff);
- buff.put( (byte)supplies.size());
- buff.put( (byte)padding1);
- buff.putShort( (short)padding2);
-
- for(int idx = 0; idx < supplies.size(); idx++)
- {
- SupplyQuantity aSupplyQuantity = supplies.get(idx);
- aSupplyQuantity.marshal(buff);
- }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ receivingEntityID.marshal(buff);
+ supplyingEntityID.marshal(buff);
+ buff.put( (byte)supplies.size());
+ buff.put( (byte)padding1);
+ buff.putShort( (short)padding2);
+
+ for(int idx = 0; idx < supplies.size(); idx++)
+ {
+ SupplyQuantity aSupplyQuantity = supplies.get(idx);
+ aSupplyQuantity.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- receivingEntityID.unmarshal(buff);
- supplyingEntityID.unmarshal(buff);
- numberOfSupplyTypes = (byte)(buff.get() & 0xFF);
- padding1 = (byte)(buff.get() & 0xFF);
- padding2 = (short)(buff.getShort() & 0xFFFF);
- for(int idx = 0; idx < numberOfSupplyTypes; idx++)
- {
- SupplyQuantity anX = new SupplyQuantity();
- anX.unmarshal(buff);
- supplies.add(anX);
- }
-
- return getMarshalledSize();
+
+ receivingEntityID.unmarshal(buff);
+ supplyingEntityID.unmarshal(buff);
+ numberOfSupplyTypes = (byte)(buff.get() & 0xFF);
+ padding1 = (byte)(buff.get() & 0xFF);
+ padding2 = (short)(buff.getShort() & 0xFFFF);
+ for(int idx = 0; idx < numberOfSupplyTypes; idx++)
+ {
+ SupplyQuantity anX = new SupplyQuantity();
+ anX.unmarshal(buff);
+ supplies.add(anX);
+ }
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final ResupplyOfferPdu rhs = (ResupplyOfferPdu)obj;
-
- if( ! (receivingEntityID.equals( rhs.receivingEntityID) )) ivarsEqual = false;
- if( ! (supplyingEntityID.equals( rhs.supplyingEntityID) )) ivarsEqual = false;
- if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
- if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
-
- for(int idx = 0; idx < supplies.size(); idx++)
- if( ! ( supplies.get(idx).equals(rhs.supplies.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final ResupplyOfferPdu rhs = (ResupplyOfferPdu)obj;
+
+ if( ! (receivingEntityID.equals( rhs.receivingEntityID) )) ivarsEqual = false;
+ if( ! (supplyingEntityID.equals( rhs.supplyingEntityID) )) ivarsEqual = false;
+ if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
+ if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
+
+ for(int idx = 0; idx < supplies.size(); idx++)
+ if( ! ( supplies.get(idx).equals(rhs.supplies.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" receivingEntityID: ").append(receivingEntityID).append("\n");
- sb.append(" supplyingEntityID: ").append(supplyingEntityID).append("\n");
- sb.append(" padding1: ").append(padding1).append("\n");
- sb.append(" padding2: ").append(padding2).append("\n");
- sb.append(" supplies: ").append("\n");
- supplies.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" receivingEntityID: ").append(receivingEntityID).append("\n");
+ sb.append(" supplyingEntityID: ").append(supplyingEntityID).append("\n");
+ sb.append(" padding1: ").append(padding1).append("\n");
+ sb.append(" padding2: ").append(padding2).append("\n");
+ sb.append(" supplies: ").append("\n");
+ supplies.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ResupplyReceivedPdu.java b/src-generated/edu/nps/moves/dis7/ResupplyReceivedPdu.java
index 8dfe14e84654d1ac1f5a1e50b188919b52abe3f3..1ed7936bab445bb00559d4a063981139786d3d76 100644
--- a/src-generated/edu/nps/moves/dis7/ResupplyReceivedPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ResupplyReceivedPdu.java
@@ -1,299 +1,299 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.5.7 Used to acknowledge the receipt of supplies by the receiving entity.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class ResupplyReceivedPdu extends LogisticsFamilyPdu implements Serializable
-{
- /** Entity that is receiving service. Shall be represented by Entity Identifier record (see 6.2.28) */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 5.5.7 Used to acknowledge the receipt of supplies by the receiving entity.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class ResupplyReceivedPdu extends LogisticsFamilyPdu implements Serializable
+{
+ /** Entity that is receiving service. Shall be represented by Entity Identifier record (see 6.2.28) */
protected EntityID receivingEntityID = new EntityID();
-
- /** Entity that is supplying. Shall be represented by Entity Identifier record (see 6.2.28) */
+
+ /** Entity that is supplying. Shall be represented by Entity Identifier record (see 6.2.28) */
protected EntityID supplyingEntityID = new EntityID();
-
- /** How many supplies are taken by receiving entity */
+
+ /** How many supplies are taken by receiving entity */
protected byte numberOfSupplyTypes;
-
- /** padding */
+
+ /** padding */
protected byte padding1 = (byte)0;
-
- /** padding */
+
+ /** padding */
protected short padding2 = (short)0;
-
- /** A Reord that Specifies the type of supply and the amount of that supply for each of the supply types in numberOfSupplyTypes (see 6.2.85), Section 7.4.3 */
+
+ /** A Reord that Specifies the type of supply and the amount of that supply for each of the supply types in numberOfSupplyTypes (see 6.2.85), Section 7.4.3 */
protected List< SupplyQuantity > supplies = new ArrayList< SupplyQuantity >();
-
-
-/** Constructor */
- public ResupplyReceivedPdu()
- {
- setPduType( DISPDUType.RESUPPLY_RECEIVED );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += receivingEntityID.getMarshalledSize();
- marshalSize += supplyingEntityID.getMarshalledSize();
- marshalSize += 1; // numberOfSupplyTypes
- marshalSize += 1; // padding1
- marshalSize += 2; // padding2
- for(int idx=0; idx < supplies.size(); idx++)
- {
- SupplyQuantity listElement = supplies.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link ResupplyReceivedPdu#receivingEntityID}*/
-public ResupplyReceivedPdu setReceivingEntityID(EntityID pReceivingEntityID)
+
+
+/** Constructor */
+ public ResupplyReceivedPdu()
+ {
+ setPduType( DISPDUType.RESUPPLY_RECEIVED );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += receivingEntityID.getMarshalledSize();
+ marshalSize += supplyingEntityID.getMarshalledSize();
+ marshalSize += 1; // numberOfSupplyTypes
+ marshalSize += 1; // padding1
+ marshalSize += 2; // padding2
+ for(int idx=0; idx < supplies.size(); idx++)
+ {
+ SupplyQuantity listElement = supplies.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link ResupplyReceivedPdu#receivingEntityID}*/
+public ResupplyReceivedPdu setReceivingEntityID(EntityID pReceivingEntityID)
{
- receivingEntityID = pReceivingEntityID;
- return this;
-}
-
-/** Getter for {@link ResupplyReceivedPdu#receivingEntityID}*/
-public EntityID getReceivingEntityID()
+ receivingEntityID = pReceivingEntityID;
+ return this;
+}
+
+/** Getter for {@link ResupplyReceivedPdu#receivingEntityID}*/
+public EntityID getReceivingEntityID()
{
return receivingEntityID;
-}
-
-/** Setter for {@link ResupplyReceivedPdu#supplyingEntityID}*/
-public ResupplyReceivedPdu setSupplyingEntityID(EntityID pSupplyingEntityID)
+}
+
+/** Setter for {@link ResupplyReceivedPdu#supplyingEntityID}*/
+public ResupplyReceivedPdu setSupplyingEntityID(EntityID pSupplyingEntityID)
{
- supplyingEntityID = pSupplyingEntityID;
- return this;
-}
-
-/** Getter for {@link ResupplyReceivedPdu#supplyingEntityID}*/
-public EntityID getSupplyingEntityID()
+ supplyingEntityID = pSupplyingEntityID;
+ return this;
+}
+
+/** Getter for {@link ResupplyReceivedPdu#supplyingEntityID}*/
+public EntityID getSupplyingEntityID()
{
return supplyingEntityID;
-}
-
-/** Setter for {@link ResupplyReceivedPdu#padding1}*/
-public ResupplyReceivedPdu setPadding1(byte pPadding1)
+}
+
+/** Setter for {@link ResupplyReceivedPdu#padding1}*/
+public ResupplyReceivedPdu setPadding1(byte pPadding1)
{
- padding1 = pPadding1;
- return this;
-}
-
-/** Getter for {@link ResupplyReceivedPdu#padding1}*/
-public byte getPadding1()
+ padding1 = pPadding1;
+ return this;
+}
+
+/** Getter for {@link ResupplyReceivedPdu#padding1}*/
+public byte getPadding1()
{
return padding1;
-}
-
-/** Setter for {@link ResupplyReceivedPdu#padding2}*/
-public ResupplyReceivedPdu setPadding2(short pPadding2)
+}
+
+/** Setter for {@link ResupplyReceivedPdu#padding2}*/
+public ResupplyReceivedPdu setPadding2(short pPadding2)
{
- padding2 = pPadding2;
- return this;
-}
-
-/** Getter for {@link ResupplyReceivedPdu#padding2}*/
-public short getPadding2()
+ padding2 = pPadding2;
+ return this;
+}
+
+/** Getter for {@link ResupplyReceivedPdu#padding2}*/
+public short getPadding2()
{
return padding2;
-}
-
-/** Setter for {@link ResupplyReceivedPdu#supplies}*/
-public ResupplyReceivedPdu setSupplies(List<SupplyQuantity> pSupplies)
+}
+
+/** Setter for {@link ResupplyReceivedPdu#supplies}*/
+public ResupplyReceivedPdu setSupplies(List<SupplyQuantity> pSupplies)
{
- supplies = pSupplies;
- return this;
-}
-
-/** Getter for {@link ResupplyReceivedPdu#supplies}*/
-public List<SupplyQuantity> getSupplies()
+ supplies = pSupplies;
+ return this;
+}
+
+/** Getter for {@link ResupplyReceivedPdu#supplies}*/
+public List<SupplyQuantity> getSupplies()
{
return supplies;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- receivingEntityID.marshal(dos);
- supplyingEntityID.marshal(dos);
- dos.writeByte(supplies.size());
- dos.writeByte(padding1);
- dos.writeShort(padding2);
-
- for(int idx = 0; idx < supplies.size(); idx++)
- {
- SupplyQuantity aSupplyQuantity = supplies.get(idx);
- aSupplyQuantity.marshal(dos);
- }
-
+ {
+ receivingEntityID.marshal(dos);
+ supplyingEntityID.marshal(dos);
+ dos.writeByte(supplies.size());
+ dos.writeByte(padding1);
+ dos.writeShort(padding2);
+
+ for(int idx = 0; idx < supplies.size(); idx++)
+ {
+ SupplyQuantity aSupplyQuantity = supplies.get(idx);
+ aSupplyQuantity.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += receivingEntityID.unmarshal(dis);
- uPosition += supplyingEntityID.unmarshal(dis);
- numberOfSupplyTypes = (byte)dis.readUnsignedByte();
- uPosition += 1;
- padding1 = (byte)dis.readUnsignedByte();
- uPosition += 1;
- padding2 = (short)dis.readUnsignedShort();
- uPosition += 2;
- for(int idx = 0; idx < numberOfSupplyTypes; idx++)
- {
- SupplyQuantity anX = new SupplyQuantity();
- uPosition += anX.unmarshal(dis);
- supplies.add(anX);
- }
-
+ {
+ uPosition += receivingEntityID.unmarshal(dis);
+ uPosition += supplyingEntityID.unmarshal(dis);
+ numberOfSupplyTypes = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ padding1 = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ padding2 = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ for(int idx = 0; idx < numberOfSupplyTypes; idx++)
+ {
+ SupplyQuantity anX = new SupplyQuantity();
+ uPosition += anX.unmarshal(dis);
+ supplies.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- receivingEntityID.marshal(buff);
- supplyingEntityID.marshal(buff);
- buff.put( (byte)supplies.size());
- buff.put( (byte)padding1);
- buff.putShort( (short)padding2);
-
- for(int idx = 0; idx < supplies.size(); idx++)
- {
- SupplyQuantity aSupplyQuantity = supplies.get(idx);
- aSupplyQuantity.marshal(buff);
- }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ receivingEntityID.marshal(buff);
+ supplyingEntityID.marshal(buff);
+ buff.put( (byte)supplies.size());
+ buff.put( (byte)padding1);
+ buff.putShort( (short)padding2);
+
+ for(int idx = 0; idx < supplies.size(); idx++)
+ {
+ SupplyQuantity aSupplyQuantity = supplies.get(idx);
+ aSupplyQuantity.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- receivingEntityID.unmarshal(buff);
- supplyingEntityID.unmarshal(buff);
- numberOfSupplyTypes = (byte)(buff.get() & 0xFF);
- padding1 = (byte)(buff.get() & 0xFF);
- padding2 = (short)(buff.getShort() & 0xFFFF);
- for(int idx = 0; idx < numberOfSupplyTypes; idx++)
- {
- SupplyQuantity anX = new SupplyQuantity();
- anX.unmarshal(buff);
- supplies.add(anX);
- }
-
- return getMarshalledSize();
+
+ receivingEntityID.unmarshal(buff);
+ supplyingEntityID.unmarshal(buff);
+ numberOfSupplyTypes = (byte)(buff.get() & 0xFF);
+ padding1 = (byte)(buff.get() & 0xFF);
+ padding2 = (short)(buff.getShort() & 0xFFFF);
+ for(int idx = 0; idx < numberOfSupplyTypes; idx++)
+ {
+ SupplyQuantity anX = new SupplyQuantity();
+ anX.unmarshal(buff);
+ supplies.add(anX);
+ }
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final ResupplyReceivedPdu rhs = (ResupplyReceivedPdu)obj;
-
- if( ! (receivingEntityID.equals( rhs.receivingEntityID) )) ivarsEqual = false;
- if( ! (supplyingEntityID.equals( rhs.supplyingEntityID) )) ivarsEqual = false;
- if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
- if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
-
- for(int idx = 0; idx < supplies.size(); idx++)
- if( ! ( supplies.get(idx).equals(rhs.supplies.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final ResupplyReceivedPdu rhs = (ResupplyReceivedPdu)obj;
+
+ if( ! (receivingEntityID.equals( rhs.receivingEntityID) )) ivarsEqual = false;
+ if( ! (supplyingEntityID.equals( rhs.supplyingEntityID) )) ivarsEqual = false;
+ if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
+ if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
+
+ for(int idx = 0; idx < supplies.size(); idx++)
+ if( ! ( supplies.get(idx).equals(rhs.supplies.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" receivingEntityID: ").append(receivingEntityID).append("\n");
- sb.append(" supplyingEntityID: ").append(supplyingEntityID).append("\n");
- sb.append(" padding1: ").append(padding1).append("\n");
- sb.append(" padding2: ").append(padding2).append("\n");
- sb.append(" supplies: ").append("\n");
- supplies.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" receivingEntityID: ").append(receivingEntityID).append("\n");
+ sb.append(" supplyingEntityID: ").append(supplyingEntityID).append("\n");
+ sb.append(" padding1: ").append(padding1).append("\n");
+ sb.append(" padding2: ").append(padding2).append("\n");
+ sb.append(" supplies: ").append("\n");
+ supplies.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/SEESPdu.java b/src-generated/edu/nps/moves/dis7/SEESPdu.java
index 1988f95d9c92ec23a3ade62a975c501af5eb4cc1..79416ece8467bf955be6fcfe5fab6a1a8ad6ceed 100644
--- a/src-generated/edu/nps/moves/dis7/SEESPdu.java
+++ b/src-generated/edu/nps/moves/dis7/SEESPdu.java
@@ -1,364 +1,364 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 7.6.6 Certain supplemental information on an entity’s physical state and emissions. See 5.7.7
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class SEESPdu extends DistributedEmissionsFamilyPdu implements Serializable
-{
- /** Originating entity ID */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 7.6.6 Certain supplemental information on an entity’s physical state and emissions. See 5.7.7
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class SEESPdu extends DistributedEmissionsFamilyPdu implements Serializable
+{
+ /** Originating entity ID */
protected EntityID orginatingEntityID = new EntityID();
-
- /** IR Signature representation index */
+
+ /** IR Signature representation index */
protected short infraredSignatureRepresentationIndex;
-
- /** acoustic Signature representation index */
+
+ /** acoustic Signature representation index */
protected short acousticSignatureRepresentationIndex;
-
- /** radar cross section representation index */
+
+ /** radar cross section representation index */
protected short radarCrossSectionSignatureRepresentationIndex;
-
- /** how many propulsion systems */
+
+ /** how many propulsion systems */
protected short numberOfPropulsionSystems;
-
- /** how many vectoring nozzle systems */
+
+ /** how many vectoring nozzle systems */
protected short numberOfVectoringNozzleSystems;
-
- /** variable length list of propulsion system data */
+
+ /** variable length list of propulsion system data */
protected List< PropulsionSystemData > propulsionSystemData = new ArrayList< PropulsionSystemData >();
-
- /** variable length list of vectoring system data */
+
+ /** variable length list of vectoring system data */
protected List< VectoringNozzleSystem > vectoringSystemData = new ArrayList< VectoringNozzleSystem >();
-
-
-/** Constructor */
- public SEESPdu()
- {
- setPduType( DISPDUType.SUPPLEMENTAL_EMISSION_ENTITY_STATE );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public SEESPdu()
+ {
+ setPduType( DISPDUType.SUPPLEMENTAL_EMISSION_ENTITY_STATE );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += orginatingEntityID.getMarshalledSize();
+ marshalSize += 2; // infraredSignatureRepresentationIndex
+ marshalSize += 2; // acousticSignatureRepresentationIndex
+ marshalSize += 2; // radarCrossSectionSignatureRepresentationIndex
+ marshalSize += 2; // numberOfPropulsionSystems
+ marshalSize += 2; // numberOfVectoringNozzleSystems
+ for(int idx=0; idx < propulsionSystemData.size(); idx++)
+ {
+ PropulsionSystemData listElement = propulsionSystemData.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+ for(int idx=0; idx < vectoringSystemData.size(); idx++)
+ {
+ VectoringNozzleSystem listElement = vectoringSystemData.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link SEESPdu#orginatingEntityID}*/
+public SEESPdu setOrginatingEntityID(EntityID pOrginatingEntityID)
{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += orginatingEntityID.getMarshalledSize();
- marshalSize += 2; // infraredSignatureRepresentationIndex
- marshalSize += 2; // acousticSignatureRepresentationIndex
- marshalSize += 2; // radarCrossSectionSignatureRepresentationIndex
- marshalSize += 2; // numberOfPropulsionSystems
- marshalSize += 2; // numberOfVectoringNozzleSystems
- for(int idx=0; idx < propulsionSystemData.size(); idx++)
- {
- PropulsionSystemData listElement = propulsionSystemData.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
- for(int idx=0; idx < vectoringSystemData.size(); idx++)
- {
- VectoringNozzleSystem listElement = vectoringSystemData.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link SEESPdu#orginatingEntityID}*/
-public SEESPdu setOrginatingEntityID(EntityID pOrginatingEntityID)
-{
- orginatingEntityID = pOrginatingEntityID;
- return this;
-}
-
-/** Getter for {@link SEESPdu#orginatingEntityID}*/
-public EntityID getOrginatingEntityID()
+ orginatingEntityID = pOrginatingEntityID;
+ return this;
+}
+
+/** Getter for {@link SEESPdu#orginatingEntityID}*/
+public EntityID getOrginatingEntityID()
{
return orginatingEntityID;
-}
-
-/** Setter for {@link SEESPdu#infraredSignatureRepresentationIndex}*/
-public SEESPdu setInfraredSignatureRepresentationIndex(short pInfraredSignatureRepresentationIndex)
+}
+
+/** Setter for {@link SEESPdu#infraredSignatureRepresentationIndex}*/
+public SEESPdu setInfraredSignatureRepresentationIndex(short pInfraredSignatureRepresentationIndex)
{
- infraredSignatureRepresentationIndex = pInfraredSignatureRepresentationIndex;
- return this;
-}
-
-/** Getter for {@link SEESPdu#infraredSignatureRepresentationIndex}*/
-public short getInfraredSignatureRepresentationIndex()
+ infraredSignatureRepresentationIndex = pInfraredSignatureRepresentationIndex;
+ return this;
+}
+
+/** Getter for {@link SEESPdu#infraredSignatureRepresentationIndex}*/
+public short getInfraredSignatureRepresentationIndex()
{
return infraredSignatureRepresentationIndex;
-}
-
-/** Setter for {@link SEESPdu#acousticSignatureRepresentationIndex}*/
-public SEESPdu setAcousticSignatureRepresentationIndex(short pAcousticSignatureRepresentationIndex)
+}
+
+/** Setter for {@link SEESPdu#acousticSignatureRepresentationIndex}*/
+public SEESPdu setAcousticSignatureRepresentationIndex(short pAcousticSignatureRepresentationIndex)
{
- acousticSignatureRepresentationIndex = pAcousticSignatureRepresentationIndex;
- return this;
-}
-
-/** Getter for {@link SEESPdu#acousticSignatureRepresentationIndex}*/
-public short getAcousticSignatureRepresentationIndex()
+ acousticSignatureRepresentationIndex = pAcousticSignatureRepresentationIndex;
+ return this;
+}
+
+/** Getter for {@link SEESPdu#acousticSignatureRepresentationIndex}*/
+public short getAcousticSignatureRepresentationIndex()
{
return acousticSignatureRepresentationIndex;
-}
-
-/** Setter for {@link SEESPdu#radarCrossSectionSignatureRepresentationIndex}*/
-public SEESPdu setRadarCrossSectionSignatureRepresentationIndex(short pRadarCrossSectionSignatureRepresentationIndex)
+}
+
+/** Setter for {@link SEESPdu#radarCrossSectionSignatureRepresentationIndex}*/
+public SEESPdu setRadarCrossSectionSignatureRepresentationIndex(short pRadarCrossSectionSignatureRepresentationIndex)
{
- radarCrossSectionSignatureRepresentationIndex = pRadarCrossSectionSignatureRepresentationIndex;
- return this;
-}
-
-/** Getter for {@link SEESPdu#radarCrossSectionSignatureRepresentationIndex}*/
-public short getRadarCrossSectionSignatureRepresentationIndex()
+ radarCrossSectionSignatureRepresentationIndex = pRadarCrossSectionSignatureRepresentationIndex;
+ return this;
+}
+
+/** Getter for {@link SEESPdu#radarCrossSectionSignatureRepresentationIndex}*/
+public short getRadarCrossSectionSignatureRepresentationIndex()
{
return radarCrossSectionSignatureRepresentationIndex;
-}
-
-/** Setter for {@link SEESPdu#propulsionSystemData}*/
-public SEESPdu setPropulsionSystemData(List<PropulsionSystemData> pPropulsionSystemData)
+}
+
+/** Setter for {@link SEESPdu#propulsionSystemData}*/
+public SEESPdu setPropulsionSystemData(List<PropulsionSystemData> pPropulsionSystemData)
{
- propulsionSystemData = pPropulsionSystemData;
- return this;
-}
-
-/** Getter for {@link SEESPdu#propulsionSystemData}*/
-public List<PropulsionSystemData> getPropulsionSystemData()
+ propulsionSystemData = pPropulsionSystemData;
+ return this;
+}
+
+/** Getter for {@link SEESPdu#propulsionSystemData}*/
+public List<PropulsionSystemData> getPropulsionSystemData()
{
return propulsionSystemData;
-}
-
-/** Setter for {@link SEESPdu#vectoringSystemData}*/
-public SEESPdu setVectoringSystemData(List<VectoringNozzleSystem> pVectoringSystemData)
+}
+
+/** Setter for {@link SEESPdu#vectoringSystemData}*/
+public SEESPdu setVectoringSystemData(List<VectoringNozzleSystem> pVectoringSystemData)
{
- vectoringSystemData = pVectoringSystemData;
- return this;
-}
-
-/** Getter for {@link SEESPdu#vectoringSystemData}*/
-public List<VectoringNozzleSystem> getVectoringSystemData()
+ vectoringSystemData = pVectoringSystemData;
+ return this;
+}
+
+/** Getter for {@link SEESPdu#vectoringSystemData}*/
+public List<VectoringNozzleSystem> getVectoringSystemData()
{
return vectoringSystemData;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- orginatingEntityID.marshal(dos);
- dos.writeShort(infraredSignatureRepresentationIndex);
- dos.writeShort(acousticSignatureRepresentationIndex);
- dos.writeShort(radarCrossSectionSignatureRepresentationIndex);
- dos.writeShort(propulsionSystemData.size());
- dos.writeShort(vectoringSystemData.size());
-
- for(int idx = 0; idx < propulsionSystemData.size(); idx++)
- {
- PropulsionSystemData aPropulsionSystemData = propulsionSystemData.get(idx);
- aPropulsionSystemData.marshal(dos);
- }
-
-
- for(int idx = 0; idx < vectoringSystemData.size(); idx++)
- {
- VectoringNozzleSystem aVectoringNozzleSystem = vectoringSystemData.get(idx);
- aVectoringNozzleSystem.marshal(dos);
- }
-
+ {
+ orginatingEntityID.marshal(dos);
+ dos.writeShort(infraredSignatureRepresentationIndex);
+ dos.writeShort(acousticSignatureRepresentationIndex);
+ dos.writeShort(radarCrossSectionSignatureRepresentationIndex);
+ dos.writeShort(propulsionSystemData.size());
+ dos.writeShort(vectoringSystemData.size());
+
+ for(int idx = 0; idx < propulsionSystemData.size(); idx++)
+ {
+ PropulsionSystemData aPropulsionSystemData = propulsionSystemData.get(idx);
+ aPropulsionSystemData.marshal(dos);
+ }
+
+
+ for(int idx = 0; idx < vectoringSystemData.size(); idx++)
+ {
+ VectoringNozzleSystem aVectoringNozzleSystem = vectoringSystemData.get(idx);
+ aVectoringNozzleSystem.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += orginatingEntityID.unmarshal(dis);
- infraredSignatureRepresentationIndex = (short)dis.readUnsignedShort();
- uPosition += 2;
- acousticSignatureRepresentationIndex = (short)dis.readUnsignedShort();
- uPosition += 2;
- radarCrossSectionSignatureRepresentationIndex = (short)dis.readUnsignedShort();
- uPosition += 2;
- numberOfPropulsionSystems = (short)dis.readUnsignedShort();
- uPosition += 2;
- numberOfVectoringNozzleSystems = (short)dis.readUnsignedShort();
- uPosition += 2;
- for(int idx = 0; idx < numberOfPropulsionSystems; idx++)
- {
- PropulsionSystemData anX = new PropulsionSystemData();
- uPosition += anX.unmarshal(dis);
- propulsionSystemData.add(anX);
- }
-
- for(int idx = 0; idx < numberOfVectoringNozzleSystems; idx++)
- {
- VectoringNozzleSystem anX = new VectoringNozzleSystem();
- uPosition += anX.unmarshal(dis);
- vectoringSystemData.add(anX);
- }
-
+ {
+ uPosition += orginatingEntityID.unmarshal(dis);
+ infraredSignatureRepresentationIndex = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ acousticSignatureRepresentationIndex = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ radarCrossSectionSignatureRepresentationIndex = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ numberOfPropulsionSystems = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ numberOfVectoringNozzleSystems = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ for(int idx = 0; idx < numberOfPropulsionSystems; idx++)
+ {
+ PropulsionSystemData anX = new PropulsionSystemData();
+ uPosition += anX.unmarshal(dis);
+ propulsionSystemData.add(anX);
+ }
+
+ for(int idx = 0; idx < numberOfVectoringNozzleSystems; idx++)
+ {
+ VectoringNozzleSystem anX = new VectoringNozzleSystem();
+ uPosition += anX.unmarshal(dis);
+ vectoringSystemData.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- orginatingEntityID.marshal(buff);
- buff.putShort( (short)infraredSignatureRepresentationIndex);
- buff.putShort( (short)acousticSignatureRepresentationIndex);
- buff.putShort( (short)radarCrossSectionSignatureRepresentationIndex);
- buff.putShort( (short)propulsionSystemData.size());
- buff.putShort( (short)vectoringSystemData.size());
-
- for(int idx = 0; idx < propulsionSystemData.size(); idx++)
- {
- PropulsionSystemData aPropulsionSystemData = propulsionSystemData.get(idx);
- aPropulsionSystemData.marshal(buff);
- }
-
-
- for(int idx = 0; idx < vectoringSystemData.size(); idx++)
- {
- VectoringNozzleSystem aVectoringNozzleSystem = vectoringSystemData.get(idx);
- aVectoringNozzleSystem.marshal(buff);
- }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ orginatingEntityID.marshal(buff);
+ buff.putShort( (short)infraredSignatureRepresentationIndex);
+ buff.putShort( (short)acousticSignatureRepresentationIndex);
+ buff.putShort( (short)radarCrossSectionSignatureRepresentationIndex);
+ buff.putShort( (short)propulsionSystemData.size());
+ buff.putShort( (short)vectoringSystemData.size());
+
+ for(int idx = 0; idx < propulsionSystemData.size(); idx++)
+ {
+ PropulsionSystemData aPropulsionSystemData = propulsionSystemData.get(idx);
+ aPropulsionSystemData.marshal(buff);
+ }
+
+
+ for(int idx = 0; idx < vectoringSystemData.size(); idx++)
+ {
+ VectoringNozzleSystem aVectoringNozzleSystem = vectoringSystemData.get(idx);
+ aVectoringNozzleSystem.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- orginatingEntityID.unmarshal(buff);
- infraredSignatureRepresentationIndex = (short)(buff.getShort() & 0xFFFF);
- acousticSignatureRepresentationIndex = (short)(buff.getShort() & 0xFFFF);
- radarCrossSectionSignatureRepresentationIndex = (short)(buff.getShort() & 0xFFFF);
- numberOfPropulsionSystems = (short)(buff.getShort() & 0xFFFF);
- numberOfVectoringNozzleSystems = (short)(buff.getShort() & 0xFFFF);
- for(int idx = 0; idx < numberOfPropulsionSystems; idx++)
- {
- PropulsionSystemData anX = new PropulsionSystemData();
- anX.unmarshal(buff);
- propulsionSystemData.add(anX);
- }
-
- for(int idx = 0; idx < numberOfVectoringNozzleSystems; idx++)
- {
- VectoringNozzleSystem anX = new VectoringNozzleSystem();
- anX.unmarshal(buff);
- vectoringSystemData.add(anX);
- }
-
- return getMarshalledSize();
+
+ orginatingEntityID.unmarshal(buff);
+ infraredSignatureRepresentationIndex = (short)(buff.getShort() & 0xFFFF);
+ acousticSignatureRepresentationIndex = (short)(buff.getShort() & 0xFFFF);
+ radarCrossSectionSignatureRepresentationIndex = (short)(buff.getShort() & 0xFFFF);
+ numberOfPropulsionSystems = (short)(buff.getShort() & 0xFFFF);
+ numberOfVectoringNozzleSystems = (short)(buff.getShort() & 0xFFFF);
+ for(int idx = 0; idx < numberOfPropulsionSystems; idx++)
+ {
+ PropulsionSystemData anX = new PropulsionSystemData();
+ anX.unmarshal(buff);
+ propulsionSystemData.add(anX);
+ }
+
+ for(int idx = 0; idx < numberOfVectoringNozzleSystems; idx++)
+ {
+ VectoringNozzleSystem anX = new VectoringNozzleSystem();
+ anX.unmarshal(buff);
+ vectoringSystemData.add(anX);
+ }
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final SEESPdu rhs = (SEESPdu)obj;
-
- if( ! (orginatingEntityID.equals( rhs.orginatingEntityID) )) ivarsEqual = false;
- if( ! (infraredSignatureRepresentationIndex == rhs.infraredSignatureRepresentationIndex)) ivarsEqual = false;
- if( ! (acousticSignatureRepresentationIndex == rhs.acousticSignatureRepresentationIndex)) ivarsEqual = false;
- if( ! (radarCrossSectionSignatureRepresentationIndex == rhs.radarCrossSectionSignatureRepresentationIndex)) ivarsEqual = false;
-
- for(int idx = 0; idx < propulsionSystemData.size(); idx++)
- if( ! ( propulsionSystemData.get(idx).equals(rhs.propulsionSystemData.get(idx)))) ivarsEqual = false;
-
-
- for(int idx = 0; idx < vectoringSystemData.size(); idx++)
- if( ! ( vectoringSystemData.get(idx).equals(rhs.vectoringSystemData.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final SEESPdu rhs = (SEESPdu)obj;
+
+ if( ! (orginatingEntityID.equals( rhs.orginatingEntityID) )) ivarsEqual = false;
+ if( ! (infraredSignatureRepresentationIndex == rhs.infraredSignatureRepresentationIndex)) ivarsEqual = false;
+ if( ! (acousticSignatureRepresentationIndex == rhs.acousticSignatureRepresentationIndex)) ivarsEqual = false;
+ if( ! (radarCrossSectionSignatureRepresentationIndex == rhs.radarCrossSectionSignatureRepresentationIndex)) ivarsEqual = false;
+
+ for(int idx = 0; idx < propulsionSystemData.size(); idx++)
+ if( ! ( propulsionSystemData.get(idx).equals(rhs.propulsionSystemData.get(idx)))) ivarsEqual = false;
+
+
+ for(int idx = 0; idx < vectoringSystemData.size(); idx++)
+ if( ! ( vectoringSystemData.get(idx).equals(rhs.vectoringSystemData.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" orginatingEntityID: ").append(orginatingEntityID).append("\n");
- sb.append(" infraredSignatureRepresentationIndex: ").append(infraredSignatureRepresentationIndex).append("\n");
- sb.append(" acousticSignatureRepresentationIndex: ").append(acousticSignatureRepresentationIndex).append("\n");
- sb.append(" radarCrossSectionSignatureRepresentationIndex: ").append(radarCrossSectionSignatureRepresentationIndex).append("\n");
- sb.append(" propulsionSystemData: ").append("\n");
- propulsionSystemData.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
- sb.append(" vectoringSystemData: ").append("\n");
- vectoringSystemData.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" orginatingEntityID: ").append(orginatingEntityID).append("\n");
+ sb.append(" infraredSignatureRepresentationIndex: ").append(infraredSignatureRepresentationIndex).append("\n");
+ sb.append(" acousticSignatureRepresentationIndex: ").append(acousticSignatureRepresentationIndex).append("\n");
+ sb.append(" radarCrossSectionSignatureRepresentationIndex: ").append(radarCrossSectionSignatureRepresentationIndex).append("\n");
+ sb.append(" propulsionSystemData: ").append("\n");
+ propulsionSystemData.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+ sb.append(" vectoringSystemData: ").append("\n");
+ vectoringSystemData.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/SecondaryOperationalData.java b/src-generated/edu/nps/moves/dis7/SecondaryOperationalData.java
index 7795185ef72f8dc20201da4e85373f67f541d333..c06b68ca656fc5b58a7c4ee7809febf52389d59c 100644
--- a/src-generated/edu/nps/moves/dis7/SecondaryOperationalData.java
+++ b/src-generated/edu/nps/moves/dis7/SecondaryOperationalData.java
@@ -1,210 +1,210 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Additional operational data for an IFF emitting system and the number of IFF Fundamental Parameter Data records Section 6.2.76.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class SecondaryOperationalData extends Object implements Serializable
-{
- /** additional operational characteristics of the IFF emitting system. Each 8-bit field will vary depending on the system type. */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Additional operational data for an IFF emitting system and the number of IFF Fundamental Parameter Data records Section 6.2.76.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class SecondaryOperationalData extends Object implements Serializable
+{
+ /** additional operational characteristics of the IFF emitting system. Each 8-bit field will vary depending on the system type. */
protected byte operationalData1;
-
- /** additional operational characteristics of the IFF emitting system. Each 8-bit field will vary depending on the system type. */
+
+ /** additional operational characteristics of the IFF emitting system. Each 8-bit field will vary depending on the system type. */
protected byte operationalData2;
-
- /** the number of IFF Fundamental Parameter Data records that follow */
+
+ /** the number of IFF Fundamental Parameter Data records that follow */
protected short numberOfIFFFundamentalParameterRecords;
-
-
-/** Constructor */
- public SecondaryOperationalData()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += 1; // operationalData1
- marshalSize += 1; // operationalData2
- marshalSize += 2; // numberOfIFFFundamentalParameterRecords
-
- return marshalSize;
-}
-
-
-/** Setter for {@link SecondaryOperationalData#operationalData1}*/
-public SecondaryOperationalData setOperationalData1(byte pOperationalData1)
+
+
+/** Constructor */
+ public SecondaryOperationalData()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 1; // operationalData1
+ marshalSize += 1; // operationalData2
+ marshalSize += 2; // numberOfIFFFundamentalParameterRecords
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link SecondaryOperationalData#operationalData1}*/
+public SecondaryOperationalData setOperationalData1(byte pOperationalData1)
{
- operationalData1 = pOperationalData1;
- return this;
-}
-
-/** Getter for {@link SecondaryOperationalData#operationalData1}*/
-public byte getOperationalData1()
+ operationalData1 = pOperationalData1;
+ return this;
+}
+
+/** Getter for {@link SecondaryOperationalData#operationalData1}*/
+public byte getOperationalData1()
{
return operationalData1;
-}
-
-/** Setter for {@link SecondaryOperationalData#operationalData2}*/
-public SecondaryOperationalData setOperationalData2(byte pOperationalData2)
+}
+
+/** Setter for {@link SecondaryOperationalData#operationalData2}*/
+public SecondaryOperationalData setOperationalData2(byte pOperationalData2)
{
- operationalData2 = pOperationalData2;
- return this;
-}
-
-/** Getter for {@link SecondaryOperationalData#operationalData2}*/
-public byte getOperationalData2()
+ operationalData2 = pOperationalData2;
+ return this;
+}
+
+/** Getter for {@link SecondaryOperationalData#operationalData2}*/
+public byte getOperationalData2()
{
return operationalData2;
-}
-
-/** Setter for {@link SecondaryOperationalData#numberOfIFFFundamentalParameterRecords}*/
-public SecondaryOperationalData setNumberOfIFFFundamentalParameterRecords(short pNumberOfIFFFundamentalParameterRecords)
+}
+
+/** Setter for {@link SecondaryOperationalData#numberOfIFFFundamentalParameterRecords}*/
+public SecondaryOperationalData setNumberOfIFFFundamentalParameterRecords(short pNumberOfIFFFundamentalParameterRecords)
{
- numberOfIFFFundamentalParameterRecords = pNumberOfIFFFundamentalParameterRecords;
- return this;
-}
-
-/** Getter for {@link SecondaryOperationalData#numberOfIFFFundamentalParameterRecords}*/
-public short getNumberOfIFFFundamentalParameterRecords()
+ numberOfIFFFundamentalParameterRecords = pNumberOfIFFFundamentalParameterRecords;
+ return this;
+}
+
+/** Getter for {@link SecondaryOperationalData#numberOfIFFFundamentalParameterRecords}*/
+public short getNumberOfIFFFundamentalParameterRecords()
{
return numberOfIFFFundamentalParameterRecords;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeByte(operationalData1);
- dos.writeByte(operationalData2);
- dos.writeShort(numberOfIFFFundamentalParameterRecords);
+ {
+ dos.writeByte(operationalData1);
+ dos.writeByte(operationalData2);
+ dos.writeShort(numberOfIFFFundamentalParameterRecords);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- operationalData1 = (byte)dis.readUnsignedByte();
- uPosition += 1;
- operationalData2 = (byte)dis.readUnsignedByte();
- uPosition += 1;
- numberOfIFFFundamentalParameterRecords = (short)dis.readUnsignedShort();
- uPosition += 2;
+ {
+ operationalData1 = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ operationalData2 = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ numberOfIFFFundamentalParameterRecords = (short)dis.readUnsignedShort();
+ uPosition += 2;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.put( (byte)operationalData1);
- buff.put( (byte)operationalData2);
- buff.putShort( (short)numberOfIFFFundamentalParameterRecords);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- operationalData1 = (byte)(buff.get() & 0xFF);
- operationalData2 = (byte)(buff.get() & 0xFF);
- numberOfIFFFundamentalParameterRecords = (short)(buff.getShort() & 0xFFFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.put( (byte)operationalData1);
+ buff.put( (byte)operationalData2);
+ buff.putShort( (short)numberOfIFFFundamentalParameterRecords);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ operationalData1 = (byte)(buff.get() & 0xFF);
+ operationalData2 = (byte)(buff.get() & 0xFF);
+ numberOfIFFFundamentalParameterRecords = (short)(buff.getShort() & 0xFFFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final SecondaryOperationalData rhs = (SecondaryOperationalData)obj;
-
- if( ! (operationalData1 == rhs.operationalData1)) ivarsEqual = false;
- if( ! (operationalData2 == rhs.operationalData2)) ivarsEqual = false;
- if( ! (numberOfIFFFundamentalParameterRecords == rhs.numberOfIFFFundamentalParameterRecords)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final SecondaryOperationalData rhs = (SecondaryOperationalData)obj;
+
+ if( ! (operationalData1 == rhs.operationalData1)) ivarsEqual = false;
+ if( ! (operationalData2 == rhs.operationalData2)) ivarsEqual = false;
+ if( ! (numberOfIFFFundamentalParameterRecords == rhs.numberOfIFFFundamentalParameterRecords)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" operationalData1: ").append(operationalData1).append("\n");
- sb.append(" operationalData2: ").append(operationalData2).append("\n");
- sb.append(" numberOfIFFFundamentalParameterRecords: ").append(numberOfIFFFundamentalParameterRecords).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" operationalData1: ").append(operationalData1).append("\n");
+ sb.append(" operationalData2: ").append(operationalData2).append("\n");
+ sb.append(" numberOfIFFFundamentalParameterRecords: ").append(numberOfIFFFundamentalParameterRecords).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/Sensor.java b/src-generated/edu/nps/moves/dis7/Sensor.java
index 8c66b42e6500572a8627fb32f09468119f7e1cd7..7afe7c90017d7f514ec9a0b5777f1b66a74e0f3e 100644
--- a/src-generated/edu/nps/moves/dis7/Sensor.java
+++ b/src-generated/edu/nps/moves/dis7/Sensor.java
@@ -1,282 +1,282 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * An entity's sensor information. Section 6.2.77.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class Sensor extends Object implements Serializable
-{
- /** the source of the Sensor Type field uid 414 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * An entity's sensor information. Section 6.2.77.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class Sensor extends Object implements Serializable
+{
+ /** the source of the Sensor Type field uid 414 */
protected SensorTypeSource sensorTypeSource = SensorTypeSource.values()[0];
-
- /** the on/off status of the sensor uid 331 */
+
+ /** the on/off status of the sensor uid 331 */
protected SensorOnOffStatus sensorOnOffStatus = SensorOnOffStatus.values()[0];
-
- /** for Source 'other':SensorRecordOtherActiveSensors/325,'em':EmitterName/75,'passive':SensorRecordSensorTypePassiveSensors/326,'mine':6.2.57,'ua':UAAcousticSystemName/144,'lasers':DesignatorSystemName/80 */
+
+ /** for Source 'other':SensorRecordOtherActiveSensors/325,'em':EmitterName/75,'passive':SensorRecordSensorTypePassiveSensors/326,'mine':6.2.57,'ua':UAAcousticSystemName/144,'lasers':DesignatorSystemName/80 */
protected short sensorType;
-
- /** the station to which the sensor is assigned. A zero value shall indi- cate that this Sensor record is not associated with any particular station and represents the total quan- tity of this sensor for this entity. If this field is non-zero, it shall either reference an attached part or an articulated part */
+
+ /** the station to which the sensor is assigned. A zero value shall indi- cate that this Sensor record is not associated with any particular station and represents the total quan- tity of this sensor for this entity. If this field is non-zero, it shall either reference an attached part or an articulated part */
protected int station;
-
- /** quantity of the sensor */
+
+ /** quantity of the sensor */
protected short quantity;
-
- /** padding */
+
+ /** padding */
protected short padding = (short)0;
-
-
-/** Constructor */
- public Sensor()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += sensorTypeSource.getMarshalledSize();
- marshalSize += sensorOnOffStatus.getMarshalledSize();
- marshalSize += 2; // sensorType
- marshalSize += 4; // station
- marshalSize += 2; // quantity
- marshalSize += 2; // padding
-
- return marshalSize;
-}
-
-
-/** Setter for {@link Sensor#sensorTypeSource}*/
-public Sensor setSensorTypeSource(SensorTypeSource pSensorTypeSource)
+
+
+/** Constructor */
+ public Sensor()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += sensorTypeSource.getMarshalledSize();
+ marshalSize += sensorOnOffStatus.getMarshalledSize();
+ marshalSize += 2; // sensorType
+ marshalSize += 4; // station
+ marshalSize += 2; // quantity
+ marshalSize += 2; // padding
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link Sensor#sensorTypeSource}*/
+public Sensor setSensorTypeSource(SensorTypeSource pSensorTypeSource)
{
- sensorTypeSource = pSensorTypeSource;
- return this;
-}
-
-/** Getter for {@link Sensor#sensorTypeSource}*/
-public SensorTypeSource getSensorTypeSource()
+ sensorTypeSource = pSensorTypeSource;
+ return this;
+}
+
+/** Getter for {@link Sensor#sensorTypeSource}*/
+public SensorTypeSource getSensorTypeSource()
{
return sensorTypeSource;
-}
-
-/** Setter for {@link Sensor#sensorOnOffStatus}*/
-public Sensor setSensorOnOffStatus(SensorOnOffStatus pSensorOnOffStatus)
+}
+
+/** Setter for {@link Sensor#sensorOnOffStatus}*/
+public Sensor setSensorOnOffStatus(SensorOnOffStatus pSensorOnOffStatus)
{
- sensorOnOffStatus = pSensorOnOffStatus;
- return this;
-}
-
-/** Getter for {@link Sensor#sensorOnOffStatus}*/
-public SensorOnOffStatus getSensorOnOffStatus()
+ sensorOnOffStatus = pSensorOnOffStatus;
+ return this;
+}
+
+/** Getter for {@link Sensor#sensorOnOffStatus}*/
+public SensorOnOffStatus getSensorOnOffStatus()
{
return sensorOnOffStatus;
-}
-
-/** Setter for {@link Sensor#sensorType}*/
-public Sensor setSensorType(short pSensorType)
+}
+
+/** Setter for {@link Sensor#sensorType}*/
+public Sensor setSensorType(short pSensorType)
{
- sensorType = pSensorType;
- return this;
-}
-
-/** Getter for {@link Sensor#sensorType}*/
-public short getSensorType()
+ sensorType = pSensorType;
+ return this;
+}
+
+/** Getter for {@link Sensor#sensorType}*/
+public short getSensorType()
{
return sensorType;
-}
-
-/** Setter for {@link Sensor#station}*/
-public Sensor setStation(int pStation)
+}
+
+/** Setter for {@link Sensor#station}*/
+public Sensor setStation(int pStation)
{
- station = pStation;
- return this;
-}
-
-/** Getter for {@link Sensor#station}*/
-public int getStation()
+ station = pStation;
+ return this;
+}
+
+/** Getter for {@link Sensor#station}*/
+public int getStation()
{
return station;
-}
-
-/** Setter for {@link Sensor#quantity}*/
-public Sensor setQuantity(short pQuantity)
+}
+
+/** Setter for {@link Sensor#quantity}*/
+public Sensor setQuantity(short pQuantity)
{
- quantity = pQuantity;
- return this;
-}
-
-/** Getter for {@link Sensor#quantity}*/
-public short getQuantity()
+ quantity = pQuantity;
+ return this;
+}
+
+/** Getter for {@link Sensor#quantity}*/
+public short getQuantity()
{
return quantity;
-}
-
-/** Setter for {@link Sensor#padding}*/
-public Sensor setPadding(short pPadding)
+}
+
+/** Setter for {@link Sensor#padding}*/
+public Sensor setPadding(short pPadding)
{
- padding = pPadding;
- return this;
-}
-
-/** Getter for {@link Sensor#padding}*/
-public short getPadding()
+ padding = pPadding;
+ return this;
+}
+
+/** Getter for {@link Sensor#padding}*/
+public short getPadding()
{
return padding;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- sensorTypeSource.marshal(dos);
- sensorOnOffStatus.marshal(dos);
- dos.writeShort(sensorType);
- dos.writeInt(station);
- dos.writeShort(quantity);
- dos.writeShort(padding);
+ {
+ sensorTypeSource.marshal(dos);
+ sensorOnOffStatus.marshal(dos);
+ dos.writeShort(sensorType);
+ dos.writeInt(station);
+ dos.writeShort(quantity);
+ dos.writeShort(padding);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- sensorTypeSource = SensorTypeSource.unmarshalEnum(dis);
- uPosition += sensorTypeSource.getMarshalledSize();
- sensorOnOffStatus = SensorOnOffStatus.unmarshalEnum(dis);
- uPosition += sensorOnOffStatus.getMarshalledSize();
- sensorType = (short)dis.readUnsignedShort();
- uPosition += 2;
- station = dis.readInt();
- uPosition += 4;
- quantity = (short)dis.readUnsignedShort();
- uPosition += 2;
- padding = (short)dis.readUnsignedShort();
- uPosition += 2;
+ {
+ sensorTypeSource = SensorTypeSource.unmarshalEnum(dis);
+ uPosition += sensorTypeSource.getMarshalledSize();
+ sensorOnOffStatus = SensorOnOffStatus.unmarshalEnum(dis);
+ uPosition += sensorOnOffStatus.getMarshalledSize();
+ sensorType = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ station = dis.readInt();
+ uPosition += 4;
+ quantity = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ padding = (short)dis.readUnsignedShort();
+ uPosition += 2;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- sensorTypeSource.marshal(buff);
- sensorOnOffStatus.marshal(buff);
- buff.putShort( (short)sensorType);
- buff.putInt( (int)station);
- buff.putShort( (short)quantity);
- buff.putShort( (short)padding);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- sensorTypeSource = SensorTypeSource.unmarshalEnum(buff);
- sensorOnOffStatus = SensorOnOffStatus.unmarshalEnum(buff);
- sensorType = (short)(buff.getShort() & 0xFFFF);
- station = buff.getInt();
- quantity = (short)(buff.getShort() & 0xFFFF);
- padding = (short)(buff.getShort() & 0xFFFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ sensorTypeSource.marshal(buff);
+ sensorOnOffStatus.marshal(buff);
+ buff.putShort( (short)sensorType);
+ buff.putInt( (int)station);
+ buff.putShort( (short)quantity);
+ buff.putShort( (short)padding);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ sensorTypeSource = SensorTypeSource.unmarshalEnum(buff);
+ sensorOnOffStatus = SensorOnOffStatus.unmarshalEnum(buff);
+ sensorType = (short)(buff.getShort() & 0xFFFF);
+ station = buff.getInt();
+ quantity = (short)(buff.getShort() & 0xFFFF);
+ padding = (short)(buff.getShort() & 0xFFFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final Sensor rhs = (Sensor)obj;
-
- if( ! (sensorTypeSource == rhs.sensorTypeSource)) ivarsEqual = false;
- if( ! (sensorOnOffStatus == rhs.sensorOnOffStatus)) ivarsEqual = false;
- if( ! (sensorType == rhs.sensorType)) ivarsEqual = false;
- if( ! (station == rhs.station)) ivarsEqual = false;
- if( ! (quantity == rhs.quantity)) ivarsEqual = false;
- if( ! (padding == rhs.padding)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final Sensor rhs = (Sensor)obj;
+
+ if( ! (sensorTypeSource == rhs.sensorTypeSource)) ivarsEqual = false;
+ if( ! (sensorOnOffStatus == rhs.sensorOnOffStatus)) ivarsEqual = false;
+ if( ! (sensorType == rhs.sensorType)) ivarsEqual = false;
+ if( ! (station == rhs.station)) ivarsEqual = false;
+ if( ! (quantity == rhs.quantity)) ivarsEqual = false;
+ if( ! (padding == rhs.padding)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" sensorTypeSource: ").append(sensorTypeSource).append("\n");
- sb.append(" sensorOnOffStatus: ").append(sensorOnOffStatus).append("\n");
- sb.append(" sensorType: ").append(sensorType).append("\n");
- sb.append(" station: ").append(station).append("\n");
- sb.append(" quantity: ").append(quantity).append("\n");
- sb.append(" padding: ").append(padding).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" sensorTypeSource: ").append(sensorTypeSource).append("\n");
+ sb.append(" sensorOnOffStatus: ").append(sensorOnOffStatus).append("\n");
+ sb.append(" sensorType: ").append(sensorType).append("\n");
+ sb.append(" station: ").append(station).append("\n");
+ sb.append(" quantity: ").append(quantity).append("\n");
+ sb.append(" padding: ").append(padding).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/SeparationVP.java b/src-generated/edu/nps/moves/dis7/SeparationVP.java
index 1c810e2be06c179bf2072683a082306e6ff05fae..3acff5c47f7f4373ec6ae2cb2e92667518de279c 100644
--- a/src-generated/edu/nps/moves/dis7/SeparationVP.java
+++ b/src-generated/edu/nps/moves/dis7/SeparationVP.java
@@ -1,304 +1,304 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Physical separation of an entity from another entity. Section 6.2.94.6
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class SeparationVP extends Object implements Serializable
-{
- /** the identification of the Variable Parameter record. Enumeration from EBV uid 56 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Physical separation of an entity from another entity. Section 6.2.94.6
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class SeparationVP extends Object implements Serializable
+{
+ /** the identification of the Variable Parameter record. Enumeration from EBV uid 56 */
protected VariableParameterRecordType recordType = VariableParameterRecordType.SEPARATION;
-
- /** Reason for separation. EBV uid 282 */
+
+ /** Reason for separation. EBV uid 282 */
protected SeparationVPReasonforSeparation reasonForSeparation = SeparationVPReasonforSeparation.values()[0];
-
- /** Whether the entity existed prior to separation EBV uid 283 */
+
+ /** Whether the entity existed prior to separation EBV uid 283 */
protected SeparationVPPreEntityIndicator preEntityIndicator = SeparationVPPreEntityIndicator.values()[0];
-
- /** padding */
+
+ /** padding */
protected byte padding1 = (byte)0;
-
- /** ID of parent */
+
+ /** ID of parent */
protected EntityID parentEntityID = new EntityID();
-
- /** padding */
+
+ /** padding */
protected short padding2 = (short)0;
-
- /** Station separated from */
+
+ /** Station separated from */
protected NamedLocationIdentification stationLocation = new NamedLocationIdentification();
-
-
-/** Constructor */
- public SeparationVP()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += recordType.getMarshalledSize();
- marshalSize += reasonForSeparation.getMarshalledSize();
- marshalSize += preEntityIndicator.getMarshalledSize();
- marshalSize += 1; // padding1
- marshalSize += parentEntityID.getMarshalledSize();
- marshalSize += 2; // padding2
- marshalSize += stationLocation.getMarshalledSize();
-
- return marshalSize;
-}
-
-
-/** Setter for {@link SeparationVP#recordType}*/
-public SeparationVP setRecordType(VariableParameterRecordType pRecordType)
+
+
+/** Constructor */
+ public SeparationVP()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += recordType.getMarshalledSize();
+ marshalSize += reasonForSeparation.getMarshalledSize();
+ marshalSize += preEntityIndicator.getMarshalledSize();
+ marshalSize += 1; // padding1
+ marshalSize += parentEntityID.getMarshalledSize();
+ marshalSize += 2; // padding2
+ marshalSize += stationLocation.getMarshalledSize();
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link SeparationVP#recordType}*/
+public SeparationVP setRecordType(VariableParameterRecordType pRecordType)
{
- recordType = pRecordType;
- return this;
-}
-
-/** Getter for {@link SeparationVP#recordType}*/
-public VariableParameterRecordType getRecordType()
+ recordType = pRecordType;
+ return this;
+}
+
+/** Getter for {@link SeparationVP#recordType}*/
+public VariableParameterRecordType getRecordType()
{
return recordType;
-}
-
-/** Setter for {@link SeparationVP#reasonForSeparation}*/
-public SeparationVP setReasonForSeparation(SeparationVPReasonforSeparation pReasonForSeparation)
+}
+
+/** Setter for {@link SeparationVP#reasonForSeparation}*/
+public SeparationVP setReasonForSeparation(SeparationVPReasonforSeparation pReasonForSeparation)
{
- reasonForSeparation = pReasonForSeparation;
- return this;
-}
-
-/** Getter for {@link SeparationVP#reasonForSeparation}*/
-public SeparationVPReasonforSeparation getReasonForSeparation()
+ reasonForSeparation = pReasonForSeparation;
+ return this;
+}
+
+/** Getter for {@link SeparationVP#reasonForSeparation}*/
+public SeparationVPReasonforSeparation getReasonForSeparation()
{
return reasonForSeparation;
-}
-
-/** Setter for {@link SeparationVP#preEntityIndicator}*/
-public SeparationVP setPreEntityIndicator(SeparationVPPreEntityIndicator pPreEntityIndicator)
+}
+
+/** Setter for {@link SeparationVP#preEntityIndicator}*/
+public SeparationVP setPreEntityIndicator(SeparationVPPreEntityIndicator pPreEntityIndicator)
{
- preEntityIndicator = pPreEntityIndicator;
- return this;
-}
-
-/** Getter for {@link SeparationVP#preEntityIndicator}*/
-public SeparationVPPreEntityIndicator getPreEntityIndicator()
+ preEntityIndicator = pPreEntityIndicator;
+ return this;
+}
+
+/** Getter for {@link SeparationVP#preEntityIndicator}*/
+public SeparationVPPreEntityIndicator getPreEntityIndicator()
{
return preEntityIndicator;
-}
-
-/** Setter for {@link SeparationVP#padding1}*/
-public SeparationVP setPadding1(byte pPadding1)
+}
+
+/** Setter for {@link SeparationVP#padding1}*/
+public SeparationVP setPadding1(byte pPadding1)
{
- padding1 = pPadding1;
- return this;
-}
-
-/** Getter for {@link SeparationVP#padding1}*/
-public byte getPadding1()
+ padding1 = pPadding1;
+ return this;
+}
+
+/** Getter for {@link SeparationVP#padding1}*/
+public byte getPadding1()
{
return padding1;
-}
-
-/** Setter for {@link SeparationVP#parentEntityID}*/
-public SeparationVP setParentEntityID(EntityID pParentEntityID)
+}
+
+/** Setter for {@link SeparationVP#parentEntityID}*/
+public SeparationVP setParentEntityID(EntityID pParentEntityID)
{
- parentEntityID = pParentEntityID;
- return this;
-}
-
-/** Getter for {@link SeparationVP#parentEntityID}*/
-public EntityID getParentEntityID()
+ parentEntityID = pParentEntityID;
+ return this;
+}
+
+/** Getter for {@link SeparationVP#parentEntityID}*/
+public EntityID getParentEntityID()
{
return parentEntityID;
-}
-
-/** Setter for {@link SeparationVP#padding2}*/
-public SeparationVP setPadding2(short pPadding2)
+}
+
+/** Setter for {@link SeparationVP#padding2}*/
+public SeparationVP setPadding2(short pPadding2)
{
- padding2 = pPadding2;
- return this;
-}
-
-/** Getter for {@link SeparationVP#padding2}*/
-public short getPadding2()
+ padding2 = pPadding2;
+ return this;
+}
+
+/** Getter for {@link SeparationVP#padding2}*/
+public short getPadding2()
{
return padding2;
-}
-
-/** Setter for {@link SeparationVP#stationLocation}*/
-public SeparationVP setStationLocation(NamedLocationIdentification pStationLocation)
+}
+
+/** Setter for {@link SeparationVP#stationLocation}*/
+public SeparationVP setStationLocation(NamedLocationIdentification pStationLocation)
{
- stationLocation = pStationLocation;
- return this;
-}
-
-/** Getter for {@link SeparationVP#stationLocation}*/
-public NamedLocationIdentification getStationLocation()
+ stationLocation = pStationLocation;
+ return this;
+}
+
+/** Getter for {@link SeparationVP#stationLocation}*/
+public NamedLocationIdentification getStationLocation()
{
return stationLocation;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- recordType.marshal(dos);
- reasonForSeparation.marshal(dos);
- preEntityIndicator.marshal(dos);
- dos.writeByte(padding1);
- parentEntityID.marshal(dos);
- dos.writeShort(padding2);
- stationLocation.marshal(dos);
+ {
+ recordType.marshal(dos);
+ reasonForSeparation.marshal(dos);
+ preEntityIndicator.marshal(dos);
+ dos.writeByte(padding1);
+ parentEntityID.marshal(dos);
+ dos.writeShort(padding2);
+ stationLocation.marshal(dos);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- recordType = VariableParameterRecordType.unmarshalEnum(dis);
- uPosition += recordType.getMarshalledSize();
- reasonForSeparation = SeparationVPReasonforSeparation.unmarshalEnum(dis);
- uPosition += reasonForSeparation.getMarshalledSize();
- preEntityIndicator = SeparationVPPreEntityIndicator.unmarshalEnum(dis);
- uPosition += preEntityIndicator.getMarshalledSize();
- padding1 = (byte)dis.readUnsignedByte();
- uPosition += 1;
- uPosition += parentEntityID.unmarshal(dis);
- padding2 = (short)dis.readUnsignedShort();
- uPosition += 2;
- uPosition += stationLocation.unmarshal(dis);
+ {
+ recordType = VariableParameterRecordType.unmarshalEnum(dis);
+ uPosition += recordType.getMarshalledSize();
+ reasonForSeparation = SeparationVPReasonforSeparation.unmarshalEnum(dis);
+ uPosition += reasonForSeparation.getMarshalledSize();
+ preEntityIndicator = SeparationVPPreEntityIndicator.unmarshalEnum(dis);
+ uPosition += preEntityIndicator.getMarshalledSize();
+ padding1 = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ uPosition += parentEntityID.unmarshal(dis);
+ padding2 = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ uPosition += stationLocation.unmarshal(dis);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- recordType.marshal(buff);
- reasonForSeparation.marshal(buff);
- preEntityIndicator.marshal(buff);
- buff.put( (byte)padding1);
- parentEntityID.marshal(buff);
- buff.putShort( (short)padding2);
- stationLocation.marshal(buff);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- recordType = VariableParameterRecordType.unmarshalEnum(buff);
- reasonForSeparation = SeparationVPReasonforSeparation.unmarshalEnum(buff);
- preEntityIndicator = SeparationVPPreEntityIndicator.unmarshalEnum(buff);
- padding1 = (byte)(buff.get() & 0xFF);
- parentEntityID.unmarshal(buff);
- padding2 = (short)(buff.getShort() & 0xFFFF);
- stationLocation.unmarshal(buff);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ recordType.marshal(buff);
+ reasonForSeparation.marshal(buff);
+ preEntityIndicator.marshal(buff);
+ buff.put( (byte)padding1);
+ parentEntityID.marshal(buff);
+ buff.putShort( (short)padding2);
+ stationLocation.marshal(buff);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ recordType = VariableParameterRecordType.unmarshalEnum(buff);
+ reasonForSeparation = SeparationVPReasonforSeparation.unmarshalEnum(buff);
+ preEntityIndicator = SeparationVPPreEntityIndicator.unmarshalEnum(buff);
+ padding1 = (byte)(buff.get() & 0xFF);
+ parentEntityID.unmarshal(buff);
+ padding2 = (short)(buff.getShort() & 0xFFFF);
+ stationLocation.unmarshal(buff);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final SeparationVP rhs = (SeparationVP)obj;
-
- if( ! (recordType == rhs.recordType)) ivarsEqual = false;
- if( ! (reasonForSeparation == rhs.reasonForSeparation)) ivarsEqual = false;
- if( ! (preEntityIndicator == rhs.preEntityIndicator)) ivarsEqual = false;
- if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
- if( ! (parentEntityID.equals( rhs.parentEntityID) )) ivarsEqual = false;
- if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
- if( ! (stationLocation.equals( rhs.stationLocation) )) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final SeparationVP rhs = (SeparationVP)obj;
+
+ if( ! (recordType == rhs.recordType)) ivarsEqual = false;
+ if( ! (reasonForSeparation == rhs.reasonForSeparation)) ivarsEqual = false;
+ if( ! (preEntityIndicator == rhs.preEntityIndicator)) ivarsEqual = false;
+ if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
+ if( ! (parentEntityID.equals( rhs.parentEntityID) )) ivarsEqual = false;
+ if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
+ if( ! (stationLocation.equals( rhs.stationLocation) )) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" recordType: ").append(recordType).append("\n");
- sb.append(" reasonForSeparation: ").append(reasonForSeparation).append("\n");
- sb.append(" preEntityIndicator: ").append(preEntityIndicator).append("\n");
- sb.append(" padding1: ").append(padding1).append("\n");
- sb.append(" parentEntityID: ").append(parentEntityID).append("\n");
- sb.append(" padding2: ").append(padding2).append("\n");
- sb.append(" stationLocation: ").append(stationLocation).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" recordType: ").append(recordType).append("\n");
+ sb.append(" reasonForSeparation: ").append(reasonForSeparation).append("\n");
+ sb.append(" preEntityIndicator: ").append(preEntityIndicator).append("\n");
+ sb.append(" padding1: ").append(padding1).append("\n");
+ sb.append(" parentEntityID: ").append(parentEntityID).append("\n");
+ sb.append(" padding2: ").append(padding2).append("\n");
+ sb.append(" stationLocation: ").append(stationLocation).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/ServiceRequestPdu.java b/src-generated/edu/nps/moves/dis7/ServiceRequestPdu.java
index 87c37e4cd2721aee1ac523b804a29c1c32d33ecc..caa19376da9f15b4d20d11df42495c7494a830e8 100644
--- a/src-generated/edu/nps/moves/dis7/ServiceRequestPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ServiceRequestPdu.java
@@ -1,297 +1,297 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.5.5 Communicate information associated with one entity requesting a service from another.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class ServiceRequestPdu extends LogisticsFamilyPdu implements Serializable
-{
- /** Entity that is requesting service (see 6.2.28), Section 7.4.2 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 5.5.5 Communicate information associated with one entity requesting a service from another.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class ServiceRequestPdu extends LogisticsFamilyPdu implements Serializable
+{
+ /** Entity that is requesting service (see 6.2.28), Section 7.4.2 */
protected EntityID requestingEntityID = new EntityID();
-
- /** Entity that is providing the service (see 6.2.28), Section 7.4.2 */
+
+ /** Entity that is providing the service (see 6.2.28), Section 7.4.2 */
protected EntityID servicingEntityID = new EntityID();
-
- /** Type of service requested, Section 7.4.2 uid 63 */
+
+ /** Type of service requested, Section 7.4.2 uid 63 */
protected ServiceRequestServiceTypeRequested serviceTypeRequested = ServiceRequestServiceTypeRequested.values()[0];
-
- /** How many requested, Section 7.4.2 */
+
+ /** How many requested, Section 7.4.2 */
protected byte numberOfSupplyTypes;
-
+
protected short padding1 = (short)0;
-
+
protected List< SupplyQuantity > supplies = new ArrayList< SupplyQuantity >();
-
-
-/** Constructor */
- public ServiceRequestPdu()
- {
- setPduType( DISPDUType.SERVICE_REQUEST );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += requestingEntityID.getMarshalledSize();
- marshalSize += servicingEntityID.getMarshalledSize();
- marshalSize += serviceTypeRequested.getMarshalledSize();
- marshalSize += 1; // numberOfSupplyTypes
- marshalSize += 2; // padding1
- for(int idx=0; idx < supplies.size(); idx++)
- {
- SupplyQuantity listElement = supplies.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link ServiceRequestPdu#requestingEntityID}*/
-public ServiceRequestPdu setRequestingEntityID(EntityID pRequestingEntityID)
+
+
+/** Constructor */
+ public ServiceRequestPdu()
+ {
+ setPduType( DISPDUType.SERVICE_REQUEST );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += requestingEntityID.getMarshalledSize();
+ marshalSize += servicingEntityID.getMarshalledSize();
+ marshalSize += serviceTypeRequested.getMarshalledSize();
+ marshalSize += 1; // numberOfSupplyTypes
+ marshalSize += 2; // padding1
+ for(int idx=0; idx < supplies.size(); idx++)
+ {
+ SupplyQuantity listElement = supplies.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link ServiceRequestPdu#requestingEntityID}*/
+public ServiceRequestPdu setRequestingEntityID(EntityID pRequestingEntityID)
{
- requestingEntityID = pRequestingEntityID;
- return this;
-}
-
-/** Getter for {@link ServiceRequestPdu#requestingEntityID}*/
-public EntityID getRequestingEntityID()
+ requestingEntityID = pRequestingEntityID;
+ return this;
+}
+
+/** Getter for {@link ServiceRequestPdu#requestingEntityID}*/
+public EntityID getRequestingEntityID()
{
return requestingEntityID;
-}
-
-/** Setter for {@link ServiceRequestPdu#servicingEntityID}*/
-public ServiceRequestPdu setServicingEntityID(EntityID pServicingEntityID)
+}
+
+/** Setter for {@link ServiceRequestPdu#servicingEntityID}*/
+public ServiceRequestPdu setServicingEntityID(EntityID pServicingEntityID)
{
- servicingEntityID = pServicingEntityID;
- return this;
-}
-
-/** Getter for {@link ServiceRequestPdu#servicingEntityID}*/
-public EntityID getServicingEntityID()
+ servicingEntityID = pServicingEntityID;
+ return this;
+}
+
+/** Getter for {@link ServiceRequestPdu#servicingEntityID}*/
+public EntityID getServicingEntityID()
{
return servicingEntityID;
-}
-
-/** Setter for {@link ServiceRequestPdu#serviceTypeRequested}*/
-public ServiceRequestPdu setServiceTypeRequested(ServiceRequestServiceTypeRequested pServiceTypeRequested)
+}
+
+/** Setter for {@link ServiceRequestPdu#serviceTypeRequested}*/
+public ServiceRequestPdu setServiceTypeRequested(ServiceRequestServiceTypeRequested pServiceTypeRequested)
{
- serviceTypeRequested = pServiceTypeRequested;
- return this;
-}
-
-/** Getter for {@link ServiceRequestPdu#serviceTypeRequested}*/
-public ServiceRequestServiceTypeRequested getServiceTypeRequested()
+ serviceTypeRequested = pServiceTypeRequested;
+ return this;
+}
+
+/** Getter for {@link ServiceRequestPdu#serviceTypeRequested}*/
+public ServiceRequestServiceTypeRequested getServiceTypeRequested()
{
return serviceTypeRequested;
-}
-
-/** Setter for {@link ServiceRequestPdu#padding1}*/
-public ServiceRequestPdu setPadding1(short pPadding1)
+}
+
+/** Setter for {@link ServiceRequestPdu#padding1}*/
+public ServiceRequestPdu setPadding1(short pPadding1)
{
- padding1 = pPadding1;
- return this;
-}
-
-/** Getter for {@link ServiceRequestPdu#padding1}*/
-public short getPadding1()
+ padding1 = pPadding1;
+ return this;
+}
+
+/** Getter for {@link ServiceRequestPdu#padding1}*/
+public short getPadding1()
{
return padding1;
-}
-
-/** Setter for {@link ServiceRequestPdu#supplies}*/
-public ServiceRequestPdu setSupplies(List<SupplyQuantity> pSupplies)
+}
+
+/** Setter for {@link ServiceRequestPdu#supplies}*/
+public ServiceRequestPdu setSupplies(List<SupplyQuantity> pSupplies)
{
- supplies = pSupplies;
- return this;
-}
-
-/** Getter for {@link ServiceRequestPdu#supplies}*/
-public List<SupplyQuantity> getSupplies()
+ supplies = pSupplies;
+ return this;
+}
+
+/** Getter for {@link ServiceRequestPdu#supplies}*/
+public List<SupplyQuantity> getSupplies()
{
return supplies;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- requestingEntityID.marshal(dos);
- servicingEntityID.marshal(dos);
- serviceTypeRequested.marshal(dos);
- dos.writeByte(supplies.size());
- dos.writeShort(padding1);
-
- for(int idx = 0; idx < supplies.size(); idx++)
- {
- SupplyQuantity aSupplyQuantity = supplies.get(idx);
- aSupplyQuantity.marshal(dos);
- }
-
+ {
+ requestingEntityID.marshal(dos);
+ servicingEntityID.marshal(dos);
+ serviceTypeRequested.marshal(dos);
+ dos.writeByte(supplies.size());
+ dos.writeShort(padding1);
+
+ for(int idx = 0; idx < supplies.size(); idx++)
+ {
+ SupplyQuantity aSupplyQuantity = supplies.get(idx);
+ aSupplyQuantity.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += requestingEntityID.unmarshal(dis);
- uPosition += servicingEntityID.unmarshal(dis);
- serviceTypeRequested = ServiceRequestServiceTypeRequested.unmarshalEnum(dis);
- uPosition += serviceTypeRequested.getMarshalledSize();
- numberOfSupplyTypes = (byte)dis.readUnsignedByte();
- uPosition += 1;
- padding1 = (short)dis.readUnsignedShort();
- uPosition += 2;
- for(int idx = 0; idx < numberOfSupplyTypes; idx++)
- {
- SupplyQuantity anX = new SupplyQuantity();
- uPosition += anX.unmarshal(dis);
- supplies.add(anX);
- }
-
+ {
+ uPosition += requestingEntityID.unmarshal(dis);
+ uPosition += servicingEntityID.unmarshal(dis);
+ serviceTypeRequested = ServiceRequestServiceTypeRequested.unmarshalEnum(dis);
+ uPosition += serviceTypeRequested.getMarshalledSize();
+ numberOfSupplyTypes = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ padding1 = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ for(int idx = 0; idx < numberOfSupplyTypes; idx++)
+ {
+ SupplyQuantity anX = new SupplyQuantity();
+ uPosition += anX.unmarshal(dis);
+ supplies.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- requestingEntityID.marshal(buff);
- servicingEntityID.marshal(buff);
- serviceTypeRequested.marshal(buff);
- buff.put( (byte)supplies.size());
- buff.putShort( (short)padding1);
-
- for(int idx = 0; idx < supplies.size(); idx++)
- {
- SupplyQuantity aSupplyQuantity = supplies.get(idx);
- aSupplyQuantity.marshal(buff);
- }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ requestingEntityID.marshal(buff);
+ servicingEntityID.marshal(buff);
+ serviceTypeRequested.marshal(buff);
+ buff.put( (byte)supplies.size());
+ buff.putShort( (short)padding1);
+
+ for(int idx = 0; idx < supplies.size(); idx++)
+ {
+ SupplyQuantity aSupplyQuantity = supplies.get(idx);
+ aSupplyQuantity.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- requestingEntityID.unmarshal(buff);
- servicingEntityID.unmarshal(buff);
- serviceTypeRequested = ServiceRequestServiceTypeRequested.unmarshalEnum(buff);
- numberOfSupplyTypes = (byte)(buff.get() & 0xFF);
- padding1 = (short)(buff.getShort() & 0xFFFF);
- for(int idx = 0; idx < numberOfSupplyTypes; idx++)
- {
- SupplyQuantity anX = new SupplyQuantity();
- anX.unmarshal(buff);
- supplies.add(anX);
- }
-
- return getMarshalledSize();
+
+ requestingEntityID.unmarshal(buff);
+ servicingEntityID.unmarshal(buff);
+ serviceTypeRequested = ServiceRequestServiceTypeRequested.unmarshalEnum(buff);
+ numberOfSupplyTypes = (byte)(buff.get() & 0xFF);
+ padding1 = (short)(buff.getShort() & 0xFFFF);
+ for(int idx = 0; idx < numberOfSupplyTypes; idx++)
+ {
+ SupplyQuantity anX = new SupplyQuantity();
+ anX.unmarshal(buff);
+ supplies.add(anX);
+ }
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final ServiceRequestPdu rhs = (ServiceRequestPdu)obj;
-
- if( ! (requestingEntityID.equals( rhs.requestingEntityID) )) ivarsEqual = false;
- if( ! (servicingEntityID.equals( rhs.servicingEntityID) )) ivarsEqual = false;
- if( ! (serviceTypeRequested == rhs.serviceTypeRequested)) ivarsEqual = false;
- if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
-
- for(int idx = 0; idx < supplies.size(); idx++)
- if( ! ( supplies.get(idx).equals(rhs.supplies.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final ServiceRequestPdu rhs = (ServiceRequestPdu)obj;
+
+ if( ! (requestingEntityID.equals( rhs.requestingEntityID) )) ivarsEqual = false;
+ if( ! (servicingEntityID.equals( rhs.servicingEntityID) )) ivarsEqual = false;
+ if( ! (serviceTypeRequested == rhs.serviceTypeRequested)) ivarsEqual = false;
+ if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
+
+ for(int idx = 0; idx < supplies.size(); idx++)
+ if( ! ( supplies.get(idx).equals(rhs.supplies.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" requestingEntityID: ").append(requestingEntityID).append("\n");
- sb.append(" servicingEntityID: ").append(servicingEntityID).append("\n");
- sb.append(" serviceTypeRequested: ").append(serviceTypeRequested).append("\n");
- sb.append(" padding1: ").append(padding1).append("\n");
- sb.append(" supplies: ").append("\n");
- supplies.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" requestingEntityID: ").append(requestingEntityID).append("\n");
+ sb.append(" servicingEntityID: ").append(servicingEntityID).append("\n");
+ sb.append(" serviceTypeRequested: ").append(serviceTypeRequested).append("\n");
+ sb.append(" padding1: ").append(padding1).append("\n");
+ sb.append(" supplies: ").append("\n");
+ supplies.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/SetDataPdu.java b/src-generated/edu/nps/moves/dis7/SetDataPdu.java
index 923cad6f853c190d235f96a69cf8fc2e00a9b73f..4655a1261c327639de1fb50095067f672a573354 100644
--- a/src-generated/edu/nps/moves/dis7/SetDataPdu.java
+++ b/src-generated/edu/nps/moves/dis7/SetDataPdu.java
@@ -1,317 +1,317 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Section 7.5.10. Initializing or changing internal state information shall be communicated using a Set Data PDU. See 5.6.5.10
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class SetDataPdu extends SimulationManagementFamilyPdu implements Serializable
-{
- /** ID of request */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Section 7.5.10. Initializing or changing internal state information shall be communicated using a Set Data PDU. See 5.6.5.10
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class SetDataPdu extends SimulationManagementFamilyPdu implements Serializable
+{
+ /** ID of request */
protected int requestID;
-
- /** padding */
+
+ /** padding */
protected int padding1 = (int)0;
-
- /** Number of fixed datum records */
+
+ /** Number of fixed datum records */
protected int numberOfFixedDatumRecords;
-
- /** Number of variable datum records, handled automatically by marshaller at run time (and not modifiable by end-user programmers) */
+
+ /** Number of variable datum records, handled automatically by marshaller at run time (and not modifiable by end-user programmers) */
protected int numberOfVariableDatumRecords;
-
- /** variable length list of fixed datums */
+
+ /** variable length list of fixed datums */
protected List< FixedDatum > fixedDatums = new ArrayList< FixedDatum >();
-
- /** variable length list of variable length datums */
+
+ /** variable length list of variable length datums */
protected List< VariableDatum > variableDatums = new ArrayList< VariableDatum >();
-
-
-/** Constructor */
- public SetDataPdu()
- {
- setPduType( DISPDUType.SET_DATA );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += 4; // requestID
- marshalSize += 4; // padding1
- marshalSize += 4; // numberOfFixedDatumRecords
- marshalSize += 4; // numberOfVariableDatumRecords
- for(int idx=0; idx < fixedDatums.size(); idx++)
- {
- FixedDatum listElement = fixedDatums.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
- for(int idx=0; idx < variableDatums.size(); idx++)
- {
- VariableDatum listElement = variableDatums.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link SetDataPdu#requestID}*/
-public SetDataPdu setRequestID(int pRequestID)
+
+
+/** Constructor */
+ public SetDataPdu()
+ {
+ setPduType( DISPDUType.SET_DATA );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += 4; // requestID
+ marshalSize += 4; // padding1
+ marshalSize += 4; // numberOfFixedDatumRecords
+ marshalSize += 4; // numberOfVariableDatumRecords
+ for(int idx=0; idx < fixedDatums.size(); idx++)
+ {
+ FixedDatum listElement = fixedDatums.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+ for(int idx=0; idx < variableDatums.size(); idx++)
+ {
+ VariableDatum listElement = variableDatums.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link SetDataPdu#requestID}*/
+public SetDataPdu setRequestID(int pRequestID)
{
- requestID = pRequestID;
- return this;
-}
-
-/** Getter for {@link SetDataPdu#requestID}*/
-public int getRequestID()
+ requestID = pRequestID;
+ return this;
+}
+
+/** Getter for {@link SetDataPdu#requestID}*/
+public int getRequestID()
{
return requestID;
-}
-
-/** Setter for {@link SetDataPdu#padding1}*/
-public SetDataPdu setPadding1(int pPadding1)
+}
+
+/** Setter for {@link SetDataPdu#padding1}*/
+public SetDataPdu setPadding1(int pPadding1)
{
- padding1 = pPadding1;
- return this;
-}
-
-/** Getter for {@link SetDataPdu#padding1}*/
-public int getPadding1()
+ padding1 = pPadding1;
+ return this;
+}
+
+/** Getter for {@link SetDataPdu#padding1}*/
+public int getPadding1()
{
return padding1;
-}
-
-/** Setter for {@link SetDataPdu#fixedDatums}*/
-public SetDataPdu setFixedDatums(List<FixedDatum> pFixedDatums)
+}
+
+/** Setter for {@link SetDataPdu#fixedDatums}*/
+public SetDataPdu setFixedDatums(List<FixedDatum> pFixedDatums)
{
- fixedDatums = pFixedDatums;
- return this;
-}
-
-/** Getter for {@link SetDataPdu#fixedDatums}*/
-public List<FixedDatum> getFixedDatums()
+ fixedDatums = pFixedDatums;
+ return this;
+}
+
+/** Getter for {@link SetDataPdu#fixedDatums}*/
+public List<FixedDatum> getFixedDatums()
{
return fixedDatums;
-}
-
-/** Setter for {@link SetDataPdu#variableDatums}*/
-public SetDataPdu setVariableDatums(List<VariableDatum> pVariableDatums)
+}
+
+/** Setter for {@link SetDataPdu#variableDatums}*/
+public SetDataPdu setVariableDatums(List<VariableDatum> pVariableDatums)
{
- variableDatums = pVariableDatums;
- return this;
-}
-
-/** Getter for {@link SetDataPdu#variableDatums}*/
-public List<VariableDatum> getVariableDatums()
+ variableDatums = pVariableDatums;
+ return this;
+}
+
+/** Getter for {@link SetDataPdu#variableDatums}*/
+public List<VariableDatum> getVariableDatums()
{
return variableDatums;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- dos.writeInt(requestID);
- dos.writeInt(padding1);
- dos.writeInt(fixedDatums.size());
- dos.writeInt(variableDatums.size());
-
- for(int idx = 0; idx < fixedDatums.size(); idx++)
- {
- FixedDatum aFixedDatum = fixedDatums.get(idx);
- aFixedDatum.marshal(dos);
- }
-
-
- for(int idx = 0; idx < variableDatums.size(); idx++)
- {
- VariableDatum aVariableDatum = variableDatums.get(idx);
- aVariableDatum.marshal(dos);
- }
-
+ {
+ dos.writeInt(requestID);
+ dos.writeInt(padding1);
+ dos.writeInt(fixedDatums.size());
+ dos.writeInt(variableDatums.size());
+
+ for(int idx = 0; idx < fixedDatums.size(); idx++)
+ {
+ FixedDatum aFixedDatum = fixedDatums.get(idx);
+ aFixedDatum.marshal(dos);
+ }
+
+
+ for(int idx = 0; idx < variableDatums.size(); idx++)
+ {
+ VariableDatum aVariableDatum = variableDatums.get(idx);
+ aVariableDatum.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- requestID = dis.readInt();
- uPosition += 4;
- padding1 = dis.readInt();
- uPosition += 4;
- numberOfFixedDatumRecords = dis.readInt();
- uPosition += 4;
- numberOfVariableDatumRecords = dis.readInt();
- uPosition += 4;
- for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
- {
- FixedDatum anX = new FixedDatum();
- uPosition += anX.unmarshal(dis);
- fixedDatums.add(anX);
- }
-
- for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
- {
- VariableDatum anX = new VariableDatum();
- uPosition += anX.unmarshal(dis);
- variableDatums.add(anX);
- }
-
+ {
+ requestID = dis.readInt();
+ uPosition += 4;
+ padding1 = dis.readInt();
+ uPosition += 4;
+ numberOfFixedDatumRecords = dis.readInt();
+ uPosition += 4;
+ numberOfVariableDatumRecords = dis.readInt();
+ uPosition += 4;
+ for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
+ {
+ FixedDatum anX = new FixedDatum();
+ uPosition += anX.unmarshal(dis);
+ fixedDatums.add(anX);
+ }
+
+ for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
+ {
+ VariableDatum anX = new VariableDatum();
+ uPosition += anX.unmarshal(dis);
+ variableDatums.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- buff.putInt( (int)requestID);
- buff.putInt( (int)padding1);
- buff.putInt( (int)fixedDatums.size());
- buff.putInt( (int)variableDatums.size());
-
- for(int idx = 0; idx < fixedDatums.size(); idx++)
- {
- FixedDatum aFixedDatum = fixedDatums.get(idx);
- aFixedDatum.marshal(buff);
- }
-
-
- for(int idx = 0; idx < variableDatums.size(); idx++)
- {
- VariableDatum aVariableDatum = variableDatums.get(idx);
- aVariableDatum.marshal(buff);
- }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ buff.putInt( (int)requestID);
+ buff.putInt( (int)padding1);
+ buff.putInt( (int)fixedDatums.size());
+ buff.putInt( (int)variableDatums.size());
+
+ for(int idx = 0; idx < fixedDatums.size(); idx++)
+ {
+ FixedDatum aFixedDatum = fixedDatums.get(idx);
+ aFixedDatum.marshal(buff);
+ }
+
+
+ for(int idx = 0; idx < variableDatums.size(); idx++)
+ {
+ VariableDatum aVariableDatum = variableDatums.get(idx);
+ aVariableDatum.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- requestID = buff.getInt();
- padding1 = buff.getInt();
- numberOfFixedDatumRecords = buff.getInt();
- numberOfVariableDatumRecords = buff.getInt();
- for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
- {
- FixedDatum anX = new FixedDatum();
- anX.unmarshal(buff);
- fixedDatums.add(anX);
- }
-
- for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
- {
- VariableDatum anX = new VariableDatum();
- anX.unmarshal(buff);
- variableDatums.add(anX);
- }
-
- return getMarshalledSize();
+
+ requestID = buff.getInt();
+ padding1 = buff.getInt();
+ numberOfFixedDatumRecords = buff.getInt();
+ numberOfVariableDatumRecords = buff.getInt();
+ for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
+ {
+ FixedDatum anX = new FixedDatum();
+ anX.unmarshal(buff);
+ fixedDatums.add(anX);
+ }
+
+ for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
+ {
+ VariableDatum anX = new VariableDatum();
+ anX.unmarshal(buff);
+ variableDatums.add(anX);
+ }
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final SetDataPdu rhs = (SetDataPdu)obj;
-
- if( ! (requestID == rhs.requestID)) ivarsEqual = false;
- if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
-
- for(int idx = 0; idx < fixedDatums.size(); idx++)
- if( ! ( fixedDatums.get(idx).equals(rhs.fixedDatums.get(idx)))) ivarsEqual = false;
-
-
- for(int idx = 0; idx < variableDatums.size(); idx++)
- if( ! ( variableDatums.get(idx).equals(rhs.variableDatums.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final SetDataPdu rhs = (SetDataPdu)obj;
+
+ if( ! (requestID == rhs.requestID)) ivarsEqual = false;
+ if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
+
+ for(int idx = 0; idx < fixedDatums.size(); idx++)
+ if( ! ( fixedDatums.get(idx).equals(rhs.fixedDatums.get(idx)))) ivarsEqual = false;
+
+
+ for(int idx = 0; idx < variableDatums.size(); idx++)
+ if( ! ( variableDatums.get(idx).equals(rhs.variableDatums.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" requestID: ").append(requestID).append("\n");
- sb.append(" padding1: ").append(padding1).append("\n");
- sb.append(" fixedDatums: ").append("\n");
- fixedDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
- sb.append(" variableDatums: ").append("\n");
- variableDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" requestID: ").append(requestID).append("\n");
+ sb.append(" padding1: ").append(padding1).append("\n");
+ sb.append(" fixedDatums: ").append("\n");
+ fixedDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+ sb.append(" variableDatums: ").append("\n");
+ variableDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/SetDataRPdu.java b/src-generated/edu/nps/moves/dis7/SetDataRPdu.java
index 62d251b2d8dacd714aa4df31688c478a5fcee650..bd1d0c72d54d6b90101afda8a6f0902763cf0f69 100644
--- a/src-generated/edu/nps/moves/dis7/SetDataRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/SetDataRPdu.java
@@ -1,365 +1,365 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.12.4.10 Serves the same function as the Set Data PDU but with the addition of reliability service levels.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class SetDataRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
-{
- /** level of reliability service used for this transaction uid 74 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 5.12.4.10 Serves the same function as the Set Data PDU but with the addition of reliability service levels.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class SetDataRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
+{
+ /** level of reliability service used for this transaction uid 74 */
protected RequiredReliabilityService requiredReliabilityService = RequiredReliabilityService.values()[0];
-
- /** padding */
+
+ /** padding */
protected byte pad1;
-
- /** padding */
+
+ /** padding */
protected short pad2;
-
- /** request ID */
+
+ /** request ID */
protected int requestID;
-
- /** Fixed datum record count */
+
+ /** Fixed datum record count */
protected int numberOfFixedDatumRecords;
-
- /** variable datum record count */
+
+ /** variable datum record count */
protected int numberOfVariableDatumRecords;
-
- /** Fixed datum records */
+
+ /** Fixed datum records */
protected List< FixedDatum > fixedDatumRecords = new ArrayList< FixedDatum >();
-
- /** Variable datum records */
+
+ /** Variable datum records */
protected List< VariableDatum > variableDatumRecords = new ArrayList< VariableDatum >();
-
-
-/** Constructor */
- public SetDataRPdu()
- {
- setPduType( DISPDUType.SET_DATA_RELIABLE );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public SetDataRPdu()
+ {
+ setPduType( DISPDUType.SET_DATA_RELIABLE );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += requiredReliabilityService.getMarshalledSize();
+ marshalSize += 1; // pad1
+ marshalSize += 2; // pad2
+ marshalSize += 4; // requestID
+ marshalSize += 4; // numberOfFixedDatumRecords
+ marshalSize += 4; // numberOfVariableDatumRecords
+ for(int idx=0; idx < fixedDatumRecords.size(); idx++)
+ {
+ FixedDatum listElement = fixedDatumRecords.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+ for(int idx=0; idx < variableDatumRecords.size(); idx++)
+ {
+ VariableDatum listElement = variableDatumRecords.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link SetDataRPdu#requiredReliabilityService}*/
+public SetDataRPdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += requiredReliabilityService.getMarshalledSize();
- marshalSize += 1; // pad1
- marshalSize += 2; // pad2
- marshalSize += 4; // requestID
- marshalSize += 4; // numberOfFixedDatumRecords
- marshalSize += 4; // numberOfVariableDatumRecords
- for(int idx=0; idx < fixedDatumRecords.size(); idx++)
- {
- FixedDatum listElement = fixedDatumRecords.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
- for(int idx=0; idx < variableDatumRecords.size(); idx++)
- {
- VariableDatum listElement = variableDatumRecords.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link SetDataRPdu#requiredReliabilityService}*/
-public SetDataRPdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
-{
- requiredReliabilityService = pRequiredReliabilityService;
- return this;
-}
-
-/** Getter for {@link SetDataRPdu#requiredReliabilityService}*/
-public RequiredReliabilityService getRequiredReliabilityService()
+ requiredReliabilityService = pRequiredReliabilityService;
+ return this;
+}
+
+/** Getter for {@link SetDataRPdu#requiredReliabilityService}*/
+public RequiredReliabilityService getRequiredReliabilityService()
{
return requiredReliabilityService;
-}
-
-/** Setter for {@link SetDataRPdu#pad1}*/
-public SetDataRPdu setPad1(byte pPad1)
+}
+
+/** Setter for {@link SetDataRPdu#pad1}*/
+public SetDataRPdu setPad1(byte pPad1)
{
- pad1 = pPad1;
- return this;
-}
-
-/** Getter for {@link SetDataRPdu#pad1}*/
-public byte getPad1()
+ pad1 = pPad1;
+ return this;
+}
+
+/** Getter for {@link SetDataRPdu#pad1}*/
+public byte getPad1()
{
return pad1;
-}
-
-/** Setter for {@link SetDataRPdu#pad2}*/
-public SetDataRPdu setPad2(short pPad2)
+}
+
+/** Setter for {@link SetDataRPdu#pad2}*/
+public SetDataRPdu setPad2(short pPad2)
{
- pad2 = pPad2;
- return this;
-}
-
-/** Getter for {@link SetDataRPdu#pad2}*/
-public short getPad2()
+ pad2 = pPad2;
+ return this;
+}
+
+/** Getter for {@link SetDataRPdu#pad2}*/
+public short getPad2()
{
return pad2;
-}
-
-/** Setter for {@link SetDataRPdu#requestID}*/
-public SetDataRPdu setRequestID(int pRequestID)
+}
+
+/** Setter for {@link SetDataRPdu#requestID}*/
+public SetDataRPdu setRequestID(int pRequestID)
{
- requestID = pRequestID;
- return this;
-}
-
-/** Getter for {@link SetDataRPdu#requestID}*/
-public int getRequestID()
+ requestID = pRequestID;
+ return this;
+}
+
+/** Getter for {@link SetDataRPdu#requestID}*/
+public int getRequestID()
{
return requestID;
-}
-
-/** Setter for {@link SetDataRPdu#fixedDatumRecords}*/
-public SetDataRPdu setFixedDatumRecords(List<FixedDatum> pFixedDatumRecords)
+}
+
+/** Setter for {@link SetDataRPdu#fixedDatumRecords}*/
+public SetDataRPdu setFixedDatumRecords(List<FixedDatum> pFixedDatumRecords)
{
- fixedDatumRecords = pFixedDatumRecords;
- return this;
-}
-
-/** Getter for {@link SetDataRPdu#fixedDatumRecords}*/
-public List<FixedDatum> getFixedDatumRecords()
+ fixedDatumRecords = pFixedDatumRecords;
+ return this;
+}
+
+/** Getter for {@link SetDataRPdu#fixedDatumRecords}*/
+public List<FixedDatum> getFixedDatumRecords()
{
return fixedDatumRecords;
-}
-
-/** Setter for {@link SetDataRPdu#variableDatumRecords}*/
-public SetDataRPdu setVariableDatumRecords(List<VariableDatum> pVariableDatumRecords)
+}
+
+/** Setter for {@link SetDataRPdu#variableDatumRecords}*/
+public SetDataRPdu setVariableDatumRecords(List<VariableDatum> pVariableDatumRecords)
{
- variableDatumRecords = pVariableDatumRecords;
- return this;
-}
-
-/** Getter for {@link SetDataRPdu#variableDatumRecords}*/
-public List<VariableDatum> getVariableDatumRecords()
+ variableDatumRecords = pVariableDatumRecords;
+ return this;
+}
+
+/** Getter for {@link SetDataRPdu#variableDatumRecords}*/
+public List<VariableDatum> getVariableDatumRecords()
{
return variableDatumRecords;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- requiredReliabilityService.marshal(dos);
- dos.writeByte(pad1);
- dos.writeShort(pad2);
- dos.writeInt(requestID);
- dos.writeInt(fixedDatumRecords.size());
- dos.writeInt(variableDatumRecords.size());
-
- for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
- {
- FixedDatum aFixedDatum = fixedDatumRecords.get(idx);
- aFixedDatum.marshal(dos);
- }
-
-
- for(int idx = 0; idx < variableDatumRecords.size(); idx++)
- {
- VariableDatum aVariableDatum = variableDatumRecords.get(idx);
- aVariableDatum.marshal(dos);
- }
-
+ {
+ requiredReliabilityService.marshal(dos);
+ dos.writeByte(pad1);
+ dos.writeShort(pad2);
+ dos.writeInt(requestID);
+ dos.writeInt(fixedDatumRecords.size());
+ dos.writeInt(variableDatumRecords.size());
+
+ for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
+ {
+ FixedDatum aFixedDatum = fixedDatumRecords.get(idx);
+ aFixedDatum.marshal(dos);
+ }
+
+
+ for(int idx = 0; idx < variableDatumRecords.size(); idx++)
+ {
+ VariableDatum aVariableDatum = variableDatumRecords.get(idx);
+ aVariableDatum.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(dis);
- uPosition += requiredReliabilityService.getMarshalledSize();
- pad1 = (byte)dis.readUnsignedByte();
- uPosition += 1;
- pad2 = (short)dis.readUnsignedShort();
- uPosition += 2;
- requestID = dis.readInt();
- uPosition += 4;
- numberOfFixedDatumRecords = dis.readInt();
- uPosition += 4;
- numberOfVariableDatumRecords = dis.readInt();
- uPosition += 4;
- for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
- {
- FixedDatum anX = new FixedDatum();
- uPosition += anX.unmarshal(dis);
- fixedDatumRecords.add(anX);
- }
-
- for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
- {
- VariableDatum anX = new VariableDatum();
- uPosition += anX.unmarshal(dis);
- variableDatumRecords.add(anX);
- }
-
+ {
+ requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(dis);
+ uPosition += requiredReliabilityService.getMarshalledSize();
+ pad1 = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ pad2 = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ requestID = dis.readInt();
+ uPosition += 4;
+ numberOfFixedDatumRecords = dis.readInt();
+ uPosition += 4;
+ numberOfVariableDatumRecords = dis.readInt();
+ uPosition += 4;
+ for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
+ {
+ FixedDatum anX = new FixedDatum();
+ uPosition += anX.unmarshal(dis);
+ fixedDatumRecords.add(anX);
+ }
+
+ for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
+ {
+ VariableDatum anX = new VariableDatum();
+ uPosition += anX.unmarshal(dis);
+ variableDatumRecords.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- requiredReliabilityService.marshal(buff);
- buff.put( (byte)pad1);
- buff.putShort( (short)pad2);
- buff.putInt( (int)requestID);
- buff.putInt( (int)fixedDatumRecords.size());
- buff.putInt( (int)variableDatumRecords.size());
-
- for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
- {
- FixedDatum aFixedDatum = fixedDatumRecords.get(idx);
- aFixedDatum.marshal(buff);
- }
-
-
- for(int idx = 0; idx < variableDatumRecords.size(); idx++)
- {
- VariableDatum aVariableDatum = variableDatumRecords.get(idx);
- aVariableDatum.marshal(buff);
- }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ requiredReliabilityService.marshal(buff);
+ buff.put( (byte)pad1);
+ buff.putShort( (short)pad2);
+ buff.putInt( (int)requestID);
+ buff.putInt( (int)fixedDatumRecords.size());
+ buff.putInt( (int)variableDatumRecords.size());
+
+ for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
+ {
+ FixedDatum aFixedDatum = fixedDatumRecords.get(idx);
+ aFixedDatum.marshal(buff);
+ }
+
+
+ for(int idx = 0; idx < variableDatumRecords.size(); idx++)
+ {
+ VariableDatum aVariableDatum = variableDatumRecords.get(idx);
+ aVariableDatum.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(buff);
- pad1 = (byte)(buff.get() & 0xFF);
- pad2 = (short)(buff.getShort() & 0xFFFF);
- requestID = buff.getInt();
- numberOfFixedDatumRecords = buff.getInt();
- numberOfVariableDatumRecords = buff.getInt();
- for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
- {
- FixedDatum anX = new FixedDatum();
- anX.unmarshal(buff);
- fixedDatumRecords.add(anX);
- }
-
- for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
- {
- VariableDatum anX = new VariableDatum();
- anX.unmarshal(buff);
- variableDatumRecords.add(anX);
- }
-
- return getMarshalledSize();
+
+ requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(buff);
+ pad1 = (byte)(buff.get() & 0xFF);
+ pad2 = (short)(buff.getShort() & 0xFFFF);
+ requestID = buff.getInt();
+ numberOfFixedDatumRecords = buff.getInt();
+ numberOfVariableDatumRecords = buff.getInt();
+ for(int idx = 0; idx < numberOfFixedDatumRecords; idx++)
+ {
+ FixedDatum anX = new FixedDatum();
+ anX.unmarshal(buff);
+ fixedDatumRecords.add(anX);
+ }
+
+ for(int idx = 0; idx < numberOfVariableDatumRecords; idx++)
+ {
+ VariableDatum anX = new VariableDatum();
+ anX.unmarshal(buff);
+ variableDatumRecords.add(anX);
+ }
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final SetDataRPdu rhs = (SetDataRPdu)obj;
-
- if( ! (requiredReliabilityService == rhs.requiredReliabilityService)) ivarsEqual = false;
- if( ! (pad1 == rhs.pad1)) ivarsEqual = false;
- if( ! (pad2 == rhs.pad2)) ivarsEqual = false;
- if( ! (requestID == rhs.requestID)) ivarsEqual = false;
-
- for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
- if( ! ( fixedDatumRecords.get(idx).equals(rhs.fixedDatumRecords.get(idx)))) ivarsEqual = false;
-
-
- for(int idx = 0; idx < variableDatumRecords.size(); idx++)
- if( ! ( variableDatumRecords.get(idx).equals(rhs.variableDatumRecords.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final SetDataRPdu rhs = (SetDataRPdu)obj;
+
+ if( ! (requiredReliabilityService == rhs.requiredReliabilityService)) ivarsEqual = false;
+ if( ! (pad1 == rhs.pad1)) ivarsEqual = false;
+ if( ! (pad2 == rhs.pad2)) ivarsEqual = false;
+ if( ! (requestID == rhs.requestID)) ivarsEqual = false;
+
+ for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
+ if( ! ( fixedDatumRecords.get(idx).equals(rhs.fixedDatumRecords.get(idx)))) ivarsEqual = false;
+
+
+ for(int idx = 0; idx < variableDatumRecords.size(); idx++)
+ if( ! ( variableDatumRecords.get(idx).equals(rhs.variableDatumRecords.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
- sb.append(" pad1: ").append(pad1).append("\n");
- sb.append(" pad2: ").append(pad2).append("\n");
- sb.append(" requestID: ").append(requestID).append("\n");
- sb.append(" fixedDatumRecords: ").append("\n");
- fixedDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
- sb.append(" variableDatumRecords: ").append("\n");
- variableDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
+ sb.append(" pad1: ").append(pad1).append("\n");
+ sb.append(" pad2: ").append(pad2).append("\n");
+ sb.append(" requestID: ").append(requestID).append("\n");
+ sb.append(" fixedDatumRecords: ").append("\n");
+ fixedDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+ sb.append(" variableDatumRecords: ").append("\n");
+ variableDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/SetDataReliablePdu.java b/src-generated/edu/nps/moves/dis7/SetDataReliablePdu.java
index c5030fe69c99ef385f3d15b103badc083f6c8109..38ec33c3800d2c2bd87a13fd5029894f6c38036c 100644
--- a/src-generated/edu/nps/moves/dis7/SetDataReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/SetDataReliablePdu.java
@@ -1,17 +1,17 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * more descriptive name for a SetDataRPdu
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class SetDataReliablePdu extends SetDataRPdu
-{}
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * more descriptive name for a SetDataRPdu
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class SetDataReliablePdu extends SetDataRPdu
+{}
diff --git a/src-generated/edu/nps/moves/dis7/SetRecordRPdu.java b/src-generated/edu/nps/moves/dis7/SetRecordRPdu.java
index fa869f63672776e72427730c860ee5fc57517b99..24f0bb7bae7e52d6cb2b5b307e75ee7518f133e8 100644
--- a/src-generated/edu/nps/moves/dis7/SetRecordRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/SetRecordRPdu.java
@@ -1,322 +1,322 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.12.4.15 Used to set or change certain parameter values. These parameter values are contained within a record format as compared to the datum format used in the Set Data-R PDU.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class SetRecordRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
-{
- /** request ID */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 5.12.4.15 Used to set or change certain parameter values. These parameter values are contained within a record format as compared to the datum format used in the Set Data-R PDU.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class SetRecordRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
+{
+ /** request ID */
protected int requestID;
-
- /** level of reliability service used for this transaction uid 74 */
+
+ /** level of reliability service used for this transaction uid 74 */
protected RequiredReliabilityService requiredReliabilityService = RequiredReliabilityService.values()[0];
-
+
protected byte pad1;
-
+
protected short pad2;
-
+
protected int pad3;
-
- /** Number of record sets in list */
+
+ /** Number of record sets in list */
protected int numberOfRecordSets;
-
- /** record sets */
+
+ /** record sets */
protected List< RecordSpecification > recordSets = new ArrayList< RecordSpecification >();
-
-
-/** Constructor */
- public SetRecordRPdu()
- {
- setPduType( DISPDUType.SET_RECORD_RELIABLE );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += 4; // requestID
- marshalSize += requiredReliabilityService.getMarshalledSize();
- marshalSize += 1; // pad1
- marshalSize += 2; // pad2
- marshalSize += 4; // pad3
- marshalSize += 4; // numberOfRecordSets
- for(int idx=0; idx < recordSets.size(); idx++)
- {
- RecordSpecification listElement = recordSets.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link SetRecordRPdu#requestID}*/
-public SetRecordRPdu setRequestID(int pRequestID)
+
+
+/** Constructor */
+ public SetRecordRPdu()
+ {
+ setPduType( DISPDUType.SET_RECORD_RELIABLE );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += 4; // requestID
+ marshalSize += requiredReliabilityService.getMarshalledSize();
+ marshalSize += 1; // pad1
+ marshalSize += 2; // pad2
+ marshalSize += 4; // pad3
+ marshalSize += 4; // numberOfRecordSets
+ for(int idx=0; idx < recordSets.size(); idx++)
+ {
+ RecordSpecification listElement = recordSets.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link SetRecordRPdu#requestID}*/
+public SetRecordRPdu setRequestID(int pRequestID)
{
- requestID = pRequestID;
- return this;
-}
-
-/** Getter for {@link SetRecordRPdu#requestID}*/
-public int getRequestID()
+ requestID = pRequestID;
+ return this;
+}
+
+/** Getter for {@link SetRecordRPdu#requestID}*/
+public int getRequestID()
{
return requestID;
-}
-
-/** Setter for {@link SetRecordRPdu#requiredReliabilityService}*/
-public SetRecordRPdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
+}
+
+/** Setter for {@link SetRecordRPdu#requiredReliabilityService}*/
+public SetRecordRPdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
{
- requiredReliabilityService = pRequiredReliabilityService;
- return this;
-}
-
-/** Getter for {@link SetRecordRPdu#requiredReliabilityService}*/
-public RequiredReliabilityService getRequiredReliabilityService()
+ requiredReliabilityService = pRequiredReliabilityService;
+ return this;
+}
+
+/** Getter for {@link SetRecordRPdu#requiredReliabilityService}*/
+public RequiredReliabilityService getRequiredReliabilityService()
{
return requiredReliabilityService;
-}
-
-/** Setter for {@link SetRecordRPdu#pad1}*/
-public SetRecordRPdu setPad1(byte pPad1)
+}
+
+/** Setter for {@link SetRecordRPdu#pad1}*/
+public SetRecordRPdu setPad1(byte pPad1)
{
- pad1 = pPad1;
- return this;
-}
-
-/** Getter for {@link SetRecordRPdu#pad1}*/
-public byte getPad1()
+ pad1 = pPad1;
+ return this;
+}
+
+/** Getter for {@link SetRecordRPdu#pad1}*/
+public byte getPad1()
{
return pad1;
-}
-
-/** Setter for {@link SetRecordRPdu#pad2}*/
-public SetRecordRPdu setPad2(short pPad2)
+}
+
+/** Setter for {@link SetRecordRPdu#pad2}*/
+public SetRecordRPdu setPad2(short pPad2)
{
- pad2 = pPad2;
- return this;
-}
-
-/** Getter for {@link SetRecordRPdu#pad2}*/
-public short getPad2()
+ pad2 = pPad2;
+ return this;
+}
+
+/** Getter for {@link SetRecordRPdu#pad2}*/
+public short getPad2()
{
return pad2;
-}
-
-/** Setter for {@link SetRecordRPdu#pad3}*/
-public SetRecordRPdu setPad3(int pPad3)
+}
+
+/** Setter for {@link SetRecordRPdu#pad3}*/
+public SetRecordRPdu setPad3(int pPad3)
{
- pad3 = pPad3;
- return this;
-}
-
-/** Getter for {@link SetRecordRPdu#pad3}*/
-public int getPad3()
+ pad3 = pPad3;
+ return this;
+}
+
+/** Getter for {@link SetRecordRPdu#pad3}*/
+public int getPad3()
{
return pad3;
-}
-
-/** Setter for {@link SetRecordRPdu#recordSets}*/
-public SetRecordRPdu setRecordSets(List<RecordSpecification> pRecordSets)
+}
+
+/** Setter for {@link SetRecordRPdu#recordSets}*/
+public SetRecordRPdu setRecordSets(List<RecordSpecification> pRecordSets)
{
- recordSets = pRecordSets;
- return this;
-}
-
-/** Getter for {@link SetRecordRPdu#recordSets}*/
-public List<RecordSpecification> getRecordSets()
+ recordSets = pRecordSets;
+ return this;
+}
+
+/** Getter for {@link SetRecordRPdu#recordSets}*/
+public List<RecordSpecification> getRecordSets()
{
return recordSets;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- dos.writeInt(requestID);
- requiredReliabilityService.marshal(dos);
- dos.writeByte(pad1);
- dos.writeShort(pad2);
- dos.writeInt(pad3);
- dos.writeInt(recordSets.size());
-
- for(int idx = 0; idx < recordSets.size(); idx++)
- {
- RecordSpecification aRecordSpecification = recordSets.get(idx);
- aRecordSpecification.marshal(dos);
- }
-
+ {
+ dos.writeInt(requestID);
+ requiredReliabilityService.marshal(dos);
+ dos.writeByte(pad1);
+ dos.writeShort(pad2);
+ dos.writeInt(pad3);
+ dos.writeInt(recordSets.size());
+
+ for(int idx = 0; idx < recordSets.size(); idx++)
+ {
+ RecordSpecification aRecordSpecification = recordSets.get(idx);
+ aRecordSpecification.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- requestID = dis.readInt();
- uPosition += 4;
- requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(dis);
- uPosition += requiredReliabilityService.getMarshalledSize();
- pad1 = (byte)dis.readUnsignedByte();
- uPosition += 1;
- pad2 = (short)dis.readUnsignedShort();
- uPosition += 2;
- pad3 = dis.readInt();
- uPosition += 4;
- numberOfRecordSets = dis.readInt();
- uPosition += 4;
- for(int idx = 0; idx < numberOfRecordSets; idx++)
- {
- RecordSpecification anX = new RecordSpecification();
- uPosition += anX.unmarshal(dis);
- recordSets.add(anX);
- }
-
+ {
+ requestID = dis.readInt();
+ uPosition += 4;
+ requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(dis);
+ uPosition += requiredReliabilityService.getMarshalledSize();
+ pad1 = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ pad2 = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ pad3 = dis.readInt();
+ uPosition += 4;
+ numberOfRecordSets = dis.readInt();
+ uPosition += 4;
+ for(int idx = 0; idx < numberOfRecordSets; idx++)
+ {
+ RecordSpecification anX = new RecordSpecification();
+ uPosition += anX.unmarshal(dis);
+ recordSets.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- buff.putInt( (int)requestID);
- requiredReliabilityService.marshal(buff);
- buff.put( (byte)pad1);
- buff.putShort( (short)pad2);
- buff.putInt( (int)pad3);
- buff.putInt( (int)recordSets.size());
-
- for(int idx = 0; idx < recordSets.size(); idx++)
- {
- RecordSpecification aRecordSpecification = recordSets.get(idx);
- aRecordSpecification.marshal(buff);
- }
-
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ buff.putInt( (int)requestID);
+ requiredReliabilityService.marshal(buff);
+ buff.put( (byte)pad1);
+ buff.putShort( (short)pad2);
+ buff.putInt( (int)pad3);
+ buff.putInt( (int)recordSets.size());
+
+ for(int idx = 0; idx < recordSets.size(); idx++)
+ {
+ RecordSpecification aRecordSpecification = recordSets.get(idx);
+ aRecordSpecification.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- requestID = buff.getInt();
- requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(buff);
- pad1 = (byte)(buff.get() & 0xFF);
- pad2 = (short)(buff.getShort() & 0xFFFF);
- pad3 = buff.getInt();
- numberOfRecordSets = buff.getInt();
- for(int idx = 0; idx < numberOfRecordSets; idx++)
- {
- RecordSpecification anX = new RecordSpecification();
- anX.unmarshal(buff);
- recordSets.add(anX);
- }
-
- return getMarshalledSize();
+
+ requestID = buff.getInt();
+ requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(buff);
+ pad1 = (byte)(buff.get() & 0xFF);
+ pad2 = (short)(buff.getShort() & 0xFFFF);
+ pad3 = buff.getInt();
+ numberOfRecordSets = buff.getInt();
+ for(int idx = 0; idx < numberOfRecordSets; idx++)
+ {
+ RecordSpecification anX = new RecordSpecification();
+ anX.unmarshal(buff);
+ recordSets.add(anX);
+ }
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final SetRecordRPdu rhs = (SetRecordRPdu)obj;
-
- if( ! (requestID == rhs.requestID)) ivarsEqual = false;
- if( ! (requiredReliabilityService == rhs.requiredReliabilityService)) ivarsEqual = false;
- if( ! (pad1 == rhs.pad1)) ivarsEqual = false;
- if( ! (pad2 == rhs.pad2)) ivarsEqual = false;
- if( ! (pad3 == rhs.pad3)) ivarsEqual = false;
-
- for(int idx = 0; idx < recordSets.size(); idx++)
- if( ! ( recordSets.get(idx).equals(rhs.recordSets.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final SetRecordRPdu rhs = (SetRecordRPdu)obj;
+
+ if( ! (requestID == rhs.requestID)) ivarsEqual = false;
+ if( ! (requiredReliabilityService == rhs.requiredReliabilityService)) ivarsEqual = false;
+ if( ! (pad1 == rhs.pad1)) ivarsEqual = false;
+ if( ! (pad2 == rhs.pad2)) ivarsEqual = false;
+ if( ! (pad3 == rhs.pad3)) ivarsEqual = false;
+
+ for(int idx = 0; idx < recordSets.size(); idx++)
+ if( ! ( recordSets.get(idx).equals(rhs.recordSets.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" requestID: ").append(requestID).append("\n");
- sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
- sb.append(" pad1: ").append(pad1).append("\n");
- sb.append(" pad2: ").append(pad2).append("\n");
- sb.append(" pad3: ").append(pad3).append("\n");
- sb.append(" recordSets: ").append("\n");
- recordSets.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" requestID: ").append(requestID).append("\n");
+ sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
+ sb.append(" pad1: ").append(pad1).append("\n");
+ sb.append(" pad2: ").append(pad2).append("\n");
+ sb.append(" pad3: ").append(pad3).append("\n");
+ sb.append(" recordSets: ").append("\n");
+ recordSets.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/SetRecordReliablePdu.java b/src-generated/edu/nps/moves/dis7/SetRecordReliablePdu.java
index 1370d05f5663d064dfddc83c04a1f276ca6fe11d..dc2070592711c0b0ee88a0c0d18f4f9801d7ed68 100644
--- a/src-generated/edu/nps/moves/dis7/SetRecordReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/SetRecordReliablePdu.java
@@ -1,17 +1,17 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * more descriptive name for a SetRecordRPdu
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class SetRecordReliablePdu extends SetRecordRPdu
-{}
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * more descriptive name for a SetRecordRPdu
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class SetRecordReliablePdu extends SetRecordRPdu
+{}
diff --git a/src-generated/edu/nps/moves/dis7/ShaftRPM.java b/src-generated/edu/nps/moves/dis7/ShaftRPM.java
index c652cb7f4d421698aef6e7040b94b48f0a1d069b..5aeff9273c8c7705db472358768f774fd126e02d 100644
--- a/src-generated/edu/nps/moves/dis7/ShaftRPM.java
+++ b/src-generated/edu/nps/moves/dis7/ShaftRPM.java
@@ -1,206 +1,206 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class ShaftRPM extends Object implements Serializable
-{
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class ShaftRPM extends Object implements Serializable
+{
protected short currentRPM;
-
+
protected short orderedRPM;
-
+
protected int RPMrateOfChange;
-
-
-/** Constructor */
- public ShaftRPM()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += 2; // currentRPM
- marshalSize += 2; // orderedRPM
- marshalSize += 4; // RPMrateOfChange
-
- return marshalSize;
-}
-
-
-/** Setter for {@link ShaftRPM#currentRPM}*/
-public ShaftRPM setCurrentRPM(short pCurrentRPM)
+
+
+/** Constructor */
+ public ShaftRPM()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 2; // currentRPM
+ marshalSize += 2; // orderedRPM
+ marshalSize += 4; // RPMrateOfChange
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link ShaftRPM#currentRPM}*/
+public ShaftRPM setCurrentRPM(short pCurrentRPM)
{
- currentRPM = pCurrentRPM;
- return this;
-}
-
-/** Getter for {@link ShaftRPM#currentRPM}*/
-public short getCurrentRPM()
+ currentRPM = pCurrentRPM;
+ return this;
+}
+
+/** Getter for {@link ShaftRPM#currentRPM}*/
+public short getCurrentRPM()
{
return currentRPM;
-}
-
-/** Setter for {@link ShaftRPM#orderedRPM}*/
-public ShaftRPM setOrderedRPM(short pOrderedRPM)
+}
+
+/** Setter for {@link ShaftRPM#orderedRPM}*/
+public ShaftRPM setOrderedRPM(short pOrderedRPM)
{
- orderedRPM = pOrderedRPM;
- return this;
-}
-
-/** Getter for {@link ShaftRPM#orderedRPM}*/
-public short getOrderedRPM()
+ orderedRPM = pOrderedRPM;
+ return this;
+}
+
+/** Getter for {@link ShaftRPM#orderedRPM}*/
+public short getOrderedRPM()
{
return orderedRPM;
-}
-
-/** Setter for {@link ShaftRPM#RPMrateOfChange}*/
-public ShaftRPM setRPMrateOfChange(int pRPMrateOfChange)
+}
+
+/** Setter for {@link ShaftRPM#RPMrateOfChange}*/
+public ShaftRPM setRPMrateOfChange(int pRPMrateOfChange)
{
- RPMrateOfChange = pRPMrateOfChange;
- return this;
-}
-
-/** Getter for {@link ShaftRPM#RPMrateOfChange}*/
-public int getRPMrateOfChange()
+ RPMrateOfChange = pRPMrateOfChange;
+ return this;
+}
+
+/** Getter for {@link ShaftRPM#RPMrateOfChange}*/
+public int getRPMrateOfChange()
{
return RPMrateOfChange;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeShort(currentRPM);
- dos.writeShort(orderedRPM);
- dos.writeInt(RPMrateOfChange);
+ {
+ dos.writeShort(currentRPM);
+ dos.writeShort(orderedRPM);
+ dos.writeInt(RPMrateOfChange);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- currentRPM = (short)dis.readUnsignedShort();
- uPosition += 2;
- orderedRPM = (short)dis.readUnsignedShort();
- uPosition += 2;
- RPMrateOfChange = dis.readInt();
- uPosition += 4;
+ {
+ currentRPM = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ orderedRPM = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ RPMrateOfChange = dis.readInt();
+ uPosition += 4;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putShort( (short)currentRPM);
- buff.putShort( (short)orderedRPM);
- buff.putInt( (int)RPMrateOfChange);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- currentRPM = (short)(buff.getShort() & 0xFFFF);
- orderedRPM = (short)(buff.getShort() & 0xFFFF);
- RPMrateOfChange = buff.getInt();
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putShort( (short)currentRPM);
+ buff.putShort( (short)orderedRPM);
+ buff.putInt( (int)RPMrateOfChange);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ currentRPM = (short)(buff.getShort() & 0xFFFF);
+ orderedRPM = (short)(buff.getShort() & 0xFFFF);
+ RPMrateOfChange = buff.getInt();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final ShaftRPM rhs = (ShaftRPM)obj;
-
- if( ! (currentRPM == rhs.currentRPM)) ivarsEqual = false;
- if( ! (orderedRPM == rhs.orderedRPM)) ivarsEqual = false;
- if( ! (RPMrateOfChange == rhs.RPMrateOfChange)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final ShaftRPM rhs = (ShaftRPM)obj;
+
+ if( ! (currentRPM == rhs.currentRPM)) ivarsEqual = false;
+ if( ! (orderedRPM == rhs.orderedRPM)) ivarsEqual = false;
+ if( ! (RPMrateOfChange == rhs.RPMrateOfChange)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" currentRPM: ").append(currentRPM).append("\n");
- sb.append(" orderedRPM: ").append(orderedRPM).append("\n");
- sb.append(" RPMrateOfChange: ").append(RPMrateOfChange).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" currentRPM: ").append(currentRPM).append("\n");
+ sb.append(" orderedRPM: ").append(orderedRPM).append("\n");
+ sb.append(" RPMrateOfChange: ").append(RPMrateOfChange).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/SilentEntitySystem.java b/src-generated/edu/nps/moves/dis7/SilentEntitySystem.java
index b2c1eeefef43559dfc237960a34007500732adf6..28aab81d448a3fe3c6382790e356b05188ba06b5 100644
--- a/src-generated/edu/nps/moves/dis7/SilentEntitySystem.java
+++ b/src-generated/edu/nps/moves/dis7/SilentEntitySystem.java
@@ -1,232 +1,232 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * information abou an enitity not producing espdus. Section 6.2.79
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class SilentEntitySystem extends Object implements Serializable
-{
- /** number of the type specified by the entity type field */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * information abou an enitity not producing espdus. Section 6.2.79
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class SilentEntitySystem extends Object implements Serializable
+{
+ /** number of the type specified by the entity type field */
protected short numberOfEntities;
-
- /** number of entity appearance records that follow */
+
+ /** number of entity appearance records that follow */
protected short numberOfAppearanceRecords;
-
- /** Entity type */
+
+ /** Entity type */
protected EntityType entityType = new EntityType();
-
- /** Variable length list of appearance records */
+
+ /** Variable length list of appearance records */
protected int[] appearanceRecordList = new int[0];
-
-
-/** Constructor */
- public SilentEntitySystem()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += 2; // numberOfEntities
- marshalSize += 2; // numberOfAppearanceRecords
- marshalSize += entityType.getMarshalledSize();
- marshalSize += appearanceRecordList.length * 4;
-
- return marshalSize;
-}
-
-
-/** Setter for {@link SilentEntitySystem#numberOfEntities}*/
-public SilentEntitySystem setNumberOfEntities(short pNumberOfEntities)
+
+
+/** Constructor */
+ public SilentEntitySystem()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 2; // numberOfEntities
+ marshalSize += 2; // numberOfAppearanceRecords
+ marshalSize += entityType.getMarshalledSize();
+ marshalSize += appearanceRecordList.length * 4;
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link SilentEntitySystem#numberOfEntities}*/
+public SilentEntitySystem setNumberOfEntities(short pNumberOfEntities)
{
- numberOfEntities = pNumberOfEntities;
- return this;
-}
-
-/** Getter for {@link SilentEntitySystem#numberOfEntities}*/
-public short getNumberOfEntities()
+ numberOfEntities = pNumberOfEntities;
+ return this;
+}
+
+/** Getter for {@link SilentEntitySystem#numberOfEntities}*/
+public short getNumberOfEntities()
{
return numberOfEntities;
-}
-
-/** Setter for {@link SilentEntitySystem#entityType}*/
-public SilentEntitySystem setEntityType(EntityType pEntityType)
+}
+
+/** Setter for {@link SilentEntitySystem#entityType}*/
+public SilentEntitySystem setEntityType(EntityType pEntityType)
{
- entityType = pEntityType;
- return this;
-}
-
-/** Getter for {@link SilentEntitySystem#entityType}*/
-public EntityType getEntityType()
+ entityType = pEntityType;
+ return this;
+}
+
+/** Getter for {@link SilentEntitySystem#entityType}*/
+public EntityType getEntityType()
{
return entityType;
-}
-
-/** Setter for {@link SilentEntitySystem#appearanceRecordList}*/
-public SilentEntitySystem setAppearanceRecordList(int[] pAppearanceRecordList)
+}
+
+/** Setter for {@link SilentEntitySystem#appearanceRecordList}*/
+public SilentEntitySystem setAppearanceRecordList(int[] pAppearanceRecordList)
{
- appearanceRecordList = pAppearanceRecordList;
- return this;
-}
-
-/** Getter for {@link SilentEntitySystem#appearanceRecordList}*/
-public int[] getAppearanceRecordList()
+ appearanceRecordList = pAppearanceRecordList;
+ return this;
+}
+
+/** Getter for {@link SilentEntitySystem#appearanceRecordList}*/
+public int[] getAppearanceRecordList()
{
return appearanceRecordList;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeShort(numberOfEntities);
- dos.writeShort(appearanceRecordList.length);
- entityType.marshal(dos);
-
- for(int idx = 0; idx < appearanceRecordList.length; idx++)
- dos.writeInt(appearanceRecordList[idx]);
-
+ {
+ dos.writeShort(numberOfEntities);
+ dos.writeShort(appearanceRecordList.length);
+ entityType.marshal(dos);
+
+ for(int idx = 0; idx < appearanceRecordList.length; idx++)
+ dos.writeInt(appearanceRecordList[idx]);
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- numberOfEntities = (short)dis.readUnsignedShort();
- uPosition += 2;
- numberOfAppearanceRecords = (short)dis.readUnsignedShort();
- uPosition += 2;
- uPosition += entityType.unmarshal(dis);
- for(int idx = 0; idx < appearanceRecordList.length; idx++)
- appearanceRecordList[idx] = dis.readInt();
- uPosition += (appearanceRecordList.length * 4);
+ {
+ numberOfEntities = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ numberOfAppearanceRecords = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ uPosition += entityType.unmarshal(dis);
+ for(int idx = 0; idx < appearanceRecordList.length; idx++)
+ appearanceRecordList[idx] = dis.readInt();
+ uPosition += (appearanceRecordList.length * 4);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putShort( (short)numberOfEntities);
- buff.putShort( (short)appearanceRecordList.length);
- entityType.marshal(buff);
-
- for(int idx = 0; idx < appearanceRecordList.length; idx++)
- buff.putInt((int)appearanceRecordList[idx]);
-
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- numberOfEntities = (short)(buff.getShort() & 0xFFFF);
- numberOfAppearanceRecords = (short)(buff.getShort() & 0xFFFF);
- entityType.unmarshal(buff);
- for(int idx = 0; idx < appearanceRecordList.length; idx++)
- appearanceRecordList[idx] = buff.getInt();
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putShort( (short)numberOfEntities);
+ buff.putShort( (short)appearanceRecordList.length);
+ entityType.marshal(buff);
+
+ for(int idx = 0; idx < appearanceRecordList.length; idx++)
+ buff.putInt((int)appearanceRecordList[idx]);
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ numberOfEntities = (short)(buff.getShort() & 0xFFFF);
+ numberOfAppearanceRecords = (short)(buff.getShort() & 0xFFFF);
+ entityType.unmarshal(buff);
+ for(int idx = 0; idx < appearanceRecordList.length; idx++)
+ appearanceRecordList[idx] = buff.getInt();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final SilentEntitySystem rhs = (SilentEntitySystem)obj;
-
- if( ! (numberOfEntities == rhs.numberOfEntities)) ivarsEqual = false;
- if( ! (entityType.equals( rhs.entityType) )) ivarsEqual = false;
-
- for(int idx = 0; idx < 0; idx++)
- {
- if(!(appearanceRecordList[idx] == rhs.appearanceRecordList[idx])) ivarsEqual = false;
- }
-
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final SilentEntitySystem rhs = (SilentEntitySystem)obj;
+
+ if( ! (numberOfEntities == rhs.numberOfEntities)) ivarsEqual = false;
+ if( ! (entityType.equals( rhs.entityType) )) ivarsEqual = false;
+
+ for(int idx = 0; idx < 0; idx++)
+ {
+ if(!(appearanceRecordList[idx] == rhs.appearanceRecordList[idx])) ivarsEqual = false;
+ }
+
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" numberOfEntities: ").append(numberOfEntities).append("\n");
- sb.append(" entityType: ").append(entityType).append("\n");
- sb.append(" appearanceRecordList: ").append("\n");
- sb.append(Arrays.toString(appearanceRecordList)).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" numberOfEntities: ").append(numberOfEntities).append("\n");
+ sb.append(" entityType: ").append(entityType).append("\n");
+ sb.append(" appearanceRecordList: ").append("\n");
+ sb.append(Arrays.toString(appearanceRecordList)).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/SimulationAddress.java b/src-generated/edu/nps/moves/dis7/SimulationAddress.java
index ea094da512cbfc85bb0b086e4eedbebaaf5abca9..a5a6211d9ad810b3e46470a15d9adc3863531516 100644
--- a/src-generated/edu/nps/moves/dis7/SimulationAddress.java
+++ b/src-generated/edu/nps/moves/dis7/SimulationAddress.java
@@ -1,186 +1,186 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * A Simulation Address record shall consist of the Site Identification number and the Application Identification number. Section 6.2.79
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class SimulationAddress extends Object implements Serializable
-{
- /** A site is defined as a facility, installation, organizational unit or a geographic location that has one or more simulation applications capable of participating in a distributed event. */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * A Simulation Address record shall consist of the Site Identification number and the Application Identification number. Section 6.2.79
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class SimulationAddress extends Object implements Serializable
+{
+ /** A site is defined as a facility, installation, organizational unit or a geographic location that has one or more simulation applications capable of participating in a distributed event. */
protected short site;
-
- /** An application is defined as a software program that is used to generate and process distributed simulation data including live, virtual and constructive data. */
+
+ /** An application is defined as a software program that is used to generate and process distributed simulation data including live, virtual and constructive data. */
protected short application;
-
-
-/** Constructor */
- public SimulationAddress()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += 2; // site
- marshalSize += 2; // application
-
- return marshalSize;
-}
-
-
-/** Setter for {@link SimulationAddress#site}*/
-public SimulationAddress setSite(short pSite)
+
+
+/** Constructor */
+ public SimulationAddress()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 2; // site
+ marshalSize += 2; // application
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link SimulationAddress#site}*/
+public SimulationAddress setSite(short pSite)
{
- site = pSite;
- return this;
-}
-
-/** Getter for {@link SimulationAddress#site}*/
-public short getSite()
+ site = pSite;
+ return this;
+}
+
+/** Getter for {@link SimulationAddress#site}*/
+public short getSite()
{
return site;
-}
-
-/** Setter for {@link SimulationAddress#application}*/
-public SimulationAddress setApplication(short pApplication)
+}
+
+/** Setter for {@link SimulationAddress#application}*/
+public SimulationAddress setApplication(short pApplication)
{
- application = pApplication;
- return this;
-}
-
-/** Getter for {@link SimulationAddress#application}*/
-public short getApplication()
+ application = pApplication;
+ return this;
+}
+
+/** Getter for {@link SimulationAddress#application}*/
+public short getApplication()
{
return application;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeShort(site);
- dos.writeShort(application);
+ {
+ dos.writeShort(site);
+ dos.writeShort(application);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- site = (short)dis.readUnsignedShort();
- uPosition += 2;
- application = (short)dis.readUnsignedShort();
- uPosition += 2;
+ {
+ site = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ application = (short)dis.readUnsignedShort();
+ uPosition += 2;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putShort( (short)site);
- buff.putShort( (short)application);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- site = (short)(buff.getShort() & 0xFFFF);
- application = (short)(buff.getShort() & 0xFFFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putShort( (short)site);
+ buff.putShort( (short)application);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ site = (short)(buff.getShort() & 0xFFFF);
+ application = (short)(buff.getShort() & 0xFFFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final SimulationAddress rhs = (SimulationAddress)obj;
-
- if( ! (site == rhs.site)) ivarsEqual = false;
- if( ! (application == rhs.application)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final SimulationAddress rhs = (SimulationAddress)obj;
+
+ if( ! (site == rhs.site)) ivarsEqual = false;
+ if( ! (application == rhs.application)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" site: ").append(site).append("\n");
- sb.append(" application: ").append(application).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" site: ").append(site).append("\n");
+ sb.append(" application: ").append(application).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/SimulationIdentifier.java b/src-generated/edu/nps/moves/dis7/SimulationIdentifier.java
index 11126ff270c2af86977e8c33d92bdf464dff7dbd..904f5fa90422cbbda396cc2d807a9ea51f90840e 100644
--- a/src-generated/edu/nps/moves/dis7/SimulationIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/SimulationIdentifier.java
@@ -1,185 +1,185 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * The unique designation of a simulation when using the 48-bit identifier format shall be specified by the Sim- ulation Identifier record. The reason that the 48-bit format is required in addition to the 32-bit simulation address format that actually identifies a specific simulation is because some 48-bit identifier fields in PDUs may contain either an Object Identifier, such as an Entity ID, or a Simulation Identifier. Section 6.2.80
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class SimulationIdentifier extends Object implements Serializable
-{
- /** Simulation address */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * The unique designation of a simulation when using the 48-bit identifier format shall be specified by the Sim- ulation Identifier record. The reason that the 48-bit format is required in addition to the 32-bit simulation address format that actually identifies a specific simulation is because some 48-bit identifier fields in PDUs may contain either an Object Identifier, such as an Entity ID, or a Simulation Identifier. Section 6.2.80
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class SimulationIdentifier extends Object implements Serializable
+{
+ /** Simulation address */
protected SimulationAddress simulationAddress = new SimulationAddress();
-
- /** This field shall be set to zero as there is no reference number associated with a Simulation Identifier. */
+
+ /** This field shall be set to zero as there is no reference number associated with a Simulation Identifier. */
protected short referenceNumber = (short)0;
-
-
-/** Constructor */
- public SimulationIdentifier()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += simulationAddress.getMarshalledSize();
- marshalSize += 2; // referenceNumber
-
- return marshalSize;
-}
-
-
-/** Setter for {@link SimulationIdentifier#simulationAddress}*/
-public SimulationIdentifier setSimulationAddress(SimulationAddress pSimulationAddress)
+
+
+/** Constructor */
+ public SimulationIdentifier()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += simulationAddress.getMarshalledSize();
+ marshalSize += 2; // referenceNumber
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link SimulationIdentifier#simulationAddress}*/
+public SimulationIdentifier setSimulationAddress(SimulationAddress pSimulationAddress)
{
- simulationAddress = pSimulationAddress;
- return this;
-}
-
-/** Getter for {@link SimulationIdentifier#simulationAddress}*/
-public SimulationAddress getSimulationAddress()
+ simulationAddress = pSimulationAddress;
+ return this;
+}
+
+/** Getter for {@link SimulationIdentifier#simulationAddress}*/
+public SimulationAddress getSimulationAddress()
{
return simulationAddress;
-}
-
-/** Setter for {@link SimulationIdentifier#referenceNumber}*/
-public SimulationIdentifier setReferenceNumber(short pReferenceNumber)
+}
+
+/** Setter for {@link SimulationIdentifier#referenceNumber}*/
+public SimulationIdentifier setReferenceNumber(short pReferenceNumber)
{
- referenceNumber = pReferenceNumber;
- return this;
-}
-
-/** Getter for {@link SimulationIdentifier#referenceNumber}*/
-public short getReferenceNumber()
+ referenceNumber = pReferenceNumber;
+ return this;
+}
+
+/** Getter for {@link SimulationIdentifier#referenceNumber}*/
+public short getReferenceNumber()
{
return referenceNumber;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- simulationAddress.marshal(dos);
- dos.writeShort(referenceNumber);
+ {
+ simulationAddress.marshal(dos);
+ dos.writeShort(referenceNumber);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- uPosition += simulationAddress.unmarshal(dis);
- referenceNumber = (short)dis.readUnsignedShort();
- uPosition += 2;
+ {
+ uPosition += simulationAddress.unmarshal(dis);
+ referenceNumber = (short)dis.readUnsignedShort();
+ uPosition += 2;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- simulationAddress.marshal(buff);
- buff.putShort( (short)referenceNumber);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- simulationAddress.unmarshal(buff);
- referenceNumber = (short)(buff.getShort() & 0xFFFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ simulationAddress.marshal(buff);
+ buff.putShort( (short)referenceNumber);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ simulationAddress.unmarshal(buff);
+ referenceNumber = (short)(buff.getShort() & 0xFFFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final SimulationIdentifier rhs = (SimulationIdentifier)obj;
-
- if( ! (simulationAddress.equals( rhs.simulationAddress) )) ivarsEqual = false;
- if( ! (referenceNumber == rhs.referenceNumber)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final SimulationIdentifier rhs = (SimulationIdentifier)obj;
+
+ if( ! (simulationAddress.equals( rhs.simulationAddress) )) ivarsEqual = false;
+ if( ! (referenceNumber == rhs.referenceNumber)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
- sb.append(" referenceNumber: ").append(referenceNumber).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
+ sb.append(" referenceNumber: ").append(referenceNumber).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/SimulationManagementFamilyPdu.java b/src-generated/edu/nps/moves/dis7/SimulationManagementFamilyPdu.java
index d771726df043b593a5ecef5bd1cf2c9c5cedd5e4..76cc5853b227edd8237971307b40c8ef2970a8a8 100644
--- a/src-generated/edu/nps/moves/dis7/SimulationManagementFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/SimulationManagementFamilyPdu.java
@@ -1,187 +1,187 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * First part of a simulation management (SIMAN) PDU and SIMAN-Reliability (SIMAN-R) PDU. Sectionn 6.2.81
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public abstract class SimulationManagementFamilyPdu extends PduBase implements Serializable
-{
- /** IDs the simulation or entity, either a simulation or an entity. Either 6.2.80 or 6.2.28 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * First part of a simulation management (SIMAN) PDU and SIMAN-Reliability (SIMAN-R) PDU. Sectionn 6.2.81
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public abstract class SimulationManagementFamilyPdu extends PduBase implements Serializable
+{
+ /** IDs the simulation or entity, either a simulation or an entity. Either 6.2.80 or 6.2.28 */
protected SimulationIdentifier originatingID = new SimulationIdentifier();
-
- /** simulation, all simulations, a special ID, or an entity. See 5.6.5 and 5.12.4 */
+
+ /** simulation, all simulations, a special ID, or an entity. See 5.6.5 and 5.12.4 */
protected SimulationIdentifier receivingID = new SimulationIdentifier();
-
-
-/** Constructor */
- public SimulationManagementFamilyPdu()
- {
- setProtocolFamily( DISProtocolFamily.SIMULATION_MANAGEMENT );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += originatingID.getMarshalledSize();
- marshalSize += receivingID.getMarshalledSize();
-
- return marshalSize;
-}
-
-
-/** Setter for {@link SimulationManagementFamilyPdu#originatingID}*/
-public SimulationManagementFamilyPdu setOriginatingID(SimulationIdentifier pOriginatingID)
+
+
+/** Constructor */
+ public SimulationManagementFamilyPdu()
+ {
+ setProtocolFamily( DISProtocolFamily.SIMULATION_MANAGEMENT );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += originatingID.getMarshalledSize();
+ marshalSize += receivingID.getMarshalledSize();
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link SimulationManagementFamilyPdu#originatingID}*/
+public SimulationManagementFamilyPdu setOriginatingID(SimulationIdentifier pOriginatingID)
{
- originatingID = pOriginatingID;
- return this;
-}
-
-/** Getter for {@link SimulationManagementFamilyPdu#originatingID}*/
-public SimulationIdentifier getOriginatingID()
+ originatingID = pOriginatingID;
+ return this;
+}
+
+/** Getter for {@link SimulationManagementFamilyPdu#originatingID}*/
+public SimulationIdentifier getOriginatingID()
{
return originatingID;
-}
-
-/** Setter for {@link SimulationManagementFamilyPdu#receivingID}*/
-public SimulationManagementFamilyPdu setReceivingID(SimulationIdentifier pReceivingID)
+}
+
+/** Setter for {@link SimulationManagementFamilyPdu#receivingID}*/
+public SimulationManagementFamilyPdu setReceivingID(SimulationIdentifier pReceivingID)
{
- receivingID = pReceivingID;
- return this;
-}
-
-/** Getter for {@link SimulationManagementFamilyPdu#receivingID}*/
-public SimulationIdentifier getReceivingID()
+ receivingID = pReceivingID;
+ return this;
+}
+
+/** Getter for {@link SimulationManagementFamilyPdu#receivingID}*/
+public SimulationIdentifier getReceivingID()
{
return receivingID;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- originatingID.marshal(dos);
- receivingID.marshal(dos);
+ {
+ originatingID.marshal(dos);
+ receivingID.marshal(dos);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += originatingID.unmarshal(dis);
- uPosition += receivingID.unmarshal(dis);
+ {
+ uPosition += originatingID.unmarshal(dis);
+ uPosition += receivingID.unmarshal(dis);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- originatingID.marshal(buff);
- receivingID.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ originatingID.marshal(buff);
+ receivingID.marshal(buff);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- originatingID.unmarshal(buff);
- receivingID.unmarshal(buff);
- return getMarshalledSize();
+
+ originatingID.unmarshal(buff);
+ receivingID.unmarshal(buff);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final SimulationManagementFamilyPdu rhs = (SimulationManagementFamilyPdu)obj;
-
- if( ! (originatingID.equals( rhs.originatingID) )) ivarsEqual = false;
- if( ! (receivingID.equals( rhs.receivingID) )) ivarsEqual = false;
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final SimulationManagementFamilyPdu rhs = (SimulationManagementFamilyPdu)obj;
+
+ if( ! (originatingID.equals( rhs.originatingID) )) ivarsEqual = false;
+ if( ! (receivingID.equals( rhs.receivingID) )) ivarsEqual = false;
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" originatingID: ").append(originatingID).append("\n");
- sb.append(" receivingID: ").append(receivingID).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" originatingID: ").append(originatingID).append("\n");
+ sb.append(" receivingID: ").append(receivingID).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/SimulationManagementWithReliabilityFamilyPdu.java b/src-generated/edu/nps/moves/dis7/SimulationManagementWithReliabilityFamilyPdu.java
index a25ab49bf55c4e2244f4abdac69e958127a3e3d0..683ec72f215d7fe16a18f7572c278fdf65d5036c 100644
--- a/src-generated/edu/nps/moves/dis7/SimulationManagementWithReliabilityFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/SimulationManagementWithReliabilityFamilyPdu.java
@@ -1,186 +1,186 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public abstract class SimulationManagementWithReliabilityFamilyPdu extends PduBase implements Serializable
-{
- /** IDs the simulation or entity, either a simulation or an entity. Either 6.2.80 or 6.2.28 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public abstract class SimulationManagementWithReliabilityFamilyPdu extends PduBase implements Serializable
+{
+ /** IDs the simulation or entity, either a simulation or an entity. Either 6.2.80 or 6.2.28 */
protected SimulationIdentifier originatingID = new SimulationIdentifier();
-
- /** simulation, all simulations, a special ID, or an entity. See 5.6.5 and 5.12.4 */
+
+ /** simulation, all simulations, a special ID, or an entity. See 5.6.5 and 5.12.4 */
protected SimulationIdentifier receivingID = new SimulationIdentifier();
-
-
-/** Constructor */
- public SimulationManagementWithReliabilityFamilyPdu()
- {
- setProtocolFamily( DISProtocolFamily.SIMULATION_MANAGEMENT_WITH_RELIABILITY );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += originatingID.getMarshalledSize();
- marshalSize += receivingID.getMarshalledSize();
-
- return marshalSize;
-}
-
-
-/** Setter for {@link SimulationManagementWithReliabilityFamilyPdu#originatingID}*/
-public SimulationManagementWithReliabilityFamilyPdu setOriginatingID(SimulationIdentifier pOriginatingID)
+
+
+/** Constructor */
+ public SimulationManagementWithReliabilityFamilyPdu()
+ {
+ setProtocolFamily( DISProtocolFamily.SIMULATION_MANAGEMENT_WITH_RELIABILITY );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += originatingID.getMarshalledSize();
+ marshalSize += receivingID.getMarshalledSize();
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link SimulationManagementWithReliabilityFamilyPdu#originatingID}*/
+public SimulationManagementWithReliabilityFamilyPdu setOriginatingID(SimulationIdentifier pOriginatingID)
{
- originatingID = pOriginatingID;
- return this;
-}
-
-/** Getter for {@link SimulationManagementWithReliabilityFamilyPdu#originatingID}*/
-public SimulationIdentifier getOriginatingID()
+ originatingID = pOriginatingID;
+ return this;
+}
+
+/** Getter for {@link SimulationManagementWithReliabilityFamilyPdu#originatingID}*/
+public SimulationIdentifier getOriginatingID()
{
return originatingID;
-}
-
-/** Setter for {@link SimulationManagementWithReliabilityFamilyPdu#receivingID}*/
-public SimulationManagementWithReliabilityFamilyPdu setReceivingID(SimulationIdentifier pReceivingID)
+}
+
+/** Setter for {@link SimulationManagementWithReliabilityFamilyPdu#receivingID}*/
+public SimulationManagementWithReliabilityFamilyPdu setReceivingID(SimulationIdentifier pReceivingID)
{
- receivingID = pReceivingID;
- return this;
-}
-
-/** Getter for {@link SimulationManagementWithReliabilityFamilyPdu#receivingID}*/
-public SimulationIdentifier getReceivingID()
+ receivingID = pReceivingID;
+ return this;
+}
+
+/** Getter for {@link SimulationManagementWithReliabilityFamilyPdu#receivingID}*/
+public SimulationIdentifier getReceivingID()
{
return receivingID;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- originatingID.marshal(dos);
- receivingID.marshal(dos);
+ {
+ originatingID.marshal(dos);
+ receivingID.marshal(dos);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += originatingID.unmarshal(dis);
- uPosition += receivingID.unmarshal(dis);
+ {
+ uPosition += originatingID.unmarshal(dis);
+ uPosition += receivingID.unmarshal(dis);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- originatingID.marshal(buff);
- receivingID.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ originatingID.marshal(buff);
+ receivingID.marshal(buff);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- originatingID.unmarshal(buff);
- receivingID.unmarshal(buff);
- return getMarshalledSize();
+
+ originatingID.unmarshal(buff);
+ receivingID.unmarshal(buff);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final SimulationManagementWithReliabilityFamilyPdu rhs = (SimulationManagementWithReliabilityFamilyPdu)obj;
-
- if( ! (originatingID.equals( rhs.originatingID) )) ivarsEqual = false;
- if( ! (receivingID.equals( rhs.receivingID) )) ivarsEqual = false;
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final SimulationManagementWithReliabilityFamilyPdu rhs = (SimulationManagementWithReliabilityFamilyPdu)obj;
+
+ if( ! (originatingID.equals( rhs.originatingID) )) ivarsEqual = false;
+ if( ! (receivingID.equals( rhs.receivingID) )) ivarsEqual = false;
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" originatingID: ").append(originatingID).append("\n");
- sb.append(" receivingID: ").append(receivingID).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" originatingID: ").append(originatingID).append("\n");
+ sb.append(" receivingID: ").append(receivingID).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/StandardVariableRecord.java b/src-generated/edu/nps/moves/dis7/StandardVariableRecord.java
index 4b6859b969deddac639e4b790cef17e99777b0b6..64bec6b92cb5afc1f07ae50442f4154974775dfd 100644
--- a/src-generated/edu/nps/moves/dis7/StandardVariableRecord.java
+++ b/src-generated/edu/nps/moves/dis7/StandardVariableRecord.java
@@ -1,216 +1,216 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Section 6.2.83
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class StandardVariableRecord extends Object implements Serializable
-{
- /** uid 66 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Section 6.2.83
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class StandardVariableRecord extends Object implements Serializable
+{
+ /** uid 66 */
protected VariableRecordType recordType = VariableRecordType.values()[0];
-
+
protected short recordLength;
-
+
protected byte[] recordSpecificFields = new byte[0];
-
+
private byte[] padding = new byte[0]; // pad to 64-bit boundary
-
-
-/** Constructor */
- public StandardVariableRecord()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += recordType.getMarshalledSize();
- marshalSize += 2; // recordLength
- marshalSize += recordSpecificFields.length * 1;
- marshalSize += padding.length;
-
- return marshalSize;
-}
-
-
-/** Setter for {@link StandardVariableRecord#recordType}*/
-public StandardVariableRecord setRecordType(VariableRecordType pRecordType)
+
+
+/** Constructor */
+ public StandardVariableRecord()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += recordType.getMarshalledSize();
+ marshalSize += 2; // recordLength
+ marshalSize += recordSpecificFields.length * 1;
+ marshalSize += padding.length;
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link StandardVariableRecord#recordType}*/
+public StandardVariableRecord setRecordType(VariableRecordType pRecordType)
{
- recordType = pRecordType;
- return this;
-}
-
-/** Getter for {@link StandardVariableRecord#recordType}*/
-public VariableRecordType getRecordType()
+ recordType = pRecordType;
+ return this;
+}
+
+/** Getter for {@link StandardVariableRecord#recordType}*/
+public VariableRecordType getRecordType()
{
return recordType;
-}
-
-/** Setter for {@link StandardVariableRecord#recordSpecificFields}*/
-public StandardVariableRecord setRecordSpecificFields(byte[] pRecordSpecificFields)
+}
+
+/** Setter for {@link StandardVariableRecord#recordSpecificFields}*/
+public StandardVariableRecord setRecordSpecificFields(byte[] pRecordSpecificFields)
{
- recordSpecificFields = pRecordSpecificFields;
- return this;
-}
-
-/** Getter for {@link StandardVariableRecord#recordSpecificFields}*/
-public byte[] getRecordSpecificFields()
+ recordSpecificFields = pRecordSpecificFields;
+ return this;
+}
+
+/** Getter for {@link StandardVariableRecord#recordSpecificFields}*/
+public byte[] getRecordSpecificFields()
{
return recordSpecificFields;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- recordType.marshal(dos);
- dos.writeShort(recordSpecificFields.length);
-
- for(int idx = 0; idx < recordSpecificFields.length; idx++)
- dos.writeByte(recordSpecificFields[idx]);
-
- padding = new byte[Align.to64bits(dos)];
+ {
+ recordType.marshal(dos);
+ dos.writeShort(recordSpecificFields.length);
+
+ for(int idx = 0; idx < recordSpecificFields.length; idx++)
+ dos.writeByte(recordSpecificFields[idx]);
+
+ padding = new byte[Align.to64bits(dos)];
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- recordType = VariableRecordType.unmarshalEnum(dis);
- uPosition += recordType.getMarshalledSize();
- recordLength = (short)dis.readUnsignedShort();
- uPosition += 2;
- for(int idx = 0; idx < recordSpecificFields.length; idx++)
- recordSpecificFields[idx] = dis.readByte();
- uPosition += (recordSpecificFields.length * 1);
- padding = new byte[Align.from64bits(uPosition,dis)];
- uPosition += padding.length;
+ {
+ recordType = VariableRecordType.unmarshalEnum(dis);
+ uPosition += recordType.getMarshalledSize();
+ recordLength = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ for(int idx = 0; idx < recordSpecificFields.length; idx++)
+ recordSpecificFields[idx] = dis.readByte();
+ uPosition += (recordSpecificFields.length * 1);
+ padding = new byte[Align.from64bits(uPosition,dis)];
+ uPosition += padding.length;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- recordType.marshal(buff);
- buff.putShort( (short)recordSpecificFields.length);
-
- for(int idx = 0; idx < recordSpecificFields.length; idx++)
- buff.put((byte)recordSpecificFields[idx]);
-
- padding = new byte[Align.to64bits(buff)];
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- recordType = VariableRecordType.unmarshalEnum(buff);
- recordLength = (short)(buff.getShort() & 0xFFFF);
- for(int idx = 0; idx < recordSpecificFields.length; idx++)
- recordSpecificFields[idx] = buff.get();
- padding = new byte[Align.from64bits(buff)];
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ recordType.marshal(buff);
+ buff.putShort( (short)recordSpecificFields.length);
+
+ for(int idx = 0; idx < recordSpecificFields.length; idx++)
+ buff.put((byte)recordSpecificFields[idx]);
+
+ padding = new byte[Align.to64bits(buff)];
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ recordType = VariableRecordType.unmarshalEnum(buff);
+ recordLength = (short)(buff.getShort() & 0xFFFF);
+ for(int idx = 0; idx < recordSpecificFields.length; idx++)
+ recordSpecificFields[idx] = buff.get();
+ padding = new byte[Align.from64bits(buff)];
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final StandardVariableRecord rhs = (StandardVariableRecord)obj;
-
- if( ! (recordType == rhs.recordType)) ivarsEqual = false;
-
- for(int idx = 0; idx < 0; idx++)
- {
- if(!(recordSpecificFields[idx] == rhs.recordSpecificFields[idx])) ivarsEqual = false;
- }
-
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final StandardVariableRecord rhs = (StandardVariableRecord)obj;
+
+ if( ! (recordType == rhs.recordType)) ivarsEqual = false;
+
+ for(int idx = 0; idx < 0; idx++)
+ {
+ if(!(recordSpecificFields[idx] == rhs.recordSpecificFields[idx])) ivarsEqual = false;
+ }
+
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" recordType: ").append(recordType).append("\n");
- sb.append(" recordSpecificFields: ").append("\n");
- sb.append(Arrays.toString(recordSpecificFields)).append("\n");
- sb.append(" padding: ").append(padding).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" recordType: ").append(recordType).append("\n");
+ sb.append(" recordSpecificFields: ").append("\n");
+ sb.append(Arrays.toString(recordSpecificFields)).append("\n");
+ sb.append(" padding: ").append(padding).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/StandardVariableSpecification.java b/src-generated/edu/nps/moves/dis7/StandardVariableSpecification.java
index 764305b4ccff650aac23ea83be2168a63a6eea86..073f3a34fbe15fe5c630b51e1587cb07b546a9a6 100644
--- a/src-generated/edu/nps/moves/dis7/StandardVariableSpecification.java
+++ b/src-generated/edu/nps/moves/dis7/StandardVariableSpecification.java
@@ -1,219 +1,219 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Does not work, and causes failure in anything it is embedded in. Section 6.2.83
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class StandardVariableSpecification extends Object implements Serializable
-{
- /** Number of static variable records */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Does not work, and causes failure in anything it is embedded in. Section 6.2.83
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class StandardVariableSpecification extends Object implements Serializable
+{
+ /** Number of static variable records */
protected short numberOfStandardVariableRecords;
-
- /** variable length list of standard variables, The class type and length here are WRONG and will cause the incorrect serialization of any class in whihc it is embedded. */
+
+ /** variable length list of standard variables, The class type and length here are WRONG and will cause the incorrect serialization of any class in whihc it is embedded. */
protected List< StandardVariableRecord > standardVariables = new ArrayList< StandardVariableRecord >();
-
-
-/** Constructor */
- public StandardVariableSpecification()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += 2; // numberOfStandardVariableRecords
- for(int idx=0; idx < standardVariables.size(); idx++)
- {
- StandardVariableRecord listElement = standardVariables.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-public short getNumberOfStandardVariableRecords()
+
+
+/** Constructor */
+ public StandardVariableSpecification()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 2; // numberOfStandardVariableRecords
+ for(int idx=0; idx < standardVariables.size(); idx++)
+ {
+ StandardVariableRecord listElement = standardVariables.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+public short getNumberOfStandardVariableRecords()
{
return (short)standardVariables.size();
-}
-
-/* Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
- * The getnumberOfStandardVariableRecords method will also be based on the actual list length rather than this value.
- * The method is simply here for java bean completeness.
- */
-public StandardVariableSpecification setNumberOfStandardVariableRecords(short pNumberOfStandardVariableRecords)
+}
+
+/* Note that setting this value will not change the marshalled value. The list whose length this describes is used for that purpose.
+ * The getnumberOfStandardVariableRecords method will also be based on the actual list length rather than this value.
+ * The method is simply here for java bean completeness.
+ */
+public StandardVariableSpecification setNumberOfStandardVariableRecords(short pNumberOfStandardVariableRecords)
{
- numberOfStandardVariableRecords = pNumberOfStandardVariableRecords;
- return this;
-}
-
-/** Setter for {@link StandardVariableSpecification#standardVariables}*/
-public StandardVariableSpecification setStandardVariables(List<StandardVariableRecord> pStandardVariables)
+ numberOfStandardVariableRecords = pNumberOfStandardVariableRecords;
+ return this;
+}
+
+/** Setter for {@link StandardVariableSpecification#standardVariables}*/
+public StandardVariableSpecification setStandardVariables(List<StandardVariableRecord> pStandardVariables)
{
- standardVariables = pStandardVariables;
- return this;
-}
-
-/** Getter for {@link StandardVariableSpecification#standardVariables}*/
-public List<StandardVariableRecord> getStandardVariables()
+ standardVariables = pStandardVariables;
+ return this;
+}
+
+/** Getter for {@link StandardVariableSpecification#standardVariables}*/
+public List<StandardVariableRecord> getStandardVariables()
{
return standardVariables;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeShort(standardVariables.size());
-
- for(int idx = 0; idx < standardVariables.size(); idx++)
- {
- StandardVariableRecord aStandardVariableRecord = standardVariables.get(idx);
- aStandardVariableRecord.marshal(dos);
- }
-
+ {
+ dos.writeShort(standardVariables.size());
+
+ for(int idx = 0; idx < standardVariables.size(); idx++)
+ {
+ StandardVariableRecord aStandardVariableRecord = standardVariables.get(idx);
+ aStandardVariableRecord.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- numberOfStandardVariableRecords = (short)dis.readUnsignedShort();
- uPosition += 2;
- for(int idx = 0; idx < numberOfStandardVariableRecords; idx++)
- {
- StandardVariableRecord anX = new StandardVariableRecord();
- uPosition += anX.unmarshal(dis);
- standardVariables.add(anX);
- }
-
+ {
+ numberOfStandardVariableRecords = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ for(int idx = 0; idx < numberOfStandardVariableRecords; idx++)
+ {
+ StandardVariableRecord anX = new StandardVariableRecord();
+ uPosition += anX.unmarshal(dis);
+ standardVariables.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putShort( (short)standardVariables.size());
-
- for(int idx = 0; idx < standardVariables.size(); idx++)
- {
- StandardVariableRecord aStandardVariableRecord = standardVariables.get(idx);
- aStandardVariableRecord.marshal(buff);
- }
-
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- numberOfStandardVariableRecords = (short)(buff.getShort() & 0xFFFF);
- for(int idx = 0; idx < numberOfStandardVariableRecords; idx++)
- {
- StandardVariableRecord anX = new StandardVariableRecord();
- anX.unmarshal(buff);
- standardVariables.add(anX);
- }
-
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putShort( (short)standardVariables.size());
+
+ for(int idx = 0; idx < standardVariables.size(); idx++)
+ {
+ StandardVariableRecord aStandardVariableRecord = standardVariables.get(idx);
+ aStandardVariableRecord.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ numberOfStandardVariableRecords = (short)(buff.getShort() & 0xFFFF);
+ for(int idx = 0; idx < numberOfStandardVariableRecords; idx++)
+ {
+ StandardVariableRecord anX = new StandardVariableRecord();
+ anX.unmarshal(buff);
+ standardVariables.add(anX);
+ }
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final StandardVariableSpecification rhs = (StandardVariableSpecification)obj;
-
- if( ! (numberOfStandardVariableRecords == rhs.numberOfStandardVariableRecords)) ivarsEqual = false;
-
- for(int idx = 0; idx < standardVariables.size(); idx++)
- if( ! ( standardVariables.get(idx).equals(rhs.standardVariables.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final StandardVariableSpecification rhs = (StandardVariableSpecification)obj;
+
+ if( ! (numberOfStandardVariableRecords == rhs.numberOfStandardVariableRecords)) ivarsEqual = false;
+
+ for(int idx = 0; idx < standardVariables.size(); idx++)
+ if( ! ( standardVariables.get(idx).equals(rhs.standardVariables.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" numberOfStandardVariableRecords: ").append(numberOfStandardVariableRecords).append("\n");
- sb.append(" standardVariables: ").append("\n");
- standardVariables.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" numberOfStandardVariableRecords: ").append(numberOfStandardVariableRecords).append("\n");
+ sb.append(" standardVariables: ").append("\n");
+ standardVariables.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/StartResumePdu.java b/src-generated/edu/nps/moves/dis7/StartResumePdu.java
index 972bbddd44ba52e16f4e321ec5af8bfb1168edc8..79cd2756f163636dab725cbf065993bb04e00bab 100644
--- a/src-generated/edu/nps/moves/dis7/StartResumePdu.java
+++ b/src-generated/edu/nps/moves/dis7/StartResumePdu.java
@@ -1,211 +1,211 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Section 7.5.4. Start or resume an entity or exercise. See 5.6.5.4.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class StartResumePdu extends SimulationManagementFamilyPdu implements Serializable
-{
- /** This field shall specify the real-world time (UTC) at which the entity is to start/resume in the exercise. This information shall be used by the participating simulation applications to start/resume an exercise synchronously. This field shall be represented by a Clock Time record (see 6.2.16). */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Section 7.5.4. Start or resume an entity or exercise. See 5.6.5.4.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class StartResumePdu extends SimulationManagementFamilyPdu implements Serializable
+{
+ /** This field shall specify the real-world time (UTC) at which the entity is to start/resume in the exercise. This information shall be used by the participating simulation applications to start/resume an exercise synchronously. This field shall be represented by a Clock Time record (see 6.2.16). */
protected ClockTime realWorldTime = new ClockTime();
-
- /** The reference time within a simulation exercise. This time is established ahead of time by simulation management and is common to all participants in a particular exercise. Simulation time may be either Absolute Time or Relative Time. This field shall be represented by a Clock Time record (see 6.2.16) */
+
+ /** The reference time within a simulation exercise. This time is established ahead of time by simulation management and is common to all participants in a particular exercise. Simulation time may be either Absolute Time or Relative Time. This field shall be represented by a Clock Time record (see 6.2.16) */
protected ClockTime simulationTime = new ClockTime();
-
- /** Identifier for the specific and unique start/resume request */
+
+ /** Identifier for the specific and unique start/resume request */
protected int requestID;
-
-
-/** Constructor */
- public StartResumePdu()
- {
- setPduType( DISPDUType.START_RESUME );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += realWorldTime.getMarshalledSize();
- marshalSize += simulationTime.getMarshalledSize();
- marshalSize += 4; // requestID
-
- return marshalSize;
-}
-
-
-/** Setter for {@link StartResumePdu#realWorldTime}*/
-public StartResumePdu setRealWorldTime(ClockTime pRealWorldTime)
+
+
+/** Constructor */
+ public StartResumePdu()
+ {
+ setPduType( DISPDUType.START_RESUME );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += realWorldTime.getMarshalledSize();
+ marshalSize += simulationTime.getMarshalledSize();
+ marshalSize += 4; // requestID
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link StartResumePdu#realWorldTime}*/
+public StartResumePdu setRealWorldTime(ClockTime pRealWorldTime)
{
- realWorldTime = pRealWorldTime;
- return this;
-}
-
-/** Getter for {@link StartResumePdu#realWorldTime}*/
-public ClockTime getRealWorldTime()
+ realWorldTime = pRealWorldTime;
+ return this;
+}
+
+/** Getter for {@link StartResumePdu#realWorldTime}*/
+public ClockTime getRealWorldTime()
{
return realWorldTime;
-}
-
-/** Setter for {@link StartResumePdu#simulationTime}*/
-public StartResumePdu setSimulationTime(ClockTime pSimulationTime)
+}
+
+/** Setter for {@link StartResumePdu#simulationTime}*/
+public StartResumePdu setSimulationTime(ClockTime pSimulationTime)
{
- simulationTime = pSimulationTime;
- return this;
-}
-
-/** Getter for {@link StartResumePdu#simulationTime}*/
-public ClockTime getSimulationTime()
+ simulationTime = pSimulationTime;
+ return this;
+}
+
+/** Getter for {@link StartResumePdu#simulationTime}*/
+public ClockTime getSimulationTime()
{
return simulationTime;
-}
-
-/** Setter for {@link StartResumePdu#requestID}*/
-public StartResumePdu setRequestID(int pRequestID)
+}
+
+/** Setter for {@link StartResumePdu#requestID}*/
+public StartResumePdu setRequestID(int pRequestID)
{
- requestID = pRequestID;
- return this;
-}
-
-/** Getter for {@link StartResumePdu#requestID}*/
-public int getRequestID()
+ requestID = pRequestID;
+ return this;
+}
+
+/** Getter for {@link StartResumePdu#requestID}*/
+public int getRequestID()
{
return requestID;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- realWorldTime.marshal(dos);
- simulationTime.marshal(dos);
- dos.writeInt(requestID);
+ {
+ realWorldTime.marshal(dos);
+ simulationTime.marshal(dos);
+ dos.writeInt(requestID);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += realWorldTime.unmarshal(dis);
- uPosition += simulationTime.unmarshal(dis);
- requestID = dis.readInt();
- uPosition += 4;
+ {
+ uPosition += realWorldTime.unmarshal(dis);
+ uPosition += simulationTime.unmarshal(dis);
+ requestID = dis.readInt();
+ uPosition += 4;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- realWorldTime.marshal(buff);
- simulationTime.marshal(buff);
- buff.putInt( (int)requestID);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ realWorldTime.marshal(buff);
+ simulationTime.marshal(buff);
+ buff.putInt( (int)requestID);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- realWorldTime.unmarshal(buff);
- simulationTime.unmarshal(buff);
- requestID = buff.getInt();
- return getMarshalledSize();
+
+ realWorldTime.unmarshal(buff);
+ simulationTime.unmarshal(buff);
+ requestID = buff.getInt();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final StartResumePdu rhs = (StartResumePdu)obj;
-
- if( ! (realWorldTime.equals( rhs.realWorldTime) )) ivarsEqual = false;
- if( ! (simulationTime.equals( rhs.simulationTime) )) ivarsEqual = false;
- if( ! (requestID == rhs.requestID)) ivarsEqual = false;
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final StartResumePdu rhs = (StartResumePdu)obj;
+
+ if( ! (realWorldTime.equals( rhs.realWorldTime) )) ivarsEqual = false;
+ if( ! (simulationTime.equals( rhs.simulationTime) )) ivarsEqual = false;
+ if( ! (requestID == rhs.requestID)) ivarsEqual = false;
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" realWorldTime: ").append(realWorldTime).append("\n");
- sb.append(" simulationTime: ").append(simulationTime).append("\n");
- sb.append(" requestID: ").append(requestID).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" realWorldTime: ").append(realWorldTime).append("\n");
+ sb.append(" simulationTime: ").append(simulationTime).append("\n");
+ sb.append(" requestID: ").append(requestID).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/StartResumeRPdu.java b/src-generated/edu/nps/moves/dis7/StartResumeRPdu.java
index faea428b8780ac2c797ef6b46b8a4cf887f19d31..c405d40de7b162639b56aab4571314a07e36f54b 100644
--- a/src-generated/edu/nps/moves/dis7/StartResumeRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/StartResumeRPdu.java
@@ -1,281 +1,281 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.12.4.4 Serves the same function as the Start/Resume PDU but with the addition of reliability service levels
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class StartResumeRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
-{
- /** time in real world for this operation to happen */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 5.12.4.4 Serves the same function as the Start/Resume PDU but with the addition of reliability service levels
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class StartResumeRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
+{
+ /** time in real world for this operation to happen */
protected ClockTime realWorldTime = new ClockTime();
-
- /** time in simulation for the simulation to resume */
+
+ /** time in simulation for the simulation to resume */
protected ClockTime simulationTime = new ClockTime();
-
- /** level of reliability service used for this transaction uid 74 */
+
+ /** level of reliability service used for this transaction uid 74 */
protected RequiredReliabilityService requiredReliabilityService = RequiredReliabilityService.values()[0];
-
+
protected byte pad1;
-
+
protected short pad2;
-
- /** Request ID */
+
+ /** Request ID */
protected int requestID;
-
-
-/** Constructor */
- public StartResumeRPdu()
- {
- setPduType( DISPDUType.START_RESUME_RELIABLE );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += realWorldTime.getMarshalledSize();
- marshalSize += simulationTime.getMarshalledSize();
- marshalSize += requiredReliabilityService.getMarshalledSize();
- marshalSize += 1; // pad1
- marshalSize += 2; // pad2
- marshalSize += 4; // requestID
-
- return marshalSize;
-}
-
-
-/** Setter for {@link StartResumeRPdu#realWorldTime}*/
-public StartResumeRPdu setRealWorldTime(ClockTime pRealWorldTime)
+
+
+/** Constructor */
+ public StartResumeRPdu()
+ {
+ setPduType( DISPDUType.START_RESUME_RELIABLE );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += realWorldTime.getMarshalledSize();
+ marshalSize += simulationTime.getMarshalledSize();
+ marshalSize += requiredReliabilityService.getMarshalledSize();
+ marshalSize += 1; // pad1
+ marshalSize += 2; // pad2
+ marshalSize += 4; // requestID
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link StartResumeRPdu#realWorldTime}*/
+public StartResumeRPdu setRealWorldTime(ClockTime pRealWorldTime)
{
- realWorldTime = pRealWorldTime;
- return this;
-}
-
-/** Getter for {@link StartResumeRPdu#realWorldTime}*/
-public ClockTime getRealWorldTime()
+ realWorldTime = pRealWorldTime;
+ return this;
+}
+
+/** Getter for {@link StartResumeRPdu#realWorldTime}*/
+public ClockTime getRealWorldTime()
{
return realWorldTime;
-}
-
-/** Setter for {@link StartResumeRPdu#simulationTime}*/
-public StartResumeRPdu setSimulationTime(ClockTime pSimulationTime)
+}
+
+/** Setter for {@link StartResumeRPdu#simulationTime}*/
+public StartResumeRPdu setSimulationTime(ClockTime pSimulationTime)
{
- simulationTime = pSimulationTime;
- return this;
-}
-
-/** Getter for {@link StartResumeRPdu#simulationTime}*/
-public ClockTime getSimulationTime()
+ simulationTime = pSimulationTime;
+ return this;
+}
+
+/** Getter for {@link StartResumeRPdu#simulationTime}*/
+public ClockTime getSimulationTime()
{
return simulationTime;
-}
-
-/** Setter for {@link StartResumeRPdu#requiredReliabilityService}*/
-public StartResumeRPdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
+}
+
+/** Setter for {@link StartResumeRPdu#requiredReliabilityService}*/
+public StartResumeRPdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
{
- requiredReliabilityService = pRequiredReliabilityService;
- return this;
-}
-
-/** Getter for {@link StartResumeRPdu#requiredReliabilityService}*/
-public RequiredReliabilityService getRequiredReliabilityService()
+ requiredReliabilityService = pRequiredReliabilityService;
+ return this;
+}
+
+/** Getter for {@link StartResumeRPdu#requiredReliabilityService}*/
+public RequiredReliabilityService getRequiredReliabilityService()
{
return requiredReliabilityService;
-}
-
-/** Setter for {@link StartResumeRPdu#pad1}*/
-public StartResumeRPdu setPad1(byte pPad1)
+}
+
+/** Setter for {@link StartResumeRPdu#pad1}*/
+public StartResumeRPdu setPad1(byte pPad1)
{
- pad1 = pPad1;
- return this;
-}
-
-/** Getter for {@link StartResumeRPdu#pad1}*/
-public byte getPad1()
+ pad1 = pPad1;
+ return this;
+}
+
+/** Getter for {@link StartResumeRPdu#pad1}*/
+public byte getPad1()
{
return pad1;
-}
-
-/** Setter for {@link StartResumeRPdu#pad2}*/
-public StartResumeRPdu setPad2(short pPad2)
+}
+
+/** Setter for {@link StartResumeRPdu#pad2}*/
+public StartResumeRPdu setPad2(short pPad2)
{
- pad2 = pPad2;
- return this;
-}
-
-/** Getter for {@link StartResumeRPdu#pad2}*/
-public short getPad2()
+ pad2 = pPad2;
+ return this;
+}
+
+/** Getter for {@link StartResumeRPdu#pad2}*/
+public short getPad2()
{
return pad2;
-}
-
-/** Setter for {@link StartResumeRPdu#requestID}*/
-public StartResumeRPdu setRequestID(int pRequestID)
+}
+
+/** Setter for {@link StartResumeRPdu#requestID}*/
+public StartResumeRPdu setRequestID(int pRequestID)
{
- requestID = pRequestID;
- return this;
-}
-
-/** Getter for {@link StartResumeRPdu#requestID}*/
-public int getRequestID()
+ requestID = pRequestID;
+ return this;
+}
+
+/** Getter for {@link StartResumeRPdu#requestID}*/
+public int getRequestID()
{
return requestID;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- realWorldTime.marshal(dos);
- simulationTime.marshal(dos);
- requiredReliabilityService.marshal(dos);
- dos.writeByte(pad1);
- dos.writeShort(pad2);
- dos.writeInt(requestID);
+ {
+ realWorldTime.marshal(dos);
+ simulationTime.marshal(dos);
+ requiredReliabilityService.marshal(dos);
+ dos.writeByte(pad1);
+ dos.writeShort(pad2);
+ dos.writeInt(requestID);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += realWorldTime.unmarshal(dis);
- uPosition += simulationTime.unmarshal(dis);
- requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(dis);
- uPosition += requiredReliabilityService.getMarshalledSize();
- pad1 = (byte)dis.readUnsignedByte();
- uPosition += 1;
- pad2 = (short)dis.readUnsignedShort();
- uPosition += 2;
- requestID = dis.readInt();
- uPosition += 4;
+ {
+ uPosition += realWorldTime.unmarshal(dis);
+ uPosition += simulationTime.unmarshal(dis);
+ requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(dis);
+ uPosition += requiredReliabilityService.getMarshalledSize();
+ pad1 = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ pad2 = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ requestID = dis.readInt();
+ uPosition += 4;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- realWorldTime.marshal(buff);
- simulationTime.marshal(buff);
- requiredReliabilityService.marshal(buff);
- buff.put( (byte)pad1);
- buff.putShort( (short)pad2);
- buff.putInt( (int)requestID);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ realWorldTime.marshal(buff);
+ simulationTime.marshal(buff);
+ requiredReliabilityService.marshal(buff);
+ buff.put( (byte)pad1);
+ buff.putShort( (short)pad2);
+ buff.putInt( (int)requestID);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- realWorldTime.unmarshal(buff);
- simulationTime.unmarshal(buff);
- requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(buff);
- pad1 = (byte)(buff.get() & 0xFF);
- pad2 = (short)(buff.getShort() & 0xFFFF);
- requestID = buff.getInt();
- return getMarshalledSize();
+
+ realWorldTime.unmarshal(buff);
+ simulationTime.unmarshal(buff);
+ requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(buff);
+ pad1 = (byte)(buff.get() & 0xFF);
+ pad2 = (short)(buff.getShort() & 0xFFFF);
+ requestID = buff.getInt();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final StartResumeRPdu rhs = (StartResumeRPdu)obj;
-
- if( ! (realWorldTime.equals( rhs.realWorldTime) )) ivarsEqual = false;
- if( ! (simulationTime.equals( rhs.simulationTime) )) ivarsEqual = false;
- if( ! (requiredReliabilityService == rhs.requiredReliabilityService)) ivarsEqual = false;
- if( ! (pad1 == rhs.pad1)) ivarsEqual = false;
- if( ! (pad2 == rhs.pad2)) ivarsEqual = false;
- if( ! (requestID == rhs.requestID)) ivarsEqual = false;
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final StartResumeRPdu rhs = (StartResumeRPdu)obj;
+
+ if( ! (realWorldTime.equals( rhs.realWorldTime) )) ivarsEqual = false;
+ if( ! (simulationTime.equals( rhs.simulationTime) )) ivarsEqual = false;
+ if( ! (requiredReliabilityService == rhs.requiredReliabilityService)) ivarsEqual = false;
+ if( ! (pad1 == rhs.pad1)) ivarsEqual = false;
+ if( ! (pad2 == rhs.pad2)) ivarsEqual = false;
+ if( ! (requestID == rhs.requestID)) ivarsEqual = false;
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" realWorldTime: ").append(realWorldTime).append("\n");
- sb.append(" simulationTime: ").append(simulationTime).append("\n");
- sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
- sb.append(" pad1: ").append(pad1).append("\n");
- sb.append(" pad2: ").append(pad2).append("\n");
- sb.append(" requestID: ").append(requestID).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" realWorldTime: ").append(realWorldTime).append("\n");
+ sb.append(" simulationTime: ").append(simulationTime).append("\n");
+ sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
+ sb.append(" pad1: ").append(pad1).append("\n");
+ sb.append(" pad2: ").append(pad2).append("\n");
+ sb.append(" requestID: ").append(requestID).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/StartResumeReliablePdu.java b/src-generated/edu/nps/moves/dis7/StartResumeReliablePdu.java
index 383cdd36fb3ed78b29f7cfb4dcc12bd6e8deaff0..2f4b352dde25e0e2160d7542435bc219ab73937e 100644
--- a/src-generated/edu/nps/moves/dis7/StartResumeReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/StartResumeReliablePdu.java
@@ -1,17 +1,17 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * more descriptive name for a StartResumeRPdu
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class StartResumeReliablePdu extends StartResumeRPdu
-{}
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * more descriptive name for a StartResumeRPdu
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class StartResumeReliablePdu extends StartResumeRPdu
+{}
diff --git a/src-generated/edu/nps/moves/dis7/StopFreezePdu.java b/src-generated/edu/nps/moves/dis7/StopFreezePdu.java
index ce3fd9353f1cff8e3f110ce43a7226d249875718..1b675112614902056784fbdc89dbb43021e2ab97 100644
--- a/src-generated/edu/nps/moves/dis7/StopFreezePdu.java
+++ b/src-generated/edu/nps/moves/dis7/StopFreezePdu.java
@@ -1,259 +1,259 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Section 7.5.5. Stop or freeze an enity or exercise. See 5.6.5.5
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class StopFreezePdu extends SimulationManagementFamilyPdu implements Serializable
-{
- /** real-world(UTC) time at which the entity shall stop or freeze in the exercise */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Section 7.5.5. Stop or freeze an enity or exercise. See 5.6.5.5
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class StopFreezePdu extends SimulationManagementFamilyPdu implements Serializable
+{
+ /** real-world(UTC) time at which the entity shall stop or freeze in the exercise */
protected ClockTime realWorldTime = new ClockTime();
-
- /** Reason the simulation was stopped or frozen (see section 7 of SISO-REF-010) represented by an 8-bit enumeration uid 67 */
+
+ /** Reason the simulation was stopped or frozen (see section 7 of SISO-REF-010) represented by an 8-bit enumeration uid 67 */
protected StopFreezeReason reason = StopFreezeReason.values()[0];
-
- /** Internal behavior of the entity(or simulation) and its appearance while frozen to the other participants uid 68 */
+
+ /** Internal behavior of the entity(or simulation) and its appearance while frozen to the other participants uid 68 */
protected StopFreezeFrozenBehavior frozenBehavior = new StopFreezeFrozenBehavior();
-
- /** padding */
+
+ /** padding */
protected short padding1 = (short)0;
-
- /** Request ID that is unique */
+
+ /** Request ID that is unique */
protected int requestID;
-
-
-/** Constructor */
- public StopFreezePdu()
- {
- setPduType( DISPDUType.STOP_FREEZE );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public StopFreezePdu()
+ {
+ setPduType( DISPDUType.STOP_FREEZE );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += realWorldTime.getMarshalledSize();
+ marshalSize += reason.getMarshalledSize();
+ marshalSize += frozenBehavior.getMarshalledSize();
+ marshalSize += 2; // padding1
+ marshalSize += 4; // requestID
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link StopFreezePdu#realWorldTime}*/
+public StopFreezePdu setRealWorldTime(ClockTime pRealWorldTime)
{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += realWorldTime.getMarshalledSize();
- marshalSize += reason.getMarshalledSize();
- marshalSize += frozenBehavior.getMarshalledSize();
- marshalSize += 2; // padding1
- marshalSize += 4; // requestID
-
- return marshalSize;
-}
-
-
-/** Setter for {@link StopFreezePdu#realWorldTime}*/
-public StopFreezePdu setRealWorldTime(ClockTime pRealWorldTime)
-{
- realWorldTime = pRealWorldTime;
- return this;
-}
-
-/** Getter for {@link StopFreezePdu#realWorldTime}*/
-public ClockTime getRealWorldTime()
+ realWorldTime = pRealWorldTime;
+ return this;
+}
+
+/** Getter for {@link StopFreezePdu#realWorldTime}*/
+public ClockTime getRealWorldTime()
{
return realWorldTime;
-}
-
-/** Setter for {@link StopFreezePdu#reason}*/
-public StopFreezePdu setReason(StopFreezeReason pReason)
+}
+
+/** Setter for {@link StopFreezePdu#reason}*/
+public StopFreezePdu setReason(StopFreezeReason pReason)
{
- reason = pReason;
- return this;
-}
-
-/** Getter for {@link StopFreezePdu#reason}*/
-public StopFreezeReason getReason()
+ reason = pReason;
+ return this;
+}
+
+/** Getter for {@link StopFreezePdu#reason}*/
+public StopFreezeReason getReason()
{
return reason;
-}
-
-/** Setter for {@link StopFreezePdu#frozenBehavior}*/
-public StopFreezePdu setFrozenBehavior(StopFreezeFrozenBehavior pFrozenBehavior)
+}
+
+/** Setter for {@link StopFreezePdu#frozenBehavior}*/
+public StopFreezePdu setFrozenBehavior(StopFreezeFrozenBehavior pFrozenBehavior)
{
- frozenBehavior = pFrozenBehavior;
- return this;
-}
-
-/** Setter for {@link StopFreezePdu#frozenBehavior}*/
-public StopFreezeFrozenBehavior getFrozenBehavior()
+ frozenBehavior = pFrozenBehavior;
+ return this;
+}
+
+/** Setter for {@link StopFreezePdu#frozenBehavior}*/
+public StopFreezeFrozenBehavior getFrozenBehavior()
{
return frozenBehavior;
-}
-
-/** Setter for {@link StopFreezePdu#padding1}*/
-public StopFreezePdu setPadding1(short pPadding1)
+}
+
+/** Setter for {@link StopFreezePdu#padding1}*/
+public StopFreezePdu setPadding1(short pPadding1)
{
- padding1 = pPadding1;
- return this;
-}
-
-/** Getter for {@link StopFreezePdu#padding1}*/
-public short getPadding1()
+ padding1 = pPadding1;
+ return this;
+}
+
+/** Getter for {@link StopFreezePdu#padding1}*/
+public short getPadding1()
{
return padding1;
-}
-
-/** Setter for {@link StopFreezePdu#requestID}*/
-public StopFreezePdu setRequestID(int pRequestID)
+}
+
+/** Setter for {@link StopFreezePdu#requestID}*/
+public StopFreezePdu setRequestID(int pRequestID)
{
- requestID = pRequestID;
- return this;
-}
-
-/** Getter for {@link StopFreezePdu#requestID}*/
-public int getRequestID()
+ requestID = pRequestID;
+ return this;
+}
+
+/** Getter for {@link StopFreezePdu#requestID}*/
+public int getRequestID()
{
return requestID;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- realWorldTime.marshal(dos);
- reason.marshal(dos);
- frozenBehavior.marshal(dos);
- dos.writeShort(padding1);
- dos.writeInt(requestID);
+ {
+ realWorldTime.marshal(dos);
+ reason.marshal(dos);
+ frozenBehavior.marshal(dos);
+ dos.writeShort(padding1);
+ dos.writeInt(requestID);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += realWorldTime.unmarshal(dis);
- reason = StopFreezeReason.unmarshalEnum(dis);
- uPosition += reason.getMarshalledSize();
- uPosition += frozenBehavior.unmarshal(dis);
- padding1 = (short)dis.readUnsignedShort();
- uPosition += 2;
- requestID = dis.readInt();
- uPosition += 4;
+ {
+ uPosition += realWorldTime.unmarshal(dis);
+ reason = StopFreezeReason.unmarshalEnum(dis);
+ uPosition += reason.getMarshalledSize();
+ uPosition += frozenBehavior.unmarshal(dis);
+ padding1 = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ requestID = dis.readInt();
+ uPosition += 4;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- realWorldTime.marshal(buff);
- reason.marshal(buff);
- frozenBehavior.marshal(buff);
- buff.putShort( (short)padding1);
- buff.putInt( (int)requestID);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ realWorldTime.marshal(buff);
+ reason.marshal(buff);
+ frozenBehavior.marshal(buff);
+ buff.putShort( (short)padding1);
+ buff.putInt( (int)requestID);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- realWorldTime.unmarshal(buff);
- reason = StopFreezeReason.unmarshalEnum(buff);
- frozenBehavior.unmarshal(buff);
- padding1 = (short)(buff.getShort() & 0xFFFF);
- requestID = buff.getInt();
- return getMarshalledSize();
+
+ realWorldTime.unmarshal(buff);
+ reason = StopFreezeReason.unmarshalEnum(buff);
+ frozenBehavior.unmarshal(buff);
+ padding1 = (short)(buff.getShort() & 0xFFFF);
+ requestID = buff.getInt();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final StopFreezePdu rhs = (StopFreezePdu)obj;
-
- if( ! (realWorldTime.equals( rhs.realWorldTime) )) ivarsEqual = false;
- if( ! (reason == rhs.reason)) ivarsEqual = false;
- if( ! (frozenBehavior.equals( rhs.frozenBehavior) )) ivarsEqual = false;
- if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
- if( ! (requestID == rhs.requestID)) ivarsEqual = false;
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final StopFreezePdu rhs = (StopFreezePdu)obj;
+
+ if( ! (realWorldTime.equals( rhs.realWorldTime) )) ivarsEqual = false;
+ if( ! (reason == rhs.reason)) ivarsEqual = false;
+ if( ! (frozenBehavior.equals( rhs.frozenBehavior) )) ivarsEqual = false;
+ if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
+ if( ! (requestID == rhs.requestID)) ivarsEqual = false;
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" realWorldTime: ").append(realWorldTime).append("\n");
- sb.append(" reason: ").append(reason).append("\n");
- sb.append(" frozenBehavior: ").append(frozenBehavior).append("\n");
- sb.append(" padding1: ").append(padding1).append("\n");
- sb.append(" requestID: ").append(requestID).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" realWorldTime: ").append(realWorldTime).append("\n");
+ sb.append(" reason: ").append(reason).append("\n");
+ sb.append(" frozenBehavior: ").append(frozenBehavior).append("\n");
+ sb.append(" padding1: ").append(padding1).append("\n");
+ sb.append(" requestID: ").append(requestID).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/StopFreezeRPdu.java b/src-generated/edu/nps/moves/dis7/StopFreezeRPdu.java
index 63bddfba19465db1f2c45e3bb6474f5d8497e11c..13b1f1cf90d8e307f2555611a939b3d6e6e7f3bb 100644
--- a/src-generated/edu/nps/moves/dis7/StopFreezeRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/StopFreezeRPdu.java
@@ -1,283 +1,283 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.12.4.5 Serves the same function as the Stop/Freeze PDU (see 5.6.5.5.1) but with the addition of reliability service levels.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class StopFreezeRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
-{
- /** time in real world for this operation to happen */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 5.12.4.5 Serves the same function as the Stop/Freeze PDU (see 5.6.5.5.1) but with the addition of reliability service levels.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class StopFreezeRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
+{
+ /** time in real world for this operation to happen */
protected ClockTime realWorldTime = new ClockTime();
-
- /** Reason for stopping/freezing simulation uid 67 */
+
+ /** Reason for stopping/freezing simulation uid 67 */
protected StopFreezeReason reason = StopFreezeReason.values()[0];
-
- /** internal behvior of the simulation while frozen uid 68 */
+
+ /** internal behvior of the simulation while frozen uid 68 */
protected StopFreezeFrozenBehavior frozenBehavior = new StopFreezeFrozenBehavior();
-
- /** reliablity level uid 74 */
+
+ /** reliablity level uid 74 */
protected RequiredReliabilityService requiredReliablityService = RequiredReliabilityService.values()[0];
-
- /** padding */
+
+ /** padding */
protected byte pad1;
-
- /** Request ID */
+
+ /** Request ID */
protected int requestID;
-
-
-/** Constructor */
- public StopFreezeRPdu()
- {
- setPduType( DISPDUType.STOP_FREEZE_RELIABLE );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += realWorldTime.getMarshalledSize();
- marshalSize += reason.getMarshalledSize();
- marshalSize += frozenBehavior.getMarshalledSize();
- marshalSize += requiredReliablityService.getMarshalledSize();
- marshalSize += 1; // pad1
- marshalSize += 4; // requestID
-
- return marshalSize;
-}
-
-
-/** Setter for {@link StopFreezeRPdu#realWorldTime}*/
-public StopFreezeRPdu setRealWorldTime(ClockTime pRealWorldTime)
+
+
+/** Constructor */
+ public StopFreezeRPdu()
+ {
+ setPduType( DISPDUType.STOP_FREEZE_RELIABLE );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += realWorldTime.getMarshalledSize();
+ marshalSize += reason.getMarshalledSize();
+ marshalSize += frozenBehavior.getMarshalledSize();
+ marshalSize += requiredReliablityService.getMarshalledSize();
+ marshalSize += 1; // pad1
+ marshalSize += 4; // requestID
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link StopFreezeRPdu#realWorldTime}*/
+public StopFreezeRPdu setRealWorldTime(ClockTime pRealWorldTime)
{
- realWorldTime = pRealWorldTime;
- return this;
-}
-
-/** Getter for {@link StopFreezeRPdu#realWorldTime}*/
-public ClockTime getRealWorldTime()
+ realWorldTime = pRealWorldTime;
+ return this;
+}
+
+/** Getter for {@link StopFreezeRPdu#realWorldTime}*/
+public ClockTime getRealWorldTime()
{
return realWorldTime;
-}
-
-/** Setter for {@link StopFreezeRPdu#reason}*/
-public StopFreezeRPdu setReason(StopFreezeReason pReason)
+}
+
+/** Setter for {@link StopFreezeRPdu#reason}*/
+public StopFreezeRPdu setReason(StopFreezeReason pReason)
{
- reason = pReason;
- return this;
-}
-
-/** Getter for {@link StopFreezeRPdu#reason}*/
-public StopFreezeReason getReason()
+ reason = pReason;
+ return this;
+}
+
+/** Getter for {@link StopFreezeRPdu#reason}*/
+public StopFreezeReason getReason()
{
return reason;
-}
-
-/** Setter for {@link StopFreezeRPdu#frozenBehavior}*/
-public StopFreezeRPdu setFrozenBehavior(StopFreezeFrozenBehavior pFrozenBehavior)
+}
+
+/** Setter for {@link StopFreezeRPdu#frozenBehavior}*/
+public StopFreezeRPdu setFrozenBehavior(StopFreezeFrozenBehavior pFrozenBehavior)
{
- frozenBehavior = pFrozenBehavior;
- return this;
-}
-
-/** Setter for {@link StopFreezeRPdu#frozenBehavior}*/
-public StopFreezeFrozenBehavior getFrozenBehavior()
+ frozenBehavior = pFrozenBehavior;
+ return this;
+}
+
+/** Setter for {@link StopFreezeRPdu#frozenBehavior}*/
+public StopFreezeFrozenBehavior getFrozenBehavior()
{
return frozenBehavior;
-}
-
-/** Setter for {@link StopFreezeRPdu#requiredReliablityService}*/
-public StopFreezeRPdu setRequiredReliablityService(RequiredReliabilityService pRequiredReliablityService)
+}
+
+/** Setter for {@link StopFreezeRPdu#requiredReliablityService}*/
+public StopFreezeRPdu setRequiredReliablityService(RequiredReliabilityService pRequiredReliablityService)
{
- requiredReliablityService = pRequiredReliablityService;
- return this;
-}
-
-/** Getter for {@link StopFreezeRPdu#requiredReliablityService}*/
-public RequiredReliabilityService getRequiredReliablityService()
+ requiredReliablityService = pRequiredReliablityService;
+ return this;
+}
+
+/** Getter for {@link StopFreezeRPdu#requiredReliablityService}*/
+public RequiredReliabilityService getRequiredReliablityService()
{
return requiredReliablityService;
-}
-
-/** Setter for {@link StopFreezeRPdu#pad1}*/
-public StopFreezeRPdu setPad1(byte pPad1)
+}
+
+/** Setter for {@link StopFreezeRPdu#pad1}*/
+public StopFreezeRPdu setPad1(byte pPad1)
{
- pad1 = pPad1;
- return this;
-}
-
-/** Getter for {@link StopFreezeRPdu#pad1}*/
-public byte getPad1()
+ pad1 = pPad1;
+ return this;
+}
+
+/** Getter for {@link StopFreezeRPdu#pad1}*/
+public byte getPad1()
{
return pad1;
-}
-
-/** Setter for {@link StopFreezeRPdu#requestID}*/
-public StopFreezeRPdu setRequestID(int pRequestID)
+}
+
+/** Setter for {@link StopFreezeRPdu#requestID}*/
+public StopFreezeRPdu setRequestID(int pRequestID)
{
- requestID = pRequestID;
- return this;
-}
-
-/** Getter for {@link StopFreezeRPdu#requestID}*/
-public int getRequestID()
+ requestID = pRequestID;
+ return this;
+}
+
+/** Getter for {@link StopFreezeRPdu#requestID}*/
+public int getRequestID()
{
return requestID;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- realWorldTime.marshal(dos);
- reason.marshal(dos);
- frozenBehavior.marshal(dos);
- requiredReliablityService.marshal(dos);
- dos.writeByte(pad1);
- dos.writeInt(requestID);
+ {
+ realWorldTime.marshal(dos);
+ reason.marshal(dos);
+ frozenBehavior.marshal(dos);
+ requiredReliablityService.marshal(dos);
+ dos.writeByte(pad1);
+ dos.writeInt(requestID);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += realWorldTime.unmarshal(dis);
- reason = StopFreezeReason.unmarshalEnum(dis);
- uPosition += reason.getMarshalledSize();
- uPosition += frozenBehavior.unmarshal(dis);
- requiredReliablityService = RequiredReliabilityService.unmarshalEnum(dis);
- uPosition += requiredReliablityService.getMarshalledSize();
- pad1 = (byte)dis.readUnsignedByte();
- uPosition += 1;
- requestID = dis.readInt();
- uPosition += 4;
+ {
+ uPosition += realWorldTime.unmarshal(dis);
+ reason = StopFreezeReason.unmarshalEnum(dis);
+ uPosition += reason.getMarshalledSize();
+ uPosition += frozenBehavior.unmarshal(dis);
+ requiredReliablityService = RequiredReliabilityService.unmarshalEnum(dis);
+ uPosition += requiredReliablityService.getMarshalledSize();
+ pad1 = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ requestID = dis.readInt();
+ uPosition += 4;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- realWorldTime.marshal(buff);
- reason.marshal(buff);
- frozenBehavior.marshal(buff);
- requiredReliablityService.marshal(buff);
- buff.put( (byte)pad1);
- buff.putInt( (int)requestID);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ realWorldTime.marshal(buff);
+ reason.marshal(buff);
+ frozenBehavior.marshal(buff);
+ requiredReliablityService.marshal(buff);
+ buff.put( (byte)pad1);
+ buff.putInt( (int)requestID);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- realWorldTime.unmarshal(buff);
- reason = StopFreezeReason.unmarshalEnum(buff);
- frozenBehavior.unmarshal(buff);
- requiredReliablityService = RequiredReliabilityService.unmarshalEnum(buff);
- pad1 = (byte)(buff.get() & 0xFF);
- requestID = buff.getInt();
- return getMarshalledSize();
+
+ realWorldTime.unmarshal(buff);
+ reason = StopFreezeReason.unmarshalEnum(buff);
+ frozenBehavior.unmarshal(buff);
+ requiredReliablityService = RequiredReliabilityService.unmarshalEnum(buff);
+ pad1 = (byte)(buff.get() & 0xFF);
+ requestID = buff.getInt();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final StopFreezeRPdu rhs = (StopFreezeRPdu)obj;
-
- if( ! (realWorldTime.equals( rhs.realWorldTime) )) ivarsEqual = false;
- if( ! (reason == rhs.reason)) ivarsEqual = false;
- if( ! (frozenBehavior.equals( rhs.frozenBehavior) )) ivarsEqual = false;
- if( ! (requiredReliablityService == rhs.requiredReliablityService)) ivarsEqual = false;
- if( ! (pad1 == rhs.pad1)) ivarsEqual = false;
- if( ! (requestID == rhs.requestID)) ivarsEqual = false;
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final StopFreezeRPdu rhs = (StopFreezeRPdu)obj;
+
+ if( ! (realWorldTime.equals( rhs.realWorldTime) )) ivarsEqual = false;
+ if( ! (reason == rhs.reason)) ivarsEqual = false;
+ if( ! (frozenBehavior.equals( rhs.frozenBehavior) )) ivarsEqual = false;
+ if( ! (requiredReliablityService == rhs.requiredReliablityService)) ivarsEqual = false;
+ if( ! (pad1 == rhs.pad1)) ivarsEqual = false;
+ if( ! (requestID == rhs.requestID)) ivarsEqual = false;
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" realWorldTime: ").append(realWorldTime).append("\n");
- sb.append(" reason: ").append(reason).append("\n");
- sb.append(" frozenBehavior: ").append(frozenBehavior).append("\n");
- sb.append(" requiredReliablityService: ").append(requiredReliablityService).append("\n");
- sb.append(" pad1: ").append(pad1).append("\n");
- sb.append(" requestID: ").append(requestID).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" realWorldTime: ").append(realWorldTime).append("\n");
+ sb.append(" reason: ").append(reason).append("\n");
+ sb.append(" frozenBehavior: ").append(frozenBehavior).append("\n");
+ sb.append(" requiredReliablityService: ").append(requiredReliablityService).append("\n");
+ sb.append(" pad1: ").append(pad1).append("\n");
+ sb.append(" requestID: ").append(requestID).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/StopFreezeReliablePdu.java b/src-generated/edu/nps/moves/dis7/StopFreezeReliablePdu.java
index 5b7a5a11db5eb026fde621e1c4527f0aa69b8489..94c6940256ddb20d7130b93bf8a971f5316490bd 100644
--- a/src-generated/edu/nps/moves/dis7/StopFreezeReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/StopFreezeReliablePdu.java
@@ -1,17 +1,17 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * more descriptive name for a StopFreezeRPdu
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class StopFreezeReliablePdu extends StopFreezeRPdu
-{}
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * more descriptive name for a StopFreezeRPdu
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class StopFreezeReliablePdu extends StopFreezeRPdu
+{}
diff --git a/src-generated/edu/nps/moves/dis7/StorageFuel.java b/src-generated/edu/nps/moves/dis7/StorageFuel.java
index fb76d2ffd198a0e05dd4b102feed45274163c3a5..be46be38bce63ed8eecbfd47d856df7424d89e92 100644
--- a/src-generated/edu/nps/moves/dis7/StorageFuel.java
+++ b/src-generated/edu/nps/moves/dis7/StorageFuel.java
@@ -1,258 +1,258 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Information about an entity's engine fuel. Section 6.2.84.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class StorageFuel extends Object implements Serializable
-{
- /** Fuel quantity, units specified by next field */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Information about an entity's engine fuel. Section 6.2.84.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class StorageFuel extends Object implements Serializable
+{
+ /** Fuel quantity, units specified by next field */
protected int fuelQuantity;
-
- /** Units in which the fuel is measured uid 328 */
+
+ /** Units in which the fuel is measured uid 328 */
protected FuelMeasurementUnits fuelMeasurementUnits = FuelMeasurementUnits.values()[0];
-
- /** Type of fuel uid 413 */
+
+ /** Type of fuel uid 413 */
protected SupplyFuelType fuelType = SupplyFuelType.values()[0];
-
- /** Location of fuel as related to entity. See section 14 of EBV document uid 329 */
+
+ /** Location of fuel as related to entity. See section 14 of EBV document uid 329 */
protected FuelLocation fuelLocation = FuelLocation.values()[0];
-
- /** padding */
+
+ /** padding */
protected byte padding = (byte)0;
-
-
-/** Constructor */
- public StorageFuel()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public StorageFuel()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 4; // fuelQuantity
+ marshalSize += fuelMeasurementUnits.getMarshalledSize();
+ marshalSize += fuelType.getMarshalledSize();
+ marshalSize += fuelLocation.getMarshalledSize();
+ marshalSize += 1; // padding
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link StorageFuel#fuelQuantity}*/
+public StorageFuel setFuelQuantity(int pFuelQuantity)
{
- int marshalSize = 0;
-
- marshalSize += 4; // fuelQuantity
- marshalSize += fuelMeasurementUnits.getMarshalledSize();
- marshalSize += fuelType.getMarshalledSize();
- marshalSize += fuelLocation.getMarshalledSize();
- marshalSize += 1; // padding
-
- return marshalSize;
-}
-
-
-/** Setter for {@link StorageFuel#fuelQuantity}*/
-public StorageFuel setFuelQuantity(int pFuelQuantity)
-{
- fuelQuantity = pFuelQuantity;
- return this;
-}
-
-/** Getter for {@link StorageFuel#fuelQuantity}*/
-public int getFuelQuantity()
+ fuelQuantity = pFuelQuantity;
+ return this;
+}
+
+/** Getter for {@link StorageFuel#fuelQuantity}*/
+public int getFuelQuantity()
{
return fuelQuantity;
-}
-
-/** Setter for {@link StorageFuel#fuelMeasurementUnits}*/
-public StorageFuel setFuelMeasurementUnits(FuelMeasurementUnits pFuelMeasurementUnits)
+}
+
+/** Setter for {@link StorageFuel#fuelMeasurementUnits}*/
+public StorageFuel setFuelMeasurementUnits(FuelMeasurementUnits pFuelMeasurementUnits)
{
- fuelMeasurementUnits = pFuelMeasurementUnits;
- return this;
-}
-
-/** Getter for {@link StorageFuel#fuelMeasurementUnits}*/
-public FuelMeasurementUnits getFuelMeasurementUnits()
+ fuelMeasurementUnits = pFuelMeasurementUnits;
+ return this;
+}
+
+/** Getter for {@link StorageFuel#fuelMeasurementUnits}*/
+public FuelMeasurementUnits getFuelMeasurementUnits()
{
return fuelMeasurementUnits;
-}
-
-/** Setter for {@link StorageFuel#fuelType}*/
-public StorageFuel setFuelType(SupplyFuelType pFuelType)
+}
+
+/** Setter for {@link StorageFuel#fuelType}*/
+public StorageFuel setFuelType(SupplyFuelType pFuelType)
{
- fuelType = pFuelType;
- return this;
-}
-
-/** Getter for {@link StorageFuel#fuelType}*/
-public SupplyFuelType getFuelType()
+ fuelType = pFuelType;
+ return this;
+}
+
+/** Getter for {@link StorageFuel#fuelType}*/
+public SupplyFuelType getFuelType()
{
return fuelType;
-}
-
-/** Setter for {@link StorageFuel#fuelLocation}*/
-public StorageFuel setFuelLocation(FuelLocation pFuelLocation)
+}
+
+/** Setter for {@link StorageFuel#fuelLocation}*/
+public StorageFuel setFuelLocation(FuelLocation pFuelLocation)
{
- fuelLocation = pFuelLocation;
- return this;
-}
-
-/** Getter for {@link StorageFuel#fuelLocation}*/
-public FuelLocation getFuelLocation()
+ fuelLocation = pFuelLocation;
+ return this;
+}
+
+/** Getter for {@link StorageFuel#fuelLocation}*/
+public FuelLocation getFuelLocation()
{
return fuelLocation;
-}
-
-/** Setter for {@link StorageFuel#padding}*/
-public StorageFuel setPadding(byte pPadding)
+}
+
+/** Setter for {@link StorageFuel#padding}*/
+public StorageFuel setPadding(byte pPadding)
{
- padding = pPadding;
- return this;
-}
-
-/** Getter for {@link StorageFuel#padding}*/
-public byte getPadding()
+ padding = pPadding;
+ return this;
+}
+
+/** Getter for {@link StorageFuel#padding}*/
+public byte getPadding()
{
return padding;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeInt(fuelQuantity);
- fuelMeasurementUnits.marshal(dos);
- fuelType.marshal(dos);
- fuelLocation.marshal(dos);
- dos.writeByte(padding);
+ {
+ dos.writeInt(fuelQuantity);
+ fuelMeasurementUnits.marshal(dos);
+ fuelType.marshal(dos);
+ fuelLocation.marshal(dos);
+ dos.writeByte(padding);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- fuelQuantity = dis.readInt();
- uPosition += 4;
- fuelMeasurementUnits = FuelMeasurementUnits.unmarshalEnum(dis);
- uPosition += fuelMeasurementUnits.getMarshalledSize();
- fuelType = SupplyFuelType.unmarshalEnum(dis);
- uPosition += fuelType.getMarshalledSize();
- fuelLocation = FuelLocation.unmarshalEnum(dis);
- uPosition += fuelLocation.getMarshalledSize();
- padding = (byte)dis.readUnsignedByte();
- uPosition += 1;
+ {
+ fuelQuantity = dis.readInt();
+ uPosition += 4;
+ fuelMeasurementUnits = FuelMeasurementUnits.unmarshalEnum(dis);
+ uPosition += fuelMeasurementUnits.getMarshalledSize();
+ fuelType = SupplyFuelType.unmarshalEnum(dis);
+ uPosition += fuelType.getMarshalledSize();
+ fuelLocation = FuelLocation.unmarshalEnum(dis);
+ uPosition += fuelLocation.getMarshalledSize();
+ padding = (byte)dis.readUnsignedByte();
+ uPosition += 1;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putInt( (int)fuelQuantity);
- fuelMeasurementUnits.marshal(buff);
- fuelType.marshal(buff);
- fuelLocation.marshal(buff);
- buff.put( (byte)padding);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- fuelQuantity = buff.getInt();
- fuelMeasurementUnits = FuelMeasurementUnits.unmarshalEnum(buff);
- fuelType = SupplyFuelType.unmarshalEnum(buff);
- fuelLocation = FuelLocation.unmarshalEnum(buff);
- padding = (byte)(buff.get() & 0xFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putInt( (int)fuelQuantity);
+ fuelMeasurementUnits.marshal(buff);
+ fuelType.marshal(buff);
+ fuelLocation.marshal(buff);
+ buff.put( (byte)padding);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ fuelQuantity = buff.getInt();
+ fuelMeasurementUnits = FuelMeasurementUnits.unmarshalEnum(buff);
+ fuelType = SupplyFuelType.unmarshalEnum(buff);
+ fuelLocation = FuelLocation.unmarshalEnum(buff);
+ padding = (byte)(buff.get() & 0xFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final StorageFuel rhs = (StorageFuel)obj;
-
- if( ! (fuelQuantity == rhs.fuelQuantity)) ivarsEqual = false;
- if( ! (fuelMeasurementUnits == rhs.fuelMeasurementUnits)) ivarsEqual = false;
- if( ! (fuelType == rhs.fuelType)) ivarsEqual = false;
- if( ! (fuelLocation == rhs.fuelLocation)) ivarsEqual = false;
- if( ! (padding == rhs.padding)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final StorageFuel rhs = (StorageFuel)obj;
+
+ if( ! (fuelQuantity == rhs.fuelQuantity)) ivarsEqual = false;
+ if( ! (fuelMeasurementUnits == rhs.fuelMeasurementUnits)) ivarsEqual = false;
+ if( ! (fuelType == rhs.fuelType)) ivarsEqual = false;
+ if( ! (fuelLocation == rhs.fuelLocation)) ivarsEqual = false;
+ if( ! (padding == rhs.padding)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" fuelQuantity: ").append(fuelQuantity).append("\n");
- sb.append(" fuelMeasurementUnits: ").append(fuelMeasurementUnits).append("\n");
- sb.append(" fuelType: ").append(fuelType).append("\n");
- sb.append(" fuelLocation: ").append(fuelLocation).append("\n");
- sb.append(" padding: ").append(padding).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" fuelQuantity: ").append(fuelQuantity).append("\n");
+ sb.append(" fuelMeasurementUnits: ").append(fuelMeasurementUnits).append("\n");
+ sb.append(" fuelType: ").append(fuelType).append("\n");
+ sb.append(" fuelLocation: ").append(fuelLocation).append("\n");
+ sb.append(" padding: ").append(padding).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/StorageFuelReload.java b/src-generated/edu/nps/moves/dis7/StorageFuelReload.java
index d32ed18a57d117e3524003bc6b6ffa8f91440d32..73cb91c311907d6dd27b53cd63d232471ca93c08 100644
--- a/src-generated/edu/nps/moves/dis7/StorageFuelReload.java
+++ b/src-generated/edu/nps/moves/dis7/StorageFuelReload.java
@@ -1,330 +1,330 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * For each type or location of Storage Fuel, this record shall specify the type, location, fuel measure- ment units, reload quantity and maximum quantity for storage fuel either for the whole entity or a specific storage fuel location (tank). Section 6.2.85.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class StorageFuelReload extends Object implements Serializable
-{
- /** the standard quantity of this fuel type normally loaded at this station/launcher if a station/launcher is specified. If the Station/Launcher field is set to zero, then this is the total quantity of this fuel type that would be present in a standard reload of all appli- cable stations/launchers associated with this entity. */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * For each type or location of Storage Fuel, this record shall specify the type, location, fuel measure- ment units, reload quantity and maximum quantity for storage fuel either for the whole entity or a specific storage fuel location (tank). Section 6.2.85.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class StorageFuelReload extends Object implements Serializable
+{
+ /** the standard quantity of this fuel type normally loaded at this station/launcher if a station/launcher is specified. If the Station/Launcher field is set to zero, then this is the total quantity of this fuel type that would be present in a standard reload of all appli- cable stations/launchers associated with this entity. */
protected int standardQuantity;
-
- /** the maximum quantity of this fuel type that this sta- tion/launcher is capable of holding when a station/launcher is specified. This would be the value used when a maximum reload was desired to be set for this station/launcher. If the Station/launcher field is set to zero, then this is the maximum quantity of this fuel type that would be present on this entity at all stations/launchers that can accept this fuel type. */
+
+ /** the maximum quantity of this fuel type that this sta- tion/launcher is capable of holding when a station/launcher is specified. This would be the value used when a maximum reload was desired to be set for this station/launcher. If the Station/launcher field is set to zero, then this is the maximum quantity of this fuel type that would be present on this entity at all stations/launchers that can accept this fuel type. */
protected int maximumQuantity;
-
- /** the seconds normally required to reload the standard quantity of this fuel type at this specific station/launcher. When the Station/Launcher field is set to zero, this shall be the time it takes to perform a standard quantity reload of this fuel type at all applicable stations/launchers for this entity. */
+
+ /** the seconds normally required to reload the standard quantity of this fuel type at this specific station/launcher. When the Station/Launcher field is set to zero, this shall be the time it takes to perform a standard quantity reload of this fuel type at all applicable stations/launchers for this entity. */
protected int standardQuantityReloadTime;
-
- /** the seconds normally required to reload the maximum possible quantity of this fuel type at this station/launcher. When the Station/Launcher field is set to zero, this shall be the time it takes to perform a maximum quantity load/reload of this fuel type at all applicable stations/launchers for this entity. */
+
+ /** the seconds normally required to reload the maximum possible quantity of this fuel type at this station/launcher. When the Station/Launcher field is set to zero, this shall be the time it takes to perform a maximum quantity load/reload of this fuel type at all applicable stations/launchers for this entity. */
protected int maximumQuantityReloadTime;
-
- /** the fuel measurement units. Enumeration uid 328 */
+
+ /** the fuel measurement units. Enumeration uid 328 */
protected FuelMeasurementUnits fuelMeasurementUnits = FuelMeasurementUnits.values()[0];
-
- /** Fuel type uid 413 */
+
+ /** Fuel type uid 413 */
protected SupplyFuelType fuelType = SupplyFuelType.values()[0];
-
- /** Location of fuel as related to entity. See section 14 of EBV document uid 329 */
+
+ /** Location of fuel as related to entity. See section 14 of EBV document uid 329 */
protected FuelLocation fuelLocation = FuelLocation.values()[0];
-
- /** padding */
+
+ /** padding */
protected byte padding = (byte)0;
-
-
-/** Constructor */
- public StorageFuelReload()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public StorageFuelReload()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 4; // standardQuantity
+ marshalSize += 4; // maximumQuantity
+ marshalSize += 4; // standardQuantityReloadTime
+ marshalSize += 4; // maximumQuantityReloadTime
+ marshalSize += fuelMeasurementUnits.getMarshalledSize();
+ marshalSize += fuelType.getMarshalledSize();
+ marshalSize += fuelLocation.getMarshalledSize();
+ marshalSize += 1; // padding
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link StorageFuelReload#standardQuantity}*/
+public StorageFuelReload setStandardQuantity(int pStandardQuantity)
{
- int marshalSize = 0;
-
- marshalSize += 4; // standardQuantity
- marshalSize += 4; // maximumQuantity
- marshalSize += 4; // standardQuantityReloadTime
- marshalSize += 4; // maximumQuantityReloadTime
- marshalSize += fuelMeasurementUnits.getMarshalledSize();
- marshalSize += fuelType.getMarshalledSize();
- marshalSize += fuelLocation.getMarshalledSize();
- marshalSize += 1; // padding
-
- return marshalSize;
-}
-
-
-/** Setter for {@link StorageFuelReload#standardQuantity}*/
-public StorageFuelReload setStandardQuantity(int pStandardQuantity)
-{
- standardQuantity = pStandardQuantity;
- return this;
-}
-
-/** Getter for {@link StorageFuelReload#standardQuantity}*/
-public int getStandardQuantity()
+ standardQuantity = pStandardQuantity;
+ return this;
+}
+
+/** Getter for {@link StorageFuelReload#standardQuantity}*/
+public int getStandardQuantity()
{
return standardQuantity;
-}
-
-/** Setter for {@link StorageFuelReload#maximumQuantity}*/
-public StorageFuelReload setMaximumQuantity(int pMaximumQuantity)
+}
+
+/** Setter for {@link StorageFuelReload#maximumQuantity}*/
+public StorageFuelReload setMaximumQuantity(int pMaximumQuantity)
{
- maximumQuantity = pMaximumQuantity;
- return this;
-}
-
-/** Getter for {@link StorageFuelReload#maximumQuantity}*/
-public int getMaximumQuantity()
+ maximumQuantity = pMaximumQuantity;
+ return this;
+}
+
+/** Getter for {@link StorageFuelReload#maximumQuantity}*/
+public int getMaximumQuantity()
{
return maximumQuantity;
-}
-
-/** Setter for {@link StorageFuelReload#standardQuantityReloadTime}*/
-public StorageFuelReload setStandardQuantityReloadTime(int pStandardQuantityReloadTime)
+}
+
+/** Setter for {@link StorageFuelReload#standardQuantityReloadTime}*/
+public StorageFuelReload setStandardQuantityReloadTime(int pStandardQuantityReloadTime)
{
- standardQuantityReloadTime = pStandardQuantityReloadTime;
- return this;
-}
-
-/** Getter for {@link StorageFuelReload#standardQuantityReloadTime}*/
-public int getStandardQuantityReloadTime()
+ standardQuantityReloadTime = pStandardQuantityReloadTime;
+ return this;
+}
+
+/** Getter for {@link StorageFuelReload#standardQuantityReloadTime}*/
+public int getStandardQuantityReloadTime()
{
return standardQuantityReloadTime;
-}
-
-/** Setter for {@link StorageFuelReload#maximumQuantityReloadTime}*/
-public StorageFuelReload setMaximumQuantityReloadTime(int pMaximumQuantityReloadTime)
+}
+
+/** Setter for {@link StorageFuelReload#maximumQuantityReloadTime}*/
+public StorageFuelReload setMaximumQuantityReloadTime(int pMaximumQuantityReloadTime)
{
- maximumQuantityReloadTime = pMaximumQuantityReloadTime;
- return this;
-}
-
-/** Getter for {@link StorageFuelReload#maximumQuantityReloadTime}*/
-public int getMaximumQuantityReloadTime()
+ maximumQuantityReloadTime = pMaximumQuantityReloadTime;
+ return this;
+}
+
+/** Getter for {@link StorageFuelReload#maximumQuantityReloadTime}*/
+public int getMaximumQuantityReloadTime()
{
return maximumQuantityReloadTime;
-}
-
-/** Setter for {@link StorageFuelReload#fuelMeasurementUnits}*/
-public StorageFuelReload setFuelMeasurementUnits(FuelMeasurementUnits pFuelMeasurementUnits)
+}
+
+/** Setter for {@link StorageFuelReload#fuelMeasurementUnits}*/
+public StorageFuelReload setFuelMeasurementUnits(FuelMeasurementUnits pFuelMeasurementUnits)
{
- fuelMeasurementUnits = pFuelMeasurementUnits;
- return this;
-}
-
-/** Getter for {@link StorageFuelReload#fuelMeasurementUnits}*/
-public FuelMeasurementUnits getFuelMeasurementUnits()
+ fuelMeasurementUnits = pFuelMeasurementUnits;
+ return this;
+}
+
+/** Getter for {@link StorageFuelReload#fuelMeasurementUnits}*/
+public FuelMeasurementUnits getFuelMeasurementUnits()
{
return fuelMeasurementUnits;
-}
-
-/** Setter for {@link StorageFuelReload#fuelType}*/
-public StorageFuelReload setFuelType(SupplyFuelType pFuelType)
+}
+
+/** Setter for {@link StorageFuelReload#fuelType}*/
+public StorageFuelReload setFuelType(SupplyFuelType pFuelType)
{
- fuelType = pFuelType;
- return this;
-}
-
-/** Getter for {@link StorageFuelReload#fuelType}*/
-public SupplyFuelType getFuelType()
+ fuelType = pFuelType;
+ return this;
+}
+
+/** Getter for {@link StorageFuelReload#fuelType}*/
+public SupplyFuelType getFuelType()
{
return fuelType;
-}
-
-/** Setter for {@link StorageFuelReload#fuelLocation}*/
-public StorageFuelReload setFuelLocation(FuelLocation pFuelLocation)
+}
+
+/** Setter for {@link StorageFuelReload#fuelLocation}*/
+public StorageFuelReload setFuelLocation(FuelLocation pFuelLocation)
{
- fuelLocation = pFuelLocation;
- return this;
-}
-
-/** Getter for {@link StorageFuelReload#fuelLocation}*/
-public FuelLocation getFuelLocation()
+ fuelLocation = pFuelLocation;
+ return this;
+}
+
+/** Getter for {@link StorageFuelReload#fuelLocation}*/
+public FuelLocation getFuelLocation()
{
return fuelLocation;
-}
-
-/** Setter for {@link StorageFuelReload#padding}*/
-public StorageFuelReload setPadding(byte pPadding)
+}
+
+/** Setter for {@link StorageFuelReload#padding}*/
+public StorageFuelReload setPadding(byte pPadding)
{
- padding = pPadding;
- return this;
-}
-
-/** Getter for {@link StorageFuelReload#padding}*/
-public byte getPadding()
+ padding = pPadding;
+ return this;
+}
+
+/** Getter for {@link StorageFuelReload#padding}*/
+public byte getPadding()
{
return padding;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeInt(standardQuantity);
- dos.writeInt(maximumQuantity);
- dos.writeInt(standardQuantityReloadTime);
- dos.writeInt(maximumQuantityReloadTime);
- fuelMeasurementUnits.marshal(dos);
- fuelType.marshal(dos);
- fuelLocation.marshal(dos);
- dos.writeByte(padding);
+ {
+ dos.writeInt(standardQuantity);
+ dos.writeInt(maximumQuantity);
+ dos.writeInt(standardQuantityReloadTime);
+ dos.writeInt(maximumQuantityReloadTime);
+ fuelMeasurementUnits.marshal(dos);
+ fuelType.marshal(dos);
+ fuelLocation.marshal(dos);
+ dos.writeByte(padding);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- standardQuantity = dis.readInt();
- uPosition += 4;
- maximumQuantity = dis.readInt();
- uPosition += 4;
- standardQuantityReloadTime = dis.readInt();
- uPosition += 4;
- maximumQuantityReloadTime = dis.readInt();
- uPosition += 4;
- fuelMeasurementUnits = FuelMeasurementUnits.unmarshalEnum(dis);
- uPosition += fuelMeasurementUnits.getMarshalledSize();
- fuelType = SupplyFuelType.unmarshalEnum(dis);
- uPosition += fuelType.getMarshalledSize();
- fuelLocation = FuelLocation.unmarshalEnum(dis);
- uPosition += fuelLocation.getMarshalledSize();
- padding = (byte)dis.readUnsignedByte();
- uPosition += 1;
+ {
+ standardQuantity = dis.readInt();
+ uPosition += 4;
+ maximumQuantity = dis.readInt();
+ uPosition += 4;
+ standardQuantityReloadTime = dis.readInt();
+ uPosition += 4;
+ maximumQuantityReloadTime = dis.readInt();
+ uPosition += 4;
+ fuelMeasurementUnits = FuelMeasurementUnits.unmarshalEnum(dis);
+ uPosition += fuelMeasurementUnits.getMarshalledSize();
+ fuelType = SupplyFuelType.unmarshalEnum(dis);
+ uPosition += fuelType.getMarshalledSize();
+ fuelLocation = FuelLocation.unmarshalEnum(dis);
+ uPosition += fuelLocation.getMarshalledSize();
+ padding = (byte)dis.readUnsignedByte();
+ uPosition += 1;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putInt( (int)standardQuantity);
- buff.putInt( (int)maximumQuantity);
- buff.putInt( (int)standardQuantityReloadTime);
- buff.putInt( (int)maximumQuantityReloadTime);
- fuelMeasurementUnits.marshal(buff);
- fuelType.marshal(buff);
- fuelLocation.marshal(buff);
- buff.put( (byte)padding);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- standardQuantity = buff.getInt();
- maximumQuantity = buff.getInt();
- standardQuantityReloadTime = buff.getInt();
- maximumQuantityReloadTime = buff.getInt();
- fuelMeasurementUnits = FuelMeasurementUnits.unmarshalEnum(buff);
- fuelType = SupplyFuelType.unmarshalEnum(buff);
- fuelLocation = FuelLocation.unmarshalEnum(buff);
- padding = (byte)(buff.get() & 0xFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putInt( (int)standardQuantity);
+ buff.putInt( (int)maximumQuantity);
+ buff.putInt( (int)standardQuantityReloadTime);
+ buff.putInt( (int)maximumQuantityReloadTime);
+ fuelMeasurementUnits.marshal(buff);
+ fuelType.marshal(buff);
+ fuelLocation.marshal(buff);
+ buff.put( (byte)padding);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ standardQuantity = buff.getInt();
+ maximumQuantity = buff.getInt();
+ standardQuantityReloadTime = buff.getInt();
+ maximumQuantityReloadTime = buff.getInt();
+ fuelMeasurementUnits = FuelMeasurementUnits.unmarshalEnum(buff);
+ fuelType = SupplyFuelType.unmarshalEnum(buff);
+ fuelLocation = FuelLocation.unmarshalEnum(buff);
+ padding = (byte)(buff.get() & 0xFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final StorageFuelReload rhs = (StorageFuelReload)obj;
-
- if( ! (standardQuantity == rhs.standardQuantity)) ivarsEqual = false;
- if( ! (maximumQuantity == rhs.maximumQuantity)) ivarsEqual = false;
- if( ! (standardQuantityReloadTime == rhs.standardQuantityReloadTime)) ivarsEqual = false;
- if( ! (maximumQuantityReloadTime == rhs.maximumQuantityReloadTime)) ivarsEqual = false;
- if( ! (fuelMeasurementUnits == rhs.fuelMeasurementUnits)) ivarsEqual = false;
- if( ! (fuelType == rhs.fuelType)) ivarsEqual = false;
- if( ! (fuelLocation == rhs.fuelLocation)) ivarsEqual = false;
- if( ! (padding == rhs.padding)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final StorageFuelReload rhs = (StorageFuelReload)obj;
+
+ if( ! (standardQuantity == rhs.standardQuantity)) ivarsEqual = false;
+ if( ! (maximumQuantity == rhs.maximumQuantity)) ivarsEqual = false;
+ if( ! (standardQuantityReloadTime == rhs.standardQuantityReloadTime)) ivarsEqual = false;
+ if( ! (maximumQuantityReloadTime == rhs.maximumQuantityReloadTime)) ivarsEqual = false;
+ if( ! (fuelMeasurementUnits == rhs.fuelMeasurementUnits)) ivarsEqual = false;
+ if( ! (fuelType == rhs.fuelType)) ivarsEqual = false;
+ if( ! (fuelLocation == rhs.fuelLocation)) ivarsEqual = false;
+ if( ! (padding == rhs.padding)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" standardQuantity: ").append(standardQuantity).append("\n");
- sb.append(" maximumQuantity: ").append(maximumQuantity).append("\n");
- sb.append(" standardQuantityReloadTime: ").append(standardQuantityReloadTime).append("\n");
- sb.append(" maximumQuantityReloadTime: ").append(maximumQuantityReloadTime).append("\n");
- sb.append(" fuelMeasurementUnits: ").append(fuelMeasurementUnits).append("\n");
- sb.append(" fuelType: ").append(fuelType).append("\n");
- sb.append(" fuelLocation: ").append(fuelLocation).append("\n");
- sb.append(" padding: ").append(padding).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" standardQuantity: ").append(standardQuantity).append("\n");
+ sb.append(" maximumQuantity: ").append(maximumQuantity).append("\n");
+ sb.append(" standardQuantityReloadTime: ").append(standardQuantityReloadTime).append("\n");
+ sb.append(" maximumQuantityReloadTime: ").append(maximumQuantityReloadTime).append("\n");
+ sb.append(" fuelMeasurementUnits: ").append(fuelMeasurementUnits).append("\n");
+ sb.append(" fuelType: ").append(fuelType).append("\n");
+ sb.append(" fuelLocation: ").append(fuelLocation).append("\n");
+ sb.append(" padding: ").append(padding).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/SupplementalEmissionEntityStatePdu.java b/src-generated/edu/nps/moves/dis7/SupplementalEmissionEntityStatePdu.java
index d848c54a0d39a4b507091b4ccdf3f3a88c8e6f31..181d6fd6f192f1c53fecd93c70bce540d6f87270 100644
--- a/src-generated/edu/nps/moves/dis7/SupplementalEmissionEntityStatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/SupplementalEmissionEntityStatePdu.java
@@ -1,17 +1,17 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * more descriptive name for a SEESPdu
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class SupplementalEmissionEntityStatePdu extends SEESPdu
-{}
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * more descriptive name for a SEESPdu
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class SupplementalEmissionEntityStatePdu extends SEESPdu
+{}
diff --git a/src-generated/edu/nps/moves/dis7/SupplyQuantity.java b/src-generated/edu/nps/moves/dis7/SupplyQuantity.java
index 550204350947066ddbca70e7b361a97dc672ced8..94aefbc44a1533a8c948b2af7dbd2a71cb2b064a 100644
--- a/src-generated/edu/nps/moves/dis7/SupplyQuantity.java
+++ b/src-generated/edu/nps/moves/dis7/SupplyQuantity.java
@@ -1,185 +1,185 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * A supply, and the amount of that supply. Section 6.2.86
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class SupplyQuantity extends Object implements Serializable
-{
- /** Type of supply */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * A supply, and the amount of that supply. Section 6.2.86
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class SupplyQuantity extends Object implements Serializable
+{
+ /** Type of supply */
protected EntityType supplyType = new EntityType();
-
- /** the number of units of a supply type. */
+
+ /** the number of units of a supply type. */
protected float quantity;
-
-
-/** Constructor */
- public SupplyQuantity()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += supplyType.getMarshalledSize();
- marshalSize += 4; // quantity
-
- return marshalSize;
-}
-
-
-/** Setter for {@link SupplyQuantity#supplyType}*/
-public SupplyQuantity setSupplyType(EntityType pSupplyType)
+
+
+/** Constructor */
+ public SupplyQuantity()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += supplyType.getMarshalledSize();
+ marshalSize += 4; // quantity
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link SupplyQuantity#supplyType}*/
+public SupplyQuantity setSupplyType(EntityType pSupplyType)
{
- supplyType = pSupplyType;
- return this;
-}
-
-/** Getter for {@link SupplyQuantity#supplyType}*/
-public EntityType getSupplyType()
+ supplyType = pSupplyType;
+ return this;
+}
+
+/** Getter for {@link SupplyQuantity#supplyType}*/
+public EntityType getSupplyType()
{
return supplyType;
-}
-
-/** Setter for {@link SupplyQuantity#quantity}*/
-public SupplyQuantity setQuantity(float pQuantity)
+}
+
+/** Setter for {@link SupplyQuantity#quantity}*/
+public SupplyQuantity setQuantity(float pQuantity)
{
- quantity = pQuantity;
- return this;
-}
-
-/** Getter for {@link SupplyQuantity#quantity}*/
-public float getQuantity()
+ quantity = pQuantity;
+ return this;
+}
+
+/** Getter for {@link SupplyQuantity#quantity}*/
+public float getQuantity()
{
return quantity;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- supplyType.marshal(dos);
- dos.writeFloat(quantity);
+ {
+ supplyType.marshal(dos);
+ dos.writeFloat(quantity);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- uPosition += supplyType.unmarshal(dis);
- quantity = dis.readFloat();
- uPosition += 4;
+ {
+ uPosition += supplyType.unmarshal(dis);
+ quantity = dis.readFloat();
+ uPosition += 4;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- supplyType.marshal(buff);
- buff.putFloat( (float)quantity);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- supplyType.unmarshal(buff);
- quantity = buff.getFloat();
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ supplyType.marshal(buff);
+ buff.putFloat( (float)quantity);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ supplyType.unmarshal(buff);
+ quantity = buff.getFloat();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final SupplyQuantity rhs = (SupplyQuantity)obj;
-
- if( ! (supplyType.equals( rhs.supplyType) )) ivarsEqual = false;
- if( ! (quantity == rhs.quantity)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final SupplyQuantity rhs = (SupplyQuantity)obj;
+
+ if( ! (supplyType.equals( rhs.supplyType) )) ivarsEqual = false;
+ if( ! (quantity == rhs.quantity)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" supplyType: ").append(supplyType).append("\n");
- sb.append(" quantity: ").append(quantity).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" supplyType: ").append(supplyType).append("\n");
+ sb.append(" quantity: ").append(quantity).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/SyntheticEnvironmentFamilyPdu.java b/src-generated/edu/nps/moves/dis7/SyntheticEnvironmentFamilyPdu.java
index 01bd4705efb6b6975ef8cdfb95d07469cb15ea19..12fccc842715a9345cbcb90ebca2253f78f0ccce 100644
--- a/src-generated/edu/nps/moves/dis7/SyntheticEnvironmentFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/SyntheticEnvironmentFamilyPdu.java
@@ -1,141 +1,141 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Section 5.3.11: Abstract superclass for synthetic environment PDUs
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public abstract class SyntheticEnvironmentFamilyPdu extends PduBase implements Serializable
-{
-
-/** Constructor */
- public SyntheticEnvironmentFamilyPdu()
- {
- setProtocolFamily( DISProtocolFamily.SYNTHETIC_ENVIRONMENT );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
-
- return marshalSize;
-}
-
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Section 5.3.11: Abstract superclass for synthetic environment PDUs
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public abstract class SyntheticEnvironmentFamilyPdu extends PduBase implements Serializable
+{
+
+/** Constructor */
+ public SyntheticEnvironmentFamilyPdu()
+ {
+ setProtocolFamily( DISProtocolFamily.SYNTHETIC_ENVIRONMENT );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+
+ return marshalSize;
+}
+
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
+ {
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
+ {
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- return getMarshalledSize();
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final SyntheticEnvironmentFamilyPdu rhs = (SyntheticEnvironmentFamilyPdu)obj;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final SyntheticEnvironmentFamilyPdu rhs = (SyntheticEnvironmentFamilyPdu)obj;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
-
- return sb.toString();
- }
-} // end of class
+
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/SystemIdentifier.java b/src-generated/edu/nps/moves/dis7/SystemIdentifier.java
index 2b4f8cd40acef015cb5ccb71e887c7d7ed2e8569..7c5a83c4cd0efce1eabb55a34307d810669d0fc1 100644
--- a/src-generated/edu/nps/moves/dis7/SystemIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/SystemIdentifier.java
@@ -1,233 +1,233 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * The ID of the IFF emitting system. Section 6.2.87
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class SystemIdentifier extends Object implements Serializable
-{
- /** general type of emitting system, an enumeration uid 82 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * The ID of the IFF emitting system. Section 6.2.87
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class SystemIdentifier extends Object implements Serializable
+{
+ /** general type of emitting system, an enumeration uid 82 */
protected IFFSystemType systemType = IFFSystemType.values()[0];
-
- /** named type of system, an enumeration uid 83 */
+
+ /** named type of system, an enumeration uid 83 */
protected IFFSystemName systemName = IFFSystemName.values()[0];
-
- /** mode of operation for the system, an enumeration uid 84 */
+
+ /** mode of operation for the system, an enumeration uid 84 */
protected IFFSystemMode systemMode = IFFSystemMode.values()[0];
-
- /** status of this PDU, see section 6.2.15 */
+
+ /** status of this PDU, see section 6.2.15 */
protected ChangeOptions changeOptions = new ChangeOptions();
-
-
-/** Constructor */
- public SystemIdentifier()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public SystemIdentifier()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += systemType.getMarshalledSize();
+ marshalSize += systemName.getMarshalledSize();
+ marshalSize += systemMode.getMarshalledSize();
+ marshalSize += changeOptions.getMarshalledSize();
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link SystemIdentifier#systemType}*/
+public SystemIdentifier setSystemType(IFFSystemType pSystemType)
{
- int marshalSize = 0;
-
- marshalSize += systemType.getMarshalledSize();
- marshalSize += systemName.getMarshalledSize();
- marshalSize += systemMode.getMarshalledSize();
- marshalSize += changeOptions.getMarshalledSize();
-
- return marshalSize;
-}
-
-
-/** Setter for {@link SystemIdentifier#systemType}*/
-public SystemIdentifier setSystemType(IFFSystemType pSystemType)
-{
- systemType = pSystemType;
- return this;
-}
-
-/** Getter for {@link SystemIdentifier#systemType}*/
-public IFFSystemType getSystemType()
+ systemType = pSystemType;
+ return this;
+}
+
+/** Getter for {@link SystemIdentifier#systemType}*/
+public IFFSystemType getSystemType()
{
return systemType;
-}
-
-/** Setter for {@link SystemIdentifier#systemName}*/
-public SystemIdentifier setSystemName(IFFSystemName pSystemName)
+}
+
+/** Setter for {@link SystemIdentifier#systemName}*/
+public SystemIdentifier setSystemName(IFFSystemName pSystemName)
{
- systemName = pSystemName;
- return this;
-}
-
-/** Getter for {@link SystemIdentifier#systemName}*/
-public IFFSystemName getSystemName()
+ systemName = pSystemName;
+ return this;
+}
+
+/** Getter for {@link SystemIdentifier#systemName}*/
+public IFFSystemName getSystemName()
{
return systemName;
-}
-
-/** Setter for {@link SystemIdentifier#systemMode}*/
-public SystemIdentifier setSystemMode(IFFSystemMode pSystemMode)
+}
+
+/** Setter for {@link SystemIdentifier#systemMode}*/
+public SystemIdentifier setSystemMode(IFFSystemMode pSystemMode)
{
- systemMode = pSystemMode;
- return this;
-}
-
-/** Getter for {@link SystemIdentifier#systemMode}*/
-public IFFSystemMode getSystemMode()
+ systemMode = pSystemMode;
+ return this;
+}
+
+/** Getter for {@link SystemIdentifier#systemMode}*/
+public IFFSystemMode getSystemMode()
{
return systemMode;
-}
-
-/** Setter for {@link SystemIdentifier#changeOptions}*/
-public SystemIdentifier setChangeOptions(ChangeOptions pChangeOptions)
+}
+
+/** Setter for {@link SystemIdentifier#changeOptions}*/
+public SystemIdentifier setChangeOptions(ChangeOptions pChangeOptions)
{
- changeOptions = pChangeOptions;
- return this;
-}
-
-/** Getter for {@link SystemIdentifier#changeOptions}*/
-public ChangeOptions getChangeOptions()
+ changeOptions = pChangeOptions;
+ return this;
+}
+
+/** Getter for {@link SystemIdentifier#changeOptions}*/
+public ChangeOptions getChangeOptions()
{
return changeOptions;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- systemType.marshal(dos);
- systemName.marshal(dos);
- systemMode.marshal(dos);
- changeOptions.marshal(dos);
+ {
+ systemType.marshal(dos);
+ systemName.marshal(dos);
+ systemMode.marshal(dos);
+ changeOptions.marshal(dos);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- systemType = IFFSystemType.unmarshalEnum(dis);
- uPosition += systemType.getMarshalledSize();
- systemName = IFFSystemName.unmarshalEnum(dis);
- uPosition += systemName.getMarshalledSize();
- systemMode = IFFSystemMode.unmarshalEnum(dis);
- uPosition += systemMode.getMarshalledSize();
- uPosition += changeOptions.unmarshal(dis);
+ {
+ systemType = IFFSystemType.unmarshalEnum(dis);
+ uPosition += systemType.getMarshalledSize();
+ systemName = IFFSystemName.unmarshalEnum(dis);
+ uPosition += systemName.getMarshalledSize();
+ systemMode = IFFSystemMode.unmarshalEnum(dis);
+ uPosition += systemMode.getMarshalledSize();
+ uPosition += changeOptions.unmarshal(dis);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- systemType.marshal(buff);
- systemName.marshal(buff);
- systemMode.marshal(buff);
- changeOptions.marshal(buff);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- systemType = IFFSystemType.unmarshalEnum(buff);
- systemName = IFFSystemName.unmarshalEnum(buff);
- systemMode = IFFSystemMode.unmarshalEnum(buff);
- changeOptions.unmarshal(buff);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ systemType.marshal(buff);
+ systemName.marshal(buff);
+ systemMode.marshal(buff);
+ changeOptions.marshal(buff);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ systemType = IFFSystemType.unmarshalEnum(buff);
+ systemName = IFFSystemName.unmarshalEnum(buff);
+ systemMode = IFFSystemMode.unmarshalEnum(buff);
+ changeOptions.unmarshal(buff);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final SystemIdentifier rhs = (SystemIdentifier)obj;
-
- if( ! (systemType == rhs.systemType)) ivarsEqual = false;
- if( ! (systemName == rhs.systemName)) ivarsEqual = false;
- if( ! (systemMode == rhs.systemMode)) ivarsEqual = false;
- if( ! (changeOptions.equals( rhs.changeOptions) )) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final SystemIdentifier rhs = (SystemIdentifier)obj;
+
+ if( ! (systemType == rhs.systemType)) ivarsEqual = false;
+ if( ! (systemName == rhs.systemName)) ivarsEqual = false;
+ if( ! (systemMode == rhs.systemMode)) ivarsEqual = false;
+ if( ! (changeOptions.equals( rhs.changeOptions) )) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" systemType: ").append(systemType).append("\n");
- sb.append(" systemName: ").append(systemName).append("\n");
- sb.append(" systemMode: ").append(systemMode).append("\n");
- sb.append(" changeOptions: ").append(changeOptions).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" systemType: ").append(systemType).append("\n");
+ sb.append(" systemName: ").append(systemName).append("\n");
+ sb.append(" systemMode: ").append(systemMode).append("\n");
+ sb.append(" changeOptions: ").append(changeOptions).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/TSPIPdu.java b/src-generated/edu/nps/moves/dis7/TSPIPdu.java
index 8636c902db48252adee4733d3bc6edba854a6a53..5761f0745ee1864cf3346fc02b56db01cee86176 100644
--- a/src-generated/edu/nps/moves/dis7/TSPIPdu.java
+++ b/src-generated/edu/nps/moves/dis7/TSPIPdu.java
@@ -1,387 +1,387 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 9.4.2 The Time Space Position Information (TSPI) PDU shall communicate information about the LE’s state vector.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class TSPIPdu extends LiveEntityFamilyPdu implements Serializable
-{
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 9.4.2 The Time Space Position Information (TSPI) PDU shall communicate information about the LE’s state vector.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class TSPIPdu extends LiveEntityFamilyPdu implements Serializable
+{
protected EntityID liveEntityId = new EntityID();
-
- /** bit field */
+
+ /** bit field */
protected byte TSPIFlag;
-
+
protected LiveEntityRelativeWorldCoordinates entityLocation = new LiveEntityRelativeWorldCoordinates();
-
+
protected LiveEntityLinearVelocity entityLinearVelocity = new LiveEntityLinearVelocity();
-
+
protected LiveEntityOrientation entityOrientation = new LiveEntityOrientation();
-
+
protected LiveEntityPositionError positionError = new LiveEntityPositionError();
-
+
protected LiveEntityOrientationError orientationError = new LiveEntityOrientationError();
-
+
protected LiveDeadReckoningParameters deadReckoningParameters = new LiveDeadReckoningParameters();
-
+
protected short measuredSpeed;
-
+
protected byte systemSpecificDataLength;
-
+
protected byte[] systemSpecificData = new byte[0];
-
-
-/** Constructor */
- public TSPIPdu()
- {
- setPduType( DISPDUType.TIME_SPACE_POSITION_INFORMATION );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public TSPIPdu()
+ {
+ setPduType( DISPDUType.TIME_SPACE_POSITION_INFORMATION );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += liveEntityId.getMarshalledSize();
+ marshalSize += 1; // TSPIFlag
+ marshalSize += entityLocation.getMarshalledSize();
+ marshalSize += entityLinearVelocity.getMarshalledSize();
+ marshalSize += entityOrientation.getMarshalledSize();
+ marshalSize += positionError.getMarshalledSize();
+ marshalSize += orientationError.getMarshalledSize();
+ marshalSize += deadReckoningParameters.getMarshalledSize();
+ marshalSize += 2; // measuredSpeed
+ marshalSize += 1; // systemSpecificDataLength
+ marshalSize += systemSpecificData.length * 1;
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link TSPIPdu#liveEntityId}*/
+public TSPIPdu setLiveEntityId(EntityID pLiveEntityId)
{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += liveEntityId.getMarshalledSize();
- marshalSize += 1; // TSPIFlag
- marshalSize += entityLocation.getMarshalledSize();
- marshalSize += entityLinearVelocity.getMarshalledSize();
- marshalSize += entityOrientation.getMarshalledSize();
- marshalSize += positionError.getMarshalledSize();
- marshalSize += orientationError.getMarshalledSize();
- marshalSize += deadReckoningParameters.getMarshalledSize();
- marshalSize += 2; // measuredSpeed
- marshalSize += 1; // systemSpecificDataLength
- marshalSize += systemSpecificData.length * 1;
-
- return marshalSize;
-}
-
-
-/** Setter for {@link TSPIPdu#liveEntityId}*/
-public TSPIPdu setLiveEntityId(EntityID pLiveEntityId)
-{
- liveEntityId = pLiveEntityId;
- return this;
-}
-
-/** Getter for {@link TSPIPdu#liveEntityId}*/
-public EntityID getLiveEntityId()
+ liveEntityId = pLiveEntityId;
+ return this;
+}
+
+/** Getter for {@link TSPIPdu#liveEntityId}*/
+public EntityID getLiveEntityId()
{
return liveEntityId;
-}
-
-/** Setter for {@link TSPIPdu#TSPIFlag}*/
-public TSPIPdu setTSPIFlag(byte pTSPIFlag)
+}
+
+/** Setter for {@link TSPIPdu#TSPIFlag}*/
+public TSPIPdu setTSPIFlag(byte pTSPIFlag)
{
- TSPIFlag = pTSPIFlag;
- return this;
-}
-
-/** Getter for {@link TSPIPdu#TSPIFlag}*/
-public byte getTSPIFlag()
+ TSPIFlag = pTSPIFlag;
+ return this;
+}
+
+/** Getter for {@link TSPIPdu#TSPIFlag}*/
+public byte getTSPIFlag()
{
return TSPIFlag;
-}
-
-/** Setter for {@link TSPIPdu#entityLocation}*/
-public TSPIPdu setEntityLocation(LiveEntityRelativeWorldCoordinates pEntityLocation)
+}
+
+/** Setter for {@link TSPIPdu#entityLocation}*/
+public TSPIPdu setEntityLocation(LiveEntityRelativeWorldCoordinates pEntityLocation)
{
- entityLocation = pEntityLocation;
- return this;
-}
-
-/** Getter for {@link TSPIPdu#entityLocation}*/
-public LiveEntityRelativeWorldCoordinates getEntityLocation()
+ entityLocation = pEntityLocation;
+ return this;
+}
+
+/** Getter for {@link TSPIPdu#entityLocation}*/
+public LiveEntityRelativeWorldCoordinates getEntityLocation()
{
return entityLocation;
-}
-
-/** Setter for {@link TSPIPdu#entityLinearVelocity}*/
-public TSPIPdu setEntityLinearVelocity(LiveEntityLinearVelocity pEntityLinearVelocity)
+}
+
+/** Setter for {@link TSPIPdu#entityLinearVelocity}*/
+public TSPIPdu setEntityLinearVelocity(LiveEntityLinearVelocity pEntityLinearVelocity)
{
- entityLinearVelocity = pEntityLinearVelocity;
- return this;
-}
-
-/** Getter for {@link TSPIPdu#entityLinearVelocity}*/
-public LiveEntityLinearVelocity getEntityLinearVelocity()
+ entityLinearVelocity = pEntityLinearVelocity;
+ return this;
+}
+
+/** Getter for {@link TSPIPdu#entityLinearVelocity}*/
+public LiveEntityLinearVelocity getEntityLinearVelocity()
{
return entityLinearVelocity;
-}
-
-/** Setter for {@link TSPIPdu#entityOrientation}*/
-public TSPIPdu setEntityOrientation(LiveEntityOrientation pEntityOrientation)
+}
+
+/** Setter for {@link TSPIPdu#entityOrientation}*/
+public TSPIPdu setEntityOrientation(LiveEntityOrientation pEntityOrientation)
{
- entityOrientation = pEntityOrientation;
- return this;
-}
-
-/** Getter for {@link TSPIPdu#entityOrientation}*/
-public LiveEntityOrientation getEntityOrientation()
+ entityOrientation = pEntityOrientation;
+ return this;
+}
+
+/** Getter for {@link TSPIPdu#entityOrientation}*/
+public LiveEntityOrientation getEntityOrientation()
{
return entityOrientation;
-}
-
-/** Setter for {@link TSPIPdu#positionError}*/
-public TSPIPdu setPositionError(LiveEntityPositionError pPositionError)
+}
+
+/** Setter for {@link TSPIPdu#positionError}*/
+public TSPIPdu setPositionError(LiveEntityPositionError pPositionError)
{
- positionError = pPositionError;
- return this;
-}
-
-/** Getter for {@link TSPIPdu#positionError}*/
-public LiveEntityPositionError getPositionError()
+ positionError = pPositionError;
+ return this;
+}
+
+/** Getter for {@link TSPIPdu#positionError}*/
+public LiveEntityPositionError getPositionError()
{
return positionError;
-}
-
-/** Setter for {@link TSPIPdu#orientationError}*/
-public TSPIPdu setOrientationError(LiveEntityOrientationError pOrientationError)
+}
+
+/** Setter for {@link TSPIPdu#orientationError}*/
+public TSPIPdu setOrientationError(LiveEntityOrientationError pOrientationError)
{
- orientationError = pOrientationError;
- return this;
-}
-
-/** Getter for {@link TSPIPdu#orientationError}*/
-public LiveEntityOrientationError getOrientationError()
+ orientationError = pOrientationError;
+ return this;
+}
+
+/** Getter for {@link TSPIPdu#orientationError}*/
+public LiveEntityOrientationError getOrientationError()
{
return orientationError;
-}
-
-/** Setter for {@link TSPIPdu#deadReckoningParameters}*/
-public TSPIPdu setDeadReckoningParameters(LiveDeadReckoningParameters pDeadReckoningParameters)
+}
+
+/** Setter for {@link TSPIPdu#deadReckoningParameters}*/
+public TSPIPdu setDeadReckoningParameters(LiveDeadReckoningParameters pDeadReckoningParameters)
{
- deadReckoningParameters = pDeadReckoningParameters;
- return this;
-}
-
-/** Getter for {@link TSPIPdu#deadReckoningParameters}*/
-public LiveDeadReckoningParameters getDeadReckoningParameters()
+ deadReckoningParameters = pDeadReckoningParameters;
+ return this;
+}
+
+/** Getter for {@link TSPIPdu#deadReckoningParameters}*/
+public LiveDeadReckoningParameters getDeadReckoningParameters()
{
return deadReckoningParameters;
-}
-
-/** Setter for {@link TSPIPdu#measuredSpeed}*/
-public TSPIPdu setMeasuredSpeed(short pMeasuredSpeed)
+}
+
+/** Setter for {@link TSPIPdu#measuredSpeed}*/
+public TSPIPdu setMeasuredSpeed(short pMeasuredSpeed)
{
- measuredSpeed = pMeasuredSpeed;
- return this;
-}
-
-/** Getter for {@link TSPIPdu#measuredSpeed}*/
-public short getMeasuredSpeed()
+ measuredSpeed = pMeasuredSpeed;
+ return this;
+}
+
+/** Getter for {@link TSPIPdu#measuredSpeed}*/
+public short getMeasuredSpeed()
{
return measuredSpeed;
-}
-
-/** Setter for {@link TSPIPdu#systemSpecificData}*/
-public TSPIPdu setSystemSpecificData(byte[] pSystemSpecificData)
+}
+
+/** Setter for {@link TSPIPdu#systemSpecificData}*/
+public TSPIPdu setSystemSpecificData(byte[] pSystemSpecificData)
{
- systemSpecificData = pSystemSpecificData;
- return this;
-}
-
-/** Getter for {@link TSPIPdu#systemSpecificData}*/
-public byte[] getSystemSpecificData()
+ systemSpecificData = pSystemSpecificData;
+ return this;
+}
+
+/** Getter for {@link TSPIPdu#systemSpecificData}*/
+public byte[] getSystemSpecificData()
{
return systemSpecificData;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- liveEntityId.marshal(dos);
- dos.writeByte(TSPIFlag);
- entityLocation.marshal(dos);
- entityLinearVelocity.marshal(dos);
- entityOrientation.marshal(dos);
- positionError.marshal(dos);
- orientationError.marshal(dos);
- deadReckoningParameters.marshal(dos);
- dos.writeShort(measuredSpeed);
- dos.writeByte(systemSpecificData.length);
-
- for(int idx = 0; idx < systemSpecificData.length; idx++)
- dos.writeByte(systemSpecificData[idx]);
-
+ {
+ liveEntityId.marshal(dos);
+ dos.writeByte(TSPIFlag);
+ entityLocation.marshal(dos);
+ entityLinearVelocity.marshal(dos);
+ entityOrientation.marshal(dos);
+ positionError.marshal(dos);
+ orientationError.marshal(dos);
+ deadReckoningParameters.marshal(dos);
+ dos.writeShort(measuredSpeed);
+ dos.writeByte(systemSpecificData.length);
+
+ for(int idx = 0; idx < systemSpecificData.length; idx++)
+ dos.writeByte(systemSpecificData[idx]);
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += liveEntityId.unmarshal(dis);
- TSPIFlag = (byte)dis.readUnsignedByte();
- uPosition += 1;
- uPosition += entityLocation.unmarshal(dis);
- uPosition += entityLinearVelocity.unmarshal(dis);
- uPosition += entityOrientation.unmarshal(dis);
- uPosition += positionError.unmarshal(dis);
- uPosition += orientationError.unmarshal(dis);
- uPosition += deadReckoningParameters.unmarshal(dis);
- measuredSpeed = (short)dis.readUnsignedShort();
- uPosition += 2;
- systemSpecificDataLength = (byte)dis.readUnsignedByte();
- uPosition += 1;
- for(int idx = 0; idx < systemSpecificData.length; idx++)
- systemSpecificData[idx] = dis.readByte();
- uPosition += (systemSpecificData.length * 1);
+ {
+ uPosition += liveEntityId.unmarshal(dis);
+ TSPIFlag = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ uPosition += entityLocation.unmarshal(dis);
+ uPosition += entityLinearVelocity.unmarshal(dis);
+ uPosition += entityOrientation.unmarshal(dis);
+ uPosition += positionError.unmarshal(dis);
+ uPosition += orientationError.unmarshal(dis);
+ uPosition += deadReckoningParameters.unmarshal(dis);
+ measuredSpeed = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ systemSpecificDataLength = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ for(int idx = 0; idx < systemSpecificData.length; idx++)
+ systemSpecificData[idx] = dis.readByte();
+ uPosition += (systemSpecificData.length * 1);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- liveEntityId.marshal(buff);
- buff.put( (byte)TSPIFlag);
- entityLocation.marshal(buff);
- entityLinearVelocity.marshal(buff);
- entityOrientation.marshal(buff);
- positionError.marshal(buff);
- orientationError.marshal(buff);
- deadReckoningParameters.marshal(buff);
- buff.putShort( (short)measuredSpeed);
- buff.put( (byte)systemSpecificData.length);
-
- for(int idx = 0; idx < systemSpecificData.length; idx++)
- buff.put((byte)systemSpecificData[idx]);
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ liveEntityId.marshal(buff);
+ buff.put( (byte)TSPIFlag);
+ entityLocation.marshal(buff);
+ entityLinearVelocity.marshal(buff);
+ entityOrientation.marshal(buff);
+ positionError.marshal(buff);
+ orientationError.marshal(buff);
+ deadReckoningParameters.marshal(buff);
+ buff.putShort( (short)measuredSpeed);
+ buff.put( (byte)systemSpecificData.length);
+
+ for(int idx = 0; idx < systemSpecificData.length; idx++)
+ buff.put((byte)systemSpecificData[idx]);
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- liveEntityId.unmarshal(buff);
- TSPIFlag = (byte)(buff.get() & 0xFF);
- entityLocation.unmarshal(buff);
- entityLinearVelocity.unmarshal(buff);
- entityOrientation.unmarshal(buff);
- positionError.unmarshal(buff);
- orientationError.unmarshal(buff);
- deadReckoningParameters.unmarshal(buff);
- measuredSpeed = (short)(buff.getShort() & 0xFFFF);
- systemSpecificDataLength = (byte)(buff.get() & 0xFF);
- for(int idx = 0; idx < systemSpecificData.length; idx++)
- systemSpecificData[idx] = buff.get();
- return getMarshalledSize();
+
+ liveEntityId.unmarshal(buff);
+ TSPIFlag = (byte)(buff.get() & 0xFF);
+ entityLocation.unmarshal(buff);
+ entityLinearVelocity.unmarshal(buff);
+ entityOrientation.unmarshal(buff);
+ positionError.unmarshal(buff);
+ orientationError.unmarshal(buff);
+ deadReckoningParameters.unmarshal(buff);
+ measuredSpeed = (short)(buff.getShort() & 0xFFFF);
+ systemSpecificDataLength = (byte)(buff.get() & 0xFF);
+ for(int idx = 0; idx < systemSpecificData.length; idx++)
+ systemSpecificData[idx] = buff.get();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final TSPIPdu rhs = (TSPIPdu)obj;
-
- if( ! (liveEntityId.equals( rhs.liveEntityId) )) ivarsEqual = false;
- if( ! (TSPIFlag == rhs.TSPIFlag)) ivarsEqual = false;
- if( ! (entityLocation.equals( rhs.entityLocation) )) ivarsEqual = false;
- if( ! (entityLinearVelocity.equals( rhs.entityLinearVelocity) )) ivarsEqual = false;
- if( ! (entityOrientation.equals( rhs.entityOrientation) )) ivarsEqual = false;
- if( ! (positionError.equals( rhs.positionError) )) ivarsEqual = false;
- if( ! (orientationError.equals( rhs.orientationError) )) ivarsEqual = false;
- if( ! (deadReckoningParameters.equals( rhs.deadReckoningParameters) )) ivarsEqual = false;
- if( ! (measuredSpeed == rhs.measuredSpeed)) ivarsEqual = false;
-
- for(int idx = 0; idx < 0; idx++)
- {
- if(!(systemSpecificData[idx] == rhs.systemSpecificData[idx])) ivarsEqual = false;
- }
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final TSPIPdu rhs = (TSPIPdu)obj;
+
+ if( ! (liveEntityId.equals( rhs.liveEntityId) )) ivarsEqual = false;
+ if( ! (TSPIFlag == rhs.TSPIFlag)) ivarsEqual = false;
+ if( ! (entityLocation.equals( rhs.entityLocation) )) ivarsEqual = false;
+ if( ! (entityLinearVelocity.equals( rhs.entityLinearVelocity) )) ivarsEqual = false;
+ if( ! (entityOrientation.equals( rhs.entityOrientation) )) ivarsEqual = false;
+ if( ! (positionError.equals( rhs.positionError) )) ivarsEqual = false;
+ if( ! (orientationError.equals( rhs.orientationError) )) ivarsEqual = false;
+ if( ! (deadReckoningParameters.equals( rhs.deadReckoningParameters) )) ivarsEqual = false;
+ if( ! (measuredSpeed == rhs.measuredSpeed)) ivarsEqual = false;
+
+ for(int idx = 0; idx < 0; idx++)
+ {
+ if(!(systemSpecificData[idx] == rhs.systemSpecificData[idx])) ivarsEqual = false;
+ }
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" liveEntityId: ").append(liveEntityId).append("\n");
- sb.append(" TSPIFlag: ").append(TSPIFlag).append("\n");
- sb.append(" entityLocation: ").append(entityLocation).append("\n");
- sb.append(" entityLinearVelocity: ").append(entityLinearVelocity).append("\n");
- sb.append(" entityOrientation: ").append(entityOrientation).append("\n");
- sb.append(" positionError: ").append(positionError).append("\n");
- sb.append(" orientationError: ").append(orientationError).append("\n");
- sb.append(" deadReckoningParameters: ").append(deadReckoningParameters).append("\n");
- sb.append(" measuredSpeed: ").append(measuredSpeed).append("\n");
- sb.append(" systemSpecificData: ").append("\n");
- sb.append(Arrays.toString(systemSpecificData)).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" liveEntityId: ").append(liveEntityId).append("\n");
+ sb.append(" TSPIFlag: ").append(TSPIFlag).append("\n");
+ sb.append(" entityLocation: ").append(entityLocation).append("\n");
+ sb.append(" entityLinearVelocity: ").append(entityLinearVelocity).append("\n");
+ sb.append(" entityOrientation: ").append(entityOrientation).append("\n");
+ sb.append(" positionError: ").append(positionError).append("\n");
+ sb.append(" orientationError: ").append(orientationError).append("\n");
+ sb.append(" deadReckoningParameters: ").append(deadReckoningParameters).append("\n");
+ sb.append(" measuredSpeed: ").append(measuredSpeed).append("\n");
+ sb.append(" systemSpecificData: ").append("\n");
+ sb.append(Arrays.toString(systemSpecificData)).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/TimeSpacePositionInformationPdu.java b/src-generated/edu/nps/moves/dis7/TimeSpacePositionInformationPdu.java
index 533d48f0dcced1693927ad25043e873ada484c62..5ae5f2f03157e5cb68f16c0eb97209e8d30b8fed 100644
--- a/src-generated/edu/nps/moves/dis7/TimeSpacePositionInformationPdu.java
+++ b/src-generated/edu/nps/moves/dis7/TimeSpacePositionInformationPdu.java
@@ -1,17 +1,17 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * more descriptive name for a TSPIPdu
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class TimeSpacePositionInformationPdu extends TSPIPdu
-{}
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * more descriptive name for a TSPIPdu
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class TimeSpacePositionInformationPdu extends TSPIPdu
+{}
diff --git a/src-generated/edu/nps/moves/dis7/TotalRecordSets.java b/src-generated/edu/nps/moves/dis7/TotalRecordSets.java
index 5e6e1caeee8829ce16e107a6b3c68ca60a65cde1..80d8900432e70e9535c69b18d7d62f7f5f077b1f 100644
--- a/src-generated/edu/nps/moves/dis7/TotalRecordSets.java
+++ b/src-generated/edu/nps/moves/dis7/TotalRecordSets.java
@@ -1,186 +1,186 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Total number of record sets contained in a logical set of one or more PDUs. Used to transfer ownership, etc Section 6.2.88
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class TotalRecordSets extends Object implements Serializable
-{
- /** Total number of record sets */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Total number of record sets contained in a logical set of one or more PDUs. Used to transfer ownership, etc Section 6.2.88
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class TotalRecordSets extends Object implements Serializable
+{
+ /** Total number of record sets */
protected short totalRecordSets;
-
- /** padding */
+
+ /** padding */
protected short padding = (short)0;
-
-
-/** Constructor */
- public TotalRecordSets()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += 2; // totalRecordSets
- marshalSize += 2; // padding
-
- return marshalSize;
-}
-
-
-/** Setter for {@link TotalRecordSets#totalRecordSets}*/
-public TotalRecordSets setTotalRecordSets(short pTotalRecordSets)
+
+
+/** Constructor */
+ public TotalRecordSets()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 2; // totalRecordSets
+ marshalSize += 2; // padding
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link TotalRecordSets#totalRecordSets}*/
+public TotalRecordSets setTotalRecordSets(short pTotalRecordSets)
{
- totalRecordSets = pTotalRecordSets;
- return this;
-}
-
-/** Getter for {@link TotalRecordSets#totalRecordSets}*/
-public short getTotalRecordSets()
+ totalRecordSets = pTotalRecordSets;
+ return this;
+}
+
+/** Getter for {@link TotalRecordSets#totalRecordSets}*/
+public short getTotalRecordSets()
{
return totalRecordSets;
-}
-
-/** Setter for {@link TotalRecordSets#padding}*/
-public TotalRecordSets setPadding(short pPadding)
+}
+
+/** Setter for {@link TotalRecordSets#padding}*/
+public TotalRecordSets setPadding(short pPadding)
{
- padding = pPadding;
- return this;
-}
-
-/** Getter for {@link TotalRecordSets#padding}*/
-public short getPadding()
+ padding = pPadding;
+ return this;
+}
+
+/** Getter for {@link TotalRecordSets#padding}*/
+public short getPadding()
{
return padding;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeShort(totalRecordSets);
- dos.writeShort(padding);
+ {
+ dos.writeShort(totalRecordSets);
+ dos.writeShort(padding);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- totalRecordSets = (short)dis.readUnsignedShort();
- uPosition += 2;
- padding = (short)dis.readUnsignedShort();
- uPosition += 2;
+ {
+ totalRecordSets = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ padding = (short)dis.readUnsignedShort();
+ uPosition += 2;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putShort( (short)totalRecordSets);
- buff.putShort( (short)padding);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- totalRecordSets = (short)(buff.getShort() & 0xFFFF);
- padding = (short)(buff.getShort() & 0xFFFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putShort( (short)totalRecordSets);
+ buff.putShort( (short)padding);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ totalRecordSets = (short)(buff.getShort() & 0xFFFF);
+ padding = (short)(buff.getShort() & 0xFFFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final TotalRecordSets rhs = (TotalRecordSets)obj;
-
- if( ! (totalRecordSets == rhs.totalRecordSets)) ivarsEqual = false;
- if( ! (padding == rhs.padding)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final TotalRecordSets rhs = (TotalRecordSets)obj;
+
+ if( ! (totalRecordSets == rhs.totalRecordSets)) ivarsEqual = false;
+ if( ! (padding == rhs.padding)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" totalRecordSets: ").append(totalRecordSets).append("\n");
- sb.append(" padding: ").append(padding).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" totalRecordSets: ").append(totalRecordSets).append("\n");
+ sb.append(" padding: ").append(padding).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/TrackJamData.java b/src-generated/edu/nps/moves/dis7/TrackJamData.java
index bd9ab2d1ae06e7add13da2eee0409a07f5a9fe47..8e434497dab88334e446f8297c6b30610e10f789 100644
--- a/src-generated/edu/nps/moves/dis7/TrackJamData.java
+++ b/src-generated/edu/nps/moves/dis7/TrackJamData.java
@@ -1,209 +1,209 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Track-Jam data Section 6.2.89
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class TrackJamData extends Object implements Serializable
-{
- /** the entity tracked or illumated, or an emitter beam targeted with jamming */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Track-Jam data Section 6.2.89
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class TrackJamData extends Object implements Serializable
+{
+ /** the entity tracked or illumated, or an emitter beam targeted with jamming */
protected EntityID entityID = new EntityID();
-
- /** Emitter system associated with the entity */
+
+ /** Emitter system associated with the entity */
protected byte emitterNumber;
-
- /** Beam associated with the entity */
+
+ /** Beam associated with the entity */
protected byte beamNumber;
-
-
-/** Constructor */
- public TrackJamData()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += entityID.getMarshalledSize();
- marshalSize += 1; // emitterNumber
- marshalSize += 1; // beamNumber
-
- return marshalSize;
-}
-
-
-/** Setter for {@link TrackJamData#entityID}*/
-public TrackJamData setEntityID(EntityID pEntityID)
+
+
+/** Constructor */
+ public TrackJamData()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += entityID.getMarshalledSize();
+ marshalSize += 1; // emitterNumber
+ marshalSize += 1; // beamNumber
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link TrackJamData#entityID}*/
+public TrackJamData setEntityID(EntityID pEntityID)
{
- entityID = pEntityID;
- return this;
-}
-
-/** Getter for {@link TrackJamData#entityID}*/
-public EntityID getEntityID()
+ entityID = pEntityID;
+ return this;
+}
+
+/** Getter for {@link TrackJamData#entityID}*/
+public EntityID getEntityID()
{
return entityID;
-}
-
-/** Setter for {@link TrackJamData#emitterNumber}*/
-public TrackJamData setEmitterNumber(byte pEmitterNumber)
+}
+
+/** Setter for {@link TrackJamData#emitterNumber}*/
+public TrackJamData setEmitterNumber(byte pEmitterNumber)
{
- emitterNumber = pEmitterNumber;
- return this;
-}
-
-/** Getter for {@link TrackJamData#emitterNumber}*/
-public byte getEmitterNumber()
+ emitterNumber = pEmitterNumber;
+ return this;
+}
+
+/** Getter for {@link TrackJamData#emitterNumber}*/
+public byte getEmitterNumber()
{
return emitterNumber;
-}
-
-/** Setter for {@link TrackJamData#beamNumber}*/
-public TrackJamData setBeamNumber(byte pBeamNumber)
+}
+
+/** Setter for {@link TrackJamData#beamNumber}*/
+public TrackJamData setBeamNumber(byte pBeamNumber)
{
- beamNumber = pBeamNumber;
- return this;
-}
-
-/** Getter for {@link TrackJamData#beamNumber}*/
-public byte getBeamNumber()
+ beamNumber = pBeamNumber;
+ return this;
+}
+
+/** Getter for {@link TrackJamData#beamNumber}*/
+public byte getBeamNumber()
{
return beamNumber;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- entityID.marshal(dos);
- dos.writeByte(emitterNumber);
- dos.writeByte(beamNumber);
+ {
+ entityID.marshal(dos);
+ dos.writeByte(emitterNumber);
+ dos.writeByte(beamNumber);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- uPosition += entityID.unmarshal(dis);
- emitterNumber = (byte)dis.readUnsignedByte();
- uPosition += 1;
- beamNumber = (byte)dis.readUnsignedByte();
- uPosition += 1;
+ {
+ uPosition += entityID.unmarshal(dis);
+ emitterNumber = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ beamNumber = (byte)dis.readUnsignedByte();
+ uPosition += 1;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- entityID.marshal(buff);
- buff.put( (byte)emitterNumber);
- buff.put( (byte)beamNumber);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- entityID.unmarshal(buff);
- emitterNumber = (byte)(buff.get() & 0xFF);
- beamNumber = (byte)(buff.get() & 0xFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ entityID.marshal(buff);
+ buff.put( (byte)emitterNumber);
+ buff.put( (byte)beamNumber);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ entityID.unmarshal(buff);
+ emitterNumber = (byte)(buff.get() & 0xFF);
+ beamNumber = (byte)(buff.get() & 0xFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final TrackJamData rhs = (TrackJamData)obj;
-
- if( ! (entityID.equals( rhs.entityID) )) ivarsEqual = false;
- if( ! (emitterNumber == rhs.emitterNumber)) ivarsEqual = false;
- if( ! (beamNumber == rhs.beamNumber)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final TrackJamData rhs = (TrackJamData)obj;
+
+ if( ! (entityID.equals( rhs.entityID) )) ivarsEqual = false;
+ if( ! (emitterNumber == rhs.emitterNumber)) ivarsEqual = false;
+ if( ! (beamNumber == rhs.beamNumber)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" entityID: ").append(entityID).append("\n");
- sb.append(" emitterNumber: ").append(emitterNumber).append("\n");
- sb.append(" beamNumber: ").append(beamNumber).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" entityID: ").append(entityID).append("\n");
+ sb.append(" emitterNumber: ").append(emitterNumber).append("\n");
+ sb.append(" beamNumber: ").append(beamNumber).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/TransferOwnershipPdu.java b/src-generated/edu/nps/moves/dis7/TransferOwnershipPdu.java
index 7bdbf34e681ca6439049dae6ef694234d047f316..986a719386329f534184edd34d417363f57731f8 100644
--- a/src-generated/edu/nps/moves/dis7/TransferOwnershipPdu.java
+++ b/src-generated/edu/nps/moves/dis7/TransferOwnershipPdu.java
@@ -1,304 +1,304 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Information initiating the dyanic allocation and control of simulation entities between two simulation applications.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class TransferOwnershipPdu extends EntityManagementFamilyPdu implements Serializable
-{
- /** ID of entity originating request */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Information initiating the dyanic allocation and control of simulation entities between two simulation applications.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class TransferOwnershipPdu extends EntityManagementFamilyPdu implements Serializable
+{
+ /** ID of entity originating request */
protected EntityID originatingEntityID = new EntityID();
-
- /** ID of entity receiving request */
+
+ /** ID of entity receiving request */
protected EntityID receivingEntityID = new EntityID();
-
- /** ID of request */
+
+ /** ID of request */
protected int requestID;
-
- /** required level of reliability service. uid 74 */
+
+ /** required level of reliability service. uid 74 */
protected RequiredReliabilityService requiredReliabilityService = RequiredReliabilityService.values()[0];
-
- /** type of transfer desired uid 224 */
+
+ /** type of transfer desired uid 224 */
protected TransferControlTransferType transferType = TransferControlTransferType.values()[0];
-
- /** The entity for which control is being requested to transfer */
+
+ /** The entity for which control is being requested to transfer */
protected EntityID transferEntityID = new EntityID();
-
+
protected RecordSpecification recordSets = new RecordSpecification();
-
-
-/** Constructor */
- public TransferOwnershipPdu()
- {
- setPduType( DISPDUType.TRANSFER_OWNERSHIP );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += originatingEntityID.getMarshalledSize();
- marshalSize += receivingEntityID.getMarshalledSize();
- marshalSize += 4; // requestID
- marshalSize += requiredReliabilityService.getMarshalledSize();
- marshalSize += transferType.getMarshalledSize();
- marshalSize += transferEntityID.getMarshalledSize();
- marshalSize += recordSets.getMarshalledSize();
-
- return marshalSize;
-}
-
-
-/** Setter for {@link TransferOwnershipPdu#originatingEntityID}*/
-public TransferOwnershipPdu setOriginatingEntityID(EntityID pOriginatingEntityID)
+
+
+/** Constructor */
+ public TransferOwnershipPdu()
+ {
+ setPduType( DISPDUType.TRANSFER_OWNERSHIP );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += originatingEntityID.getMarshalledSize();
+ marshalSize += receivingEntityID.getMarshalledSize();
+ marshalSize += 4; // requestID
+ marshalSize += requiredReliabilityService.getMarshalledSize();
+ marshalSize += transferType.getMarshalledSize();
+ marshalSize += transferEntityID.getMarshalledSize();
+ marshalSize += recordSets.getMarshalledSize();
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link TransferOwnershipPdu#originatingEntityID}*/
+public TransferOwnershipPdu setOriginatingEntityID(EntityID pOriginatingEntityID)
{
- originatingEntityID = pOriginatingEntityID;
- return this;
-}
-
-/** Getter for {@link TransferOwnershipPdu#originatingEntityID}*/
-public EntityID getOriginatingEntityID()
+ originatingEntityID = pOriginatingEntityID;
+ return this;
+}
+
+/** Getter for {@link TransferOwnershipPdu#originatingEntityID}*/
+public EntityID getOriginatingEntityID()
{
return originatingEntityID;
-}
-
-/** Setter for {@link TransferOwnershipPdu#receivingEntityID}*/
-public TransferOwnershipPdu setReceivingEntityID(EntityID pReceivingEntityID)
+}
+
+/** Setter for {@link TransferOwnershipPdu#receivingEntityID}*/
+public TransferOwnershipPdu setReceivingEntityID(EntityID pReceivingEntityID)
{
- receivingEntityID = pReceivingEntityID;
- return this;
-}
-
-/** Getter for {@link TransferOwnershipPdu#receivingEntityID}*/
-public EntityID getReceivingEntityID()
+ receivingEntityID = pReceivingEntityID;
+ return this;
+}
+
+/** Getter for {@link TransferOwnershipPdu#receivingEntityID}*/
+public EntityID getReceivingEntityID()
{
return receivingEntityID;
-}
-
-/** Setter for {@link TransferOwnershipPdu#requestID}*/
-public TransferOwnershipPdu setRequestID(int pRequestID)
+}
+
+/** Setter for {@link TransferOwnershipPdu#requestID}*/
+public TransferOwnershipPdu setRequestID(int pRequestID)
{
- requestID = pRequestID;
- return this;
-}
-
-/** Getter for {@link TransferOwnershipPdu#requestID}*/
-public int getRequestID()
+ requestID = pRequestID;
+ return this;
+}
+
+/** Getter for {@link TransferOwnershipPdu#requestID}*/
+public int getRequestID()
{
return requestID;
-}
-
-/** Setter for {@link TransferOwnershipPdu#requiredReliabilityService}*/
-public TransferOwnershipPdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
+}
+
+/** Setter for {@link TransferOwnershipPdu#requiredReliabilityService}*/
+public TransferOwnershipPdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
{
- requiredReliabilityService = pRequiredReliabilityService;
- return this;
-}
-
-/** Getter for {@link TransferOwnershipPdu#requiredReliabilityService}*/
-public RequiredReliabilityService getRequiredReliabilityService()
+ requiredReliabilityService = pRequiredReliabilityService;
+ return this;
+}
+
+/** Getter for {@link TransferOwnershipPdu#requiredReliabilityService}*/
+public RequiredReliabilityService getRequiredReliabilityService()
{
return requiredReliabilityService;
-}
-
-/** Setter for {@link TransferOwnershipPdu#transferType}*/
-public TransferOwnershipPdu setTransferType(TransferControlTransferType pTransferType)
+}
+
+/** Setter for {@link TransferOwnershipPdu#transferType}*/
+public TransferOwnershipPdu setTransferType(TransferControlTransferType pTransferType)
{
- transferType = pTransferType;
- return this;
-}
-
-/** Getter for {@link TransferOwnershipPdu#transferType}*/
-public TransferControlTransferType getTransferType()
+ transferType = pTransferType;
+ return this;
+}
+
+/** Getter for {@link TransferOwnershipPdu#transferType}*/
+public TransferControlTransferType getTransferType()
{
return transferType;
-}
-
-/** Setter for {@link TransferOwnershipPdu#transferEntityID}*/
-public TransferOwnershipPdu setTransferEntityID(EntityID pTransferEntityID)
+}
+
+/** Setter for {@link TransferOwnershipPdu#transferEntityID}*/
+public TransferOwnershipPdu setTransferEntityID(EntityID pTransferEntityID)
{
- transferEntityID = pTransferEntityID;
- return this;
-}
-
-/** Getter for {@link TransferOwnershipPdu#transferEntityID}*/
-public EntityID getTransferEntityID()
+ transferEntityID = pTransferEntityID;
+ return this;
+}
+
+/** Getter for {@link TransferOwnershipPdu#transferEntityID}*/
+public EntityID getTransferEntityID()
{
return transferEntityID;
-}
-
-/** Setter for {@link TransferOwnershipPdu#recordSets}*/
-public TransferOwnershipPdu setRecordSets(RecordSpecification pRecordSets)
+}
+
+/** Setter for {@link TransferOwnershipPdu#recordSets}*/
+public TransferOwnershipPdu setRecordSets(RecordSpecification pRecordSets)
{
- recordSets = pRecordSets;
- return this;
-}
-
-/** Getter for {@link TransferOwnershipPdu#recordSets}*/
-public RecordSpecification getRecordSets()
+ recordSets = pRecordSets;
+ return this;
+}
+
+/** Getter for {@link TransferOwnershipPdu#recordSets}*/
+public RecordSpecification getRecordSets()
{
return recordSets;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- originatingEntityID.marshal(dos);
- receivingEntityID.marshal(dos);
- dos.writeInt(requestID);
- requiredReliabilityService.marshal(dos);
- transferType.marshal(dos);
- transferEntityID.marshal(dos);
- recordSets.marshal(dos);
+ {
+ originatingEntityID.marshal(dos);
+ receivingEntityID.marshal(dos);
+ dos.writeInt(requestID);
+ requiredReliabilityService.marshal(dos);
+ transferType.marshal(dos);
+ transferEntityID.marshal(dos);
+ recordSets.marshal(dos);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += originatingEntityID.unmarshal(dis);
- uPosition += receivingEntityID.unmarshal(dis);
- requestID = dis.readInt();
- uPosition += 4;
- requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(dis);
- uPosition += requiredReliabilityService.getMarshalledSize();
- transferType = TransferControlTransferType.unmarshalEnum(dis);
- uPosition += transferType.getMarshalledSize();
- uPosition += transferEntityID.unmarshal(dis);
- uPosition += recordSets.unmarshal(dis);
+ {
+ uPosition += originatingEntityID.unmarshal(dis);
+ uPosition += receivingEntityID.unmarshal(dis);
+ requestID = dis.readInt();
+ uPosition += 4;
+ requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(dis);
+ uPosition += requiredReliabilityService.getMarshalledSize();
+ transferType = TransferControlTransferType.unmarshalEnum(dis);
+ uPosition += transferType.getMarshalledSize();
+ uPosition += transferEntityID.unmarshal(dis);
+ uPosition += recordSets.unmarshal(dis);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- originatingEntityID.marshal(buff);
- receivingEntityID.marshal(buff);
- buff.putInt( (int)requestID);
- requiredReliabilityService.marshal(buff);
- transferType.marshal(buff);
- transferEntityID.marshal(buff);
- recordSets.marshal(buff);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ originatingEntityID.marshal(buff);
+ receivingEntityID.marshal(buff);
+ buff.putInt( (int)requestID);
+ requiredReliabilityService.marshal(buff);
+ transferType.marshal(buff);
+ transferEntityID.marshal(buff);
+ recordSets.marshal(buff);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- originatingEntityID.unmarshal(buff);
- receivingEntityID.unmarshal(buff);
- requestID = buff.getInt();
- requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(buff);
- transferType = TransferControlTransferType.unmarshalEnum(buff);
- transferEntityID.unmarshal(buff);
- recordSets.unmarshal(buff);
- return getMarshalledSize();
+
+ originatingEntityID.unmarshal(buff);
+ receivingEntityID.unmarshal(buff);
+ requestID = buff.getInt();
+ requiredReliabilityService = RequiredReliabilityService.unmarshalEnum(buff);
+ transferType = TransferControlTransferType.unmarshalEnum(buff);
+ transferEntityID.unmarshal(buff);
+ recordSets.unmarshal(buff);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final TransferOwnershipPdu rhs = (TransferOwnershipPdu)obj;
-
- if( ! (originatingEntityID.equals( rhs.originatingEntityID) )) ivarsEqual = false;
- if( ! (receivingEntityID.equals( rhs.receivingEntityID) )) ivarsEqual = false;
- if( ! (requestID == rhs.requestID)) ivarsEqual = false;
- if( ! (requiredReliabilityService == rhs.requiredReliabilityService)) ivarsEqual = false;
- if( ! (transferType == rhs.transferType)) ivarsEqual = false;
- if( ! (transferEntityID.equals( rhs.transferEntityID) )) ivarsEqual = false;
- if( ! (recordSets.equals( rhs.recordSets) )) ivarsEqual = false;
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final TransferOwnershipPdu rhs = (TransferOwnershipPdu)obj;
+
+ if( ! (originatingEntityID.equals( rhs.originatingEntityID) )) ivarsEqual = false;
+ if( ! (receivingEntityID.equals( rhs.receivingEntityID) )) ivarsEqual = false;
+ if( ! (requestID == rhs.requestID)) ivarsEqual = false;
+ if( ! (requiredReliabilityService == rhs.requiredReliabilityService)) ivarsEqual = false;
+ if( ! (transferType == rhs.transferType)) ivarsEqual = false;
+ if( ! (transferEntityID.equals( rhs.transferEntityID) )) ivarsEqual = false;
+ if( ! (recordSets.equals( rhs.recordSets) )) ivarsEqual = false;
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" originatingEntityID: ").append(originatingEntityID).append("\n");
- sb.append(" receivingEntityID: ").append(receivingEntityID).append("\n");
- sb.append(" requestID: ").append(requestID).append("\n");
- sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
- sb.append(" transferType: ").append(transferType).append("\n");
- sb.append(" transferEntityID: ").append(transferEntityID).append("\n");
- sb.append(" recordSets: ").append(recordSets).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" originatingEntityID: ").append(originatingEntityID).append("\n");
+ sb.append(" receivingEntityID: ").append(receivingEntityID).append("\n");
+ sb.append(" requestID: ").append(requestID).append("\n");
+ sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
+ sb.append(" transferType: ").append(transferType).append("\n");
+ sb.append(" transferEntityID: ").append(transferEntityID).append("\n");
+ sb.append(" recordSets: ").append(recordSets).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/TransmitterPdu.java b/src-generated/edu/nps/moves/dis7/TransmitterPdu.java
index dfd2ad0b43a7b276e6eb46c51d5fec639a1cfd23..791b8b34f2db2450d0965263fd8c2c279d51d35b 100644
--- a/src-generated/edu/nps/moves/dis7/TransmitterPdu.java
+++ b/src-generated/edu/nps/moves/dis7/TransmitterPdu.java
@@ -1,669 +1,669 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 5.8.3 Communicates the state of a particular radio transmitter or simple intercom.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class TransmitterPdu extends RadioCommunicationsFamilyPdu implements Serializable
-{
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 5.8.3 Communicates the state of a particular radio transmitter or simple intercom.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class TransmitterPdu extends RadioCommunicationsFamilyPdu implements Serializable
+{
protected RadioCommsHeader header = new RadioCommsHeader();
-
- /** particular radio within an entity */
+
+ /** particular radio within an entity */
protected short radioNumber;
-
- /** Type of radio */
+
+ /** Type of radio */
protected RadioType radioEntityType = new RadioType();
-
- /** transmit state uid 164 */
+
+ /** transmit state uid 164 */
protected TransmitterTransmitState transmitState = TransmitterTransmitState.values()[0];
-
- /** input source uid 165 */
+
+ /** input source uid 165 */
protected TransmitterInputSource inputSource = TransmitterInputSource.values()[0];
-
- /** count field */
+
+ /** count field */
protected short variableTransmitterParameterCount;
-
- /** Location of antenna */
+
+ /** Location of antenna */
protected Vector3Double antennaLocation = new Vector3Double();
-
- /** relative location of antenna */
+
+ /** relative location of antenna */
protected Vector3Float relativeAntennaLocation = new Vector3Float();
-
- /** antenna pattern type uid 167 */
+
+ /** antenna pattern type uid 167 */
protected TransmitterAntennaPatternType antennaPatternType = TransmitterAntennaPatternType.values()[0];
-
- /** atenna pattern length */
+
+ /** atenna pattern length */
protected short antennaPatternCount;
-
- /** frequency */
+
+ /** frequency */
protected long frequency;
-
- /** transmit frequency Bandwidth */
+
+ /** transmit frequency Bandwidth */
protected float transmitFrequencyBandwidth;
-
- /** transmission power */
+
+ /** transmission power */
protected float power;
-
- /** modulation */
+
+ /** modulation */
protected ModulationType modulationType = new ModulationType();
-
- /** crypto system enumeration uid 166 */
+
+ /** crypto system enumeration uid 166 */
protected TransmitterCryptoSystem cryptoSystem = TransmitterCryptoSystem.values()[0];
-
- /** crypto system key identifer */
+
+ /** crypto system key identifer */
protected short cryptoKeyId;
-
- /** how many modulation parameters we have */
+
+ /** how many modulation parameters we have */
protected byte modulationParameterCount;
-
+
protected byte padding1 = (byte)0;
-
+
protected short padding2 = (short)0;
-
- /** variable length list of modulation parameters */
+
+ /** variable length list of modulation parameters */
protected List< ModulationParameters > modulationParametersList = new ArrayList< ModulationParameters >();
-
- /** variable length list of antenna pattern records */
+
+ /** variable length list of antenna pattern records */
protected List< VariableTransmitterParameters > antennaPatternList = new ArrayList< VariableTransmitterParameters >();
-
-
-/** Constructor */
- public TransmitterPdu()
- {
- setPduType( DISPDUType.TRANSMITTER );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += header.getMarshalledSize();
- marshalSize += 2; // radioNumber
- marshalSize += radioEntityType.getMarshalledSize();
- marshalSize += transmitState.getMarshalledSize();
- marshalSize += inputSource.getMarshalledSize();
- marshalSize += 2; // variableTransmitterParameterCount
- marshalSize += antennaLocation.getMarshalledSize();
- marshalSize += relativeAntennaLocation.getMarshalledSize();
- marshalSize += antennaPatternType.getMarshalledSize();
- marshalSize += 2; // antennaPatternCount
- marshalSize += 8; // frequency
- marshalSize += 4; // transmitFrequencyBandwidth
- marshalSize += 4; // power
- marshalSize += modulationType.getMarshalledSize();
- marshalSize += cryptoSystem.getMarshalledSize();
- marshalSize += 2; // cryptoKeyId
- marshalSize += 1; // modulationParameterCount
- marshalSize += 1; // padding1
- marshalSize += 2; // padding2
- for(int idx=0; idx < modulationParametersList.size(); idx++)
- {
- ModulationParameters listElement = modulationParametersList.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
- for(int idx=0; idx < antennaPatternList.size(); idx++)
- {
- VariableTransmitterParameters listElement = antennaPatternList.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link TransmitterPdu#header}*/
-public TransmitterPdu setHeader(RadioCommsHeader pHeader)
-{
- header = pHeader;
- return this;
-}
-
-/** Getter for {@link TransmitterPdu#header}*/
-public RadioCommsHeader getHeader()
+
+
+/** Constructor */
+ public TransmitterPdu()
+ {
+ setPduType( DISPDUType.TRANSMITTER );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += header.getMarshalledSize();
+ marshalSize += 2; // radioNumber
+ marshalSize += radioEntityType.getMarshalledSize();
+ marshalSize += transmitState.getMarshalledSize();
+ marshalSize += inputSource.getMarshalledSize();
+ marshalSize += 2; // variableTransmitterParameterCount
+ marshalSize += antennaLocation.getMarshalledSize();
+ marshalSize += relativeAntennaLocation.getMarshalledSize();
+ marshalSize += antennaPatternType.getMarshalledSize();
+ marshalSize += 2; // antennaPatternCount
+ marshalSize += 8; // frequency
+ marshalSize += 4; // transmitFrequencyBandwidth
+ marshalSize += 4; // power
+ marshalSize += modulationType.getMarshalledSize();
+ marshalSize += cryptoSystem.getMarshalledSize();
+ marshalSize += 2; // cryptoKeyId
+ marshalSize += 1; // modulationParameterCount
+ marshalSize += 1; // padding1
+ marshalSize += 2; // padding2
+ for(int idx=0; idx < modulationParametersList.size(); idx++)
+ {
+ ModulationParameters listElement = modulationParametersList.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+ for(int idx=0; idx < antennaPatternList.size(); idx++)
+ {
+ VariableTransmitterParameters listElement = antennaPatternList.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link TransmitterPdu#header}*/
+public TransmitterPdu setHeader(RadioCommsHeader pHeader)
+{
+ header = pHeader;
+ return this;
+}
+
+/** Getter for {@link TransmitterPdu#header}*/
+public RadioCommsHeader getHeader()
{
return header;
-}
-
-/** Setter for {@link TransmitterPdu#radioNumber}*/
-public TransmitterPdu setRadioNumber(short pRadioNumber)
-{
- radioNumber = pRadioNumber;
- return this;
-}
-
-/** Getter for {@link TransmitterPdu#radioNumber}*/
-public short getRadioNumber()
+}
+
+/** Setter for {@link TransmitterPdu#radioNumber}*/
+public TransmitterPdu setRadioNumber(short pRadioNumber)
+{
+ radioNumber = pRadioNumber;
+ return this;
+}
+
+/** Getter for {@link TransmitterPdu#radioNumber}*/
+public short getRadioNumber()
{
return radioNumber;
-}
-
-/** Setter for {@link TransmitterPdu#radioEntityType}*/
-public TransmitterPdu setRadioEntityType(RadioType pRadioEntityType)
-{
- radioEntityType = pRadioEntityType;
- return this;
-}
-
-/** Getter for {@link TransmitterPdu#radioEntityType}*/
-public RadioType getRadioEntityType()
+}
+
+/** Setter for {@link TransmitterPdu#radioEntityType}*/
+public TransmitterPdu setRadioEntityType(RadioType pRadioEntityType)
+{
+ radioEntityType = pRadioEntityType;
+ return this;
+}
+
+/** Getter for {@link TransmitterPdu#radioEntityType}*/
+public RadioType getRadioEntityType()
{
return radioEntityType;
-}
-
-/** Setter for {@link TransmitterPdu#transmitState}*/
-public TransmitterPdu setTransmitState(TransmitterTransmitState pTransmitState)
-{
- transmitState = pTransmitState;
- return this;
-}
-
-/** Getter for {@link TransmitterPdu#transmitState}*/
-public TransmitterTransmitState getTransmitState()
+}
+
+/** Setter for {@link TransmitterPdu#transmitState}*/
+public TransmitterPdu setTransmitState(TransmitterTransmitState pTransmitState)
+{
+ transmitState = pTransmitState;
+ return this;
+}
+
+/** Getter for {@link TransmitterPdu#transmitState}*/
+public TransmitterTransmitState getTransmitState()
{
return transmitState;
-}
-
-/** Setter for {@link TransmitterPdu#inputSource}*/
-public TransmitterPdu setInputSource(TransmitterInputSource pInputSource)
-{
- inputSource = pInputSource;
- return this;
-}
-
-/** Getter for {@link TransmitterPdu#inputSource}*/
-public TransmitterInputSource getInputSource()
+}
+
+/** Setter for {@link TransmitterPdu#inputSource}*/
+public TransmitterPdu setInputSource(TransmitterInputSource pInputSource)
+{
+ inputSource = pInputSource;
+ return this;
+}
+
+/** Getter for {@link TransmitterPdu#inputSource}*/
+public TransmitterInputSource getInputSource()
{
return inputSource;
-}
-
-/** Setter for {@link TransmitterPdu#variableTransmitterParameterCount}*/
-public TransmitterPdu setVariableTransmitterParameterCount(short pVariableTransmitterParameterCount)
-{
- variableTransmitterParameterCount = pVariableTransmitterParameterCount;
- return this;
-}
-
-/** Getter for {@link TransmitterPdu#variableTransmitterParameterCount}*/
-public short getVariableTransmitterParameterCount()
+}
+
+/** Setter for {@link TransmitterPdu#variableTransmitterParameterCount}*/
+public TransmitterPdu setVariableTransmitterParameterCount(short pVariableTransmitterParameterCount)
+{
+ variableTransmitterParameterCount = pVariableTransmitterParameterCount;
+ return this;
+}
+
+/** Getter for {@link TransmitterPdu#variableTransmitterParameterCount}*/
+public short getVariableTransmitterParameterCount()
{
return variableTransmitterParameterCount;
-}
-
-/** Setter for {@link TransmitterPdu#antennaLocation}*/
-public TransmitterPdu setAntennaLocation(Vector3Double pAntennaLocation)
-{
- antennaLocation = pAntennaLocation;
- return this;
-}
-
-/** Getter for {@link TransmitterPdu#antennaLocation}*/
-public Vector3Double getAntennaLocation()
+}
+
+/** Setter for {@link TransmitterPdu#antennaLocation}*/
+public TransmitterPdu setAntennaLocation(Vector3Double pAntennaLocation)
+{
+ antennaLocation = pAntennaLocation;
+ return this;
+}
+
+/** Getter for {@link TransmitterPdu#antennaLocation}*/
+public Vector3Double getAntennaLocation()
{
return antennaLocation;
-}
-
-/** Setter for {@link TransmitterPdu#relativeAntennaLocation}*/
-public TransmitterPdu setRelativeAntennaLocation(Vector3Float pRelativeAntennaLocation)
-{
- relativeAntennaLocation = pRelativeAntennaLocation;
- return this;
-}
-
-/** Getter for {@link TransmitterPdu#relativeAntennaLocation}*/
-public Vector3Float getRelativeAntennaLocation()
+}
+
+/** Setter for {@link TransmitterPdu#relativeAntennaLocation}*/
+public TransmitterPdu setRelativeAntennaLocation(Vector3Float pRelativeAntennaLocation)
+{
+ relativeAntennaLocation = pRelativeAntennaLocation;
+ return this;
+}
+
+/** Getter for {@link TransmitterPdu#relativeAntennaLocation}*/
+public Vector3Float getRelativeAntennaLocation()
{
return relativeAntennaLocation;
-}
-
-/** Setter for {@link TransmitterPdu#antennaPatternType}*/
-public TransmitterPdu setAntennaPatternType(TransmitterAntennaPatternType pAntennaPatternType)
-{
- antennaPatternType = pAntennaPatternType;
- return this;
-}
-
-/** Getter for {@link TransmitterPdu#antennaPatternType}*/
-public TransmitterAntennaPatternType getAntennaPatternType()
+}
+
+/** Setter for {@link TransmitterPdu#antennaPatternType}*/
+public TransmitterPdu setAntennaPatternType(TransmitterAntennaPatternType pAntennaPatternType)
+{
+ antennaPatternType = pAntennaPatternType;
+ return this;
+}
+
+/** Getter for {@link TransmitterPdu#antennaPatternType}*/
+public TransmitterAntennaPatternType getAntennaPatternType()
{
return antennaPatternType;
-}
-
-/** Setter for {@link TransmitterPdu#frequency}*/
-public TransmitterPdu setFrequency(long pFrequency)
-{
- frequency = pFrequency;
- return this;
-}
-
-/** Getter for {@link TransmitterPdu#frequency}*/
-public long getFrequency()
+}
+
+/** Setter for {@link TransmitterPdu#frequency}*/
+public TransmitterPdu setFrequency(long pFrequency)
+{
+ frequency = pFrequency;
+ return this;
+}
+
+/** Getter for {@link TransmitterPdu#frequency}*/
+public long getFrequency()
{
return frequency;
-}
-
-/** Setter for {@link TransmitterPdu#transmitFrequencyBandwidth}*/
-public TransmitterPdu setTransmitFrequencyBandwidth(float pTransmitFrequencyBandwidth)
-{
- transmitFrequencyBandwidth = pTransmitFrequencyBandwidth;
- return this;
-}
-
-/** Getter for {@link TransmitterPdu#transmitFrequencyBandwidth}*/
-public float getTransmitFrequencyBandwidth()
+}
+
+/** Setter for {@link TransmitterPdu#transmitFrequencyBandwidth}*/
+public TransmitterPdu setTransmitFrequencyBandwidth(float pTransmitFrequencyBandwidth)
+{
+ transmitFrequencyBandwidth = pTransmitFrequencyBandwidth;
+ return this;
+}
+
+/** Getter for {@link TransmitterPdu#transmitFrequencyBandwidth}*/
+public float getTransmitFrequencyBandwidth()
{
return transmitFrequencyBandwidth;
-}
-
-/** Setter for {@link TransmitterPdu#power}*/
-public TransmitterPdu setPower(float pPower)
-{
- power = pPower;
- return this;
-}
-
-/** Getter for {@link TransmitterPdu#power}*/
-public float getPower()
+}
+
+/** Setter for {@link TransmitterPdu#power}*/
+public TransmitterPdu setPower(float pPower)
+{
+ power = pPower;
+ return this;
+}
+
+/** Getter for {@link TransmitterPdu#power}*/
+public float getPower()
{
return power;
-}
-
-/** Setter for {@link TransmitterPdu#modulationType}*/
-public TransmitterPdu setModulationType(ModulationType pModulationType)
-{
- modulationType = pModulationType;
- return this;
-}
-
-/** Getter for {@link TransmitterPdu#modulationType}*/
-public ModulationType getModulationType()
+}
+
+/** Setter for {@link TransmitterPdu#modulationType}*/
+public TransmitterPdu setModulationType(ModulationType pModulationType)
+{
+ modulationType = pModulationType;
+ return this;
+}
+
+/** Getter for {@link TransmitterPdu#modulationType}*/
+public ModulationType getModulationType()
{
return modulationType;
-}
-
-/** Setter for {@link TransmitterPdu#cryptoSystem}*/
-public TransmitterPdu setCryptoSystem(TransmitterCryptoSystem pCryptoSystem)
-{
- cryptoSystem = pCryptoSystem;
- return this;
-}
-
-/** Getter for {@link TransmitterPdu#cryptoSystem}*/
-public TransmitterCryptoSystem getCryptoSystem()
+}
+
+/** Setter for {@link TransmitterPdu#cryptoSystem}*/
+public TransmitterPdu setCryptoSystem(TransmitterCryptoSystem pCryptoSystem)
+{
+ cryptoSystem = pCryptoSystem;
+ return this;
+}
+
+/** Getter for {@link TransmitterPdu#cryptoSystem}*/
+public TransmitterCryptoSystem getCryptoSystem()
{
return cryptoSystem;
-}
-
-/** Setter for {@link TransmitterPdu#cryptoKeyId}*/
-public TransmitterPdu setCryptoKeyId(short pCryptoKeyId)
-{
- cryptoKeyId = pCryptoKeyId;
- return this;
-}
-
-/** Getter for {@link TransmitterPdu#cryptoKeyId}*/
-public short getCryptoKeyId()
+}
+
+/** Setter for {@link TransmitterPdu#cryptoKeyId}*/
+public TransmitterPdu setCryptoKeyId(short pCryptoKeyId)
+{
+ cryptoKeyId = pCryptoKeyId;
+ return this;
+}
+
+/** Getter for {@link TransmitterPdu#cryptoKeyId}*/
+public short getCryptoKeyId()
{
return cryptoKeyId;
-}
-
-/** Setter for {@link TransmitterPdu#padding1}*/
-public TransmitterPdu setPadding1(byte pPadding1)
-{
- padding1 = pPadding1;
- return this;
-}
-
-/** Getter for {@link TransmitterPdu#padding1}*/
-public byte getPadding1()
+}
+
+/** Setter for {@link TransmitterPdu#padding1}*/
+public TransmitterPdu setPadding1(byte pPadding1)
+{
+ padding1 = pPadding1;
+ return this;
+}
+
+/** Getter for {@link TransmitterPdu#padding1}*/
+public byte getPadding1()
{
return padding1;
-}
-
-/** Setter for {@link TransmitterPdu#padding2}*/
-public TransmitterPdu setPadding2(short pPadding2)
-{
- padding2 = pPadding2;
- return this;
-}
-
-/** Getter for {@link TransmitterPdu#padding2}*/
-public short getPadding2()
+}
+
+/** Setter for {@link TransmitterPdu#padding2}*/
+public TransmitterPdu setPadding2(short pPadding2)
+{
+ padding2 = pPadding2;
+ return this;
+}
+
+/** Getter for {@link TransmitterPdu#padding2}*/
+public short getPadding2()
{
return padding2;
-}
-
-/** Setter for {@link TransmitterPdu#modulationParametersList}*/
-public TransmitterPdu setModulationParametersList(List<ModulationParameters> pModulationParametersList)
-{
- modulationParametersList = pModulationParametersList;
- return this;
-}
-
-/** Getter for {@link TransmitterPdu#modulationParametersList}*/
-public List<ModulationParameters> getModulationParametersList()
+}
+
+/** Setter for {@link TransmitterPdu#modulationParametersList}*/
+public TransmitterPdu setModulationParametersList(List<ModulationParameters> pModulationParametersList)
+{
+ modulationParametersList = pModulationParametersList;
+ return this;
+}
+
+/** Getter for {@link TransmitterPdu#modulationParametersList}*/
+public List<ModulationParameters> getModulationParametersList()
{
return modulationParametersList;
-}
-
-/** Setter for {@link TransmitterPdu#antennaPatternList}*/
-public TransmitterPdu setAntennaPatternList(List<VariableTransmitterParameters> pAntennaPatternList)
-{
- antennaPatternList = pAntennaPatternList;
- return this;
-}
-
-/** Getter for {@link TransmitterPdu#antennaPatternList}*/
-public List<VariableTransmitterParameters> getAntennaPatternList()
+}
+
+/** Setter for {@link TransmitterPdu#antennaPatternList}*/
+public TransmitterPdu setAntennaPatternList(List<VariableTransmitterParameters> pAntennaPatternList)
+{
+ antennaPatternList = pAntennaPatternList;
+ return this;
+}
+
+/** Getter for {@link TransmitterPdu#antennaPatternList}*/
+public List<VariableTransmitterParameters> getAntennaPatternList()
{
return antennaPatternList;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- header.marshal(dos);
- dos.writeShort(radioNumber);
- radioEntityType.marshal(dos);
- transmitState.marshal(dos);
- inputSource.marshal(dos);
- dos.writeShort(variableTransmitterParameterCount);
- antennaLocation.marshal(dos);
- relativeAntennaLocation.marshal(dos);
- antennaPatternType.marshal(dos);
- dos.writeShort(antennaPatternList.size());
- dos.writeLong(frequency);
- dos.writeFloat(transmitFrequencyBandwidth);
- dos.writeFloat(power);
- modulationType.marshal(dos);
- cryptoSystem.marshal(dos);
- dos.writeShort(cryptoKeyId);
- dos.writeByte(modulationParametersList.size());
- dos.writeByte(padding1);
- dos.writeShort(padding2);
-
- for(int idx = 0; idx < modulationParametersList.size(); idx++)
- {
- ModulationParameters aModulationParameters = modulationParametersList.get(idx);
- aModulationParameters.marshal(dos);
- }
-
-
- for(int idx = 0; idx < antennaPatternList.size(); idx++)
- {
- VariableTransmitterParameters aVariableTransmitterParameters = antennaPatternList.get(idx);
- aVariableTransmitterParameters.marshal(dos);
- }
-
+ {
+ header.marshal(dos);
+ dos.writeShort(radioNumber);
+ radioEntityType.marshal(dos);
+ transmitState.marshal(dos);
+ inputSource.marshal(dos);
+ dos.writeShort(variableTransmitterParameterCount);
+ antennaLocation.marshal(dos);
+ relativeAntennaLocation.marshal(dos);
+ antennaPatternType.marshal(dos);
+ dos.writeShort(antennaPatternList.size());
+ dos.writeLong(frequency);
+ dos.writeFloat(transmitFrequencyBandwidth);
+ dos.writeFloat(power);
+ modulationType.marshal(dos);
+ cryptoSystem.marshal(dos);
+ dos.writeShort(cryptoKeyId);
+ dos.writeByte(modulationParametersList.size());
+ dos.writeByte(padding1);
+ dos.writeShort(padding2);
+
+ for(int idx = 0; idx < modulationParametersList.size(); idx++)
+ {
+ ModulationParameters aModulationParameters = modulationParametersList.get(idx);
+ aModulationParameters.marshal(dos);
+ }
+
+
+ for(int idx = 0; idx < antennaPatternList.size(); idx++)
+ {
+ VariableTransmitterParameters aVariableTransmitterParameters = antennaPatternList.get(idx);
+ aVariableTransmitterParameters.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += header.unmarshal(dis);
- radioNumber = (short)dis.readUnsignedShort();
- uPosition += 2;
- uPosition += radioEntityType.unmarshal(dis);
- transmitState = TransmitterTransmitState.unmarshalEnum(dis);
- uPosition += transmitState.getMarshalledSize();
- inputSource = TransmitterInputSource.unmarshalEnum(dis);
- uPosition += inputSource.getMarshalledSize();
- variableTransmitterParameterCount = (short)dis.readUnsignedShort();
- uPosition += 2;
- uPosition += antennaLocation.unmarshal(dis);
- uPosition += relativeAntennaLocation.unmarshal(dis);
- antennaPatternType = TransmitterAntennaPatternType.unmarshalEnum(dis);
- uPosition += antennaPatternType.getMarshalledSize();
- antennaPatternCount = (short)dis.readUnsignedShort();
- uPosition += 2;
- frequency = dis.readLong();
- uPosition += 4;
- transmitFrequencyBandwidth = dis.readFloat();
- uPosition += 4;
- power = dis.readFloat();
- uPosition += 4;
- uPosition += modulationType.unmarshal(dis);
- cryptoSystem = TransmitterCryptoSystem.unmarshalEnum(dis);
- uPosition += cryptoSystem.getMarshalledSize();
- cryptoKeyId = (short)dis.readUnsignedShort();
- uPosition += 2;
- modulationParameterCount = (byte)dis.readUnsignedByte();
- uPosition += 1;
- padding1 = (byte)dis.readUnsignedByte();
- uPosition += 1;
- padding2 = (short)dis.readUnsignedShort();
- uPosition += 2;
- for(int idx = 0; idx < modulationParameterCount; idx++)
- {
- ModulationParameters anX = new ModulationParameters();
- uPosition += anX.unmarshal(dis);
- modulationParametersList.add(anX);
- }
-
- for(int idx = 0; idx < antennaPatternCount; idx++)
- {
- VariableTransmitterParameters anX = new VariableTransmitterParameters();
- uPosition += anX.unmarshal(dis);
- antennaPatternList.add(anX);
- }
-
+ {
+ uPosition += header.unmarshal(dis);
+ radioNumber = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ uPosition += radioEntityType.unmarshal(dis);
+ transmitState = TransmitterTransmitState.unmarshalEnum(dis);
+ uPosition += transmitState.getMarshalledSize();
+ inputSource = TransmitterInputSource.unmarshalEnum(dis);
+ uPosition += inputSource.getMarshalledSize();
+ variableTransmitterParameterCount = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ uPosition += antennaLocation.unmarshal(dis);
+ uPosition += relativeAntennaLocation.unmarshal(dis);
+ antennaPatternType = TransmitterAntennaPatternType.unmarshalEnum(dis);
+ uPosition += antennaPatternType.getMarshalledSize();
+ antennaPatternCount = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ frequency = dis.readLong();
+ uPosition += 4;
+ transmitFrequencyBandwidth = dis.readFloat();
+ uPosition += 4;
+ power = dis.readFloat();
+ uPosition += 4;
+ uPosition += modulationType.unmarshal(dis);
+ cryptoSystem = TransmitterCryptoSystem.unmarshalEnum(dis);
+ uPosition += cryptoSystem.getMarshalledSize();
+ cryptoKeyId = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ modulationParameterCount = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ padding1 = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ padding2 = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ for(int idx = 0; idx < modulationParameterCount; idx++)
+ {
+ ModulationParameters anX = new ModulationParameters();
+ uPosition += anX.unmarshal(dis);
+ modulationParametersList.add(anX);
+ }
+
+ for(int idx = 0; idx < antennaPatternCount; idx++)
+ {
+ VariableTransmitterParameters anX = new VariableTransmitterParameters();
+ uPosition += anX.unmarshal(dis);
+ antennaPatternList.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- header.marshal(buff);
- buff.putShort( (short)radioNumber);
- radioEntityType.marshal(buff);
- transmitState.marshal(buff);
- inputSource.marshal(buff);
- buff.putShort( (short)variableTransmitterParameterCount);
- antennaLocation.marshal(buff);
- relativeAntennaLocation.marshal(buff);
- antennaPatternType.marshal(buff);
- buff.putShort( (short)antennaPatternList.size());
- buff.putLong( (long)frequency);
- buff.putFloat( (float)transmitFrequencyBandwidth);
- buff.putFloat( (float)power);
- modulationType.marshal(buff);
- cryptoSystem.marshal(buff);
- buff.putShort( (short)cryptoKeyId);
- buff.put( (byte)modulationParametersList.size());
- buff.put( (byte)padding1);
- buff.putShort( (short)padding2);
-
- for(int idx = 0; idx < modulationParametersList.size(); idx++)
- {
- ModulationParameters aModulationParameters = modulationParametersList.get(idx);
- aModulationParameters.marshal(buff);
- }
-
-
- for(int idx = 0; idx < antennaPatternList.size(); idx++)
- {
- VariableTransmitterParameters aVariableTransmitterParameters = antennaPatternList.get(idx);
- aVariableTransmitterParameters.marshal(buff);
- }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+ }
+ return getMarshalledSize();
+}
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ header.marshal(buff);
+ buff.putShort( (short)radioNumber);
+ radioEntityType.marshal(buff);
+ transmitState.marshal(buff);
+ inputSource.marshal(buff);
+ buff.putShort( (short)variableTransmitterParameterCount);
+ antennaLocation.marshal(buff);
+ relativeAntennaLocation.marshal(buff);
+ antennaPatternType.marshal(buff);
+ buff.putShort( (short)antennaPatternList.size());
+ buff.putLong( (long)frequency);
+ buff.putFloat( (float)transmitFrequencyBandwidth);
+ buff.putFloat( (float)power);
+ modulationType.marshal(buff);
+ cryptoSystem.marshal(buff);
+ buff.putShort( (short)cryptoKeyId);
+ buff.put( (byte)modulationParametersList.size());
+ buff.put( (byte)padding1);
+ buff.putShort( (short)padding2);
+
+ for(int idx = 0; idx < modulationParametersList.size(); idx++)
+ {
+ ModulationParameters aModulationParameters = modulationParametersList.get(idx);
+ aModulationParameters.marshal(buff);
+ }
+
+
+ for(int idx = 0; idx < antennaPatternList.size(); idx++)
+ {
+ VariableTransmitterParameters aVariableTransmitterParameters = antennaPatternList.get(idx);
+ aVariableTransmitterParameters.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- header.unmarshal(buff);
- radioNumber = (short)(buff.getShort() & 0xFFFF);
- radioEntityType.unmarshal(buff);
- transmitState = TransmitterTransmitState.unmarshalEnum(buff);
- inputSource = TransmitterInputSource.unmarshalEnum(buff);
- variableTransmitterParameterCount = (short)(buff.getShort() & 0xFFFF);
- antennaLocation.unmarshal(buff);
- relativeAntennaLocation.unmarshal(buff);
- antennaPatternType = TransmitterAntennaPatternType.unmarshalEnum(buff);
- antennaPatternCount = (short)(buff.getShort() & 0xFFFF);
- frequency = buff.getLong();
- transmitFrequencyBandwidth = buff.getFloat();
- power = buff.getFloat();
- modulationType.unmarshal(buff);
- cryptoSystem = TransmitterCryptoSystem.unmarshalEnum(buff);
- cryptoKeyId = (short)(buff.getShort() & 0xFFFF);
- modulationParameterCount = (byte)(buff.get() & 0xFF);
- padding1 = (byte)(buff.get() & 0xFF);
- padding2 = (short)(buff.getShort() & 0xFFFF);
- for(int idx = 0; idx < modulationParameterCount; idx++)
- {
- ModulationParameters anX = new ModulationParameters();
- anX.unmarshal(buff);
- modulationParametersList.add(anX);
- }
-
- for(int idx = 0; idx < antennaPatternCount; idx++)
- {
- VariableTransmitterParameters anX = new VariableTransmitterParameters();
- anX.unmarshal(buff);
- antennaPatternList.add(anX);
- }
-
- return getMarshalledSize();
-}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final TransmitterPdu rhs = (TransmitterPdu)obj;
-
- if( ! (header.equals( rhs.header) )) ivarsEqual = false;
- if( ! (radioNumber == rhs.radioNumber)) ivarsEqual = false;
- if( ! (radioEntityType.equals( rhs.radioEntityType) )) ivarsEqual = false;
- if( ! (transmitState == rhs.transmitState)) ivarsEqual = false;
- if( ! (inputSource == rhs.inputSource)) ivarsEqual = false;
- if( ! (variableTransmitterParameterCount == rhs.variableTransmitterParameterCount)) ivarsEqual = false;
- if( ! (antennaLocation.equals( rhs.antennaLocation) )) ivarsEqual = false;
- if( ! (relativeAntennaLocation.equals( rhs.relativeAntennaLocation) )) ivarsEqual = false;
- if( ! (antennaPatternType == rhs.antennaPatternType)) ivarsEqual = false;
- if( ! (frequency == rhs.frequency)) ivarsEqual = false;
- if( ! (transmitFrequencyBandwidth == rhs.transmitFrequencyBandwidth)) ivarsEqual = false;
- if( ! (power == rhs.power)) ivarsEqual = false;
- if( ! (modulationType.equals( rhs.modulationType) )) ivarsEqual = false;
- if( ! (cryptoSystem == rhs.cryptoSystem)) ivarsEqual = false;
- if( ! (cryptoKeyId == rhs.cryptoKeyId)) ivarsEqual = false;
- if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
- if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
-
- for(int idx = 0; idx < modulationParametersList.size(); idx++)
- if( ! ( modulationParametersList.get(idx).equals(rhs.modulationParametersList.get(idx)))) ivarsEqual = false;
-
-
- for(int idx = 0; idx < antennaPatternList.size(); idx++)
- if( ! ( antennaPatternList.get(idx).equals(rhs.antennaPatternList.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ header.unmarshal(buff);
+ radioNumber = (short)(buff.getShort() & 0xFFFF);
+ radioEntityType.unmarshal(buff);
+ transmitState = TransmitterTransmitState.unmarshalEnum(buff);
+ inputSource = TransmitterInputSource.unmarshalEnum(buff);
+ variableTransmitterParameterCount = (short)(buff.getShort() & 0xFFFF);
+ antennaLocation.unmarshal(buff);
+ relativeAntennaLocation.unmarshal(buff);
+ antennaPatternType = TransmitterAntennaPatternType.unmarshalEnum(buff);
+ antennaPatternCount = (short)(buff.getShort() & 0xFFFF);
+ frequency = buff.getLong();
+ transmitFrequencyBandwidth = buff.getFloat();
+ power = buff.getFloat();
+ modulationType.unmarshal(buff);
+ cryptoSystem = TransmitterCryptoSystem.unmarshalEnum(buff);
+ cryptoKeyId = (short)(buff.getShort() & 0xFFFF);
+ modulationParameterCount = (byte)(buff.get() & 0xFF);
+ padding1 = (byte)(buff.get() & 0xFF);
+ padding2 = (short)(buff.getShort() & 0xFFFF);
+ for(int idx = 0; idx < modulationParameterCount; idx++)
+ {
+ ModulationParameters anX = new ModulationParameters();
+ anX.unmarshal(buff);
+ modulationParametersList.add(anX);
+ }
+
+ for(int idx = 0; idx < antennaPatternCount; idx++)
+ {
+ VariableTransmitterParameters anX = new VariableTransmitterParameters();
+ anX.unmarshal(buff);
+ antennaPatternList.add(anX);
+ }
+
+ return getMarshalledSize();
+}
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final TransmitterPdu rhs = (TransmitterPdu)obj;
+
+ if( ! (header.equals( rhs.header) )) ivarsEqual = false;
+ if( ! (radioNumber == rhs.radioNumber)) ivarsEqual = false;
+ if( ! (radioEntityType.equals( rhs.radioEntityType) )) ivarsEqual = false;
+ if( ! (transmitState == rhs.transmitState)) ivarsEqual = false;
+ if( ! (inputSource == rhs.inputSource)) ivarsEqual = false;
+ if( ! (variableTransmitterParameterCount == rhs.variableTransmitterParameterCount)) ivarsEqual = false;
+ if( ! (antennaLocation.equals( rhs.antennaLocation) )) ivarsEqual = false;
+ if( ! (relativeAntennaLocation.equals( rhs.relativeAntennaLocation) )) ivarsEqual = false;
+ if( ! (antennaPatternType == rhs.antennaPatternType)) ivarsEqual = false;
+ if( ! (frequency == rhs.frequency)) ivarsEqual = false;
+ if( ! (transmitFrequencyBandwidth == rhs.transmitFrequencyBandwidth)) ivarsEqual = false;
+ if( ! (power == rhs.power)) ivarsEqual = false;
+ if( ! (modulationType.equals( rhs.modulationType) )) ivarsEqual = false;
+ if( ! (cryptoSystem == rhs.cryptoSystem)) ivarsEqual = false;
+ if( ! (cryptoKeyId == rhs.cryptoKeyId)) ivarsEqual = false;
+ if( ! (padding1 == rhs.padding1)) ivarsEqual = false;
+ if( ! (padding2 == rhs.padding2)) ivarsEqual = false;
+
+ for(int idx = 0; idx < modulationParametersList.size(); idx++)
+ if( ! ( modulationParametersList.get(idx).equals(rhs.modulationParametersList.get(idx)))) ivarsEqual = false;
+
+
+ for(int idx = 0; idx < antennaPatternList.size(); idx++)
+ if( ! ( antennaPatternList.get(idx).equals(rhs.antennaPatternList.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" header: ").append(header).append("\n");
- sb.append(" radioNumber: ").append(radioNumber).append("\n");
- sb.append(" radioEntityType: ").append(radioEntityType).append("\n");
- sb.append(" transmitState: ").append(transmitState).append("\n");
- sb.append(" inputSource: ").append(inputSource).append("\n");
- sb.append(" variableTransmitterParameterCount: ").append(variableTransmitterParameterCount).append("\n");
- sb.append(" antennaLocation: ").append(antennaLocation).append("\n");
- sb.append(" relativeAntennaLocation: ").append(relativeAntennaLocation).append("\n");
- sb.append(" antennaPatternType: ").append(antennaPatternType).append("\n");
- sb.append(" frequency: ").append(frequency).append("\n");
- sb.append(" transmitFrequencyBandwidth: ").append(transmitFrequencyBandwidth).append("\n");
- sb.append(" power: ").append(power).append("\n");
- sb.append(" modulationType: ").append(modulationType).append("\n");
- sb.append(" cryptoSystem: ").append(cryptoSystem).append("\n");
- sb.append(" cryptoKeyId: ").append(cryptoKeyId).append("\n");
- sb.append(" padding1: ").append(padding1).append("\n");
- sb.append(" padding2: ").append(padding2).append("\n");
- sb.append(" modulationParametersList: ").append("\n");
- modulationParametersList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
- sb.append(" antennaPatternList: ").append("\n");
- antennaPatternList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" header: ").append(header).append("\n");
+ sb.append(" radioNumber: ").append(radioNumber).append("\n");
+ sb.append(" radioEntityType: ").append(radioEntityType).append("\n");
+ sb.append(" transmitState: ").append(transmitState).append("\n");
+ sb.append(" inputSource: ").append(inputSource).append("\n");
+ sb.append(" variableTransmitterParameterCount: ").append(variableTransmitterParameterCount).append("\n");
+ sb.append(" antennaLocation: ").append(antennaLocation).append("\n");
+ sb.append(" relativeAntennaLocation: ").append(relativeAntennaLocation).append("\n");
+ sb.append(" antennaPatternType: ").append(antennaPatternType).append("\n");
+ sb.append(" frequency: ").append(frequency).append("\n");
+ sb.append(" transmitFrequencyBandwidth: ").append(transmitFrequencyBandwidth).append("\n");
+ sb.append(" power: ").append(power).append("\n");
+ sb.append(" modulationType: ").append(modulationType).append("\n");
+ sb.append(" cryptoSystem: ").append(cryptoSystem).append("\n");
+ sb.append(" cryptoKeyId: ").append(cryptoKeyId).append("\n");
+ sb.append(" padding1: ").append(padding1).append("\n");
+ sb.append(" padding2: ").append(padding2).append("\n");
+ sb.append(" modulationParametersList: ").append("\n");
+ modulationParametersList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+ sb.append(" antennaPatternList: ").append("\n");
+ antennaPatternList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/UABeam.java b/src-generated/edu/nps/moves/dis7/UABeam.java
index 7119a368d9a3fc1c2bfcb57eb0b6143f842a36e8..6ef24d03f1a0aabf51da4c300c0ce8cb85b29eb4 100644
--- a/src-generated/edu/nps/moves/dis7/UABeam.java
+++ b/src-generated/edu/nps/moves/dis7/UABeam.java
@@ -1,228 +1,228 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class UABeam extends Object implements Serializable
-{
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class UABeam extends Object implements Serializable
+{
protected byte beamDataLength;
-
+
protected byte beamNumber;
-
+
protected short padding;
-
+
protected UAFundamentalParameter fundamentalParameterData = new UAFundamentalParameter();
-
-
-/** Constructor */
- public UABeam()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public UABeam()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 1; // beamDataLength
+ marshalSize += 1; // beamNumber
+ marshalSize += 2; // padding
+ marshalSize += fundamentalParameterData.getMarshalledSize();
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link UABeam#beamDataLength}*/
+public UABeam setBeamDataLength(byte pBeamDataLength)
{
- int marshalSize = 0;
-
- marshalSize += 1; // beamDataLength
- marshalSize += 1; // beamNumber
- marshalSize += 2; // padding
- marshalSize += fundamentalParameterData.getMarshalledSize();
-
- return marshalSize;
-}
-
-
-/** Setter for {@link UABeam#beamDataLength}*/
-public UABeam setBeamDataLength(byte pBeamDataLength)
-{
- beamDataLength = pBeamDataLength;
- return this;
-}
-
-/** Getter for {@link UABeam#beamDataLength}*/
-public byte getBeamDataLength()
+ beamDataLength = pBeamDataLength;
+ return this;
+}
+
+/** Getter for {@link UABeam#beamDataLength}*/
+public byte getBeamDataLength()
{
return beamDataLength;
-}
-
-/** Setter for {@link UABeam#beamNumber}*/
-public UABeam setBeamNumber(byte pBeamNumber)
+}
+
+/** Setter for {@link UABeam#beamNumber}*/
+public UABeam setBeamNumber(byte pBeamNumber)
{
- beamNumber = pBeamNumber;
- return this;
-}
-
-/** Getter for {@link UABeam#beamNumber}*/
-public byte getBeamNumber()
+ beamNumber = pBeamNumber;
+ return this;
+}
+
+/** Getter for {@link UABeam#beamNumber}*/
+public byte getBeamNumber()
{
return beamNumber;
-}
-
-/** Setter for {@link UABeam#padding}*/
-public UABeam setPadding(short pPadding)
+}
+
+/** Setter for {@link UABeam#padding}*/
+public UABeam setPadding(short pPadding)
{
- padding = pPadding;
- return this;
-}
-
-/** Getter for {@link UABeam#padding}*/
-public short getPadding()
+ padding = pPadding;
+ return this;
+}
+
+/** Getter for {@link UABeam#padding}*/
+public short getPadding()
{
return padding;
-}
-
-/** Setter for {@link UABeam#fundamentalParameterData}*/
-public UABeam setFundamentalParameterData(UAFundamentalParameter pFundamentalParameterData)
+}
+
+/** Setter for {@link UABeam#fundamentalParameterData}*/
+public UABeam setFundamentalParameterData(UAFundamentalParameter pFundamentalParameterData)
{
- fundamentalParameterData = pFundamentalParameterData;
- return this;
-}
-
-/** Getter for {@link UABeam#fundamentalParameterData}*/
-public UAFundamentalParameter getFundamentalParameterData()
+ fundamentalParameterData = pFundamentalParameterData;
+ return this;
+}
+
+/** Getter for {@link UABeam#fundamentalParameterData}*/
+public UAFundamentalParameter getFundamentalParameterData()
{
return fundamentalParameterData;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeByte(beamDataLength);
- dos.writeByte(beamNumber);
- dos.writeShort(padding);
- fundamentalParameterData.marshal(dos);
+ {
+ dos.writeByte(beamDataLength);
+ dos.writeByte(beamNumber);
+ dos.writeShort(padding);
+ fundamentalParameterData.marshal(dos);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- beamDataLength = (byte)dis.readUnsignedByte();
- uPosition += 1;
- beamNumber = (byte)dis.readUnsignedByte();
- uPosition += 1;
- padding = (short)dis.readUnsignedShort();
- uPosition += 2;
- uPosition += fundamentalParameterData.unmarshal(dis);
+ {
+ beamDataLength = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ beamNumber = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ padding = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ uPosition += fundamentalParameterData.unmarshal(dis);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.put( (byte)beamDataLength);
- buff.put( (byte)beamNumber);
- buff.putShort( (short)padding);
- fundamentalParameterData.marshal(buff);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- beamDataLength = (byte)(buff.get() & 0xFF);
- beamNumber = (byte)(buff.get() & 0xFF);
- padding = (short)(buff.getShort() & 0xFFFF);
- fundamentalParameterData.unmarshal(buff);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.put( (byte)beamDataLength);
+ buff.put( (byte)beamNumber);
+ buff.putShort( (short)padding);
+ fundamentalParameterData.marshal(buff);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ beamDataLength = (byte)(buff.get() & 0xFF);
+ beamNumber = (byte)(buff.get() & 0xFF);
+ padding = (short)(buff.getShort() & 0xFFFF);
+ fundamentalParameterData.unmarshal(buff);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final UABeam rhs = (UABeam)obj;
-
- if( ! (beamDataLength == rhs.beamDataLength)) ivarsEqual = false;
- if( ! (beamNumber == rhs.beamNumber)) ivarsEqual = false;
- if( ! (padding == rhs.padding)) ivarsEqual = false;
- if( ! (fundamentalParameterData.equals( rhs.fundamentalParameterData) )) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final UABeam rhs = (UABeam)obj;
+
+ if( ! (beamDataLength == rhs.beamDataLength)) ivarsEqual = false;
+ if( ! (beamNumber == rhs.beamNumber)) ivarsEqual = false;
+ if( ! (padding == rhs.padding)) ivarsEqual = false;
+ if( ! (fundamentalParameterData.equals( rhs.fundamentalParameterData) )) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" beamDataLength: ").append(beamDataLength).append("\n");
- sb.append(" beamNumber: ").append(beamNumber).append("\n");
- sb.append(" padding: ").append(padding).append("\n");
- sb.append(" fundamentalParameterData: ").append(fundamentalParameterData).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" beamDataLength: ").append(beamDataLength).append("\n");
+ sb.append(" beamNumber: ").append(beamNumber).append("\n");
+ sb.append(" padding: ").append(padding).append("\n");
+ sb.append(" fundamentalParameterData: ").append(fundamentalParameterData).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/UAEmitter.java b/src-generated/edu/nps/moves/dis7/UAEmitter.java
index 145720de9688fcc3f953cee55ddc00b60ac55790..f22fcccb48bb317c7de9edb7efdabe30edb78452 100644
--- a/src-generated/edu/nps/moves/dis7/UAEmitter.java
+++ b/src-generated/edu/nps/moves/dis7/UAEmitter.java
@@ -1,294 +1,294 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class UAEmitter extends Object implements Serializable
-{
- /** this field shall specify the length of this emitter system's data in 32-bit words. */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class UAEmitter extends Object implements Serializable
+{
+ /** this field shall specify the length of this emitter system's data in 32-bit words. */
protected byte systemDataLength;
-
- /** the number of beams being described in the current PDU for the emitter system being described. */
+
+ /** the number of beams being described in the current PDU for the emitter system being described. */
protected byte numberOfBeams;
-
+
protected short padding;
-
- /** TODO */
+
+ /** TODO */
protected AcousticEmitter acousticEmitter = new AcousticEmitter();
-
- /** the location of the antenna beam source with respect to the emitting entity's coordinate system. This location shall be the origin of the emitter coordinate system that shall have the same orientation as the entity coordinate system. This field shall be represented by an Entity Coordinate Vector record see 6.2.95 */
+
+ /** the location of the antenna beam source with respect to the emitting entity's coordinate system. This location shall be the origin of the emitter coordinate system that shall have the same orientation as the entity coordinate system. This field shall be represented by an Entity Coordinate Vector record see 6.2.95 */
protected Vector3Float location = new Vector3Float();
-
- /** Electronic emission beams */
+
+ /** Electronic emission beams */
protected List< UABeam > beams = new ArrayList< UABeam >();
-
-
-/** Constructor */
- public UAEmitter()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += 1; // systemDataLength
- marshalSize += 1; // numberOfBeams
- marshalSize += 2; // padding
- marshalSize += acousticEmitter.getMarshalledSize();
- marshalSize += location.getMarshalledSize();
- for(int idx=0; idx < beams.size(); idx++)
- {
- UABeam listElement = beams.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link UAEmitter#systemDataLength}*/
-public UAEmitter setSystemDataLength(byte pSystemDataLength)
+
+
+/** Constructor */
+ public UAEmitter()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 1; // systemDataLength
+ marshalSize += 1; // numberOfBeams
+ marshalSize += 2; // padding
+ marshalSize += acousticEmitter.getMarshalledSize();
+ marshalSize += location.getMarshalledSize();
+ for(int idx=0; idx < beams.size(); idx++)
+ {
+ UABeam listElement = beams.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link UAEmitter#systemDataLength}*/
+public UAEmitter setSystemDataLength(byte pSystemDataLength)
{
- systemDataLength = pSystemDataLength;
- return this;
-}
-
-/** Getter for {@link UAEmitter#systemDataLength}*/
-public byte getSystemDataLength()
+ systemDataLength = pSystemDataLength;
+ return this;
+}
+
+/** Getter for {@link UAEmitter#systemDataLength}*/
+public byte getSystemDataLength()
{
return systemDataLength;
-}
-
-/** Setter for {@link UAEmitter#padding}*/
-public UAEmitter setPadding(short pPadding)
+}
+
+/** Setter for {@link UAEmitter#padding}*/
+public UAEmitter setPadding(short pPadding)
{
- padding = pPadding;
- return this;
-}
-
-/** Getter for {@link UAEmitter#padding}*/
-public short getPadding()
+ padding = pPadding;
+ return this;
+}
+
+/** Getter for {@link UAEmitter#padding}*/
+public short getPadding()
{
return padding;
-}
-
-/** Setter for {@link UAEmitter#acousticEmitter}*/
-public UAEmitter setAcousticEmitter(AcousticEmitter pAcousticEmitter)
+}
+
+/** Setter for {@link UAEmitter#acousticEmitter}*/
+public UAEmitter setAcousticEmitter(AcousticEmitter pAcousticEmitter)
{
- acousticEmitter = pAcousticEmitter;
- return this;
-}
-
-/** Getter for {@link UAEmitter#acousticEmitter}*/
-public AcousticEmitter getAcousticEmitter()
+ acousticEmitter = pAcousticEmitter;
+ return this;
+}
+
+/** Getter for {@link UAEmitter#acousticEmitter}*/
+public AcousticEmitter getAcousticEmitter()
{
return acousticEmitter;
-}
-
-/** Setter for {@link UAEmitter#location}*/
-public UAEmitter setLocation(Vector3Float pLocation)
+}
+
+/** Setter for {@link UAEmitter#location}*/
+public UAEmitter setLocation(Vector3Float pLocation)
{
- location = pLocation;
- return this;
-}
-
-/** Getter for {@link UAEmitter#location}*/
-public Vector3Float getLocation()
+ location = pLocation;
+ return this;
+}
+
+/** Getter for {@link UAEmitter#location}*/
+public Vector3Float getLocation()
{
return location;
-}
-
-/** Setter for {@link UAEmitter#beams}*/
-public UAEmitter setBeams(List<UABeam> pBeams)
+}
+
+/** Setter for {@link UAEmitter#beams}*/
+public UAEmitter setBeams(List<UABeam> pBeams)
{
- beams = pBeams;
- return this;
-}
-
-/** Getter for {@link UAEmitter#beams}*/
-public List<UABeam> getBeams()
+ beams = pBeams;
+ return this;
+}
+
+/** Getter for {@link UAEmitter#beams}*/
+public List<UABeam> getBeams()
{
return beams;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeByte(systemDataLength);
- dos.writeByte(beams.size());
- dos.writeShort(padding);
- acousticEmitter.marshal(dos);
- location.marshal(dos);
-
- for(int idx = 0; idx < beams.size(); idx++)
- {
- UABeam aUABeam = beams.get(idx);
- aUABeam.marshal(dos);
- }
-
+ {
+ dos.writeByte(systemDataLength);
+ dos.writeByte(beams.size());
+ dos.writeShort(padding);
+ acousticEmitter.marshal(dos);
+ location.marshal(dos);
+
+ for(int idx = 0; idx < beams.size(); idx++)
+ {
+ UABeam aUABeam = beams.get(idx);
+ aUABeam.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- systemDataLength = (byte)dis.readUnsignedByte();
- uPosition += 1;
- numberOfBeams = (byte)dis.readUnsignedByte();
- uPosition += 1;
- padding = (short)dis.readUnsignedShort();
- uPosition += 2;
- uPosition += acousticEmitter.unmarshal(dis);
- uPosition += location.unmarshal(dis);
- for(int idx = 0; idx < numberOfBeams; idx++)
- {
- UABeam anX = new UABeam();
- uPosition += anX.unmarshal(dis);
- beams.add(anX);
- }
-
+ {
+ systemDataLength = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ numberOfBeams = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ padding = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ uPosition += acousticEmitter.unmarshal(dis);
+ uPosition += location.unmarshal(dis);
+ for(int idx = 0; idx < numberOfBeams; idx++)
+ {
+ UABeam anX = new UABeam();
+ uPosition += anX.unmarshal(dis);
+ beams.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.put( (byte)systemDataLength);
- buff.put( (byte)beams.size());
- buff.putShort( (short)padding);
- acousticEmitter.marshal(buff);
- location.marshal(buff);
-
- for(int idx = 0; idx < beams.size(); idx++)
- {
- UABeam aUABeam = beams.get(idx);
- aUABeam.marshal(buff);
- }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- systemDataLength = (byte)(buff.get() & 0xFF);
- numberOfBeams = (byte)(buff.get() & 0xFF);
- padding = (short)(buff.getShort() & 0xFFFF);
- acousticEmitter.unmarshal(buff);
- location.unmarshal(buff);
- for(int idx = 0; idx < numberOfBeams; idx++)
- {
- UABeam anX = new UABeam();
- anX.unmarshal(buff);
- beams.add(anX);
- }
-
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.put( (byte)systemDataLength);
+ buff.put( (byte)beams.size());
+ buff.putShort( (short)padding);
+ acousticEmitter.marshal(buff);
+ location.marshal(buff);
+
+ for(int idx = 0; idx < beams.size(); idx++)
+ {
+ UABeam aUABeam = beams.get(idx);
+ aUABeam.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ systemDataLength = (byte)(buff.get() & 0xFF);
+ numberOfBeams = (byte)(buff.get() & 0xFF);
+ padding = (short)(buff.getShort() & 0xFFFF);
+ acousticEmitter.unmarshal(buff);
+ location.unmarshal(buff);
+ for(int idx = 0; idx < numberOfBeams; idx++)
+ {
+ UABeam anX = new UABeam();
+ anX.unmarshal(buff);
+ beams.add(anX);
+ }
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final UAEmitter rhs = (UAEmitter)obj;
-
- if( ! (systemDataLength == rhs.systemDataLength)) ivarsEqual = false;
- if( ! (padding == rhs.padding)) ivarsEqual = false;
- if( ! (acousticEmitter.equals( rhs.acousticEmitter) )) ivarsEqual = false;
- if( ! (location.equals( rhs.location) )) ivarsEqual = false;
-
- for(int idx = 0; idx < beams.size(); idx++)
- if( ! ( beams.get(idx).equals(rhs.beams.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final UAEmitter rhs = (UAEmitter)obj;
+
+ if( ! (systemDataLength == rhs.systemDataLength)) ivarsEqual = false;
+ if( ! (padding == rhs.padding)) ivarsEqual = false;
+ if( ! (acousticEmitter.equals( rhs.acousticEmitter) )) ivarsEqual = false;
+ if( ! (location.equals( rhs.location) )) ivarsEqual = false;
+
+ for(int idx = 0; idx < beams.size(); idx++)
+ if( ! ( beams.get(idx).equals(rhs.beams.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" systemDataLength: ").append(systemDataLength).append("\n");
- sb.append(" padding: ").append(padding).append("\n");
- sb.append(" acousticEmitter: ").append(acousticEmitter).append("\n");
- sb.append(" location: ").append(location).append("\n");
- sb.append(" beams: ").append("\n");
- beams.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" systemDataLength: ").append(systemDataLength).append("\n");
+ sb.append(" padding: ").append(padding).append("\n");
+ sb.append(" acousticEmitter: ").append(acousticEmitter).append("\n");
+ sb.append(" location: ").append(location).append("\n");
+ sb.append(" beams: ").append("\n");
+ beams.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/UAFundamentalParameter.java b/src-generated/edu/nps/moves/dis7/UAFundamentalParameter.java
index 57e31d3c1b14392b0e2c9c4d10542405c35f4dee..818af16837c72d64264443fab746ac040110bf1c 100644
--- a/src-generated/edu/nps/moves/dis7/UAFundamentalParameter.java
+++ b/src-generated/edu/nps/moves/dis7/UAFundamentalParameter.java
@@ -1,282 +1,282 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Regeneration parameters for active emission systems that are variable throughout a scenario. Section 6.2.91
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class UAFundamentalParameter extends Object implements Serializable
-{
- /** Which database record shall be used uid 146 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Regeneration parameters for active emission systems that are variable throughout a scenario. Section 6.2.91
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class UAFundamentalParameter extends Object implements Serializable
+{
+ /** Which database record shall be used uid 146 */
protected UAActiveEmissionParameterIndex activeEmissionParameterIndex = UAActiveEmissionParameterIndex.values()[0];
-
- /** The type of scan pattern, If not used, zero uid 147 */
+
+ /** The type of scan pattern, If not used, zero uid 147 */
protected UAScanPattern scanPattern = UAScanPattern.values()[0];
-
- /** center azimuth bearing of th emain beam. In radians. */
+
+ /** center azimuth bearing of th emain beam. In radians. */
protected float beamCenterAzimuthHorizontal;
-
- /** Horizontal beamwidth of th emain beam Meastued at the 3dB down point of peak radiated power. In radians. */
+
+ /** Horizontal beamwidth of th emain beam Meastued at the 3dB down point of peak radiated power. In radians. */
protected float azimuthalBeamwidthHorizontal;
-
- /** center of the d/e angle of th emain beam relative to the stablised de angle of the target. In radians. */
+
+ /** center of the d/e angle of th emain beam relative to the stablised de angle of the target. In radians. */
protected float beamCenterDepressionElevation;
-
- /** vertical beamwidth of the main beam. Meastured at the 3dB down point of peak radiated power. In radians. */
+
+ /** vertical beamwidth of the main beam. Meastured at the 3dB down point of peak radiated power. In radians. */
protected float depressionElevationBeamWidth;
-
-
-/** Constructor */
- public UAFundamentalParameter()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += activeEmissionParameterIndex.getMarshalledSize();
- marshalSize += scanPattern.getMarshalledSize();
- marshalSize += 4; // beamCenterAzimuthHorizontal
- marshalSize += 4; // azimuthalBeamwidthHorizontal
- marshalSize += 4; // beamCenterDepressionElevation
- marshalSize += 4; // depressionElevationBeamWidth
-
- return marshalSize;
-}
-
-
-/** Setter for {@link UAFundamentalParameter#activeEmissionParameterIndex}*/
-public UAFundamentalParameter setActiveEmissionParameterIndex(UAActiveEmissionParameterIndex pActiveEmissionParameterIndex)
+
+
+/** Constructor */
+ public UAFundamentalParameter()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += activeEmissionParameterIndex.getMarshalledSize();
+ marshalSize += scanPattern.getMarshalledSize();
+ marshalSize += 4; // beamCenterAzimuthHorizontal
+ marshalSize += 4; // azimuthalBeamwidthHorizontal
+ marshalSize += 4; // beamCenterDepressionElevation
+ marshalSize += 4; // depressionElevationBeamWidth
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link UAFundamentalParameter#activeEmissionParameterIndex}*/
+public UAFundamentalParameter setActiveEmissionParameterIndex(UAActiveEmissionParameterIndex pActiveEmissionParameterIndex)
{
- activeEmissionParameterIndex = pActiveEmissionParameterIndex;
- return this;
-}
-
-/** Getter for {@link UAFundamentalParameter#activeEmissionParameterIndex}*/
-public UAActiveEmissionParameterIndex getActiveEmissionParameterIndex()
+ activeEmissionParameterIndex = pActiveEmissionParameterIndex;
+ return this;
+}
+
+/** Getter for {@link UAFundamentalParameter#activeEmissionParameterIndex}*/
+public UAActiveEmissionParameterIndex getActiveEmissionParameterIndex()
{
return activeEmissionParameterIndex;
-}
-
-/** Setter for {@link UAFundamentalParameter#scanPattern}*/
-public UAFundamentalParameter setScanPattern(UAScanPattern pScanPattern)
+}
+
+/** Setter for {@link UAFundamentalParameter#scanPattern}*/
+public UAFundamentalParameter setScanPattern(UAScanPattern pScanPattern)
{
- scanPattern = pScanPattern;
- return this;
-}
-
-/** Getter for {@link UAFundamentalParameter#scanPattern}*/
-public UAScanPattern getScanPattern()
+ scanPattern = pScanPattern;
+ return this;
+}
+
+/** Getter for {@link UAFundamentalParameter#scanPattern}*/
+public UAScanPattern getScanPattern()
{
return scanPattern;
-}
-
-/** Setter for {@link UAFundamentalParameter#beamCenterAzimuthHorizontal}*/
-public UAFundamentalParameter setBeamCenterAzimuthHorizontal(float pBeamCenterAzimuthHorizontal)
+}
+
+/** Setter for {@link UAFundamentalParameter#beamCenterAzimuthHorizontal}*/
+public UAFundamentalParameter setBeamCenterAzimuthHorizontal(float pBeamCenterAzimuthHorizontal)
{
- beamCenterAzimuthHorizontal = pBeamCenterAzimuthHorizontal;
- return this;
-}
-
-/** Getter for {@link UAFundamentalParameter#beamCenterAzimuthHorizontal}*/
-public float getBeamCenterAzimuthHorizontal()
+ beamCenterAzimuthHorizontal = pBeamCenterAzimuthHorizontal;
+ return this;
+}
+
+/** Getter for {@link UAFundamentalParameter#beamCenterAzimuthHorizontal}*/
+public float getBeamCenterAzimuthHorizontal()
{
return beamCenterAzimuthHorizontal;
-}
-
-/** Setter for {@link UAFundamentalParameter#azimuthalBeamwidthHorizontal}*/
-public UAFundamentalParameter setAzimuthalBeamwidthHorizontal(float pAzimuthalBeamwidthHorizontal)
+}
+
+/** Setter for {@link UAFundamentalParameter#azimuthalBeamwidthHorizontal}*/
+public UAFundamentalParameter setAzimuthalBeamwidthHorizontal(float pAzimuthalBeamwidthHorizontal)
{
- azimuthalBeamwidthHorizontal = pAzimuthalBeamwidthHorizontal;
- return this;
-}
-
-/** Getter for {@link UAFundamentalParameter#azimuthalBeamwidthHorizontal}*/
-public float getAzimuthalBeamwidthHorizontal()
+ azimuthalBeamwidthHorizontal = pAzimuthalBeamwidthHorizontal;
+ return this;
+}
+
+/** Getter for {@link UAFundamentalParameter#azimuthalBeamwidthHorizontal}*/
+public float getAzimuthalBeamwidthHorizontal()
{
return azimuthalBeamwidthHorizontal;
-}
-
-/** Setter for {@link UAFundamentalParameter#beamCenterDepressionElevation}*/
-public UAFundamentalParameter setBeamCenterDepressionElevation(float pBeamCenterDepressionElevation)
+}
+
+/** Setter for {@link UAFundamentalParameter#beamCenterDepressionElevation}*/
+public UAFundamentalParameter setBeamCenterDepressionElevation(float pBeamCenterDepressionElevation)
{
- beamCenterDepressionElevation = pBeamCenterDepressionElevation;
- return this;
-}
-
-/** Getter for {@link UAFundamentalParameter#beamCenterDepressionElevation}*/
-public float getBeamCenterDepressionElevation()
+ beamCenterDepressionElevation = pBeamCenterDepressionElevation;
+ return this;
+}
+
+/** Getter for {@link UAFundamentalParameter#beamCenterDepressionElevation}*/
+public float getBeamCenterDepressionElevation()
{
return beamCenterDepressionElevation;
-}
-
-/** Setter for {@link UAFundamentalParameter#depressionElevationBeamWidth}*/
-public UAFundamentalParameter setDepressionElevationBeamWidth(float pDepressionElevationBeamWidth)
+}
+
+/** Setter for {@link UAFundamentalParameter#depressionElevationBeamWidth}*/
+public UAFundamentalParameter setDepressionElevationBeamWidth(float pDepressionElevationBeamWidth)
{
- depressionElevationBeamWidth = pDepressionElevationBeamWidth;
- return this;
-}
-
-/** Getter for {@link UAFundamentalParameter#depressionElevationBeamWidth}*/
-public float getDepressionElevationBeamWidth()
+ depressionElevationBeamWidth = pDepressionElevationBeamWidth;
+ return this;
+}
+
+/** Getter for {@link UAFundamentalParameter#depressionElevationBeamWidth}*/
+public float getDepressionElevationBeamWidth()
{
return depressionElevationBeamWidth;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- activeEmissionParameterIndex.marshal(dos);
- scanPattern.marshal(dos);
- dos.writeFloat(beamCenterAzimuthHorizontal);
- dos.writeFloat(azimuthalBeamwidthHorizontal);
- dos.writeFloat(beamCenterDepressionElevation);
- dos.writeFloat(depressionElevationBeamWidth);
+ {
+ activeEmissionParameterIndex.marshal(dos);
+ scanPattern.marshal(dos);
+ dos.writeFloat(beamCenterAzimuthHorizontal);
+ dos.writeFloat(azimuthalBeamwidthHorizontal);
+ dos.writeFloat(beamCenterDepressionElevation);
+ dos.writeFloat(depressionElevationBeamWidth);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- activeEmissionParameterIndex = UAActiveEmissionParameterIndex.unmarshalEnum(dis);
- uPosition += activeEmissionParameterIndex.getMarshalledSize();
- scanPattern = UAScanPattern.unmarshalEnum(dis);
- uPosition += scanPattern.getMarshalledSize();
- beamCenterAzimuthHorizontal = dis.readFloat();
- uPosition += 4;
- azimuthalBeamwidthHorizontal = dis.readFloat();
- uPosition += 4;
- beamCenterDepressionElevation = dis.readFloat();
- uPosition += 4;
- depressionElevationBeamWidth = dis.readFloat();
- uPosition += 4;
+ {
+ activeEmissionParameterIndex = UAActiveEmissionParameterIndex.unmarshalEnum(dis);
+ uPosition += activeEmissionParameterIndex.getMarshalledSize();
+ scanPattern = UAScanPattern.unmarshalEnum(dis);
+ uPosition += scanPattern.getMarshalledSize();
+ beamCenterAzimuthHorizontal = dis.readFloat();
+ uPosition += 4;
+ azimuthalBeamwidthHorizontal = dis.readFloat();
+ uPosition += 4;
+ beamCenterDepressionElevation = dis.readFloat();
+ uPosition += 4;
+ depressionElevationBeamWidth = dis.readFloat();
+ uPosition += 4;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- activeEmissionParameterIndex.marshal(buff);
- scanPattern.marshal(buff);
- buff.putFloat( (float)beamCenterAzimuthHorizontal);
- buff.putFloat( (float)azimuthalBeamwidthHorizontal);
- buff.putFloat( (float)beamCenterDepressionElevation);
- buff.putFloat( (float)depressionElevationBeamWidth);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- activeEmissionParameterIndex = UAActiveEmissionParameterIndex.unmarshalEnum(buff);
- scanPattern = UAScanPattern.unmarshalEnum(buff);
- beamCenterAzimuthHorizontal = buff.getFloat();
- azimuthalBeamwidthHorizontal = buff.getFloat();
- beamCenterDepressionElevation = buff.getFloat();
- depressionElevationBeamWidth = buff.getFloat();
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ activeEmissionParameterIndex.marshal(buff);
+ scanPattern.marshal(buff);
+ buff.putFloat( (float)beamCenterAzimuthHorizontal);
+ buff.putFloat( (float)azimuthalBeamwidthHorizontal);
+ buff.putFloat( (float)beamCenterDepressionElevation);
+ buff.putFloat( (float)depressionElevationBeamWidth);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ activeEmissionParameterIndex = UAActiveEmissionParameterIndex.unmarshalEnum(buff);
+ scanPattern = UAScanPattern.unmarshalEnum(buff);
+ beamCenterAzimuthHorizontal = buff.getFloat();
+ azimuthalBeamwidthHorizontal = buff.getFloat();
+ beamCenterDepressionElevation = buff.getFloat();
+ depressionElevationBeamWidth = buff.getFloat();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final UAFundamentalParameter rhs = (UAFundamentalParameter)obj;
-
- if( ! (activeEmissionParameterIndex == rhs.activeEmissionParameterIndex)) ivarsEqual = false;
- if( ! (scanPattern == rhs.scanPattern)) ivarsEqual = false;
- if( ! (beamCenterAzimuthHorizontal == rhs.beamCenterAzimuthHorizontal)) ivarsEqual = false;
- if( ! (azimuthalBeamwidthHorizontal == rhs.azimuthalBeamwidthHorizontal)) ivarsEqual = false;
- if( ! (beamCenterDepressionElevation == rhs.beamCenterDepressionElevation)) ivarsEqual = false;
- if( ! (depressionElevationBeamWidth == rhs.depressionElevationBeamWidth)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final UAFundamentalParameter rhs = (UAFundamentalParameter)obj;
+
+ if( ! (activeEmissionParameterIndex == rhs.activeEmissionParameterIndex)) ivarsEqual = false;
+ if( ! (scanPattern == rhs.scanPattern)) ivarsEqual = false;
+ if( ! (beamCenterAzimuthHorizontal == rhs.beamCenterAzimuthHorizontal)) ivarsEqual = false;
+ if( ! (azimuthalBeamwidthHorizontal == rhs.azimuthalBeamwidthHorizontal)) ivarsEqual = false;
+ if( ! (beamCenterDepressionElevation == rhs.beamCenterDepressionElevation)) ivarsEqual = false;
+ if( ! (depressionElevationBeamWidth == rhs.depressionElevationBeamWidth)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" activeEmissionParameterIndex: ").append(activeEmissionParameterIndex).append("\n");
- sb.append(" scanPattern: ").append(scanPattern).append("\n");
- sb.append(" beamCenterAzimuthHorizontal: ").append(beamCenterAzimuthHorizontal).append("\n");
- sb.append(" azimuthalBeamwidthHorizontal: ").append(azimuthalBeamwidthHorizontal).append("\n");
- sb.append(" beamCenterDepressionElevation: ").append(beamCenterDepressionElevation).append("\n");
- sb.append(" depressionElevationBeamWidth: ").append(depressionElevationBeamWidth).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" activeEmissionParameterIndex: ").append(activeEmissionParameterIndex).append("\n");
+ sb.append(" scanPattern: ").append(scanPattern).append("\n");
+ sb.append(" beamCenterAzimuthHorizontal: ").append(beamCenterAzimuthHorizontal).append("\n");
+ sb.append(" azimuthalBeamwidthHorizontal: ").append(azimuthalBeamwidthHorizontal).append("\n");
+ sb.append(" beamCenterDepressionElevation: ").append(beamCenterDepressionElevation).append("\n");
+ sb.append(" depressionElevationBeamWidth: ").append(depressionElevationBeamWidth).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/UnattachedIdentifier.java b/src-generated/edu/nps/moves/dis7/UnattachedIdentifier.java
index b1c8138579ec9a894a4a0e033cf41ce42d6c8287..e7b726129acf0ef2fe083ddd54d22e5bb8fd5c9c 100644
--- a/src-generated/edu/nps/moves/dis7/UnattachedIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/UnattachedIdentifier.java
@@ -1,185 +1,185 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * The unique designation of one or more unattached radios in an event or exercise Section 6.2.91
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class UnattachedIdentifier extends Object implements Serializable
-{
- /** See 6.2.79 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * The unique designation of one or more unattached radios in an event or exercise Section 6.2.91
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class UnattachedIdentifier extends Object implements Serializable
+{
+ /** See 6.2.79 */
protected SimulationAddress simulationAddress = new SimulationAddress();
-
- /** Reference number */
+
+ /** Reference number */
protected short referenceNumber;
-
-
-/** Constructor */
- public UnattachedIdentifier()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += simulationAddress.getMarshalledSize();
- marshalSize += 2; // referenceNumber
-
- return marshalSize;
-}
-
-
-/** Setter for {@link UnattachedIdentifier#simulationAddress}*/
-public UnattachedIdentifier setSimulationAddress(SimulationAddress pSimulationAddress)
+
+
+/** Constructor */
+ public UnattachedIdentifier()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += simulationAddress.getMarshalledSize();
+ marshalSize += 2; // referenceNumber
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link UnattachedIdentifier#simulationAddress}*/
+public UnattachedIdentifier setSimulationAddress(SimulationAddress pSimulationAddress)
{
- simulationAddress = pSimulationAddress;
- return this;
-}
-
-/** Getter for {@link UnattachedIdentifier#simulationAddress}*/
-public SimulationAddress getSimulationAddress()
+ simulationAddress = pSimulationAddress;
+ return this;
+}
+
+/** Getter for {@link UnattachedIdentifier#simulationAddress}*/
+public SimulationAddress getSimulationAddress()
{
return simulationAddress;
-}
-
-/** Setter for {@link UnattachedIdentifier#referenceNumber}*/
-public UnattachedIdentifier setReferenceNumber(short pReferenceNumber)
+}
+
+/** Setter for {@link UnattachedIdentifier#referenceNumber}*/
+public UnattachedIdentifier setReferenceNumber(short pReferenceNumber)
{
- referenceNumber = pReferenceNumber;
- return this;
-}
-
-/** Getter for {@link UnattachedIdentifier#referenceNumber}*/
-public short getReferenceNumber()
+ referenceNumber = pReferenceNumber;
+ return this;
+}
+
+/** Getter for {@link UnattachedIdentifier#referenceNumber}*/
+public short getReferenceNumber()
{
return referenceNumber;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- simulationAddress.marshal(dos);
- dos.writeShort(referenceNumber);
+ {
+ simulationAddress.marshal(dos);
+ dos.writeShort(referenceNumber);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- uPosition += simulationAddress.unmarshal(dis);
- referenceNumber = (short)dis.readUnsignedShort();
- uPosition += 2;
+ {
+ uPosition += simulationAddress.unmarshal(dis);
+ referenceNumber = (short)dis.readUnsignedShort();
+ uPosition += 2;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- simulationAddress.marshal(buff);
- buff.putShort( (short)referenceNumber);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- simulationAddress.unmarshal(buff);
- referenceNumber = (short)(buff.getShort() & 0xFFFF);
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ simulationAddress.marshal(buff);
+ buff.putShort( (short)referenceNumber);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ simulationAddress.unmarshal(buff);
+ referenceNumber = (short)(buff.getShort() & 0xFFFF);
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final UnattachedIdentifier rhs = (UnattachedIdentifier)obj;
-
- if( ! (simulationAddress.equals( rhs.simulationAddress) )) ivarsEqual = false;
- if( ! (referenceNumber == rhs.referenceNumber)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final UnattachedIdentifier rhs = (UnattachedIdentifier)obj;
+
+ if( ! (simulationAddress.equals( rhs.simulationAddress) )) ivarsEqual = false;
+ if( ! (referenceNumber == rhs.referenceNumber)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
- sb.append(" referenceNumber: ").append(referenceNumber).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
+ sb.append(" referenceNumber: ").append(referenceNumber).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/UnderwaterAcousticPdu.java b/src-generated/edu/nps/moves/dis7/UnderwaterAcousticPdu.java
index a9cdd92e8f2eb80c17e6dd7aaa3d822fe9daa5c6..c741d7f55087698c91c8bb80aac64920dec63cf0 100644
--- a/src-generated/edu/nps/moves/dis7/UnderwaterAcousticPdu.java
+++ b/src-generated/edu/nps/moves/dis7/UnderwaterAcousticPdu.java
@@ -1,474 +1,474 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * 7.6.4 Information about underwater acoustic emmissions. See 5.7.5.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class UnderwaterAcousticPdu extends DistributedEmissionsFamilyPdu implements Serializable
-{
- /** ID of the entity that is the source of the emission */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * 7.6.4 Information about underwater acoustic emmissions. See 5.7.5.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class UnderwaterAcousticPdu extends DistributedEmissionsFamilyPdu implements Serializable
+{
+ /** ID of the entity that is the source of the emission */
protected EntityID emittingEntityID = new EntityID();
-
- /** ID of event */
+
+ /** ID of event */
protected EventIdentifier eventID = new EventIdentifier();
-
- /** This field shall be used to indicate whether the data in the UA PDU represent a state update or data that have changed since issuance of the last UA PDU uid 143 */
+
+ /** This field shall be used to indicate whether the data in the UA PDU represent a state update or data that have changed since issuance of the last UA PDU uid 143 */
protected UAStateChangeUpdateIndicator stateChangeIndicator = UAStateChangeUpdateIndicator.values()[0];
-
- /** padding */
+
+ /** padding */
protected byte pad;
-
- /** This field indicates which database record (or file) shall be used in the definition of passive signature (unintentional) emissions of the entity. The indicated database record (or file) shall define all noise generated as a function of propulsion plant configurations and associated auxiliaries. uid 148 */
+
+ /** This field indicates which database record (or file) shall be used in the definition of passive signature (unintentional) emissions of the entity. The indicated database record (or file) shall define all noise generated as a function of propulsion plant configurations and associated auxiliaries. uid 148 */
protected UAPassiveParameterIndex passiveParameterIndex = UAPassiveParameterIndex.values()[0];
-
- /** This field shall specify the entity propulsion plant configuration. This field is used to determine the passive signature characteristics of an entity. */
+
+ /** This field shall specify the entity propulsion plant configuration. This field is used to determine the passive signature characteristics of an entity. */
protected byte propulsionPlantConfiguration;
-
- /** This field shall represent the number of shafts on a platform */
+
+ /** This field shall represent the number of shafts on a platform */
protected byte numberOfShafts;
-
- /** This field shall indicate the number of APAs described in the current UA PDU */
+
+ /** This field shall indicate the number of APAs described in the current UA PDU */
protected byte numberOfAPAs;
-
- /** This field shall specify the number of UA emitter systems being described in the current UA PDU */
+
+ /** This field shall specify the number of UA emitter systems being described in the current UA PDU */
protected byte numberOfUAEmitterSystems;
-
- /** shaft RPM values. */
+
+ /** shaft RPM values. */
protected List< ShaftRPM > shaftRPMs = new ArrayList< ShaftRPM >();
-
- /** additional passive activities */
+
+ /** additional passive activities */
protected List< APA > apaData = new ArrayList< APA >();
-
+
protected List< UAEmitter > emitterSystems = new ArrayList< UAEmitter >();
-
-
-/** Constructor */
- public UnderwaterAcousticPdu()
- {
- setPduType( DISPDUType.UNDERWATER_ACOUSTIC );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
- marshalSize += emittingEntityID.getMarshalledSize();
- marshalSize += eventID.getMarshalledSize();
- marshalSize += stateChangeIndicator.getMarshalledSize();
- marshalSize += 1; // pad
- marshalSize += passiveParameterIndex.getMarshalledSize();
- marshalSize += 1; // propulsionPlantConfiguration
- marshalSize += 1; // numberOfShafts
- marshalSize += 1; // numberOfAPAs
- marshalSize += 1; // numberOfUAEmitterSystems
- for(int idx=0; idx < shaftRPMs.size(); idx++)
- {
- ShaftRPM listElement = shaftRPMs.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
- for(int idx=0; idx < apaData.size(); idx++)
- {
- APA listElement = apaData.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
- for(int idx=0; idx < emitterSystems.size(); idx++)
- {
- UAEmitter listElement = emitterSystems.get(idx);
- marshalSize += listElement.getMarshalledSize();
- }
-
- return marshalSize;
-}
-
-
-/** Setter for {@link UnderwaterAcousticPdu#emittingEntityID}*/
-public UnderwaterAcousticPdu setEmittingEntityID(EntityID pEmittingEntityID)
+
+
+/** Constructor */
+ public UnderwaterAcousticPdu()
+ {
+ setPduType( DISPDUType.UNDERWATER_ACOUSTIC );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+ marshalSize += emittingEntityID.getMarshalledSize();
+ marshalSize += eventID.getMarshalledSize();
+ marshalSize += stateChangeIndicator.getMarshalledSize();
+ marshalSize += 1; // pad
+ marshalSize += passiveParameterIndex.getMarshalledSize();
+ marshalSize += 1; // propulsionPlantConfiguration
+ marshalSize += 1; // numberOfShafts
+ marshalSize += 1; // numberOfAPAs
+ marshalSize += 1; // numberOfUAEmitterSystems
+ for(int idx=0; idx < shaftRPMs.size(); idx++)
+ {
+ ShaftRPM listElement = shaftRPMs.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+ for(int idx=0; idx < apaData.size(); idx++)
+ {
+ APA listElement = apaData.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+ for(int idx=0; idx < emitterSystems.size(); idx++)
+ {
+ UAEmitter listElement = emitterSystems.get(idx);
+ marshalSize += listElement.getMarshalledSize();
+ }
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link UnderwaterAcousticPdu#emittingEntityID}*/
+public UnderwaterAcousticPdu setEmittingEntityID(EntityID pEmittingEntityID)
{
- emittingEntityID = pEmittingEntityID;
- return this;
-}
-
-/** Getter for {@link UnderwaterAcousticPdu#emittingEntityID}*/
-public EntityID getEmittingEntityID()
+ emittingEntityID = pEmittingEntityID;
+ return this;
+}
+
+/** Getter for {@link UnderwaterAcousticPdu#emittingEntityID}*/
+public EntityID getEmittingEntityID()
{
return emittingEntityID;
-}
-
-/** Setter for {@link UnderwaterAcousticPdu#eventID}*/
-public UnderwaterAcousticPdu setEventID(EventIdentifier pEventID)
+}
+
+/** Setter for {@link UnderwaterAcousticPdu#eventID}*/
+public UnderwaterAcousticPdu setEventID(EventIdentifier pEventID)
{
- eventID = pEventID;
- return this;
-}
-
-/** Getter for {@link UnderwaterAcousticPdu#eventID}*/
-public EventIdentifier getEventID()
+ eventID = pEventID;
+ return this;
+}
+
+/** Getter for {@link UnderwaterAcousticPdu#eventID}*/
+public EventIdentifier getEventID()
{
return eventID;
-}
-
-/** Setter for {@link UnderwaterAcousticPdu#stateChangeIndicator}*/
-public UnderwaterAcousticPdu setStateChangeIndicator(UAStateChangeUpdateIndicator pStateChangeIndicator)
+}
+
+/** Setter for {@link UnderwaterAcousticPdu#stateChangeIndicator}*/
+public UnderwaterAcousticPdu setStateChangeIndicator(UAStateChangeUpdateIndicator pStateChangeIndicator)
{
- stateChangeIndicator = pStateChangeIndicator;
- return this;
-}
-
-/** Getter for {@link UnderwaterAcousticPdu#stateChangeIndicator}*/
-public UAStateChangeUpdateIndicator getStateChangeIndicator()
+ stateChangeIndicator = pStateChangeIndicator;
+ return this;
+}
+
+/** Getter for {@link UnderwaterAcousticPdu#stateChangeIndicator}*/
+public UAStateChangeUpdateIndicator getStateChangeIndicator()
{
return stateChangeIndicator;
-}
-
-/** Setter for {@link UnderwaterAcousticPdu#pad}*/
-public UnderwaterAcousticPdu setPad(byte pPad)
+}
+
+/** Setter for {@link UnderwaterAcousticPdu#pad}*/
+public UnderwaterAcousticPdu setPad(byte pPad)
{
- pad = pPad;
- return this;
-}
-
-/** Getter for {@link UnderwaterAcousticPdu#pad}*/
-public byte getPad()
+ pad = pPad;
+ return this;
+}
+
+/** Getter for {@link UnderwaterAcousticPdu#pad}*/
+public byte getPad()
{
return pad;
-}
-
-/** Setter for {@link UnderwaterAcousticPdu#passiveParameterIndex}*/
-public UnderwaterAcousticPdu setPassiveParameterIndex(UAPassiveParameterIndex pPassiveParameterIndex)
+}
+
+/** Setter for {@link UnderwaterAcousticPdu#passiveParameterIndex}*/
+public UnderwaterAcousticPdu setPassiveParameterIndex(UAPassiveParameterIndex pPassiveParameterIndex)
{
- passiveParameterIndex = pPassiveParameterIndex;
- return this;
-}
-
-/** Getter for {@link UnderwaterAcousticPdu#passiveParameterIndex}*/
-public UAPassiveParameterIndex getPassiveParameterIndex()
+ passiveParameterIndex = pPassiveParameterIndex;
+ return this;
+}
+
+/** Getter for {@link UnderwaterAcousticPdu#passiveParameterIndex}*/
+public UAPassiveParameterIndex getPassiveParameterIndex()
{
return passiveParameterIndex;
-}
-
-/** Setter for {@link UnderwaterAcousticPdu#propulsionPlantConfiguration}*/
-public UnderwaterAcousticPdu setPropulsionPlantConfiguration(byte pPropulsionPlantConfiguration)
+}
+
+/** Setter for {@link UnderwaterAcousticPdu#propulsionPlantConfiguration}*/
+public UnderwaterAcousticPdu setPropulsionPlantConfiguration(byte pPropulsionPlantConfiguration)
{
- propulsionPlantConfiguration = pPropulsionPlantConfiguration;
- return this;
-}
-
-/** Getter for {@link UnderwaterAcousticPdu#propulsionPlantConfiguration}*/
-public byte getPropulsionPlantConfiguration()
+ propulsionPlantConfiguration = pPropulsionPlantConfiguration;
+ return this;
+}
+
+/** Getter for {@link UnderwaterAcousticPdu#propulsionPlantConfiguration}*/
+public byte getPropulsionPlantConfiguration()
{
return propulsionPlantConfiguration;
-}
-
-/** Setter for {@link UnderwaterAcousticPdu#shaftRPMs}*/
-public UnderwaterAcousticPdu setShaftRPMs(List<ShaftRPM> pShaftRPMs)
+}
+
+/** Setter for {@link UnderwaterAcousticPdu#shaftRPMs}*/
+public UnderwaterAcousticPdu setShaftRPMs(List<ShaftRPM> pShaftRPMs)
{
- shaftRPMs = pShaftRPMs;
- return this;
-}
-
-/** Getter for {@link UnderwaterAcousticPdu#shaftRPMs}*/
-public List<ShaftRPM> getShaftRPMs()
+ shaftRPMs = pShaftRPMs;
+ return this;
+}
+
+/** Getter for {@link UnderwaterAcousticPdu#shaftRPMs}*/
+public List<ShaftRPM> getShaftRPMs()
{
return shaftRPMs;
-}
-
-/** Setter for {@link UnderwaterAcousticPdu#apaData}*/
-public UnderwaterAcousticPdu setApaData(List<APA> pApaData)
+}
+
+/** Setter for {@link UnderwaterAcousticPdu#apaData}*/
+public UnderwaterAcousticPdu setApaData(List<APA> pApaData)
{
- apaData = pApaData;
- return this;
-}
-
-/** Getter for {@link UnderwaterAcousticPdu#apaData}*/
-public List<APA> getApaData()
+ apaData = pApaData;
+ return this;
+}
+
+/** Getter for {@link UnderwaterAcousticPdu#apaData}*/
+public List<APA> getApaData()
{
return apaData;
-}
-
-/** Setter for {@link UnderwaterAcousticPdu#emitterSystems}*/
-public UnderwaterAcousticPdu setEmitterSystems(List<UAEmitter> pEmitterSystems)
+}
+
+/** Setter for {@link UnderwaterAcousticPdu#emitterSystems}*/
+public UnderwaterAcousticPdu setEmitterSystems(List<UAEmitter> pEmitterSystems)
{
- emitterSystems = pEmitterSystems;
- return this;
-}
-
-/** Getter for {@link UnderwaterAcousticPdu#emitterSystems}*/
-public List<UAEmitter> getEmitterSystems()
+ emitterSystems = pEmitterSystems;
+ return this;
+}
+
+/** Getter for {@link UnderwaterAcousticPdu#emitterSystems}*/
+public List<UAEmitter> getEmitterSystems()
{
return emitterSystems;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
- emittingEntityID.marshal(dos);
- eventID.marshal(dos);
- stateChangeIndicator.marshal(dos);
- dos.writeByte(pad);
- passiveParameterIndex.marshal(dos);
- dos.writeByte(propulsionPlantConfiguration);
- dos.writeByte(shaftRPMs.size());
- dos.writeByte(apaData.size());
- dos.writeByte(emitterSystems.size());
-
- for(int idx = 0; idx < shaftRPMs.size(); idx++)
- {
- ShaftRPM aShaftRPM = shaftRPMs.get(idx);
- aShaftRPM.marshal(dos);
- }
-
-
- for(int idx = 0; idx < apaData.size(); idx++)
- {
- APA aAPA = apaData.get(idx);
- aAPA.marshal(dos);
- }
-
-
- for(int idx = 0; idx < emitterSystems.size(); idx++)
- {
- UAEmitter aUAEmitter = emitterSystems.get(idx);
- aUAEmitter.marshal(dos);
- }
-
+ {
+ emittingEntityID.marshal(dos);
+ eventID.marshal(dos);
+ stateChangeIndicator.marshal(dos);
+ dos.writeByte(pad);
+ passiveParameterIndex.marshal(dos);
+ dos.writeByte(propulsionPlantConfiguration);
+ dos.writeByte(shaftRPMs.size());
+ dos.writeByte(apaData.size());
+ dos.writeByte(emitterSystems.size());
+
+ for(int idx = 0; idx < shaftRPMs.size(); idx++)
+ {
+ ShaftRPM aShaftRPM = shaftRPMs.get(idx);
+ aShaftRPM.marshal(dos);
+ }
+
+
+ for(int idx = 0; idx < apaData.size(); idx++)
+ {
+ APA aAPA = apaData.get(idx);
+ aAPA.marshal(dos);
+ }
+
+
+ for(int idx = 0; idx < emitterSystems.size(); idx++)
+ {
+ UAEmitter aUAEmitter = emitterSystems.get(idx);
+ aUAEmitter.marshal(dos);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
- uPosition += emittingEntityID.unmarshal(dis);
- uPosition += eventID.unmarshal(dis);
- stateChangeIndicator = UAStateChangeUpdateIndicator.unmarshalEnum(dis);
- uPosition += stateChangeIndicator.getMarshalledSize();
- pad = (byte)dis.readUnsignedByte();
- uPosition += 1;
- passiveParameterIndex = UAPassiveParameterIndex.unmarshalEnum(dis);
- uPosition += passiveParameterIndex.getMarshalledSize();
- propulsionPlantConfiguration = (byte)dis.readUnsignedByte();
- uPosition += 1;
- numberOfShafts = (byte)dis.readUnsignedByte();
- uPosition += 1;
- numberOfAPAs = (byte)dis.readUnsignedByte();
- uPosition += 1;
- numberOfUAEmitterSystems = (byte)dis.readUnsignedByte();
- uPosition += 1;
- for(int idx = 0; idx < numberOfShafts; idx++)
- {
- ShaftRPM anX = new ShaftRPM();
- uPosition += anX.unmarshal(dis);
- shaftRPMs.add(anX);
- }
-
- for(int idx = 0; idx < numberOfAPAs; idx++)
- {
- APA anX = new APA();
- uPosition += anX.unmarshal(dis);
- apaData.add(anX);
- }
-
- for(int idx = 0; idx < numberOfUAEmitterSystems; idx++)
- {
- UAEmitter anX = new UAEmitter();
- uPosition += anX.unmarshal(dis);
- emitterSystems.add(anX);
- }
-
+ {
+ uPosition += emittingEntityID.unmarshal(dis);
+ uPosition += eventID.unmarshal(dis);
+ stateChangeIndicator = UAStateChangeUpdateIndicator.unmarshalEnum(dis);
+ uPosition += stateChangeIndicator.getMarshalledSize();
+ pad = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ passiveParameterIndex = UAPassiveParameterIndex.unmarshalEnum(dis);
+ uPosition += passiveParameterIndex.getMarshalledSize();
+ propulsionPlantConfiguration = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ numberOfShafts = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ numberOfAPAs = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ numberOfUAEmitterSystems = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ for(int idx = 0; idx < numberOfShafts; idx++)
+ {
+ ShaftRPM anX = new ShaftRPM();
+ uPosition += anX.unmarshal(dis);
+ shaftRPMs.add(anX);
+ }
+
+ for(int idx = 0; idx < numberOfAPAs; idx++)
+ {
+ APA anX = new APA();
+ uPosition += anX.unmarshal(dis);
+ apaData.add(anX);
+ }
+
+ for(int idx = 0; idx < numberOfUAEmitterSystems; idx++)
+ {
+ UAEmitter anX = new UAEmitter();
+ uPosition += anX.unmarshal(dis);
+ emitterSystems.add(anX);
+ }
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
- emittingEntityID.marshal(buff);
- eventID.marshal(buff);
- stateChangeIndicator.marshal(buff);
- buff.put( (byte)pad);
- passiveParameterIndex.marshal(buff);
- buff.put( (byte)propulsionPlantConfiguration);
- buff.put( (byte)shaftRPMs.size());
- buff.put( (byte)apaData.size());
- buff.put( (byte)emitterSystems.size());
-
- for(int idx = 0; idx < shaftRPMs.size(); idx++)
- {
- ShaftRPM aShaftRPM = shaftRPMs.get(idx);
- aShaftRPM.marshal(buff);
- }
-
-
- for(int idx = 0; idx < apaData.size(); idx++)
- {
- APA aAPA = apaData.get(idx);
- aAPA.marshal(buff);
- }
-
-
- for(int idx = 0; idx < emitterSystems.size(); idx++)
- {
- UAEmitter aUAEmitter = emitterSystems.get(idx);
- aUAEmitter.marshal(buff);
- }
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+ emittingEntityID.marshal(buff);
+ eventID.marshal(buff);
+ stateChangeIndicator.marshal(buff);
+ buff.put( (byte)pad);
+ passiveParameterIndex.marshal(buff);
+ buff.put( (byte)propulsionPlantConfiguration);
+ buff.put( (byte)shaftRPMs.size());
+ buff.put( (byte)apaData.size());
+ buff.put( (byte)emitterSystems.size());
+
+ for(int idx = 0; idx < shaftRPMs.size(); idx++)
+ {
+ ShaftRPM aShaftRPM = shaftRPMs.get(idx);
+ aShaftRPM.marshal(buff);
+ }
+
+
+ for(int idx = 0; idx < apaData.size(); idx++)
+ {
+ APA aAPA = apaData.get(idx);
+ aAPA.marshal(buff);
+ }
+
+
+ for(int idx = 0; idx < emitterSystems.size(); idx++)
+ {
+ UAEmitter aUAEmitter = emitterSystems.get(idx);
+ aUAEmitter.marshal(buff);
+ }
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- emittingEntityID.unmarshal(buff);
- eventID.unmarshal(buff);
- stateChangeIndicator = UAStateChangeUpdateIndicator.unmarshalEnum(buff);
- pad = (byte)(buff.get() & 0xFF);
- passiveParameterIndex = UAPassiveParameterIndex.unmarshalEnum(buff);
- propulsionPlantConfiguration = (byte)(buff.get() & 0xFF);
- numberOfShafts = (byte)(buff.get() & 0xFF);
- numberOfAPAs = (byte)(buff.get() & 0xFF);
- numberOfUAEmitterSystems = (byte)(buff.get() & 0xFF);
- for(int idx = 0; idx < numberOfShafts; idx++)
- {
- ShaftRPM anX = new ShaftRPM();
- anX.unmarshal(buff);
- shaftRPMs.add(anX);
- }
-
- for(int idx = 0; idx < numberOfAPAs; idx++)
- {
- APA anX = new APA();
- anX.unmarshal(buff);
- apaData.add(anX);
- }
-
- for(int idx = 0; idx < numberOfUAEmitterSystems; idx++)
- {
- UAEmitter anX = new UAEmitter();
- anX.unmarshal(buff);
- emitterSystems.add(anX);
- }
-
- return getMarshalledSize();
+
+ emittingEntityID.unmarshal(buff);
+ eventID.unmarshal(buff);
+ stateChangeIndicator = UAStateChangeUpdateIndicator.unmarshalEnum(buff);
+ pad = (byte)(buff.get() & 0xFF);
+ passiveParameterIndex = UAPassiveParameterIndex.unmarshalEnum(buff);
+ propulsionPlantConfiguration = (byte)(buff.get() & 0xFF);
+ numberOfShafts = (byte)(buff.get() & 0xFF);
+ numberOfAPAs = (byte)(buff.get() & 0xFF);
+ numberOfUAEmitterSystems = (byte)(buff.get() & 0xFF);
+ for(int idx = 0; idx < numberOfShafts; idx++)
+ {
+ ShaftRPM anX = new ShaftRPM();
+ anX.unmarshal(buff);
+ shaftRPMs.add(anX);
+ }
+
+ for(int idx = 0; idx < numberOfAPAs; idx++)
+ {
+ APA anX = new APA();
+ anX.unmarshal(buff);
+ apaData.add(anX);
+ }
+
+ for(int idx = 0; idx < numberOfUAEmitterSystems; idx++)
+ {
+ UAEmitter anX = new UAEmitter();
+ anX.unmarshal(buff);
+ emitterSystems.add(anX);
+ }
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final UnderwaterAcousticPdu rhs = (UnderwaterAcousticPdu)obj;
-
- if( ! (emittingEntityID.equals( rhs.emittingEntityID) )) ivarsEqual = false;
- if( ! (eventID.equals( rhs.eventID) )) ivarsEqual = false;
- if( ! (stateChangeIndicator == rhs.stateChangeIndicator)) ivarsEqual = false;
- if( ! (pad == rhs.pad)) ivarsEqual = false;
- if( ! (passiveParameterIndex == rhs.passiveParameterIndex)) ivarsEqual = false;
- if( ! (propulsionPlantConfiguration == rhs.propulsionPlantConfiguration)) ivarsEqual = false;
-
- for(int idx = 0; idx < shaftRPMs.size(); idx++)
- if( ! ( shaftRPMs.get(idx).equals(rhs.shaftRPMs.get(idx)))) ivarsEqual = false;
-
-
- for(int idx = 0; idx < apaData.size(); idx++)
- if( ! ( apaData.get(idx).equals(rhs.apaData.get(idx)))) ivarsEqual = false;
-
-
- for(int idx = 0; idx < emitterSystems.size(); idx++)
- if( ! ( emitterSystems.get(idx).equals(rhs.emitterSystems.get(idx)))) ivarsEqual = false;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final UnderwaterAcousticPdu rhs = (UnderwaterAcousticPdu)obj;
+
+ if( ! (emittingEntityID.equals( rhs.emittingEntityID) )) ivarsEqual = false;
+ if( ! (eventID.equals( rhs.eventID) )) ivarsEqual = false;
+ if( ! (stateChangeIndicator == rhs.stateChangeIndicator)) ivarsEqual = false;
+ if( ! (pad == rhs.pad)) ivarsEqual = false;
+ if( ! (passiveParameterIndex == rhs.passiveParameterIndex)) ivarsEqual = false;
+ if( ! (propulsionPlantConfiguration == rhs.propulsionPlantConfiguration)) ivarsEqual = false;
+
+ for(int idx = 0; idx < shaftRPMs.size(); idx++)
+ if( ! ( shaftRPMs.get(idx).equals(rhs.shaftRPMs.get(idx)))) ivarsEqual = false;
+
+
+ for(int idx = 0; idx < apaData.size(); idx++)
+ if( ! ( apaData.get(idx).equals(rhs.apaData.get(idx)))) ivarsEqual = false;
+
+
+ for(int idx = 0; idx < emitterSystems.size(); idx++)
+ if( ! ( emitterSystems.get(idx).equals(rhs.emitterSystems.get(idx)))) ivarsEqual = false;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" emittingEntityID: ").append(emittingEntityID).append("\n");
- sb.append(" eventID: ").append(eventID).append("\n");
- sb.append(" stateChangeIndicator: ").append(stateChangeIndicator).append("\n");
- sb.append(" pad: ").append(pad).append("\n");
- sb.append(" passiveParameterIndex: ").append(passiveParameterIndex).append("\n");
- sb.append(" propulsionPlantConfiguration: ").append(propulsionPlantConfiguration).append("\n");
- sb.append(" shaftRPMs: ").append("\n");
- shaftRPMs.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
- sb.append(" apaData: ").append("\n");
- apaData.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
- sb.append(" emitterSystems: ").append("\n");
- emitterSystems.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" emittingEntityID: ").append(emittingEntityID).append("\n");
+ sb.append(" eventID: ").append(eventID).append("\n");
+ sb.append(" stateChangeIndicator: ").append(stateChangeIndicator).append("\n");
+ sb.append(" pad: ").append(pad).append("\n");
+ sb.append(" passiveParameterIndex: ").append(passiveParameterIndex).append("\n");
+ sb.append(" propulsionPlantConfiguration: ").append(propulsionPlantConfiguration).append("\n");
+ sb.append(" shaftRPMs: ").append("\n");
+ shaftRPMs.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+ sb.append(" apaData: ").append("\n");
+ apaData.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+ sb.append(" emitterSystems: ").append("\n");
+ emitterSystems.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/UnsignedDISInteger.java b/src-generated/edu/nps/moves/dis7/UnsignedDISInteger.java
index 9bb314cc471d8b419999fa78a818de3faef0290a..94c7d90dbcab864fe8484128ce63eb5fa6f23ed7 100644
--- a/src-generated/edu/nps/moves/dis7/UnsignedDISInteger.java
+++ b/src-generated/edu/nps/moves/dis7/UnsignedDISInteger.java
@@ -1,162 +1,162 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * container class not in specification
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class UnsignedDISInteger extends Object implements Serializable
-{
- /** unsigned integer */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * container class not in specification
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class UnsignedDISInteger extends Object implements Serializable
+{
+ /** unsigned integer */
protected int val;
-
-
-/** Constructor */
- public UnsignedDISInteger()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
+
+
+/** Constructor */
+ public UnsignedDISInteger()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 4; // val
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link UnsignedDISInteger#val}*/
+public UnsignedDISInteger setVal(int pVal)
{
- int marshalSize = 0;
-
- marshalSize += 4; // val
-
- return marshalSize;
-}
-
-
-/** Setter for {@link UnsignedDISInteger#val}*/
-public UnsignedDISInteger setVal(int pVal)
-{
- val = pVal;
- return this;
-}
-
-/** Getter for {@link UnsignedDISInteger#val}*/
-public int getVal()
+ val = pVal;
+ return this;
+}
+
+/** Getter for {@link UnsignedDISInteger#val}*/
+public int getVal()
{
return val;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeInt(val);
+ {
+ dos.writeInt(val);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- val = dis.readInt();
- uPosition += 4;
+ {
+ val = dis.readInt();
+ uPosition += 4;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putInt( (int)val);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- val = buff.getInt();
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putInt( (int)val);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ val = buff.getInt();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final UnsignedDISInteger rhs = (UnsignedDISInteger)obj;
-
- if( ! (val == rhs.val)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final UnsignedDISInteger rhs = (UnsignedDISInteger)obj;
+
+ if( ! (val == rhs.val)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" val: ").append(val).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" val: ").append(val).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/VariableParameter.java b/src-generated/edu/nps/moves/dis7/VariableParameter.java
index adfb3737aa83bdfdb88c2ea15eae10a9e0b329dc..d47ab3e62d68aa0d8c38d3387bee6e5108af5f99 100644
--- a/src-generated/edu/nps/moves/dis7/VariableParameter.java
+++ b/src-generated/edu/nps/moves/dis7/VariableParameter.java
@@ -1,200 +1,200 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * used in DetonationPdu, ArticulatedPartsPdu among others
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class VariableParameter extends Object implements Serializable
-{
- /** the identification of the Variable Parameter record. Enumeration from EBV uid 56 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * used in DetonationPdu, ArticulatedPartsPdu among others
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class VariableParameter extends Object implements Serializable
+{
+ /** the identification of the Variable Parameter record. Enumeration from EBV uid 56 */
protected VariableParameterRecordType recordType = VariableParameterRecordType.values()[0];
-
- /** 120 bits */
+
+ /** 120 bits */
protected byte[] recordSpecificFields = new byte[15];
-
-
-/** Constructor */
- public VariableParameter()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += recordType.getMarshalledSize();
- marshalSize += recordSpecificFields.length * 1;
-
- return marshalSize;
-}
-
-
-/** Setter for {@link VariableParameter#recordType}*/
-public VariableParameter setRecordType(VariableParameterRecordType pRecordType)
+
+
+/** Constructor */
+ public VariableParameter()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += recordType.getMarshalledSize();
+ marshalSize += recordSpecificFields.length * 1;
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link VariableParameter#recordType}*/
+public VariableParameter setRecordType(VariableParameterRecordType pRecordType)
{
- recordType = pRecordType;
- return this;
-}
-
-/** Getter for {@link VariableParameter#recordType}*/
-public VariableParameterRecordType getRecordType()
+ recordType = pRecordType;
+ return this;
+}
+
+/** Getter for {@link VariableParameter#recordType}*/
+public VariableParameterRecordType getRecordType()
{
return recordType;
-}
-
-/** Setter for {@link VariableParameter#recordSpecificFields}*/
-public VariableParameter setRecordSpecificFields(byte[] pRecordSpecificFields)
+}
+
+/** Setter for {@link VariableParameter#recordSpecificFields}*/
+public VariableParameter setRecordSpecificFields(byte[] pRecordSpecificFields)
{
- recordSpecificFields = Arrays.copyOf(pRecordSpecificFields, recordSpecificFields.length);
- return this;
-}
-
-/** Getter for {@link VariableParameter#recordSpecificFields}*/
-public byte[] getRecordSpecificFields()
+ recordSpecificFields = Arrays.copyOf(pRecordSpecificFields, recordSpecificFields.length);
+ return this;
+}
+
+/** Getter for {@link VariableParameter#recordSpecificFields}*/
+public byte[] getRecordSpecificFields()
{
return recordSpecificFields;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- recordType.marshal(dos);
-
- for(int idx = 0; idx < recordSpecificFields.length; idx++)
- dos.writeByte(recordSpecificFields[idx]);
-
+ {
+ recordType.marshal(dos);
+
+ for(int idx = 0; idx < recordSpecificFields.length; idx++)
+ dos.writeByte(recordSpecificFields[idx]);
+
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- recordType = VariableParameterRecordType.unmarshalEnum(dis);
- uPosition += recordType.getMarshalledSize();
- for(int idx = 0; idx < recordSpecificFields.length; idx++)
- recordSpecificFields[idx] = dis.readByte();
- uPosition += (recordSpecificFields.length * 1);
+ {
+ recordType = VariableParameterRecordType.unmarshalEnum(dis);
+ uPosition += recordType.getMarshalledSize();
+ for(int idx = 0; idx < recordSpecificFields.length; idx++)
+ recordSpecificFields[idx] = dis.readByte();
+ uPosition += (recordSpecificFields.length * 1);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- recordType.marshal(buff);
-
- for(int idx = 0; idx < recordSpecificFields.length; idx++)
- buff.put((byte)recordSpecificFields[idx]);
-
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- recordType = VariableParameterRecordType.unmarshalEnum(buff);
- for(int idx = 0; idx < recordSpecificFields.length; idx++)
- recordSpecificFields[idx] = buff.get();
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ recordType.marshal(buff);
+
+ for(int idx = 0; idx < recordSpecificFields.length; idx++)
+ buff.put((byte)recordSpecificFields[idx]);
+
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ recordType = VariableParameterRecordType.unmarshalEnum(buff);
+ for(int idx = 0; idx < recordSpecificFields.length; idx++)
+ recordSpecificFields[idx] = buff.get();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final VariableParameter rhs = (VariableParameter)obj;
-
- if( ! (recordType == rhs.recordType)) ivarsEqual = false;
-
- for(int idx = 0; idx < 15; idx++)
- {
- if(!(recordSpecificFields[idx] == rhs.recordSpecificFields[idx])) ivarsEqual = false;
- }
-
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final VariableParameter rhs = (VariableParameter)obj;
+
+ if( ! (recordType == rhs.recordType)) ivarsEqual = false;
+
+ for(int idx = 0; idx < 15; idx++)
+ {
+ if(!(recordSpecificFields[idx] == rhs.recordSpecificFields[idx])) ivarsEqual = false;
+ }
+
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" recordType: ").append(recordType).append("\n");
- sb.append(" recordSpecificFields: ").append("\n");
- sb.append(Arrays.toString(recordSpecificFields)).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" recordType: ").append(recordType).append("\n");
+ sb.append(" recordSpecificFields: ").append("\n");
+ sb.append(Arrays.toString(recordSpecificFields)).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/VariableTransmitterParameters.java b/src-generated/edu/nps/moves/dis7/VariableTransmitterParameters.java
index 967eadf02119140e6846a3b0b634158f99096382..89f04d0bfa88e8b11de1617190147f661ada56a2 100644
--- a/src-generated/edu/nps/moves/dis7/VariableTransmitterParameters.java
+++ b/src-generated/edu/nps/moves/dis7/VariableTransmitterParameters.java
@@ -1,232 +1,232 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Relates to radios. Section 6.2.95
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class VariableTransmitterParameters extends Object implements Serializable
-{
- /** Type of VTP uid 66 */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Relates to radios. Section 6.2.95
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class VariableTransmitterParameters extends Object implements Serializable
+{
+ /** Type of VTP uid 66 */
protected VariableRecordType recordType = VariableRecordType.values()[0];
-
- /** Length, in bytes */
+
+ /** Length, in bytes */
protected short recordLength;
-
+
protected byte[] recordSpecificFields = new byte[0];
-
+
private byte[] padding = new byte[0]; // pad to 64-bit boundary
-
-
-/** Constructor */
- public VariableTransmitterParameters()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += recordType.getMarshalledSize();
- marshalSize += 2; // recordLength
- marshalSize += recordSpecificFields.length * 1;
- marshalSize += padding.length;
-
- return marshalSize;
-}
-
-
-/** Setter for {@link VariableTransmitterParameters#recordType}*/
-public VariableTransmitterParameters setRecordType(VariableRecordType pRecordType)
+
+
+/** Constructor */
+ public VariableTransmitterParameters()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += recordType.getMarshalledSize();
+ marshalSize += 2; // recordLength
+ marshalSize += recordSpecificFields.length * 1;
+ marshalSize += padding.length;
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link VariableTransmitterParameters#recordType}*/
+public VariableTransmitterParameters setRecordType(VariableRecordType pRecordType)
{
- recordType = pRecordType;
- return this;
-}
-
-/** Getter for {@link VariableTransmitterParameters#recordType}*/
-public VariableRecordType getRecordType()
+ recordType = pRecordType;
+ return this;
+}
+
+/** Getter for {@link VariableTransmitterParameters#recordType}*/
+public VariableRecordType getRecordType()
{
return recordType;
-}
-
-/** Setter for {@link VariableTransmitterParameters#recordLength}*/
-public VariableTransmitterParameters setRecordLength(short pRecordLength)
+}
+
+/** Setter for {@link VariableTransmitterParameters#recordLength}*/
+public VariableTransmitterParameters setRecordLength(short pRecordLength)
{
- recordLength = pRecordLength;
- return this;
-}
-
-/** Getter for {@link VariableTransmitterParameters#recordLength}*/
-public short getRecordLength()
+ recordLength = pRecordLength;
+ return this;
+}
+
+/** Getter for {@link VariableTransmitterParameters#recordLength}*/
+public short getRecordLength()
{
return recordLength;
-}
-
-/** Setter for {@link VariableTransmitterParameters#recordSpecificFields}*/
-public VariableTransmitterParameters setRecordSpecificFields(byte[] pRecordSpecificFields)
+}
+
+/** Setter for {@link VariableTransmitterParameters#recordSpecificFields}*/
+public VariableTransmitterParameters setRecordSpecificFields(byte[] pRecordSpecificFields)
{
- recordSpecificFields = pRecordSpecificFields;
- return this;
-}
-
-/** Getter for {@link VariableTransmitterParameters#recordSpecificFields}*/
-public byte[] getRecordSpecificFields()
+ recordSpecificFields = pRecordSpecificFields;
+ return this;
+}
+
+/** Getter for {@link VariableTransmitterParameters#recordSpecificFields}*/
+public byte[] getRecordSpecificFields()
{
return recordSpecificFields;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- recordType.marshal(dos);
- dos.writeShort(recordLength);
-
- for(int idx = 0; idx < recordSpecificFields.length; idx++)
- dos.writeByte(recordSpecificFields[idx]);
-
- padding = new byte[Align.to64bits(dos)];
+ {
+ recordType.marshal(dos);
+ dos.writeShort(recordLength);
+
+ for(int idx = 0; idx < recordSpecificFields.length; idx++)
+ dos.writeByte(recordSpecificFields[idx]);
+
+ padding = new byte[Align.to64bits(dos)];
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- recordType = VariableRecordType.unmarshalEnum(dis);
- uPosition += recordType.getMarshalledSize();
- recordLength = (short)dis.readUnsignedShort();
- uPosition += 2;
- for(int idx = 0; idx < recordSpecificFields.length; idx++)
- recordSpecificFields[idx] = dis.readByte();
- uPosition += (recordSpecificFields.length * 1);
- padding = new byte[Align.from64bits(uPosition,dis)];
- uPosition += padding.length;
+ {
+ recordType = VariableRecordType.unmarshalEnum(dis);
+ uPosition += recordType.getMarshalledSize();
+ recordLength = (short)dis.readUnsignedShort();
+ uPosition += 2;
+ for(int idx = 0; idx < recordSpecificFields.length; idx++)
+ recordSpecificFields[idx] = dis.readByte();
+ uPosition += (recordSpecificFields.length * 1);
+ padding = new byte[Align.from64bits(uPosition,dis)];
+ uPosition += padding.length;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- recordType.marshal(buff);
- buff.putShort( (short)recordLength);
-
- for(int idx = 0; idx < recordSpecificFields.length; idx++)
- buff.put((byte)recordSpecificFields[idx]);
-
- padding = new byte[Align.to64bits(buff)];
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- recordType = VariableRecordType.unmarshalEnum(buff);
- recordLength = (short)(buff.getShort() & 0xFFFF);
- for(int idx = 0; idx < recordSpecificFields.length; idx++)
- recordSpecificFields[idx] = buff.get();
- padding = new byte[Align.from64bits(buff)];
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ recordType.marshal(buff);
+ buff.putShort( (short)recordLength);
+
+ for(int idx = 0; idx < recordSpecificFields.length; idx++)
+ buff.put((byte)recordSpecificFields[idx]);
+
+ padding = new byte[Align.to64bits(buff)];
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ recordType = VariableRecordType.unmarshalEnum(buff);
+ recordLength = (short)(buff.getShort() & 0xFFFF);
+ for(int idx = 0; idx < recordSpecificFields.length; idx++)
+ recordSpecificFields[idx] = buff.get();
+ padding = new byte[Align.from64bits(buff)];
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final VariableTransmitterParameters rhs = (VariableTransmitterParameters)obj;
-
- if( ! (recordType == rhs.recordType)) ivarsEqual = false;
- if( ! (recordLength == rhs.recordLength)) ivarsEqual = false;
-
- for(int idx = 0; idx < 0; idx++)
- {
- if(!(recordSpecificFields[idx] == rhs.recordSpecificFields[idx])) ivarsEqual = false;
- }
-
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final VariableTransmitterParameters rhs = (VariableTransmitterParameters)obj;
+
+ if( ! (recordType == rhs.recordType)) ivarsEqual = false;
+ if( ! (recordLength == rhs.recordLength)) ivarsEqual = false;
+
+ for(int idx = 0; idx < 0; idx++)
+ {
+ if(!(recordSpecificFields[idx] == rhs.recordSpecificFields[idx])) ivarsEqual = false;
+ }
+
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" recordType: ").append(recordType).append("\n");
- sb.append(" recordLength: ").append(recordLength).append("\n");
- sb.append(" recordSpecificFields: ").append("\n");
- sb.append(Arrays.toString(recordSpecificFields)).append("\n");
- sb.append(" padding: ").append(padding).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" recordType: ").append(recordType).append("\n");
+ sb.append(" recordLength: ").append(recordLength).append("\n");
+ sb.append(" recordSpecificFields: ").append("\n");
+ sb.append(Arrays.toString(recordSpecificFields)).append("\n");
+ sb.append(" padding: ").append(padding).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/Vector2Float.java b/src-generated/edu/nps/moves/dis7/Vector2Float.java
index 9d0ae58fe860ed5c542cb550b400db092ecdc89b..2d83385f78b00862847466e2a262b29824044c02 100644
--- a/src-generated/edu/nps/moves/dis7/Vector2Float.java
+++ b/src-generated/edu/nps/moves/dis7/Vector2Float.java
@@ -1,186 +1,186 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Two floating point values, x, y
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class Vector2Float extends Object implements Serializable
-{
- /** X value */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Two floating point values, x, y
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class Vector2Float extends Object implements Serializable
+{
+ /** X value */
protected float x;
-
- /** y Value */
+
+ /** y Value */
protected float y;
-
-
-/** Constructor */
- public Vector2Float()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += 4; // x
- marshalSize += 4; // y
-
- return marshalSize;
-}
-
-
-/** Setter for {@link Vector2Float#x}*/
-public Vector2Float setX(float pX)
+
+
+/** Constructor */
+ public Vector2Float()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 4; // x
+ marshalSize += 4; // y
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link Vector2Float#x}*/
+public Vector2Float setX(float pX)
{
- x = pX;
- return this;
-}
-
-/** Getter for {@link Vector2Float#x}*/
-public float getX()
+ x = pX;
+ return this;
+}
+
+/** Getter for {@link Vector2Float#x}*/
+public float getX()
{
return x;
-}
-
-/** Setter for {@link Vector2Float#y}*/
-public Vector2Float setY(float pY)
+}
+
+/** Setter for {@link Vector2Float#y}*/
+public Vector2Float setY(float pY)
{
- y = pY;
- return this;
-}
-
-/** Getter for {@link Vector2Float#y}*/
-public float getY()
+ y = pY;
+ return this;
+}
+
+/** Getter for {@link Vector2Float#y}*/
+public float getY()
{
return y;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeFloat(x);
- dos.writeFloat(y);
+ {
+ dos.writeFloat(x);
+ dos.writeFloat(y);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- x = dis.readFloat();
- uPosition += 4;
- y = dis.readFloat();
- uPosition += 4;
+ {
+ x = dis.readFloat();
+ uPosition += 4;
+ y = dis.readFloat();
+ uPosition += 4;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putFloat( (float)x);
- buff.putFloat( (float)y);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- x = buff.getFloat();
- y = buff.getFloat();
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putFloat( (float)x);
+ buff.putFloat( (float)y);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ x = buff.getFloat();
+ y = buff.getFloat();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final Vector2Float rhs = (Vector2Float)obj;
-
- if( ! (x == rhs.x)) ivarsEqual = false;
- if( ! (y == rhs.y)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final Vector2Float rhs = (Vector2Float)obj;
+
+ if( ! (x == rhs.x)) ivarsEqual = false;
+ if( ! (y == rhs.y)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" x: ").append(x).append("\n");
- sb.append(" y: ").append(y).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" x: ").append(x).append("\n");
+ sb.append(" y: ").append(y).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/Vector3Double.java b/src-generated/edu/nps/moves/dis7/Vector3Double.java
index 4df208322fcb16a79fc2532c5e1dcfe68ca3e0fe..8a10f7c637ee77f06d8acb3e2334272c7b4380b8 100644
--- a/src-generated/edu/nps/moves/dis7/Vector3Double.java
+++ b/src-generated/edu/nps/moves/dis7/Vector3Double.java
@@ -1,210 +1,210 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Three double precision floating point values, x, y, and z. Used for world coordinates Section 6.2.97.
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class Vector3Double extends Object implements Serializable
-{
- /** X value */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Three double precision floating point values, x, y, and z. Used for world coordinates Section 6.2.97.
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class Vector3Double extends Object implements Serializable
+{
+ /** X value */
protected double x;
-
- /** y Value */
+
+ /** y Value */
protected double y;
-
- /** Z value */
+
+ /** Z value */
protected double z;
-
-
-/** Constructor */
- public Vector3Double()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += 8; // x
- marshalSize += 8; // y
- marshalSize += 8; // z
-
- return marshalSize;
-}
-
-
-/** Setter for {@link Vector3Double#x}*/
-public Vector3Double setX(double pX)
+
+
+/** Constructor */
+ public Vector3Double()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 8; // x
+ marshalSize += 8; // y
+ marshalSize += 8; // z
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link Vector3Double#x}*/
+public Vector3Double setX(double pX)
{
- x = pX;
- return this;
-}
-
-/** Getter for {@link Vector3Double#x}*/
-public double getX()
+ x = pX;
+ return this;
+}
+
+/** Getter for {@link Vector3Double#x}*/
+public double getX()
{
return x;
-}
-
-/** Setter for {@link Vector3Double#y}*/
-public Vector3Double setY(double pY)
+}
+
+/** Setter for {@link Vector3Double#y}*/
+public Vector3Double setY(double pY)
{
- y = pY;
- return this;
-}
-
-/** Getter for {@link Vector3Double#y}*/
-public double getY()
+ y = pY;
+ return this;
+}
+
+/** Getter for {@link Vector3Double#y}*/
+public double getY()
{
return y;
-}
-
-/** Setter for {@link Vector3Double#z}*/
-public Vector3Double setZ(double pZ)
+}
+
+/** Setter for {@link Vector3Double#z}*/
+public Vector3Double setZ(double pZ)
{
- z = pZ;
- return this;
-}
-
-/** Getter for {@link Vector3Double#z}*/
-public double getZ()
+ z = pZ;
+ return this;
+}
+
+/** Getter for {@link Vector3Double#z}*/
+public double getZ()
{
return z;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeDouble(x);
- dos.writeDouble(y);
- dos.writeDouble(z);
+ {
+ dos.writeDouble(x);
+ dos.writeDouble(y);
+ dos.writeDouble(z);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- x = dis.readDouble();
- uPosition += 4;
- y = dis.readDouble();
- uPosition += 4;
- z = dis.readDouble();
- uPosition += 4;
+ {
+ x = dis.readDouble();
+ uPosition += 4;
+ y = dis.readDouble();
+ uPosition += 4;
+ z = dis.readDouble();
+ uPosition += 4;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putDouble( (double)x);
- buff.putDouble( (double)y);
- buff.putDouble( (double)z);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- x = buff.getDouble();
- y = buff.getDouble();
- z = buff.getDouble();
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putDouble( (double)x);
+ buff.putDouble( (double)y);
+ buff.putDouble( (double)z);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ x = buff.getDouble();
+ y = buff.getDouble();
+ z = buff.getDouble();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final Vector3Double rhs = (Vector3Double)obj;
-
- if( ! (x == rhs.x)) ivarsEqual = false;
- if( ! (y == rhs.y)) ivarsEqual = false;
- if( ! (z == rhs.z)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final Vector3Double rhs = (Vector3Double)obj;
+
+ if( ! (x == rhs.x)) ivarsEqual = false;
+ if( ! (y == rhs.y)) ivarsEqual = false;
+ if( ! (z == rhs.z)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" x: ").append(x).append("\n");
- sb.append(" y: ").append(y).append("\n");
- sb.append(" z: ").append(z).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" x: ").append(x).append("\n");
+ sb.append(" y: ").append(y).append("\n");
+ sb.append(" z: ").append(z).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/Vector3Float.java b/src-generated/edu/nps/moves/dis7/Vector3Float.java
index 7d18aa1f2e1f5081754f28f778299836ebae351e..3b1b9f3263c64aed5293cf2b5492efac7a6c66aa 100644
--- a/src-generated/edu/nps/moves/dis7/Vector3Float.java
+++ b/src-generated/edu/nps/moves/dis7/Vector3Float.java
@@ -1,210 +1,210 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Three floating point values, x, y, and z. Section 6.2.95
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class Vector3Float extends Object implements Serializable
-{
- /** X value */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Three floating point values, x, y, and z. Section 6.2.95
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class Vector3Float extends Object implements Serializable
+{
+ /** X value */
protected float x;
-
- /** y Value */
+
+ /** y Value */
protected float y;
-
- /** Z value */
+
+ /** Z value */
protected float z;
-
-
-/** Constructor */
- public Vector3Float()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += 4; // x
- marshalSize += 4; // y
- marshalSize += 4; // z
-
- return marshalSize;
-}
-
-
-/** Setter for {@link Vector3Float#x}*/
-public Vector3Float setX(float pX)
+
+
+/** Constructor */
+ public Vector3Float()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 4; // x
+ marshalSize += 4; // y
+ marshalSize += 4; // z
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link Vector3Float#x}*/
+public Vector3Float setX(float pX)
{
- x = pX;
- return this;
-}
-
-/** Getter for {@link Vector3Float#x}*/
-public float getX()
+ x = pX;
+ return this;
+}
+
+/** Getter for {@link Vector3Float#x}*/
+public float getX()
{
return x;
-}
-
-/** Setter for {@link Vector3Float#y}*/
-public Vector3Float setY(float pY)
+}
+
+/** Setter for {@link Vector3Float#y}*/
+public Vector3Float setY(float pY)
{
- y = pY;
- return this;
-}
-
-/** Getter for {@link Vector3Float#y}*/
-public float getY()
+ y = pY;
+ return this;
+}
+
+/** Getter for {@link Vector3Float#y}*/
+public float getY()
{
return y;
-}
-
-/** Setter for {@link Vector3Float#z}*/
-public Vector3Float setZ(float pZ)
+}
+
+/** Setter for {@link Vector3Float#z}*/
+public Vector3Float setZ(float pZ)
{
- z = pZ;
- return this;
-}
-
-/** Getter for {@link Vector3Float#z}*/
-public float getZ()
+ z = pZ;
+ return this;
+}
+
+/** Getter for {@link Vector3Float#z}*/
+public float getZ()
{
return z;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeFloat(x);
- dos.writeFloat(y);
- dos.writeFloat(z);
+ {
+ dos.writeFloat(x);
+ dos.writeFloat(y);
+ dos.writeFloat(z);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- x = dis.readFloat();
- uPosition += 4;
- y = dis.readFloat();
- uPosition += 4;
- z = dis.readFloat();
- uPosition += 4;
+ {
+ x = dis.readFloat();
+ uPosition += 4;
+ y = dis.readFloat();
+ uPosition += 4;
+ z = dis.readFloat();
+ uPosition += 4;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putFloat( (float)x);
- buff.putFloat( (float)y);
- buff.putFloat( (float)z);
+ }
+ return getMarshalledSize();
}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- x = buff.getFloat();
- y = buff.getFloat();
- z = buff.getFloat();
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putFloat( (float)x);
+ buff.putFloat( (float)y);
+ buff.putFloat( (float)z);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ x = buff.getFloat();
+ y = buff.getFloat();
+ z = buff.getFloat();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final Vector3Float rhs = (Vector3Float)obj;
-
- if( ! (x == rhs.x)) ivarsEqual = false;
- if( ! (y == rhs.y)) ivarsEqual = false;
- if( ! (z == rhs.z)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final Vector3Float rhs = (Vector3Float)obj;
+
+ if( ! (x == rhs.x)) ivarsEqual = false;
+ if( ! (y == rhs.y)) ivarsEqual = false;
+ if( ! (z == rhs.z)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" x: ").append(x).append("\n");
- sb.append(" y: ").append(y).append("\n");
- sb.append(" z: ").append(z).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" x: ").append(x).append("\n");
+ sb.append(" y: ").append(y).append("\n");
+ sb.append(" z: ").append(z).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/VectoringNozzleSystem.java b/src-generated/edu/nps/moves/dis7/VectoringNozzleSystem.java
index a6ceef0b636cfe595d95da9e10384c101da72496..cf16cf3fb3aab6e5d45095fa46a89e55ca07750f 100644
--- a/src-generated/edu/nps/moves/dis7/VectoringNozzleSystem.java
+++ b/src-generated/edu/nps/moves/dis7/VectoringNozzleSystem.java
@@ -1,186 +1,186 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Operational data for describing the vectoring nozzle systems Section 6.2.96
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class VectoringNozzleSystem extends Object implements Serializable
-{
- /** In degrees */
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Operational data for describing the vectoring nozzle systems Section 6.2.96
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public class VectoringNozzleSystem extends Object implements Serializable
+{
+ /** In degrees */
protected float horizontalDeflectionAngle;
-
- /** In degrees */
+
+ /** In degrees */
protected float verticalDeflectionAngle;
-
-
-/** Constructor */
- public VectoringNozzleSystem()
- {
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += 4; // horizontalDeflectionAngle
- marshalSize += 4; // verticalDeflectionAngle
-
- return marshalSize;
-}
-
-
-/** Setter for {@link VectoringNozzleSystem#horizontalDeflectionAngle}*/
-public VectoringNozzleSystem setHorizontalDeflectionAngle(float pHorizontalDeflectionAngle)
+
+
+/** Constructor */
+ public VectoringNozzleSystem()
+ {
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize += 4; // horizontalDeflectionAngle
+ marshalSize += 4; // verticalDeflectionAngle
+
+ return marshalSize;
+}
+
+
+/** Setter for {@link VectoringNozzleSystem#horizontalDeflectionAngle}*/
+public VectoringNozzleSystem setHorizontalDeflectionAngle(float pHorizontalDeflectionAngle)
{
- horizontalDeflectionAngle = pHorizontalDeflectionAngle;
- return this;
-}
-
-/** Getter for {@link VectoringNozzleSystem#horizontalDeflectionAngle}*/
-public float getHorizontalDeflectionAngle()
+ horizontalDeflectionAngle = pHorizontalDeflectionAngle;
+ return this;
+}
+
+/** Getter for {@link VectoringNozzleSystem#horizontalDeflectionAngle}*/
+public float getHorizontalDeflectionAngle()
{
return horizontalDeflectionAngle;
-}
-
-/** Setter for {@link VectoringNozzleSystem#verticalDeflectionAngle}*/
-public VectoringNozzleSystem setVerticalDeflectionAngle(float pVerticalDeflectionAngle)
+}
+
+/** Setter for {@link VectoringNozzleSystem#verticalDeflectionAngle}*/
+public VectoringNozzleSystem setVerticalDeflectionAngle(float pVerticalDeflectionAngle)
{
- verticalDeflectionAngle = pVerticalDeflectionAngle;
- return this;
-}
-
-/** Getter for {@link VectoringNozzleSystem#verticalDeflectionAngle}*/
-public float getVerticalDeflectionAngle()
+ verticalDeflectionAngle = pVerticalDeflectionAngle;
+ return this;
+}
+
+/** Getter for {@link VectoringNozzleSystem#verticalDeflectionAngle}*/
+public float getVerticalDeflectionAngle()
{
return verticalDeflectionAngle;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
+}
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
try
- {
- dos.writeFloat(horizontalDeflectionAngle);
- dos.writeFloat(verticalDeflectionAngle);
+ {
+ dos.writeFloat(horizontalDeflectionAngle);
+ dos.writeFloat(verticalDeflectionAngle);
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
try
- {
- horizontalDeflectionAngle = dis.readFloat();
- uPosition += 4;
- verticalDeflectionAngle = dis.readFloat();
- uPosition += 4;
+ {
+ horizontalDeflectionAngle = dis.readFloat();
+ uPosition += 4;
+ verticalDeflectionAngle = dis.readFloat();
+ uPosition += 4;
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.putFloat( (float)horizontalDeflectionAngle);
- buff.putFloat( (float)verticalDeflectionAngle);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- horizontalDeflectionAngle = buff.getFloat();
- verticalDeflectionAngle = buff.getFloat();
- return getMarshalledSize();
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ buff.putFloat( (float)horizontalDeflectionAngle);
+ buff.putFloat( (float)verticalDeflectionAngle);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
+ horizontalDeflectionAngle = buff.getFloat();
+ verticalDeflectionAngle = buff.getFloat();
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final VectoringNozzleSystem rhs = (VectoringNozzleSystem)obj;
-
- if( ! (horizontalDeflectionAngle == rhs.horizontalDeflectionAngle)) ivarsEqual = false;
- if( ! (verticalDeflectionAngle == rhs.verticalDeflectionAngle)) ivarsEqual = false;
- return ivarsEqual;
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+ /**
+ * Compare all fields that contribute to the state, ignoring
+ * transient and static fields, for <code>this</code> and the supplied object
+ * @param obj the object to compare to
+ * @return true if the objects are equal, false otherwise.
+ */
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final VectoringNozzleSystem rhs = (VectoringNozzleSystem)obj;
+
+ if( ! (horizontalDeflectionAngle == rhs.horizontalDeflectionAngle)) ivarsEqual = false;
+ if( ! (verticalDeflectionAngle == rhs.verticalDeflectionAngle)) ivarsEqual = false;
+ return ivarsEqual;
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
- sb.append(" horizontalDeflectionAngle: ").append(horizontalDeflectionAngle).append("\n");
- sb.append(" verticalDeflectionAngle: ").append(verticalDeflectionAngle).append("\n");
-
- return sb.toString();
- }
-} // end of class
+
+ sb.append(" horizontalDeflectionAngle: ").append(horizontalDeflectionAngle).append("\n");
+ sb.append(" verticalDeflectionAngle: ").append(verticalDeflectionAngle).append("\n");
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/WarfareFamilyPdu.java b/src-generated/edu/nps/moves/dis7/WarfareFamilyPdu.java
index 21bbb67a427c4df201ba20a3db5cd23ccf010973..3ea1fccb9fabf332669e7b94cd9db48950100ea0 100644
--- a/src-generated/edu/nps/moves/dis7/WarfareFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/WarfareFamilyPdu.java
@@ -1,141 +1,141 @@
/**
* Copyright (c) 2008-2020, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
* This work is provided under a BSD open-source license, see project license.html and license.txt
- */
-
-package edu.nps.moves.dis7;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis7.enumerations.*;
-
-/**
- * Abstract superclass for fire and detonation pdus that have shared information. Section 7.3
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public abstract class WarfareFamilyPdu extends PduBase implements Serializable
-{
-
-/** Constructor */
- public WarfareFamilyPdu()
- {
- setProtocolFamily( DISProtocolFamily.WARFARE );
- }
-
-/** Returns the size of this serialized object in bytes*/
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
-
- return marshalSize;
-}
-
-
-/**
- * Serializes an object to a DataOutputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataOutputStream
- * @param dos the OutputStream
- */
-public void marshal(DataOutputStream dos) throws Exception
-{
- super.marshal(dos);
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * Abstract superclass for fire and detonation pdus that have shared information. Section 7.3
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
+ */
+public abstract class WarfareFamilyPdu extends PduBase implements Serializable
+{
+
+/** Constructor */
+ public WarfareFamilyPdu()
+ {
+ setProtocolFamily( DISProtocolFamily.WARFARE );
+ }
+
+/** Returns the size of this serialized object in bytes*/
+public int getMarshalledSize()
+{
+ int marshalSize = 0;
+
+ marshalSize = super.getMarshalledSize();
+
+ return marshalSize;
+}
+
+
+/**
+ * Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataOutputStream
+ * @param dos the OutputStream
+ */
+public void marshal(DataOutputStream dos) throws Exception
+{
+ super.marshal(dos);
try
- {
+ {
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @throws java.lang.Exception if something goes wrong
- * @see java.io.DataInputStream
- * @param dis the InputStream
- * @return unmarshalled size
- */
-public int unmarshal(DataInputStream dis) throws Exception
-{
- int uPosition = 0;
+ }
+}
+
+/**
+ * Deserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
+ * @see java.io.DataInputStream
+ * @param dis the InputStream
+ * @return unmarshalled size
+ */
+public int unmarshal(DataInputStream dis) throws Exception
+{
+ int uPosition = 0;
uPosition += super.unmarshal(dis);
-
+
try
- {
+ {
}
- catch(Exception e)
+ catch(Exception e)
{
System.err.println(e);
- }
- return getMarshalledSize();
+ }
+ return getMarshalledSize();
}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- super.marshal(buff);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
+
+/**
+ * Packs an object into the ByteBuffer.
+ * @throws java.nio.BufferOverflowException if buff is too small
+ * @throws java.nio.ReadOnlyBufferException if buff is read only
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin writing
+ * @throws Exception ByteBuffer-generated exception
+ */
+public void marshal(java.nio.ByteBuffer buff) throws Exception
+{
+ super.marshal(buff);
+}
+
+/**
+ * Unpacks a Pdu from the underlying data.
+ * @throws java.nio.BufferUnderflowException if buff is too small
+ * @see java.nio.ByteBuffer
+ * @param buff The ByteBuffer at the position to begin reading
+ * @return marshalled size
+ * @throws Exception ByteBuffer-generated exception
+ */
+public int unmarshal(java.nio.ByteBuffer buff) throws Exception
+{
super.unmarshal(buff);
-
- return getMarshalledSize();
+
+ return getMarshalledSize();
}
-
- /*
- * Override of default equals method. Calls equalsImpl() for content comparison.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
-@Override
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- final WarfareFamilyPdu rhs = (WarfareFamilyPdu)obj;
-
- return ivarsEqual && super.equalsImpl(rhs);
- }
-
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
+
+ /*
+ * Override of default equals method. Calls equalsImpl() for content comparison.
+ */
+@Override
+ public boolean equals(Object obj)
+ {
+ if(this == obj)
+ return true;
+
+ if(obj == null)
+ return false;
+
+ if(!getClass().isAssignableFrom(obj.getClass())) //if(getClass() != obj.getClass())
+ return false;
+
+ return equalsImpl(obj);
+ }
+
+@Override
+ public boolean equalsImpl(Object obj)
+ {
+ boolean ivarsEqual = true;
+
+ final WarfareFamilyPdu rhs = (WarfareFamilyPdu)obj;
+
+ return ivarsEqual && super.equalsImpl(rhs);
+ }
+
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName()).append(":\n");
-
-
- return sb.toString();
- }
-} // end of class
+
+
+ return sb.toString();
+ }
+} // end of class
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/APAParameterIndexAPAStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/APAParameterIndexAPAStatus.java
index e0b5b07d219dad2002c836d9a09be0d345387037..cf3d003785e8d045057f730f8c00c784c9bd1269 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/APAParameterIndexAPAStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/APAParameterIndexAPAStatus.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 281 marshal size 2<br>
- * APA Parameter Index-APA Status
+ * APAParameterIndexAPAStatus
*/
public enum APAParameterIndexAPAStatus
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AcknowledgeAcknowledgeFlag.java b/src-generated/edu/nps/moves/dis7/enumerations/AcknowledgeAcknowledgeFlag.java
index 17d8caebfb3eb7b8543267eed0ad494de54092a3..72398804921f5e48f7f0ef95c1a86b374ddb24b7 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AcknowledgeAcknowledgeFlag.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AcknowledgeAcknowledgeFlag.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 69 marshal size 16<br>
- * Acknowledge-Acknowledge Flag
+ * AcknowledgeAcknowledgeFlag
*/
public enum AcknowledgeAcknowledgeFlag
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AcknowledgeResponseFlag.java b/src-generated/edu/nps/moves/dis7/enumerations/AcknowledgeResponseFlag.java
index 58f905a3704607722184721f674e2b1a028d52e1..78aef2a48a00f6287e84b70955e18f8990a6d6c8 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AcknowledgeResponseFlag.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AcknowledgeResponseFlag.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 70 marshal size 16<br>
- * Acknowledge-Response Flag
+ * AcknowledgeResponseFlag
*/
public enum AcknowledgeResponseFlag
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Acronyms.java b/src-generated/edu/nps/moves/dis7/enumerations/Acronyms.java
index ddd451753062d100fb26225961119299ed2d6a95..af4159084b3fafc397a04bf68d47a89abd179528 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Acronyms.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Acronyms.java
@@ -1,4 +1,4 @@
-/* Generated from the XML, SISO-REF-010-v25, 2018-08-29 */
+/* Generated from the XML, SISO-REF-010-v28, 2020-05-07 */
package edu.nps.moves.dis7.enumerations;
/* UID 2 */
@@ -14,6 +14,7 @@ public enum Acronyms
AAWSM ("Advanced Anti-Tank Weapon System-Medium"),
ABCCC ("Airborne Command, Control and Communications"),
ABL ("Airborne Laser"),
+ ABLE ("Automotive Bridge Launching Equipment"),
ABM ("Anti-Ballistic Missile"),
ABMOC ("Air Battle Management Operations Center"),
ABS ("Amphibious Bridging System"),
@@ -46,6 +47,7 @@ public enum Acronyms
AGSS ("Auxiliary Submarine"),
AHIP ("Army Helicopter Improvement Program"),
AHM ("Anti-Helicopter Mine"),
+ AHTS ("Anchor Handling Tug Supply Vessel"),
AII ("Active Interrogation Indicator"),
AIS ("Automatic Identification System"),
AIT ("Auxiliary Intelligence Trawler"),
@@ -120,6 +122,7 @@ public enum Acronyms
BD ("Base Detonation"),
BDR ("Battle Damage Repair"),
BFUF ("Batteriefuhrungsfahrzeug/Unterstutzungszelle Flugabwehr (battery management vehicle/air defense support)"),
+ BFA ("Battle Field Ambulance"),
BG ("Battle Group"),
BIDS ("Biological Integrated Detection System"),
BN ("Battalion"),
@@ -149,8 +152,9 @@ public enum Acronyms
CEM ("Combined Effects Munition"),
CFV ("Cavalry Fighting Vehicle"),
CGS ("Common Ground Station"),
+ CHE ("Container Handling Equipment"),
CIRCM ("Common Infrared Countermeasures"),
- CITV ("Commander's Independent Thermal Viewer"),
+ CITV ("Commanders Independent Thermal Viewer"),
CIWS ("Close-In Weapon System"),
CLAWS ("Complementary Low Altitude Weapon System"),
CLV ("Command and Liaison Vehicle"),
@@ -173,7 +177,7 @@ public enum Acronyms
CTOL ("Conventional Take-Off and Landing"),
CUAS ("Counter Unmanned Aircraft System"),
CUCV ("Commercial Utility Cargo Vehicle"),
- CV ("Aircraft Carrier"),
+ CV ("Aircraft Carrier; Command Variant"),
CVCC ("Combat Vehicle Command and Control"),
CVN ("Aircraft Carrier Nuclear-powered"),
CVS ("Antisubmarine Aircraft Carrier"),
@@ -222,16 +226,20 @@ public enum Acronyms
EGBU ("Enhanced Guided Bomb Unit"),
ELAV ("Engineer LAV"),
ELINT ("Electronic Intelligence"),
+ ELVA ("Emergency Low Visibility Approach"),
EMATT ("Expendable Mobile ASW Training Target"),
EMT ("Emergency Medical Technician"),
EOD ("Explosive Ordnance Disposal"),
EOS ("Electro-Optical Sensor"),
+ EPIRB ("Emergency Position-Indicating Radio Beacons"),
EPLRS ("Enhanced Position Location Reporting System"),
+ EPLS ("Enhanced Pallet Load System"),
EPP ("Electric Power Plant"),
EPS ("External Personnel System"),
ERAM ("Extended Range Anti-Armor Munition"),
ERFB ("Extended Range Full Bore"),
ERINT ("Extended Range Interceptor"),
+ ERRV ("Emergency Response and Rescue Vessel"),
ERS ("European Remote sensing Satellite"),
ESK ("Einsatzfahrzeug fur spezialisierte Krafte (light protected vehicle for specialised forces)"),
ESS ("Extended Self-protection Suite"),
@@ -287,7 +295,7 @@ public enum Acronyms
GP ("General Purpose"),
GPH ("Gallons Per Hour"),
GPMP ("General Purpose Machine Gun"),
- GPS ("Global Positioning System; Gunner's Primary Sight"),
+ GPS ("Global Positioning System; Gunners Primary Sight"),
GSM ("Global System for Mobile Communications or Ground Station Module"),
GTI ("German Tank Improvement"),
GTK ("Gepanzertes Transport Kraftfahrzeug (armoured transport vehicle)"),
@@ -335,6 +343,7 @@ public enum Acronyms
IFU ("Integrated Fire Unit"),
IFV ("Infantry Fighting Vehicle"),
ILS ("Instrumented Landing System"),
+ IMMLC ("Improved Medium Mobility Load Carrier"),
INS ("Inertial Navigation system"),
IO ("Information Operations"),
IR ("Infrared"),
@@ -344,6 +353,7 @@ public enum Acronyms
ISM ("IFF Simulation Mode"),
ISR ("Intelligence Surveillance and Reconnaissance"),
IST ("Institute for Simulation and Training"),
+ ISTAR ("Intelligence, Surveillance, Target Acquisition and Reconnaissance"),
ITAS ("Improved Target Acquisition system"),
ITOW ("Improved TOW"),
ITV ("Improved TOW Vehicle"),
@@ -398,10 +408,12 @@ public enum Acronyms
LPD ("Amphibious Transport Dock"),
LPG ("Liquefied Petroleum Gas"),
LPH ("Landing Platform Helicopter"),
+ LPPV ("Light Protected Patrol Vehicle"),
LRASM ("Long Range Anti-Ship Missile"),
LRLAP ("Long Range Land Attack Projectile"),
LRPV ("Long Range Patrol Vehicle"),
LRRSC ("Long-Range Recovery and Support Craft"),
+ LRTA ("Long Range Tracking Antenna"),
LS ("Launcher Station"),
LSB ("Lower Sideband"),
LSL ("Landing Ship Logistics"),
@@ -450,6 +462,7 @@ public enum Acronyms
MLMS ("Multipurpose Lightweight Missile System"),
MLRS ("Multiple Launch Rocket System"),
MMA ("Multi-Mission Maritime Aircraft"),
+ MMLC ("Medium Mobility Load Carrier"),
MMP ("Mobile Mooring Platform"),
MMS ("Mast-Mounted Sight"),
MOAB ("Massive Ordnance Air Blast"),
@@ -463,6 +476,7 @@ public enum Acronyms
MRAP ("Mine Resistant Ambush Protected"),
MRCA ("Multi-Role Combat Aircraft"),
MRL ("Multiple Rocket Launcher"),
+ MRLS ("Multiple Rocket Launch System"),
MRM ("Mid-Range Munition"),
MRT ("Multi Role Transport"),
MRTT ("Multi Role Tanker Transport"),
@@ -490,6 +504,7 @@ public enum Acronyms
NSW ("Naval Special Warfare"),
NTH ("Naval Transport Helicopter"),
OCC ("Operational Control Center"),
+ OCV ("Offshore Construction Vessel"),
OPV ("Observation Post Vehicle or Offshore Patrol Vessel"),
PAR ("Pulse Acquisition Radar"),
PC ("Coastal Patrol"),
@@ -501,6 +516,7 @@ public enum Acronyms
PD ("Point Detonation"),
PDM ("Pursuit Deterrent Munition"),
PDU ("Protocol Data Unit"),
+ PE ("Protected Eyes"),
PGDT ("Portable Ground Data Terminal"),
PGSS ("Persistent Ground Surveillance System"),
PIR ("Pressure Ignition Rocket"),
@@ -530,6 +546,7 @@ public enum Acronyms
RCMAT ("Radio Controlled Miniature Aerial Target"),
RCS ("Remote Control Station"),
RDFLT ("Rapid Deployment Force Light Tank"),
+ REBS ("Rapidly Emplaced Bridging System"),
RECCE ("Reconnaissance"),
RF ("Radio Frequency"),
RGM ("Revolver Gun Mount"),
@@ -541,9 +558,11 @@ public enum Acronyms
ROR ("Range-Only-Radar"),
ROV ("Remotely Operated Vehicle"),
ROWPU ("Reverse Osmosis Water Purification Unit"),
+ RRV ("Repair & Recovery Variant"),
RSTA ("Reconnaissance, Surveillance and Target Acquisition"),
RTCST ("Rough Terrain Container Straddle Truck"),
RTTL ("Range Target Towing Launch"),
+ RWS ("Remote Weapons Sight"),
SACLOS ("Semi-Automatic Command to Line of Sight"),
SADARM ("Sense and Destroy Armor"),
SADL ("Situation Awareness Data Link"),
@@ -578,19 +597,23 @@ public enum Acronyms
SLAMRAAM ("Surfaced Launched Advanced Medium Range Air-to-Air Missile"),
SLAP ("Saboted Light Armor Penetrator"),
SLBM ("Submarine Launched Ballistic Missile"),
+ SLDMB ("Self Locating Datum Marker Buoy"),
+ SLDT ("Self/Side Loading Dump Truck"),
SMARTT ("Secure Mobile Anti-Jam Reliable Tactical-Terminal"),
SMAW ("Shoulder-launched Multipurpose Assault Weapon (US)"),
SMFT ("Semi-Trailer Mounted Fabric Tank"),
SNA ("Soviet Naval Air"),
- SNLE ("Sous-marin Nucleaire Lanceur d'Engin (device launching nuclear submarine)"),
- SNLENG ("Sous-marin Nucleaire Lanceur d'Engins de Nouvelle Generation (next generation device launching nuclear submarine)"),
+ SNLE ("Sous-marin Nucleaire Lanceur dEngin (device launching nuclear submarine)"),
+ SNLENG ("Sous-marin Nucleaire Lanceur dEngins de Nouvelle Generation (next generation device launching nuclear submarine)"),
SOF ("Special Operations Forces"),
SOW ("Stand-Off Weapon"),
SP ("Self-Propelled"),
SPAS ("Shuttle Pallet Satellite"),
+ SPRA ("Self Propelled Rocket Artillery"),
SRAM ("Short Range Attack Missile"),
SRAW ("Short-Range Assault Weapon"),
SRBM ("Short-Range Ballistic Missile"),
+ SRNL ("SAR Night Light"),
SRTA ("Short Range Training Ammunition"),
SS ("Submarine Attack"),
SSA ("Submarine Auxiliary/Cargo Submarine"),
@@ -635,6 +658,7 @@ public enum Acronyms
TCAS ("Traffic Alert and Collision Avoidance System"),
TCD ("Landing Ship, Dock"),
TCDL ("Tactical Common Data Link"),
+ TCV ("Troop Carrying Variant"),
TDL ("Tactical Data Link"),
TDRSS ("Tactical Data Relay Satellite System"),
TEI ("Transferred Entity Indicator"),
@@ -667,12 +691,14 @@ public enum Acronyms
UPIN ("User Protocol Identification Number"),
UR ("Upper Receiver"),
USB ("Upper Sideband"),
+ UST ("Unit Support Tanker"),
USV ("Unmanned Surface Vehicle"),
UUGS ("Urban Unattended Ground Sensor"),
UUV ("Unmanned Underwater Vehicle"),
VBL ("Vehicule Blinde Leger (light armoured vehicle)"),
VBR ("Vehicule Blinde a Roues (wheeled armoured vehicle)"),
- VCI ("Vehicule de Combat d'Infanterie"),
+ VBTPMR ("Viatura Blindada Transporte de Pessoal - Media de Rodas / Armoured Personnel Carrier Vehicle - Medium Wheel Type"),
+ VCI ("Vehicule de Combat dInfanterie"),
VEMASID ("Vehicle Magnetic Signature Duplicator"),
VIP ("Very Important Person"),
VLAP ("Velocity Enhanced Artillery Projectile"),
@@ -685,13 +711,20 @@ public enum Acronyms
VSB ("Vestigial Sideband"),
VSHORAD ("Very Short Range Air Defense"),
VT ("Variable Time"),
+ VTLREC ("Viatura de Transporte Leve Reconhecimento / Light Transport Vehicle, Reconnaisance"),
+ VTNE ("Viatura de Transporte Nao Especializada / Non-Specialized Transport Vehicle"),
VX ("Venomous agent X"),
WAAM ("Wide Area Anti-Armor Munition"),
WAM ("Wide Area Mine"),
+ WBDL ("Wide Band Data Link"),
WCMD ("Wind-Corrected Munitions Dispenser"),
+ WEM ("Medical Evacuation Vehicle"),
WFU ("Weapon Fire Unit"),
WP ("White Phosphorus"),
WPS ("West Philippine Sea"),
+ WRT ("Technical Reconnaissance Vehicle"),
+ WSRiD ("Multisensory Reconnaissance and Supervision System"),
+ WSV ("Well Stimulation Vessel"),
XLWB ("Extra Long Wheelbase"),
YDG ("Degaussing tender");
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ActionRequestActionID.java b/src-generated/edu/nps/moves/dis7/enumerations/ActionRequestActionID.java
index f30373b8b8fcea448bbae8f6298c5667b075d7cb..ed87a63cf3e4b61ead06a1d4cdf174a5d230f477 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ActionRequestActionID.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ActionRequestActionID.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 71 marshal size 32<br>
- * Action Request-Action ID
+ * ActionRequestActionID
*/
public enum ActionRequestActionID
{
@@ -18,18 +18,18 @@ public enum ActionRequestActionID
OTHER (0, "Other"),
/** Local storage of the requested information */
LOCAL_STORAGE_OF_THE_REQUESTED_INFORMATION (1, "Local storage of the requested information"),
- /** Inform SM of event "ran out of ammunition" */
- INFORM_SM_OF_EVENT_RAN_OUT_OF_AMMUNITION_ (2, "Inform SM of event 'ran out of ammunition'"),
- /** Inform SM of event "killed in action" */
- INFORM_SM_OF_EVENT_KILLED_IN_ACTION_ (3, "Inform SM of event 'killed in action'"),
- /** Inform SM of event "damage" */
- INFORM_SM_OF_EVENT_DAMAGE_ (4, "Inform SM of event 'damage'"),
- /** Inform SM of event "mobility disabled" */
- INFORM_SM_OF_EVENT_MOBILITY_DISABLED_ (5, "Inform SM of event 'mobility disabled'"),
- /** Inform SM of event "fire disabled" */
- INFORM_SM_OF_EVENT_FIRE_DISABLED_ (6, "Inform SM of event 'fire disabled'"),
- /** Inform SM of event "ran out of fuel" */
- INFORM_SM_OF_EVENT_RAN_OUT_OF_FUEL_ (7, "Inform SM of event 'ran out of fuel'"),
+ /** Inform SM of event ran out of ammunition */
+ INFORM_SM_OF_EVENT_RAN_OUT_OF_AMMUNITION (2, "Inform SM of event ran out of ammunition"),
+ /** Inform SM of event killed in action */
+ INFORM_SM_OF_EVENT_KILLED_IN_ACTION (3, "Inform SM of event killed in action"),
+ /** Inform SM of event damage */
+ INFORM_SM_OF_EVENT_DAMAGE (4, "Inform SM of event damage"),
+ /** Inform SM of event mobility disabled */
+ INFORM_SM_OF_EVENT_MOBILITY_DISABLED (5, "Inform SM of event mobility disabled"),
+ /** Inform SM of event fire disabled */
+ INFORM_SM_OF_EVENT_FIRE_DISABLED (6, "Inform SM of event fire disabled"),
+ /** Inform SM of event ran out of fuel */
+ INFORM_SM_OF_EVENT_RAN_OUT_OF_FUEL (7, "Inform SM of event ran out of fuel"),
/** Recall checkpoint data */
RECALL_CHECKPOINT_DATA (8, "Recall checkpoint data"),
/** Recall initial parameters */
@@ -111,7 +111,13 @@ public enum ActionRequestActionID
/** TACCSF LOS Request-Type 1 */
TACCSF_LOS_REQUEST_TYPE_1 (100, "TACCSF LOS Request-Type 1"),
/** TACCSF LOS Request-Type 2 */
- TACCSF_LOS_REQUEST_TYPE_2 (101, "TACCSF LOS Request-Type 2");
+ TACCSF_LOS_REQUEST_TYPE_2 (101, "TACCSF LOS Request-Type 2"),
+ /** Airmount Mount Request */
+ AIRMOUNT_MOUNT_REQUEST (4303, "Airmount Mount Request"),
+ /** Airmount Dismount Request */
+ AIRMOUNT_DISMOUNT_REQUEST (4304, "Airmount Dismount Request"),
+ /** Airmount Information Request */
+ AIRMOUNT_INFORMATION_REQUEST (4305, "Airmount Information Request");
private int value;
private final String description;
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ActionResponseRequestStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/ActionResponseRequestStatus.java
index 4caa6a00f24b909fff0aa20eb7b8c9bafd0a5dc2..3a2666ebe2dabcbf56ed69605eb605e0bd6c789d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ActionResponseRequestStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ActionResponseRequestStatus.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 72 marshal size 32<br>
- * Action Response-Request Status
+ * ActionResponseRequestStatus
*/
public enum ActionResponseRequestStatus
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AddSpecificDimensionEnumerationsforSubsurfaceAreaSize.java b/src-generated/edu/nps/moves/dis7/enumerations/AddSpecificDimensionEnumerationsforSubsurfaceAreaSize.java
index f395a4cd04f32817df9e912673a7438ab797d2f1..a325b270891ac5e3586adbe1edb8b6c98de50ec8 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AddSpecificDimensionEnumerationsforSubsurfaceAreaSize.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AddSpecificDimensionEnumerationsforSubsurfaceAreaSize.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 133 marshal size 8<br>
- * Add Specific Dimension Enumerations for Subsurface Area Size<br>
+ * AddSpecificDimensionEnumerationsforSubsurfaceAreaSize<br>
* The gaps in enumeration values are intentional and are reserved for future additions.
*/
public enum AddSpecificDimensionEnumerationsforSubsurfaceAreaSize
@@ -22,8 +22,8 @@ public enum AddSpecificDimensionEnumerationsforSubsurfaceAreaSize
SMALL_SCHOOL_DENSE_5KM_LONG_X_250M_WIDE_X_83M_DEEP_1KM_X_5KM_X_166M (223, "Small School, Dense (.5km long x 250m wide x 83m deep - 1km x .5km x 166m)"),
/** Medium School (.5km x 1km x 125m - 1km x 2km x 500m) */
MEDIUM_SCHOOL_5KM_X_1KM_X_125M_1KM_X_2KM_X_500M (224, "Medium School (.5km x 1km x 125m - 1km x 2km x 500m)"),
- /** Medium School, Dense (.5km x 1km x 125m - 1km x 2km x 500m) */
- MEDIUM_SCHOOL_DENSE_5KM_X_1KM_X_125M_1KM_X_2KM_X_500M (225, "Medium School, Dense (.5km x 1km x 125m - 1km x 2km x 500m)"),
+ /** Medium School, Dense (.5km x 1km x 125m - 1km x 2km x 500m) */
+ MEDIUM_SCHOOL_DENSE_5KM_X_1KM_X_125M_1KM_X_2KM_X_500M (225, "Medium School, Dense (.5km x 1km x 125m - 1km x 2km x 500m)"),
/** Large School (5km x 2km x 500m - 10km x 4km x 1km) */
LARGE_SCHOOL_5KM_X_2KM_X_500M_10KM_X_4KM_X_1KM (226, "Large School (5km x 2km x 500m - 10km x 4km x 1km)"),
/** Large School, Dense (5km x 2km x 500m - 10km x 4km x 1km) */
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforAirCategory201Insect.java b/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforAirCategory201Insect.java
index c03c8e6d7c3014fbcc14bd49a52dd6f697b85b4a..9513ce41dadf89eb67133e9c7ad47fa875b754d7 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforAirCategory201Insect.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforAirCategory201Insect.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 137 marshal size 8<br>
- * Add Variants for Air Category 201 - Insect
+ * AddVariantsforAirCategory201Insect
*/
public enum AddVariantsforAirCategory201Insect
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforLandCategory200Mammal.java b/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforLandCategory200Mammal.java
index 5962b1d195f9d68d10b7887835c1f2f39cec9f17..c612672d56dbbf3181881012e5f572efb8c024de 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforLandCategory200Mammal.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforLandCategory200Mammal.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 134 marshal size 8<br>
- * Add Variants for Land Category 200 - Mammal
+ * AddVariantsforLandCategory200Mammal
*/
public enum AddVariantsforLandCategory200Mammal
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforSubsurfaceCategoriesFishMolluskCrustaceanandInsect.java b/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforSubsurfaceCategoriesFishMolluskCrustaceanandInsect.java
index 7ff285356cf7b6a6de05641b944332e65e471faf..b4e63c5c2850f16e44b8dd1dbee357357b44474c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforSubsurfaceCategoriesFishMolluskCrustaceanandInsect.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforSubsurfaceCategoriesFishMolluskCrustaceanandInsect.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 138 marshal size 8<br>
- * Add Variants for Subsurface Categories Fish, Mollusk, Crustacean, and Insect
+ * AddVariantsforSubsurfaceCategoriesFish,Mollusk,Crustacean,andInsect
*/
public enum AddVariantsforSubsurfaceCategoriesFishMolluskCrustaceanandInsect
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateAggregateKind.java b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateAggregateKind.java
index 6fee569af0092f70ff4e03e0361288d1ffb8fa82..136914da5caeb11f5a9d26dd8cbfa91806c3337c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateAggregateKind.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateAggregateKind.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 206 marshal size 8<br>
- * Aggregate State-Aggregate Kind
+ * AggregateStateAggregateKind
*/
public enum AggregateStateAggregateKind
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateAggregateState.java b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateAggregateState.java
index ca60ef2fdfa3b0f64f290ceaa324dab65e5fb07f..d168a490244149d8105ee759490f4744b2354674 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateAggregateState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateAggregateState.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 204 marshal size 8<br>
- * Aggregate State-Aggregate State
+ * AggregateStateAggregateState
*/
public enum AggregateStateAggregateState
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateFormation.java b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateFormation.java
index 2943e07e982012932313493ed1f09247d30dfe31..84104bd9430c482724772caf37a6a6e2cd2295e1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateFormation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateFormation.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 205 marshal size 32<br>
- * Aggregate State-Formation
+ * AggregateStateFormation
*/
public enum AggregateStateFormation
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateSpecific.java b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateSpecific.java
index 1959eca19917be48896d024ce473a8169ab2b6d3..82acd89cf93c04400d88883446516556dcabc803 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateSpecific.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateSpecific.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 209 marshal size 8<br>
- * Aggregate State-Specific
+ * AggregateStateSpecific
*/
public enum AggregateStateSpecific
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateSubcategory.java b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateSubcategory.java
index 0d4a8fb6cce826d64e49f2914e2fa9a88d9c416e..392ef1445bb113c4ff12f41fb7d81c5c5ece77a3 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateSubcategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateSubcategory.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 208 marshal size 8<br>
- * Aggregate State-Subcategory
+ * AggregateStateSubcategory
*/
public enum AggregateStateSubcategory implements SubCategory
{
@@ -30,8 +30,8 @@ public enum AggregateStateSubcategory implements SubCategory
ARMORED_CAVALRY (6, "Armored Cavalry"),
/** Artillery */
ARTILLERY (7, "Artillery"),
- /** Self-propelled Artillery */
- SELF_PROPELLED_ARTILLERY (8, "Self-propelled Artillery"),
+ /** Self-Propelled Artillery */
+ SELF_PROPELLED_ARTILLERY (8, "Self-Propelled Artillery"),
/** Close Air Support */
CLOSE_AIR_SUPPORT (9, "Close Air Support"),
/** Engineer */
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AirPlatformAppearance.java b/src-generated/edu/nps/moves/dis7/enumerations/AirPlatformAppearance.java
index e86b5943be935e7cf39fd35124a62a8f9cd323cf..8e86ff7fb29e79a4db9564c34e7f06416d36ec7c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AirPlatformAppearance.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AirPlatformAppearance.java
@@ -3,24 +3,24 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 32 marshal size 32<br>
- * Air Platform Appearance
+ * AirPlatformAppearance
*/
public class AirPlatformAppearance extends DisBitSet
{
/**
* Describes the visual paint design, Use {@link AppearancePaintScheme} values for this field
*/
- public static Bits PAINT_SCHEME = new Bits(0, 1, AppearancePaintScheme.class);
+ public static Bits PAINTSCHEME = new Bits(0, 1, AppearancePaintScheme.class);
/**
* Describes whether it is capable of moving on its own power
*/
- public static Bits PROPULSION_KILLED = new Bits(1, 1);
+ public static Bits PROPULSIONKILLED = new Bits(1, 1);
/**
* Describes whether air platform lighting is in covert or overt mode, Use {@link AppearanceNVGMode} values for this field
*/
- public static Bits NVG_MODE = new Bits(2, 1, AppearanceNVGMode.class);
+ public static Bits NVGMODE = new Bits(2, 1, AppearanceNVGMode.class);
/**
* Describes the damaged appearance, Use {@link AppearanceDamage} values for this field
*/
@@ -28,63 +28,63 @@ public class AirPlatformAppearance extends DisBitSet
/**
* Describes whether or not smoke is emanating from the entity
*/
- public static Bits IS_SMOKE_EMANATING = new Bits(5, 1);
+ public static Bits ISSMOKEEMANATING = new Bits(5, 1);
/**
* Describes whether or not the engine is emitting smoke
*/
- public static Bits IS_ENGINE_EMITTING_SMOKE = new Bits(6, 1);
+ public static Bits ISENGINEEMITTINGSMOKE = new Bits(6, 1);
/**
* Describes the size of the contrails or ionization trailing effects, Use {@link AppearanceTrailingEffects} values for this field
*/
- public static Bits TRAILING_EFFECTS = new Bits(7, 2, AppearanceTrailingEffects.class);
+ public static Bits TRAILINGEFFECTS = new Bits(7, 2, AppearanceTrailingEffects.class);
/**
* Describes the state of the canopy/troop door, Use {@link AppearanceCanopy} values for this field
*/
- public static Bits CANOPY_TROOP_DOOR = new Bits(9, 3, AppearanceCanopy.class);
+ public static Bits CANOPY_TROOPDOOR = new Bits(9, 3, AppearanceCanopy.class);
/**
* Describes whether landing lights are on or off
*/
- public static Bits LANDING_LIGHTS_ON = new Bits(12, 1);
+ public static Bits LANDINGLIGHTSON = new Bits(12, 1);
/**
* Describes whether navigation lights are on or off
*/
- public static Bits NAVIGATION_LIGHTS_ON = new Bits(13, 1);
+ public static Bits NAVIGATIONLIGHTSON = new Bits(13, 1);
/**
* Describes whether Anti-Collision lights are on or off
*/
- public static Bits ANTI_COLLISION_LIGHTS_ON = new Bits(14, 1);
+ public static Bits ANTICOLLISIONLIGHTSON = new Bits(14, 1);
/**
* Describes whether the entity is burning and flames are visible
*/
- public static Bits IS_FLAMING = new Bits(15, 1);
+ public static Bits ISFLAMING = new Bits(15, 1);
/**
* Describes if the air platform is in afterburner
*/
- public static Bits AFTERBURNER_ON = new Bits(16, 1);
+ public static Bits AFTERBURNERON = new Bits(16, 1);
/**
* Describes whether the lower Anti-Collision light is on or off
*/
- public static Bits LOWER_ANTI_COLLISION_LIGHT_ON = new Bits(17, 1);
+ public static Bits LOWERANTICOLLISIONLIGHTON = new Bits(17, 1);
/**
* Describes whether the upper Anti-Collision light is on or off
*/
- public static Bits UPPER_ANTI_COLLISION_LIGHT_ON = new Bits(18, 1);
+ public static Bits UPPERANTICOLLISIONLIGHTON = new Bits(18, 1);
/**
* Describes the day/night status of the Anti-Collision lights, Use {@link AppearanceAntiCollisionDayNight} values for this field
*/
- public static Bits ANTI_COLLISION_LIGHT_DAY_NIGHT = new Bits(19, 1, AppearanceAntiCollisionDayNight.class);
+ public static Bits ANTICOLLISIONLIGHTDAY_NIGHT = new Bits(19, 1, AppearanceAntiCollisionDayNight.class);
/**
* Indicates whether any air platform lights are blinking or not
*/
- public static Bits IS_BLINKING = new Bits(20, 1);
+ public static Bits ISBLINKING = new Bits(20, 1);
/**
* Describes whether the entity is frozen and should not be dead reckoned
*/
- public static Bits IS_FROZEN = new Bits(21, 1);
+ public static Bits ISFROZEN = new Bits(21, 1);
/**
* Describes whether the power plant is on or off
*/
- public static Bits POWER_PLANT_ON = new Bits(22, 1);
+ public static Bits POWERPLANTON = new Bits(22, 1);
/**
* Describes whether the entity is active or deactivated, Use {@link AppearanceEntityorObjectState} values for this field
*/
@@ -92,35 +92,35 @@ public class AirPlatformAppearance extends DisBitSet
/**
* Describes whether formation lights are on or off
*/
- public static Bits FORMATION_LIGHTS_ON = new Bits(24, 1);
+ public static Bits FORMATIONLIGHTSON = new Bits(24, 1);
/**
* Describes whether the landing gear is wholly retracted or extended
*/
- public static Bits LANDING_GEAR_EXTENDED = new Bits(25, 1);
+ public static Bits LANDINGGEAREXTENDED = new Bits(25, 1);
/**
* Describes whether the cargo doors (main door) are closed or open
*/
- public static Bits CARGO_DOORS_OPENED = new Bits(26, 1);
+ public static Bits CARGODOORSOPENED = new Bits(26, 1);
/**
* Describes the brightness of the navigation/position lights, Use {@link AppearanceNavigationPositionBrightness} values for this field
*/
- public static Bits NAVIGATION_POSITION_BRIGHTNESS = new Bits(27, 1, AppearanceNavigationPositionBrightness.class);
+ public static Bits NAVIGATION_POSITIONBRIGHTNESS = new Bits(27, 1, AppearanceNavigationPositionBrightness.class);
/**
* Describes whether spot/search light #1 is on or off
*/
- public static Bits SPOT_SEARCH_LIGHT_1_ON = new Bits(28, 1);
+ public static Bits SPOT_SEARCHLIGHT1ON = new Bits(28, 1);
/**
* Describes whether interior lights are on or off
*/
- public static Bits INTERIOR_LIGHTS_ON = new Bits(29, 1);
+ public static Bits INTERIORLIGHTSON = new Bits(29, 1);
/**
* Describes whether the air platform has engaged reverse thrust
*/
- public static Bits REVERSE_THRUST_ENGAGED = new Bits(30, 1);
+ public static Bits REVERSETHRUSTENGAGED = new Bits(30, 1);
/**
* Describes whether the air platform has weight on its main landing gear
*/
- public static Bits WEIGHT_ON_WHEELS = new Bits(31, 1);
+ public static Bits WEIGHTONWHEELS = new Bits(31, 1);
public static class Bits
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AirPlatformCapabilities.java b/src-generated/edu/nps/moves/dis7/enumerations/AirPlatformCapabilities.java
index 84b8844f1b41c14433d1f77b1a0daaec2e6faf2b..8127557292caa7e6af63a59b7550decf1e932311 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AirPlatformCapabilities.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AirPlatformCapabilities.java
@@ -3,20 +3,20 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 451 marshal size 32<br>
- * Air Platform Capabilities
+ * AirPlatformCapabilities
*/
public class AirPlatformCapabilities extends DisBitSet implements EntityCapabilities
{
/**
* Describes whether the entity is able to supply some type of ammunition in response to an appropriate service request
*/
- public static Bits AMMUNITION_SUPPLY = new Bits(0, 1);
+ public static Bits AMMUNITIONSUPPLY = new Bits(0, 1);
/**
* Describes whether the entity is able to supply some type of fuel in response to an appropriate service request
*/
- public static Bits FUEL_SUPPLY = new Bits(1, 1);
+ public static Bits FUELSUPPLY = new Bits(1, 1);
/**
* Describes whether the entity is able to provide recovery (e.g., towing) services in response to an appropriate service request
*/
@@ -28,23 +28,23 @@ public class AirPlatformCapabilities extends DisBitSet implements EntityCapabili
/**
* Describes whether the entity is equipped with Automatic Dependent Surveillance - Broadcast (ADS-B)
*/
- public static Bits ADS_B = new Bits(4, 1);
+ public static Bits ADSB = new Bits(4, 1);
/**
- * The Entity is able to carry a payload in a sling load. The extended appearance record (if available) will identify the current sling load status and entity association and/or entity offset records (if available) will provide additional sling load details (such as payload).
+ * The Entity is able to carry a payload in a sling load. The extended appearance record (if available) will identify the current sling load status and entity association and/or entity offset records (if available) will provide additional sling load details (such as payload).
*/
- public static Bits SLING_LOAD_CARRIER = new Bits(5, 1);
+ public static Bits SLINGLOADCARRIER = new Bits(5, 1);
/**
- * The Entity is able to be carried as a sling load payload. The extended appearance record (if available) will identify if it is currently sling loaded and entity association and/or entity offset records (if available) will provide additional sling load details (such as carrier).
+ * The Entity is able to be carried as a sling load payload. The extended appearance record (if available) will identify if it is currently sling loaded and entity association and/or entity offset records (if available) will provide additional sling load details (such as carrier).
*/
- public static Bits SLING_LOADABLE = new Bits(6, 1);
+ public static Bits SLINGLOADABLE = new Bits(6, 1);
/**
- * The Entity is an IED or contains an IED. The extended appearance record (if available) will identify how well hidden the IED is on the Entity. An Attached Part (if applicable, for instance a jury-rigged munition does not apply here) will identify the IED explicitly.
+ * The Entity is an IED or contains an IED. The extended appearance record (if available) will identify how well hidden the IED is on the Entity. An Attached Part (if applicable, for instance a jury-rigged munition does not apply here) will identify the IED explicitly.
*/
- public static Bits IED_PRESENCE_INDICATOR = new Bits(7, 1);
+ public static Bits IEDPRESENCEINDICATOR = new Bits(7, 1);
/**
* The Entity (normally a virtual manned module) can be task organized into an existing mixed mode unit (where mixed mode is intended to comprise a combination of computer-generated forces and virtual or even live forces).
*/
- public static Bits TASK_ORGANIZABLE = new Bits(8, 1);
+ public static Bits TASKORGANIZABLE = new Bits(8, 1);
/**
* Describes whether the entity is equipped with Large Aircraft Infrared Countermeasures (LAIRCM)
*/
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AircraftAddressSource.java b/src-generated/edu/nps/moves/dis7/enumerations/AircraftAddressSource.java
index 6c565790b50782f82d93efedd1aa499239f24e37..ae1f966183b3fd46ee3e2e836271d9d2f942e658 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AircraftAddressSource.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AircraftAddressSource.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 364 marshal size 1<br>
- * Aircraft Address Source
+ * AircraftAddressSource
*/
public enum AircraftAddressSource
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AircraftIdentificationType.java b/src-generated/edu/nps/moves/dis7/enumerations/AircraftIdentificationType.java
index c1f150a3eb8866655d80a3efa53bc01d654c5e50..58f0238d5e51a76a2cb77bb83fcd215a0890741c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AircraftIdentificationType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AircraftIdentificationType.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 357 marshal size 8<br>
- * Aircraft Identification Type
+ * AircraftIdentificationType
*/
public enum AircraftIdentificationType
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AircraftPresentDomain.java b/src-generated/edu/nps/moves/dis7/enumerations/AircraftPresentDomain.java
index 0cf328e7dabe765f8634e95cdfcec76287346343..6af593cf0c7a0d16c12e8d5c511cf95828429ed7 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AircraftPresentDomain.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AircraftPresentDomain.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 356 marshal size 8<br>
- * Aircraft Present Domain
+ * AircraftPresentDomain
*/
public enum AircraftPresentDomain
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AircraftTypeWake.java b/src-generated/edu/nps/moves/dis7/enumerations/AircraftTypeWake.java
index da52feee3beb762a45634a45b4117f5e3126c2d7..faf6c0ce48a86a614d46552fe99f4f71264e846a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AircraftTypeWake.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AircraftTypeWake.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 368 marshal size 3<br>
- * Aircraft Type/Wake
+ * AircraftType/Wake
*/
public enum AircraftTypeWake
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AnimalLifeformGroupSizeRangeEnumerationforallDomains.java b/src-generated/edu/nps/moves/dis7/enumerations/AnimalLifeformGroupSizeRangeEnumerationforallDomains.java
index 1bdf3e401940427d47fa54d18b1f310f0be8146e..c196f1d7bafa140491348ff6f1a55e9a2e2e3b46 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AnimalLifeformGroupSizeRangeEnumerationforallDomains.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AnimalLifeformGroupSizeRangeEnumerationforallDomains.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 130 marshal size 8<br>
- * Animal Lifeform Group Size Range Enumeration for all Domains<br>
+ * AnimalLifeformGroupSizeRangeEnumerationforallDomains<br>
* The gaps in enumeration values are intentional and are reserved for future additions.
*/
public enum AnimalLifeformGroupSizeRangeEnumerationforallDomains
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AntennaSelection.java b/src-generated/edu/nps/moves/dis7/enumerations/AntennaSelection.java
index 92ad6125e62c80566b82d561361f2349bb1bff63..b71fdc06fd6b84ed58aab27fe14941e6a6373bcc 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AntennaSelection.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AntennaSelection.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 351 marshal size 2<br>
- * Antenna Selection
+ * AntennaSelection
*/
public enum AntennaSelection
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AntennaStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/AntennaStatus.java
index a1eb19789cdc9a33237e1874749b7a8dcf4dcbb5..1ee48be2647c009a3cb348d3b356845177e9fbe0 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AntennaStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AntennaStatus.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 371 marshal size 8<br>
- * Antenna Status
+ * AntennaStatus
*/
public enum AntennaStatus
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceAntiCollisionDayNight.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceAntiCollisionDayNight.java
index a7ed07595cc78eb5fe92ac3f5bc4a335ae9171a3..0ce1cc73ab84af74535942afc17dcc8ce8d8eeb5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceAntiCollisionDayNight.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceAntiCollisionDayNight.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 397 marshal size 1<br>
- * Appearance-Anti-Collision Day/Night
+ * AppearanceAntiCollisionDay/Night
*/
public enum AppearanceAntiCollisionDayNight
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceCamouflageType.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceCamouflageType.java
index 012155c857a1d7944d90c22576e6e2e6ce91ced7..700875265c4ccaffe46a052462138e9b61c01104 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceCamouflageType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceCamouflageType.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 384 marshal size 2<br>
- * Appearance-Camouflage Type
+ * AppearanceCamouflageType
*/
public enum AppearanceCamouflageType
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceCanopy.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceCanopy.java
index 0d0d5c9d5a179e762b9f4630b14e889a6fa94c51..5871d05fdba6241e71fc9fdc9bef1968b114dcff 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceCanopy.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceCanopy.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 387 marshal size 3<br>
- * Appearance-Canopy
+ * AppearanceCanopy
*/
public enum AppearanceCanopy
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceConcealedMovement.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceConcealedMovement.java
index 1e07e1d7e901ce7655c1347830bc770f12641192..44f40277cb1b561790d77a2d186b27da1ae707b6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceConcealedMovement.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceConcealedMovement.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 394 marshal size 1<br>
- * Appearance-Concealed Movement
+ * AppearanceConcealedMovement
*/
public enum AppearanceConcealedMovement
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceConcealedPosition.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceConcealedPosition.java
index 3c9bb5ba646daacea17a4aac60eafc4da116aec1..a8bdd97d10c52be8ead9695ca944459d8ea8f4be 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceConcealedPosition.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceConcealedPosition.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 385 marshal size 1<br>
- * Appearance-Concealed Position
+ * AppearanceConcealedPosition
*/
public enum AppearanceConcealedPosition
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceDamage.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceDamage.java
index f992931251dc7defe3aa1241f4879aca2ac13751..f6a49d4d193af5bd825702393e843b05df8700cb 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceDamage.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceDamage.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 379 marshal size 2<br>
- * Appearance-Damage
+ * AppearanceDamage
*/
public enum AppearanceDamage
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceEntityorObjectState.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceEntityorObjectState.java
index 724f5b924092521a9b4d6cdf41628cc7dde9a1b8..aae9532e4ac6e1232c4c68938dcca45759eeff49 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceEntityorObjectState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceEntityorObjectState.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 386 marshal size 1<br>
- * Appearance-Entity or Object State
+ * AppearanceEntityorObjectState
*/
public enum AppearanceEntityorObjectState
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceEnvironmentalDensity.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceEnvironmentalDensity.java
index 81edf5a6a88f0a2123f7f52f9024d10164bb81ff..bafadbfcfe37735fed037fa4778ab625e75cd596 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceEnvironmentalDensity.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceEnvironmentalDensity.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 395 marshal size 4<br>
- * Appearance-Environmental Density
+ * AppearanceEnvironmentalDensity
*/
public enum AppearanceEnvironmentalDensity
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceHatch.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceHatch.java
index c6e16c16b75aacd6f4bdaf1c84ae8ed914cfdf0d..2773bb50725ce44873591b44b894648a30d3ff66 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceHatch.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceHatch.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 382 marshal size 3<br>
- * Appearance-Hatch
+ * AppearanceHatch
*/
public enum AppearanceHatch
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLauncherOperational.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLauncherOperational.java
index 3ca63e7fa8a9d139fb228e22f8859fa6969a073d..c68dc49d3f2f1aa3418ca4d44da6bde16837412d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLauncherOperational.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLauncherOperational.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 383 marshal size 1<br>
- * Appearance-Launcher/Operational
+ * AppearanceLauncher/Operational
*/
public enum AppearanceLauncherOperational
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormComplianceStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormComplianceStatus.java
index b013c3231e50cd2d67361d9829a9dc84c1e2d4c9..8de1d2d9e069f23bf6ef3dcf861f0b8d034759f5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormComplianceStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormComplianceStatus.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 391 marshal size 4<br>
- * Appearance-Life Form Compliance Status
+ * AppearanceLifeFormComplianceStatus
*/
public enum AppearanceLifeFormComplianceStatus
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormPosture.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormPosture.java
index 4ea339bc2f25ec79548352c1e22892e2bf4330dc..347e448a176b56928aac6a8135d9d8efe7d0f5ad 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormPosture.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormPosture.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 392 marshal size 4<br>
- * Appearance-Life Form Posture
+ * AppearanceLifeFormPosture
*/
public enum AppearanceLifeFormPosture
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormWeaponImplement.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormWeaponImplement.java
index 1109010c5606f5d75f8b68e719ffa12988086ebb..49a6d9742c582b66c27e8daf648bb44570279ce7 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormWeaponImplement.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormWeaponImplement.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 393 marshal size 2<br>
- * Appearance-Life Form Weapon/Implement
+ * AppearanceLifeFormWeapon/Implement
*/
public enum AppearanceLifeFormWeaponImplement
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeformHealth.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeformHealth.java
index 4bc27033305f25eb866bc27c4ec6c2581b9d2099..9ff576f606461d099bf6b53b6081bbca7a361245 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeformHealth.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeformHealth.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 390 marshal size 2<br>
- * Appearance-Lifeform Health
+ * AppearanceLifeformHealth
*/
public enum AppearanceLifeformHealth
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLinearObjectLaneMarkerVisible.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLinearObjectLaneMarkerVisible.java
index a2d03b42c98e768e7b1edc6fff4aafa06dbf7ae6..ff0f404f0428c3a6fe0b0bdb948f9c8da68ca294 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLinearObjectLaneMarkerVisible.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLinearObjectLaneMarkerVisible.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 410 marshal size 2<br>
- * Appearance-Linear Object Lane Marker Visible
+ * AppearanceLinearObjectLaneMarkerVisible
*/
public enum AppearanceLinearObjectLaneMarkerVisible
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLinearObjectTankDitchBreach.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLinearObjectTankDitchBreach.java
index cb06ee1bda5635ced36f7eb02f4df673da5505e6..e140fa6414d539faf92e4469eda88f2df2e9aad8 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLinearObjectTankDitchBreach.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLinearObjectTankDitchBreach.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 409 marshal size 2<br>
- * Appearance-Linear Object Tank Ditch Breach
+ * AppearanceLinearObjectTankDitchBreach
*/
public enum AppearanceLinearObjectTankDitchBreach
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceNVGMode.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceNVGMode.java
index 6e3401c02519cc5d7fb88e2c6412a8e5469f8897..50834a63b2596ad9c851a6829fc0cc9d35902466 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceNVGMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceNVGMode.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 400 marshal size 1<br>
- * Appearance-NVG Mode
+ * AppearanceNVGMode
*/
public enum AppearanceNVGMode
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceNavigationPositionBrightness.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceNavigationPositionBrightness.java
index aa3e396c76a98788354d56d98c7ca0f73654dd2c..20dff7f9174064db4930a3e66126ee85ec4fa4b9 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceNavigationPositionBrightness.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceNavigationPositionBrightness.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 398 marshal size 1<br>
- * Appearance-Navigation/Position Brightness
+ * AppearanceNavigation/PositionBrightness
*/
public enum AppearanceNavigationPositionBrightness
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralDamage.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralDamage.java
index 870e78b9260a027977f79cc0ed388b44b8105cc7..95dc6ed238a40958371d853df405db38e75ad46f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralDamage.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralDamage.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 405 marshal size 2<br>
- * Appearance-Object General-Damage
+ * AppearanceObjectGeneralDamage
*/
public enum AppearanceObjectGeneralDamage
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralIEDPresent.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralIEDPresent.java
index 1349d68b6c0c0cd815fef5ce78b3ae30a9411bdb..627d09cad6316b6201fbb288426f51157ee43e20 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralIEDPresent.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralIEDPresent.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 411 marshal size 2<br>
- * Appearance-Object General-IED Present
+ * AppearanceObjectGeneralIEDPresent
*/
public enum AppearanceObjectGeneralIEDPresent
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralPredistributed.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralPredistributed.java
index f8ef6c3b51e9c1542c73118c0fcfd9bcdf7c4529..5b90b6e8316865d97dd5c842082ac292c00774e9 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralPredistributed.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralPredistributed.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 406 marshal size 1<br>
- * Appearance-Object General-Predistributed
+ * AppearanceObjectGeneralPredistributed
*/
public enum AppearanceObjectGeneralPredistributed
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectSpecificBreachState.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectSpecificBreachState.java
index c7a852b0c6fb0c228118c26c7f9edc2d9a59b7a2..8a66625cc38e27367d6ff1a569093262e112219c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectSpecificBreachState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectSpecificBreachState.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 407 marshal size 2<br>
- * Appearance-Object Specific-Breach State
+ * AppearanceObjectSpecificBreachState
*/
public enum AppearanceObjectSpecificBreachState
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectSpecificChemicalType.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectSpecificChemicalType.java
index 9e37042a7f9aa082711dbb4d257fb0ca95b0a67c..87300e0a17bb87fff27af2292f17d89c59fc4576 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectSpecificChemicalType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectSpecificChemicalType.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 408 marshal size 2<br>
- * Appearance-Object Specific-Chemical Type
+ * AppearanceObjectSpecificChemicalType
*/
public enum AppearanceObjectSpecificChemicalType
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearancePaintScheme.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearancePaintScheme.java
index c6fd8fea0d7c7900a36f4f2b6ebcbe53476fe72f..7bbf82c2de7f859db8c7a6228bf35cb0f52fc8c8 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearancePaintScheme.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearancePaintScheme.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 378 marshal size 1<br>
- * Appearance-Paint Scheme
+ * AppearancePaintScheme
*/
public enum AppearancePaintScheme
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceSubsurfaceHatch.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceSubsurfaceHatch.java
index 4d2277f3a9bd11b585f04a4c39bc24e3a948b76e..348c05916c8d58c6c5e6cee1c410d5178cea8191 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceSubsurfaceHatch.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceSubsurfaceHatch.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 388 marshal size 3<br>
- * Appearance-Subsurface Hatch
+ * AppearanceSubsurfaceHatch
*/
public enum AppearanceSubsurfaceHatch
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceSupplyDeployed.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceSupplyDeployed.java
index 1274cefb8fb4d6d2ccf5052e4f6fe0e26abf944d..8acb3d68412e9b5de8c97b70eb8a54c0ffe3f4b9 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceSupplyDeployed.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceSupplyDeployed.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 399 marshal size 2<br>
- * Appearance-Supply Deployed
+ * AppearanceSupplyDeployed
*/
public enum AppearanceSupplyDeployed
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceTrailingEffects.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceTrailingEffects.java
index 4d13f8bf566d59d2fe16eccb77718ed1fa9f658c..5ef252124db9cbfb0da92c6c599db6ac8aaeb614 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceTrailingEffects.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceTrailingEffects.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 381 marshal size 2<br>
- * Appearance-Trailing Effects
+ * AppearanceTrailingEffects
*/
public enum AppearanceTrailingEffects
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ArealObjectAppearanceMinefield.java b/src-generated/edu/nps/moves/dis7/enumerations/ArealObjectAppearanceMinefield.java
index a024109aeea4e6e4cdbf5539ef50960db5c7252f..7a18eb2f54120de4a23718a648f7494cd4f43465 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ArealObjectAppearanceMinefield.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ArealObjectAppearanceMinefield.java
@@ -3,20 +3,20 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 239 marshal size 16<br>
- * Areal Object Appearance-Minefield
+ * ArealObjectAppearanceMinefield
*/
public class ArealObjectAppearanceMinefield extends DisBitSet
{
/**
* Describes the breached appearance of the object, Use {@link AppearanceObjectSpecificBreachState} values for this field
*/
- public static Bits BREACH_STATE = new Bits(0, 2, AppearanceObjectSpecificBreachState.class);
+ public static Bits BREACHSTATE = new Bits(0, 2, AppearanceObjectSpecificBreachState.class);
/**
* 16-bit unsigned integer indicating the number of mines in the minefield
*/
- public static Bits MINE_COUNT = new Bits(16, 16);
+ public static Bits MINECOUNT = new Bits(16, 16);
public static class Bits
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ArticulatedPartsTypeClass.java b/src-generated/edu/nps/moves/dis7/enumerations/ArticulatedPartsTypeClass.java
index 1a2ecfde5d3be036d5a7a097898b961531f7a26e..78895fb17fe109e7f55b931f54ea94a275607071 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ArticulatedPartsTypeClass.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ArticulatedPartsTypeClass.java
@@ -8,30 +8,30 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 59 marshal size 32<br>
- * Articulated Parts-Type Class
+ * ArticulatedPartsTypeClass
*/
public enum ArticulatedPartsTypeClass
{
/** Not Specified */
NOT_SPECIFIED (0, "Not Specified"),
- /** rudder */
- RUDDER (1024, "rudder"),
- /** left flap */
- LEFT_FLAP (1056, "left flap"),
- /** right flap */
- RIGHT_FLAP (1088, "right flap"),
- /** left aileron */
- LEFT_AILERON (1120, "left aileron"),
- /** right aileron */
- RIGHT_AILERON (1152, "right aileron"),
- /** helicopter - main rotor */
- HELICOPTER_MAIN_ROTOR (1184, "helicopter - main rotor"),
- /** helicopter - tail rotor */
- HELICOPTER_TAIL_ROTOR (1216, "helicopter - tail rotor"),
- /** other Aircraft Control Surfaces defined as needed */
- OTHER_AIRCRAFT_CONTROL_SURFACES_DEFINED_AS_NEEDED (1248, "other Aircraft Control Surfaces defined as needed"),
+ /** Rudder */
+ RUDDER (1024, "Rudder"),
+ /** Left Flap */
+ LEFT_FLAP (1056, "Left Flap"),
+ /** Right Flap */
+ RIGHT_FLAP (1088, "Right Flap"),
+ /** Left Aileron */
+ LEFT_AILERON (1120, "Left Aileron"),
+ /** Right Aileron */
+ RIGHT_AILERON (1152, "Right Aileron"),
+ /** Helicopter - Main Rotor */
+ HELICOPTER_MAIN_ROTOR (1184, "Helicopter - Main Rotor"),
+ /** Helicopter - Tail Rotor */
+ HELICOPTER_TAIL_ROTOR (1216, "Helicopter - Tail Rotor"),
+ /** Other Aircraft Control Surfaces Defined as Needed */
+ OTHER_AIRCRAFT_CONTROL_SURFACES_DEFINED_AS_NEEDED (1248, "Other Aircraft Control Surfaces Defined as Needed"),
/** Propeller Number 1 */
PROPELLER_NUMBER_1 (1280, "Propeller Number 1"),
/** Propeller Number 2 */
@@ -56,46 +56,76 @@ public enum ArticulatedPartsTypeClass
LEFT_ELEVATOR (1600, "Left Elevator"),
/** Right Elevator */
RIGHT_ELEVATOR (1632, "Right Elevator"),
- /** periscope */
- PERISCOPE (2048, "periscope"),
- /** generic antenna */
- GENERIC_ANTENNA (2080, "generic antenna"),
- /** snorkel */
- SNORKEL (2112, "snorkel"),
- /** other extendible parts defined as needed */
- OTHER_EXTENDIBLE_PARTS_DEFINED_AS_NEEDED (2144, "other extendible parts defined as needed"),
+ /** Canard (left) */
+ CANARD_LEFT (1664, "Canard (left)"),
+ /** Canard (right) */
+ CANARD_RIGHT (1696, "Canard (right)"),
+ /** Elevon Inner (left) */
+ ELEVON_INNER_LEFT (1728, "Elevon Inner (left)"),
+ /** Elevon Inner (right) */
+ ELEVON_INNER_RIGHT (1760, "Elevon Inner (right)"),
+ /** Elevon Middle (left) */
+ ELEVON_MIDDLE_LEFT (1792, "Elevon Middle (left)"),
+ /** Elevon Middle (right) */
+ ELEVON_MIDDLE_RIGHT (1824, "Elevon Middle (right)"),
+ /** Elevon Outer (left) */
+ ELEVON_OUTER_LEFT (1856, "Elevon Outer (left)"),
+ /** Elevon Outer (right) */
+ ELEVON_OUTER_RIGHT (1888, "Elevon Outer (right)"),
+ /** Canopy (Aircraft) */
+ CANOPY_AIRCRAFT (1920, "Canopy (Aircraft)"),
+ /** Periscope */
+ PERISCOPE (2048, "Periscope"),
+ /** Generic Antenna */
+ GENERIC_ANTENNA (2080, "Generic Antenna"),
+ /** Snorkel */
+ SNORKEL (2112, "Snorkel"),
+ /** Other Extendible Parts Defined as Needed */
+ OTHER_EXTENDIBLE_PARTS_DEFINED_AS_NEEDED (2144, "Other Extendible Parts Defined as Needed"),
+ /** Dive Plane (Sail) - Left */
+ DIVE_PLANE_SAIL_LEFT (2176, "Dive Plane (Sail) - Left"),
+ /** Dive Plane (Sail) - Right */
+ DIVE_PLANE_SAIL_RIGHT (2208, "Dive Plane (Sail) - Right"),
+ /** Dive Plane (Bow) - Left */
+ DIVE_PLANE_BOW_LEFT (2240, "Dive Plane (Bow) - Left"),
+ /** Dive Plane (Bow) - Right */
+ DIVE_PLANE_BOW_RIGHT (2272, "Dive Plane (Bow) - Right"),
+ /** Dive Plane (Stern) - Left */
+ DIVE_PLANE_STERN_LEFT (2304, "Dive Plane (Stern) - Left"),
+ /** Dive Plane (Stern) - Right */
+ DIVE_PLANE_STERN_RIGHT (2336, "Dive Plane (Stern) - Right"),
/** Landing Gear, Nose and Left/Right Main move in unison; intended for low-fidelity simulations and not to be used if the others are used. */
LANDING_GEAR (3072, "Landing Gear"),
- /** tail hook */
- TAIL_HOOK (3104, "tail hook"),
- /** speed brake */
- SPEED_BRAKE (3136, "speed brake"),
+ /** Tail Hook */
+ TAIL_HOOK (3104, "Tail Hook"),
+ /** Speed Brake */
+ SPEED_BRAKE (3136, "Speed Brake"),
/** Left Door of Primary Weapon Bay */
LEFT_DOOR_OF_PRIMARY_WEAPON_BAY (3168, "Left Door of Primary Weapon Bay"),
/** Right Door of Primary Weapon Bay */
RIGHT_DOOR_OF_PRIMARY_WEAPON_BAY (3200, "Right Door of Primary Weapon Bay"),
- /** tank or APC hatch */
- TANK_OR_APC_HATCH (3232, "tank or APC hatch"),
- /** wingsweep */
- WINGSWEEP (3264, "wingsweep"),
- /** Bridge launcher */
- BRIDGE_LAUNCHER (3296, "Bridge launcher"),
- /** Bridge section 1 */
- BRIDGE_SECTION_1 (3328, "Bridge section 1"),
- /** Bridge section 2 */
- BRIDGE_SECTION_2 (3360, "Bridge section 2"),
- /** Bridge section 3 */
- BRIDGE_SECTION_3 (3392, "Bridge section 3"),
- /** Primary blade 1 */
- PRIMARY_BLADE_1 (3424, "Primary blade 1"),
- /** Primary blade 2 */
- PRIMARY_BLADE_2 (3456, "Primary blade 2"),
- /** Primary boom */
- PRIMARY_BOOM (3488, "Primary boom"),
- /** Primary launcher arm */
- PRIMARY_LAUNCHER_ARM (3520, "Primary launcher arm"),
- /** other fixed position parts defined as needed */
- OTHER_FIXED_POSITION_PARTS_DEFINED_AS_NEEDED (3552, "other fixed position parts defined as needed"),
+ /** Tank or APC Hatch */
+ TANK_OR_APC_HATCH (3232, "Tank or APC Hatch"),
+ /** Wingsweep */
+ WINGSWEEP (3264, "Wingsweep"),
+ /** Bridge Launcher */
+ BRIDGE_LAUNCHER (3296, "Bridge Launcher"),
+ /** Bridge Section 1 */
+ BRIDGE_SECTION_1 (3328, "Bridge Section 1"),
+ /** Bridge Section 2 */
+ BRIDGE_SECTION_2 (3360, "Bridge Section 2"),
+ /** Bridge Section 3 */
+ BRIDGE_SECTION_3 (3392, "Bridge Section 3"),
+ /** Primary Blade 1 */
+ PRIMARY_BLADE_1 (3424, "Primary Blade 1"),
+ /** Primary Blade 2 */
+ PRIMARY_BLADE_2 (3456, "Primary Blade 2"),
+ /** Primary Boom */
+ PRIMARY_BOOM (3488, "Primary Boom"),
+ /** Primary Launcher Arm */
+ PRIMARY_LAUNCHER_ARM (3520, "Primary Launcher Arm"),
+ /** Other Fixed Position Parts Defined as Needed */
+ OTHER_FIXED_POSITION_PARTS_DEFINED_AS_NEEDED (3552, "Other Fixed Position Parts Defined as Needed"),
/** Landing Gear - Nose */
LANDING_GEAR_NOSE (3584, "Landing Gear - Nose"),
/** Landing Gear - Left Main */
@@ -114,206 +144,208 @@ public enum ArticulatedPartsTypeClass
SPOT_SEARCH_LIGHT_3 (3808, "Spot/Search Light #3"),
/** Spot/Search Light #4 */
SPOT_SEARCH_LIGHT_4 (3840, "Spot/Search Light #4"),
- /** Primary turret number 1 */
- PRIMARY_TURRET_NUMBER_1 (4096, "Primary turret number 1"),
- /** Primary turret number 2 */
- PRIMARY_TURRET_NUMBER_2 (4128, "Primary turret number 2"),
- /** Primary turret number 3 */
- PRIMARY_TURRET_NUMBER_3 (4160, "Primary turret number 3"),
- /** Primary turret number 4 */
- PRIMARY_TURRET_NUMBER_4 (4192, "Primary turret number 4"),
- /** Primary turret number 5 */
- PRIMARY_TURRET_NUMBER_5 (4224, "Primary turret number 5"),
- /** Primary turret number 6 */
- PRIMARY_TURRET_NUMBER_6 (4256, "Primary turret number 6"),
- /** Primary turret number 7 */
- PRIMARY_TURRET_NUMBER_7 (4288, "Primary turret number 7"),
- /** Primary turret number 8 */
- PRIMARY_TURRET_NUMBER_8 (4320, "Primary turret number 8"),
- /** Primary turret number 9 */
- PRIMARY_TURRET_NUMBER_9 (4352, "Primary turret number 9"),
- /** Primary turret number 10 */
- PRIMARY_TURRET_NUMBER_10 (4384, "Primary turret number 10"),
- /** Primary gun number 1 */
- PRIMARY_GUN_NUMBER_1 (4416, "Primary gun number 1"),
- /** Primary gun number 2 */
- PRIMARY_GUN_NUMBER_2 (4448, "Primary gun number 2"),
- /** Primary gun number 3 */
- PRIMARY_GUN_NUMBER_3 (4480, "Primary gun number 3"),
- /** Primary gun number 4 */
- PRIMARY_GUN_NUMBER_4 (4512, "Primary gun number 4"),
- /** Primary gun number 5 */
- PRIMARY_GUN_NUMBER_5 (4544, "Primary gun number 5"),
- /** Primary gun number 6 */
- PRIMARY_GUN_NUMBER_6 (4576, "Primary gun number 6"),
- /** Primary gun number 7 */
- PRIMARY_GUN_NUMBER_7 (4608, "Primary gun number 7"),
- /** Primary gun number 8 */
- PRIMARY_GUN_NUMBER_8 (4640, "Primary gun number 8"),
- /** Primary gun number 9 */
- PRIMARY_GUN_NUMBER_9 (4672, "Primary gun number 9"),
- /** Primary gun number 10 */
- PRIMARY_GUN_NUMBER_10 (4704, "Primary gun number 10"),
- /** Primary launcher 1 */
- PRIMARY_LAUNCHER_1 (4736, "Primary launcher 1"),
- /** Primary launcher 2 */
- PRIMARY_LAUNCHER_2 (4768, "Primary launcher 2"),
- /** Primary launcher 3 */
- PRIMARY_LAUNCHER_3 (4800, "Primary launcher 3"),
- /** Primary launcher 4 */
- PRIMARY_LAUNCHER_4 (4832, "Primary launcher 4"),
- /** Primary launcher 5 */
- PRIMARY_LAUNCHER_5 (4864, "Primary launcher 5"),
- /** Primary launcher 6 */
- PRIMARY_LAUNCHER_6 (4896, "Primary launcher 6"),
- /** Primary launcher 7 */
- PRIMARY_LAUNCHER_7 (4928, "Primary launcher 7"),
- /** Primary launcher 8 */
- PRIMARY_LAUNCHER_8 (4960, "Primary launcher 8"),
- /** Primary launcher 9 */
- PRIMARY_LAUNCHER_9 (4992, "Primary launcher 9"),
- /** Primary launcher 10 */
- PRIMARY_LAUNCHER_10 (5024, "Primary launcher 10"),
- /** Primary defense systems 1, Point defense systems like Phalanx guns, or visible chaff, flare, or smoke dispensers. */
- PRIMARY_DEFENSE_SYSTEMS_1 (5056, "Primary defense systems 1"),
- /** Primary defense systems 2 */
- PRIMARY_DEFENSE_SYSTEMS_2 (5088, "Primary defense systems 2"),
- /** Primary defense systems 3 */
- PRIMARY_DEFENSE_SYSTEMS_3 (5120, "Primary defense systems 3"),
- /** Primary defense systems 4 */
- PRIMARY_DEFENSE_SYSTEMS_4 (5152, "Primary defense systems 4"),
- /** Primary defense systems 5 */
- PRIMARY_DEFENSE_SYSTEMS_5 (5184, "Primary defense systems 5"),
- /** Primary defense systems 6 */
- PRIMARY_DEFENSE_SYSTEMS_6 (5216, "Primary defense systems 6"),
- /** Primary defense systems 7 */
- PRIMARY_DEFENSE_SYSTEMS_7 (5248, "Primary defense systems 7"),
- /** Primary defense systems 8 */
- PRIMARY_DEFENSE_SYSTEMS_8 (5280, "Primary defense systems 8"),
- /** Primary defense systems 9 */
- PRIMARY_DEFENSE_SYSTEMS_9 (5312, "Primary defense systems 9"),
- /** Primary defense systems 10 */
- PRIMARY_DEFENSE_SYSTEMS_10 (5344, "Primary defense systems 10"),
- /** Primary radar 1, Any radar dish or movable antenna or sensor. */
- PRIMARY_RADAR_1 (5376, "Primary radar 1"),
- /** Primary radar 2 */
- PRIMARY_RADAR_2 (5408, "Primary radar 2"),
- /** Primary radar 3 */
- PRIMARY_RADAR_3 (5440, "Primary radar 3"),
- /** Primary radar 4 */
- PRIMARY_RADAR_4 (5472, "Primary radar 4"),
- /** Primary radar 5 */
- PRIMARY_RADAR_5 (5504, "Primary radar 5"),
- /** Primary radar 6 */
- PRIMARY_RADAR_6 (5536, "Primary radar 6"),
- /** Primary radar 7 */
- PRIMARY_RADAR_7 (5568, "Primary radar 7"),
- /** Primary radar 8 */
- PRIMARY_RADAR_8 (5600, "Primary radar 8"),
- /** Primary radar 9 */
- PRIMARY_RADAR_9 (5632, "Primary radar 9"),
- /** Primary radar 10 */
- PRIMARY_RADAR_10 (5664, "Primary radar 10"),
- /** Secondary turret number 1 */
- SECONDARY_TURRET_NUMBER_1 (5696, "Secondary turret number 1"),
- /** Secondary turret number 2 */
- SECONDARY_TURRET_NUMBER_2 (5728, "Secondary turret number 2"),
- /** Secondary turret number 3 */
- SECONDARY_TURRET_NUMBER_3 (5760, "Secondary turret number 3"),
- /** Secondary turret number 4 */
- SECONDARY_TURRET_NUMBER_4 (5792, "Secondary turret number 4"),
- /** Secondary turret number 5 */
- SECONDARY_TURRET_NUMBER_5 (5824, "Secondary turret number 5"),
- /** Secondary turret number 6 */
- SECONDARY_TURRET_NUMBER_6 (5856, "Secondary turret number 6"),
- /** Secondary turret number 7 */
- SECONDARY_TURRET_NUMBER_7 (5888, "Secondary turret number 7"),
- /** Secondary turret number 8 */
- SECONDARY_TURRET_NUMBER_8 (5920, "Secondary turret number 8"),
- /** Secondary turret number 9 */
- SECONDARY_TURRET_NUMBER_9 (5952, "Secondary turret number 9"),
- /** Secondary turret number 10 */
- SECONDARY_TURRET_NUMBER_10 (5984, "Secondary turret number 10"),
- /** Secondary gun number 1 */
- SECONDARY_GUN_NUMBER_1 (6016, "Secondary gun number 1"),
- /** Secondary gun number 2 */
- SECONDARY_GUN_NUMBER_2 (6048, "Secondary gun number 2"),
- /** Secondary gun number 3 */
- SECONDARY_GUN_NUMBER_3 (6080, "Secondary gun number 3"),
- /** Secondary gun number 4 */
- SECONDARY_GUN_NUMBER_4 (6112, "Secondary gun number 4"),
- /** Secondary gun number 5 */
- SECONDARY_GUN_NUMBER_5 (6144, "Secondary gun number 5"),
- /** Secondary gun number 6 */
- SECONDARY_GUN_NUMBER_6 (6176, "Secondary gun number 6"),
- /** Secondary gun number 7 */
- SECONDARY_GUN_NUMBER_7 (6208, "Secondary gun number 7"),
- /** Secondary gun number 8 */
- SECONDARY_GUN_NUMBER_8 (6240, "Secondary gun number 8"),
- /** Secondary gun number 9 */
- SECONDARY_GUN_NUMBER_9 (6272, "Secondary gun number 9"),
- /** Secondary gun number 10 */
- SECONDARY_GUN_NUMBER_10 (6304, "Secondary gun number 10"),
- /** Secondary launcher 1 */
- SECONDARY_LAUNCHER_1 (6336, "Secondary launcher 1"),
- /** Secondary launcher 2 */
- SECONDARY_LAUNCHER_2 (6368, "Secondary launcher 2"),
- /** Secondary launcher 3 */
- SECONDARY_LAUNCHER_3 (6400, "Secondary launcher 3"),
- /** Secondary launcher 4 */
- SECONDARY_LAUNCHER_4 (6432, "Secondary launcher 4"),
- /** Secondary launcher 5 */
- SECONDARY_LAUNCHER_5 (6464, "Secondary launcher 5"),
- /** Secondary launcher 6 */
- SECONDARY_LAUNCHER_6 (6496, "Secondary launcher 6"),
- /** Secondary launcher 7 */
- SECONDARY_LAUNCHER_7 (6528, "Secondary launcher 7"),
- /** Secondary launcher 8 */
- SECONDARY_LAUNCHER_8 (6560, "Secondary launcher 8"),
- /** Secondary launcher 9 */
- SECONDARY_LAUNCHER_9 (6592, "Secondary launcher 9"),
- /** Secondary launcher 10 */
- SECONDARY_LAUNCHER_10 (6624, "Secondary launcher 10"),
- /** Secondary defense systems 1 */
- SECONDARY_DEFENSE_SYSTEMS_1 (6656, "Secondary defense systems 1"),
- /** Secondary defense systems 2 */
- SECONDARY_DEFENSE_SYSTEMS_2 (6688, "Secondary defense systems 2"),
- /** Secondary defense systems 3 */
- SECONDARY_DEFENSE_SYSTEMS_3 (6720, "Secondary defense systems 3"),
- /** Secondary defense systems 4 */
- SECONDARY_DEFENSE_SYSTEMS_4 (6752, "Secondary defense systems 4"),
- /** Secondary defense systems 5 */
- SECONDARY_DEFENSE_SYSTEMS_5 (6784, "Secondary defense systems 5"),
- /** Secondary defense systems 6 */
- SECONDARY_DEFENSE_SYSTEMS_6 (6816, "Secondary defense systems 6"),
- /** Secondary defense systems 7 */
- SECONDARY_DEFENSE_SYSTEMS_7 (6848, "Secondary defense systems 7"),
- /** Secondary defense systems 8 */
- SECONDARY_DEFENSE_SYSTEMS_8 (6880, "Secondary defense systems 8"),
- /** Secondary defense systems 9 */
- SECONDARY_DEFENSE_SYSTEMS_9 (6912, "Secondary defense systems 9"),
- /** Secondary defense systems 10 */
- SECONDARY_DEFENSE_SYSTEMS_10 (6944, "Secondary defense systems 10"),
- /** Secondary radar 1 */
- SECONDARY_RADAR_1 (6976, "Secondary radar 1"),
- /** Secondary radar 2 */
- SECONDARY_RADAR_2 (7008, "Secondary radar 2"),
- /** Secondary radar 3 */
- SECONDARY_RADAR_3 (7040, "Secondary radar 3"),
- /** Secondary radar 4 */
- SECONDARY_RADAR_4 (7072, "Secondary radar 4"),
- /** Secondary radar 5 */
- SECONDARY_RADAR_5 (7104, "Secondary radar 5"),
- /** Secondary radar 6 */
- SECONDARY_RADAR_6 (7136, "Secondary radar 6"),
- /** Secondary radar 7 */
- SECONDARY_RADAR_7 (7168, "Secondary radar 7"),
- /** Secondary radar 8 */
- SECONDARY_RADAR_8 (7200, "Secondary radar 8"),
- /** Secondary radar 9 */
- SECONDARY_RADAR_9 (7232, "Secondary radar 9"),
- /** Secondary radar 10 */
- SECONDARY_RADAR_10 (7264, "Secondary radar 10"),
+ /** Landing Light */
+ LANDING_LIGHT (3872, "Landing Light"),
+ /** Primary Turret Number 1 */
+ PRIMARY_TURRET_NUMBER_1 (4096, "Primary Turret Number 1"),
+ /** Primary Turret Number 2 */
+ PRIMARY_TURRET_NUMBER_2 (4128, "Primary Turret Number 2"),
+ /** Primary Turret Number 3 */
+ PRIMARY_TURRET_NUMBER_3 (4160, "Primary Turret Number 3"),
+ /** Primary Turret Number 4 */
+ PRIMARY_TURRET_NUMBER_4 (4192, "Primary Turret Number 4"),
+ /** Primary Turret Number 5 */
+ PRIMARY_TURRET_NUMBER_5 (4224, "Primary Turret Number 5"),
+ /** Primary Turret Number 6 */
+ PRIMARY_TURRET_NUMBER_6 (4256, "Primary Turret Number 6"),
+ /** Primary Turret Number 7 */
+ PRIMARY_TURRET_NUMBER_7 (4288, "Primary Turret Number 7"),
+ /** Primary Turret Number 8 */
+ PRIMARY_TURRET_NUMBER_8 (4320, "Primary Turret Number 8"),
+ /** Primary Turret Number 9 */
+ PRIMARY_TURRET_NUMBER_9 (4352, "Primary Turret Number 9"),
+ /** Primary Turret Number 10 */
+ PRIMARY_TURRET_NUMBER_10 (4384, "Primary Turret Number 10"),
+ /** Primary Gun Number 1 */
+ PRIMARY_GUN_NUMBER_1 (4416, "Primary Gun Number 1"),
+ /** Primary Gun Number 2 */
+ PRIMARY_GUN_NUMBER_2 (4448, "Primary Gun Number 2"),
+ /** Primary Gun Number 3 */
+ PRIMARY_GUN_NUMBER_3 (4480, "Primary Gun Number 3"),
+ /** Primary Gun Number 4 */
+ PRIMARY_GUN_NUMBER_4 (4512, "Primary Gun Number 4"),
+ /** Primary Gun Number 5 */
+ PRIMARY_GUN_NUMBER_5 (4544, "Primary Gun Number 5"),
+ /** Primary Gun Number 6 */
+ PRIMARY_GUN_NUMBER_6 (4576, "Primary Gun Number 6"),
+ /** Primary Gun Number 7 */
+ PRIMARY_GUN_NUMBER_7 (4608, "Primary Gun Number 7"),
+ /** Primary Gun Number 8 */
+ PRIMARY_GUN_NUMBER_8 (4640, "Primary Gun Number 8"),
+ /** Primary Gun Number 9 */
+ PRIMARY_GUN_NUMBER_9 (4672, "Primary Gun Number 9"),
+ /** Primary Gun Number 10 */
+ PRIMARY_GUN_NUMBER_10 (4704, "Primary Gun Number 10"),
+ /** Primary Launcher 1 */
+ PRIMARY_LAUNCHER_1 (4736, "Primary Launcher 1"),
+ /** Primary Launcher 2 */
+ PRIMARY_LAUNCHER_2 (4768, "Primary Launcher 2"),
+ /** Primary Launcher 3 */
+ PRIMARY_LAUNCHER_3 (4800, "Primary Launcher 3"),
+ /** Primary Launcher 4 */
+ PRIMARY_LAUNCHER_4 (4832, "Primary Launcher 4"),
+ /** Primary Launcher 5 */
+ PRIMARY_LAUNCHER_5 (4864, "Primary Launcher 5"),
+ /** Primary Launcher 6 */
+ PRIMARY_LAUNCHER_6 (4896, "Primary Launcher 6"),
+ /** Primary Launcher 7 */
+ PRIMARY_LAUNCHER_7 (4928, "Primary Launcher 7"),
+ /** Primary Launcher 8 */
+ PRIMARY_LAUNCHER_8 (4960, "Primary Launcher 8"),
+ /** Primary Launcher 9 */
+ PRIMARY_LAUNCHER_9 (4992, "Primary Launcher 9"),
+ /** Primary Launcher 10 */
+ PRIMARY_LAUNCHER_10 (5024, "Primary Launcher 10"),
+ /** Primary Defense Systems 1, Point defense systems like Phalanx guns, or visible chaff, flare, or smoke dispensers. */
+ PRIMARY_DEFENSE_SYSTEMS_1 (5056, "Primary Defense Systems 1"),
+ /** Primary Defense Systems 2 */
+ PRIMARY_DEFENSE_SYSTEMS_2 (5088, "Primary Defense Systems 2"),
+ /** Primary Defense Systems 3 */
+ PRIMARY_DEFENSE_SYSTEMS_3 (5120, "Primary Defense Systems 3"),
+ /** Primary Defense Systems 4 */
+ PRIMARY_DEFENSE_SYSTEMS_4 (5152, "Primary Defense Systems 4"),
+ /** Primary Defense Systems 5 */
+ PRIMARY_DEFENSE_SYSTEMS_5 (5184, "Primary Defense Systems 5"),
+ /** Primary Defense Systems 6 */
+ PRIMARY_DEFENSE_SYSTEMS_6 (5216, "Primary Defense Systems 6"),
+ /** Primary Defense Systems 7 */
+ PRIMARY_DEFENSE_SYSTEMS_7 (5248, "Primary Defense Systems 7"),
+ /** Primary Defense Systems 8 */
+ PRIMARY_DEFENSE_SYSTEMS_8 (5280, "Primary Defense Systems 8"),
+ /** Primary Defense Systems 9 */
+ PRIMARY_DEFENSE_SYSTEMS_9 (5312, "Primary Defense Systems 9"),
+ /** Primary Defense Systems 10 */
+ PRIMARY_DEFENSE_SYSTEMS_10 (5344, "Primary Defense Systems 10"),
+ /** Primary Radar 1, Any radar dish or movable antenna or sensor. */
+ PRIMARY_RADAR_1 (5376, "Primary Radar 1"),
+ /** Primary Radar 2 */
+ PRIMARY_RADAR_2 (5408, "Primary Radar 2"),
+ /** Primary Radar 3 */
+ PRIMARY_RADAR_3 (5440, "Primary Radar 3"),
+ /** Primary Radar 4 */
+ PRIMARY_RADAR_4 (5472, "Primary Radar 4"),
+ /** Primary Radar 5 */
+ PRIMARY_RADAR_5 (5504, "Primary Radar 5"),
+ /** Primary Radar 6 */
+ PRIMARY_RADAR_6 (5536, "Primary Radar 6"),
+ /** Primary Radar 7 */
+ PRIMARY_RADAR_7 (5568, "Primary Radar 7"),
+ /** Primary Radar 8 */
+ PRIMARY_RADAR_8 (5600, "Primary Radar 8"),
+ /** Primary Radar 9 */
+ PRIMARY_RADAR_9 (5632, "Primary Radar 9"),
+ /** Primary Radar 10 */
+ PRIMARY_RADAR_10 (5664, "Primary Radar 10"),
+ /** Secondary Turret Number 1 */
+ SECONDARY_TURRET_NUMBER_1 (5696, "Secondary Turret Number 1"),
+ /** Secondary Turret Number 2 */
+ SECONDARY_TURRET_NUMBER_2 (5728, "Secondary Turret Number 2"),
+ /** Secondary Turret Number 3 */
+ SECONDARY_TURRET_NUMBER_3 (5760, "Secondary Turret Number 3"),
+ /** Secondary Turret Number 4 */
+ SECONDARY_TURRET_NUMBER_4 (5792, "Secondary Turret Number 4"),
+ /** Secondary Turret Number 5 */
+ SECONDARY_TURRET_NUMBER_5 (5824, "Secondary Turret Number 5"),
+ /** Secondary Turret Number 6 */
+ SECONDARY_TURRET_NUMBER_6 (5856, "Secondary Turret Number 6"),
+ /** Secondary Turret Number 7 */
+ SECONDARY_TURRET_NUMBER_7 (5888, "Secondary Turret Number 7"),
+ /** Secondary Turret Number 8 */
+ SECONDARY_TURRET_NUMBER_8 (5920, "Secondary Turret Number 8"),
+ /** Secondary Turret Number 9 */
+ SECONDARY_TURRET_NUMBER_9 (5952, "Secondary Turret Number 9"),
+ /** Secondary Turret Number 10 */
+ SECONDARY_TURRET_NUMBER_10 (5984, "Secondary Turret Number 10"),
+ /** Secondary Gun Number 1 */
+ SECONDARY_GUN_NUMBER_1 (6016, "Secondary Gun Number 1"),
+ /** Secondary Gun Number 2 */
+ SECONDARY_GUN_NUMBER_2 (6048, "Secondary Gun Number 2"),
+ /** Secondary Gun Number 3 */
+ SECONDARY_GUN_NUMBER_3 (6080, "Secondary Gun Number 3"),
+ /** Secondary Gun Number 4 */
+ SECONDARY_GUN_NUMBER_4 (6112, "Secondary Gun Number 4"),
+ /** Secondary Gun Number 5 */
+ SECONDARY_GUN_NUMBER_5 (6144, "Secondary Gun Number 5"),
+ /** Secondary Gun Number 6 */
+ SECONDARY_GUN_NUMBER_6 (6176, "Secondary Gun Number 6"),
+ /** Secondary Gun Number 7 */
+ SECONDARY_GUN_NUMBER_7 (6208, "Secondary Gun Number 7"),
+ /** Secondary Gun Number 8 */
+ SECONDARY_GUN_NUMBER_8 (6240, "Secondary Gun Number 8"),
+ /** Secondary Gun Number 9 */
+ SECONDARY_GUN_NUMBER_9 (6272, "Secondary Gun Number 9"),
+ /** Secondary Gun Number 10 */
+ SECONDARY_GUN_NUMBER_10 (6304, "Secondary Gun Number 10"),
+ /** Secondary Launcher 1 */
+ SECONDARY_LAUNCHER_1 (6336, "Secondary Launcher 1"),
+ /** Secondary Launcher 2 */
+ SECONDARY_LAUNCHER_2 (6368, "Secondary Launcher 2"),
+ /** Secondary Launcher 3 */
+ SECONDARY_LAUNCHER_3 (6400, "Secondary Launcher 3"),
+ /** Secondary Launcher 4 */
+ SECONDARY_LAUNCHER_4 (6432, "Secondary Launcher 4"),
+ /** Secondary Launcher 5 */
+ SECONDARY_LAUNCHER_5 (6464, "Secondary Launcher 5"),
+ /** Secondary Launcher 6 */
+ SECONDARY_LAUNCHER_6 (6496, "Secondary Launcher 6"),
+ /** Secondary Launcher 7 */
+ SECONDARY_LAUNCHER_7 (6528, "Secondary Launcher 7"),
+ /** Secondary Launcher 8 */
+ SECONDARY_LAUNCHER_8 (6560, "Secondary Launcher 8"),
+ /** Secondary Launcher 9 */
+ SECONDARY_LAUNCHER_9 (6592, "Secondary Launcher 9"),
+ /** Secondary Launcher 10 */
+ SECONDARY_LAUNCHER_10 (6624, "Secondary Launcher 10"),
+ /** Secondary Defense Systems 1 */
+ SECONDARY_DEFENSE_SYSTEMS_1 (6656, "Secondary Defense Systems 1"),
+ /** Secondary Defense Systems 2 */
+ SECONDARY_DEFENSE_SYSTEMS_2 (6688, "Secondary Defense Systems 2"),
+ /** Secondary Defense Systems 3 */
+ SECONDARY_DEFENSE_SYSTEMS_3 (6720, "Secondary Defense Systems 3"),
+ /** Secondary Defense Systems 4 */
+ SECONDARY_DEFENSE_SYSTEMS_4 (6752, "Secondary Defense Systems 4"),
+ /** Secondary Defense Systems 5 */
+ SECONDARY_DEFENSE_SYSTEMS_5 (6784, "Secondary Defense Systems 5"),
+ /** Secondary Defense Systems 6 */
+ SECONDARY_DEFENSE_SYSTEMS_6 (6816, "Secondary Defense Systems 6"),
+ /** Secondary Defense Systems 7 */
+ SECONDARY_DEFENSE_SYSTEMS_7 (6848, "Secondary Defense Systems 7"),
+ /** Secondary Defense Systems 8 */
+ SECONDARY_DEFENSE_SYSTEMS_8 (6880, "Secondary Defense Systems 8"),
+ /** Secondary Defense Systems 9 */
+ SECONDARY_DEFENSE_SYSTEMS_9 (6912, "Secondary Defense Systems 9"),
+ /** Secondary Defense Systems 10 */
+ SECONDARY_DEFENSE_SYSTEMS_10 (6944, "Secondary Defense Systems 10"),
+ /** Secondary Radar 1 */
+ SECONDARY_RADAR_1 (6976, "Secondary Radar 1"),
+ /** Secondary Radar 2 */
+ SECONDARY_RADAR_2 (7008, "Secondary Radar 2"),
+ /** Secondary Radar 3 */
+ SECONDARY_RADAR_3 (7040, "Secondary Radar 3"),
+ /** Secondary Radar 4 */
+ SECONDARY_RADAR_4 (7072, "Secondary Radar 4"),
+ /** Secondary Radar 5 */
+ SECONDARY_RADAR_5 (7104, "Secondary Radar 5"),
+ /** Secondary Radar 6 */
+ SECONDARY_RADAR_6 (7136, "Secondary Radar 6"),
+ /** Secondary Radar 7 */
+ SECONDARY_RADAR_7 (7168, "Secondary Radar 7"),
+ /** Secondary Radar 8 */
+ SECONDARY_RADAR_8 (7200, "Secondary Radar 8"),
+ /** Secondary Radar 9 */
+ SECONDARY_RADAR_9 (7232, "Secondary Radar 9"),
+ /** Secondary Radar 10 */
+ SECONDARY_RADAR_10 (7264, "Secondary Radar 10"),
/** Deck Elevator #1 */
DECK_ELEVATOR_1 (7296, "Deck Elevator #1"),
/** Deck Elevator #2 */
@@ -332,10 +364,10 @@ public enum ArticulatedPartsTypeClass
ARRESTOR_WIRES_2 (7520, "Arrestor Wires #2"),
/** Arrestor Wires #3 */
ARRESTOR_WIRES_3 (7552, "Arrestor Wires #3"),
- /** Wing (or rotor) fold */
- WING_OR_ROTOR_FOLD (7584, "Wing (or rotor) fold"),
- /** Fuselage fold */
- FUSELAGE_FOLD (7616, "Fuselage fold"),
+ /** Wing (or Rotor) Fold */
+ WING_OR_ROTOR_FOLD (7584, "Wing (or Rotor) Fold"),
+ /** Fuselage Fold */
+ FUSELAGE_FOLD (7616, "Fuselage Fold"),
/** Main Cargo Door */
MAIN_CARGO_DOOR (7648, "Main Cargo Door"),
/** Cargo Ramp */
@@ -429,45 +461,49 @@ public enum ArticulatedPartsTypeClass
/** Right Engine Nacelle */
RIGHT_ENGINE_NACELLE (9088, "Right Engine Nacelle"),
/** 1st Left Wheel, May be a sprocket, idler, or road wheel */
- $1ST_LEFT_WHEEL (9120, "1st Left Wheel"),
+ NAME_1ST_LEFT_WHEEL (9120, "1st Left Wheel"),
/** 1st Right Wheel */
- $1ST_RIGHT_WHEEL (9152, "1st Right Wheel"),
+ NAME_1ST_RIGHT_WHEEL (9152, "1st Right Wheel"),
/** 2nd Left Wheel */
- $2ND_LEFT_WHEEL (9184, "2nd Left Wheel"),
+ NAME_2ND_LEFT_WHEEL (9184, "2nd Left Wheel"),
/** 2nd Right Wheel */
- $2ND_RIGHT_WHEEL (9216, "2nd Right Wheel"),
+ NAME_2ND_RIGHT_WHEEL (9216, "2nd Right Wheel"),
/** 3rd Left Wheel */
- $3RD_LEFT_WHEEL (9248, "3rd Left Wheel"),
+ NAME_3RD_LEFT_WHEEL (9248, "3rd Left Wheel"),
/** 3rd Right Wheel */
- $3RD_RIGHT_WHEEL (9280, "3rd Right Wheel"),
+ NAME_3RD_RIGHT_WHEEL (9280, "3rd Right Wheel"),
/** 4th Left Wheel */
- $4TH_LEFT_WHEEL (9312, "4th Left Wheel"),
+ NAME_4TH_LEFT_WHEEL (9312, "4th Left Wheel"),
/** 4th Right Wheel */
- $4TH_RIGHT_WHEEL (9344, "4th Right Wheel"),
+ NAME_4TH_RIGHT_WHEEL (9344, "4th Right Wheel"),
/** 5th Left Wheel */
- $5TH_LEFT_WHEEL (9376, "5th Left Wheel"),
+ NAME_5TH_LEFT_WHEEL (9376, "5th Left Wheel"),
/** 5th Right Wheel */
- $5TH_RIGHT_WHEEL (9408, "5th Right Wheel"),
+ NAME_5TH_RIGHT_WHEEL (9408, "5th Right Wheel"),
/** 6th Left Wheel */
- $6TH_LEFT_WHEEL (9440, "6th Left Wheel"),
+ NAME_6TH_LEFT_WHEEL (9440, "6th Left Wheel"),
/** 6th Right Wheel */
- $6TH_RIGHT_WHEEL (9472, "6th Right Wheel"),
+ NAME_6TH_RIGHT_WHEEL (9472, "6th Right Wheel"),
/** 7th Left Wheel */
- $7TH_LEFT_WHEEL (9504, "7th Left Wheel"),
+ NAME_7TH_LEFT_WHEEL (9504, "7th Left Wheel"),
/** 7th Right Wheel */
- $7TH_RIGHT_WHEEL (9536, "7th Right Wheel"),
+ NAME_7TH_RIGHT_WHEEL (9536, "7th Right Wheel"),
/** 8th Left Wheel */
- $8TH_LEFT_WHEEL (9568, "8th Left Wheel"),
+ NAME_8TH_LEFT_WHEEL (9568, "8th Left Wheel"),
/** 8th Right Wheel */
- $8TH_RIGHT_WHEEL (9600, "8th Right Wheel"),
+ NAME_8TH_RIGHT_WHEEL (9600, "8th Right Wheel"),
/** 9th Left Wheel */
- $9TH_LEFT_WHEEL (9632, "9th Left Wheel"),
+ NAME_9TH_LEFT_WHEEL (9632, "9th Left Wheel"),
/** 9th Right Wheel */
- $9TH_RIGHT_WHEEL (9664, "9th Right Wheel"),
+ NAME_9TH_RIGHT_WHEEL (9664, "9th Right Wheel"),
/** 10th Left Wheel */
- $10TH_LEFT_WHEEL (9696, "10th Left Wheel"),
+ NAME_10TH_LEFT_WHEEL (9696, "10th Left Wheel"),
/** 10th Right Wheel */
- $10TH_RIGHT_WHEEL (9728, "10th Right Wheel");
+ NAME_10TH_RIGHT_WHEEL (9728, "10th Right Wheel"),
+ /** Refueling Probe */
+ REFUELING_PROBE (9760, "Refueling Probe"),
+ /** Steering Wheel */
+ STEERING_WHEEL (9792, "Steering Wheel");
private int value;
private final String description;
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ArticulatedPartsTypeMetric.java b/src-generated/edu/nps/moves/dis7/enumerations/ArticulatedPartsTypeMetric.java
index 37573a26725c0134a0bc77b341ba07660724d4cf..ba245d68cc8f9df4820fdc0559b68d98e1bb8bf6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ArticulatedPartsTypeMetric.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ArticulatedPartsTypeMetric.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 58 marshal size 5<br>
- * Articulated Parts-Type Metric
+ * ArticulatedPartsTypeMetric
*/
public enum ArticulatedPartsTypeMetric
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AttachedPartDetachedIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/AttachedPartDetachedIndicator.java
index 17cbc4fe8d668fc76d3eddc8a7751929ef4b4006..8f737453d1c1ec3da30c715cc9f16bd9d56106f0 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AttachedPartDetachedIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AttachedPartDetachedIndicator.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 415 marshal size 8<br>
- * Attached Part-Detached Indicator
+ * AttachedPartDetachedIndicator
*/
public enum AttachedPartDetachedIndicator
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AttachedParts.java b/src-generated/edu/nps/moves/dis7/enumerations/AttachedParts.java
index dca5e21a7eb2eb1fb52211a0db4a0ad9478f8b8c..f11c1b6a5209984f298dbee17e9f9150a9ff92bb 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AttachedParts.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AttachedParts.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 57 marshal size 32<br>
- * Attached Parts
+ * AttachedParts
*/
public enum AttachedParts
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AustralianCategoryOverlay.java b/src-generated/edu/nps/moves/dis7/enumerations/AustralianCategoryOverlay.java
index dd1d3d977ab698b974bc0adcfb82bc278398dc33..c77f76a9f070e69bd1d7c33ffdaf5edda6a38d54 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AustralianCategoryOverlay.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AustralianCategoryOverlay.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 500 marshal size 8<br>
- * Australian Category Overlay
+ * AustralianCategoryOverlay
*/
public enum AustralianCategoryOverlay
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/BeamStatusBeamState.java b/src-generated/edu/nps/moves/dis7/enumerations/BeamStatusBeamState.java
index 9353d5a479b6b521f233cd07d933bdd3ae78ed51..b5083bf28e02f57b52be12dc443e60a1115b7222 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/BeamStatusBeamState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/BeamStatusBeamState.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 318 marshal size 1<br>
- * Beam Status-Beam State
+ * BeamStatusBeamState
*/
public enum BeamStatusBeamState
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/BuildingPaintScheme.java b/src-generated/edu/nps/moves/dis7/enumerations/BuildingPaintScheme.java
index 96b24dbcfad324ade5a13f902752a14b0541397e..b38881f98acb3aba7b21829785b9876b94c9f49a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/BuildingPaintScheme.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/BuildingPaintScheme.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 464 marshal size 8<br>
- * Building Paint Scheme
+ * BuildingPaintScheme
*/
public enum BuildingPaintScheme
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/CCTTSINCGARSClearChannel.java b/src-generated/edu/nps/moves/dis7/enumerations/CCTTSINCGARSClearChannel.java
index ab5e76e4ba48e36cb3088a757b3b2d9601b28229..e7b4a61344fdf53f7f2d756a5cf5dc06edd71af6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/CCTTSINCGARSClearChannel.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/CCTTSINCGARSClearChannel.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 171 marshal size 8<br>
- * CCTT SINCGARS-Clear Channel
+ * CCTTSINCGARSClearChannel
*/
public enum CCTTSINCGARSClearChannel
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/CCTTSINCGARSStartofMessage.java b/src-generated/edu/nps/moves/dis7/enumerations/CCTTSINCGARSStartofMessage.java
index 22fc434641fb8a5920ea1aa4f90d41637cf2f82c..c60a7664ea011b1748cec766601c4125c7020532 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/CCTTSINCGARSStartofMessage.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/CCTTSINCGARSStartofMessage.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 170 marshal size 8<br>
- * CCTT SINCGARS-Start of Message
+ * CCTTSINCGARSStartofMessage
*/
public enum CCTTSINCGARSStartofMessage
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/CIGIExtensionPacketID.java b/src-generated/edu/nps/moves/dis7/enumerations/CIGIExtensionPacketID.java
index 846384b39b87cf1b5a723a7c9f99a664d4e0eb95..7658dc53677c5e944c9f0a80a40648351d56169e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/CIGIExtensionPacketID.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/CIGIExtensionPacketID.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 780 marshal size 16<br>
- * CIGI Extension Packet ID<br>
+ * CIGIExtensionPacketID<br>
* Registered extension packet IDs shall be in the range of 1000h - 7FFFh. If the extension capability includes both a request and response packet, it is recommended they be given sequential packet ID numbers. Submitters are welcome to request any ID within this range, but are encouraged to cluster packet IDs for similar capabilities if the next available sequential ID from the beginning of the range is not requested.
*/
public enum CIGIExtensionPacketID
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/CapabilityReport.java b/src-generated/edu/nps/moves/dis7/enumerations/CapabilityReport.java
index e4ba79051cee7b0f48cb85a4f24c20b1557f6508..1631d1a26aaa57959a1e07aa3831a0b37fe42fa7 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/CapabilityReport.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/CapabilityReport.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 358 marshal size 8<br>
- * Capability Report
+ * CapabilityReport
*/
public enum CapabilityReport
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class10SupplyCategoryMaterialtoSupportNonMilitaryPrograms.java b/src-generated/edu/nps/moves/dis7/enumerations/Class10SupplyCategoryMaterialtoSupportNonMilitaryPrograms.java
index 6943bb1733beb668716ecf9c1c5f4e9bb191a681..4ea26b5e09ac5b3fba198577d6ead69cdfb21382 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class10SupplyCategoryMaterialtoSupportNonMilitaryPrograms.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class10SupplyCategoryMaterialtoSupportNonMilitaryPrograms.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 610 marshal size 8<br>
- * Class 10 Supply Category - Material to Support Non-Military Programs
+ * Class10SupplyCategoryMaterialtoSupportNonMilitaryPrograms
*/
public enum Class10SupplyCategoryMaterialtoSupportNonMilitaryPrograms implements Category
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class11SupplyCategorySuppliesNonDoctrinal.java b/src-generated/edu/nps/moves/dis7/enumerations/Class11SupplyCategorySuppliesNonDoctrinal.java
index c728d9453c17b735b3a4361586c36ea5a63704b2..d677cb284f0f7557364138bf659dd4fa638cec60 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class11SupplyCategorySuppliesNonDoctrinal.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class11SupplyCategorySuppliesNonDoctrinal.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 611 marshal size 8<br>
- * Class 11 Supply Category - Supplies (Non Doctrinal)
+ * Class11SupplyCategorySupplies(NonDoctrinal)
*/
public enum Class11SupplyCategorySuppliesNonDoctrinal implements Category
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class12SupplyCategorySlingLoadsNonDoctrinal.java b/src-generated/edu/nps/moves/dis7/enumerations/Class12SupplyCategorySlingLoadsNonDoctrinal.java
index b7acdd99f22087b46e2afbcf6efef04f8b46f0dc..bf1feb8214608ecad4985a6662e0f67f8c0b1596 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class12SupplyCategorySlingLoadsNonDoctrinal.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class12SupplyCategorySlingLoadsNonDoctrinal.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 612 marshal size 8<br>
- * Class 12 Supply Category - Sling Loads (Non Doctrinal)
+ * Class12SupplyCategorySlingLoads(NonDoctrinal)
*/
public enum Class12SupplyCategorySlingLoadsNonDoctrinal implements Category
{
@@ -35,7 +35,9 @@ public enum Class12SupplyCategorySlingLoadsNonDoctrinal implements Category
/** Sling Load, Helicopters */
SLING_LOAD_HELICOPTERS (10, "Sling Load, Helicopters"),
/** Sling Load, Hoist */
- SLING_LOAD_HOIST (11, "Sling Load, Hoist");
+ SLING_LOAD_HOIST (11, "Sling Load, Hoist"),
+ /** Sling Load, Concrete Block */
+ SLING_LOAD_CONCRETE_BLOCK (12, "Sling Load, Concrete Block");
private int value;
private final String description;
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class1SupplyCategorySubsistence.java b/src-generated/edu/nps/moves/dis7/enumerations/Class1SupplyCategorySubsistence.java
index e8913a1fb6bb704bc6f88285c3c8d3f72dce0205..b5f55d16f8d72999376264a571046670dff62c88 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class1SupplyCategorySubsistence.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class1SupplyCategorySubsistence.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 601 marshal size 8<br>
- * Class 1 Supply Category - Subsistence
+ * Class1SupplyCategorySubsistence
*/
public enum Class1SupplyCategorySubsistence implements Category
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class2SupplyCategoryClothingIndividualEquipmentToolsAdminSupplies.java b/src-generated/edu/nps/moves/dis7/enumerations/Class2SupplyCategoryClothingIndividualEquipmentToolsAdminSupplies.java
index 2db6abfd49bcefdbc2df18b3bb1a6fee3ae133d4..d572af87b1ef7a453e4bb5f6bcc6303dbfafbabc 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class2SupplyCategoryClothingIndividualEquipmentToolsAdminSupplies.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class2SupplyCategoryClothingIndividualEquipmentToolsAdminSupplies.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 602 marshal size 8<br>
- * Class 2 Supply Category - Clothing, Individual Equipment, Tools, Admin. Supplies
+ * Class2SupplyCategoryClothing,IndividualEquipment,Tools,Admin.Supplies
*/
public enum Class2SupplyCategoryClothingIndividualEquipmentToolsAdminSupplies implements Category
{
@@ -26,8 +26,8 @@ public enum Class2SupplyCategoryClothingIndividualEquipmentToolsAdminSupplies im
F_CLOTHING (5, "F - Clothing"),
/** G - Electronics */
G_ELECTRONICS (6, "G - Electronics"),
- /** M - Weapons (Humans) */
- M_WEAPONS_HUMANS (7, "M - Weapons (Humans)"),
+ /** M - Weapons (Humans) */
+ M_WEAPONS_HUMANS (7, "M - Weapons (Humans)"),
/** T - Industrial Supplies */
T_INDUSTRIAL_SUPPLIES (8, "T - Industrial Supplies");
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class3SupplyCategoryPetroleumOilsLubricants.java b/src-generated/edu/nps/moves/dis7/enumerations/Class3SupplyCategoryPetroleumOilsLubricants.java
index 1f377900c1ff6ac6701ca4d4d5a3ddb720581cb5..22e67fd2b4348ad3e36dbd07a8071e1d69ba3299 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class3SupplyCategoryPetroleumOilsLubricants.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class3SupplyCategoryPetroleumOilsLubricants.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 603 marshal size 8<br>
- * Class 3 Supply Category - Petroleum, Oils, Lubricants
+ * Class3SupplyCategoryPetroleum,Oils,Lubricants
*/
public enum Class3SupplyCategoryPetroleumOilsLubricants implements Category
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class4SupplyCategoryConstructionMaterials.java b/src-generated/edu/nps/moves/dis7/enumerations/Class4SupplyCategoryConstructionMaterials.java
index 403252788053b14e82361e4427ae72a41d0d0b30..d2b5bcaeaaa09e81de61673a09561986ad91c801 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class4SupplyCategoryConstructionMaterials.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class4SupplyCategoryConstructionMaterials.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 604 marshal size 8<br>
- * Class 4 Supply Category - Construction Materials
+ * Class4SupplyCategoryConstructionMaterials
*/
public enum Class4SupplyCategoryConstructionMaterials implements Category
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class6SupplyCategoryPersonnelDemandItems.java b/src-generated/edu/nps/moves/dis7/enumerations/Class6SupplyCategoryPersonnelDemandItems.java
index 8dcc6166a534aac4191b3f6e0a7b22a79e0182cd..cf615642a6aa01d229057e90a4ad7cdcf9581e4e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class6SupplyCategoryPersonnelDemandItems.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class6SupplyCategoryPersonnelDemandItems.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 606 marshal size 8<br>
- * Class 6 Supply Category - Personnel Demand Items
+ * Class6SupplyCategoryPersonnelDemandItems
*/
public enum Class6SupplyCategoryPersonnelDemandItems implements Category
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class7SupplyCategoryMajorItems.java b/src-generated/edu/nps/moves/dis7/enumerations/Class7SupplyCategoryMajorItems.java
index bd62ee2b8ff3b447181b26a6d77b30dd2c931787..4ae69ef061a8bca5cb9abb46d6463e75851dee32 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class7SupplyCategoryMajorItems.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class7SupplyCategoryMajorItems.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 607 marshal size 8<br>
- * Class 7 Supply Category - Major Items
+ * Class7SupplyCategoryMajorItems
*/
public enum Class7SupplyCategoryMajorItems implements Category
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class8SupplyCategoryMedicalMaterial.java b/src-generated/edu/nps/moves/dis7/enumerations/Class8SupplyCategoryMedicalMaterial.java
index 42a6374efde82e2ad217736a0b9f8c42006c24f9..3fd7694af26267570f4c271d8a14492657dc630e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class8SupplyCategoryMedicalMaterial.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class8SupplyCategoryMedicalMaterial.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 608 marshal size 8<br>
- * Class 8 Supply Category - Medical Material
+ * Class8SupplyCategoryMedicalMaterial
*/
public enum Class8SupplyCategoryMedicalMaterial implements Category
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class9SupplyCategoryRepairPartsandComponents.java b/src-generated/edu/nps/moves/dis7/enumerations/Class9SupplyCategoryRepairPartsandComponents.java
index 7091586a6ec262a22966cbdef093f37a07a01ac5..670146f5dbf0ea984acf1d81c895d59bae4fb173 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class9SupplyCategoryRepairPartsandComponents.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class9SupplyCategoryRepairPartsandComponents.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 609 marshal size 8<br>
- * Class 9 Supply Category - Repair Parts and Components
+ * Class9SupplyCategoryRepairPartsandComponents
*/
public enum Class9SupplyCategoryRepairPartsandComponents implements Category
{
@@ -24,7 +24,7 @@ public enum Class9SupplyCategoryRepairPartsandComponents implements Category
D_ADMIN_VEHICLES (4, "D - Admin Vehicles"),
/** G - Electronics */
G_ELECTRONICS (5, "G - Electronics"),
- /** K - Tactical Vehicles, Any repair part for a modelled function of a platform, not related to Mobility, Firepower, Sensor, or Communications, e.g. Bulldozer Blade, Crane, Winch, Mine Plow, etc. */
+ /** K - Tactical Vehicles, Any repair part for a modelled function of a platform, not related to Mobility, Firepower, Sensor, or Communications, e.g. Bulldozer Blade, Crane, Winch, Mine Plow, etc. */
K_TACTICAL_VEHICLES (6, "K - Tactical Vehicles"),
/** L - Missiles */
L_MISSILES (7, "L - Missiles"),
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/CollisionType.java b/src-generated/edu/nps/moves/dis7/enumerations/CollisionType.java
index b5af0e90d6f6b76175e9b5686697b79be2fdeca3..9d1ee2a15f273225588ec0db4a8e841932831b85 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/CollisionType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/CollisionType.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 189 marshal size 8<br>
- * Collision Type
+ * CollisionType
*/
public enum CollisionType
{
@@ -18,8 +18,8 @@ public enum CollisionType
INELASTIC (0, "Inelastic"),
/** Elastic */
ELASTIC (1, "Elastic"),
- /** Boom nozzle has cleared the receiver's refueling receptacle, Collision Type 55 indicates that during an aerial refueling exercise the boom nozzle has cleared the receiver's refueling receptacle. */
- BOOM_NOZZLE_HAS_CLEARED_THE_RECEIVERS_REFUELING_RECEPTACLE (55, "Boom nozzle has cleared the receiver's refueling receptacle");
+ /** Boom nozzle has cleared the receivers refueling receptacle, Collision Type 55 indicates that during an aerial refueling exercise the boom nozzle has cleared the receiver's refueling receptacle. */
+ BOOM_NOZZLE_HAS_CLEARED_THE_RECEIVERS_REFUELING_RECEPTACLE (55, "Boom nozzle has cleared the receivers refueling receptacle");
private int value;
private final String description;
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Color.java b/src-generated/edu/nps/moves/dis7/enumerations/Color.java
index 9810baaf0a76b160ee6419d534ce153d1197bc49..9774fad4c3f37228ac2fbec712e127768876dd53 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Color.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Color.java
@@ -8,7 +8,7 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 463 marshal size 8<br>
* Color<br>
* The color values 1 to 15 are defined in the HTML 3.0 specification; color values 20 to 159 are defined in the SVG 1.0 specification
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ComponentVisualDamageStatusSmoke.java b/src-generated/edu/nps/moves/dis7/enumerations/ComponentVisualDamageStatusSmoke.java
index 2eb5c586c35d3c393a163a387fb4c8ddc5e564eb..75f7e7bebbebfd48925bf185d6767f0e4ff7b746 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ComponentVisualDamageStatusSmoke.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ComponentVisualDamageStatusSmoke.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 375 marshal size 2<br>
- * Component Visual Damage Status-Smoke
+ * ComponentVisualDamageStatusSmoke
*/
public enum ComponentVisualDamageStatusSmoke
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ComponentVisualDamageStatusSurfaceDamage.java b/src-generated/edu/nps/moves/dis7/enumerations/ComponentVisualDamageStatusSurfaceDamage.java
index 437bca1cb99d034ca9be16dfd2cf2c599bfef2aa..0283cac60f77d322a3bafd3d09ee8ddb30f47629 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ComponentVisualDamageStatusSurfaceDamage.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ComponentVisualDamageStatusSurfaceDamage.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 376 marshal size 2<br>
- * Component Visual Damage Status-Surface Damage
+ * ComponentVisualDamageStatusSurfaceDamage
*/
public enum ComponentVisualDamageStatusSurfaceDamage
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Country.java b/src-generated/edu/nps/moves/dis7/enumerations/Country.java
index 7af401335627d15707d4399f8accdfc6b7ed76d9..37cb93dfd839c70048f8d7dbae0da9ded8542fef 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Country.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Country.java
@@ -8,7 +8,7 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 29 marshal size 16<br>
* Country
*/
@@ -104,8 +104,8 @@ public enum Country
CHAD_TCD (43, "Chad (TCD)"),
/** Chile (CHL) */
CHILE_CHL (44, "Chile (CHL)"),
- /** China, People's Republic of (CHN) */
- CHINA_PEOPLES_REPUBLIC_OF_CHN (45, "China, People's Republic of (CHN)"),
+ /** China, Peoples Republic of (CHN) */
+ CHINA_PEOPLES_REPUBLIC_OF_CHN (45, "China, Peoples Republic of (CHN)"),
/** Christmas Island (CXR) */
CHRISTMAS_ISLAND_CXR (46, "Christmas Island (CXR)"),
/** Cocos (Keeling) Islands (CCK) */
@@ -210,8 +210,8 @@ public enum Country
HOWLAND_ISLAND_UNITED_STATES (96, "Howland Island (United States)"),
/** Hungary (HUN) */
HUNGARY_HUN (97, "Hungary (HUN)"),
- /** Iceland (ESL) */
- ICELAND_ESL (98, "Iceland (ESL)"),
+ /** Iceland (ISL) */
+ ICELAND_ISL (98, "Iceland (ISL)"),
/** India (IND) */
INDIA_IND (99, "India (IND)"),
/** Indonesia (IDN) */
@@ -226,8 +226,8 @@ public enum Country
ISRAEL_ISR (105, "Israel (ISR)"),
/** Italy (ITA) */
ITALY_ITA (106, "Italy (ITA)"),
- /** Cote d'Ivoire (CIV) */
- COTE_DIVOIRE_CIV (107, "Cote d'Ivoire (CIV)"),
+ /** Cote dIvoire (CIV) */
+ COTE_DIVOIRE_CIV (107, "Cote dIvoire (CIV)"),
/** Jamaica (JAM) */
JAMAICA_JAM (108, "Jamaica (JAM)"),
/** Jan Mayen (Norway), Use Svalbard and Jan Mayen */
@@ -250,14 +250,14 @@ public enum Country
KINGMAN_REEF_UNITED_STATES (117, "Kingman Reef (United States)"),
/** Kiribati (KIR) */
KIRIBATI_KIR (118, "Kiribati (KIR)"),
- /** Korea (Democratic People's Republic of) (PRK) */
- KOREA_DEMOCRATIC_PEOPLES_REPUBLIC_OF_PRK (119, "Korea (Democratic People's Republic of) (PRK)"),
+ /** Korea (Democratic Peoples Republic of) (PRK) */
+ KOREA_DEMOCRATIC_PEOPLES_REPUBLIC_OF_PRK (119, "Korea (Democratic Peoples Republic of) (PRK)"),
/** Korea (Republic of) (KOR) */
KOREA_REPUBLIC_OF_KOR (120, "Korea (Republic of) (KOR)"),
/** Kuwait (KWT) */
KUWAIT_KWT (121, "Kuwait (KWT)"),
- /** Lao People's Democratic Republic (LAO) */
- LAO_PEOPLES_DEMOCRATIC_REPUBLIC_LAO (122, "Lao People's Democratic Republic (LAO)"),
+ /** Lao Peoples Democratic Republic (LAO) */
+ LAO_PEOPLES_DEMOCRATIC_REPUBLIC_LAO (122, "Lao Peoples Democratic Republic (LAO)"),
/** Lebanon (LBN) */
LEBANON_LBN (123, "Lebanon (LBN)"),
/** Lesotho (LSO) */
@@ -312,8 +312,8 @@ public enum Country
MOZAMBIQUE_MOZ (148, "Mozambique (MOZ)"),
/** Namibia (NAM) */
NAMIBIA_NAM (149, "Namibia (NAM)"),
- /** Nauru (NRO) */
- NAURU_NRO (150, "Nauru (NRO)"),
+ /** Nauru (NRU) */
+ NAURU_NRU (150, "Nauru (NRU)"),
/** Navassa Island (United States), Use United States Minor Outlying Islands */
NAVASSA_ISLAND_UNITED_STATES (151, "Navassa Island (United States)"),
/** Nepal (NPL) */
@@ -370,8 +370,8 @@ public enum Country
QATAR_QAT (178, "Qatar (QAT)"),
/** Reunion (REU) */
REUNION_REU (179, "Reunion (REU)"),
- /** Romania (ROY) */
- ROMANIA_ROY (180, "Romania (ROY)"),
+ /** Romania (ROU) */
+ ROMANIA_ROU (180, "Romania (ROU)"),
/** Rwanda (RWA) */
RWANDA_RWA (181, "Rwanda (RWA)"),
/** Saint Kitts and Nevis (KNA) */
@@ -418,8 +418,8 @@ public enum Country
SURINAME_SUR (202, "Suriname (SUR)"),
/** Svalbard (Norway), Use Svalbard and Jan Mayen */
SVALBARD_NORWAY (203, "Svalbard (Norway)"),
- /** Swaziland (SWZ) */
- SWAZILAND_SWZ (204, "Swaziland (SWZ)"),
+ /** Eswatini (SWZ) */
+ ESWATINI_SWZ (204, "Eswatini (SWZ)"),
/** Sweden (SWE) */
SWEDEN_SWE (205, "Sweden (SWE)"),
/** Switzerland (CHE) */
@@ -516,10 +516,10 @@ public enum Country
KYRGYZSTAN_KGZ (253, "Kyrgyzstan (KGZ)"),
/** Latvia (LVA) */
LATVIA_LVA (254, "Latvia (LVA)"),
- /** Lithuania (LTU) */
- LITHUANIA_LTU (255, "Lithuania (LTU)"),
- /** Macedonia (The Former Yugoslav Republic of) (MKD) */
- MACEDONIA_THE_FORMER_YUGOSLAV_REPUBLIC_OF_MKD (256, "Macedonia (The Former Yugoslav Republic of) (MKD)"),
+ /** Lithuania (LTU) */
+ LITHUANIA_LTU (255, "Lithuania (LTU)"),
+ /** North Macedonia (MKD) */
+ NORTH_MACEDONIA_MKD (256, "North Macedonia (MKD)"),
/** Midway Islands (United States), Use United States Minor Outlying Islands */
MIDWAY_ISLANDS_UNITED_STATES (257, "Midway Islands (United States)"),
/** Moldova (Republic of) (MDA) */
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/CoverShroudStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/CoverShroudStatus.java
index 3c8ec8e03549e51069361f32e4d6baca0e6d2471..060a78ba751abf3f927bbd7953dcf5e5f5128be6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/CoverShroudStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/CoverShroudStatus.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 426 marshal size 2<br>
- * Cover/Shroud Status
+ * Cover/ShroudStatus
*/
public enum CoverShroudStatus
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/CryptoKeyIDCryptoMode.java b/src-generated/edu/nps/moves/dis7/enumerations/CryptoKeyIDCryptoMode.java
index eecc7d95c3aff7e7b2b4d90b4d0a76e5e9cb85ea..7241f5a97c2c4ddf7dfc4343e9f6883589586355 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/CryptoKeyIDCryptoMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/CryptoKeyIDCryptoMode.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 449 marshal size 1<br>
- * Crypto Key ID-Crypto Mode
+ * CryptoKeyIDCryptoMode
*/
public enum CryptoKeyIDCryptoMode
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/CulturalFeatureAppearance.java b/src-generated/edu/nps/moves/dis7/enumerations/CulturalFeatureAppearance.java
index ee6a0e9684db4390d7f313d5ffe5a31fc3836eac..735ed1952aad2f69a888387109ea7f1f2304a484 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/CulturalFeatureAppearance.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/CulturalFeatureAppearance.java
@@ -3,9 +3,9 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 39 marshal size 32<br>
- * Cultural Feature Appearance
+ * CulturalFeatureAppearance
*/
public class CulturalFeatureAppearance extends DisBitSet
{
@@ -16,19 +16,19 @@ public class CulturalFeatureAppearance extends DisBitSet
/**
* Describes whether or not smoke is emanating from the entity
*/
- public static Bits IS_SMOKE_EMANATING = new Bits(5, 1);
+ public static Bits ISSMOKEEMANATING = new Bits(5, 1);
/**
* Describes whether the entity is burning and flames are visible
*/
- public static Bits IS_FLAMING = new Bits(15, 1);
+ public static Bits ISFLAMING = new Bits(15, 1);
/**
* Describes whether the entity is frozen and should not be dead reckoned
*/
- public static Bits IS_FROZEN = new Bits(21, 1);
+ public static Bits ISFROZEN = new Bits(21, 1);
/**
* Describes whether the internal heat is on or off
*/
- public static Bits INTERNAL_HEAT_ON = new Bits(22, 1);
+ public static Bits INTERNALHEATON = new Bits(22, 1);
/**
* Describes whether the entity is active or deactivated, Use {@link AppearanceEntityorObjectState} values for this field
*/
@@ -36,11 +36,11 @@ public class CulturalFeatureAppearance extends DisBitSet
/**
* Describes whether the exterior lights are on or off
*/
- public static Bits EXTERIOR_LIGHTS_ON = new Bits(28, 1);
+ public static Bits EXTERIORLIGHTSON = new Bits(28, 1);
/**
* Describes whether the interior lights are on or off
*/
- public static Bits INTERIOR_LIGHTS_ON = new Bits(29, 1);
+ public static Bits INTERIORLIGHTSON = new Bits(29, 1);
/**
* Describes whether or not the entity is masked or cloaked
*/
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/CulturalFeatureCapabilities.java b/src-generated/edu/nps/moves/dis7/enumerations/CulturalFeatureCapabilities.java
index 1d5268d019692857720832729e028d9aedd28b4a..28318589b76036499a04a4f3d96d1215e5648e1f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/CulturalFeatureCapabilities.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/CulturalFeatureCapabilities.java
@@ -3,9 +3,9 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 458 marshal size 32<br>
- * Cultural Feature Capabilities
+ * CulturalFeatureCapabilities
*/
public class CulturalFeatureCapabilities extends DisBitSet implements EntityCapabilities
{
@@ -14,13 +14,13 @@ public class CulturalFeatureCapabilities extends DisBitSet implements EntityCapa
*/
public static Bits RESERVED = new Bits(0, 5);
/**
- * The Entity is able to be carried as a sling load payload. The extended appearance record (if available) will identify if it is currently sling loaded and entity association and/or entity offset records (if available) will provide additional sling load details (such as carrier).
+ * The Entity is able to be carried as a sling load payload. The extended appearance record (if available) will identify if it is currently sling loaded and entity association and/or entity offset records (if available) will provide additional sling load details (such as carrier).
*/
- public static Bits SLING_LOADABLE = new Bits(6, 1);
+ public static Bits SLINGLOADABLE = new Bits(6, 1);
/**
- * The Entity is an IED or contains an IED. The extended appearance record (if available) will identify how well hidden the IED is on the Entity. An Attached Part (if applicable, for instance a jury-rigged munition does not apply here) will identify the IED explicitly.
+ * The Entity is an IED or contains an IED. The extended appearance record (if available) will identify how well hidden the IED is on the Entity. An Attached Part (if applicable, for instance a jury-rigged munition does not apply here) will identify the IED explicitly.
*/
- public static Bits IED_PRESENCE_INDICATOR = new Bits(7, 1);
+ public static Bits IEDPRESENCEINDICATOR = new Bits(7, 1);
public static class Bits
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentDamageStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentDamageStatus.java
index 26383dcba4c781cad86b375b149a30b028a742e6..879b6f587da2eedba84a9f0529cef056d03acfa1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentDamageStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentDamageStatus.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 315 marshal size 8<br>
- * DE Damage Description-Component Damage Status
+ * DEDamageDescriptionComponentDamageStatus
*/
public enum DEDamageDescriptionComponentDamageStatus
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentVisualDamageStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentVisualDamageStatus.java
index 5a7dece79ba9c0fcb65c06e4fbb946f26310a034..f80cbe48f69a4b089277298b2d96d660a4b06a51 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentVisualDamageStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentVisualDamageStatus.java
@@ -3,16 +3,16 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 317 marshal size 8<br>
- * DE Damage Description-Component Visual Damage Status
+ * DEDamageDescriptionComponentVisualDamageStatus
*/
public class DEDamageDescriptionComponentVisualDamageStatus extends DisBitSet
{
/**
* Describes presence of fire at the damage site
*/
- public static Bits IS_FIRE_PRESENT = new Bits(0, 1);
+ public static Bits ISFIREPRESENT = new Bits(0, 1);
/**
* Describes presence of smoke emanating from the damage site, Use {@link ComponentVisualDamageStatusSmoke} values for this field
*/
@@ -20,7 +20,7 @@ public class DEDamageDescriptionComponentVisualDamageStatus extends DisBitSet
/**
* Describes general surface appearance at the damage site, Use {@link ComponentVisualDamageStatusSurfaceDamage} values for this field
*/
- public static Bits SURFACE_DAMAGE = new Bits(3, 2, ComponentVisualDamageStatusSurfaceDamage.class);
+ public static Bits SURFACEDAMAGE = new Bits(3, 2, ComponentVisualDamageStatusSurfaceDamage.class);
public static class Bits
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentVisualSmokeColor.java b/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentVisualSmokeColor.java
index cedb1ee51954e968c6661f294f7469075af9c8cc..46d97d3911ca44bbe646021d965a7f9ddadeb875 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentVisualSmokeColor.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentVisualSmokeColor.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 316 marshal size 8<br>
- * DE Damage Description-Component Visual Smoke Color
+ * DEDamageDescriptionComponentVisualSmokeColor
*/
public enum DEDamageDescriptionComponentVisualSmokeColor
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DEFireFlags.java b/src-generated/edu/nps/moves/dis7/enumerations/DEFireFlags.java
index 3756fa5ae6172e2097564d0a70129abc5b305a87..761f759828b6f2cdb85750659455a43af8e555c6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DEFireFlags.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DEFireFlags.java
@@ -3,20 +3,20 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 313 marshal size 16<br>
- * DE Fire-Flags
+ * DEFireFlags
*/
public class DEFireFlags extends DisBitSet
{
/**
* Identifies the State of the DE Weapon
*/
- public static Bits WEAPON_ON = new Bits(0, 1);
+ public static Bits WEAPONON = new Bits(0, 1);
/**
* Identifies a DE Weapon State Change, Use {@link DEFireFlagsStateUpdateFlag} values for this field
*/
- public static Bits STATE_UPDATE_FLAG = new Bits(1, 1, DEFireFlagsStateUpdateFlag.class);
+ public static Bits STATE_UPDATEFLAG = new Bits(1, 1, DEFireFlagsStateUpdateFlag.class);
public static class Bits
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DEFireFlagsStateUpdateFlag.java b/src-generated/edu/nps/moves/dis7/enumerations/DEFireFlagsStateUpdateFlag.java
index be061863daa681e7586c5577acce04699258bfe3..858d591100fdab6875d6cfbf1e1380f8eaf88d3b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DEFireFlagsStateUpdateFlag.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DEFireFlagsStateUpdateFlag.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 374 marshal size 1<br>
- * DE Fire-Flags-State/Update Flag
+ * DEFireFlagsState/UpdateFlag
*/
public enum DEFireFlagsStateUpdateFlag
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DEFirePulseShape.java b/src-generated/edu/nps/moves/dis7/enumerations/DEFirePulseShape.java
index 397627b4a73aef249c10e4712c0084149883aee6..538d7e30179e405bd1215abdc56bb8a90edc31dd 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DEFirePulseShape.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DEFirePulseShape.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 312 marshal size 8<br>
- * DE Fire-Pulse Shape
+ * DEFirePulseShape
*/
public enum DEFirePulseShape
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DEPrecisionAimpointBeamSpotType.java b/src-generated/edu/nps/moves/dis7/enumerations/DEPrecisionAimpointBeamSpotType.java
index da9c7b681fe71e506766cbab698074dfbc2d2011..1d0cc51f46e0f840bbba2102d476e18f46513983 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DEPrecisionAimpointBeamSpotType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DEPrecisionAimpointBeamSpotType.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 311 marshal size 8<br>
- * DE Precision Aimpoint-Beam Spot Type
+ * DEPrecisionAimpointBeamSpotType
*/
public enum DEPrecisionAimpointBeamSpotType
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISAttributeActionCode.java b/src-generated/edu/nps/moves/dis7/enumerations/DISAttributeActionCode.java
index fd157a20ca6920e8458d40560a24e202f89c082f..63e2ec511026c30b0ca016ad3aa503af78d009c7 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISAttributeActionCode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISAttributeActionCode.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 295 marshal size 8<br>
- * DIS-Attribute-Action Code
+ * DISAttributeActionCode
*/
public enum DISAttributeActionCode
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISLiveEntitySubprotocolNumber.java b/src-generated/edu/nps/moves/dis7/enumerations/DISLiveEntitySubprotocolNumber.java
index 73f4e886a58f45cbecd70952d0828906d0e0ee0d..3eda667911fad7bdf23fd37f56de81fe560e15cd 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISLiveEntitySubprotocolNumber.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISLiveEntitySubprotocolNumber.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 417 marshal size 8<br>
- * DIS-Live Entity-Subprotocol Number
+ * DISLiveEntitySubprotocolNumber
*/
public enum DISLiveEntitySubprotocolNumber
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusActiveInterrogationIndicatorAII.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusActiveInterrogationIndicatorAII.java
index 6beef58e6cbf3c0299cb995a1242bdb9fd456b90..3622cf8bbec5bc430f4f1856215665c45b79775a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusActiveInterrogationIndicatorAII.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusActiveInterrogationIndicatorAII.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 389 marshal size 1<br>
- * DIS-PDU Status-Active Interrogation Indicator (AII)
+ * DISPDUStatusActiveInterrogationIndicator(AII)
*/
public enum DISPDUStatusActiveInterrogationIndicatorAII
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusCoupledExtensionIndicatorCEI.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusCoupledExtensionIndicatorCEI.java
index aa4087ef09bdf8732bf8ebc510f83bf6b8a19b4f..07e4d563e46eacae90e64781c78840af3a93dd10 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusCoupledExtensionIndicatorCEI.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusCoupledExtensionIndicatorCEI.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 303 marshal size 1<br>
- * DIS-PDU Status-Coupled Extension Indicator (CEI)
+ * DISPDUStatusCoupledExtensionIndicator(CEI)
*/
public enum DISPDUStatusCoupledExtensionIndicatorCEI
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusDetonationTypeIndicatorDTI.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusDetonationTypeIndicatorDTI.java
index 42ea3d3e801f5556b183c5b787174dd7a299a93e..dc0e9dfcc82b6ada4e4b49eec21ec1ecbb8083d5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusDetonationTypeIndicatorDTI.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusDetonationTypeIndicatorDTI.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 305 marshal size 2<br>
- * DIS-PDU Status-Detonation Type Indicator (DTI)
+ * DISPDUStatusDetonationTypeIndicator(DTI)
*/
public enum DISPDUStatusDetonationTypeIndicatorDTI
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusFireTypeIndicatorFTI.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusFireTypeIndicatorFTI.java
index 1ae4989e9c66396d38633d1793be287602fe5920..4ba62d3e1f06dccdf7a2114998fe997ee841fb85 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusFireTypeIndicatorFTI.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusFireTypeIndicatorFTI.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 304 marshal size 1<br>
- * DIS-PDU Status-Fire Type Indicator (FTI)
+ * DISPDUStatusFireTypeIndicator(FTI)
*/
public enum DISPDUStatusFireTypeIndicatorFTI
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusIFFSimulationModeISM.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusIFFSimulationModeISM.java
index 016cdb6f9db6d2f171752ee4ad7d72521084337a..021f9a512145be0e6161ffb9fc26bb67092ae93d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusIFFSimulationModeISM.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusIFFSimulationModeISM.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 308 marshal size 1<br>
- * DIS-PDU Status-IFF Simulation Mode (ISM)
+ * DISPDUStatusIFFSimulationMode(ISM)
*/
public enum DISPDUStatusIFFSimulationModeISM
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusIntercomAttachedIndicatorIAI.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusIntercomAttachedIndicatorIAI.java
index 6e6c121fae9de7caaed95f3decafa027b2288f9c..2cd89031507004cc67cb22fbfab1abdd03b46d65 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusIntercomAttachedIndicatorIAI.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusIntercomAttachedIndicatorIAI.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 307 marshal size 2<br>
- * DIS-PDU Status-Intercom Attached Indicator (IAI)
+ * DISPDUStatusIntercomAttachedIndicator(IAI)
*/
public enum DISPDUStatusIntercomAttachedIndicatorIAI
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusLVCIndicatorLVC.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusLVCIndicatorLVC.java
index e943de5010f91270f6e2367d4359cc5c171358de..7716fc59a0783aa15bf4f8dedc28058276bca286 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusLVCIndicatorLVC.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusLVCIndicatorLVC.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 302 marshal size 2<br>
- * DIS-PDU Status-LVC Indicator (LVC)
+ * DISPDUStatusLVCIndicator(LVC)
*/
public enum DISPDUStatusLVCIndicatorLVC
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusRadioAttachedIndicatorRAI.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusRadioAttachedIndicatorRAI.java
index cc1a6f7b70570c2c4f5ccaebe998f2827b2ae3f7..1d962ee163cfb93e6321d4c1771b778ab6061d5d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusRadioAttachedIndicatorRAI.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusRadioAttachedIndicatorRAI.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 306 marshal size 2<br>
- * DIS-PDU Status-Radio Attached Indicator (RAI)
+ * DISPDUStatusRadioAttachedIndicator(RAI)
*/
public enum DISPDUStatusRadioAttachedIndicatorRAI
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusTransferredEntityIndicatorTEI.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusTransferredEntityIndicatorTEI.java
index be2eb518c4112bfb6b134937cfc4d2d377f09330..f7669d748f052310b4f3f0ab6ce4b6ec5e771dda 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusTransferredEntityIndicatorTEI.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusTransferredEntityIndicatorTEI.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 301 marshal size 1<br>
- * DIS-PDU Status-Transferred Entity Indicator (TEI)
+ * DISPDUStatusTransferredEntityIndicator(TEI)
*/
public enum DISPDUStatusTransferredEntityIndicatorTEI
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUType.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUType.java
index 2ec7ac173d7dd00ff8e9829e1c29ba6ce37885d0..e59027de1e1156c4a950e1d87dfdc29a3b40d041 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUType.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 4 marshal size 8<br>
- * DIS-PDU Type
+ * DISPDUType
*/
public enum DISPDUType
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISProtocolFamily.java b/src-generated/edu/nps/moves/dis7/enumerations/DISProtocolFamily.java
index 54e44e205f1ae8bc7e848d13d4819a9fcf54c003..c19a41737f64e09611690f16b5ef2e87db3d1e16 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISProtocolFamily.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISProtocolFamily.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 5 marshal size 8<br>
- * DIS-Protocol Family
+ * DISProtocolFamily
*/
public enum DISProtocolFamily
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISProtocolVersion.java b/src-generated/edu/nps/moves/dis7/enumerations/DISProtocolVersion.java
index 39b61ce7cca80b5525bf09d5e9a84faeb4d561b7..49ac1e694bb9475fad3ef3431f20ad76e88632c5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISProtocolVersion.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISProtocolVersion.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 3 marshal size 8<br>
- * DIS-Protocol Version
+ * DISProtocolVersion
*/
public enum DISProtocolVersion
{
@@ -20,10 +20,10 @@ public enum DISProtocolVersion
DIS_PDU_VERSION_10_MAY_92 (1, "DIS PDU version 1.0 (May 92)"),
/** IEEE 1278-1993 */
IEEE_1278_1993 (2, "IEEE 1278-1993"),
- /** DIS PDU version 2.0 - third draft (May 93) */
- DIS_PDU_VERSION_20_THIRD_DRAFT_MAY_93 (3, "DIS PDU version 2.0 - third draft (May 93)"),
- /** DIS PDU version 2.0 - fourth draft (revised) March 16, 1994 */
- DIS_PDU_VERSION_20_FOURTH_DRAFT_REVISED_MARCH_16_1994 (4, "DIS PDU version 2.0 - fourth draft (revised) March 16, 1994"),
+ /** DIS Applications Version 2.0 - Third Draft (28 May 1993), IST-CR-93-15 */
+ DIS_APPLICATIONS_VERSION_20_THIRD_DRAFT_28_MAY_1993 (3, "DIS Applications Version 2.0 - Third Draft (28 May 1993)"),
+ /** DIS Application Protocols Version 2.0 - Fourth Draft (Revised) (16 March 1994), IST-CR-94-50 */
+ DIS_APPLICATION_PROTOCOLS_VERSION_20_FOURTH_DRAFT_REVISED_16_MARCH_1994 (4, "DIS Application Protocols Version 2.0 - Fourth Draft (Revised) (16 March 1994)"),
/** IEEE 1278.1-1995 */
IEEE_12781_1995 (5, "IEEE 1278.1-1995"),
/** IEEE 1278.1A-1998 */
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DRParametersType.java b/src-generated/edu/nps/moves/dis7/enumerations/DRParametersType.java
index a3eaf537df35416e90182bc2746c30386940c8a9..d68c6ee2a197be3140fe77ead0ab19dcaa48d4f2 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DRParametersType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DRParametersType.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 296 marshal size 8<br>
- * DR Parameters Type
+ * DRParametersType
*/
public enum DRParametersType
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DataCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/DataCategory.java
index 145018a4072de43c90315d920804209818e2a34b..9328f5ef6d4bb29c35b3f262b256e2300dc78d0e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DataCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DataCategory.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 369 marshal size 8<br>
- * Data Category
+ * DataCategory
*/
public enum DataCategory
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DeadReckoningAlgorithm.java b/src-generated/edu/nps/moves/dis7/enumerations/DeadReckoningAlgorithm.java
index c461d0b51b904f2df406b8690af23cabae7774d9..d48bb123b9128f775a8c78c6a86da0d54107ea08 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DeadReckoningAlgorithm.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DeadReckoningAlgorithm.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 44 marshal size 8<br>
- * Dead Reckoning Algorithm
+ * DeadReckoningAlgorithm
*/
public enum DeadReckoningAlgorithm
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DeltaMode5SAltitudePositiveNegativeIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/DeltaMode5SAltitudePositiveNegativeIndicator.java
index e262dea0ee6eebb6c4fdfad23b630f058ab4e948..e9ed2f1034e56ba16204be66a8bf1c963601c1e2 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DeltaMode5SAltitudePositiveNegativeIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DeltaMode5SAltitudePositiveNegativeIndicator.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 362 marshal size 1<br>
- * Delta Mode 5/S Altitude Positive/Negative Indicator
+ * DeltaMode5/SAltitudePositive/NegativeIndicator
*/
public enum DeltaMode5SAltitudePositiveNegativeIndicator
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DesignatorDesignatorCode.java b/src-generated/edu/nps/moves/dis7/enumerations/DesignatorDesignatorCode.java
index 7065bdfd2e2454f6b87f54e79cf7c1b16ddbc454..103ff4af087fdf26d51ef94214229d89b4c9e275 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DesignatorDesignatorCode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DesignatorDesignatorCode.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 81 marshal size 16<br>
- * Designator-Designator Code<br>
+ * DesignatorDesignatorCode<br>
* UID table only for historical purposes. Do not add new entries
*/
public enum DesignatorDesignatorCode
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DesignatorSystemName.java b/src-generated/edu/nps/moves/dis7/enumerations/DesignatorSystemName.java
index 92bedccd4981f2120c6bccb4a499fc946f0174da..2a44eb6983c38db7392438b6218b7268d5510900 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DesignatorSystemName.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DesignatorSystemName.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 80 marshal size 16<br>
- * Designator System Name
+ * DesignatorSystemName
*/
public enum DesignatorSystemName
{
@@ -164,8 +164,14 @@ public enum DesignatorSystemName
AN_PAQ_1_LTD (8900, "AN/PAQ-1 LTD"),
/** AN/PAQ-3 MULE */
AN_PAQ_3_MULE (9000, "AN/PAQ-3 MULE"),
+ /** AN/PEQ-1; SOFLAM */
+ AN_PEQ_1_SOFLAM (9090, "AN/PEQ-1; SOFLAM"),
/** AN/PEQ-3 */
AN_PEQ_3 (9100, "AN/PEQ-3"),
+ /** AN/PEQ-15; ATPIAL */
+ AN_PEQ_15_ATPIAL (9140, "AN/PEQ-15; ATPIAL"),
+ /** AN/PEQ-18; IZLID 1000P */
+ AN_PEQ_18_IZLID_1000P (9150, "AN/PEQ-18; IZLID 1000P"),
/** AN/TVQ-2 G/VLLD */
AN_TVQ_2_G_VLLD (9200, "AN/TVQ-2 G/VLLD"),
/** AN/ZSQ-2(V)1 EOS */
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DetonationResult.java b/src-generated/edu/nps/moves/dis7/enumerations/DetonationResult.java
index 198856978ae7eea355b820e0fa871ee66e434f4d..63a4f881ad59b335560e076fa4dbe2b319674f5c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DetonationResult.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DetonationResult.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 62 marshal size 8<br>
- * Detonation Result
+ * DetonationResult
*/
public enum DetonationResult
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EEAttributeStateIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/EEAttributeStateIndicator.java
index 6a21ed90746f7c7d6ee421293830e31b27c97525..f028ba78678ca5d9f8b14de4873e239b50e23d35 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EEAttributeStateIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EEAttributeStateIndicator.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 300 marshal size 8<br>
- * EE Attribute-State Indicator
+ * EEAttributeStateIndicator
*/
public enum EEAttributeStateIndicator
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ElectromagneticEmissionBeamFunction.java b/src-generated/edu/nps/moves/dis7/enumerations/ElectromagneticEmissionBeamFunction.java
index a48ccf5279d5c15960f804798dd27b41394a70dd..635707d44e67c4b2bf894ab8ccf4f90688d25277 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ElectromagneticEmissionBeamFunction.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ElectromagneticEmissionBeamFunction.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 78 marshal size 8<br>
- * Electromagnetic Emission-Beam Function
+ * ElectromagneticEmissionBeamFunction
*/
public enum ElectromagneticEmissionBeamFunction
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ElectromagneticEmissionStateUpdateIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/ElectromagneticEmissionStateUpdateIndicator.java
index db77038ccd308d3f80c5a7b833e45bbc6f6099ad..d6e84cc3afdbc2464ec18afb5bcaeb790c210a43 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ElectromagneticEmissionStateUpdateIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ElectromagneticEmissionStateUpdateIndicator.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 77 marshal size 8<br>
- * Electromagnetic Emission-State Update Indicator
+ * ElectromagneticEmissionStateUpdateIndicator
*/
public enum ElectromagneticEmissionStateUpdateIndicator
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EmitterName.java b/src-generated/edu/nps/moves/dis7/enumerations/EmitterName.java
index bdae5e553ef967975654b357c7d1ca2418a22677..e477375ed22ae04ead7196b4f58dc22465811d55 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EmitterName.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EmitterName.java
@@ -8,144 +8,200 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 75 marshal size 16<br>
- * Emitter Name
+ * EmitterName
*/
public enum EmitterName
{
/** 1245/6X */
- $1245_6X (2, "1245/6X"),
+ NAME_1245_6X (2, "1245/6X"),
+ /** 1L117 */
+ NAME_1L117 (3, "1L117"),
+ /** 1L121E */
+ NAME_1L121E (4, "1L121E"),
/** 1L250 */
- $1L250 (5, "1L250"),
+ NAME_1L250 (5, "1L250"),
+ /** 1L220-U */
+ NAME_1L220_U (6, "1L220-U"),
+ /** 1L122-1E */
+ NAME_1L122_1E (7, "1L122-1E"),
/** 1RL138 */
- $1RL138 (10, "1RL138"),
+ NAME_1RL138 (10, "1RL138"),
+ /** 5N20 */
+ NAME_5N20 (12, "5N20"),
/** 5P-10 */
- $5P_10 (14, "5P-10"),
+ NAME_5P_10 (14, "5P-10"),
/** 5P-10E */
- $5P_10E (15, "5P-10E"),
+ NAME_5P_10E (15, "5P-10E"),
/** 5P-10-01 */
- $5P_10_01 (16, "5P-10-01"),
+ NAME_5P_10_01 (16, "5P-10-01"),
/** 5P-10-01E */
- $5P_10_01E (17, "5P-10-01E"),
+ NAME_5P_10_01E (17, "5P-10-01E"),
/** 5P-10-02 */
- $5P_10_02 (18, "5P-10-02"),
+ NAME_5P_10_02 (18, "5P-10-02"),
/** 5P-10-02E */
- $5P_10_02E (19, "5P-10-02E"),
+ NAME_5P_10_02E (19, "5P-10-02E"),
/** 5P-10-03 */
- $5P_10_03 (20, "5P-10-03"),
+ NAME_5P_10_03 (20, "5P-10-03"),
/** 5P-10-03E */
- $5P_10_03E (21, "5P-10-03E"),
+ NAME_5P_10_03E (21, "5P-10-03E"),
/** 5P-10E MOD */
- $5P_10E_MOD (22, "5P-10E MOD"),
+ NAME_5P_10E_MOD (22, "5P-10E MOD"),
+ /** 621A-3 */
+ NAME_621A_3 (25, "621A-3"),
+ /** COMMID_860F-1AL-101 */
+ COMMID_860F_1AL_101 (40, "COMMID_860F-1AL-101"),
/** 1226 DECCA MIL */
- $1226_DECCA_MIL (45, "1226 DECCA MIL"),
+ NAME_1226_DECCA_MIL (45, "1226 DECCA MIL"),
/** 9B-1348 */
- $9B_1348 (46, "9B-1348"),
+ NAME_9B_1348 (46, "9B-1348"),
/** 3KM6 */
- $3KM6 (47, "3KM6"),
+ NAME_3KM6 (47, "3KM6"),
/** 9KR400 */
- $9KR400 (48, "9KR400"),
+ NAME_9KR400 (48, "9KR400"),
+ /** 55G6-1 */
+ NAME_55G6_1 (50, "55G6-1"),
+ /** 59N6 */
+ NAME_59N6 (55, "59N6"),
+ /** 67N6 */
+ NAME_67N6 (60, "67N6"),
+ /** 76T6 */
+ NAME_76T6 (63, "76T6"),
+ /** 80K6 */
+ NAME_80K6 (65, "80K6"),
+ /** 96L6E */
+ NAME_96L6E (70, "96L6E"),
/** 9GR400 */
- $9GR400 (80, "9GR400"),
+ NAME_9GR400 (80, "9GR400"),
+ /** 9 GR 400A */
+ NAME_9_GR_400A (81, "9 GR 400A"),
/** 9GR600 */
- $9GR600 (90, "9GR600"),
+ NAME_9GR600 (90, "9GR600"),
/** 9GR606 */
- $9GR606 (91, "9GR606"),
+ NAME_9GR606 (91, "9GR606"),
+ /** 9 LV 100 */
+ NAME_9_LV_100 (125, "9 LV 100"),
/** 9LV 200 TA */
- $9LV_200_TA (135, "9LV 200 TA"),
+ NAME_9LV_200_TA (135, "9LV 200 TA"),
/** 9LV 200 TV */
- $9LV_200_TV (180, "9LV 200 TV"),
+ NAME_9LV_200_TV (180, "9LV 200 TV"),
/** 9LV 200 TT */
- $9LV_200_TT (181, "9LV 200 TT"),
+ NAME_9LV_200_TT (181, "9LV 200 TT"),
/** 9LV200 MK III */
- $9LV200_MK_III (183, "9LV200 MK III"),
+ NAME_9LV200_MK_III (183, "9LV200 MK III"),
/** 9LV326 */
- $9LV326 (185, "9LV326"),
+ NAME_9LV326 (185, "9LV326"),
/** 9M96E2 Seeker */
- $9M96E2_SEEKER (190, "9M96E2 Seeker"),
- /** */
- undef (225, ""),
- /** */
- undef_2 (270, ""),
- /** */
- undef_3 (315, ""),
- /** */
- undef_4 (360, ""),
- /** */
- undef_5 (405, ""),
- /** */
- undef_6 (450, ""),
- /** */
- undef_7 (495, ""),
- /** */
- undef_8 (540, ""),
- /** */
- undef_9 (585, ""),
- /** */
- undef_10 (630, ""),
- /** */
- undef_11 (675, ""),
- /** */
- undef_12 (720, ""),
- /** */
- undef_13 (765, ""),
- /** */
- undef_14 (810, ""),
- /** */
- undef_15 (855, ""),
- /** */
- undef_16 (900, ""),
- /** */
- undef_17 (945, ""),
- /** */
- undef_18 (990, ""),
- /** */
- undef_19 (1035, ""),
- /** */
- undef_20 (1080, ""),
+ NAME_9M96E2_SEEKER (190, "9M96E2 Seeker"),
+ /** NATOID_A310Z */
+ NATOID_A310Z (225, "NATOID_A310Z"),
+ /** NATOID_A325A */
+ NATOID_A325A (270, "NATOID_A325A"),
+ /** NATOID_A346Z */
+ NATOID_A346Z (315, "NATOID_A346Z"),
+ /** NATOID_A353B */
+ NATOID_A353B (360, "NATOID_A353B"),
+ /** NATOID_A372A */
+ NATOID_A372A (405, "NATOID_A372A"),
+ /** NATOID_A372B */
+ NATOID_A372B (450, "NATOID_A372B"),
+ /** NATOID_A372C */
+ NATOID_A372C (495, "NATOID_A372C"),
+ /** NATOID_A377A */
+ NATOID_A377A (540, "NATOID_A377A"),
+ /** NATOID_A377B */
+ NATOID_A377B (585, "NATOID_A377B"),
+ /** NATOID_A380Z */
+ NATOID_A380Z (630, "NATOID_A380Z"),
+ /** NATOID_A381Z */
+ NATOID_A381Z (675, "NATOID_A381Z"),
+ /** NATOID_A398Z */
+ NATOID_A398Z (720, "NATOID_A398Z"),
+ /** NATOID_A403Z */
+ NATOID_A403Z (765, "NATOID_A403Z"),
+ /** NATOID_A409A */
+ NATOID_A409A (810, "NATOID_A409A"),
+ /** NATOID_A418A */
+ NATOID_A418A (855, "NATOID_A418A"),
+ /** NATOID_A419Z */
+ NATOID_A419Z (900, "NATOID_A419Z"),
+ /** NATOID_A429Z */
+ NATOID_A429Z (945, "NATOID_A429Z"),
+ /** NATOID_A432Z */
+ NATOID_A432Z (990, "NATOID_A432Z"),
+ /** NATOID_A434Z */
+ NATOID_A434Z (1035, "NATOID_A434Z"),
+ /** NATOID_A401A */
+ NATOID_A401A (1080, "NATOID_A401A"),
/** AA-13 Arrow Seeker */
AA_13_ARROW_SEEKER (1085, "AA-13 Arrow Seeker"),
+ /** AAM-4B MH */
+ AAM_4B_MH (1090, "AAM-4B MH"),
/** AA-300 */
AA_300 (1094, "AA-300"),
/** AA-12 Seeker */
AA_12_SEEKER (1095, "AA-12 Seeker"),
- /** */
- undef_21 (1096, ""),
+ /** COMMID_AD4A */
+ COMMID_AD4A (1096, "COMMID_AD4A"),
/** ADES */
ADES (1097, "ADES"),
/** ADS-4 LRSR */
ADS_4_LRSR (1098, "ADS-4 LRSR"),
+ /** ACR-430 */
+ ACR_430 (1099, "ACR-430"),
/** Agave */
AGAVE (1100, "Agave"),
+ /** ACSOPRI-E */
+ ACSOPRI_E (1101, "ACSOPRI-E"),
+ /** ABD 2000 */
+ ABD_2000 (1102, "ABD 2000"),
/** ADAC MK 1 */
ADAC_MK_1 (1110, "ADAC MK 1"),
/** ADAC MK 2 */
ADAC_MK_2 (1111, "ADAC MK 2"),
+ /** ADAR */
+ ADAR (1113, "ADAR"),
+ /** ADOUR */
+ ADOUR (1115, "ADOUR"),
/** AGRION 15 */
AGRION_15 (1125, "AGRION 15"),
+ /** COMMID_AHV-7 */
+ COMMID_AHV_7 (1130, "COMMID_AHV-7"),
+ /** AHV-17 */
+ AHV_17 (1150, "AHV-17"),
/** AI MK 23 */
AI_MK_23 (1170, "AI MK 23"),
/** AIDA II */
AIDA_II (1215, "AIDA II"),
/** AIM-120A */
AIM_120A (1216, "AIM-120A"),
+ /** 1L271 */
+ NAME_1L271 (1230, "1L271"),
+ /** ALA-51 */
+ ALA_51 (1240, "ALA-51"),
/** Albatros MK2 */
ALBATROS_MK2 (1260, "Albatros MK2"),
+ /** ALT-50 */
+ ALT_50 (1263, "ALT-50"),
+ /** ALTAIR */
+ ALTAIR (1264, "ALTAIR"),
/** AM/APS-717 */
AM_APS_717 (1265, "AM/APS-717"),
+ /** AMES 13 MK 1 */
+ AMES_13_MK_1 (1268, "AMES 13 MK 1"),
/** WGU-16/B */
WGU_16_B (1270, "WGU-16/B"),
/** 1L13-3 (55G6) */
- $1L13_3_55G6 (1280, "1L13-3 (55G6)"),
+ NAME_1L13_3_55G6 (1280, "1L13-3 (55G6)"),
/** 1L13-3 (55G6) */
- $1L13_3_55G6_2 (1282, "1L13-3 (55G6)"),
+ NAME_1L13_3_55G6_2 (1282, "1L13-3 (55G6)"),
/** AMDR 3D */
AMDR_3D (1288, "AMDR 3D"),
/** ANA SPS 502 */
ANA_SPS_502 (1305, "ANA SPS 502"),
- /** */
- undef_22 (1306, " "),
+ /** COMMID_Anemone */
+ COMMID_ANEMONE (1306, "COMMID_Anemone"),
/** ANRITSU Electric AR-30A */
ANRITSU_ELECTRIC_AR_30A (1350, "ANRITSU Electric AR-30A"),
/** Antilope V */
@@ -180,6 +236,8 @@ public enum EmitterName
AN_ALQ_126B (1622, "AN/ALQ-126B"),
/** AN/ALQ-131 */
AN_ALQ_131 (1626, "AN/ALQ-131"),
+ /** AN/ALQ-131 Blk II */
+ AN_ALQ_131_BLK_II (1627, "AN/ALQ-131 Blk II"),
/** AN/ALQ-135C/D */
AN_ALQ_135C_D (1628, "AN/ALQ-135C/D"),
/** AN/ALQ-144A(V)3 */
@@ -230,10 +288,14 @@ public enum EmitterName
AN_ALQ_211V (1655, "AN/ALQ-211(V)"),
/** AN/ALT-16A */
AN_ALT_16A (1656, "AN/ALT-16A"),
+ /** AN/ALQ-173 */
+ AN_ALQ_173 (1657, "AN/ALQ-173"),
/** AN/ALT-28 */
AN_ALT_28 (1658, "AN/ALT-28"),
/** AN/ALT-32A */
AN_ALT_32A (1660, "AN/ALT-32A"),
+ /** AN/ALQ-196 */
+ AN_ALQ_196 (1661, "AN/ALQ-196"),
/** AN/APD 10 */
AN_APD_10 (1665, "AN/APD 10"),
/** AN/APG-50 */
@@ -266,6 +328,8 @@ public enum EmitterName
AN_APG_68V9 (1895, "AN/APG-68(v)9"),
/** AN/APG-70 */
AN_APG_70 (1935, "AN/APG-70"),
+ /** AN/APG-71 */
+ AN_APG_71 (1940, "AN/APG-71"),
/** AN/APG-73 */
AN_APG_73 (1945, "AN/APG-73"),
/** AN/APG-77 */
@@ -292,6 +356,8 @@ public enum EmitterName
AN_APN_69 (2160, "AN/APN-69"),
/** AN/APN-81 */
AN_APN_81 (2205, "AN/APN-81"),
+ /** AN/APN-102 */
+ AN_APN_102 (2220, "AN/APN-102"),
/** AN/APN-117 */
AN_APN_117 (2250, "AN/APN-117"),
/** AN/APN-118 */
@@ -322,6 +388,8 @@ public enum EmitterName
AN_APN_159 (2745, "AN/APN-159"),
/** AN/APN-177 */
AN_APN_177 (2746, "AN/APN-177"),
+ /** AN/APN-179 */
+ AN_APN_179 (2747, "AN/APN-179"),
/** AN/APN-169 */
AN_APN_169 (2748, "AN/APN-169"),
/** AN/APN-182 */
@@ -420,6 +488,8 @@ public enum EmitterName
AN_APQ_164 (3785, "AN/APQ-164"),
/** AN/APQ-166 */
AN_APQ_166 (3788, "AN/APQ-166"),
+ /** AN/APQ-170 */
+ AN_APQ_170 (3790, "AN/APQ-170"),
/** AN/APQ-174 */
AN_APQ_174 (3791, "AN/APQ-174"),
/** AN/APQ-180 */
@@ -440,6 +510,12 @@ public enum EmitterName
AN_APS_88 (3915, "AN/APS-88"),
/** AN/APS-88A */
AN_APS_88A (3916, "AN/APS-88A"),
+ /** AN/APS-94 */
+ AN_APS_94 (3920, "AN/APS-94"),
+ /** AN/APS-96 */
+ AN_APS_96 (3922, "AN/APS-96"),
+ /** AN/APS-113 */
+ AN_APS_113 (3958, "AN/APS-113"),
/** AN/APS-115 */
AN_APS_115 (3960, "AN/APS-115"),
/** AN/APS-116 */
@@ -452,6 +528,8 @@ public enum EmitterName
AN_APS_124 (4140, "AN/APS-124"),
/** AN/APS-125 */
AN_APS_125 (4185, "AN/APS-125"),
+ /** AN/APS-127 */
+ AN_APS_127 (4190, "AN/APS-127"),
/** AN/APS-128 */
AN_APS_128 (4230, "AN/APS-128"),
/** AN/APS-130 */
@@ -462,6 +540,8 @@ public enum EmitterName
AN_APS_134 (4365, "AN/APS-134"),
/** AN/APS-137 */
AN_APS_137 (4410, "AN/APS-137"),
+ /** AN/APS-137(V)5 */
+ AN_APS_137V5 (4413, "AN/APS-137(V)5"),
/** AN/APS-137B */
AN_APS_137B (4415, "AN/APS-137B"),
/** AN/APS-137B(V)5 */
@@ -470,6 +550,8 @@ public enum EmitterName
AN_APS_138 (4455, "AN/APS-138"),
/** AN/APS-139 */
AN_APS_139 (4460, "AN/APS-139"),
+ /** AN/APS-143 */
+ AN_APS_143 (4464, "AN/APS-143"),
/** AN/APS-143 (V) 1 */
AN_APS_143_V_1 (4465, "AN/APS-143 (V) 1"),
/** AN/APS-143B */
@@ -480,6 +562,8 @@ public enum EmitterName
AN_APS_143BV3 (4468, "AN/APS-143B(V)3"),
/** AN/APS-153 */
AN_APS_153 (4475, "AN/APS-153"),
+ /** AN/APS-154 */
+ AN_APS_154 (4476, "AN/APS-154"),
/** AN/APS-150 */
AN_APS_150 (4480, "AN/APS-150"),
/** AN/APS-145 */
@@ -488,6 +572,8 @@ public enum EmitterName
AN_APS_147 (4485, "AN/APS-147"),
/** AN/APS-149 */
AN_APS_149 (4486, "AN/APS-149"),
+ /** AN/APS-503 */
+ AN_APS_503 (4489, "AN/APS-503"),
/** AN/APS-504 */
AN_APS_504 (4490, "AN/APS-504"),
/** AN/APS-705 */
@@ -554,6 +640,10 @@ public enum EmitterName
AN_ASN_128 (5270, "AN/ASN-128"),
/** AN/ASQ-108 */
AN_ASQ_108 (5280, "AN/ASQ-108"),
+ /** AN/AST-502 */
+ AN_AST_502 (5290, "AN/AST-502"),
+ /** AN/AVQ-55 */
+ AN_AVQ_55 (5300, "AN/AVQ-55"),
/** AN/AWG 9 */
AN_AWG_9 (5310, "AN/AWG 9"),
/** AN/BRN-1 */
@@ -566,8 +656,16 @@ public enum EmitterName
AN_BPS_15 (5400, "AN/BPS 15"),
/** AN/BPS-15 H */
AN_BPS_15_H (5401, "AN/BPS-15 H"),
+ /** AN/BPS-15J */
+ AN_BPS_15J (5402, "AN/BPS-15J"),
/** AN/BPS-16 */
AN_BPS_16 (5405, "AN/BPS-16"),
+ /** AN/BPS-16(V)2 */
+ AN_BPS_16V2 (5406, "AN/BPS-16(V)2"),
+ /** AN/CPN-4 */
+ AN_CPN_4 (5410, "AN/CPN-4"),
+ /** AN/CPN-18 */
+ AN_CPN_18 (5415, "AN/CPN-18"),
/** AN/CRM-30 */
AN_CRM_30 (5420, "AN/CRM-30"),
/** AN/DPW-23 */
@@ -576,18 +674,42 @@ public enum EmitterName
AN_DSQ_26_PHOENIX_MH (5445, "AN/DSQ 26 Phoenix MH"),
/** AN/DSQ 28 Harpoon MH */
AN_DSQ_28_HARPOON_MH (5490, "AN/DSQ 28 Harpoon MH"),
+ /** AN/FPN-1 */
+ AN_FPN_1 (5491, "AN/FPN-1"),
+ /** AN/FPN-28 */
+ AN_FPN_28 (5493, "AN/FPN-28"),
+ /** AN/FPN-33 */
+ AN_FPN_33 (5494, "AN/FPN-33"),
/** AN/FPN-40 */
AN_FPN_40 (5495, "AN/FPN-40"),
/** AN/FPN-62 */
AN_FPN_62 (5500, "AN/FPN-62"),
+ /** AN/FPN-66 */
+ AN_FPN_66 (5502, "AN/FPN-66"),
+ /** AN/FPS-8 */
+ AN_FPS_8 (5503, "AN/FPS-8"),
+ /** AN/FPN-67 */
+ AN_FPN_67 (5504, "AN/FPN-67"),
/** AN/FPS-16 */
AN_FPS_16 (5505, "AN/FPS-16"),
+ /** AN/FPS-5 */
+ AN_FPS_5 (5506, "AN/FPS-5"),
/** AN/FPS-18 */
AN_FPS_18 (5507, "AN/FPS-18"),
/** AN/FPS-89 */
AN_FPS_89 (5508, "AN/FPS-89"),
+ /** AN/FPS-49 */
+ AN_FPS_49 (5509, "AN/FPS-49"),
/** AN/FPS-117 */
AN_FPS_117 (5510, "AN/FPS-117"),
+ /** AN/FPS-85 */
+ AN_FPS_85 (5511, "AN/FPS-85"),
+ /** AN/FPS-88 */
+ AN_FPS_88 (5512, "AN/FPS-88"),
+ /** AN/FPS-113 */
+ AN_FPS_113 (5513, "AN/FPS-113"),
+ /** AN/FPS-115 */
+ AN_FPS_115 (5514, "AN/FPS-115"),
/** AN/FPS-20R */
AN_FPS_20R (5515, "AN/FPS-20R"),
/** AN/FPS-77 */
@@ -600,16 +722,24 @@ public enum EmitterName
AN_FPS_108 (5526, "AN/FPS-108"),
/** AN/GPN-12 */
AN_GPN_12 (5527, "AN/GPN-12"),
+ /** AN/FPS-124(V) */
+ AN_FPS_124V (5528, "AN/FPS-124(V)"),
+ /** AN/FPS-129 */
+ AN_FPS_129 (5529, "AN/FPS-129"),
/** AN/GPX-6 */
AN_GPX_6 (5530, "AN/GPX-6"),
/** AN/GPX 8 */
AN_GPX_8 (5535, "AN/GPX 8"),
/** AN/GRN-12 */
AN_GRN_12 (5537, "AN/GRN-12"),
+ /** AN/MPN-14K */
+ AN_MPN_14K (5538, "AN/MPN-14K"),
/** AN/MPN-14 */
AN_MPN_14 (5539, "AN/MPN-14"),
/** AN/MPQ-10 */
AN_MPQ_10 (5540, "AN/MPQ-10"),
+ /** AN/MPN-17 */
+ AN_MPN_17 (5541, "AN/MPN-17"),
/** AN/MPQ-33/39/46/57/61 (HPIR) ILL */
AN_MPQ_33_39_46_57_61_HPIR_ILL (5545, "AN/MPQ-33/39/46/57/61 (HPIR) ILL"),
/** AN/MPQ-34/48/55/62 (CWAR) TA */
@@ -622,6 +752,10 @@ public enum EmitterName
AN_MPQ_50C (5556, "AN/MPQ-50C"),
/** AN/MPQ-37/51 (ROR) TT */
AN_MPQ_37_51_ROR_TT (5560, "AN/MPQ-37/51 (ROR) TT"),
+ /** AN/MPQ-43 */
+ AN_MPQ_43 (5565, "AN/MPQ-43"),
+ /** AN/MPQ-50 */
+ AN_MPQ_50 (5567, "AN/MPQ-50"),
/** AN/MPQ-53 */
AN_MPQ_53 (5570, "AN/MPQ-53"),
/** AN/MPQ-63 */
@@ -638,16 +772,22 @@ public enum EmitterName
AN_SLQ_32A (5579, "AN/SLQ-32A"),
/** AN/SPG-34 */
AN_SPG_34 (5580, "AN/SPG-34"),
+ /** AN/MPS-36 */
+ AN_MPS_36 (5583, "AN/MPS-36"),
/** AN/SPG-48/MK 25 MOD 3 */
AN_SPG_48_MK_25_MOD_3 (5620, "AN/SPG-48/MK 25 MOD 3"),
/** AN/SPG-50 */
AN_SPG_50 (5625, "AN/SPG-50"),
/** AN/SPG-51 */
AN_SPG_51 (5670, "AN/SPG-51"),
+ /** AN/PPQ-2 */
+ AN_PPQ_2 (5690, "AN/PPQ-2"),
/** AN/PPS-15 */
AN_PPS_15 (5700, "AN/PPS-15"),
/** AN/PPS-5 */
AN_PPS_5 (5705, "AN/PPS-5"),
+ /** AN/PPS-5D */
+ AN_PPS_5D (5710, "AN/PPS-5D"),
/** AN/SPG-51 CWI TI */
AN_SPG_51_CWI_TI (5715, "AN/SPG-51 CWI TI"),
/** AN/SPG-51 FC */
@@ -666,6 +806,8 @@ public enum EmitterName
AN_SPG_62 (5985, "AN/SPG-62"),
/** AN/SPG-503 */
AN_SPG_503 (5995, "AN/SPG-503"),
+ /** AN/SPN-4 */
+ AN_SPN_4 (6015, "AN/SPN-4"),
/** AN/SPN-11 */
AN_SPN_11 (6025, "AN/SPN-11"),
/** AN/SPN-35 */
@@ -680,6 +822,8 @@ public enum EmitterName
AN_SPN_46 (6085, "AN/SPN-46"),
/** AN/SPQ-2 */
AN_SPQ_2 (6120, "AN/SPQ-2"),
+ /** AN/SPQ-5A */
+ AN_SPQ_5A (6155, "AN/SPQ-5A"),
/** AN/SPQ-9A */
AN_SPQ_9A (6165, "AN/SPQ-9A"),
/** AN/SPQ-9B */
@@ -774,6 +918,8 @@ public enum EmitterName
AN_SPS_74 (7216, "AN/SPS-74"),
/** AN/SPS-88 */
AN_SPS_88 (7225, "AN/SPS-88"),
+ /** AN/SPS-501 */
+ AN_SPS_501 (7226, "AN/SPS-501"),
/** AN/SPS-505 */
AN_SPS_505 (7230, "AN/SPS-505"),
/** AN/SPY-1 */
@@ -800,16 +946,36 @@ public enum EmitterName
AN_TLQ_32_ARM_DECOY (7269, "AN/TLQ-32 ARM Decoy"),
/** AN/TPN-17 */
AN_TPN_17 (7270, "AN/TPN-17"),
+ /** AN/TPN-8 */
+ AN_TPN_8 (7271, "AN/TPN-8"),
+ /** AN/TPN-22 */
+ AN_TPN_22 (7272, "AN/TPN-22"),
+ /** AN/TLQ-17A */
+ AN_TLQ_17A (7273, "AN/TLQ-17A"),
+ /** AN/TMS-1 */
+ AN_TMS_1 (7274, "AN/TMS-1"),
/** AN/TPN-24 */
AN_TPN_24 (7275, "AN/TPN-24"),
+ /** AN/TPN-25 */
+ AN_TPN_25 (7276, "AN/TPN-25"),
+ /** AN/TMS-2 */
+ AN_TMS_2 (7277, "AN/TMS-2"),
+ /** AN/TPN-19 */
+ AN_TPN_19 (7278, "AN/TPN-19"),
+ /** AN/TPN-31 */
+ AN_TPN_31 (7279, "AN/TPN-31"),
/** AN/TPQ-18 */
AN_TPQ_18 (7280, "AN/TPQ-18"),
+ /** AN/SPY-6(V) */
+ AN_SPY_6V (7281, "AN/SPY-6(V)"),
/** AN/TPQ-36 */
AN_TPQ_36 (7295, "AN/TPQ-36"),
/** AN/TPQ-37 */
AN_TPQ_37 (7300, "AN/TPQ-37"),
/** AN/TPQ-38 (V8) */
AN_TPQ_38_V8 (7301, "AN/TPQ-38 (V8)"),
+ /** AN/TPQ-39(V) */
+ AN_TPQ_39V (7302, "AN/TPQ-39(V)"),
/** AN/TPQ-47 */
AN_TPQ_47 (7303, "AN/TPQ-47"),
/** AN/TPS-43 */
@@ -820,32 +986,52 @@ public enum EmitterName
AN_TPQ_48 (7311, "AN/TPQ-48"),
/** AN/TPQ-49 */
AN_TPQ_49 (7312, "AN/TPQ-49"),
+ /** AN/TPQ-46A */
+ AN_TPQ_46A (7313, "AN/TPQ-46A"),
+ /** AN/TPS-34 */
+ AN_TPS_34 (7314, "AN/TPS-34"),
/** AN/TPS-59 */
AN_TPS_59 (7315, "AN/TPS-59"),
+ /** AN/TPS-44 */
+ AN_TPS_44 (7316, "AN/TPS-44"),
/** AN/TPS-63 */
AN_TPS_63 (7320, "AN/TPS-63"),
/** AN/TPS-65 */
AN_TPS_65 (7321, "AN/TPS-65"),
/** AN/TPS-70 (V) 1 */
AN_TPS_70_V_1 (7322, "AN/TPS-70 (V) 1"),
+ /** AN/TPS-63SS */
+ AN_TPS_63SS (7323, "AN/TPS-63SS"),
/** AN/TPS-73 */
AN_TPS_73 (7324, "AN/TPS-73"),
/** AN/TPS-75 */
AN_TPS_75 (7325, "AN/TPS-75"),
/** AN/TSP-77 */
AN_TSP_77 (7326, "AN/TSP-77"),
+ /** AN/TPS-78 */
+ AN_TPS_78 (7327, "AN/TPS-78"),
+ /** AN/TPS-79 */
+ AN_TPS_79 (7328, "AN/TPS-79"),
+ /** AN/TPS-703 */
+ AN_TPS_703 (7329, "AN/TPS-703"),
/** AN/TPX-46(V)7 */
AN_TPX_46V7 (7330, "AN/TPX-46(V)7"),
/** AN/TPY-2 */
AN_TPY_2 (7333, "AN/TPY-2"),
/** AN/ULQ-6A */
AN_ULQ_6A (7335, "AN/ULQ-6A"),
+ /** AN/ULQ-19 */
+ AN_ULQ_19 (7340, "AN/ULQ-19"),
+ /** AN/ULQ-21 */
+ AN_ULQ_21 (7345, "AN/ULQ-21"),
/** AN/UPN 25 */
AN_UPN_25 (7380, "AN/UPN 25"),
/** AN/UPS 1 */
AN_UPS_1 (7425, "AN/UPS 1"),
/** AN/UPS-2 */
AN_UPS_2 (7426, "AN/UPS-2"),
+ /** AN/UPS-3 */
+ AN_UPS_3 (7427, "AN/UPS-3"),
/** AN/UPX 1 */
AN_UPX_1 (7470, "AN/UPX 1"),
/** AN/UPX 5 */
@@ -858,6 +1044,8 @@ public enum EmitterName
AN_UPX_17 (7650, "AN/UPX 17"),
/** AN/UPX 23 */
AN_UPX_23 (7695, "AN/UPX 23"),
+ /** AN/USQ-113(V)3 */
+ AN_USQ_113V3 (7700, "AN/USQ-113(V)3"),
/** AN/VPS 2 */
AN_VPS_2 (7740, "AN/VPS 2"),
/** AN/PLM-3 */
@@ -868,12 +1056,16 @@ public enum EmitterName
AN_PLM_4 (7752, "AN/PLM-4"),
/** AN/ZPY-3 */
AN_ZPY_3 (7755, "AN/ZPY-3"),
+ /** AORL-1AS */
+ AORL_1AS (7761, "AORL-1AS"),
+ /** AORL-85K/TK/MTA */
+ AORL_85K_TK_MTA (7762, "AORL-85K/TK/MTA"),
/** APAR */
APAR (7765, "APAR"),
/** Aparna */
APARNA (7770, "Aparna"),
- /** */
- undef_23 (7785, ""),
+ /** COMMID_ApelcoAD77 */
+ COMMID_APELCOAD77 (7785, "COMMID_ApelcoAD77"),
/** APG 71 */
APG_71 (7830, "APG 71"),
/** APN 148 */
@@ -888,26 +1080,42 @@ public enum EmitterName
APQ_148 (8055, "APQ 148"),
/** APS 504 V3 */
APS_504_V3 (8100, "APS 504 V3"),
+ /** AQUITAINE II */
+ AQUITAINE_II (8102, "AQUITAINE II"),
+ /** AR-1 */
+ AR_1 (8103, "AR-1"),
/** AR 3D */
AR_3D (8105, "AR 3D"),
- /** */
- undef_24 (8112, ""),
- /** */
- undef_25 (8113, " "),
+ /** COMMID_PlesseyAR-5 */
+ COMMID_PLESSEYAR_5 (8112, "COMMID_PlesseyAR-5"),
+ /** COMMID_AR-15 */
+ COMMID_AR_15 (8113, "COMMID_AR-15"),
+ /** AR-15/2 */
+ AR_15_2 (8114, "AR-15/2"),
/** AR 320 */
AR_320 (8115, "AR 320"),
+ /** AR-325 */
+ AR_325 (8118, "AR-325"),
/** AR 327 */
AR_327 (8120, "AR 327"),
- /** */
- undef_26 (8123, " "),
- /** */
- undef_27 (8126, " "),
+ /** Arbalet-52 */
+ ARBALET_52 (8121, "Arbalet-52"),
+ /** ARBB-31 */
+ ARBB_31 (8122, "ARBB-31"),
+ /** COMMID_ARBB33 */
+ COMMID_ARBB33 (8123, "COMMID_ARBB33"),
+ /** COMMID_ARIES */
+ COMMID_ARIES (8126, "COMMID_ARIES"),
/** ARGS-14E */
ARGS_14E (8134, "ARGS-14E"),
/** ARGS 31 */
ARGS_31 (8135, "ARGS 31"),
+ /** ARGUS */
+ ARGUS (8140, "ARGUS"),
/** AR M31 */
AR_M31 (8145, "AR M31"),
+ /** ARECIBO */
+ ARECIBO (8150, "ARECIBO"),
/** ARED */
ARED (8160, "ARED"),
/** ARI 5954 */
@@ -918,58 +1126,100 @@ public enum EmitterName
ARI_5979 (8280, "ARI 5979"),
/** ARGSN-31 */
ARGSN_31 (8281, "ARGSN-31"),
- /** */
- undef_28 (8325, ""),
- /** */
- undef_29 (8370, ""),
+ /** ARGOS-10 */
+ ARGOS_10 (8282, "ARGOS-10"),
+ /** ARGOS-800 */
+ ARGOS_800 (8283, "ARGOS-800"),
+ /** ARI 5983 */
+ ARI_5983 (8284, "ARI 5983"),
+ /** ARI 5991 */
+ ARI_5991 (8285, "ARI 5991"),
+ /** ARI 5995 */
+ ARI_5995 (8290, "ARI 5995"),
+ /** COMMID_ARINC564BNDXKINGRDR1E */
+ COMMID_ARINC564BNDXKINGRDR1E (8325, "COMMID_ARINC564BNDXKINGRDR1E"),
+ /** COMMID_ARINC700BNDXKINGRDR1E */
+ COMMID_ARINC700BNDXKINGRDR1E (8370, "COMMID_ARINC700BNDXKINGRDR1E"),
/** ARK-1 */
ARK_1 (8375, "ARK-1"),
- /** */
- undef_30 (8378, " "),
+ /** COMMID_ARL-MMTI */
+ COMMID_ARL_MMTI (8378, "COMMID_ARL-MMTI"),
+ /** ARMOR */
+ ARMOR (8379, "ARMOR"),
/** ARSR-3 */
ARSR_3 (8380, "ARSR-3"),
+ /** ARS-400 */
+ ARS_400 (8381, "ARS-400"),
+ /** ARSR-1 */
+ ARSR_1 (8382, "ARSR-1"),
+ /** ARSR-4 */
+ ARSR_4 (8384, "ARSR-4"),
/** ARSR-18 */
ARSR_18 (8390, "ARSR-18"),
- /** */
- undef_31 (8395, " "),
- /** */
- undef_32 (8415, ""),
- /** */
- undef_33 (8460, ""),
+ /** COMMID_ARTHUR */
+ COMMID_ARTHUR (8395, "COMMID_ARTHUR"),
+ /** ARTHUR MOD B */
+ ARTHUR_MOD_B (8400, "ARTHUR MOD B"),
+ /** ARTHUR MOD C */
+ ARTHUR_MOD_C (8405, "ARTHUR MOD C"),
+ /** NATOID_AS2Kipper */
+ NATOID_AS2KIPPER (8415, "NATOID_AS2Kipper"),
+ /** NATOID_AS2KipperMH */
+ NATOID_AS2KIPPERMH (8460, "NATOID_AS2KipperMH"),
/** AS 3 YJ-83K mmW MH */
AS_3_YJ_83K_MMW_MH (8470, "AS 3 YJ-83K mmW MH"),
/** AS.34 Kormoran Seeker */
AS34_KORMORAN_SEEKER (8480, "AS.34 Kormoran Seeker"),
- /** */
- undef_34 (8505, ""),
- /** */
- undef_35 (8550, ""),
- /** */
- undef_36 (8595, ""),
- /** */
- undef_37 (8640, ""),
- /** */
- undef_38 (8685, ""),
- /** */
- undef_39 (8730, ""),
- /** */
- undef_40 (8735, ""),
- /** */
- undef_41 (8736, " "),
- /** */
- undef_42 (8737, " "),
- /** */
- undef_43 (8750, " "),
+ /** NATOID_AS4Kitchen */
+ NATOID_AS4KITCHEN (8505, "NATOID_AS4Kitchen"),
+ /** NATOID_AS4KitchenMH */
+ NATOID_AS4KITCHENMH (8550, "NATOID_AS4KitchenMH"),
+ /** NATOID_AS5KeltMH */
+ NATOID_AS5KELTMH (8595, "NATOID_AS5KeltMH"),
+ /** NATOID_AS6KingfishMH */
+ NATOID_AS6KINGFISHMH (8640, "NATOID_AS6KingfishMH"),
+ /** NATOID_AS7Kerry */
+ NATOID_AS7KERRY (8685, "NATOID_AS7Kerry"),
+ /** NATOID_AS7KerryMG */
+ NATOID_AS7KERRYMG (8730, "NATOID_AS7KerryMG"),
+ /** NATOID_AS15KENTaltimeter */
+ NATOID_AS15KENTALTIMETER (8735, "NATOID_AS15KENTaltimeter"),
+ /** NATOID_AS-17AKryptonSeeker */
+ NATOID_AS_17AKRYPTONSEEKER (8736, "NATOID_AS-17AKryptonSeeker"),
+ /** NATOID_AS-17BKryptonSeeker */
+ NATOID_AS_17BKRYPTONSEEKER (8737, "NATOID_AS-17BKryptonSeeker"),
+ /** COMMID_AS901 */
+ COMMID_AS901 (8750, "COMMID_AS901"),
+ /** AS901A */
+ AS901A (8751, "AS901A"),
/** ASARS2 */
ASARS2 (8755, "ASARS2"),
+ /** ASDE-KDD */
+ ASDE_KDD (8756, "ASDE-KDD"),
+ /** ASLESHA */
+ ASLESHA (8757, "ASLESHA"),
+ /** A-SMGCS */
+ A_SMGCS (8758, "A-SMGCS"),
+ /** ASMI-18X */
+ ASMI_18X (8759, "ASMI-18X"),
/** Aspide AAM/SAM ILL */
ASPIDE_AAM_SAM_ILL (8760, "Aspide AAM/SAM ILL"),
+ /** ASMI-3 */
+ ASMI_3 (8761, "ASMI-3"),
+ /** ASR-2000 */
+ ASR_2000 (8771, "ASR-2000"),
/** ASR-4 */
ASR_4 (8772, "ASR-4"),
/** ASR-4D */
ASR_4D (8773, "ASR-4D"),
/** ASR O */
ASR_O (8775, "ASR O"),
+ /** ASR-12 */
+ ASR_12 (8776, "ASR-12"),
+ /** ASR-22AL */
+ ASR_22AL (8778, "ASR-22AL"),
+ /** ASR-3 */
+ ASR_3 (8779, "ASR-3"),
/** ASR-5 */
ASR_5 (8780, "ASR-5"),
/** ASR-7 */
@@ -978,30 +1228,52 @@ public enum EmitterName
ASR_8 (8785, "ASR-8"),
/** ASR-9 */
ASR_9 (8790, "ASR-9"),
+ /** ASR-9000 */
+ ASR_9000 (8791, "ASR-9000"),
+ /** ASTI */
+ ASTI (8792, "ASTI"),
/** ASR-11/DASR */
ASR_11_DASR (8793, "ASR-11/DASR"),
/** ASR-12 */
- ASR_12 (8795, "ASR-12"),
- /** */
- undef_44 (8812, ""),
+ ASR_12_2 (8795, "ASR-12"),
+ /** COMMID_RaytheonASR-10SS */
+ COMMID_RAYTHEONASR_10SS (8812, "COMMID_RaytheonASR-10SS"),
/** ASR-23SS */
ASR_23SS (8816, "ASR-23SS"),
/** Arabel */
ARABEL (8818, "Arabel"),
- /** */
- undef_45 (8819, " "),
- /** */
- undef_46 (8820, ""),
+ /** COMMID_ASTRE */
+ COMMID_ASTRE (8819, "COMMID_ASTRE"),
+ /** NATOID_AT2SwatterMG */
+ NATOID_AT2SWATTERMG (8820, "NATOID_AT2SwatterMG"),
+ /** 9K114 Shturm MG */
+ NAME_9K114_SHTURM_MG (8824, "9K114 Shturm MG"),
+ /** ATCR-22 */
+ ATCR_22 (8830, "ATCR-22"),
+ /** ATCR-22 M */
+ ATCR_22_M (8831, "ATCR-22 M"),
+ /** ATCR-2T */
+ ATCR_2T (8832, "ATCR-2T"),
/** ATCR-33 */
ATCR_33 (8840, "ATCR-33"),
/** ATCR 33 K/M */
ATCR_33_K_M (8845, "ATCR 33 K/M"),
/** ATCR-33S */
ATCR_33S (8846, "ATCR-33S"),
- /** */
- undef_47 (8850, " "),
- /** */
- undef_48 (8865, ""),
+ /** ATCR-3T */
+ ATCR_3T (8847, "ATCR-3T"),
+ /** ATCR-44 */
+ ATCR_44 (8848, "ATCR-44"),
+ /** ATCR-44 K */
+ ATCR_44_K (8849, "ATCR-44 K"),
+ /** COMMID_Argos73 */
+ COMMID_ARGOS73 (8850, "COMMID_Argos73"),
+ /** ATCR-44 M/S */
+ ATCR_44_M_S (8851, "ATCR-44 M/S"),
+ /** ATCR-4T */
+ ATCR_4T (8852, "ATCR-4T"),
+ /** COMMID_AtlasElektronkTRSN */
+ COMMID_ATLASELEKTRONKTRSN (8865, "COMMID_AtlasElektronkTRSN"),
/** ATLAS-8600X */
ATLAS_8600X (8866, "ATLAS-8600X"),
/** Atlas-9600M */
@@ -1012,14 +1284,24 @@ public enum EmitterName
ATLAS_9600S (8869, "ATLAS-9600S"),
/** ATLAS-9740 VTS */
ATLAS_9740_VTS (8870, "ATLAS-9740 VTS"),
+ /** ATLASS */
+ ATLASS (8871, "ATLASS"),
+ /** ATR-500C */
+ ATR_500C (8880, "ATR-500C"),
/** AVG 65 */
AVG_65 (8910, "AVG 65"),
/** AVH 7 */
AVH_7 (8955, "AVH 7"),
- /** */
- undef_49 (8990, ""),
- /** */
- undef_50 (8995, ""),
+ /** AVIA CM */
+ AVIA_CM (8980, "AVIA CM"),
+ /** AVIA D */
+ AVIA_D (8985, "AVIA D"),
+ /** COMMID_Aviaconversia */
+ COMMID_AVIACONVERSIA (8990, "COMMID_Aviaconversia"),
+ /** COMMID_AviaconversiaII */
+ COMMID_AVIACONVERSIAII (8993, "COMMID_AviaconversiaII"),
+ /** COMMID_AviaconversiaIII */
+ COMMID_AVIACONVERSIAIII (8995, "COMMID_AviaconversiaIII"),
/** AVQ 20 */
AVQ_20 (9000, "AVQ 20"),
/** AVQ-21 */
@@ -1040,76 +1322,84 @@ public enum EmitterName
B597Z (9200, "B597Z"),
/** B636Z */
B636Z (9205, "B636Z"),
- /** */
- undef_51 (9215, ""),
- /** */
- undef_52 (9225, ""),
- /** */
- undef_53 (9270, ""),
- /** */
- undef_54 (9280, ""),
+ /** NATOID_BackBoard */
+ NATOID_BACKBOARD (9215, "NATOID_BackBoard"),
+ /** NATOID_BackNetAB */
+ NATOID_BACKNETAB (9225, "NATOID_BackNetAB"),
+ /** NATOID_BackTrap */
+ NATOID_BACKTRAP (9270, "NATOID_BackTrap"),
+ /** COMMID_BAESystemsRT-1805APN */
+ COMMID_BAESYSTEMSRT_1805APN (9280, "COMMID_BAESystemsRT-1805APN"),
/** Balance Beam */
BALANCE_BEAM (9285, "Balance Beam"),
+ /** BALTIKA-B */
+ BALTIKA_B (9300, "BALTIKA-B"),
/** BALTYK */
BALTYK (9310, "BALTYK"),
- /** */
- undef_55 (9315, ""),
- /** */
- undef_56 (9360, ""),
- /** */
- undef_57 (9405, ""),
- /** */
- undef_58 (9406, " "),
- /** P-35/37 ("A"); P-50 ("B") */
- P_35_37_A_P_50_B_ (9450, "P-35/37 ('A'); P-50 ('B')"),
+ /** NATOID_BallEnd */
+ NATOID_BALLEND (9315, "NATOID_BallEnd"),
+ /** NATOID_BallGun */
+ NATOID_BALLGUN (9360, "NATOID_BallGun"),
+ /** NATOID_BandStand */
+ NATOID_BANDSTAND (9405, "NATOID_BandStand"),
+ /** COMMID_BandStand3 */
+ COMMID_BANDSTAND3 (9406, "COMMID_BandStand3"),
+ /** P-35/37 (A); P-50 (B) */
+ P_35_37_A_P_50_B (9450, "P-35/37 (A); P-50 (B)"),
+ /** BARAX */
+ BARAX (9475, "BARAX"),
/** BASIR-110D */
BASIR_110D (9485, "BASIR-110D"),
- /** */
- undef_59 (9495, ""),
+ /** NATOID_BassTilt */
+ NATOID_BASSTILT (9495, "NATOID_BassTilt"),
/** Badger */
BADGER (9505, "Badger"),
- /** */
- undef_60 (9540, ""),
- /** */
- undef_61 (9585, ""),
- /** */
- undef_62 (9630, ""),
- /** */
- undef_63 (9640, ""),
- /** */
- undef_64 (9642, ""),
- /** */
- undef_65 (9643, ""),
- /** */
- undef_66 (9645, ""),
- /** */
- undef_67 (9659, ""),
- /** */
- undef_68 (9660, ""),
- /** */
- undef_69 (9661, ""),
- /** */
- undef_70 (9675, ""),
- /** */
- undef_71 (9720, ""),
- /** */
- undef_72 (9765, ""),
- /** */
- undef_73 (9775, " "),
+ /** NATOID_Beacon */
+ NATOID_BEACON (9540, "NATOID_Beacon"),
+ /** NATOID_BeanSticks */
+ NATOID_BEANSTICKS (9585, "NATOID_BeanSticks"),
+ /** NATOID_BeeHind */
+ NATOID_BEEHIND (9630, "NATOID_BeeHind"),
+ /** NATOID_BellCrownA */
+ NATOID_BELLCROWNA (9640, "NATOID_BellCrownA"),
+ /** NATOID_BellCrownB */
+ NATOID_BELLCROWNB (9642, "NATOID_BellCrownB"),
+ /** NATOID_BellSquat */
+ NATOID_BELLSQUAT (9643, "NATOID_BellSquat"),
+ /** NATOID_BIGBACK */
+ NATOID_BIGBACK (9645, "NATOID_BIGBACK"),
+ /** NATOID_BigBirdABC */
+ NATOID_BIGBIRDABC (9659, "NATOID_BigBirdABC"),
+ /** NATOID_BigBirdD */
+ NATOID_BIGBIRDD (9660, "NATOID_BigBirdD"),
+ /** NATOID_BigBirdDMod */
+ NATOID_BIGBIRDDMOD (9661, "NATOID_BigBirdDMod"),
+ /** NATOID_BigBulge */
+ NATOID_BIGBULGE (9675, "NATOID_BigBulge"),
+ /** NATOID_BigBulgeA */
+ NATOID_BIGBULGEA (9720, "NATOID_BigBulgeA"),
+ /** NATOID_BigBulgeB */
+ NATOID_BIGBULGEB (9765, "NATOID_BigBulgeB"),
+ /** COMMID_BIGEYE */
+ COMMID_BIGEYE (9775, "COMMID_BIGEYE"),
/** SNAR-10 */
SNAR_10 (9780, "SNAR-10"),
- /** */
- undef_74 (9781, " "),
- /** */
- undef_75 (9810, ""),
- /** */
- undef_76 (9855, ""),
+ /** COMMID_BIGHEADB */
+ COMMID_BIGHEADB (9781, "COMMID_BIGHEADB"),
+ /** NATOID_BigMesh */
+ NATOID_BIGMESH (9810, "NATOID_BigMesh"),
+ /** NATOID_BigNet */
+ NATOID_BIGNET (9855, "NATOID_BigNet"),
/** 9S15MT */
- $9S15MT (9885, "9S15MT"),
- /** */
- undef_77 (9900, ""),
+ NAME_9S15MT (9885, "9S15MT"),
+ /** NATOID_BillFold */
+ NATOID_BILLFOLD (9900, "NATOID_BillFold"),
+ /** BLIGHTER 400 */
+ BLIGHTER_400 (9903, "BLIGHTER 400"),
/** Blowpipe MG */
BLOWPIPE_MG (9905, "Blowpipe MG"),
+ /** BLR */
+ BLR (9920, "BLR"),
/** Blue Fox */
BLUE_FOX (9930, "Blue Fox"),
/** Blue Kestrel */
@@ -1124,18 +1414,20 @@ public enum EmitterName
BLUE_ORCHID (10035, "Blue Orchid"),
/** BM/DJG-8715 */
BM_DJG_8715 (10057, "BM/DJG-8715"),
- /** */
- undef_78 (10080, ""),
- /** */
- undef_79 (10125, ""),
- /** */
- undef_80 (10170, ""),
- /** */
- undef_81 (10215, ""),
- /** */
- undef_82 (10260, ""),
- /** */
- undef_83 (10305, ""),
+ /** NATOID_BoatSail */
+ NATOID_BOATSAIL (10080, "NATOID_BoatSail"),
+ /** BOR-A 550 */
+ BOR_A_550 (10090, "BOR-A 550"),
+ /** COMMID_BoforsElectronic9LV331 */
+ COMMID_BOFORSELECTRONIC9LV331 (10125, "COMMID_BoforsElectronic9LV331"),
+ /** COMMID_BoforsEricssonSeaGiraffe50HC */
+ COMMID_BOFORSERICSSONSEAGIRAFFE50HC (10170, "COMMID_BoforsEricssonSeaGiraffe50HC"),
+ /** NATOID_BowlMesh */
+ NATOID_BOWLMESH (10215, "NATOID_BowlMesh"),
+ /** NATOID_BoxBrick */
+ NATOID_BOXBRICK (10260, "NATOID_BoxBrick"),
+ /** NATOID_BoxTail */
+ NATOID_BOXTAIL (10305, "NATOID_BoxTail"),
/** BM/KG 8601/8605/8606 */
BM_KG_8601_8605_8606 (10315, "BM/KG 8601/8605/8606"),
/** BPS 11A */
@@ -1148,18 +1440,18 @@ public enum EmitterName
BR_15_TOKYO_KEIKI (10485, "BR-15 Tokyo KEIKI"),
/** BrahMos */
BRAHMOS (10500, "BrahMos"),
- /** */
- undef_84 (10510, " "),
- /** */
- undef_85 (10511, " "),
- /** */
- undef_86 (10512, " "),
- /** */
- undef_87 (10513, " "),
+ /** COMMID_BridgeMaster */
+ COMMID_BRIDGEMASTER (10510, "COMMID_BridgeMaster"),
+ /** COMMID_BridgeMasterEEPA */
+ COMMID_BRIDGEMASTEREEPA (10511, "COMMID_BridgeMasterEEPA"),
+ /** COMMID_BridgeMasterEATAandARPA */
+ COMMID_BRIDGEMASTEREATAANDARPA (10512, "COMMID_BridgeMasterEATAandARPA"),
+ /** COMMID_BridgeMasterEnaval */
+ COMMID_BRIDGEMASTERENAVAL (10513, "COMMID_BridgeMasterEnaval"),
/** Brimstone mmW MH */
BRIMSTONE_MMW_MH (10520, "Brimstone mmW MH"),
- /** */
- undef_88 (10530, ""),
+ /** NATOID_BreadBin */
+ NATOID_BREADBIN (10530, "NATOID_BreadBin"),
/** Asr */
ASR (10540, "Asr"),
/** BT 271 */
@@ -1168,20 +1460,24 @@ public enum EmitterName
BU_304 (10595, "BU-304"),
/** BX 732 */
BX_732 (10620, "BX 732"),
+ /** BUK-MB */
+ BUK_MB (10630, "BUK-MB"),
/** Buran-D */
BURAN_D (10642, "Buran-D"),
- /** */
- undef_89 (10665, ""),
+ /** BUREVISNYK-1 */
+ BUREVISNYK_1 (10650, "BUREVISNYK-1"),
+ /** NATOID_BuzzStand */
+ NATOID_BUZZSTAND (10665, "NATOID_BuzzStand"),
/** C 5A Multi Mode Radar */
C_5A_MULTI_MODE_RADAR (10710, "C 5A Multi Mode Radar"),
/** C-802 AL */
C_802_AL (10711, "C-802 AL"),
- /** */
- undef_90 (10740, " "),
+ /** COMMID_CAESAR */
+ COMMID_CAESAR (10740, "COMMID_CAESAR"),
/** Caiman */
CAIMAN (10755, "Caiman"),
- /** */
- undef_91 (10800, ""),
+ /** NATOID_CakeStand */
+ NATOID_CAKESTAND (10800, "NATOID_CakeStand"),
/** Calypso C61 */
CALYPSO_C61 (10845, "Calypso C61"),
/** Calypso C63 */
@@ -1192,14 +1488,14 @@ public enum EmitterName
CALYPSO_III (10891, "Calypso III"),
/** Calypso IV */
CALYPSO_IV (10892, "Calypso IV"),
- /** */
- undef_92 (10895, ""),
+ /** COMMID_CardionCoastal */
+ COMMID_CARDIONCOASTAL (10895, "COMMID_CardionCoastal"),
/** Castor Ii */
CASTOR_II (10935, "Castor Ii"),
/** Castor 2J TT (Crotale NG) */
CASTOR_2J_TT_CROTALE_NG (10940, "Castor 2J TT (Crotale NG)"),
- /** */
- undef_93 (10980, ""),
+ /** NATOID_CatHouse */
+ NATOID_CATHOUSE (10980, "NATOID_CatHouse"),
/** CDR-431 */
CDR_431 (10985, "CDR-431"),
/** CEAFAR */
@@ -1212,56 +1508,80 @@ public enum EmitterName
CEROS_200_CWI (10991, "CEROS 200 CWI"),
/** CH/SS-N-6 */
CH_SS_N_6 (10995, "CH/SS-N-6"),
- /** */
- undef_94 (11000, ""),
- /** */
- undef_95 (11010, ""),
+ /** NATOID_ChairBackTT */
+ NATOID_CHAIRBACKTT (11000, "NATOID_ChairBackTT"),
+ /** NATOID_ChairBackILL */
+ NATOID_CHAIRBACKILL (11010, "NATOID_ChairBackILL"),
/** LEMZ 96L6 */
LEMZ_96L6 (11020, "LEMZ 96L6"),
- /** */
- undef_96 (11025, ""),
- /** */
- undef_97 (11030, " "),
+ /** NATOID_CheeseBrick */
+ NATOID_CHEESEBRICK (11025, "NATOID_CheeseBrick"),
+ /** NATOID_CheeseCake */
+ NATOID_CHEESECAKE (11030, "NATOID_CheeseCake"),
/** Clam Pipe */
CLAM_PIPE (11070, "Clam Pipe"),
- /** */
- undef_98 (11115, ""),
+ /** NATOID_Clamshell */
+ NATOID_CLAMSHELL (11115, "NATOID_Clamshell"),
+ /** CLC-1 */
+ CLC_1 (11117, "CLC-1"),
+ /** CLC-2 */
+ CLC_2 (11118, "CLC-2"),
+ /** CLC-3 */
+ CLC_3 (11119, "CLC-3"),
+ /** CLR-155 */
+ CLR_155 (11120, "CLR-155"),
+ /** COAST WATCHER 100 */
+ COAST_WATCHER_100 (11123, "COAST WATCHER 100"),
/** Coastal Giraffe */
COASTAL_GIRAFFE (11125, "Coastal Giraffe"),
+ /** COBRA */
+ COBRA (11130, "COBRA"),
+ /** Cobra Shoe */
+ COBRA_SHOE (11133, "Cobra Shoe"),
/** Colibri */
COLIBRI (11137, "Colibri"),
- /** */
- undef_99 (11155, " "),
- /** */
- undef_100 (11160, ""),
- /** */
- undef_101 (11205, ""),
- /** */
- undef_102 (11230, " "),
- /** */
- undef_103 (11240, " "),
- /** */
- undef_104 (11250, ""),
- /** */
- undef_105 (11260, ""),
+ /** COMMID_CollinsWXR-300 */
+ COMMID_COLLINSWXR_300 (11155, "COMMID_CollinsWXR-300"),
+ /** COMMID_CollinsWXR-700X */
+ COMMID_COLLINSWXR_700X (11160, "COMMID_CollinsWXR-700X"),
+ /** Collins TWR-850 */
+ COLLINS_TWR_850 (11165, "Collins TWR-850"),
+ /** COMMID_CollinsDN101 */
+ COMMID_COLLINSDN101 (11205, "COMMID_CollinsDN101"),
+ /** NATOID_COMET-1 */
+ NATOID_COMET_1 (11230, "NATOID_COMET-1"),
+ /** CONDOR MK 2 */
+ CONDOR_MK_2 (11235, "CONDOR MK 2"),
+ /** COMMID_ConsiliumSelesmarRTM25XIM */
+ COMMID_CONSILIUMSELESMARRTM25XIM (11240, "COMMID_ConsiliumSelesmarRTM25XIM"),
+ /** COMMID_ContravesSeaHunterMK4 */
+ COMMID_CONTRAVESSEAHUNTERMK4 (11250, "COMMID_ContravesSeaHunterMK4"),
+ /** NATOID_CornCan */
+ NATOID_CORNCAN (11260, "NATOID_CornCan"),
+ /** COSMO SKYMED-1 */
+ COSMO_SKYMED_1 (11265, "COSMO SKYMED-1"),
/** CR-105 RMCA */
CR_105_RMCA (11270, "CR-105 RMCA"),
- /** */
- undef_106 (11295, ""),
- /** */
- undef_107 (11340, ""),
- /** */
- undef_108 (11385, ""),
- /** */
- undef_109 (11430, ""),
- /** */
- undef_110 (11475, ""),
- /** */
- undef_111 (11520, ""),
- /** */
- undef_112 (11565, ""),
- /** */
- undef_113 (11610, ""),
+ /** CREW Duke 2 */
+ CREW_DUKE_2 (11280, "CREW Duke 2"),
+ /** CREW Duke 3 */
+ CREW_DUKE_3 (11290, "CREW Duke 3"),
+ /** NATOID_CrossBird */
+ NATOID_CROSSBIRD (11295, "NATOID_CrossBird"),
+ /** NATOID_CrossDome */
+ NATOID_CROSSDOME (11340, "NATOID_CrossDome"),
+ /** NATOID_CrossLegs */
+ NATOID_CROSSLEGS (11385, "NATOID_CrossLegs"),
+ /** NATOID_CrossOut */
+ NATOID_CROSSOUT (11430, "NATOID_CrossOut"),
+ /** NATOID_CrossSlot */
+ NATOID_CROSSSLOT (11475, "NATOID_CrossSlot"),
+ /** NATOID_CrossSword */
+ NATOID_CROSSSWORD (11520, "NATOID_CrossSword"),
+ /** NATOID_CrossUp */
+ NATOID_CROSSUP (11565, "NATOID_CrossUp"),
+ /** NATOID_CrossSwordFC */
+ NATOID_CROSSSWORDFC (11610, "NATOID_CrossSwordFC"),
/** Crotale Acquisition TA */
CROTALE_ACQUISITION_TA (11655, "Crotale Acquisition TA"),
/** Crotale NG TA */
@@ -1278,18 +1598,24 @@ public enum EmitterName
CSS_N_4_MH (11735, "CSS-N-4 MH"),
/** CSS C 3C CAS 1M1 M2 MH */
CSS_C_3C_CAS_1M1_M2_MH (11745, "CSS C 3C CAS 1M1 M2 MH"),
+ /** HY-2B MH */
+ HY_2B_MH (11748, "HY-2B MH"),
/** CSS C 2B HY 1A MH */
CSS_C_2B_HY_1A_MH (11790, "CSS C 2B HY 1A MH"),
/** CSS-N-4 Sardine */
CSS_N_4_SARDINE (11800, "CSS-N-4 Sardine"),
/** CSS-N-8 Saccade */
CSS_N_8_SACCADE (11810, "CSS-N-8 Saccade"),
- /** */
- undef_114 (11825, " "),
+ /** NATOID_CurlStoneB */
+ NATOID_CURLSTONEB (11825, "NATOID_CurlStoneB"),
+ /** CWS-1 */
+ CWS_1 (11830, "CWS-1"),
/** CWS 2 */
CWS_2 (11835, "CWS 2"),
- /** */
- undef_115 (11880, ""),
+ /** CWS-3 */
+ CWS_3 (11840, "CWS-3"),
+ /** NATOID_CylinderHead */
+ NATOID_CYLINDERHEAD (11880, "NATOID_CylinderHead"),
/** Cymbeline */
CYMBELINE (11902, "Cymbeline"),
/** Cyrano II */
@@ -1306,86 +1632,90 @@ public enum EmitterName
DA_05_2 (12016, "DA-05/2"),
/** DA.08 */
DA08 (12018, "DA.08"),
- /** */
- undef_116 (12060, ""),
- /** */
- undef_117 (12105, ""),
- /** */
- undef_118 (12110, ""),
- /** */
- undef_119 (12111, ""),
- /** */
- undef_120 (12150, ""),
- /** */
- undef_121 (12195, ""),
- /** */
- undef_122 (12196, " "),
- /** */
- undef_123 (12240, ""),
- /** */
- undef_124 (12285, ""),
- /** */
- undef_125 (12292, ""),
- /** */
- undef_126 (12330, ""),
- /** */
- undef_127 (12375, ""),
- /** */
- undef_128 (12420, ""),
- /** */
- undef_129 (12430, ""),
- /** */
- undef_130 (12465, ""),
- /** */
- undef_131 (12510, ""),
- /** */
- undef_132 (12555, ""),
- /** */
- undef_133 (12600, ""),
- /** */
- undef_134 (12610, ""),
- /** */
- undef_135 (12615, ""),
- /** */
- undef_136 (12616, " "),
- /** */
- undef_137 (12645, ""),
- /** */
- undef_138 (12655, ""),
- /** */
- undef_139 (12690, ""),
- /** */
- undef_140 (12691, ""),
- /** */
- undef_141 (12694, " "),
- /** */
- undef_142 (12735, ""),
- /** */
- undef_143 (12780, ""),
- /** */
- undef_144 (12782, ""),
- /** */
- undef_145 (12785, ""),
- /** */
- undef_146 (12787, ""),
- /** */
- undef_147 (12800, ""),
- /** */
- undef_148 (12805, ""),
- /** */
- undef_149 (12825, ""),
+ /** NATOID_Dawn */
+ NATOID_DAWN (12060, "NATOID_Dawn"),
+ /** DCR */
+ DCR (12090, "DCR"),
+ /** NATOID_DeadDuck */
+ NATOID_DEADDUCK (12105, "NATOID_DeadDuck"),
+ /** COMMID_DECCA-20V909 */
+ COMMID_DECCA_20V909 (12110, "COMMID_DECCA-20V909"),
+ /** COMMID_DECCA-20V90S */
+ COMMID_DECCA_20V90S (12111, "COMMID_DECCA-20V90S"),
+ /** COMMID_DECCA45 */
+ COMMID_DECCA45 (12150, "COMMID_DECCA45"),
+ /** COMMID_DECCA50 */
+ COMMID_DECCA50 (12195, "COMMID_DECCA50"),
+ /** COMMID_DECCA71 */
+ COMMID_DECCA71 (12196, "COMMID_DECCA71"),
+ /** Decca 72 */
+ DECCA_72 (12197, "Decca 72"),
+ /** COMMID_DECCA110 */
+ COMMID_DECCA110 (12240, "COMMID_DECCA110"),
+ /** COMMID_DECCA170 */
+ COMMID_DECCA170 (12285, "COMMID_DECCA170"),
+ /** COMMID_DECCAHF2 */
+ COMMID_DECCAHF2 (12292, "COMMID_DECCAHF2"),
+ /** COMMID_DECCA202 */
+ COMMID_DECCA202 (12330, "COMMID_DECCA202"),
+ /** COMMID_DECCAD202 */
+ COMMID_DECCAD202 (12375, "COMMID_DECCAD202"),
+ /** COMMID_DECCA303 */
+ COMMID_DECCA303 (12420, "COMMID_DECCA303"),
+ /** COMMID_DECCA535 */
+ COMMID_DECCA535 (12430, "COMMID_DECCA535"),
+ /** COMMID_DECCA626 */
+ COMMID_DECCA626 (12465, "COMMID_DECCA626"),
+ /** COMMID_DECCA629 */
+ COMMID_DECCA629 (12510, "COMMID_DECCA629"),
+ /** COMMID_DECCA914 */
+ COMMID_DECCA914 (12555, "COMMID_DECCA914"),
+ /** COMMID_DECCA916 */
+ COMMID_DECCA916 (12600, "COMMID_DECCA916"),
+ /** COMMID_DECCA926 */
+ COMMID_DECCA926 (12610, "COMMID_DECCA926"),
+ /** COMMID_DECCA1070A */
+ COMMID_DECCA1070A (12615, "COMMID_DECCA1070A"),
+ /** COMMID_Decca1008 */
+ COMMID_DECCA1008 (12616, "COMMID_Decca1008"),
+ /** COMMID_DECCA1226Commercial */
+ COMMID_DECCA1226COMMERCIAL (12645, "COMMID_DECCA1226Commercial"),
+ /** COMMID_DECCA1290 */
+ COMMID_DECCA1290 (12655, "COMMID_DECCA1290"),
+ /** COMMID_DECCA1626 */
+ COMMID_DECCA1626 (12690, "COMMID_DECCA1626"),
+ /** COMMID_DECCA2070 */
+ COMMID_DECCA2070 (12691, "COMMID_DECCA2070"),
+ /** COMMID_Decca1630 */
+ COMMID_DECCA1630 (12694, "COMMID_Decca1630"),
+ /** COMMID_DECCA2459 */
+ COMMID_DECCA2459 (12735, "COMMID_DECCA2459"),
+ /** COMMID_DECCAAWS1 */
+ COMMID_DECCAAWS1 (12780, "COMMID_DECCAAWS1"),
+ /** COMMID_DECCAAWS2 */
+ COMMID_DECCAAWS2 (12782, "COMMID_DECCAAWS2"),
+ /** COMMID_DECCAAWS4 */
+ COMMID_DECCAAWS4 (12785, "COMMID_DECCAAWS4"),
+ /** COMMID_DECCAAWS-4(2) */
+ COMMID_DECCAAWS_42 (12787, "COMMID_DECCAAWS-4(2)"),
+ /** COMMID_DECCAMAR */
+ COMMID_DECCAMAR (12800, "COMMID_DECCAMAR"),
+ /** COMMID_DECCARM326 */
+ COMMID_DECCARM326 (12805, "COMMID_DECCARM326"),
+ /** COMMID_DECCARM416 */
+ COMMID_DECCARM416 (12825, "COMMID_DECCARM416"),
/** DECCA RM 970BT */
DECCA_RM_970BT (12850, "DECCA RM 970BT"),
- /** */
- undef_150 (12870, ""),
+ /** COMMID_DECCARM914 */
+ COMMID_DECCARM914 (12870, "COMMID_DECCARM914"),
/** DF-21D Seeker */
DF_21D_SEEKER (12875, "DF-21D Seeker"),
- /** */
- undef_151 (12915, ""),
- /** */
- undef_152 (12916, " "),
- /** */
- undef_153 (12960, ""),
+ /** COMMID_DECCARM1690 */
+ COMMID_DECCARM1690 (12915, "COMMID_DECCARM1690"),
+ /** COMMID_DECCA1690 */
+ COMMID_DECCA1690 (12916, "COMMID_DECCA1690"),
+ /** COMMID_DECCASuper101MK3 */
+ COMMID_DECCASUPER101MK3 (12960, "COMMID_DECCASuper101MK3"),
/** DISS 1 */
DISS_1 (13005, "DISS 1"),
/** DISS-7 */
@@ -1394,14 +1724,16 @@ public enum EmitterName
DISS_013 (13007, "DISS-013"),
/** DISS-15D */
DISS_15D (13015, "DISS-15D"),
+ /** DLD-100A */
+ DLD_100A (13020, "DLD-100A"),
/** Rapier TTDN 181 */
RAPIER_TTDN_181 (13050, "Rapier TTDN 181"),
/** Rapier 2000 TT */
RAPIER_2000_TT (13055, "Rapier 2000 TT"),
- /** */
- undef_154 (13095, ""),
- /** */
- undef_155 (13140, ""),
+ /** NATOID_DogEar */
+ NATOID_DOGEAR (13095, "NATOID_DogEar"),
+ /** NATOID_DogHouse */
+ NATOID_DOGHOUSE (13140, "NATOID_DogHouse"),
/** DM3 */
DM3 (13141, "DM3"),
/** DM-3B */
@@ -1410,12 +1742,16 @@ public enum EmitterName
DM_5 (13143, "DM-5"),
/** Don 2 */
DON_2 (13185, "Don 2"),
- /** */
- undef_156 (13230, ""),
- /** */
- undef_157 (13275, ""),
- /** */
- undef_158 (13320, ""),
+ /** NATOID_DonAB2Kay */
+ NATOID_DONAB2KAY (13230, "NATOID_DonAB2Kay"),
+ /** NATOID_Donets */
+ NATOID_DONETS (13275, "NATOID_Donets"),
+ /** COMMID_Doppler90Series */
+ COMMID_DOPPLER90SERIES (13280, "COMMID_Doppler90Series"),
+ /** NATOID_DownBeat */
+ NATOID_DOWNBEAT (13320, "NATOID_DownBeat"),
+ /** DR-582 */
+ DR_582 (13360, "DR-582"),
/** DRAA 2A */
DRAA_2A (13365, "DRAA 2A"),
/** DRAA 2B */
@@ -1436,18 +1772,20 @@ public enum EmitterName
DRAC_43A (13460, "DRAC 43A"),
/** DRAC 44A */
DRAC_44A (13465, "DRAC 44A"),
- /** */
- undef_159 (13477, ""),
- /** */
- undef_160 (13480, " "),
- /** */
- undef_161 (13481, " "),
- /** */
- undef_162 (13485, " "),
+ /** NATOID_DragonEye */
+ NATOID_DRAGONEYE (13477, "NATOID_DragonEye"),
+ /** NATOID_DragonEye2 */
+ NATOID_DRAGONEYE2 (13480, "NATOID_DragonEye2"),
+ /** NATOID_DragonEye3 */
+ NATOID_DRAGONEYE3 (13481, "NATOID_DragonEye3"),
+ /** NATOID_DragonEye4 */
+ NATOID_DRAGONEYE4 (13485, "NATOID_DragonEye4"),
/** DRBC 30B */
DRBC_30B (13500, "DRBC 30B"),
/** DRBC 31A */
DRBC_31A (13545, "DRBC 31A"),
+ /** DRBC-31D */
+ DRBC_31D (13546, "DRBC-31D"),
/** DRBC-32 */
DRBC_32 (13585, "DRBC-32"),
/** DRBC 32A */
@@ -1466,20 +1804,28 @@ public enum EmitterName
DRBN_30 (13860, "DRBN 30"),
/** DRBN 32 */
DRBN_32 (13905, "DRBN 32"),
+ /** DRBN 34 */
+ DRBN_34 (13915, "DRBN 34"),
/** DRBR 51 */
DRBR_51 (13950, "DRBR 51"),
+ /** DRBV-20A */
+ DRBV_20A (13994, "DRBV-20A"),
/** DRBV 20B */
DRBV_20B (13995, "DRBV 20B"),
/** DRBV-21 Mars 05 */
DRBV_21_MARS_05 (14020, "DRBV-21 Mars 05"),
/** DRBV 22 */
DRBV_22 (14040, "DRBV 22"),
+ /** DRBV-23 */
+ DRBV_23 (14041, "DRBV-23"),
/** DRBV 26C */
DRBV_26C (14085, "DRBV 26C"),
/** DRBV 26D */
DRBV_26D (14086, "DRBV 26D"),
/** DRBV 30 */
DRBV_30 (14130, "DRBV 30"),
+ /** DRBV-31 */
+ DRBV_31 (14131, "DRBV-31"),
/** DRBV 50 */
DRBV_50 (14175, "DRBV 50"),
/** DRBV 51 */
@@ -1494,22 +1840,32 @@ public enum EmitterName
DROP_KICK (14400, "Drop Kick"),
/** DRUA 31 */
DRUA_31 (14445, "DRUA 31"),
- /** */
- undef_163 (14490, ""),
- /** */
- undef_164 (14535, ""),
- /** */
- undef_165 (14545, ""),
+ /** NATOID_DrumTilt */
+ NATOID_DRUMTILT (14490, "NATOID_DrumTilt"),
+ /** NATOID_DrumTiltA */
+ NATOID_DRUMTILTA (14535, "NATOID_DrumTiltA"),
+ /** NATOID_DrumTiltB */
+ NATOID_DRUMTILTB (14545, "NATOID_DrumTiltB"),
/** DRUN 30A */
DRUN_30A (14560, "DRUN 30A"),
- /** */
- undef_166 (14580, ""),
+ /** NATOID_Dumbo */
+ NATOID_DUMBO (14580, "NATOID_Dumbo"),
+ /** DWSR-92 */
+ DWSR_92 (14583, "DWSR-92"),
+ /** DWSR-93S */
+ DWSR_93S (14585, "DWSR-93S"),
+ /** EAGLE */
+ EAGLE (14586, "EAGLE"),
+ /** EAGLE Mk 1 */
+ EAGLE_MK_1 (14587, "EAGLE Mk 1"),
/** EKCO E390 */
EKCO_E390 (14590, "EKCO E390"),
/** ECR-90 */
ECR_90 (14600, "ECR-90"),
- /** */
- undef_167 (14625, ""),
+ /** NATOID_EggCupAB */
+ NATOID_EGGCUPAB (14625, "NATOID_EggCupAB"),
+ /** EISCAT */
+ EISCAT (14640, "EISCAT"),
/** EKCO E120 */
EKCO_E120 (14660, "EKCO E120"),
/** EKCO 190 */
@@ -1522,22 +1878,62 @@ public enum EmitterName
EL_M_2022 (14725, "EL/M-2022"),
/** EL/M-2032 */
EL_M_2032 (14726, "EL/M-2032"),
+ /** EL/M-2052 */
+ EL_M_2052 (14727, "EL/M-2052"),
/** EL/M-2055 */
EL_M_2055 (14728, "EL/M-2055"),
/** EL/M-2060 */
EL_M_2060 (14730, "EL/M-2060"),
/** EL/M-2075 */
EL_M_2075 (14735, "EL/M-2075"),
+ /** EL/M-2022U(V)3 */
+ EL_M_2022UV3 (14736, "EL/M-2022U(V)3"),
+ /** EL/M-2080 */
+ EL_M_2080 (14737, "EL/M-2080"),
+ /** EL/M-2080S */
+ EL_M_2080S (14738, "EL/M-2080S"),
+ /** EL/M-2085 */
+ EL_M_2085 (14739, "EL/M-2085"),
+ /** EL/M-2106 */
+ EL_M_2106 (14740, "EL/M-2106"),
+ /** EL/M-2106NG */
+ EL_M_2106NG (14741, "EL/M-2106NG"),
+ /** EL/M-2125 */
+ EL_M_2125 (14742, "EL/M-2125"),
+ /** EL/M-2129 */
+ EL_M_2129 (14743, "EL/M-2129"),
+ /** EL/M-2150 */
+ EL_M_2150 (14744, "EL/M-2150"),
+ /** EL/M-2083 */
+ EL_M_2083 (14745, "EL/M-2083"),
+ /** EL/M-2084 */
+ EL_M_2084 (14746, "EL/M-2084"),
+ /** EL/M-2160-V1 */
+ EL_M_2160_V1 (14747, "EL/M-2160-V1"),
+ /** EL/M-2084 MMR */
+ EL_M_2084_MMR (14748, "EL/M-2084 MMR"),
+ /** EL/M-2112 */
+ EL_M_2112 (14749, "EL/M-2112"),
/** EL/M-2200 */
EL_M_2200 (14750, "EL/M-2200"),
+ /** EL/M-2133 */
+ EL_M_2133 (14751, "EL/M-2133"),
+ /** EL/M-2205 */
+ EL_M_2205 (14755, "EL/M-2205"),
/** EL M 2207 */
EL_M_2207 (14760, "EL M 2207"),
- /** */
- undef_168 (14770, ""),
+ /** EL/M-2215 */
+ EL_M_2215 (14765, "EL/M-2215"),
+ /** NATOID_ELM2216(V) */
+ NATOID_ELM2216V (14770, "NATOID_ELM2216(V)"),
+ /** EL/M-2216XH */
+ EL_M_2216XH (14772, "EL/M-2216XH"),
/** EL/M-2218S */
EL_M_2218S (14775, "EL/M-2218S"),
/** ELT-361 */
ELT_361 (14776, "ELT-361"),
+ /** EL/M-2258 */
+ EL_M_2258 (14777, "EL/M-2258"),
/** ELT-558 */
ELT_558 (14780, "ELT-558"),
/** ELT-572 */
@@ -1548,6 +1944,8 @@ public enum EmitterName
EL_M_2228S_3D (14806, "EL/M-2228S/3D"),
/** EL/M-2705 */
EL_M_2705 (14807, "EL/M-2705"),
+ /** EL/M-2226 */
+ EL_M_2226 (14808, "EL/M-2226"),
/** EL/M-2228X */
EL_M_2228X (14809, "EL/M-2228X"),
/** ELTA SIS */
@@ -1556,20 +1954,38 @@ public enum EmitterName
EL_M_2238 (14811, "EL/M-2238"),
/** EL/M-2248 */
EL_M_2248 (14815, "EL/M-2248"),
- /** */
- undef_169 (14830, " "),
+ /** EL/M-2288 */
+ EL_M_2288 (14820, "EL/M-2288"),
+ /** EL/M-2311 */
+ EL_M_2311 (14821, "EL/M-2311"),
+ /** ELM-2026 */
+ ELM_2026 (14822, "ELM-2026"),
+ /** COMMID_ELNA4007 */
+ COMMID_ELNA4007 (14830, "COMMID_ELNA4007"),
+ /** ELW-2090 */
+ ELW_2090 (14835, "ELW-2090"),
+ /** COMMID_EnhancedMeteorDetectionRadarEMDR */
+ COMMID_ENHANCEDMETEORDETECTIONRADAREMDR (14845, "COMMID_EnhancedMeteorDetectionRadarEMDR"),
/** EMD 2900 */
EMD_2900 (14850, "EMD 2900"),
/** EMPAR */
EMPAR (14851, "EMPAR"),
- /** */
- undef_170 (14895, ""),
+ /** NATOID_EndTray */
+ NATOID_ENDTRAY (14895, "NATOID_EndTray"),
+ /** EQ-36 */
+ EQ_36 (14896, "EQ-36"),
/** Ericsson SLAR */
ERICSSON_SLAR (14897, "Ericsson SLAR"),
/** Erieye */
ERIEYE (14898, "Erieye"),
/** ESR 1 */
ESR_1 (14900, "ESR 1"),
+ /** ESR 220 */
+ ESR_220 (14901, "ESR 220"),
+ /** ESR380 */
+ ESR380 (14902, "ESR380"),
+ /** ESTEREL */
+ ESTEREL (14903, "ESTEREL"),
/** ET-316 */
ET_316 (14905, "ET-316"),
/** Exocet Type */
@@ -1582,38 +1998,38 @@ public enum EmitterName
EXOCET_1_MH (14985, "Exocet 1 MH"),
/** Exocet 2 */
EXOCET_2 (15030, "Exocet 2"),
- /** */
- undef_171 (15075, ""),
- /** */
- undef_172 (15120, ""),
- /** */
- undef_173 (15140, ""),
- /** */
- undef_174 (15155, ""),
- /** */
- undef_175 (15156, ""),
+ /** NATOID_EyeBowl */
+ NATOID_EYEBOWL (15075, "NATOID_EyeBowl"),
+ /** NATOID_EyeShield */
+ NATOID_EYESHIELD (15120, "NATOID_EyeShield"),
+ /** NATOID_F332Z */
+ NATOID_F332Z (15140, "NATOID_F332Z"),
+ /** NATOID_FalconClawTI */
+ NATOID_FALCONCLAWTI (15155, "NATOID_FalconClawTI"),
+ /** NATOID_FalconClawTT */
+ NATOID_FALCONCLAWTT (15156, "NATOID_FalconClawTT"),
/** FALCON */
FALCON (15160, "FALCON"),
/** FALCON-G */
FALCON_G (15161, "FALCON-G"),
- /** */
- undef_176 (15163, " "),
- /** */
- undef_177 (15165, ""),
- /** */
- undef_178 (15200, ""),
- /** */
- undef_179 (15210, ""),
- /** */
- undef_180 (15220, ""),
- /** */
- undef_181 (15230, ""),
- /** */
- undef_182 (15240, ""),
- /** */
- undef_183 (15255, ""),
- /** */
- undef_184 (15300, ""),
+ /** NATOID_FalconEye */
+ NATOID_FALCONEYE (15163, "NATOID_FalconEye"),
+ /** NATOID_FanSongA */
+ NATOID_FANSONGA (15165, "NATOID_FanSongA"),
+ /** NATOID_FanSongBFTA */
+ NATOID_FANSONGBFTA (15200, "NATOID_FanSongBFTA"),
+ /** NATOID_FanSongBFTT */
+ NATOID_FANSONGBFTT (15210, "NATOID_FanSongBFTT"),
+ /** NATOID_FanSongCETA */
+ NATOID_FANSONGCETA (15220, "NATOID_FanSongCETA"),
+ /** NATOID_FanSongCETT */
+ NATOID_FANSONGCETT (15230, "NATOID_FanSongCETT"),
+ /** NATOID_FanSongCEMG */
+ NATOID_FANSONGCEMG (15240, "NATOID_FanSongCEMG"),
+ /** NATOID_FanSongBFFMG */
+ NATOID_FANSONGBFFMG (15255, "NATOID_FanSongBFFMG"),
+ /** NATOID_FanTail */
+ NATOID_FANTAIL (15300, "NATOID_FanTail"),
/** FAR-2117 */
FAR_2117 (15301, "FAR-2117"),
/** FAR-2827 */
@@ -1632,78 +2048,86 @@ public enum EmitterName
FCS_2_21A (15315, "FCS-2-21A"),
/** FCS-2-21C */
FCS_2_21C (15317, "FCS-2-21C"),
+ /** FCS-2-22 */
+ FCS_2_22 (15318, "FCS-2-22"),
/** FCS-2-31 */
FCS_2_31 (15319, "FCS-2-31"),
/** FCS-3 */
FCS_3 (15320, "FCS-3"),
- /** */
- undef_185 (15345, ""),
- /** */
- undef_186 (15390, ""),
- /** */
- undef_187 (15435, ""),
- /** */
- undef_188 (15470, ""),
- /** */
- undef_189 (15475, ""),
- /** */
- undef_190 (15480, ""),
- /** */
- undef_191 (15525, ""),
- /** */
- undef_192 (15570, ""),
- /** */
- undef_193 (15615, ""),
- /** */
- undef_194 (15660, ""),
- /** */
- undef_195 (15705, ""),
- /** */
- undef_196 (15750, ""),
- /** */
- undef_197 (15795, ""),
- /** */
- undef_198 (15800, " "),
+ /** NATOID_FinCurve */
+ NATOID_FINCURVE (15345, "NATOID_FinCurve"),
+ /** NATOID_FireCan */
+ NATOID_FIRECAN (15390, "NATOID_FireCan"),
+ /** NATOID_FireDish */
+ NATOID_FIREDISH (15435, "NATOID_FireDish"),
+ /** NATOID_FireDomeTA */
+ NATOID_FIREDOMETA (15470, "NATOID_FireDomeTA"),
+ /** NATOID_FireDomeTT */
+ NATOID_FIREDOMETT (15475, "NATOID_FireDomeTT"),
+ /** NATOID_FireDomeTI */
+ NATOID_FIREDOMETI (15480, "NATOID_FireDomeTI"),
+ /** NATOID_FireIron */
+ NATOID_FIREIRON (15525, "NATOID_FireIron"),
+ /** NATOID_FireWheel */
+ NATOID_FIREWHEEL (15570, "NATOID_FireWheel"),
+ /** NATOID_FishBowl */
+ NATOID_FISHBOWL (15615, "NATOID_FishBowl"),
+ /** FLAIR */
+ FLAIR (15650, "FLAIR"),
+ /** NATOID_FlapLid */
+ NATOID_FLAPLID (15660, "NATOID_FlapLid"),
+ /** NATOID_FlapTruck */
+ NATOID_FLAPTRUCK (15705, "NATOID_FlapTruck"),
+ /** NATOID_FlapWheel */
+ NATOID_FLAPWHEEL (15750, "NATOID_FlapWheel"),
+ /** NATOID_FlashDance */
+ NATOID_FLASHDANCE (15795, "NATOID_FlashDance"),
+ /** NATOID_FlashDanceM */
+ NATOID_FLASHDANCEM (15800, "NATOID_FlashDanceM"),
/** P-15 */
P_15 (15840, "P-15"),
- /** */
- undef_199 (15842, ""),
- /** */
- undef_200 (15885, ""),
- /** */
- undef_201 (15930, ""),
- /** */
- undef_202 (15975, ""),
+ /** 35N6 */
+ NAME_35N6 (15842, "35N6"),
+ /** NATOID_FlatScreen */
+ NATOID_FLATSCREEN (15885, "NATOID_FlatScreen"),
+ /** NATOID_FlatSpin */
+ NATOID_FLATSPIN (15930, "NATOID_FlatSpin"),
+ /** NATOID_FlatTwin */
+ NATOID_FLATTWIN (15975, "NATOID_FlatTwin"),
/** FL-400 */
FL_400 (15980, "FL-400"),
/** Fledermaus */
FLEDERMAUS (16020, "Fledermaus"),
- /** */
- undef_203 (16030, ""),
- /** */
- undef_204 (16065, ""),
- /** */
- undef_205 (16110, ""),
- /** */
- undef_206 (16155, ""),
- /** */
- undef_207 (16200, ""),
- /** */
- undef_208 (16245, ""),
- /** */
- undef_209 (16290, ""),
+ /** NATOID_FLYCATCHER */
+ NATOID_FLYCATCHER (16030, "NATOID_FLYCATCHER"),
+ /** FLYCATCHER MK 2 */
+ FLYCATCHER_MK_2 (16035, "FLYCATCHER MK 2"),
+ /** NATOID_FlyScreen */
+ NATOID_FLYSCREEN (16065, "NATOID_FlyScreen"),
+ /** NATOID_FlyScreenAandB */
+ NATOID_FLYSCREENAB (16110, "NATOID_FlyScreenA&B"),
+ /** NATOID_FlyTrapB */
+ NATOID_FLYTRAPB (16155, "NATOID_FlyTrapB"),
+ /** FM-90 */
+ FM_90 (16160, "FM-90"),
+ /** NATOID_FogLampMG */
+ NATOID_FOGLAMPMG (16200, "NATOID_FogLampMG"),
+ /** NATOID_FogLampTT */
+ NATOID_FOGLAMPTT (16245, "NATOID_FogLampTT"),
+ /** NATOID_FoilTwo */
+ NATOID_FOILTWO (16290, "NATOID_FoilTwo"),
/** FootBall */
FOOTBALL (16300, "FootBall"),
/** Fox Hunter */
FOX_HUNTER (16335, "Fox Hunter"),
- /** */
- undef_210 (16380, ""),
- /** */
- undef_211 (16390, ""),
+ /** NATOID_FoxFireAL */
+ NATOID_FOXFIREAL (16380, "NATOID_FoxFireAL"),
+ /** NATOID_FoxFireILL */
+ NATOID_FOXFIREILL (16390, "NATOID_FoxFireILL"),
/** FR-151A */
FR_151A (16400, "FR-151A"),
- /** */
- undef_212 (16405, " "),
+ /** COMMID_FurunoFR-1500FR-1600 */
+ COMMID_FURUNOFR_1500FR_1600 (16405, "COMMID_FurunoFR-1500FR-1600"),
/** FR-1505 DA */
FR_1505_DA (16410, "FR-1505 DA"),
/** FR-1510DS */
@@ -1712,40 +2136,42 @@ public enum EmitterName
FR_2000 (16420, "FR-2000"),
/** Furuno-2855W */
FURUNO_2855W (16421, "Furuno-2855W"),
- /** */
- undef_213 (16422, " "),
- /** */
- undef_214 (16423, " "),
- /** */
- undef_215 (16424, " "),
- /** */
- undef_216 (16425, ""),
- /** */
- undef_217 (16470, ""),
- /** */
- undef_218 (16515, ""),
+ /** COMMID_FregatMAE */
+ COMMID_FREGATMAE (16422, "COMMID_FregatMAE"),
+ /** COMMID_FregatN1 */
+ COMMID_FREGATN1 (16423, "COMMID_FregatN1"),
+ /** COMMID_FregatN2 */
+ COMMID_FREGATN2 (16424, "COMMID_FregatN2"),
+ /** NATOID_FrontDome */
+ NATOID_FRONTDOME (16425, "NATOID_FrontDome"),
+ /** NATOID_FrontDoor */
+ NATOID_FRONTDOOR (16470, "NATOID_FrontDoor"),
+ /** NATOID_FrontPiece */
+ NATOID_FRONTPIECE (16515, "NATOID_FrontPiece"),
/** Furby mmW MH */
FURBY_MMW_MH (16520, "Furby mmW MH"),
- /** */
- undef_219 (16550, " "),
+ /** NATOID_Furke */
+ NATOID_FURKE (16550, "NATOID_Furke"),
+ /** Furke-4 */
+ FURKE_4 (16554, "Furke-4"),
/** Furuno */
FURUNO (16560, "Furuno"),
/** Furuno 1721 */
FURUNO_1721 (16561, "Furuno 1721"),
- /** */
- undef_220 (16564, " "),
- /** */
- undef_221 (16565, " "),
+ /** COMMID_Furuno1934C */
+ COMMID_FURUNO1934C (16564, "COMMID_Furuno1934C"),
+ /** COMMID_Furuno1715 */
+ COMMID_FURUNO1715 (16565, "COMMID_Furuno1715"),
/** Furuno 1730 */
FURUNO_1730 (16580, "Furuno 1730"),
/** Furuno 1832 */
FURUNO_1832 (16585, "Furuno 1832"),
- /** */
- undef_222 (16587, " "),
+ /** COMMID_Furuno1835 */
+ COMMID_FURUNO1835 (16587, "COMMID_Furuno1835"),
/** Furuno 1932 */
FURUNO_1932 (16590, "Furuno 1932"),
- /** */
- undef_223 (16596, " "),
+ /** COMMID_Furuno1935 */
+ COMMID_FURUNO1935 (16596, "COMMID_Furuno1935"),
/** Furuno 701 */
FURUNO_701 (16605, "Furuno 701"),
/** Furuno 1940 */
@@ -1768,42 +2194,60 @@ public enum EmitterName
FURUNO_240 (16690, "Furuno 240"),
/** Furuno 2400 */
FURUNO_2400 (16695, "Furuno 2400"),
+ /** FR-801D */
+ FR_801D (16725, "FR-801D"),
/** Furuno 8051 */
FURUNO_8051 (16730, "Furuno 8051"),
- /** */
- undef_224 (16732, " "),
- /** */
- undef_225 (16733, " "),
- /** */
- undef_226 (16734, " "),
+ /** COMMID_FurunoDRS-2D */
+ COMMID_FURUNODRS_2D (16732, "COMMID_FurunoDRS-2D"),
+ /** COMMID_FurunoDRS-4D */
+ COMMID_FURUNODRS_4D (16733, "COMMID_FurunoDRS-4D"),
+ /** COMMID_FurunoDRS-4A */
+ COMMID_FURUNODRS_4A (16734, "COMMID_FurunoDRS-4A"),
/** G030A(APD-31) */
G030AAPD_31 (16735, "G030A(APD-31)"),
/** GA 01 00 */
GA_01_00 (16740, "GA 01 00"),
- /** */
- undef_227 (16785, ""),
- /** */
- undef_228 (16800, ""),
- /** */
- undef_229 (16830, ""),
- /** */
- undef_230 (16833, ""),
+ /** NATOID_Gage */
+ NATOID_GAGE (16785, "NATOID_Gage"),
+ /** Gaofen-3 */
+ GAOFEN_3 (16787, "Gaofen-3"),
+ /** GAP GATE */
+ GAP_GATE (16790, "GAP GATE"),
+ /** NATOID_Gardenia */
+ NATOID_GARDENIA (16800, "NATOID_Gardenia"),
+ /** NATOID_Garpin */
+ NATOID_GARPIN (16830, "NATOID_Garpin"),
+ /** NATOID_GateGuard */
+ NATOID_GATEGUARD (16833, "NATOID_GateGuard"),
/** Garpun-Bal-E */
GARPUN_BAL_E (16835, "Garpun-Bal-E"),
/** GBS1 */
GBS1 (16840, "GBS1"),
- /** */
- undef_231 (16858, " "),
+ /** GCA-2000 */
+ GCA_2000 (16850, "GCA-2000"),
+ /** COMMID_Furuno18321921Series */
+ COMMID_FURUNO18321921SERIES (16858, "COMMID_Furuno18321921Series"),
+ /** COMMID_GEMINI-DB */
+ COMMID_GEMINI_DB (16870, "COMMID_GEMINI-DB"),
/** GEM BX 132 */
GEM_BX_132 (16875, "GEM BX 132"),
/** GEM SC-2050X */
GEM_SC_2050X (16876, "GEM SC-2050X"),
+ /** COMMID_GEMSeaEagle200N */
+ COMMID_GEMSEAEAGLE200N (16877, "COMMID_GEMSeaEagle200N"),
/** MPDR-12 */
MPDR_12 (16880, "MPDR-12"),
- /** */
- undef_232 (16884, ""),
+ /** GEN-X */
+ GEN_X (16881, "GEN-X"),
+ /** NATOID_GepardTT */
+ NATOID_GEPARDTT (16884, "NATOID_GepardTT"),
/** GERAN-F */
GERAN_F (16888, "GERAN-F"),
+ /** GERFAUT */
+ GERFAUT (16890, "GERFAUT"),
+ /** GFE(L)1 */
+ GFEL1 (16895, "GFE(L)1"),
/** GIRAFFE */
GIRAFFE (16900, "GIRAFFE"),
/** Giraffe-40 */
@@ -1812,24 +2256,20 @@ public enum EmitterName
GIRAFFE_50_AT (16908, "Giraffe-50 AT"),
/** Giraffe 75 */
GIRAFFE_75 (16912, "Giraffe 75"),
- /** */
- undef_233 (16915, ""),
+ /** NATOID_GinSlingTA */
+ NATOID_GINSLINGTA (16915, "NATOID_GinSlingTA"),
/** Gin Sling */
GIN_SLING (16920, "Gin Sling"),
- /** */
- undef_234 (16925, ""),
+ /** NATOID_GinSlingMG */
+ NATOID_GINSLINGMG (16925, "NATOID_GinSlingMG"),
/** Goal Keeper */
GOAL_KEEPER (16930, "Goal Keeper"),
- /** */
- undef_235 (16931, ""),
- /** */
- undef_236 (16932, ""),
- /** */
- undef_237 (16935, ""),
- /** */
- undef_238 (16940, ""),
- /** */
- undef_239 (16942, " "),
+ /** NATOID_GoldenDome */
+ NATOID_GOLDENDOME (16935, "NATOID_GoldenDome"),
+ /** NATOID_GoldenHeart */
+ NATOID_GOLDENHEART (16940, "NATOID_GoldenHeart"),
+ /** NATOID_GoldenRock */
+ NATOID_GOLDENROCK (16942, "NATOID_GoldenRock"),
/** GPN-22 */
GPN_22 (16945, "GPN-22"),
/** GPSJ-10 */
@@ -1842,118 +2282,132 @@ public enum EmitterName
GPSJ_50 (16949, "GPSJ-50"),
/** GRN-9 */
GRN_9 (16950, "GRN-9"),
- /** */
- undef_240 (16960, ""),
+ /** GRAN-K */
+ GRAN_K (16951, "GRAN-K"),
+ /** NATOID_GraveStone */
+ NATOID_GRAVESTONE (16960, "NATOID_GraveStone"),
+ /** GRAVES */
+ GRAVES (16963, "GRAVES"),
/** Green Stain */
GREEN_STAIN (16965, "Green Stain"),
- /** */
- undef_241 (17010, ""),
+ /** NATOID_GridBow */
+ NATOID_GRIDBOW (17010, "NATOID_GridBow"),
/** Grifo-F */
GRIFO_F (17016, "Grifo-F"),
/** 9S32 */
- $9S32 (17025, "9S32"),
+ NAME_9S32 (17025, "9S32"),
+ /** NATOID_GRILLSCREEN */
+ NATOID_GRILLSCREEN (17027, "NATOID_GRILLSCREEN"),
+ /** GROUND MASTER 400 */
+ GROUND_MASTER_400 (17030, "GROUND MASTER 400"),
/** GT-4 */
GT_4 (17031, "GT-4"),
+ /** GRS 440 */
+ GRS_440 (17032, "GRS 440"),
+ /** GUARDIAN */
+ GUARDIAN (17050, "GUARDIAN"),
/** Guardsman */
GUARDSMAN (17055, "Guardsman"),
/** RPK-2 */
RPK_2 (17070, "RPK-2"),
/** HADR */
HADR (17080, "HADR"),
- /** */
- undef_242 (17100, ""),
- /** */
- undef_243 (17145, ""),
- /** */
- undef_244 (17190, ""),
+ /** NATOID_HairNet */
+ NATOID_HAIRNET (17100, "NATOID_HairNet"),
+ /** NATOID_HalfPlateA */
+ NATOID_HALFPLATEA (17145, "NATOID_HalfPlateA"),
+ /** NATOID_HalfPlateB */
+ NATOID_HALFPLATEB (17190, "NATOID_HalfPlateB"),
/** HARD */
HARD (17220, "HARD"),
/** Harpoon */
HARPOON (17225, "Harpoon"),
- /** */
- undef_245 (17230, " "),
- /** */
- undef_246 (17235, ""),
- /** */
- undef_247 (17250, " "),
- /** */
- undef_248 (17255, " "),
- /** */
- undef_249 (17280, ""),
- /** */
- undef_250 (17325, ""),
- /** */
- undef_251 (17370, ""),
- /** */
- undef_252 (17415, ""),
- /** */
- undef_253 (17460, ""),
- /** */
- undef_254 (17505, ""),
- /** */
- undef_255 (17550, ""),
- /** */
- undef_256 (17572, ""),
+ /** NATOID_HatBox */
+ NATOID_HATBOX (17230, "NATOID_HatBox"),
+ /** NATOID_HawkScreech */
+ NATOID_HAWKSCREECH (17235, "NATOID_HawkScreech"),
+ /** NATOID_HayPole */
+ NATOID_HAYPOLE (17250, "NATOID_HayPole"),
+ /** NATOID_HayRick */
+ NATOID_HAYRICK (17255, "NATOID_HayRick"),
+ /** NATOID_HeadLightA */
+ NATOID_HEADLIGHTA (17280, "NATOID_HeadLightA"),
+ /** NATOID_HeadLights */
+ NATOID_HEADLIGHTS (17325, "NATOID_HeadLights"),
+ /** NATOID_HeadLightsC */
+ NATOID_HEADLIGHTSC (17370, "NATOID_HeadLightsC"),
+ /** NATOID_HeadLightsMGA */
+ NATOID_HEADLIGHTSMGA (17415, "NATOID_HeadLightsMGA"),
+ /** NATOID_HeadLightsMGB */
+ NATOID_HEADLIGHTSMGB (17460, "NATOID_HeadLightsMGB"),
+ /** NATOID_HeadLightsTT */
+ NATOID_HEADLIGHTSTT (17505, "NATOID_HeadLightsTT"),
+ /** NATOID_HeadNet */
+ NATOID_HEADNET (17550, "NATOID_HeadNet"),
+ /** NATOID_HeartAcheB */
+ NATOID_HEARTACHEB (17572, "NATOID_HeartAcheB"),
/** Hellfire mmW MH */
HELLFIRE_MMW_MH (17590, "Hellfire mmW MH"),
- /** */
- undef_257 (17595, ""),
- /** */
- undef_258 (17640, ""),
- /** */
- undef_259 (17685, ""),
- /** */
- undef_260 (17730, ""),
- /** */
- undef_261 (17732, " "),
+ /** NATOID_HenEgg */
+ NATOID_HENEGG (17595, "NATOID_HenEgg"),
+ /** NATOID_HenHouse */
+ NATOID_HENHOUSE (17640, "NATOID_HenHouse"),
+ /** NATOID_HenNest */
+ NATOID_HENNEST (17685, "NATOID_HenNest"),
+ /** NATOID_HenRoost */
+ NATOID_HENROOST (17730, "NATOID_HenRoost"),
+ /** COMMID_Herakles */
+ COMMID_HERAKLES (17732, "COMMID_Herakles"),
/** HF-2 MG */
HF_2_MG (17735, "HF-2 MG"),
/** HGR-105 */
HGR_105 (17745, "HGR-105"),
- /** */
- undef_262 (17775, ""),
- /** */
- undef_263 (17820, ""),
- /** */
- undef_264 (17842, ""),
- /** */
- undef_265 (17865, ""),
- /** */
- undef_266 (17910, ""),
- /** */
- undef_267 (17955, ""),
- /** */
- undef_268 (18000, ""),
- /** */
- undef_269 (18045, ""),
- /** */
- undef_270 (18090, ""),
- /** */
- undef_271 (18135, ""),
+ /** NATOID_HighBrick */
+ NATOID_HIGHBRICK (17775, "NATOID_HighBrick"),
+ /** NATOID_HighFix */
+ NATOID_HIGHFIX (17820, "NATOID_HighFix"),
+ /** NATOID_HighGuard */
+ NATOID_HIGHGUARD (17842, "NATOID_HighGuard"),
+ /** NATOID_HighLarkTI */
+ NATOID_HIGHLARKTI (17865, "NATOID_HighLarkTI"),
+ /** NATOID_HighLark1 */
+ NATOID_HIGHLARK1 (17910, "NATOID_HighLark1"),
+ /** NATOID_HighLark2 */
+ NATOID_HIGHLARK2 (17955, "NATOID_HighLark2"),
+ /** NATOID_HighLark4 */
+ NATOID_HIGHLARK4 (18000, "NATOID_HighLark4"),
+ /** NATOID_HighLune */
+ NATOID_HIGHLUNE (18045, "NATOID_HighLune"),
+ /** NATOID_HighPoleAandB */
+ NATOID_HIGHPOLEAB (18090, "NATOID_HighPoleA&B"),
+ /** NATOID_HighScoop */
+ NATOID_HIGHSCOOP (18135, "NATOID_HighScoop"),
/** 9S19MT */
- $9S19MT (18150, "9S19MT"),
- /** */
- undef_272 (18180, ""),
- /** */
- undef_273 (18185, " "),
- /** */
- undef_274 (18190, ""),
+ NAME_9S19MT (18150, "9S19MT"),
+ /** NATOID_HighSieve */
+ NATOID_HIGHSIEVE (18180, "NATOID_HighSieve"),
+ /** NATOID_HillBlock */
+ NATOID_HILLBLOCK (18185, "NATOID_HillBlock"),
+ /** COMMID_HG-9550 */
+ COMMID_HG_9550 (18190, "COMMID_HG-9550"),
+ /** HJ-6374 */
+ HJ_6374 (18193, "HJ-6374"),
/** HLJQ-520 */
HLJQ_520 (18195, "HLJQ-520"),
/** HN-503 */
HN_503 (18200, "HN-503"),
/** HN-C03-M */
HN_C03_M (18201, "HN-C03-M"),
- /** */
- undef_275 (18225, ""),
- /** */
- undef_276 (18270, ""),
- /** */
- undef_277 (18280, ""),
- /** */
- undef_278 (18315, ""),
- /** */
- undef_279 (18316, " "),
+ /** NATOID_HomeTalk */
+ NATOID_HOMETALK (18225, "NATOID_HomeTalk"),
+ /** NATOID_HornSpoon */
+ NATOID_HORNSPOON (18270, "NATOID_HornSpoon"),
+ /** NATOID_HotBrick */
+ NATOID_HOTBRICK (18280, "NATOID_HotBrick"),
+ /** NATOID_HotFlash */
+ NATOID_HOTFLASH (18315, "NATOID_HotFlash"),
+ /** NATOID_HotFlash2 */
+ NATOID_HOTFLASH2 (18316, "NATOID_HotFlash2"),
/** IHS-6 */
IHS_6 (18318, "IHS-6"),
/** IRL144M */
@@ -1962,30 +2416,44 @@ public enum EmitterName
IRL144M_2 (18325, "IRL144M"),
/** IRL144M */
IRL144M_3 (18330, "IRL144M"),
+ /** HPS-106 */
+ HPS_106 (18331, "HPS-106"),
+ /** HPS-104 */
+ HPS_104 (18332, "HPS-104"),
/** HQ-9 MH */
HQ_9_MH (18339, "HQ-9 MH"),
- /** */
- undef_280 (18340, " "),
+ /** COMMID_HSR-1128 */
+ COMMID_HSR_1128 (18340, "COMMID_HSR-1128"),
/** HQ-61 */
HQ_61 (18350, "HQ-61"),
/** HRJS */
HRJS (18351, "HRJS"),
+ /** IBIS-80 */
+ IBIS_80 (18353, "IBIS-80"),
+ /** IBIS-150 */
+ IBIS_150 (18355, "IBIS-150"),
+ /** IBIS-200 */
+ IBIS_200 (18357, "IBIS-200"),
/** IFF MK XII AIMS UPX 29 */
IFF_MK_XII_AIMS_UPX_29 (18360, "IFF MK XII AIMS UPX 29"),
/** IFF MK XV */
IFF_MK_XV (18405, "IFF MK XV"),
/** IFF INT */
IFF_INT (18406, "IFF INT"),
- /** */
- undef_281 (18407, ""),
+ /** NATOID_JackKnife */
+ NATOID_JACKKNIFE (18407, "NATOID_JackKnife"),
/** IFF TRSP */
IFF_TRSP (18408, "IFF TRSP"),
/** Javelin MG */
JAVELIN_MG (18410, "Javelin MG"),
- /** */
- undef_282 (18450, ""),
+ /** NATOID_JayBird */
+ NATOID_JAYBIRD (18450, "NATOID_JayBird"),
+ /** J/FPS-3 */
+ J_FPS_3 (18451, "J/FPS-3"),
/** JH-10 */
JH_10 (18452, "JH-10"),
+ /** J/MPQ-P7 */
+ J_MPQ_P7 (18453, "J/MPQ-P7"),
/** JL-7 */
JL_7 (18454, "JL-7"),
/** JL-10B */
@@ -2012,8 +2480,14 @@ public enum EmitterName
JMA_5320 (18466, "JMA 5320"),
/** JRC JMR-9210-6XC */
JRC_JMR_9210_6XC (18467, "JRC JMR-9210-6XC"),
+ /** JERS-1 */
+ JERS_1 (18468, "JERS-1"),
+ /** JINDALEE */
+ JINDALEE (18469, "JINDALEE"),
/** JRC JMA-9900 series */
JRC_JMA_9900_SERIES (18470, "JRC JMA-9900 series"),
+ /** JLP-40D */
+ JLP_40D (18471, "JLP-40D"),
/** JRC JMA-5300 series */
JRC_JMA_5300_SERIES (18475, "JRC JMA-5300 series"),
/** Jupiter */
@@ -2034,6 +2508,8 @@ public enum EmitterName
JY_14 (18560, "JY-14"),
/** JY-14A */
JY_14A (18561, "JY-14A"),
+ /** JY-16 */
+ JY_16 (18565, "JY-16"),
/** JY-24 */
JY_24 (18570, "JY-24"),
/** J/APG-1 */
@@ -2048,34 +2524,44 @@ public enum EmitterName
JYL_6 (18580, "JYL-6"),
/** JYL-6A */
JYL_6A (18582, "JYL-6A"),
- /** */
- undef_283 (18585, ""),
+ /** JZ/QF-612 */
+ JZ_QF_612 (18583, "JZ/QF-612"),
+ /** NATOID_K376Z */
+ NATOID_K376Z (18585, "NATOID_K376Z"),
/** Kaige */
KAIGE (18600, "Kaige"),
- /** */
- undef_284 (18630, ""),
- /** */
- undef_285 (18675, ""),
- /** */
- undef_286 (18700, " "),
- /** */
- undef_287 (18720, ""),
- /** */
- undef_288 (18765, ""),
- /** */
- undef_289 (18770, " "),
- /** */
- undef_290 (18774, " "),
- /** */
- undef_291 (18775, " "),
- /** */
- undef_292 (18776, " "),
- /** */
- undef_293 (18777, " "),
+ /** KALKAN */
+ KALKAN (18610, "KALKAN"),
+ /** COMMID_KelvinHughes2A */
+ COMMID_KELVINHUGHES2A (18630, "COMMID_KelvinHughes2A"),
+ /** COMMID_KelvinHughes149 */
+ COMMID_KELVINHUGHES149 (18675, "COMMID_KelvinHughes149"),
+ /** NATOID_Karpaty */
+ NATOID_KARPATY (18700, "NATOID_Karpaty"),
+ /** COMMID_KelvinHughestype1006 */
+ COMMID_KELVINHUGHESTYPE1006 (18720, "COMMID_KelvinHughestype1006"),
+ /** COMMID_KelvinHughestype1007 */
+ COMMID_KELVINHUGHESTYPE1007 (18765, "COMMID_KelvinHughestype1007"),
+ /** COMMID_KelvinHughesType1007FBand */
+ COMMID_KELVINHUGHESTYPE1007FBAND (18766, "COMMID_KelvinHughesType1007FBand"),
+ /** COMMID_KelvinHughes2007FBand */
+ COMMID_KELVINHUGHES2007FBAND (18767, "COMMID_KelvinHughes2007FBand"),
+ /** COMMID_KelvinHughes2007IBand */
+ COMMID_KELVINHUGHES2007IBAND (18768, "COMMID_KelvinHughes2007IBand"),
+ /** COMMID_KHNucleus5000 */
+ COMMID_KHNUCLEUS5000 (18770, "COMMID_KHNucleus5000"),
+ /** COMMID_KHMANTA */
+ COMMID_KHMANTA (18774, "COMMID_KHMANTA"),
+ /** COMMID_KHNUCLEUS26000 */
+ COMMID_KHNUCLEUS26000 (18775, "COMMID_KHNUCLEUS26000"),
+ /** COMMID_KHNUCLEUS35000 */
+ COMMID_KHNUCLEUS35000 (18776, "COMMID_KHNUCLEUS35000"),
+ /** COMMID_KHNUCLEUS36000A */
+ COMMID_KHNUCLEUS36000A (18777, "COMMID_KHNUCLEUS36000A"),
/** KH Family */
KH_FAMILY (18780, "KH Family"),
- /** */
- undef_294 (18781, " "),
+ /** COMMID_KelvinHughes6000A */
+ COMMID_KELVINHUGHES6000A (18781, "COMMID_KelvinHughes6000A"),
/** Kh-38MAE MH */
KH_38MAE_MH (18782, "Kh-38MAE MH"),
/** KG8605A */
@@ -2084,24 +2570,30 @@ public enum EmitterName
KH_902M (18785, "KH-902M"),
/** KHOROM-K */
KHOROM_K (18786, "KHOROM-K"),
+ /** KHIBINY */
+ KHIBINY (18787, "KHIBINY"),
/** KG300E */
KG300E (18789, "KG300E"),
- /** */
- undef_295 (18790, " "),
+ /** COMMID_KHSharpEye */
+ COMMID_KHSHARPEYE (18790, "COMMID_KHSharpEye"),
+ /** COMMID_KHSharpEyeB */
+ COMMID_KHSHARPEYEB (18791, "COMMID_KHSharpEyeB"),
+ /** COMMID_KHSharpEyeC */
+ COMMID_KHSHARPEYEC (18792, "COMMID_KHSharpEyeC"),
/** KH 1700 */
KH_1700 (18795, "KH 1700"),
- /** */
- undef_296 (18797, ""),
+ /** NATOID_KingPin */
+ NATOID_KINGPIN (18797, "NATOID_KingPin"),
/** KG-300 */
KG_300 (18805, "KG-300"),
- /** */
- undef_297 (18810, ""),
- /** */
- undef_298 (18855, ""),
- /** */
- undef_299 (18900, ""),
- /** */
- undef_300 (18945, ""),
+ /** NATOID_KiteScreech */
+ NATOID_KITESCREECH (18810, "NATOID_KiteScreech"),
+ /** NATOID_KiteScreechA */
+ NATOID_KITESCREECHA (18855, "NATOID_KiteScreechA"),
+ /** NATOID_KiteScreechB */
+ NATOID_KITESCREECHB (18900, "NATOID_KiteScreechB"),
+ /** NATOID_Kivach */
+ NATOID_KIVACH (18945, "NATOID_Kivach"),
/** KLC-1 */
KLC_1 (18947, "KLC-1"),
/** KLJ-1 */
@@ -2116,14 +2608,14 @@ public enum EmitterName
KLJ_7 (18960, "KLJ-7"),
/** KLJ-7B */
KLJ_7B (18961, "KLJ-7B"),
- /** */
- undef_301 (18990, ""),
+ /** NATOID_KnifeRest */
+ NATOID_KNIFEREST (18990, "NATOID_KnifeRest"),
/** P-10 */
P_10 (19035, "P-10"),
- /** */
- undef_302 (19037, ""),
- /** */
- undef_303 (19039, " "),
+ /** NATOID_KNIFERESTC */
+ NATOID_KNIFERESTC (19037, "NATOID_KNIFERESTC"),
+ /** COMMID_KodenMD3730 */
+ COMMID_KODENMD3730 (19039, "COMMID_KodenMD3730"),
/** KJ-2000 */
KJ_2000 (19040, "KJ-2000"),
/** KOPYO-I */
@@ -2132,148 +2624,206 @@ public enum EmitterName
KR_75 (19050, "KR-75"),
/** KRONOS */
KRONOS (19051, "KRONOS"),
+ /** KREDO-1E */
+ KREDO_1E (19052, "KREDO-1E"),
+ /** Krasukha-2 */
+ KRASUKHA_2 (19053, "Krasukha-2"),
+ /** KRONOS GRAND NAVAL */
+ KRONOS_GRAND_NAVAL (19054, "KRONOS GRAND NAVAL"),
+ /** KRM-66E */
+ KRM_66E (19060, "KRM-66E"),
/** KSA SRN */
KSA_SRN (19080, "KSA SRN"),
/** KSA TSR */
KSA_TSR (19125, "KSA TSR"),
+ /** KS-1A PHASED ARRAY */
+ KS_1A_PHASED_ARRAY (19127, "KS-1A PHASED ARRAY"),
/** KS418 */
KS418 (19129, "KS418"),
+ /** KS418E */
+ KS418E (19130, "KS418E"),
/** KZ100 */
KZ100 (19131, "KZ100"),
/** KZ900 */
KZ900 (19132, "KZ900"),
- /** */
- undef_304 (19170, ""),
- /** */
- undef_305 (19215, ""),
- /** */
- undef_306 (19260, ""),
- /** */
- undef_307 (19305, ""),
+ /** L175V */
+ L175V (19140, "L175V"),
+ /** L-415 */
+ L_415 (19143, "L-415"),
+ /** L-88 */
+ L_88 (19145, "L-88"),
+ /** LAADS */
+ LAADS (19150, "LAADS"),
+ /** NATOID_LandFall */
+ NATOID_LANDFALL (19170, "NATOID_LandFall"),
+ /** NATOID_LandRollMG */
+ NATOID_LANDROLLMG (19215, "NATOID_LandRollMG"),
+ /** NATOID_LandRollTA */
+ NATOID_LANDROLLTA (19260, "NATOID_LandRollTA"),
+ /** NATOID_LandRollTT */
+ NATOID_LANDROLLTT (19305, "NATOID_LandRollTT"),
/** LAZUR */
LAZUR (19306, "LAZUR"),
/** Model 791-A */
MODEL_791_A (19307, "Model 791-A"),
+ /** LAP-3000 */
+ LAP_3000 (19309, "LAP-3000"),
/** LC-150 */
LC_150 (19310, "LC-150"),
- /** */
- undef_308 (19330, " "),
- /** */
- undef_309 (19350, ""),
- /** */
- undef_310 (19395, ""),
+ /** LEER-3 */
+ LEER_3 (19320, "LEER-3"),
+ /** NATOID_LegDrive */
+ NATOID_LEGDRIVE (19330, "NATOID_LegDrive"),
+ /** NATOID_Leningraf */
+ NATOID_LENINGRAF (19350, "NATOID_Leningraf"),
+ /** LIANA */
+ LIANA (19370, "LIANA"),
+ /** NATOID_LightBulb */
+ NATOID_LIGHTBULB (19395, "NATOID_LightBulb"),
+ /** LIRA-A10 */
+ LIRA_A10 (19396, "LIRA-A10"),
/** LIROD 8 */
LIROD_8 (19397, "LIROD 8"),
/** LIROD MK II */
LIROD_MK_II (19398, "LIROD MK II"),
+ /** LLX05K */
+ LLX05K (19399, "LLX05K"),
/** LMT NRAI-6A */
LMT_NRAI_6A (19400, "LMT NRAI-6A"),
/** LN 55 */
LN_55 (19440, "LN 55"),
- /** */
- undef_311 (19485, ""),
- /** */
- undef_312 (19500, " "),
- /** */
- undef_313 (19505, " "),
- /** */
- undef_314 (19530, ""),
- /** */
- undef_315 (19575, ""),
- /** */
- undef_316 (19620, ""),
- /** */
- undef_317 (19665, ""),
- /** */
- undef_318 (19710, ""),
- /** */
- undef_319 (19755, ""),
- /** */
- undef_320 (19800, ""),
- /** */
- undef_321 (19845, ""),
- /** */
- undef_322 (19890, ""),
+ /** NATOID_Ln66 */
+ NATOID_LN66 (19485, "NATOID_Ln66"),
+ /** NATOID_Liman */
+ NATOID_LIMAN (19500, "NATOID_Liman"),
+ /** NATOID_Liman2 */
+ NATOID_LIMAN2 (19505, "NATOID_Liman2"),
+ /** NATOID_LongBow */
+ NATOID_LONGBOW (19530, "NATOID_LongBow"),
+ /** NATOID_LongBrick */
+ NATOID_LONGBRICK (19575, "NATOID_LongBrick"),
+ /** NATOID_LongBull */
+ NATOID_LONGBULL (19620, "NATOID_LongBull"),
+ /** NATOID_LongEye */
+ NATOID_LONGEYE (19665, "NATOID_LongEye"),
+ /** NATOID_LongHead */
+ NATOID_LONGHEAD (19710, "NATOID_LongHead"),
+ /** NATOID_LongTalk */
+ NATOID_LONGTALK (19755, "NATOID_LongTalk"),
+ /** NATOID_LongTrack */
+ NATOID_LONGTRACK (19800, "NATOID_LongTrack"),
+ /** NATOID_LongTrough */
+ NATOID_LONGTROUGH (19845, "NATOID_LongTrough"),
+ /** NATOID_LookTwo */
+ NATOID_LOOKTWO (19890, "NATOID_LookTwo"),
+ /** LOPAR */
+ LOPAR (19920, "LOPAR"),
/** LORAN */
LORAN (19935, "LORAN"),
- /** */
- undef_323 (19950, ""),
- /** */
- undef_324 (19955, ""),
- /** */
- undef_325 (19960, ""),
- /** */
- undef_326 (19970, " "),
- /** */
- undef_327 (19971, " "),
- /** */
- undef_328 (19980, ""),
- /** */
- undef_329 (20025, ""),
+ /** NATOID_LowBlowTA */
+ NATOID_LOWBLOWTA (19950, "NATOID_LowBlowTA"),
+ /** NATOID_LowBlowTT */
+ NATOID_LOWBLOWTT (19955, "NATOID_LowBlowTT"),
+ /** NATOID_LowBlowMG */
+ NATOID_LOWBLOWMG (19960, "NATOID_LowBlowMG"),
+ /** NATOID_LowJackTT */
+ NATOID_LOWJACKTT (19970, "NATOID_LowJackTT"),
+ /** NATOID_LowJackMG */
+ NATOID_LOWJACKMG (19971, "NATOID_LowJackMG"),
+ /** NATOID_LowSieve */
+ NATOID_LOWSIEVE (19980, "NATOID_LowSieve"),
+ /** NATOID_LowTrough */
+ NATOID_LOWTROUGH (20025, "NATOID_LowTrough"),
/** LR66 */
LR66 (20029, "LR66"),
+ /** LRA-900 */
+ LRA_900 (20030, "LRA-900"),
/** TRS-2050 */
TRS_2050 (20040, "TRS-2050"),
- /** LW 08 */
+ /** LW 01 */
+ LW_01 (20060, "LW 01"),
+ /** LW 08, Use 28485 value. */
LW_08 (20070, "LW 08"),
- /** */
- undef_330 (20090, ""),
+ /** NATOID_M-1983FCR */
+ NATOID_M_1983FCR (20090, "NATOID_M-1983FCR"),
/** M22-40 */
M22_40 (20115, "M22-40"),
/** M44 */
M44 (20160, "M44"),
- /** */
- undef_331 (20205, ""),
- /** */
- undef_332 (20250, ""),
- /** */
- undef_333 (20295, ""),
+ /** NATOID_M401Z */
+ NATOID_M401Z (20205, "NATOID_M401Z"),
+ /** NATOID_M585Z */
+ NATOID_M585Z (20250, "NATOID_M585Z"),
+ /** NATOID_M588Z */
+ NATOID_M588Z (20295, "NATOID_M588Z"),
/** MA 1 IFF Portion */
MA_1_IFF_PORTION (20340, "MA 1 IFF Portion"),
- /** */
- undef_334 (20360, ""),
- /** */
- undef_335 (20385, ""),
+ /** MAD HACK */
+ MAD_HACK (20350, "MAD HACK"),
+ /** NATOID_MARELD */
+ NATOID_MARELD (20360, "NATOID_MARELD"),
+ /** COMMID_MAType909# */
+ COMMID_MATYPE909 (20385, "COMMID_MAType909#"),
/** MARC S-152 */
MARC_S_152 (20420, "MARC S-152"),
- /** */
- undef_336 (20430, ""),
- /** */
- undef_337 (20475, ""),
- /** */
- undef_338 (20495, ""),
- /** */
- undef_339 (20520, ""),
- /** */
- undef_340 (20530, ""),
- /** */
- undef_341 (20565, ""),
- /** */
- undef_342 (20585, ""),
- /** */
- undef_343 (20590, " "),
- /** */
- undef_344 (20610, ""),
- /** */
- undef_345 (20655, ""),
- /** */
- undef_346 (20700, ""),
- /** */
- undef_347 (20745, ""),
- /** */
- undef_348 (20790, ""),
- /** */
- undef_349 (20835, ""),
- /** */
- undef_350 (20880, ""),
+ /** COMMID_Marconi1810 */
+ COMMID_MARCONI1810 (20430, "COMMID_Marconi1810"),
+ /** COMMID_MarconiCanadaHC75 */
+ COMMID_MARCONICANADAHC75 (20475, "COMMID_MarconiCanadaHC75"),
+ /** COMMID_MarconiS713 */
+ COMMID_MARCONIS713 (20495, "COMMID_MarconiS713"),
+ /** COMMID_MarconiS1802 */
+ COMMID_MARCONIS1802 (20520, "COMMID_MarconiS1802"),
+ /** COMMID_MarconiS247 */
+ COMMID_MARCONIS247 (20530, "COMMID_MarconiS247"),
+ /** COMMID_MarconiS810 */
+ COMMID_MARCONIS810 (20565, "COMMID_MarconiS810"),
+ /** COMMID_MarconiSA10 */
+ COMMID_MARCONISA10 (20585, "COMMID_MarconiSA10"),
+ /** COMMID_MarconiST805 */
+ COMMID_MARCONIST805 (20590, "COMMID_MarconiST805"),
+ /** COMMID_Marconitype967 */
+ COMMID_MARCONITYPE967 (20610, "COMMID_Marconitype967"),
+ /** COMMID_Marconitype968 */
+ COMMID_MARCONITYPE968 (20655, "COMMID_Marconitype968"),
+ /** COMMID_Marconitype992 */
+ COMMID_MARCONITYPE992 (20700, "COMMID_Marconitype992"),
+ /** COMMID_Marconisignaaltype1022 */
+ COMMID_MARCONISIGNAALTYPE1022 (20745, "COMMID_Marconisignaaltype1022"),
+ /** COMMID_Marconisignaaltype910 */
+ COMMID_MARCONISIGNAALTYPE910 (20790, "COMMID_Marconisignaaltype910"),
+ /** COMMID_Marconisignaaltype911 */
+ COMMID_MARCONISIGNAALTYPE911 (20835, "COMMID_Marconisignaaltype911"),
+ /** COMMID_Marconisignaaltype992R */
+ COMMID_MARCONISIGNAALTYPE992R (20880, "COMMID_Marconisignaaltype992R"),
+ /** MARTELLO 743D */
+ MARTELLO_743D (20890, "MARTELLO 743D"),
+ /** MARTELLO S-723A */
+ MARTELLO_S_723A (20895, "MARTELLO S-723A"),
+ /** MASTER-A */
+ MASTER_A (20897, "MASTER-A"),
/** MELCO-3 */
MELCO_3 (20915, "MELCO-3"),
- /** */
- undef_351 (20920, ""),
- /** */
- undef_352 (20925, ""),
+ /** MELODI */
+ MELODI (20917, "MELODI"),
+ /** MERLIN */
+ MERLIN (20918, "MERLIN"),
+ /** COMMID_NorthropGrummanMESA */
+ COMMID_NORTHROPGRUMMANMESA (20920, "COMMID_NorthropGrummanMESA"),
+ /** NATOID_MeshBrick */
+ NATOID_MESHBRICK (20925, "NATOID_MeshBrick"),
+ /** METEOR 1500S */
+ METEOR_1500S (20927, "METEOR 1500S"),
+ /** METEOR 200 */
+ METEOR_200 (20929, "METEOR 200"),
+ /** METEOR 50DX */
+ METEOR_50DX (20930, "METEOR 50DX"),
+ /** METEOR 300 */
+ METEOR_300 (20931, "METEOR 300"),
/** MFR */
MFR (20935, "MFR"),
+ /** MFSR 2100/45 */
+ MFSR_2100_45 (20940, "MFSR 2100/45"),
/** MICA MH */
MICA_MH (20942, "MICA MH"),
/** Mineral-ME */
@@ -2282,8 +2832,8 @@ public enum EmitterName
MIRAGE_ILL (20950, "Mirage ILL"),
/** MK 15 (Phalanx BLK 0) */
MK_15_PHALANX_BLK_0 (20969, "MK 15 (Phalanx BLK 0)"),
- /** */
- undef_353 (20970, ""),
+ /** COMMID_MK15CIWS */
+ COMMID_MK15CIWS (20970, "COMMID_MK15CIWS"),
/** MK-23 */
MK_23 (21015, "MK-23"),
/** MK 23 TAS */
@@ -2292,6 +2842,8 @@ public enum EmitterName
MK_25 (21105, "MK 25"),
/** Mk-25 Mod-3 */
MK_25_MOD_3 (21110, "Mk-25 Mod-3"),
+ /** Mk 25 Mod 7 */
+ MK_25_MOD_7 (21130, "Mk 25 Mod 7"),
/** MK-35 M2 */
MK_35_M2 (21150, "MK-35 M2"),
/** MK 92 */
@@ -2312,6 +2864,10 @@ public enum EmitterName
MM_950 (21360, "MM 950"),
/** MM APS 705 */
MM_APS_705 (21375, "MM APS 705"),
+ /** MM/APS-784 */
+ MM_APS_784 (21390, "MM/APS-784"),
+ /** MM/SPG-73 (RTN-12X) */
+ MM_SPG_73_RTN_12X (21419, "MM/SPG-73 (RTN-12X)"),
/** MM SPG 74 */
MM_SPG_74 (21420, "MM SPG 74"),
/** MM SPG 75 */
@@ -2320,26 +2876,36 @@ public enum EmitterName
MM_SPN_703 (21490, "MM SPN 703"),
/** MM SPN-753B */
MM_SPN_753B (21495, "MM SPN-753B"),
+ /** MM/SPQ-3 */
+ MM_SPQ_3 (21500, "MM/SPQ-3"),
/** MM SPS 702 */
MM_SPS_702 (21510, "MM SPS 702"),
/** MM SPS 768 */
MM_SPS_768 (21555, "MM SPS 768"),
/** MM SPS 774 */
MM_SPS_774 (21600, "MM SPS 774"),
+ /** MM/SPS-791 (RAN-30X) */
+ MM_SPS_791_RAN_30X (21610, "MM/SPS-791 (RAN-30X)"),
/** MM SPS-794 (RAN-21S) */
MM_SPS_794_RAN_21S (21615, "MM SPS-794 (RAN-21S)"),
/** MM/SPS-798 (RAN-40L) */
MM_SPS_798_RAN_40L (21620, "MM/SPS-798 (RAN-40L)"),
+ /** MMSR */
+ MMSR (21623, "MMSR"),
/** Model-17C */
MODEL_17C (21625, "Model-17C"),
/** Moon 4 */
MOON_4 (21645, "Moon 4"),
- /** */
- undef_354 (21646, ""),
- /** */
- undef_355 (21648, " "),
- /** */
- undef_356 (21650, ""),
+ /** NATOID_MoonPie */
+ NATOID_MOONPIE (21646, "NATOID_MoonPie"),
+ /** MOON CONE */
+ MOON_CONE (21647, "MOON CONE"),
+ /** NATOID_MoonRack */
+ NATOID_MOONRACK (21648, "NATOID_MoonRack"),
+ /** MOON FACE */
+ MOON_FACE (21649, "MOON FACE"),
+ /** NATOID_MMRS */
+ NATOID_MMRS (21650, "NATOID_MMRS"),
/** Model 360 */
MODEL_360 (21655, "Model 360"),
/** Model 378 */
@@ -2348,32 +2914,58 @@ public enum EmitterName
MODEL_970 (21661, "Model-970"),
/** Model 974 */
MODEL_974 (21665, "Model 974"),
- /** */
- undef_357 (21675, " "),
- /** */
- undef_358 (21680, " "),
+ /** NATOID_Monument */
+ NATOID_MONUMENT (21675, "NATOID_Monument"),
+ /** NATOID_Mouse */
+ NATOID_MOUSE (21680, "NATOID_Mouse"),
+ /** MPDR 18/S */
+ MPDR_18_S (21685, "MPDR 18/S"),
/** MPDR 18 X */
MPDR_18_X (21690, "MPDR 18 X"),
+ /** MPDR 45/E */
+ MPDR_45_E (21692, "MPDR 45/E"),
/** MPR */
MPR (21695, "MPR"),
- /** */
- undef_359 (21699, " "),
+ /** MPS-1 */
+ MPS_1 (21697, "MPS-1"),
+ /** NATOID_MR-231MOD */
+ NATOID_MR_231MOD (21699, "NATOID_MR-231MOD"),
/** MR-1600 */
MR_1600 (21700, "MR-1600"),
/** MRR */
MRR (21701, "MRR"),
+ /** MR35 */
+ MR35 (21702, "MR35"),
+ /** MR36 */
+ MR36 (21703, "MR36"),
+ /** MRL-1 */
+ MRL_1 (21704, "MRL-1"),
+ /** MRL-4 */
+ MRL_4 (21705, "MRL-4"),
+ /** MRL-5 */
+ MRL_5 (21706, "MRL-5"),
+ /** MSAM */
+ MSAM (21707, "MSAM"),
+ /** MR-36A */
+ MR_36A (21708, "MR-36A"),
+ /** MSTAR */
+ MSTAR (21709, "MSTAR"),
/** MT-305X */
MT_305X (21710, "MT-305X"),
- /** */
- undef_360 (21735, ""),
+ /** MR-10M1E */
+ MR_10M1E (21711, "MR-10M1E"),
+ /** NATOID_MuffCob */
+ NATOID_MUFFCOB (21735, "NATOID_MuffCob"),
/** Mushroom */
MUSHROOM (21780, "Mushroom"),
/** Mushroom 1 */
MUSHROOM_1 (21825, "Mushroom 1"),
/** Mushroom 2 */
MUSHROOM_2 (21870, "Mushroom 2"),
- /** */
- undef_361 (21871, " "),
+ /** NATOID_Mushroom3 */
+ NATOID_MUSHROOM3 (21871, "NATOID_Mushroom3"),
+ /** N-23 */
+ N_23 (21872, "N-23"),
/** N-011M Bars */
N_011M_BARS (21873, "N-011M Bars"),
/** N-011M Bars-B */
@@ -2386,30 +2978,58 @@ public enum EmitterName
N035_IRBIS_E (21877, "N035 Irbis-E"),
/** N036 Byelka */
N036_BYELKA (21878, "N036 Byelka"),
+ /** N-25 */
+ N_25 (21879, "N-25"),
/** N920Z */
N920Z (21880, "N920Z"),
+ /** N001V */
+ N001V (21881, "N001V"),
/** NACOS RADARPILOT Platinum */
NACOS_RADARPILOT_PLATINUM (21884, "NACOS RADARPILOT Platinum"),
- /** */
- undef_362 (21885, " "),
- /** */
- undef_363 (21890, ""),
- /** */
- undef_364 (21895, ""),
+ /** NATOID_NampoB */
+ NATOID_NAMPOB (21885, "NATOID_NampoB"),
+ /** NAGIRA */
+ NAGIRA (21886, "NAGIRA"),
+ /** NATOID_NanjingB */
+ NATOID_NANJINGB (21890, "NATOID_NanjingB"),
+ /** NATOID_NanjingC */
+ NATOID_NANJINGC (21895, "NATOID_NanjingC"),
/** Nayada */
NAYADA (21915, "Nayada"),
+ /** NAYADA-5M */
+ NAYADA_5M (21917, "NAYADA-5M"),
+ /** NAYADA-5PV */
+ NAYADA_5PV (21918, "NAYADA-5PV"),
+ /** NEBO-M */
+ NEBO_M (21919, "NEBO-M"),
/** Nebo-SVU */
NEBO_SVU (21920, "Nebo-SVU"),
/** Neptun */
NEPTUN (21960, "Neptun"),
- /** */
- undef_365 (21980, ""),
+ /** NIKE HERCULES MTR */
+ NIKE_HERCULES_MTR (21970, "NIKE HERCULES MTR"),
+ /** NATOID_NIKETT */
+ NATOID_NIKETT (21980, "NATOID_NIKETT"),
/** NJ-81E */
NJ_81E (21983, "NJ-81E"),
+ /** Normandie */
+ NORMANDIE (21984, "Normandie"),
/** NRJ-6A */
NRJ_6A (21985, "NRJ-6A"),
- /** */
- undef_366 (21992, ""),
+ /** NOSTRADAMUS */
+ NOSTRADAMUS (21986, "NOSTRADAMUS"),
+ /** NPG-1240 */
+ NPG_1240 (21987, "NPG-1240"),
+ /** NPG-1460 */
+ NPG_1460 (21988, "NPG-1460"),
+ /** NPG-434 */
+ NPG_434 (21989, "NPG-434"),
+ /** NPG-630 */
+ NPG_630 (21990, "NPG-630"),
+ /** NPM-510 */
+ NPM_510 (21991, "NPM-510"),
+ /** NATOID_NutCan */
+ NATOID_NUTCAN (21992, "NATOID_NutCan"),
/** NRBA 50 */
NRBA_50 (22005, "NRBA 50"),
/** NRBA 51 */
@@ -2418,28 +3038,34 @@ public enum EmitterName
NRBF_20A (22095, "NRBF 20A"),
/** NRJ-5 */
NRJ_5 (22110, "NRJ-5"),
- /** */
- undef_367 (22140, ""),
- /** */
- undef_368 (22185, ""),
- /** */
- undef_369 (22230, ""),
- /** */
- undef_370 (22275, ""),
- /** */
- undef_371 (22320, ""),
+ /** NUR-31 */
+ NUR_31 (22127, "NUR-31"),
+ /** NWS-3 */
+ NWS_3 (22130, "NWS-3"),
+ /** NATOID_NysaB */
+ NATOID_NYSAB (22140, "NATOID_NysaB"),
+ /** NATOID_O524A */
+ NATOID_O524A (22185, "NATOID_O524A"),
+ /** NATOID_O580B */
+ NATOID_O580B (22230, "NATOID_O580B"),
+ /** NATOID_O625Z */
+ NATOID_O625Z (22275, "NATOID_O625Z"),
+ /** NATOID_O626Z */
+ NATOID_O626Z (22320, "NATOID_O626Z"),
/** Ocean Master */
OCEAN_MASTER (22335, "Ocean Master"),
- /** */
- undef_372 (22345, ""),
- /** */
- undef_373 (22365, ""),
- /** */
- undef_374 (22410, ""),
- /** */
- undef_375 (22411, ""),
- /** */
- undef_376 (22455, ""),
+ /** COMMID_OceanMaster400 */
+ COMMID_OCEANMASTER400 (22340, "COMMID_OceanMaster400"),
+ /** NATOID_OddGroup */
+ NATOID_ODDGROUP (22345, "NATOID_OddGroup"),
+ /** NATOID_OddLot */
+ NATOID_ODDLOT (22365, "NATOID_OddLot"),
+ /** NATOID_OddPair */
+ NATOID_ODDPAIR (22410, "NATOID_OddPair"),
+ /** NATOID_OddRods */
+ NATOID_ODDRODS (22411, "NATOID_OddRods"),
+ /** NATOID_Oka */
+ NATOID_OKA (22455, "NATOID_Oka"),
/** OKEAN */
OKEAN (22500, "OKEAN"),
/** OKEAN A */
@@ -2454,10 +3080,14 @@ public enum EmitterName
OMERA_ORB32 (22635, "Omera ORB32"),
/** OMUL */
OMUL (22640, "OMUL"),
- /** */
- undef_377 (22680, ""),
+ /** NATOID_OneEye */
+ NATOID_ONEEYE (22680, "NATOID_OneEye"),
/** OP-28 */
OP_28 (22690, "OP-28"),
+ /** OPRL-4 */
+ OPRL_4 (22695, "OPRL-4"),
+ /** OPRM-71 */
+ OPRM_71 (22696, "OPRM-71"),
/** OPS-9 */
OPS_9 (22697, "OPS-9"),
/** OPS-11 B/C */
@@ -2474,14 +3104,20 @@ public enum EmitterName
OPS_19 (22732, "OPS-19"),
/** OPS-20 */
OPS_20 (22735, "OPS-20"),
+ /** OPS-22 */
+ OPS_22 (22736, "OPS-22"),
/** OPS-24 */
OPS_24 (22737, "OPS-24"),
/** OPS-28 */
OPS_28 (22740, "OPS-28"),
+ /** OPS-28C */
+ OPS_28C (22745, "OPS-28C"),
/** OPS-39 */
OPS_39 (22750, "OPS-39"),
- /** */
- undef_378 (22770, ""),
+ /** OPTIMA 3.2 */
+ OPTIMA_32 (22760, "OPTIMA 3.2"),
+ /** NATOID_OR-2 */
+ NATOID_OR_2 (22770, "NATOID_OR-2"),
/** ORB-31S */
ORB_31S (22810, "ORB-31S"),
/** ORB 32 */
@@ -2498,128 +3134,162 @@ public enum EmitterName
OTOMAT_MK_II_TESEO (22905, "Otomat MK II Teseo"),
/** Otomat Series AL */
OTOMAT_SERIES_AL (22906, "Otomat Series AL"),
- /** */
- undef_379 (22950, ""),
+ /** NATOID_OwlScreech */
+ NATOID_OWLSCREECH (22950, "NATOID_OwlScreech"),
/** P360Z */
P360Z (22955, "P360Z"),
+ /** P-14 */
+ P_14 (22956, "P-14"),
+ /** P-180U */
+ P_180U (22957, "P-180U"),
+ /** P-18-2 */
+ P_18_2 (22959, "P-18-2"),
/** PA-1660 */
PA_1660 (22960, "PA-1660"),
- /** */
- undef_380 (22977, ""),
- /** */
- undef_381 (22995, ""),
- /** */
- undef_382 (22998, ""),
- /** */
- undef_383 (23040, ""),
- /** */
- undef_384 (23085, ""),
- /** */
- undef_385 (23095, ""),
- /** */
- undef_386 (23130, ""),
- /** */
- undef_387 (23175, ""),
+ /** P-18M */
+ P_18M (22961, "P-18M"),
+ /** P-190U */
+ P_190U (22962, "P-190U"),
+ /** P-30 */
+ P_30 (22963, "P-30"),
+ /** P-18 MOD */
+ P_18_MOD (22964, "P-18 MOD"),
+ /** PAGE */
+ PAGE (22970, "PAGE"),
+ /** NATOID_PaintBox */
+ NATOID_PAINTBOX (22977, "NATOID_PaintBox"),
+ /** NATOID_PalmFrond */
+ NATOID_PALMFROND (22995, "NATOID_PalmFrond"),
+ /** NATOID_ModifiedPaintBox */
+ NATOID_MODIFIEDPAINTBOX (22998, "NATOID_ModifiedPaintBox"),
+ /** NATOID_PalmFrondAB */
+ NATOID_PALMFRONDAB (23040, "NATOID_PalmFrondAB"),
+ /** PAR-2 */
+ PAR_2 (23045, "PAR-2"),
+ /** PAR-2000 */
+ PAR_2000 (23050, "PAR-2000"),
+ /** PAR-2090C */
+ PAR_2090C (23053, "PAR-2090C"),
+ /** PAR-80 */
+ PAR_80 (23055, "PAR-80"),
+ /** NATOID_PatHandTT */
+ NATOID_PATHANDTT (23085, "NATOID_PatHandTT"),
+ /** NATOID_PatHandMG */
+ NATOID_PATHANDMG (23095, "NATOID_PatHandMG"),
+ /** PATRIOT */
+ PATRIOT (23100, "PATRIOT"),
+ /** NATOID_PattyCake */
+ NATOID_PATTYCAKE (23130, "NATOID_PattyCake"),
+ /** NATOID_PawnCake */
+ NATOID_PAWNCAKE (23175, "NATOID_PawnCake"),
/** PBR 4 Rubin */
PBR_4_RUBIN (23220, "PBR 4 Rubin"),
- /** */
- undef_388 (23265, ""),
- /** */
- undef_389 (23310, ""),
- /** */
- undef_390 (23355, ""),
- /** */
- undef_391 (23400, ""),
- /** */
- undef_392 (23445, ""),
- /** */
- undef_393 (23450, ""),
- /** */
- undef_394 (23490, ""),
- /** */
- undef_395 (23500, " "),
+ /** PCS 514 */
+ PCS_514 (23240, "PCS 514"),
+ /** NATOID_PeaSticks */
+ NATOID_PEASTICKS (23265, "NATOID_PeaSticks"),
+ /** Pechora SC */
+ PECHORA_SC (23295, "Pechora SC"),
+ /** NATOID_PeelCone */
+ NATOID_PEELCONE (23310, "NATOID_PeelCone"),
+ /** NATOID_PeelGroup */
+ NATOID_PEELGROUP (23355, "NATOID_PeelGroup"),
+ /** NATOID_PeelGroupA */
+ NATOID_PEELGROUPA (23400, "NATOID_PeelGroupA"),
+ /** NATOID_PeelGroupB */
+ NATOID_PEELGROUPB (23445, "NATOID_PeelGroupB"),
+ /** NATOID_PeelGroupMG */
+ NATOID_PEELGROUPMG (23450, "NATOID_PeelGroupMG"),
+ /** NATOID_PeelPair */
+ NATOID_PEELPAIR (23490, "NATOID_PeelPair"),
+ /** NATOID_Pelena */
+ NATOID_PELENA (23500, "NATOID_Pelena"),
+ /** PGZ07 */
+ PGZ07 (23515, "PGZ07"),
/** Phalanx */
PHALANX (23525, "Phalanx"),
- /** */
- undef_396 (23535, ""),
- /** */
- undef_397 (23580, ""),
- /** */
- undef_398 (23625, ""),
- /** */
- undef_399 (23670, ""),
- /** */
- undef_400 (23685, " "),
- /** */
- undef_401 (23690, ""),
- /** */
- undef_402 (23695, " "),
+ /** COMMID_Philips9LV200 */
+ COMMID_PHILIPS9LV200 (23535, "COMMID_Philips9LV200"),
+ /** COMMID_Philips9LV331 */
+ COMMID_PHILIPS9LV331 (23580, "COMMID_Philips9LV331"),
+ /** COMMID_PhilipsLV223 */
+ COMMID_PHILIPSLV223 (23625, "COMMID_PhilipsLV223"),
+ /** COMMID_PhilipsSeaGiraffe50HC */
+ COMMID_PHILIPSSEAGIRAFFE50HC (23670, "COMMID_PhilipsSeaGiraffe50HC"),
+ /** PICOSAR */
+ PICOSAR (23680, "PICOSAR"),
+ /** COMMID_PILOTMK2 */
+ COMMID_PILOTMK2 (23685, "COMMID_PILOTMK2"),
+ /** NATOID_PinJib */
+ NATOID_PINJIB (23690, "NATOID_PinJib"),
+ /** NATOID_PinTip */
+ NATOID_PINTIP (23695, "NATOID_PinTip"),
/** PL-11 */
PL_11 (23700, "PL-11"),
/** PL-12 */
PL_12 (23701, "PL-12"),
- /** */
- undef_403 (23710, ""),
- /** */
- undef_404 (23715, ""),
- /** */
- undef_405 (23760, ""),
- /** */
- undef_406 (23805, ""),
- /** */
- undef_407 (23850, ""),
- /** */
- undef_408 (23895, ""),
- /** */
- undef_409 (23925, ""),
- /** */
- undef_410 (23940, ""),
- /** */
- undef_411 (23985, ""),
- /** */
- undef_412 (23990, ""),
- /** */
- undef_413 (24020, " "),
- /** */
- undef_414 (24030, ""),
+ /** NATOID_PlankShad */
+ NATOID_PLANKSHAD (23710, "NATOID_PlankShad"),
+ /** NATOID_PlankShave */
+ NATOID_PLANKSHAVE (23715, "NATOID_PlankShave"),
+ /** NATOID_PlankShaveA */
+ NATOID_PLANKSHAVEA (23760, "NATOID_PlankShaveA"),
+ /** NATOID_PlankShaveB */
+ NATOID_PLANKSHAVEB (23805, "NATOID_PlankShaveB"),
+ /** NATOID_PlateSteer */
+ NATOID_PLATESTEER (23850, "NATOID_PlateSteer"),
+ /** COMMID_PlesseyAWS1 */
+ COMMID_PLESSEYAWS1 (23895, "COMMID_PlesseyAWS1"),
+ /** COMMID_PlesseyAWS-2 */
+ COMMID_PLESSEYAWS_2 (23925, "COMMID_PlesseyAWS-2"),
+ /** COMMID_PlesseyAWS4 */
+ COMMID_PLESSEYAWS4 (23940, "COMMID_PlesseyAWS4"),
+ /** COMMID_PlesseyAWS6 */
+ COMMID_PLESSEYAWS6 (23985, "COMMID_PlesseyAWS6"),
+ /** COMMID_PlesseyRJ */
+ COMMID_PLESSEYRJ (23990, "COMMID_PlesseyRJ"),
+ /** COMMID_PlesseyType904 */
+ COMMID_PLESSEYTYPE904 (24020, "COMMID_PlesseyType904"),
+ /** COMMID_Plesseytype996 */
+ COMMID_PLESSEYTYPE996 (24030, "COMMID_Plesseytype996"),
/** Plessey AWS 9 */
PLESSEY_AWS_9 (24035, "Plessey AWS 9"),
- /** */
- undef_415 (24075, ""),
- /** */
- undef_416 (24095, ""),
+ /** NATOID_PlinthNet */
+ NATOID_PLINTHNET (24075, "NATOID_PlinthNet"),
+ /** NATOID_Pluto */
+ NATOID_PLUTO (24095, "NATOID_Pluto"),
/** POHJANPALO */
POHJANPALO (24100, "POHJANPALO"),
/** Poliment-K */
POLIMENT_K (24110, "Poliment-K"),
/** POLLUX */
POLLUX (24120, "POLLUX"),
- /** */
- undef_417 (24165, ""),
- /** */
- undef_418 (24210, ""),
- /** */
- undef_419 (24255, ""),
- /** */
- undef_420 (24300, ""),
- /** */
- undef_421 (24320, " "),
- /** */
- undef_422 (24345, ""),
+ /** NATOID_PopGroup */
+ NATOID_POPGROUP (24165, "NATOID_PopGroup"),
+ /** NATOID_PopGroupMG */
+ NATOID_POPGROUPMG (24210, "NATOID_PopGroupMG"),
+ /** NATOID_PopGroupTA */
+ NATOID_POPGROUPTA (24255, "NATOID_PopGroupTA"),
+ /** NATOID_PopGroupTT */
+ NATOID_POPGROUPTT (24300, "NATOID_PopGroupTT"),
+ /** NATOID_PorkFist */
+ NATOID_PORKFIST (24320, "NATOID_PorkFist"),
+ /** NATOID_PorkTrough */
+ NATOID_PORKTROUGH (24345, "NATOID_PorkTrough"),
/** Positive ME */
POSITIVE_ME (24385, "Positive ME"),
/** Positive-ME1.2 */
POSITIVE_ME12 (24386, "Positive-ME1.2"),
- /** */
- undef_423 (24390, ""),
- /** */
- undef_424 (24435, ""),
- /** */
- undef_425 (24480, ""),
- /** */
- undef_426 (24525, ""),
- /** */
- undef_427 (24535, ""),
+ /** NATOID_PostBow */
+ NATOID_POSTBOW (24390, "NATOID_PostBow"),
+ /** NATOID_PostLamp */
+ NATOID_POSTLAMP (24435, "NATOID_PostLamp"),
+ /** NATOID_PotDrum */
+ NATOID_POTDRUM (24480, "NATOID_PotDrum"),
+ /** NATOID_PotHead */
+ NATOID_POTHEAD (24525, "NATOID_PotHead"),
+ /** NATOID_PotShot */
+ NATOID_POTSHOT (24535, "NATOID_PotShot"),
/** Praetorian Countermeasures Suite */
PRAETORIAN_COUNTERMEASURES_SUITE (24540, "Praetorian Countermeasures Suite"),
/** PRIMUS 30A */
@@ -2636,68 +3306,88 @@ public enum EmitterName
PRIMUS_650 (24617, "Primus 650"),
/** Primus 700 */
PRIMUS_700 (24618, "Primus 700"),
- /** */
- undef_428 (24620, ""),
+ /** PRIMUS 800 */
+ PRIMUS_800 (24619, "PRIMUS 800"),
+ /** COMMID_Primus3000 */
+ COMMID_PRIMUS3000 (24620, "COMMID_Primus3000"),
/** PRORA */
PRORA (24630, "PRORA"),
/** PRS-2 */
PRS_2 (24631, "PRS-2"),
/** PRORA PA-1660 */
PRORA_PA_1660 (24635, "PRORA PA-1660"),
+ /** PS-15 */
+ PS_15 (24640, "PS-15"),
/** PS-05A */
PS_05A (24650, "PS-05A"),
/** PS 46 A */
PS_46_A (24660, "PS 46 A"),
/** PS 70 R */
PS_70_R (24705, "PS 70 R"),
+ /** PS-171/R */
+ PS_171_R (24706, "PS-171/R"),
/** PS-860 */
PS_860 (24707, "PS-860"),
/** PS-870 */
PS_870 (24709, "PS-870"),
/** PS-890 */
PS_890 (24710, "PS-890"),
- /** */
- undef_429 (24750, ""),
+ /** NATOID_PuffBall */
+ NATOID_PUFFBALL (24750, "NATOID_PuffBall"),
/** Quadradar VI */
QUADRADAR_VI (24755, "Quadradar VI"),
+ /** QW-1A */
+ QW_1A (24757, "QW-1A"),
/** PVS-200 */
PVS_200 (24760, "PVS-200"),
/** PVS 2000 */
PVS_2000 (24761, "PVS 2000"),
+ /** R 045 */
+ R_045 (24769, "R 045"),
/** R-76 */
R_76 (24770, "R-76"),
+ /** R-934B */
+ R_934B (24771, "R-934B"),
+ /** RA-20 */
+ RA_20 (24772, "RA-20"),
/** RA723 */
RA723 (24774, "RA723"),
/** R41XXX */
R41XXX (24775, "R41XXX"),
- /** */
- undef_430 (24780, ""),
- /** */
- undef_431 (24795, ""),
+ /** RAC-3D */
+ RAC_3D (24776, "RAC-3D"),
+ /** COMMID_RAC-30 */
+ COMMID_RAC_30 (24780, "COMMID_RAC-30"),
+ /** COMMID_Racal1229 */
+ COMMID_RACAL1229 (24795, "COMMID_Racal1229"),
/** DECCA 1230 */
DECCA_1230 (24800, "DECCA 1230"),
- /** */
- undef_432 (24840, ""),
- /** */
- undef_433 (24885, ""),
+ /** COMMID_RacalAC2690BT */
+ COMMID_RACALAC2690BT (24840, "COMMID_RacalAC2690BT"),
+ /** COMMID_RacalDecca1216 */
+ COMMID_RACALDECCA1216 (24885, "COMMID_RacalDecca1216"),
/** Racal-DECCA 20V90/9 */
RACAL_DECCA_20V90_9 (24890, "Racal-DECCA 20V90/9"),
- /** */
- undef_434 (24930, ""),
- /** */
- undef_435 (24975, ""),
- /** */
- undef_436 (25020, ""),
- /** */
- undef_437 (25065, ""),
- /** */
- undef_438 (25110, ""),
- /** */
- undef_439 (25155, ""),
- /** */
- undef_440 (25170, " "),
- /** */
- undef_441 (25171, " "),
+ /** COMMID_RacalDecca360 */
+ COMMID_RACALDECCA360 (24930, "COMMID_RacalDecca360"),
+ /** COMMID_RacalDeccaAC1290 */
+ COMMID_RACALDECCAAC1290 (24975, "COMMID_RacalDeccaAC1290"),
+ /** COMMID_RacalDeccaTM1229 */
+ COMMID_RACALDECCATM1229 (25020, "COMMID_RacalDeccaTM1229"),
+ /** COMMID_RacalDeccaTM1626 */
+ COMMID_RACALDECCATM1626 (25065, "COMMID_RacalDeccaTM1626"),
+ /** COMMID_RacalDRBN34A */
+ COMMID_RACALDRBN34A (25110, "COMMID_RacalDRBN34A"),
+ /** RADA MHR */
+ RADA_MHR (25150, "RADA MHR"),
+ /** COMMID_Radar24 */
+ COMMID_RADAR24 (25155, "COMMID_Radar24"),
+ /** COMMID_RADARPILOT1000 */
+ COMMID_RADARPILOT1000 (25170, "COMMID_RADARPILOT1000"),
+ /** COMMID_RADARPILOT1100 */
+ COMMID_RADARPILOT1100 (25171, "COMMID_RADARPILOT1100"),
+ /** RAJENDRA */
+ RAJENDRA (25180, "RAJENDRA"),
/** RAN 7S */
RAN_7S (25200, "RAN 7S"),
/** RAN 10S */
@@ -2722,54 +3412,64 @@ public enum EmitterName
RASIT_3190B (25277, "Rasit 3190B"),
/** RAT-31 DL/M */
RAT_31_DL_M (25278, "RAT-31 DL/M"),
+ /** RAT-31 DL */
+ RAT_31_DL (25279, "RAT-31 DL"),
/** RAT-31S */
RAT_31S (25280, "RAT-31S"),
+ /** RAT-8 S */
+ RAT_8_S (25281, "RAT-8 S"),
+ /** RAT-31 SL */
+ RAT_31_SL (25282, "RAT-31 SL"),
/** RATAC (LCT) */
RATAC_LCT (25285, "RATAC (LCT)"),
/** RAWL */
RAWL (25286, "RAWL"),
- /** */
- undef_442 (25287, ""),
+ /** NATOID_Rattler */
+ NATOID_RATTLER (25287, "NATOID_Rattler"),
/** RAWS */
RAWS (25288, "RAWS"),
/** RAWL-02 */
RAWL_02 (25289, "RAWL-02"),
- /** */
- undef_443 (25290, ""),
+ /** COMMID_Raytheon1220 */
+ COMMID_RAYTHEON1220 (25290, "COMMID_Raytheon1220"),
/** RAWS-03 */
RAWS_03 (25291, "RAWS-03"),
- /** */
- undef_444 (25292, " "),
- /** */
- undef_445 (25300, ""),
- /** */
- undef_446 (25335, ""),
- /** */
- undef_447 (25380, ""),
- /** */
- undef_448 (25425, ""),
- /** */
- undef_449 (25470, ""),
- /** */
- undef_450 (25515, ""),
- /** */
- undef_451 (25540, " "),
- /** */
- undef_452 (25550, " "),
- /** */
- undef_453 (25560, ""),
- /** */
- undef_454 (25605, ""),
+ /** COMMID_Raytheon1210xx */
+ COMMID_RAYTHEON1210XX (25292, "COMMID_Raytheon1210xx"),
+ /** COMMID_Raytheon1302 */
+ COMMID_RAYTHEON1302 (25300, "COMMID_Raytheon1302"),
+ /** COMMID_Raytheon1500 */
+ COMMID_RAYTHEON1500 (25335, "COMMID_Raytheon1500"),
+ /** COMMID_Raytheon1645 */
+ COMMID_RAYTHEON1645 (25380, "COMMID_Raytheon1645"),
+ /** COMMID_Raytheon1650 */
+ COMMID_RAYTHEON1650 (25425, "COMMID_Raytheon1650"),
+ /** COMMID_Raytheon1900 */
+ COMMID_RAYTHEON1900 (25470, "COMMID_Raytheon1900"),
+ /** COMMID_Raytheon2502 */
+ COMMID_RAYTHEON2502 (25515, "COMMID_Raytheon2502"),
+ /** Raytheon Anschutz NautoScan NX */
+ RAYTHEON_ANSCHUTZ_NAUTOSCAN_NX (25530, "Raytheon Anschutz NautoScan NX"),
+ /** COMMID_RaytheonR41 */
+ COMMID_RAYTHEONR41 (25540, "COMMID_RaytheonR41"),
+ /** COMMID_RaytheonRM10256X */
+ COMMID_RAYTHEONRM10256X (25545, "COMMID_RaytheonRM10256X"),
+ /** COMMID_RaytheonSL72 */
+ COMMID_RAYTHEONSL72 (25550, "COMMID_RaytheonSL72"),
+ /** COMMID_RaytheonTM16506X */
+ COMMID_RAYTHEONTM16506X (25560, "COMMID_RaytheonTM16506X"),
+ /** COMMID_RaytheonTM166012S */
+ COMMID_RAYTHEONTM166012S (25605, "COMMID_RaytheonTM166012S"),
/** RAY-1220XR */
RAY_1220XR (25630, "RAY-1220XR"),
- /** */
- undef_455 (25635, ""),
- /** */
- undef_456 (25650, ""),
- /** */
- undef_457 (25694, " "),
- /** */
- undef_458 (25695, ""),
+ /** COMMID_RAY-1401 */
+ COMMID_RAY_1401 (25635, "COMMID_RAY-1401"),
+ /** COMMID_Ray2900 */
+ COMMID_RAY2900 (25650, "COMMID_Ray2900"),
+ /** COMMID_RaymarineRD218 */
+ COMMID_RAYMARINERD218 (25694, "COMMID_RaymarineRD218"),
+ /** COMMID_Raypath */
+ COMMID_RAYPATH (25695, "COMMID_Raypath"),
/** RBE2 */
RBE2 (25735, "RBE2"),
/** RCT-180 */
@@ -2780,6 +3480,10 @@ public enum EmitterName
RDI (25750, "RDI"),
/** RDY */
RDY (25760, "RDY"),
+ /** RDY-3 */
+ RDY_3 (25762, "RDY-3"),
+ /** RDS-86 */
+ RDS_86 (25770, "RDS-86"),
/** RDN 72 */
RDN_72 (25785, "RDN 72"),
/** RDR 1A */
@@ -2788,10 +3492,16 @@ public enum EmitterName
RDR_1E (25835, "RDR 1E"),
/** RDR 4A */
RDR_4A (25840, "RDR 4A"),
+ /** RDR-150 */
+ RDR_150 (25845, "RDR-150"),
/** RDR-160XD */
RDR_160XD (25850, "RDR-160XD"),
+ /** RDR-230 HP */
+ RDR_230_HP (25853, "RDR-230 HP"),
/** RDR 1100 */
RDR_1100 (25855, "RDR 1100"),
+ /** RDR-1150 */
+ RDR_1150 (25860, "RDR-1150"),
/** RDR 1200 */
RDR_1200 (25875, "RDR 1200"),
/** RDR 1400 */
@@ -2800,34 +3510,46 @@ public enum EmitterName
RDR_1400_C (25890, "RDR 1400 C"),
/** RDR 1500 */
RDR_1500 (25895, "RDR 1500"),
- /** */
- undef_459 (25896, ""),
+ /** NATOID_RiceCake */
+ NATOID_RICECAKE (25896, "NATOID_RiceCake"),
/** RDR 1600 */
RDR_1600 (25897, "RDR 1600"),
/** RDR 2000 */
RDR_2000 (25898, "RDR 2000"),
+ /** RDR 1700B */
+ RDR_1700B (25899, "RDR 1700B"),
/** Remora */
REMORA (25900, "Remora"),
/** Rice Field */
RICE_FIELD (25901, "Rice Field"),
- /** */
- undef_460 (25907, " "),
+ /** REC-1A */
+ REC_1A (25902, "REC-1A"),
+ /** REC-1B */
+ REC_1B (25903, "REC-1B"),
+ /** REC-1C */
+ REC_1C (25904, "REC-1C"),
+ /** Resolve EAS */
+ RESOLVE_EAS (25906, "Resolve EAS"),
+ /** NATOID_RiceCupC */
+ NATOID_RICECUPC (25907, "NATOID_RiceCupC"),
/** REL-6E */
REL_6E (25908, "REL-6E"),
/** REC-1 */
REC_1 (25909, "REC-1"),
- /** */
- undef_461 (25910, ""),
+ /** NATOID_RiceBowl */
+ NATOID_RICEBOWL (25910, "NATOID_RiceBowl"),
/** Improved Reporter */
IMPROVED_REPORTER (25911, "Improved Reporter"),
- /** */
- undef_462 (25912, " "),
- /** */
- undef_463 (25915, " "),
- /** */
- undef_464 (25920, ""),
- /** */
- undef_465 (25965, ""),
+ /** NATOID_RiceBug */
+ NATOID_RICEBUG (25912, "NATOID_RiceBug"),
+ /** NATOID_RiceCup */
+ NATOID_RICECUP (25915, "NATOID_RiceCup"),
+ /** NATOID_RiceLamp */
+ NATOID_RICELAMP (25920, "NATOID_RiceLamp"),
+ /** REZONANS */
+ REZONANS (25950, "REZONANS"),
+ /** NATOID_RicePad */
+ NATOID_RICEPAD (25965, "NATOID_RicePad"),
/** RKL-526 */
RKL_526 (25966, "RKL-526"),
/** RKZ-764 */
@@ -2844,20 +3566,36 @@ public enum EmitterName
RKZ_761 (25972, "RKZ-761"),
/** RKZ-2000 */
RKZ_2000 (25973, "RKZ-2000"),
- /** */
- undef_466 (26008, " "),
- /** */
- undef_467 (26010, ""),
- /** */
- undef_468 (26011, ""),
+ /** RIS-4C/A */
+ RIS_4C_A (25974, "RIS-4C/A"),
+ /** RL-2000 */
+ RL_2000 (25975, "RL-2000"),
+ /** RL-41 */
+ RL_41 (25976, "RL-41"),
+ /** RIR 778 */
+ RIR_778 (25977, "RIR 778"),
+ /** RISAT */
+ RISAT (25978, "RISAT"),
+ /** NATOID_RiceScoop */
+ NATOID_RICESCOOP (26008, "NATOID_RiceScoop"),
+ /** NATOID_RiceScreen */
+ NATOID_RICESCREEN (26010, "NATOID_RiceScreen"),
+ /** COMMID_DECCARM1070A */
+ COMMID_DECCARM1070A (26011, "COMMID_DECCARM1070A"),
/** RM370BT */
RM370BT (26015, "RM370BT"),
- /** */
- undef_469 (26020, ""),
- /** */
- undef_470 (26040, " "),
- /** */
- undef_471 (26041, " "),
+ /** COMMID_RockwellCollinsFMR-200X */
+ COMMID_ROCKWELLCOLLINSFMR_200X (26020, "COMMID_RockwellCollinsFMR-200X"),
+ /** NATOID_RM-231-2 */
+ NATOID_RM_231_2 (26040, "NATOID_RM-231-2"),
+ /** NATOID_RM-231-3 */
+ NATOID_RM_231_3 (26041, "NATOID_RM-231-3"),
+ /** RMT 0100A */
+ RMT_0100A (26043, "RMT 0100A"),
+ /** RN-222 */
+ RN_222 (26045, "RN-222"),
+ /** ROLAND 2 */
+ ROLAND_2 (26053, "ROLAND 2"),
/** ROLAND BN */
ROLAND_BN (26055, "ROLAND BN"),
/** ROLAND MG */
@@ -2866,34 +3604,42 @@ public enum EmitterName
ROLAND_TA (26145, "ROLAND TA"),
/** ROLAND TT */
ROLAND_TT (26190, "ROLAND TT"),
- /** */
- undef_472 (26235, ""),
+ /** NATOID_RoundBall */
+ NATOID_ROUNDBALL (26235, "NATOID_RoundBall"),
/** RP-379D Tirada D */
RP_379D_TIRADA_D (26236, "RP-379D Tirada D"),
- /** */
- undef_473 (26280, ""),
- /** */
- undef_474 (26325, ""),
+ /** RP-3 */
+ RP_3 (26237, "RP-3"),
+ /** RP-4G */
+ RP_4G (26238, "RP-4G"),
+ /** NATOID_RoundHouse */
+ NATOID_ROUNDHOUSE (26280, "NATOID_RoundHouse"),
+ /** NATOID_RoundHouseB */
+ NATOID_ROUNDHOUSEB (26325, "NATOID_RoundHouseB"),
/** RPR-117 */
RPR_117 (26326, "RPR-117"),
/** RS-02/50 */
RS_02_50 (26327, "RS-02/50"),
- /** */
- undef_475 (26328, " "),
+ /** COMMID_RSR210N */
+ COMMID_RSR210N (26328, "COMMID_RSR210N"),
/** RT-02/50 */
RT_02_50 (26330, "RT-02/50"),
+ /** RTA-4100 */
+ RTA_4100 (26340, "RTA-4100"),
/** RTN-1A */
RTN_1A (26350, "RTN-1A"),
/** RTN-25X */
RTN_25X (26353, "RTN-25X"),
- /** */
- undef_476 (26355, " "),
- /** */
- undef_477 (26360, ""),
- /** */
- undef_478 (26361, " "),
- /** */
- undef_479 (26362, " "),
+ /** RTS-6400 */
+ RTS_6400 (26354, "RTS-6400"),
+ /** NATOID_RubyRake */
+ NATOID_RUBYRAKE (26355, "NATOID_RubyRake"),
+ /** NATOID_RumSling */
+ NATOID_RUMSLING (26360, "NATOID_RumSling"),
+ /** NATOID_RumSlingRO */
+ NATOID_RUMSLINGRO (26361, "NATOID_RumSlingRO"),
+ /** NATOID_RumSlingTT */
+ NATOID_RUMSLINGTT (26362, "NATOID_RumSlingTT"),
/** RV2 */
RV2 (26370, "RV2"),
/** RV3 */
@@ -2912,42 +3658,68 @@ public enum EmitterName
RV_21 (26596, "RV-21"),
/** RV-21B */
RV_21B (26597, "RV-21B"),
+ /** RV-25 */
+ RV_25 (26600, "RV-25"),
/** RV-377 */
RV_377 (26610, "RV-377"),
/** RV UM */
RV_UM (26640, "RV UM"),
- /** */
- undef_480 (26660, ""),
- /** */
- undef_481 (26665, " "),
+ /** COMMID_RXN2-60 */
+ COMMID_RXN2_60 (26660, "COMMID_RXN2-60"),
+ /** NATOID_RyeHouse */
+ NATOID_RYEHOUSE (26665, "NATOID_RyeHouse"),
/** S-1810CD */
S_1810CD (26670, "S-1810CD"),
/** Sahab */
SAHAB (26672, "Sahab"),
/** Salamandre */
SALAMANDRE (26673, "Salamandre"),
- /** */
- undef_482 (26674, " "),
+ /** COMMID_SamyungSMR-7200 */
+ COMMID_SAMYUNGSMR_7200 (26674, "COMMID_SamyungSMR-7200"),
/** S1850M */
S1850M (26675, "S1850M"),
- /** */
- undef_483 (26685, ""),
- /** */
- undef_484 (26730, ""),
- /** */
- undef_485 (26775, ""),
- /** */
- undef_486 (26795, ""),
+ /** S-511 */
+ S_511 (26676, "S-511"),
+ /** S-512 */
+ S_512 (26677, "S-512"),
+ /** S-600 */
+ S_600 (26678, "S-600"),
+ /** S-604 */
+ S_604 (26679, "S-604"),
+ /** S-613 */
+ S_613 (26681, "S-613"),
+ /** S-631 */
+ S_631 (26682, "S-631"),
+ /** S-654 */
+ S_654 (26683, "S-654"),
+ /** S-669 */
+ S_669 (26684, "S-669"),
+ /** NATOID_SA2Guideline */
+ NATOID_SA2GUIDELINE (26685, "NATOID_SA2Guideline"),
+ /** S-244 */
+ S_244 (26686, "S-244"),
+ /** S-711 */
+ S_711 (26687, "S-711"),
+ /** NATOID_SA3Goa */
+ NATOID_SA3GOA (26730, "NATOID_SA3Goa"),
+ /** NATOID_SA8GeckoDT */
+ NATOID_SA8GECKODT (26775, "NATOID_SA8GeckoDT"),
+ /** NATOID_SA-12TELARILL */
+ NATOID_SA_12TELARILL (26795, "NATOID_SA-12TELARILL"),
+ /** SABER-M60 */
+ SABER_M60 (26799, "SABER-M60"),
+ /** Samovar */
+ SAMOVAR (26805, "Samovar"),
/** Sampson */
SAMPSON (26810, "Sampson"),
- /** */
- undef_487 (26820, ""),
- /** */
- undef_488 (26865, ""),
+ /** NATOID_SAN7GadflyTI */
+ NATOID_SAN7GADFLYTI (26820, "NATOID_SAN7GadflyTI"),
+ /** NATOID_SAN11Cads1UN */
+ NATOID_SAN11CADS1UN (26865, "NATOID_SAN11Cads1UN"),
/** Saccade MH */
SACCADE_MH (26900, "Saccade MH"),
- /** */
- undef_489 (26910, ""),
+ /** NATOID_SaltPotAandB */
+ NATOID_SALTPOTAB (26910, "NATOID_SaltPotA&B"),
/** SAP-14 */
SAP_14 (26920, "SAP-14"),
/** SAP-518 */
@@ -2960,30 +3732,42 @@ public enum EmitterName
SA_PECHORA_2M_TT (26935, "SA Pechora 2M TT"),
/** SAR (on UAVs) */
SAR_ON_UAVS (26945, "SAR (on UAVs)"),
+ /** SATRAPE */
+ SATRAPE (26950, "SATRAPE"),
/** SATURNE II */
SATURNE_II (26955, "SATURNE II"),
- /** */
- undef_490 (27000, ""),
- /** */
- undef_491 (27045, ""),
- /** */
- undef_492 (27090, ""),
- /** */
- undef_493 (27100, " "),
- /** */
- undef_494 (27101, " "),
- /** */
- undef_495 (27102, " "),
- /** */
- undef_496 (27110, " "),
- /** */
- undef_497 (27115, " "),
- /** */
- undef_498 (27116, " "),
- /** */
- undef_499 (27125, " "),
- /** */
- undef_500 (27135, ""),
+ /** NATOID_ScanCan */
+ NATOID_SCANCAN (27000, "NATOID_ScanCan"),
+ /** NATOID_ScanFix */
+ NATOID_SCANFIX (27045, "NATOID_ScanFix"),
+ /** NATOID_ScanOdd */
+ NATOID_SCANODD (27090, "NATOID_ScanOdd"),
+ /** SCANTER 1002 */
+ SCANTER_1002 (27095, "SCANTER 1002"),
+ /** COMMID_SCANTER2001 */
+ COMMID_SCANTER2001 (27100, "COMMID_SCANTER2001"),
+ /** COMMID_SCANTER2002 */
+ COMMID_SCANTER2002 (27101, "COMMID_SCANTER2002"),
+ /** COMMID_SCANTER2100 */
+ COMMID_SCANTER2100 (27102, "COMMID_SCANTER2100"),
+ /** SCANTER 4002 */
+ SCANTER_4002 (27109, "SCANTER 4002"),
+ /** COMMID_SCANTER4100 */
+ COMMID_SCANTER4100 (27110, "COMMID_SCANTER4100"),
+ /** SCANTER 5102 */
+ SCANTER_5102 (27111, "SCANTER 5102"),
+ /** SCANTER 5502 */
+ SCANTER_5502 (27113, "SCANTER 5502"),
+ /** COMMID_SCANTER6000 */
+ COMMID_SCANTER6000 (27115, "COMMID_SCANTER6000"),
+ /** COMMID_SCANTER6002 */
+ COMMID_SCANTER6002 (27116, "COMMID_SCANTER6002"),
+ /** COMMID_ScanterMil009 */
+ COMMID_SCANTERMIL009 (27125, "COMMID_ScanterMil009"),
+ /** NATOID_ScanThree */
+ NATOID_SCANTHREE (27135, "NATOID_ScanThree"),
+ /** SCANTER MIL S */
+ SCANTER_MIL_S (27137, "SCANTER MIL S"),
/** Scanter SMR */
SCANTER_SMR (27139, "Scanter SMR"),
/** SCANTER (CSR) */
@@ -2992,12 +3776,12 @@ public enum EmitterName
SCORADS (27141, "SCORADS"),
/** STAR 2000 */
STAR_2000 (27143, "STAR 2000"),
- /** */
- undef_501 (27150, ""),
- /** */
- undef_502 (27180, ""),
- /** */
- undef_503 (27183, " "),
+ /** NATOID_SCOREBOARD */
+ NATOID_SCOREBOARD (27150, "NATOID_SCOREBOARD"),
+ /** NATOID_ScoupPlate */
+ NATOID_SCOUPPLATE (27180, "NATOID_ScoupPlate"),
+ /** COMMID_SCOUT */
+ COMMID_SCOUT (27183, "COMMID_SCOUT"),
/** SCR-584 */
SCR_584 (27190, "SCR-584"),
/** Sea Archer 2 */
@@ -3008,22 +3792,24 @@ public enum EmitterName
SEA_EAGLE_TYPE_381 (27239, "Sea Eagle (Type 381)"),
/** Sea Eagle S/C (Type 382) */
SEA_EAGLE_S_C_TYPE_382 (27240, "Sea Eagle S/C (Type 382)"),
- /** */
- undef_504 (27248, " "),
- /** */
- undef_505 (27251, " "),
+ /** SEA FALCON */
+ SEA_FALCON (27245, "SEA FALCON"),
+ /** COMMID_SeaGiraffeAMB */
+ COMMID_SEAGIRAFFEAMB (27248, "COMMID_SeaGiraffeAMB"),
+ /** COMMID_Seaguard */
+ COMMID_SEAGUARD (27251, "COMMID_Seaguard"),
/** Sea Hunter 4 MG */
SEA_HUNTER_4_MG (27270, "Sea Hunter 4 MG"),
/** Sea Hunter 4 TA */
SEA_HUNTER_4_TA (27315, "Sea Hunter 4 TA"),
/** Sea Hunter 4 TT */
SEA_HUNTER_4_TT (27360, "Sea Hunter 4 TT"),
- /** */
- undef_506 (27405, ""),
- /** */
- undef_507 (27430, " "),
- /** */
- undef_508 (27450, ""),
+ /** NATOID_SeaGull */
+ NATOID_SEAGULL (27405, "NATOID_SeaGull"),
+ /** COMMID_SeaMaster400 */
+ COMMID_SEAMASTER400 (27430, "COMMID_SeaMaster400"),
+ /** NATOID_SeaNet */
+ NATOID_SEANET (27450, "NATOID_SeaNet"),
/** Sea Sparrow */
SEA_SPARROW (27451, "Sea Sparrow"),
/** Sea Spray */
@@ -3038,108 +3824,130 @@ public enum EmitterName
SEARCHWATER (27570, "Searchwater"),
/** Searchwater 2000 */
SEARCHWATER_2000 (27575, "Searchwater 2000"),
- /** */
- undef_509 (27584, " "),
- /** */
- undef_510 (27585, ""),
- /** */
- undef_511 (27630, ""),
- /** */
- undef_512 (27675, ""),
+ /** SEASONDE */
+ SEASONDE (27580, "SEASONDE"),
+ /** SEASPRAY 7000E */
+ SEASPRAY_7000E (27582, "SEASPRAY 7000E"),
+ /** SeaVue */
+ SEAVUE (27583, "SeaVue"),
+ /** COMMID_SeasprayMk3 */
+ COMMID_SEASPRAYMK3 (27584, "COMMID_SeasprayMk3"),
+ /** COMMID_SeleniaOrion7 */
+ COMMID_SELENIAORION7 (27585, "COMMID_SeleniaOrion7"),
+ /** COMMID_Seleniatype912 */
+ COMMID_SELENIATYPE912 (27630, "COMMID_Seleniatype912"),
+ /** COMMID_SelenniaRAN12LX */
+ COMMID_SELENNIARAN12LX (27675, "COMMID_SelenniaRAN12LX"),
/** Selenia RAN 20S */
SELENIA_RAN_20S (27680, "Selenia RAN 20S"),
- /** */
- undef_513 (27720, ""),
- /** */
- undef_514 (27765, ""),
- /** */
- undef_515 (27775, " "),
+ /** COMMID_SelenniaRTN10X */
+ COMMID_SELENNIARTN10X (27720, "COMMID_SelenniaRTN10X"),
+ /** COMMID_SeliniaARP1645 */
+ COMMID_SELINIAARP1645 (27765, "COMMID_SeliniaARP1645"),
+ /** SENTIR-M20 */
+ SENTIR_M20 (27770, "SENTIR-M20"),
+ /** SERHAT */
+ SERHAT (27773, "SERHAT"),
+ /** COMMID_Series10CompactSubmarineRadar(CSR) */
+ COMMID_SERIES10COMPACTSUBMARINERADARCSR (27775, "COMMID_Series10CompactSubmarineRadar(CSR)"),
+ /** SERIES 52 */
+ SERIES_52 (27780, "SERIES 52"),
+ /** SERIES 320 */
+ SERIES_320 (27790, "SERIES 320"),
/** SG */
SG (27800, "SG"),
- /** */
- undef_516 (27802, " "),
- /** */
- undef_517 (27803, " "),
+ /** NATOID_SGJ-02 */
+ NATOID_SGJ_02 (27802, "NATOID_SGJ-02"),
+ /** NATOID_SGJ-03 */
+ NATOID_SGJ_03 (27803, "NATOID_SGJ-03"),
/** SGR 102 00 */
SGR_102_00 (27810, "SGR 102 00"),
/** SGR 103/02 */
SGR_103_02 (27855, "SGR 103/02"),
/** SGR-104 */
SGR_104 (27870, "SGR-104"),
- /** */
- undef_518 (27900, ""),
- /** */
- undef_519 (27945, ""),
- /** */
- undef_520 (27990, ""),
- /** */
- undef_521 (28035, ""),
+ /** SHAHINE */
+ SHAHINE (27875, "SHAHINE"),
+ /** NATOID_SheetBend */
+ NATOID_SHEETBEND (27900, "NATOID_SheetBend"),
+ /** NATOID_SheetCurve */
+ NATOID_SHEETCURVE (27945, "NATOID_SheetCurve"),
+ /** SHIKRA */
+ SHIKRA (27980, "SHIKRA"),
+ /** NATOID_ShipGlobe */
+ NATOID_SHIPGLOBE (27990, "NATOID_ShipGlobe"),
+ /** NATOID_ShipWheel */
+ NATOID_SHIPWHEEL (28035, "NATOID_ShipWheel"),
/** SGR 114 */
SGR_114 (28080, "SGR 114"),
- /** */
- undef_522 (28125, ""),
- /** */
- undef_523 (28170, ""),
- /** */
- undef_524 (28215, ""),
- /** */
- undef_525 (28260, ""),
+ /** NATOID_ShoreWalkA */
+ NATOID_SHOREWALKA (28125, "NATOID_ShoreWalkA"),
+ /** NATOID_ShortHorn */
+ NATOID_SHORTHORN (28170, "NATOID_ShortHorn"),
+ /** NATOID_ShotDome */
+ NATOID_SHOTDOME (28215, "NATOID_ShotDome"),
+ /** NATOID_SideGlobeJN */
+ NATOID_SIDEGLOBEJN (28260, "NATOID_SideGlobeJN"),
/** PRV-11 */
PRV_11 (28280, "PRV-11"),
- /** */
- undef_526 (28305, ""),
- /** */
- undef_527 (28350, ""),
- /** */
- undef_528 (28395, ""),
- /** */
- undef_529 (28440, ""),
- /** */
- undef_530 (28445, " "),
- /** */
- undef_531 (28480, " "),
- /** */
- undef_532 (28485, ""),
- /** */
- undef_533 (28530, ""),
- /** */
- undef_534 (28575, ""),
- /** */
- undef_535 (28620, ""),
- /** */
- undef_536 (28665, ""),
- /** */
- undef_537 (28710, ""),
- /** */
- undef_538 (28755, ""),
- /** */
- undef_539 (28760, " "),
- /** */
- undef_540 (28770, " "),
- /** */
- undef_541 (28800, ""),
- /** */
- undef_542 (28845, ""),
- /** */
- undef_543 (28890, ""),
- /** */
- undef_544 (28935, ""),
- /** */
- undef_545 (28980, ""),
- /** */
- undef_546 (29025, ""),
- /** */
- undef_547 (29030, " "),
- /** */
- undef_548 (29035, " "),
- /** */
- undef_549 (29050, " "),
- /** */
- undef_550 (29070, ""),
- /** */
- undef_551 (29115, ""),
- /** */
- undef_552 (29160, ""),
+ /** NATOID_SideWalkA */
+ NATOID_SIDEWALKA (28305, "NATOID_SideWalkA"),
+ /** COMMID_SignaalDA02 */
+ COMMID_SIGNAALDA02 (28350, "COMMID_SignaalDA02"),
+ /** COMMID_SignaalDA05 */
+ COMMID_SIGNAALDA05 (28395, "COMMID_SignaalDA05"),
+ /** COMMID_SignaalDA08 */
+ COMMID_SIGNAALDA08 (28440, "COMMID_SignaalDA08"),
+ /** COMMID_SignaalDA082LS */
+ COMMID_SIGNAALDA082LS (28445, "COMMID_SignaalDA082LS"),
+ /** COMMID_SignaalLW04 */
+ COMMID_SIGNAALLW04 (28480, "COMMID_SignaalLW04"),
+ /** COMMID_SignaalLW08 */
+ COMMID_SIGNAALLW08 (28485, "COMMID_SignaalLW08"),
+ /** COMMID_SignaalLWOR */
+ COMMID_SIGNAALLWOR (28530, "COMMID_SignaalLWOR"),
+ /** COMMID_SignaalM45 */
+ COMMID_SIGNAALM45 (28575, "COMMID_SignaalM45"),
+ /** COMMID_SignaalMW08 */
+ COMMID_SIGNAALMW08 (28620, "COMMID_SignaalMW08"),
+ /** COMMID_SignaalSMART */
+ COMMID_SIGNAALSMART (28665, "COMMID_SignaalSMART"),
+ /** COMMID_SignaalSTING */
+ COMMID_SIGNAALSTING (28710, "COMMID_SignaalSTING"),
+ /** COMMID_SignaalSTIR */
+ COMMID_SIGNAALSTIR (28755, "COMMID_SignaalSTIR"),
+ /** COMMID_SignaalSTIR1.8M */
+ COMMID_SIGNAALSTIR18M (28760, "COMMID_SignaalSTIR1.8M"),
+ /** COMMID_SignaalSTIR24M */
+ COMMID_SIGNAALSTIR24M (28770, "COMMID_SignaalSTIR24M"),
+ /** COMMID_SignaalWM202 */
+ COMMID_SIGNAALWM202 (28800, "COMMID_SignaalWM202"),
+ /** COMMID_SignaalWM25 */
+ COMMID_SIGNAALWM25 (28845, "COMMID_SignaalWM25"),
+ /** COMMID_SignaalWM27 */
+ COMMID_SIGNAALWM27 (28890, "COMMID_SignaalWM27"),
+ /** COMMID_SignaalWM28 */
+ COMMID_SIGNAALWM28 (28935, "COMMID_SignaalWM28"),
+ /** COMMID_SignaalZW01 */
+ COMMID_SIGNAALZW01 (28980, "COMMID_SignaalZW01"),
+ /** COMMID_SignaalZW06 */
+ COMMID_SIGNAALZW06 (29025, "COMMID_SignaalZW06"),
+ /** COMMID_SignaalZW07 */
+ COMMID_SIGNAALZW07 (29030, "COMMID_SignaalZW07"),
+ /** COMMID_SignaalZW0800 */
+ COMMID_SIGNAALZW0800 (29035, "COMMID_SignaalZW0800"),
+ /** SIMRAD 3G */
+ SIMRAD_3G (29043, "SIMRAD 3G"),
+ /** SIMRAD 4G */
+ SIMRAD_4G (29045, "SIMRAD 4G"),
+ /** COMMID_SimradCA54 */
+ COMMID_SIMRADCA54 (29050, "COMMID_SimradCA54"),
+ /** NATOID_SkiPole */
+ NATOID_SKIPOLE (29070, "NATOID_SkiPole"),
+ /** NATOID_SkinHead */
+ NATOID_SKINHEAD (29115, "NATOID_SkinHead"),
+ /** NATOID_SkipSpin */
+ NATOID_SKIPSPIN (29160, "NATOID_SkipSpin"),
/** Sky Wave (Over The Horizon) */
SKY_WAVE_OVER_THE_HORIZON (29175, "Sky Wave (Over The Horizon)"),
/** Skyguard B */
@@ -3152,872 +3960,60 @@ public enum EmitterName
SKYGUARD_LR (29191, "Skyguard LR"),
/** Skymaster */
SKYMASTER (29200, "Skymaster"),
- /** */
- undef_553 (29205, ""),
+ /** NATOID_SkyWatch */
+ NATOID_SKYWATCH (29205, "NATOID_SkyWatch"),
/** Sky Ranger */
SKY_RANGER (29210, "Sky Ranger"),
- /** */
- undef_554 (29215, ""),
+ /** COMMID_SKYSHADOW */
+ COMMID_SKYSHADOW (29215, "COMMID_SKYSHADOW"),
/** SKYSHIELD TA */
SKYSHIELD_TA (29220, "SKYSHIELD TA"),
/** SL */
SL (29250, "SL"),
/** SL/ALQ-234 */
SL_ALQ_234 (29270, "SL/ALQ-234"),
- /** */
- undef_555 (29295, ""),
- /** */
- undef_556 (29297, " "),
- /** */
- undef_557 (29340, ""),
- /** */
- undef_558 (29385, ""),
- /** */
- undef_559 (29400, ""),
- /** */
- undef_560 (29430, ""),
- /** */
- undef_561 (29431, ""),
- /** */
- undef_562 (29432, ""),
- /** */
- undef_563 (29433, " "),
- /** */
- undef_564 (29434, " "),
- /** */
- undef_565 (29435, ""),
- /** */
- undef_566 (29440, ""),
+ /** NATOID_SlapShot */
+ NATOID_SLAPSHOT (29295, "NATOID_SlapShot"),
+ /** NATOID_SlapShotG */
+ NATOID_SLAPSHOTG (29297, "NATOID_SlapShotG"),
+ /** SLC-2 */
+ SLC_2 (29300, "SLC-2"),
+ /** SLC-4 */
+ SLC_4 (29305, "SLC-4"),
+ /** NATOID_SlimNet */
+ NATOID_SLIMNET (29340, "NATOID_SlimNet"),
+ /** NATOID_SlotBackA */
+ NATOID_SLOTBACKA (29385, "NATOID_SlotBackA"),
+ /** NATOID_SlotBackILL */
+ NATOID_SLOTBACKILL (29400, "NATOID_SlotBackILL"),
+ /** NATOID_SlotBackB */
+ NATOID_SLOTBACKB (29430, "NATOID_SlotBackB"),
+ /** NATOID_SlotBackIV */
+ NATOID_SLOTBACKIV (29431, "NATOID_SlotBackIV"),
+ /** NATOID_SlotBackBTopaz */
+ NATOID_SLOTBACKBTOPAZ (29432, "NATOID_SlotBackBTopaz"),
+ /** NATOID_SlotBackE */
+ NATOID_SLOTBACKE (29433, "NATOID_SlotBackE"),
+ /** NATOID_SlotBackG */
+ NATOID_SLOTBACKG (29434, "NATOID_SlotBackG"),
+ /** NATOID_SlotBackVI */
+ NATOID_SLOTBACKVI (29435, "NATOID_SlotBackVI"),
+ /** NATOID_SlotRest */
+ NATOID_SLOTREST (29440, "NATOID_SlotRest"),
/** SM-674A/UPM */
SM_674A_UPM (29450, "SM-674A/UPM"),
- /** */
- undef_567 (29475, ""),
- /** */
- undef_568 (29520, ""),
- /** */
- undef_569 (29565, ""),
- /** */
- undef_570 (29610, ""),
- /** */
- undef_571 (29655, ""),
- /** */
- undef_572 (29700, ""),
- /** */
- undef_573 (29745, ""),
- /** */
- undef_574 (29790, ""),
- /** */
- undef_575 (29835, ""),
- /** */
- undef_576 (29880, ""),
- /** */
- undef_577 (29925, ""),
- /** */
- undef_578 (29970, ""),
- /** */
- undef_579 (30015, ""),
- /** SR-47A */
- SR_47A (30016, "SR-47A"),
- /** */
- undef_580 (30060, ""),
- /** */
- undef_581 (30065, " "),
- /** SMART-S */
- SMART_S (30068, "SMART-S"),
- /** SMART-S Mk2 */
- SMART_S_MK2 (30069, "SMART-S Mk2"),
- /** SMART-L */
- SMART_L (30070, "SMART-L"),
- /** SM-932 */
- SM_932 (30072, "SM-932"),
- /** */
- undef_582 (30075, ""),
- /** */
- undef_583 (30080, ""),
- /** */
- undef_584 (30105, ""),
- /** */
- undef_585 (30140, ""),
- /** */
- undef_586 (30150, ""),
- /** */
- undef_587 (30195, ""),
- /** */
- undef_588 (30200, " "),
- /** */
- undef_589 (30240, ""),
- /** */
- undef_590 (30255, ""),
- /** */
- undef_591 (30285, ""),
- /** */
- undef_592 (30330, ""),
- /** */
- undef_593 (30375, ""),
- /** */
- undef_594 (30420, ""),
- /** */
- undef_595 (30421, " "),
- /** */
- undef_596 (30465, ""),
- /** 9S18M1 */
- $9S18M1 (30470, "9S18M1"),
- /** SPB-7 */
- SPB_7 (30475, "SPB-7"),
- /** */
- undef_597 (30480, " "),
- /** SO-1 */
- SO_1 (30510, "SO-1"),
- /** SO-12 */
- SO_12 (30520, "SO-12"),
- /** SO A Communist */
- SO_A_COMMUNIST (30555, "SO A Communist"),
- /** SO-69 */
- SO_69 (30580, "SO-69"),
- /** */
- undef_598 (30600, ""),
- /** SOM 64 */
- SOM_64 (30645, "SOM 64"),
- /** */
- undef_599 (30660, ""),
- /** */
- undef_600 (30670, ""),
- /** Sparrow (AIM/RIM-7) ILL */
- SPARROW_AIM_RIM_7_ILL (30690, "Sparrow (AIM/RIM-7) ILL"),
- /** SPERRY RASCAR */
- SPERRY_RASCAR (30691, "SPERRY RASCAR"),
- /** */
- undef_601 (30700, ""),
- /** */
- undef_602 (30701, " "),
- /** SPG 53F */
- SPG_53F (30735, "SPG 53F"),
- /** SPG 70 (RTN 10X) */
- SPG_70_RTN_10X (30780, "SPG 70 (RTN 10X)"),
- /** SPG 74 (RTN 20X) */
- SPG_74_RTN_20X (30825, "SPG 74 (RTN 20X)"),
- /** SPG 75 (RTN 30X) */
- SPG_75_RTN_30X (30870, "SPG 75 (RTN 30X)"),
- /** SPG 76 (RTN 30X) */
- SPG_76_RTN_30X (30915, "SPG 76 (RTN 30X)"),
- /** */
- undef_603 (30960, ""),
- /** */
- undef_604 (31005, ""),
- /** */
- undef_605 (31050, ""),
- /** */
- undef_606 (31095, ""),
- /** SPN-2 */
- SPN_2 (31096, "SPN-2"),
- /** SPN-4 */
- SPN_4 (31097, "SPN-4"),
- /** SPN-30 */
- SPN_30 (31100, "SPN-30"),
- /** SPN 35A */
- SPN_35A (31140, "SPN 35A"),
- /** SPN 41 */
- SPN_41 (31185, "SPN 41"),
- /** SPN 42 */
- SPN_42 (31230, "SPN 42"),
- /** SPN 43A */
- SPN_43A (31275, "SPN 43A"),
- /** SPN 43B */
- SPN_43B (31320, "SPN 43B"),
- /** SPN 44 */
- SPN_44 (31365, "SPN 44"),
- /** SPN 46 */
- SPN_46 (31410, "SPN 46"),
- /** SPN 703 */
- SPN_703 (31455, "SPN 703"),
- /** SPN 728 (V) 1 */
- SPN_728_V_1 (31500, "SPN 728 (V) 1"),
- /** SPN 748 */
- SPN_748 (31545, "SPN 748"),
- /** SPN 750 */
- SPN_750 (31590, "SPN 750"),
- /** SPO-8 */
- SPO_8 (31592, "SPO-8"),
- /** SPN 753G */
- SPN_753G (31593, "SPN 753G"),
- /** */
- undef_607 (31635, ""),
- /** P-12 */
- P_12 (31680, "P-12"),
- /** P-18 */
- P_18 (31681, "P-18"),
- /** P-18 */
- P_18_2 (31682, "P-18"),
- /** P-18 */
- P_18_3 (31684, "P-18"),
- /** */
- undef_608 (31700, " "),
- /** SPQ 712 (RAN 12 L/X) */
- SPQ_712_RAN_12_L_X (31725, "SPQ 712 (RAN 12 L/X)"),
- /** SPS 6C */
- SPS_6C (31770, "SPS 6C"),
- /** SPS 10F */
- SPS_10F (31815, "SPS 10F"),
- /** SPS 12 */
- SPS_12 (31860, "SPS 12"),
- /** SPS 58 */
- SPS_58 (31905, "SPS 58"),
- /** SPS 64 */
- SPS_64 (31950, "SPS 64"),
- /** SPS-141 */
- SPS_141 (31951, "SPS-141"),
- /** SPS-142 */
- SPS_142 (31952, "SPS-142"),
- /** SPS-143 */
- SPS_143 (31953, "SPS-143"),
- /** SPS-161 */
- SPS_161 (31960, "SPS-161"),
- /** SPS 768 (RAN EL) */
- SPS_768_RAN_EL (31995, "SPS 768 (RAN EL)"),
- /** SPS-550K MF */
- SPS_550K_MF (32020, "SPS-550K MF"),
- /** SPS 774 (RAN 10S) */
- SPS_774_RAN_10S (32040, "SPS 774 (RAN 10S)"),
- /** SPY 790 */
- SPY_790 (32085, "SPY 790"),
- /** */
- undef_609 (32130, ""),
- /** */
- undef_610 (32175, ""),
- /** */
- undef_611 (32220, ""),
- /** */
- undef_612 (32265, ""),
- /** Shmel, Add SHMEL National Nomenclature for clarity */
- SHMEL (32310, "Shmel"),
- /** P-15M */
- P_15M (32330, "P-15M"),
- /** */
- undef_613 (32355, ""),
- /** SR47B-G */
- SR47B_G (32375, "SR47B-G"),
- /** SRN 6 */
- SRN_6 (32400, "SRN 6"),
- /** SRN 15 */
- SRN_15 (32445, "SRN 15"),
- /** SRN 206 */
- SRN_206 (32455, "SRN 206"),
- /** SRN 745 */
- SRN_745 (32490, "SRN 745"),
- /** SRO 1 */
- SRO_1 (32535, "SRO 1"),
- /** SRO 2 */
- SRO_2 (32580, "SRO 2"),
- /** */
- undef_614 (32625, ""),
- /** */
- undef_615 (32670, ""),
- /** */
- undef_616 (32715, ""),
- /** */
- undef_617 (32760, ""),
- /** */
- undef_618 (32805, ""),
- /** */
- undef_619 (32850, ""),
- /** */
- undef_620 (32851, " "),
- /** */
- undef_621 (32852, " "),
- /** */
- undef_622 (32895, ""),
- /** */
- undef_623 (32940, ""),
- /** */
- undef_624 (32985, ""),
- /** */
- undef_625 (33025, " "),
- /** */
- undef_626 (33030, ""),
- /** */
- undef_627 (33075, ""),
- /** */
- undef_628 (33120, ""),
- /** SS-N-10A FL-10 mmW MH */
- SS_N_10A_FL_10_MMW_MH (33125, "SS-N-10A FL-10 mmW MH"),
- /** SS-N-11 Nasr-1 mmW MH */
- SS_N_11_NASR_1_MMW_MH (33140, "SS-N-11 Nasr-1 mmW MH"),
- /** */
- undef_629 (33165, ""),
- /** SS-N-12 YJ-83J mmW MH */
- SS_N_12_YJ_83J_MMW_MH (33166, "SS-N-12 YJ-83J mmW MH"),
- /** */
- undef_630 (33210, ""),
- /** */
- undef_631 (33230, " "),
- /** */
- undef_632 (33231, " "),
- /** */
- undef_633 (33255, ""),
- /** */
- undef_634 (33300, ""),
- /** */
- undef_635 (33345, ""),
- /** */
- undef_636 (33390, ""),
- /** */
- undef_637 (33435, ""),
- /** */
- undef_638 (33480, ""),
- /** */
- undef_639 (33481, " "),
- /** */
- undef_640 (33483, " "),
- /** SS-N-26 Strobile MMW MH */
- SS_N_26_STROBILE_MMW_MH (33484, "SS-N-26 Strobile MMW MH"),
- /** */
- undef_641 (33485, ""),
- /** */
- undef_642 (33486, " "),
- /** */
- undef_643 (33505, " "),
- /** */
- undef_644 (33510, " "),
- /** */
- undef_645 (33511, " "),
- /** */
- undef_646 (33525, ""),
- /** STR 41 */
- STR_41 (33570, "STR 41"),
- /** */
- undef_647 (33590, ""),
- /** */
- undef_648 (33595, ""),
- /** */
- undef_649 (33600, ""),
- /** */
- undef_650 (33615, ""),
- /** */
- undef_651 (33660, ""),
- /** */
- undef_652 (33705, ""),
- /** */
- undef_653 (33750, ""),
- /** */
- undef_654 (33795, ""),
- /** */
- undef_655 (33840, ""),
- /** Superfledermaus */
- SUPERFLEDERMAUS (33860, "Superfledermaus"),
- /** Supersearcher */
- SUPERSEARCHER (33870, "Supersearcher"),
- /** */
- undef_656 (33885, ""),
- /** */
- undef_657 (33930, ""),
- /** SYNAPSIS Mk2 */
- SYNAPSIS_MK2 (33935, "SYNAPSIS Mk2"),
- /** */
- undef_658 (33975, ""),
- /** */
- undef_659 (34020, ""),
- /** */
- undef_660 (34040, ""),
- /** */
- undef_661 (34065, ""),
- /** */
- undef_662 (34110, ""),
- /** */
- undef_663 (34155, ""),
- /** */
- undef_664 (34200, ""),
- /** */
- undef_665 (34245, ""),
- /** */
- undef_666 (34290, ""),
- /** */
- undef_667 (34335, ""),
- /** */
- undef_668 (34380, ""),
- /** */
- undef_669 (34425, ""),
- /** */
- undef_670 (34470, ""),
- /** JY-11B */
- JY_11B (34500, "JY-11B"),
- /** TACAN/SURF */
- TACAN_SURF (34505, "TACAN/SURF"),
- /** P-14 */
- P_14 (34515, "P-14"),
- /** */
- undef_671 (34560, ""),
- /** */
- undef_672 (34605, ""),
- /** */
- undef_673 (34610, " "),
- /** */
- undef_674 (34620, " "),
- /** */
- undef_675 (34625, ""),
- /** T1135 */
- T1135 (34626, "T1135"),
- /** TANCAN/SURF */
- TANCAN_SURF (34627, "TANCAN/SURF"),
- /** TESAR */
- TESAR (34630, "TESAR"),
- /** THAAD GBR */
- THAAD_GBR (34640, "THAAD GBR"),
- /** Thales Nederland Signaal APAR */
- THALES_NEDERLAND_SIGNAAL_APAR (34645, "Thales Nederland Signaal APAR"),
- /** Thales Variant */
- THALES_VARIANT (34647, "Thales Variant"),
- /** THD 225 */
- THD_225 (34650, "THD 225"),
- /** THD 1940 */
- THD_1940 (34670, "THD 1940"),
- /** THD-1955 Palmier */
- THD_1955_PALMIER (34680, "THD-1955 Palmier"),
- /** THD 5500 */
- THD_5500 (34695, "THD 5500"),
- /** */
- undef_676 (34740, ""),
- /** PRV-9 */
- PRV_9 (34785, "PRV-9"),
- /** PRV-16 */
- PRV_16 (34786, "PRV-16"),
- /** */
- undef_677 (34795, ""),
- /** */
- undef_678 (34830, ""),
- /** */
- undef_679 (34875, ""),
- /** */
- undef_680 (34920, ""),
- /** */
- undef_681 (34965, ""),
- /** */
- undef_682 (35010, ""),
- /** */
- undef_683 (35055, ""),
- /** */
- undef_684 (35100, ""),
- /** */
- undef_685 (35145, ""),
- /** */
- undef_686 (35190, ""),
- /** */
- undef_687 (35235, ""),
- /** */
- undef_688 (35280, ""),
- /** */
- undef_689 (35325, ""),
- /** */
- undef_690 (35370, ""),
- /** */
- undef_691 (35415, ""),
- /** */
- undef_692 (35460, ""),
- /** Thomson ENR (European Navy Radar) */
- THOMSON_ENR_EUROPEAN_NAVY_RADAR (35470, "Thomson ENR (European Navy Radar)"),
- /** Thomson RDI */
- THOMSON_RDI (35475, "Thomson RDI"),
- /** Tier II Plus */
- TIER_II_PLUS (35477, "Tier II Plus"),
- /** TRS-2105 */
- TRS_2105 (35480, "TRS-2105"),
- /** HT-223 */
- HT_223 (35485, "HT-223"),
- /** TRS-2100 */
- TRS_2100 (35490, "TRS-2100"),
- /** */
- undef_693 (35505, ""),
- /** 36D6 */
- $36D6 (35550, "36D6"),
- /** */
- undef_694 (35570, ""),
- /** TIRSPONDER */
- TIRSPONDER (35580, "TIRSPONDER"),
- /** TMK Mk2 */
- TMK_MK2 (35585, "TMK Mk2"),
- /** TMX Mk2 */
- TMX_MK2 (35586, "TMX Mk2"),
- /** */
- undef_695 (35595, ""),
- /** */
- undef_696 (35640, ""),
- /** */
- undef_697 (35685, ""),
- /** */
- undef_698 (35730, ""),
- /** */
- undef_699 (35775, ""),
- /** Token B */
- TOKEN_B (35785, "Token B"),
- /** */
- undef_700 (35800, ""),
- /** Tonson */
- TONSON (35810, "Tonson"),
- /** */
- undef_701 (35820, ""),
- /** */
- undef_702 (35865, ""),
- /** */
- undef_703 (35910, ""),
- /** */
- undef_704 (35955, ""),
- /** */
- undef_705 (36000, ""),
- /** */
- undef_706 (36045, ""),
- /** */
- undef_707 (36046, ""),
- /** */
- undef_708 (36090, ""),
- /** TYPE-208 */
- TYPE_208 (36120, "TYPE-208"),
- /** */
- undef_709 (36135, ""),
- /** */
- undef_710 (36180, ""),
- /** Tornado GMR */
- TORNADO_GMR (36200, "Tornado GMR"),
- /** Tornado TFR */
- TORNADO_TFR (36201, "Tornado TFR"),
- /** */
- undef_711 (36220, ""),
- /** */
- undef_712 (36225, ""),
- /** */
- undef_713 (36230, ""),
- /** */
- undef_714 (36270, ""),
- /** TORSO M */
- TORSO_M (36315, "TORSO M"),
- /** TQN-2 */
- TQN_2 (36320, "TQN-2"),
- /** */
- undef_715 (36360, ""),
- /** TRD-1500 */
- TRD_1500 (36365, "TRD-1500"),
- /** */
- undef_716 (36370, " "),
- /** */
- undef_717 (36371, " "),
- /** TRISPONDE */
- TRISPONDE (36380, "TRISPONDE"),
- /** TRS 3010 */
- TRS_3010 (36386, "TRS 3010"),
- /** Triton G */
- TRITON_G (36390, "Triton G"),
- /** TRS 3030 */
- TRS_3030 (36400, "TRS 3030"),
- /** TRS 3033 */
- TRS_3033 (36405, "TRS 3033"),
- /** TRS 3203 */
- TRS_3203 (36417, "TRS 3203"),
- /** TRS 3405 */
- TRS_3405 (36420, "TRS 3405"),
- /** TRS 3410 */
- TRS_3410 (36425, "TRS 3410"),
- /** TRS 3415 */
- TRS_3415 (36430, "TRS 3415"),
- /** TRS-3D */
- TRS_3D (36440, "TRS-3D"),
- /** TRS-3D/16 */
- TRS_3D_16 (36441, "TRS-3D/16"),
- /** TRS-3D/16-ES */
- TRS_3D_16_ES (36442, "TRS-3D/16-ES"),
- /** TRS-3D/32 */
- TRS_3D_32 (36443, "TRS-3D/32"),
- /** TRS-4D */
- TRS_4D (36446, "TRS-4D"),
- /** TRS-C */
- TRS_C (36447, "TRS-C"),
- /** TRS-N */
- TRS_N (36450, "TRS-N"),
- /** TS-4478A */
- TS_4478A (36460, "TS-4478A"),
- /** TSE 5000 */
- TSE_5000 (36495, "TSE 5000"),
- /** TSR 333 */
- TSR_333 (36540, "TSR 333"),
- /** TSR 793 */
- TSR_793 (36550, "TSR 793"),
- /** */
- undef_718 (36563, ""),
- /** */
- undef_719 (36585, ""),
- /** */
- undef_720 (36630, ""),
- /** */
- undef_721 (36675, ""),
- /** */
- undef_722 (36720, ""),
- /** */
- undef_723 (36765, ""),
- /** */
- undef_724 (36810, ""),
- /** Type 2-12 J/A */
- TYPE_2_12_J_A (36827, "Type 2-12 J/A"),
- /** Type 2-21 J/A */
- TYPE_2_21_J_A (36830, "Type 2-21 J/A"),
- /** Type 2-23 */
- TYPE_2_23 (36835, "Type 2-23"),
- /** Type 80/ASM-1 */
- TYPE_80_ASM_1 (36836, "Type 80/ASM-1"),
- /** Type 208 */
- TYPE_208_2 (36840, "Type 208"),
- /** Type 222 */
- TYPE_222 (36843, "Type 222"),
- /** Type 226 */
- TYPE_226 (36846, "Type 226"),
- /** Type 232H */
- TYPE_232H (36850, "Type 232H"),
- /** TYPE 245 */
- TYPE_245 (36853, "TYPE 245"),
- /** TYPE 262 */
- TYPE_262 (36855, "TYPE 262"),
- /** TYPE 275 */
- TYPE_275 (36900, "TYPE 275"),
- /** TYPE 293 */
- TYPE_293 (36945, "TYPE 293"),
- /** Type 341 */
- TYPE_341 (36946, "Type 341"),
- /** Type 334 */
- TYPE_334 (36960, "Type 334"),
- /** TYPE 343 SUN VISOR B */
- TYPE_343_SUN_VISOR_B (36990, "TYPE 343 SUN VISOR B"),
- /** Type 345 */
- TYPE_345 (37010, "Type 345"),
- /** TYPE 347B */
- TYPE_347B (37035, "TYPE 347B"),
- /** Type 347G */
- TYPE_347G (37038, "Type 347G"),
- /** Type 359 */
- TYPE_359 (37039, "Type 359"),
- /** Type 352 */
- TYPE_352 (37040, "Type 352"),
- /** Type 360 */
- TYPE_360 (37041, "Type 360"),
- /** Type 362 ESR-1 SR-47B */
- TYPE_362_ESR_1_SR_47B (37043, "Type 362 ESR-1 SR-47B"),
- /** Type 354 */
- TYPE_354 (37045, "Type 354"),
- /** Type 363 */
- TYPE_363 (37048, "Type 363"),
- /** Type 364 */
- TYPE_364 (37049, "Type 364"),
- /** Type-404A(CH) */
- TYPE_404ACH (37050, "Type-404A(CH)"),
- /** Type 405 */
- TYPE_405 (37052, "Type 405"),
- /** Type 408D */
- TYPE_408D (37058, "Type 408D"),
- /** Type 518 (Hai Ying, God Eye, REL-2) */
- TYPE_518_HAI_YING_GOD_EYE_REL_2 (37060, "Type 518 (Hai Ying, God Eye, REL-2)"),
- /** Type 589 */
- TYPE_589 (37070, "Type 589"),
- /** Type 753 */
- TYPE_753 (37075, "Type 753"),
- /** Type 702 */
- TYPE_702 (37077, "Type 702"),
- /** Type 704 */
- TYPE_704 (37078, "Type 704"),
- /** Type 753 */
- TYPE_753_2 (37079, "Type 753"),
- /** Type 756 */
- TYPE_756 (37080, "Type 756"),
- /** Type 815 */
- TYPE_815 (37090, "Type 815"),
- /** Type 793 */
- TYPE_793 (37095, "Type 793"),
- /** Type 8A-813 */
- TYPE_8A_813 (37100, "Type 8A-813"),
- /** Type 902B */
- TYPE_902B (37124, "Type 902B"),
- /** TYPE 903 */
- TYPE_903 (37125, "TYPE 903"),
- /** TYPE 909 TI */
- TYPE_909_TI (37170, "TYPE 909 TI"),
- /** TYPE 909 TT */
- TYPE_909_TT (37215, "TYPE 909 TT"),
- /** TYPE 910 */
- TYPE_910 (37260, "TYPE 910"),
- /** TYPE-931(CH) */
- TYPE_931CH (37265, "TYPE-931(CH)"),
- /** TYPE 965 */
- TYPE_965 (37305, "TYPE 965"),
- /** TYPE 967 */
- TYPE_967 (37350, "TYPE 967"),
- /** TYPE 968 */
- TYPE_968 (37395, "TYPE 968"),
- /** TYPE 974 */
- TYPE_974 (37440, "TYPE 974"),
- /** TYPE 975 */
- TYPE_975 (37485, "TYPE 975"),
- /** TYPE 978 */
- TYPE_978 (37530, "TYPE 978"),
- /** Type 981 */
- TYPE_981 (37534, "Type 981"),
- /** TYPE 992 */
- TYPE_992 (37575, "TYPE 992"),
- /** TYPE 993 */
- TYPE_993 (37620, "TYPE 993"),
- /** TYPE 994 */
- TYPE_994 (37665, "TYPE 994"),
- /** Type 996 */
- TYPE_996 (37670, "Type 996"),
- /** Type 997 Artisan */
- TYPE_997_ARTISAN (37675, "Type 997 Artisan"),
- /** TYPE 1006(1) */
- TYPE_10061 (37710, "TYPE 1006(1)"),
- /** TYPE 1006(2) */
- TYPE_10062 (37755, "TYPE 1006(2)"),
- /** TYPE 1022 */
- TYPE_1022 (37800, "TYPE 1022"),
- /** Type 1047 */
- TYPE_1047 (37810, "Type 1047"),
- /** Type 1048 */
- TYPE_1048 (37815, "Type 1048"),
- /** UK MK 10 */
- UK_MK_10 (37845, "UK MK 10"),
- /** UPS-220C */
- UPS_220C (37850, "UPS-220C"),
- /** UPX 1 10 */
- UPX_1_10 (37890, "UPX 1 10"),
- /** UPX 27 */
- UPX_27 (37935, "UPX 27"),
- /** URN 20 */
- URN_20 (37980, "URN 20"),
- /** URN 25 */
- URN_25 (38025, "URN 25"),
- /** VOLEX III/IV */
- VOLEX_III_IV (38045, "VOLEX III/IV"),
- /** VSR */
- VSR (38050, "VSR"),
- /** W-160 */
- W_160 (38058, "W-160"),
- /** W1028 */
- W1028 (38060, "W1028"),
- /** W8818 */
- W8818 (38070, "W8818"),
- /** W8838 */
- W8838 (38115, "W8838"),
- /** W8852 */
- W8852 (38120, "W8852"),
- /** */
- undef_725 (38140, " "),
- /** */
- undef_726 (38150, ""),
- /** WAS-74S */
- WAS_74S (38160, "WAS-74S"),
- /** */
- undef_727 (38205, ""),
- /** WATCHDOG */
- WATCHDOG (38210, "WATCHDOG"),
- /** */
- undef_728 (38250, ""),
- /** Watchman */
- WATCHMAN (38260, "Watchman"),
- /** */
- undef_729 (38295, ""),
- /** */
- undef_730 (38320, ""),
- /** */
- undef_731 (38340, ""),
- /** */
- undef_732 (38385, ""),
- /** */
- undef_733 (38430, ""),
- /** */
- undef_734 (38475, ""),
- /** Wet Eye */
- WET_EYE (38520, "Wet Eye"),
- /** Wet Eye 2 */
- WET_EYE_2 (38525, "Wet Eye 2"),
- /** Wet Eye Mod */
- WET_EYE_MOD (38565, "Wet Eye Mod"),
- /** WGU-41/B */
- WGU_41_B (38570, "WGU-41/B"),
- /** WGU-44/B */
- WGU_44_B (38572, "WGU-44/B"),
- /** */
- undef_735 (38610, ""),
- /** */
- undef_736 (38655, ""),
- /** */
- undef_737 (38700, ""),
- /** */
- undef_738 (38715, ""),
- /** */
- undef_739 (38730, " "),
- /** Wild Card */
- WILD_CARD (38745, "Wild Card"),
- /** */
- undef_740 (38790, ""),
- /** */
- undef_741 (38835, ""),
- /** WM2X Series */
- WM2X_SERIES (38880, "WM2X Series"),
- /** WM2X Series CAS */
- WM2X_SERIES_CAS (38925, "WM2X Series CAS"),
- /** WSR-74C */
- WSR_74C (38950, "WSR-74C"),
- /** WSR-74S */
- WSR_74S (38955, "WSR-74S"),
- /** WXR-700C */
- WXR_700C (38960, "WXR-700C"),
- /** */
- undef_742 (38970, ""),
- /** */
- undef_743 (39015, ""),
- /** */
- undef_744 (39060, ""),
- /** YJ-12 MH */
- YJ_12_MH (39063, "YJ-12 MH"),
- /** YJ-62 MH */
- YJ_62_MH (39065, "YJ-62 MH"),
- /** YJ-82 MH */
- YJ_82_MH (39066, "YJ-82 MH"),
- /** YJ-83 MH */
- YJ_83_MH (39067, "YJ-83 MH"),
- /** YLC-2 */
- YLC_2 (39070, "YLC-2"),
- /** YLC-4 */
- YLC_4 (39073, "YLC-4"),
- /** YLC-6 */
- YLC_6 (39074, "YLC-6"),
- /** YLC-6M */
- YLC_6M (39075, "YLC-6M"),
- /** YLC-8 */
- YLC_8 (39080, "YLC-8"),
- /** YLC-18 */
- YLC_18 (39085, "YLC-18"),
- /** */
- undef_745 (39105, ""),
- /** Zoo Park 1 */
- ZOO_PARK_1 (39125, "Zoo Park 1"),
- /** ZPS-6 */
- ZPS_6 (39126, "ZPS-6"),
- /** ZD-12 */
- ZD_12 (39131, "ZD-12"),
- /** ZW-06 */
- ZW_06 (39150, "ZW-06"),
- /** AN/ALQ-136(V)1 */
- AN_ALQ_136V1 (39200, "AN/ALQ-136(V)1"),
- /** AN/ALQ-136(V)2 */
- AN_ALQ_136V2 (39201, "AN/ALQ-136(V)2"),
- /** AN/ALQ-136(V)3 */
- AN_ALQ_136V3 (39202, "AN/ALQ-136(V)3"),
- /** AN/ALQ-136(V)4 */
- AN_ALQ_136V4 (39203, "AN/ALQ-136(V)4"),
- /** AN/ALQ-136(V)5 */
- AN_ALQ_136V5 (39204, "AN/ALQ-136(V)5"),
- /** AN/ALQ-162(V)2, See also 1638 */
- AN_ALQ_162V2 (39210, "AN/ALQ-162(V)2"),
- /** AN/ALQ-162(V)3 */
- AN_ALQ_162V3 (39211, "AN/ALQ-162(V)3"),
- /** AN/ALQ-162(V)4 */
- AN_ALQ_162V4 (39212, "AN/ALQ-162(V)4"),
- /** Zhuk-M */
- ZHUK_M (45300, "Zhuk-M"),
- /** ZHUK-MME */
- ZHUK_MME (45305, "ZHUK-MME");
+ /** COMMID_SMA3RM */
+ COMMID_SMA3RM (29475, "COMMID_SMA3RM"),
+ /** COMMID_SMA3RM20 */
+ COMMID_SMA3RM20 (29520, "COMMID_SMA3RM20"),
+ /** COMMID_SMA3RM20ASMG */
+ COMMID_SMA3RM20ASMG (29565, "COMMID_SMA3RM20ASMG"),
+ /** COMMID_SMABPS704 */
+ COMMID_SMABPS704 (29610, "COMMID_SMABPS704"),
+ /** COMMID_SMASPIN749(V)2 */
+ COMMID_SMASPIN749V2 (29655, "COMMID_SMASPIN749(V)2"),
+ /** COMMID_SMASPN703 */
+ COMMID_SMASPN703 (29700, "COMMID_SMASPN703");
private int value;
private final String description;
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EmitterSystemFunction.java b/src-generated/edu/nps/moves/dis7/enumerations/EmitterSystemFunction.java
index 2b7c29fe06b6aee5e037b0ec1db4f7f32338720c..920113308a50ba3e7b56bb3d314222ced065acf4 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EmitterSystemFunction.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EmitterSystemFunction.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 76 marshal size 8<br>
- * Emitter System Function
+ * EmitterSystemFunction
*/
public enum EmitterSystemFunction
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationAssociationStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationAssociationStatus.java
index ae82c75ce342f45b301aceaf3fbdb22c535cfd87..f1f8ea3efe54bd125eee5461d0d0927024ee077a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationAssociationStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationAssociationStatus.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 319 marshal size 8<br>
- * Entity Association-Association Status
+ * EntityAssociationAssociationStatus
*/
public enum EntityAssociationAssociationStatus
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationAssociationType.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationAssociationType.java
index 28621e125ac088ef32819997fcc5082c02620268..d490a3847389ebd4827724a5b7b49a9e798b89ce 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationAssociationType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationAssociationType.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 330 marshal size 8<br>
- * Entity Association-Association Type
+ * EntityAssociationAssociationType
*/
public enum EntityAssociationAssociationType
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationGroupMemberType.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationGroupMemberType.java
index 61d41204044858715b6a601d1da93ebd3e5447eb..3ad9c4def4d221a606e032122dec1802d150d49a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationGroupMemberType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationGroupMemberType.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 321 marshal size 8<br>
- * Entity Association-Group Member Type
+ * EntityAssociationGroupMemberType
*/
public enum EntityAssociationGroupMemberType
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationPhysicalAssociationType.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationPhysicalAssociationType.java
index de62fa2958913df90ea78da6bc10eb8f8b933e04..8f323c0c1686f221c2a1cc9d63ac5fcb89d7db86 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationPhysicalAssociationType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationPhysicalAssociationType.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 323 marshal size 8<br>
- * Entity Association-Physical Association Type
+ * EntityAssociationPhysicalAssociationType
*/
public enum EntityAssociationPhysicalAssociationType
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationPhysicalConnectionType.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationPhysicalConnectionType.java
index 303a977ebed24a2d84a48e5229f70a57f3e7b497..93a15df39b2f26e458a836ecb056a7be5a22c08f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationPhysicalConnectionType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationPhysicalConnectionType.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 324 marshal size 8<br>
- * Entity Association-Physical Connection Type
+ * EntityAssociationPhysicalConnectionType
*/
public enum EntityAssociationPhysicalConnectionType
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EntityCapabilityTypes.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityCapabilityTypes.java
index 92106115ecd839d787ff5c20811c972d43858216..def68b0bd1c96a1a622de44de2ddfa7ec3741d27 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EntityCapabilityTypes.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityCapabilityTypes.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 55 marshal size 32<br>
- * Entity Capabilities
+ * EntityCapabilities
*/
public enum EntityCapabilityTypes
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EntityDamageStatusComponentIdentification.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityDamageStatusComponentIdentification.java
index d3ae9aa27e87acb5cb3104fe9a32ba9809f91902..1f7c415e209aa370702aa6cdb8b8786ac295683f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EntityDamageStatusComponentIdentification.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityDamageStatusComponentIdentification.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 314 marshal size 8<br>
- * Entity Damage Status-Component Identification
+ * EntityDamageStatusComponentIdentification
*/
public enum EntityDamageStatusComponentIdentification
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EntityKind.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityKind.java
index cdf00cde3aeb9f9815a8ae9d4cbba0522c6024d0..6b9b67332ee869f50a8ad1ede891c0fdc4e356aa 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EntityKind.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityKind.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 7 marshal size 8<br>
- * Entity Kind
+ * EntityKind
*/
public enum EntityKind
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EntityMarkingCharacterSet.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityMarkingCharacterSet.java
index 4817de4064c6c59ffdcc239fd05c3f5a51b4b92f..5a0294a7bddaee22d3797167d1753ad990067386 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EntityMarkingCharacterSet.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityMarkingCharacterSet.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 45 marshal size 8<br>
- * Entity Marking-Character Set
+ * EntityMarkingCharacterSet
*/
public enum EntityMarkingCharacterSet
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EntityVPRecordChangeIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityVPRecordChangeIndicator.java
index 509df1c9c5a817afc82da83e4bbe7ba2a72761ce..e901b6211c8b265d02bb971b19a294c304870347 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EntityVPRecordChangeIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityVPRecordChangeIndicator.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 320 marshal size 8<br>
- * Entity VP Record-Change Indicator
+ * EntityVPRecordChangeIndicator
*/
public enum EntityVPRecordChangeIndicator
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentRecordTypeGroups.java b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentRecordTypeGroups.java
index 6ccd94e6de19ee90528dd233047c524a238c2e26..628f2771371e40fc675643d113b8e26b9d5e4a66 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentRecordTypeGroups.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentRecordTypeGroups.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 273 marshal size 8<br>
- * Environment Record Type Groups
+ * EnvironmentRecordTypeGroups
*/
public enum EnvironmentRecordTypeGroups
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalAppearance.java b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalAppearance.java
index 16be9582333f5e4e2a0a353b5db6a55912a2675b..d0938b091af2388cf07d32aeb1a9c03db2d1cc35 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalAppearance.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalAppearance.java
@@ -3,9 +3,9 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 38 marshal size 32<br>
- * Environmental Appearance
+ * EnvironmentalAppearance
*/
public class EnvironmentalAppearance extends DisBitSet
{
@@ -16,7 +16,7 @@ public class EnvironmentalAppearance extends DisBitSet
/**
* Describes whether the entity is frozen and should not be dead reckoned
*/
- public static Bits IS_FROZEN = new Bits(21, 1);
+ public static Bits ISFROZEN = new Bits(21, 1);
/**
* Describes whether the entity is active or deactivated, Use {@link AppearanceEntityorObjectState} values for this field
*/
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalCapabilities.java b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalCapabilities.java
index 85511f610881f960c551c54c25625dffaff5cac2..6277afe1ff03506be13b7df276b5d81af22ed7bf 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalCapabilities.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalCapabilities.java
@@ -3,9 +3,9 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 457 marshal size 32<br>
- * Environmental Capabilities
+ * EnvironmentalCapabilities
*/
public class EnvironmentalCapabilities extends DisBitSet implements EntityCapabilities
{
@@ -14,9 +14,9 @@ public class EnvironmentalCapabilities extends DisBitSet implements EntityCapabi
*/
public static Bits RESERVED = new Bits(0, 5);
/**
- * The Entity is an IED or contains an IED. The extended appearance record (if available) will identify how well hidden the IED is on the Entity. An Attached Part (if applicable, for instance a jury-rigged munition does not apply here) will identify the IED explicitly.
+ * The Entity is an IED or contains an IED. The extended appearance record (if available) will identify how well hidden the IED is on the Entity. An Attached Part (if applicable, for instance a jury-rigged munition does not apply here) will identify the IED explicitly.
*/
- public static Bits IED_PRESENCE_INDICATOR = new Bits(7, 1);
+ public static Bits IEDPRESENCEINDICATOR = new Bits(7, 1);
public static class Bits
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalProcessEnvironmentStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalProcessEnvironmentStatus.java
index 6d2f0c5c0658b489345901aa673baae581c29de2..b718e76a8ee040795c4039b6c39822c2d5e22e1d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalProcessEnvironmentStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalProcessEnvironmentStatus.java
@@ -3,20 +3,20 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 249 marshal size 8<br>
- * Environmental Process-Environment Status
+ * EnvironmentalProcessEnvironmentStatus
*/
public class EnvironmentalProcessEnvironmentStatus extends DisBitSet
{
/**
* Indicates that the current update shall be the last update for the specified process
*/
- public static Bits IS_LAST = new Bits(0, 1);
+ public static Bits ISLAST = new Bits(0, 1);
/**
* Describes whether the environmental process is active or not
*/
- public static Bits IS_ACTIVE = new Bits(1, 1);
+ public static Bits ISACTIVE = new Bits(1, 1);
public static class Bits
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalProcessModelType.java b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalProcessModelType.java
index 4d93ab7e81128f31748d3f4f66a1ecffc25e387a..5f86cf20380f29263bf680d622f535eff978514c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalProcessModelType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalProcessModelType.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 248 marshal size 8<br>
- * Environmental Process-Model Type
+ * EnvironmentalProcessModelType
*/
public enum EnvironmentalProcessModelType
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalProcessRecordType.java b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalProcessRecordType.java
index 0be711bdaaef15d2894f140ca9ebae0b099d287a..2de4051269187b1bf5b2f2b0e83e2157cebd993f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalProcessRecordType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalProcessRecordType.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 250 marshal size 32<br>
- * Environmental Process-Record Type
+ * EnvironmentalProcessRecordType
*/
public enum EnvironmentalProcessRecordType
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalSubcategory.java b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalSubcategory.java
index ec5f77146264e4eb206d21096d64682528cba66a..d4f13b65bf51ae9fbdd813f63d4f4d8b51ddcbb0 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalSubcategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalSubcategory.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 21 marshal size 8<br>
- * Environmental Subcategory
+ * EnvironmentalSubcategory
*/
public enum EnvironmentalSubcategory implements SubCategory
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EventReportEventType.java b/src-generated/edu/nps/moves/dis7/enumerations/EventReportEventType.java
index f9aa4f2084dcc8459f7a7bf4c8b61bf06158fd2e..c895d7492afacfd404a797a2e06275be14d52c52 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EventReportEventType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EventReportEventType.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 73 marshal size 32<br>
- * Event Report-Event Type
+ * EventReportEventType
*/
public enum EventReportEventType
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ExpendableAirCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/ExpendableAirCategory.java
index 84f0a837a71165fd56716bbd182e49e97a744e36..3e8097e6d420a8829173543bc3e802f647553c28 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ExpendableAirCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ExpendableAirCategory.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 25 marshal size 8<br>
- * Expendable-Air Category
+ * ExpendableAirCategory
*/
public enum ExpendableAirCategory implements Category
{
@@ -20,18 +20,24 @@ public enum ExpendableAirCategory implements Category
CHAFF (1, "Chaff"),
/** Flare */
FLARE (2, "Flare"),
- /** Combined chaff and flare */
- COMBINED_CHAFF_AND_FLARE (3, "Combined chaff and flare"),
- /** Active emitter */
- ACTIVE_EMITTER (4, "Active emitter"),
- /** Passive decoy */
- PASSIVE_DECOY (5, "Passive decoy"),
- /** Winged decoy */
- WINGED_DECOY (6, "Winged decoy"),
+ /** Combined Chaff and Flare */
+ COMBINED_CHAFF_AND_FLARE (3, "Combined Chaff and Flare"),
+ /** Active Emitter */
+ ACTIVE_EMITTER (4, "Active Emitter"),
+ /** Passive Decoy */
+ PASSIVE_DECOY (5, "Passive Decoy"),
+ /** Winged Decoy */
+ WINGED_DECOY (6, "Winged Decoy"),
/** Signal/Illumination Flare */
SIGNAL_ILLUMINATION_FLARE (7, "Signal/Illumination Flare"),
/** Smoke Generator */
- SMOKE_GENERATOR (8, "Smoke Generator");
+ SMOKE_GENERATOR (8, "Smoke Generator"),
+ /** Combined Flare and Smoke Generator */
+ COMBINED_FLARE_AND_SMOKE_GENERATOR (12, "Combined Flare and Smoke Generator"),
+ /** SAR Night Light (SRNL) */
+ SAR_NIGHT_LIGHT_SRNL (13, "SAR Night Light (SRNL)"),
+ /** SAR Buoy */
+ SAR_BUOY (14, "SAR Buoy");
private int value;
private final String description;
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ExpendableAppearance.java b/src-generated/edu/nps/moves/dis7/enumerations/ExpendableAppearance.java
index 78780e65fcb96eff3389d2ca6c1a042ea7ac4f2f..e9e96224a43aed4a87e3c08c1c2802a9aed8c55a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ExpendableAppearance.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ExpendableAppearance.java
@@ -3,9 +3,9 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 42 marshal size 32<br>
- * Expendable Appearance
+ * ExpendableAppearance
*/
public class ExpendableAppearance extends DisBitSet
{
@@ -16,35 +16,35 @@ public class ExpendableAppearance extends DisBitSet
/**
* Describes whether or not smoke is emanating from the entity
*/
- public static Bits IS_SMOKE_EMANATING = new Bits(5, 1);
+ public static Bits ISSMOKEEMANATING = new Bits(5, 1);
/**
- * Describes the status of a flare's parachute, Use {@link Parachute} values for this field
+ * Describes the status of a flares parachute, Use {@link Parachute} values for this field
*/
- public static Bits PARACHUTE_STATUS = new Bits(7, 2, Parachute.class);
+ public static Bits PARACHUTESTATUS = new Bits(7, 2, Parachute.class);
/**
- * Describes the color of a flare's light output or the color of smoke emanating from a smoke expendable, Use {@link FlareSmokeColor} values for this field
+ * Describes the color of a flares light output or the color of smoke emanating from a smoke expendable, Use {@link FlareSmokeColor} values for this field
*/
- public static Bits FLARE_SMOKE_COLOR = new Bits(9, 3, FlareSmokeColor.class);
+ public static Bits FLARE_SMOKECOLOR = new Bits(9, 3, FlareSmokeColor.class);
/**
* Describes whether the entity is burning and flames are visible
*/
- public static Bits IS_FLAMING = new Bits(15, 1);
+ public static Bits ISFLAMING = new Bits(15, 1);
/**
* Describes whether or not launch flash is present
*/
- public static Bits LAUNCH_FLASH_PRESENT = new Bits(16, 1);
+ public static Bits LAUNCHFLASHPRESENT = new Bits(16, 1);
/**
* Describes the status of a flare or smoke expendable, Use {@link FlareSmokeStatus} values for this field
*/
- public static Bits FLARE_SMOKE_STATUS = new Bits(17, 2, FlareSmokeStatus.class);
+ public static Bits FLARE_SMOKESTATUS = new Bits(17, 2, FlareSmokeStatus.class);
/**
* Describes whether the entity is frozen and should not be dead reckoned
*/
- public static Bits IS_FROZEN = new Bits(21, 1);
+ public static Bits ISFROZEN = new Bits(21, 1);
/**
* Describes whether the power plant is on or off
*/
- public static Bits POWER_PLANT_ON = new Bits(22, 1);
+ public static Bits POWERPLANTON = new Bits(22, 1);
/**
* Describes whether the entity is active or deactivated, Use {@link AppearanceEntityorObjectState} values for this field
*/
@@ -52,7 +52,7 @@ public class ExpendableAppearance extends DisBitSet
/**
* Describes the status of spot chaff, Use {@link SpotChaffStatus} values for this field
*/
- public static Bits SPOT_CHAFF_STATUS = new Bits(24, 2, SpotChaffStatus.class);
+ public static Bits SPOTCHAFFSTATUS = new Bits(24, 2, SpotChaffStatus.class);
/**
* Describes whether or not the entity is masked or cloaked
*/
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ExpendableCapabilities.java b/src-generated/edu/nps/moves/dis7/enumerations/ExpendableCapabilities.java
index 73f16dce2acfa1ec05bd69dd21ab3fb59326bcab..33e8b90aea5929387251ce7f218f5bf9679bd019 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ExpendableCapabilities.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ExpendableCapabilities.java
@@ -3,9 +3,9 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 461 marshal size 32<br>
- * Expendable Capabilities
+ * ExpendableCapabilities
*/
public class ExpendableCapabilities extends DisBitSet implements EntityCapabilities
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ExpendableSubsurfaceCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/ExpendableSubsurfaceCategory.java
index 506286e205be003af5ea5540785603be742ca5ac..f09f785640331c9f2b87b1a31f2accb4557283e1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ExpendableSubsurfaceCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ExpendableSubsurfaceCategory.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 27 marshal size 8<br>
- * Expendable-Subsurface Category
+ * ExpendableSubsurfaceCategory
*/
public enum ExpendableSubsurfaceCategory implements Category
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ExpendableSurfaceCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/ExpendableSurfaceCategory.java
index e4c82685dd119e85de41e71d2b6614191cf4194a..40093d8e23a6e740addcecd4df691341b0c2c36f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ExpendableSurfaceCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ExpendableSurfaceCategory.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 26 marshal size 8<br>
- * Expendable-Surface Category
+ * ExpendableSurfaceCategory
*/
public enum ExpendableSurfaceCategory implements Category
{
@@ -18,12 +18,16 @@ public enum ExpendableSurfaceCategory implements Category
OTHER (0, "Other"),
/** Flare */
FLARE (2, "Flare"),
- /** Active emitter */
- ACTIVE_EMITTER (4, "Active emitter"),
- /** Passive decoy */
- PASSIVE_DECOY (5, "Passive decoy"),
- /** Smoke */
- SMOKE (8, "Smoke");
+ /** Active Emitter */
+ ACTIVE_EMITTER (4, "Active Emitter"),
+ /** Passive Decoy */
+ PASSIVE_DECOY (5, "Passive Decoy"),
+ /** Smoke Generator */
+ SMOKE_GENERATOR (8, "Smoke Generator"),
+ /** Combined Flare and Smoke Generator */
+ COMBINED_FLARE_AND_SMOKE_GENERATOR (12, "Combined Flare and Smoke Generator"),
+ /** SAR Buoy */
+ SAR_BUOY (14, "SAR Buoy");
private int value;
private final String description;
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ExplosiveMaterialCategories.java b/src-generated/edu/nps/moves/dis7/enumerations/ExplosiveMaterialCategories.java
index 68be83a1e026879c0a6509e2c9f23ebc85c29b79..d355f084dc0a0141b3e00f29bdea20b4da340ffd 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ExplosiveMaterialCategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ExplosiveMaterialCategories.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 310 marshal size 16<br>
- * Explosive Material Categories
+ * ExplosiveMaterialCategories
*/
public enum ExplosiveMaterialCategories
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ExplosiveMaterialGroups.java b/src-generated/edu/nps/moves/dis7/enumerations/ExplosiveMaterialGroups.java
index 24067c029b65753ed5822328af66ac574e24b5f1..fc3a549daefb5172732eff0dad33754bcfeca0b0 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ExplosiveMaterialGroups.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ExplosiveMaterialGroups.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 309 marshal size 8<br>
- * Explosive Material Groups
+ * ExplosiveMaterialGroups
*/
public enum ExplosiveMaterialGroups
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/FlareSmokeColor.java b/src-generated/edu/nps/moves/dis7/enumerations/FlareSmokeColor.java
index da205606f785db2f0cf6bbfa3425a9da0b5d98b9..0c44291fdc0ea67152442105773cf48a055d536d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/FlareSmokeColor.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/FlareSmokeColor.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 402 marshal size 3<br>
- * Flare/Smoke Color
+ * Flare/SmokeColor
*/
public enum FlareSmokeColor
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/FlareSmokeStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/FlareSmokeStatus.java
index abb0a23fb4df5ba50d77672da67224bd8e2154e9..79d88a088fdb11c2086b78034126037caff0f93a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/FlareSmokeStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/FlareSmokeStatus.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 403 marshal size 2<br>
- * Flare/Smoke Status
+ * Flare/SmokeStatus
*/
public enum FlareSmokeStatus
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ForceID.java b/src-generated/edu/nps/moves/dis7/enumerations/ForceID.java
index 5031588540338c841aeaafdd552d09fb59ae7c6a..310d5bba4a72de9bac2a7fb6606ebdb97baf1e60 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ForceID.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ForceID.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 6 marshal size 8<br>
- * Force ID
+ * ForceID
*/
public enum ForceID
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/FormatType.java b/src-generated/edu/nps/moves/dis7/enumerations/FormatType.java
index 4a9136441643a69099f90942f5b91efd9d62ecb1..93016c215defd65b72ed1c9856b50363b7f87ae3 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/FormatType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/FormatType.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 363 marshal size 5<br>
- * Format Type
+ * FormatType
*/
public enum FormatType
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/FuelLocation.java b/src-generated/edu/nps/moves/dis7/enumerations/FuelLocation.java
index 2ae1da3c388d34c9ef8f387d0aa38380261d9269..1e314e16e053e94588807af8048c04411db728e4 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/FuelLocation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/FuelLocation.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 329 marshal size 8<br>
- * Fuel Location
+ * FuelLocation
*/
public enum FuelLocation
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/FuelMeasurementUnits.java b/src-generated/edu/nps/moves/dis7/enumerations/FuelMeasurementUnits.java
index 8c661336765ed2e776f31596e3c3743aa16d9cff..93472c51113c568c5a1f622985bde7fa0367d2e4 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/FuelMeasurementUnits.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/FuelMeasurementUnits.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 328 marshal size 8<br>
- * Fuel Measurement Units
+ * FuelMeasurementUnits
*/
public enum FuelMeasurementUnits
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/GridAxisDescriptorAxisType.java b/src-generated/edu/nps/moves/dis7/enumerations/GridAxisDescriptorAxisType.java
index 9c28ce058cec15a85578cb9bb05a063baebf35aa..18d7c08b70b8d9c9d06b999460dfe5cbb7f76cea 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/GridAxisDescriptorAxisType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/GridAxisDescriptorAxisType.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 377 marshal size 8<br>
- * Grid Axis Descriptor-Axis Type
+ * GridAxisDescriptorAxisType
*/
public enum GridAxisDescriptorAxisType
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataConstantGrid.java b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataConstantGrid.java
index 24f83c810c8b67874d40b55f168076db34539280..a1a75f8fece28a6e9c68f31eb5ef9b5491ea0ff2 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataConstantGrid.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataConstantGrid.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 245 marshal size 8<br>
- * Gridded Data-Constant Grid
+ * GriddedDataConstantGrid
*/
public enum GriddedDataConstantGrid
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataCoordinateSystem.java b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataCoordinateSystem.java
index 506f8f600647c0fa38ff80e4f8a08663181e0ea2..a290b4b9bfbec0f463ef8ca6fa31809bb2c88991 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataCoordinateSystem.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataCoordinateSystem.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 244 marshal size 16<br>
- * Gridded Data-Coordinate System
+ * GriddedDataCoordinateSystem
*/
public enum GriddedDataCoordinateSystem
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataDataRepresentation.java b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataDataRepresentation.java
index 643bd49d4da7bbbeca90abc79cf978a5ac61cd38..342367e43d2e43114310095f58cbd76a2b5477e7 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataDataRepresentation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataDataRepresentation.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 247 marshal size 16<br>
- * Gridded Data-Data Representation
+ * GriddedDataDataRepresentation
*/
public enum GriddedDataDataRepresentation
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataFieldNumber.java b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataFieldNumber.java
index d02909810525a8c930983e3442628bcaa3020c62..4a44d2710177b84faa42fd4c1e3a6bbafa731090 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataFieldNumber.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataFieldNumber.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 243 marshal size 16<br>
- * Gridded Data-Field Number
+ * GriddedDataFieldNumber
*/
public enum GriddedDataFieldNumber
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataSampleType.java b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataSampleType.java
index fb9a394dfdd9590a242d79103d512339c14c7073..a67db49640d33c5ce4b9976d17ed9ca45558dc3e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataSampleType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataSampleType.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 246 marshal size 16<br>
- * Gridded Data-Sample Type
+ * GriddedDataSampleType
*/
public enum GriddedDataSampleType
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/HighDensityTrackJam.java b/src-generated/edu/nps/moves/dis7/enumerations/HighDensityTrackJam.java
index 0599aac82eddf514c252d456be436f41fa4c55b3..36497c3182d98726e19024cfabbcea694e6cfdff 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/HighDensityTrackJam.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/HighDensityTrackJam.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 79 marshal size 8<br>
- * High Density Track/Jam
+ * HighDensityTrack/Jam
*/
public enum HighDensityTrackJam
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/HighFidelityHAVEQUICKTODTransmitIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/HighFidelityHAVEQUICKTODTransmitIndicator.java
index 190723a309782df6f72bad530258a8bf4535bbc4..c5e8d981a37dcc0e9bd5076585121f074c34eb76 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/HighFidelityHAVEQUICKTODTransmitIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/HighFidelityHAVEQUICKTODTransmitIndicator.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 297 marshal size 8<br>
- * High Fidelity HAVE QUICK-TOD Transmit Indicator
+ * HighFidelityHAVEQUICKTODTransmitIndicator
*/
public enum HighFidelityHAVEQUICKTODTransmitIndicator
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IFFAlternateMode4ChallengeReply.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFAlternateMode4ChallengeReply.java
index cb0cfaec82621ce3df741b1580fc9e3a71948f77..63ca7072d548b7dc1ff2d5b5d63135485cab4398 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IFFAlternateMode4ChallengeReply.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFAlternateMode4ChallengeReply.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 96 marshal size 8<br>
- * IFF-Alternate Mode 4 Challenge/Reply
+ * IFFAlternateMode4Challenge/Reply
*/
public enum IFFAlternateMode4ChallengeReply
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IFFApplicableModes.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFApplicableModes.java
index 550401abd833c90f2883c133a1e563db20050e37..ece0b271de8f8322b804a33dfd5797e09bf74b63 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IFFApplicableModes.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFApplicableModes.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 339 marshal size 8<br>
- * IFF Applicable Modes
+ * IFFApplicableModes
*/
public enum IFFApplicableModes
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IFFDataRecordAvailable.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFDataRecordAvailable.java
index 145fd380f928c2ce8ce76dfd97597a325651cdfc..ea6a594960caf1989f3a7ab70d7457d29ddf493b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IFFDataRecordAvailable.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFDataRecordAvailable.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 360 marshal size 1<br>
- * IFF Data Record Available
+ * IFFDataRecordAvailable
*/
public enum IFFDataRecordAvailable
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IFFLayerSpecificInformation.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFLayerSpecificInformation.java
index e234e75a05f62a8fd4e7a96c8a6d00f1792c5a41..4f1f72be41e7747920044df88e664db265cbe0ed 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IFFLayerSpecificInformation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFLayerSpecificInformation.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 87 marshal size 8<br>
- * IFF-Layer Specific Information
+ * IFFLayerSpecificInformation
*/
public enum IFFLayerSpecificInformation
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IFFSimulationMode.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFSimulationMode.java
index 6ae96775a67fd057128806dba34f0b906d55f8a6..d907fef02425b5b305c3b2bfca15dbec16c6b4e4 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IFFSimulationMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFSimulationMode.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 338 marshal size 1<br>
- * IFF Simulation Mode
+ * IFFSimulationMode
*/
public enum IFFSimulationMode
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemMode.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemMode.java
index f11ae13fdea57490a5f7ff4db9bd36a46b1e3457..911e6c297318d727c833591b8a001a2621aa814e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemMode.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 84 marshal size 8<br>
- * IFF-System Mode
+ * IFFSystemMode
*/
public enum IFFSystemMode
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemName.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemName.java
index ec10fe0a9472263098e2b81bc66bd77d81bb9d39..26e06064d429b21bc551b869b30517d7d691707c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemName.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemName.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 83 marshal size 16<br>
- * IFF-System Name
+ * IFFSystemName
*/
public enum IFFSystemName
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType.java
index 2a0c15baea06beded5d2cb9a4d747baaa99af4f9..a3c75a1397e934f6800ad7d6c0fead73201831b8 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 82 marshal size 16<br>
- * IFF-System Type
+ * IFFSystemType
*/
public enum IFFSystemType
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType1OperationalParameter1.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType1OperationalParameter1.java
index 2f4bc93cc67b7fb4ec4d4591f83e12c5552744d2..e809c92f806dae0042a209f2482f29a4fd131458 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType1OperationalParameter1.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType1OperationalParameter1.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 97 marshal size 8<br>
- * IFF-System Type 1-Operational Parameter 1
+ * IFFSystemType1OperationalParameter1
*/
public enum IFFSystemType1OperationalParameter1
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType1OperationalParameter2.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType1OperationalParameter2.java
index a650ea3430937ed6ffb1f84fd68cc767765d73d6..dcf051c3ba55e6114149061469b5f6654ddf3459 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType1OperationalParameter2.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType1OperationalParameter2.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 98 marshal size 8<br>
- * IFF-System Type 1-Operational Parameter 2
+ * IFFSystemType1OperationalParameter2
*/
public enum IFFSystemType1OperationalParameter2
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOActionPhase.java b/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOActionPhase.java
index fdcc9e99a2ed2f8935df8bd31a2d2a151d85ea46..26fab6d44f74d657046567f0f075ad3d1dbd7722 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOActionPhase.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOActionPhase.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 288 marshal size 16<br>
- * IO Action-IO Action Phase
+ * IOActionIOActionPhase
*/
public enum IOActionIOActionPhase
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOActionType.java b/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOActionType.java
index ee654ef4d2bbb26fc950257609c35cd188567a79..29c0ae4665f40bfd880b55b4e7afb6d36e28391a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOActionType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOActionType.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 287 marshal size 16<br>
- * IO Action-IO Action Type
+ * IOActionIOActionType
*/
public enum IOActionIOActionType
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOSimulationSource.java b/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOSimulationSource.java
index 84d1b618c0997641ac2420cc213ae0905c2aa5c6..46aa5726c0059c5e7593a5435874e7c8d02c9dfd 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOSimulationSource.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOSimulationSource.java
@@ -8,10 +8,10 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 286 marshal size 16<br>
- * IO Action-IO Simulation Source<br>
- * Values 1-999 are reserved for United States IO Simulation Sources – See applicable agreement of the organizers of the event (training, exercise, etc.) in which information operations is included.
+ * IOActionIOSimulationSource<br>
+ * Values 1-999 are reserved for United States IO Simulation Sources - See applicable agreement of the organizers of the event (training, exercise, etc.) in which information operations is included.
*/
public enum IOActionIOSimulationSource
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOWarfareType.java b/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOWarfareType.java
index 5d3c8595d759bbcfdc06ea831f21578e0e24efe2..57e8b6baa574ca533dde5ab9d1f6f50bd41ff350 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOWarfareType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOWarfareType.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 285 marshal size 16<br>
- * IO Action-IO Warfare Type
+ * IOActionIOWarfareType
*/
public enum IOActionIOWarfareType
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IOCommsNodeRecordCommsNodeType.java b/src-generated/edu/nps/moves/dis7/enumerations/IOCommsNodeRecordCommsNodeType.java
index 6b6c918fe5afed8e0938f452217fbc1e10300b94..6921d72e16234f604f80d0203d048fb094e7e94b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IOCommsNodeRecordCommsNodeType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOCommsNodeRecordCommsNodeType.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 294 marshal size 8<br>
- * IO Comms Node Record-Comms Node Type
+ * IOCommsNodeRecordCommsNodeType
*/
public enum IOCommsNodeRecordCommsNodeType
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOEffect.java b/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOEffect.java
index 9e1d4d4ea8a56bc42e5cf41cca084a608889936e..ee002604324365392992dfef87d7914a47dcbdc1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOEffect.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOEffect.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 292 marshal size 8<br>
- * IO Effects Record-IO Effect
+ * IOEffectsRecordIOEffect
*/
public enum IOEffectsRecordIOEffect
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOLinkType.java b/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOLinkType.java
index f74df1aa7f36241b70f1e43cc4781d4c35a6c750..facc033ceefd4e497bc4ccd52ff895428c226134 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOLinkType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOLinkType.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 291 marshal size 8<br>
- * IO Effects Record-IO Link Type
+ * IOEffectsRecordIOLinkType
*/
public enum IOEffectsRecordIOLinkType
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOProcess.java b/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOProcess.java
index 5fb62c88b191ca062354148ba847250c248182b5..4bf40f3a54dcfbd39c8881d507365d467c5d9dc0 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOProcess.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOProcess.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 293 marshal size 16<br>
- * IO Effects Record-IO Process
+ * IOEffectsRecordIOProcess
*/
public enum IOEffectsRecordIOProcess
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOStatus.java
index 5b0e88fdb5500b7616208c89c9ff07233f8413d3..c61b5ab6b33a8bce6b2d9ee76e566f654cc9f1a3 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOStatus.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 290 marshal size 8<br>
- * IO Effects Record-IO Status
+ * IOEffectsRecordIOStatus
*/
public enum IOEffectsRecordIOStatus
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IOReportIOReportType.java b/src-generated/edu/nps/moves/dis7/enumerations/IOReportIOReportType.java
index 7073c1f6dcdabb75a391a593af11ba33135301ef..acb75c66bc039dd142ad044dba5514c305bd45f8 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IOReportIOReportType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOReportIOReportType.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 289 marshal size 8<br>
- * IO Report-IO Report Type
+ * IOReportIOReportType
*/
public enum IOReportIOReportType
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ISLSAntennaType.java b/src-generated/edu/nps/moves/dis7/enumerations/ISLSAntennaType.java
index 8c45a5384de084222b233e246926f4d82f2468a3..3d1076627de2f62ccde291f07919b56f7e2bd2bc 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ISLSAntennaType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ISLSAntennaType.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 349 marshal size 8<br>
- * ISLS Antenna Type
+ * ISLSAntennaType
*/
public enum ISLSAntennaType
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommand.java b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommand.java
index 7ee02dcb3a815cfa58a4ad239d1d182406d8a2ce..667bd35b973f30b7aa23500f061392daa09c1574 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommand.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommand.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 182 marshal size 8<br>
- * Intercom Control-Command
+ * IntercomControlCommand
*/
public enum IntercomControlCommand
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommunicationsClass.java b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommunicationsClass.java
index e8ccff40c170efb9d912b0ba795565f4533bb74c..50c908b640d9e6a075cf8fbd2dfb1cec6783a744 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommunicationsClass.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommunicationsClass.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 416 marshal size 1<br>
- * Intercom Control-Communications Class
+ * IntercomControlCommunicationsClass
*/
public enum IntercomControlCommunicationsClass
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommunicationsType.java b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommunicationsType.java
index f7e4da28a48a1c2ca4b720d109ef837a05078b04..f235d7a506a803f22e703bb5a3a14f6fac132e5b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommunicationsType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommunicationsType.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 181 marshal size 7<br>
- * Intercom Control-Communications Type
+ * IntercomControlCommunicationsType
*/
public enum IntercomControlCommunicationsType
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlControlType.java b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlControlType.java
index d5229f7dcf9c5026f09f8b178e65873577577fc5..f8f2d6ff9da90ad2d77d67a4a4aa21dd22384644 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlControlType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlControlType.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 180 marshal size 8<br>
- * Intercom Control-Control Type
+ * IntercomControlControlType
*/
public enum IntercomControlControlType
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlDestinationLineStateCommand.java b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlDestinationLineStateCommand.java
index 3b0aa853f008bf9e54ee5fd2ec54fa42c9ac7ad3..77f4bdf893bd6661a70cb428d7eb6cc96621f3f7 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlDestinationLineStateCommand.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlDestinationLineStateCommand.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 184 marshal size 8<br>
- * Intercom Control-Destination Line State Command
+ * IntercomControlDestinationLineStateCommand
*/
public enum IntercomControlDestinationLineStateCommand
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlRecordType.java b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlRecordType.java
index d271fde1d63a61640782dde760255b87dd37c697..40001de670e7ae2724b1ea4763deae2bb9b58783 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlRecordType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlRecordType.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 185 marshal size 16<br>
- * Intercom Control-Record Type
+ * IntercomControlRecordType
*/
public enum IntercomControlRecordType
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlTransmitLineState.java b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlTransmitLineState.java
index 6ae97c7ffdbce6fdc9d38aa5524646593d1d5944..243b5ec5011d3e07aa6cfa9d35620c19bb4d8f4d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlTransmitLineState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlTransmitLineState.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 183 marshal size 8<br>
- * Intercom Control-Transmit Line State
+ * IntercomControlTransmitLineState
*/
public enum IntercomControlTransmitLineState
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IsGroupOfGroupedEntityCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/IsGroupOfGroupedEntityCategory.java
index ef7253c8cc0fef432582f588af1c81511eefc4ca..db678185af1ff91c2e44875f580f255ef3454f68 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IsGroupOfGroupedEntityCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IsGroupOfGroupedEntityCategory.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 213 marshal size 8<br>
- * IsGroupOf-Grouped Entity Category
+ * IsGroupOfGroupedEntityCategory
*/
public enum IsGroupOfGroupedEntityCategory implements Category
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IsGroupOfRestStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/IsGroupOfRestStatus.java
index af9d6a0cdce56725831777aae6661fafcde85125..3b18c405459176f54d91c714ce4e81776e5e5842 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IsGroupOfRestStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IsGroupOfRestStatus.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 214 marshal size 8<br>
- * IsGroupOf-Rest Status
+ * IsGroupOfRestStatus
*/
public enum IsGroupOfRestStatus
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfNature.java b/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfNature.java
index a2fd7ef122a8c8b93ad91806618b43508b5b1f60..8031de2b1a5ff6830b6308d6989ecb452c4cffc8 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfNature.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfNature.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 210 marshal size 16<br>
- * IsPartOf-Nature
+ * IsPartOfNature
*/
public enum IsPartOfNature
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfPosition.java b/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfPosition.java
index cd4055ae3c24b70ac39b167789eb6bddb7578d01..f2792df6f9b7d2e1457e14e44bfe02e9dbcf5747 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfPosition.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfPosition.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 211 marshal size 16<br>
- * IsPartOf-Position
+ * IsPartOfPosition
*/
public enum IsPartOfPosition
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfStationName.java b/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfStationName.java
index 9ca8928d9b1eb9bf7cbe27a63309a6a626428633..36c816cc5b9c22cb355aff4586a5a10ad7b6d873 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfStationName.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfStationName.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 212 marshal size 16<br>
- * IsPartOf-Station Name
+ * IsPartOfStationName
*/
public enum IsPartOfStationName
{
@@ -18,18 +18,18 @@ public enum IsPartOfStationName
OTHER (0, "Other"),
/** Aircraft Wingstation */
AIRCRAFT_WINGSTATION (1, "Aircraft Wingstation"),
- /** Ship's Forward Gunmount (Starboard) */
- SHIPS_FORWARD_GUNMOUNT_STARBOARD (2, "Ship's Forward Gunmount (Starboard)"),
- /** Ship's Forward Gunmount (Port) */
- SHIPS_FORWARD_GUNMOUNT_PORT (3, "Ship's Forward Gunmount (Port)"),
- /** Ship's Forward Gunmount (Centerline) */
- SHIPS_FORWARD_GUNMOUNT_CENTERLINE (4, "Ship's Forward Gunmount (Centerline)"),
- /** Ship's Aft Gunmount (Starboard) */
- SHIPS_AFT_GUNMOUNT_STARBOARD (5, "Ship's Aft Gunmount (Starboard)"),
- /** Ship's Aft Gunmount (Port) */
- SHIPS_AFT_GUNMOUNT_PORT (6, "Ship's Aft Gunmount (Port)"),
- /** Ship's Aft Gunmount (Centerline) */
- SHIPS_AFT_GUNMOUNT_CENTERLINE (7, "Ship's Aft Gunmount (Centerline)"),
+ /** Ships Forward Gunmount (Starboard) */
+ SHIPS_FORWARD_GUNMOUNT_STARBOARD (2, "Ships Forward Gunmount (Starboard)"),
+ /** Ships Forward Gunmount (Port) */
+ SHIPS_FORWARD_GUNMOUNT_PORT (3, "Ships Forward Gunmount (Port)"),
+ /** Ships Forward Gunmount (Centerline) */
+ SHIPS_FORWARD_GUNMOUNT_CENTERLINE (4, "Ships Forward Gunmount (Centerline)"),
+ /** Ships Aft Gunmount (Starboard) */
+ SHIPS_AFT_GUNMOUNT_STARBOARD (5, "Ships Aft Gunmount (Starboard)"),
+ /** Ships Aft Gunmount (Port) */
+ SHIPS_AFT_GUNMOUNT_PORT (6, "Ships Aft Gunmount (Port)"),
+ /** Ships Aft Gunmount (Centerline) */
+ SHIPS_AFT_GUNMOUNT_CENTERLINE (7, "Ships Aft Gunmount (Centerline)"),
/** Forward Torpedo Tube */
FORWARD_TORPEDO_TUBE (8, "Forward Torpedo Tube"),
/** Aft Torpedo Tube */
@@ -51,7 +51,15 @@ public enum IsPartOfStationName
/** Air-to-Air Refueling Boom */
AIR_TO_AIR_REFUELING_BOOM (17, "Air-to-Air Refueling Boom"),
/** Aerial Refueling Receptacle */
- AERIAL_REFUELING_RECEPTACLE (18, "Aerial Refueling Receptacle");
+ AERIAL_REFUELING_RECEPTACLE (18, "Aerial Refueling Receptacle"),
+ /** Port Side Refueling Drogue */
+ PORT_SIDE_REFUELING_DROGUE (19, "Port Side Refueling Drogue"),
+ /** Starboard Side Refueling Drogue */
+ STARBOARD_SIDE_REFUELING_DROGUE (20, "Starboard Side Refueling Drogue"),
+ /** Center Refueling Drogue */
+ CENTER_REFUELING_DROGUE (21, "Center Refueling Drogue"),
+ /** Air Refueling Probe */
+ AIR_REFUELING_PROBE (22, "Air Refueling Probe");
private int value;
private final String description;
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IslandSubcategory.java b/src-generated/edu/nps/moves/dis7/enumerations/IslandSubcategory.java
index 0cdbc5fc4974e0f96c82e00f24d8b2cc52959cd8..e8ca6a8e54752bfc25784d2e5c6b38adfffa3259 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IslandSubcategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IslandSubcategory.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 715 marshal size 16<br>
- * Island Subcategory
+ * IslandSubcategory
*/
public enum IslandSubcategory implements SubCategory
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersSynchronizationState.java b/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersSynchronizationState.java
index 0c68678d6f14acfa7f1fc33fa947e2075ada69b2..4d6a89bfcd5b562879b0be79606fddd5e2feb4bd 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersSynchronizationState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersSynchronizationState.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 175 marshal size 8<br>
- * JTIDS/MIDS Modulation Parameters-Synchronization State
+ * JTIDS/MIDSModulationParametersSynchronizationState
*/
public enum JTIDSMIDSModulationParametersSynchronizationState
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalPrimaryMode.java b/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalPrimaryMode.java
index b39cb3f0c87fa110460c94ace7963e07ad1c3cd7..b5f56c27653d81ecbb5eb084520b99d939cc07e3 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalPrimaryMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalPrimaryMode.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 173 marshal size 8<br>
- * JTIDS/MIDS Modulation Parameters-Transmitting Terminal Primary Mode
+ * JTIDS/MIDSModulationParametersTransmittingTerminalPrimaryMode
*/
public enum JTIDSMIDSModulationParametersTransmittingTerminalPrimaryMode
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalSecondaryMode.java b/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalSecondaryMode.java
index cb2b925a7f2890d3c3052351370e6d332b5a9e5c..066547dbaeebc2e5b882b5e0a75a4016ba4705e1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalSecondaryMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalSecondaryMode.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 174 marshal size 8<br>
- * JTIDS/MIDS Modulation Parameters-Transmitting Terminal Secondary Mode
+ * JTIDS/MIDSModulationParametersTransmittingTerminalSecondaryMode
*/
public enum JTIDSMIDSModulationParametersTransmittingTerminalSecondaryMode
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LandPlatformAppearance.java b/src-generated/edu/nps/moves/dis7/enumerations/LandPlatformAppearance.java
index 2cc7ff16a5db025cfc8101433e3ddba8bd631d01..bad33ca52fa45ef2ff204c9f251724df9136722a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LandPlatformAppearance.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LandPlatformAppearance.java
@@ -3,24 +3,24 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 31 marshal size 32<br>
- * Land Platform Appearance
+ * LandPlatformAppearance
*/
public class LandPlatformAppearance extends DisBitSet
{
/**
* Describes the visual paint design, Use {@link AppearancePaintScheme} values for this field
*/
- public static Bits PAINT_SCHEME = new Bits(0, 1, AppearancePaintScheme.class);
+ public static Bits PAINTSCHEME = new Bits(0, 1, AppearancePaintScheme.class);
/**
* Describes whether it is capable of moving on its own power
*/
- public static Bits MOBILITY_KILLED = new Bits(1, 1);
+ public static Bits MOBILITYKILLED = new Bits(1, 1);
/**
* Describes whether it can fire weapons
*/
- public static Bits FIRE_POWER_KILLED = new Bits(2, 1);
+ public static Bits FIREPOWERKILLED = new Bits(2, 1);
/**
* Describes the damaged appearance, Use {@link AppearanceDamage} values for this field
*/
@@ -28,35 +28,35 @@ public class LandPlatformAppearance extends DisBitSet
/**
* Describes whether or not smoke is emanating from the entity
*/
- public static Bits IS_SMOKE_EMANATING = new Bits(5, 1);
+ public static Bits ISSMOKEEMANATING = new Bits(5, 1);
/**
* Describes whether or not the engine is emitting smoke
*/
- public static Bits IS_ENGINE_EMITTING_SMOKE = new Bits(6, 1);
+ public static Bits ISENGINEEMITTINGSMOKE = new Bits(6, 1);
/**
* Describes the size of the dust cloud trailing effect, Use {@link AppearanceTrailingEffects} values for this field
*/
- public static Bits TRAILING_DUST_CLOUD = new Bits(7, 2, AppearanceTrailingEffects.class);
+ public static Bits TRAILINGDUSTCLOUD = new Bits(7, 2, AppearanceTrailingEffects.class);
/**
* Describes whether the primary hatch is open or closed and whether someone is visible, Use {@link AppearanceHatch} values for this field
*/
- public static Bits PRIMARY_HATCH = new Bits(9, 3, AppearanceHatch.class);
+ public static Bits PRIMARYHATCH = new Bits(9, 3, AppearanceHatch.class);
/**
* Describes whether head lights are on or off
*/
- public static Bits HEAD_LIGHTS_ON = new Bits(12, 1);
+ public static Bits HEADLIGHTSON = new Bits(12, 1);
/**
* Describes whether tail lights are on or off
*/
- public static Bits TAIL_LIGHTS_ON = new Bits(13, 1);
+ public static Bits TAILLIGHTSON = new Bits(13, 1);
/**
* Describes whether brake lights are on or off
*/
- public static Bits BRAKE_LIGHTS_ON = new Bits(14, 1);
+ public static Bits BRAKELIGHTSON = new Bits(14, 1);
/**
* Describes whether the entity is burning and flames are visible
*/
- public static Bits IS_FLAMING = new Bits(15, 1);
+ public static Bits ISFLAMING = new Bits(15, 1);
/**
* Describes the status of the mechanism required for the platform to be operational, such as the elevated status of the primary launcher, Use {@link AppearanceLauncherOperational} values for this field
*/
@@ -64,19 +64,19 @@ public class LandPlatformAppearance extends DisBitSet
/**
* Describes the camouflage color, Use {@link AppearanceCamouflageType} values for this field
*/
- public static Bits CAMOUFLAGE_TYPE = new Bits(17, 2, AppearanceCamouflageType.class);
+ public static Bits CAMOUFLAGETYPE = new Bits(17, 2, AppearanceCamouflageType.class);
/**
* Describes the type of concealment, Use {@link AppearanceConcealedPosition} values for this field
*/
- public static Bits CONCEALED_POSITION = new Bits(19, 1, AppearanceConcealedPosition.class);
+ public static Bits CONCEALEDPOSITION = new Bits(19, 1, AppearanceConcealedPosition.class);
/**
* Describes whether the entity is frozen and should not be dead reckoned
*/
- public static Bits IS_FROZEN = new Bits(21, 1);
+ public static Bits ISFROZEN = new Bits(21, 1);
/**
* Describes whether the power plant is on or off
*/
- public static Bits POWER_PLANT_ON = new Bits(22, 1);
+ public static Bits POWERPLANTON = new Bits(22, 1);
/**
* Describes whether the entity is active or deactivated, Use {@link AppearanceEntityorObjectState} values for this field
*/
@@ -84,31 +84,31 @@ public class LandPlatformAppearance extends DisBitSet
/**
* Describes whether or not the tent is extended
*/
- public static Bits TENT_EXTENDED = new Bits(24, 1);
+ public static Bits TENTEXTENDED = new Bits(24, 1);
/**
* Describes whether or not the ramp is extended
*/
- public static Bits RAMP_EXTENDED = new Bits(25, 1);
+ public static Bits RAMPEXTENDED = new Bits(25, 1);
/**
* Describes whether blackout lights are on or off
*/
- public static Bits BLACKOUT_LIGHTS_ON = new Bits(26, 1);
+ public static Bits BLACKOUTLIGHTSON = new Bits(26, 1);
/**
* Describes whether blackout brake lights are on or off
*/
- public static Bits BLACKOUT_BRAKE_LIGHTS_ON = new Bits(27, 1);
+ public static Bits BLACKOUTBRAKELIGHTSON = new Bits(27, 1);
/**
* Describes whether spot/search light #1 is on or off
*/
- public static Bits SPOT_SEARCH_LIGHT_1_ON = new Bits(28, 1);
+ public static Bits SPOT_SEARCHLIGHT1ON = new Bits(28, 1);
/**
* Describes whether interior lights (forward) are on or off
*/
- public static Bits INTERIOR_LIGHTS_FORWARD_ON = new Bits(29, 1);
+ public static Bits INTERIORLIGHTSFORWARDON = new Bits(29, 1);
/**
* Describes whether or not the vehicle occupants have surrendered
*/
- public static Bits OCCUPANTS_SURRENDERED = new Bits(30, 1);
+ public static Bits OCCUPANTSSURRENDERED = new Bits(30, 1);
/**
* Describes whether or not the entity is masked or cloaked
*/
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LandPlatformCapabilities.java b/src-generated/edu/nps/moves/dis7/enumerations/LandPlatformCapabilities.java
index 0818bdbbaac83f3848cfd7905dd3bb5ac58b6a4b..741624e573ae681eafb37b13608c14107428fb05 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LandPlatformCapabilities.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LandPlatformCapabilities.java
@@ -3,20 +3,20 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 450 marshal size 32<br>
- * Land Platform Capabilities
+ * LandPlatformCapabilities
*/
public class LandPlatformCapabilities extends DisBitSet implements EntityCapabilities
{
/**
* Describes whether the entity is able to supply some type of ammunition in response to an appropriate service request
*/
- public static Bits AMMUNITION_SUPPLY = new Bits(0, 1);
+ public static Bits AMMUNITIONSUPPLY = new Bits(0, 1);
/**
* Describes whether the entity is able to supply some type of fuel in response to an appropriate service request
*/
- public static Bits FUEL_SUPPLY = new Bits(1, 1);
+ public static Bits FUELSUPPLY = new Bits(1, 1);
/**
* Describes whether the entity is able to provide recovery (e.g., towing) services in response to an appropriate service request
*/
@@ -30,17 +30,17 @@ public class LandPlatformCapabilities extends DisBitSet implements EntityCapabil
*/
public static Bits RESERVED = new Bits(4, 1);
/**
- * The Entity is able to be carried as a sling load payload. The extended appearance record (if available) will identify if it is currently sling loaded and entity association and/or entity offset records (if available) will provide additional sling load details (such as carrier).
+ * The Entity is able to be carried as a sling load payload. The extended appearance record (if available) will identify if it is currently sling loaded and entity association and/or entity offset records (if available) will provide additional sling load details (such as carrier).
*/
- public static Bits SLING_LOADABLE = new Bits(6, 1);
+ public static Bits SLINGLOADABLE = new Bits(6, 1);
/**
- * The Entity is an IED or contains an IED. The extended appearance record (if available) will identify how well hidden the IED is on the Entity. An Attached Part (if applicable, for instance a jury-rigged munition does not apply here) will identify the IED explicitly.
+ * The Entity is an IED or contains an IED. The extended appearance record (if available) will identify how well hidden the IED is on the Entity. An Attached Part (if applicable, for instance a jury-rigged munition does not apply here) will identify the IED explicitly.
*/
- public static Bits IED_PRESENCE_INDICATOR = new Bits(7, 1);
+ public static Bits IEDPRESENCEINDICATOR = new Bits(7, 1);
/**
* The Entity (normally a virtual manned module) can be task organized into an existing mixed mode unit (where mixed mode is intended to comprise a combination of computer-generated forces and virtual or even live forces).
*/
- public static Bits TASK_ORGANIZABLE = new Bits(8, 1);
+ public static Bits TASKORGANIZABLE = new Bits(8, 1);
public static class Bits
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LeafCoverage.java b/src-generated/edu/nps/moves/dis7/enumerations/LeafCoverage.java
index cf5fac872dc61aa465c680115434998aee04f907..b34595f2bc4cca9145e7ee25f9cd857269cded9c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LeafCoverage.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LeafCoverage.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 509 marshal size 2<br>
- * Leaf Coverage
+ * LeafCoverage
*/
public enum LeafCoverage
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Level2SquitterStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/Level2SquitterStatus.java
index 27e92b5ce430f81529bc3d17233fd3a7a187e847..e33436c4d65ee30f5a1893252a577ae29cfb95ff 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Level2SquitterStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Level2SquitterStatus.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 353 marshal size 1<br>
- * Level 2 Squitter Status
+ * Level2SquitterStatus
*/
public enum Level2SquitterStatus
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormAirCategories.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormAirCategories.java
index 6c5e2e90d2ea758d384ec0cee7a20da7ac608c8a..0c2343fcbf603ed6d7cb3b1afffaf7465cb4e916 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormAirCategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormAirCategories.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 478 marshal size 8<br>
- * Life Form Air Categories
+ * LifeFormAirCategories
*/
public enum LifeFormAirCategories
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormCategoriesAfghanistan.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormCategoriesAfghanistan.java
new file mode 100644
index 0000000000000000000000000000000000000000..36d1366aa82d0d82905aed14eef65685b62349db
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormCategoriesAfghanistan.java
@@ -0,0 +1,124 @@
+package edu.nps.moves.dis7.enumerations;
+
+import java.nio.ByteBuffer;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+import edu.nps.moves.dis7.*;
+
+/**
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
+ * UID 501 marshal size 8<br>
+ * LifeFormCategoriesAfghanistan
+ */
+public enum LifeFormCategoriesAfghanistan
+{
+ /** Afghan National Army (ANA) */
+ AFGHAN_NATIONAL_ARMY_ANA (11, "Afghan National Army (ANA)"),
+ /** Afghan Air Force (AAF) */
+ AFGHAN_AIR_FORCE_AAF (13, "Afghan Air Force (AAF)"),
+ /** National Directorate of Security (NDS) */
+ NATIONAL_DIRECTORATE_OF_SECURITY_NDS (51, "National Directorate of Security (NDS)"),
+ /** Afghan National Police (ANP) */
+ AFGHAN_NATIONAL_POLICE_ANP (52, "Afghan National Police (ANP)"),
+ /** Afghan Border Police (ABP) */
+ AFGHAN_BORDER_POLICE_ABP (53, "Afghan Border Police (ABP)"),
+ /** Afghan National Civil Order Police (ANCOP) */
+ AFGHAN_NATIONAL_CIVIL_ORDER_POLICE_ANCOP (54, "Afghan National Civil Order Police (ANCOP)"),
+ /** Afghan Public Protection Force (APPF) */
+ AFGHAN_PUBLIC_PROTECTION_FORCE_APPF (55, "Afghan Public Protection Force (APPF)"),
+ /** Non-Military National Government Agencies */
+ NON_MILITARY_NATIONAL_GOVERNMENT_AGENCIES (70, "Non-Military National Government Agencies"),
+ /** Terrorist Combatant */
+ TERRORIST_COMBATANT (101, "Terrorist Combatant"),
+ /** Humanitarian Organizations */
+ HUMANITARIAN_ORGANIZATIONS (120, "Humanitarian Organizations"),
+ /** Red Crescent */
+ RED_CRESCENT (121, "Red Crescent"),
+ /** Civilian */
+ CIVILIAN (130, "Civilian"),
+ /** Press */
+ PRESS (133, "Press");
+
+ private int value;
+ private final String description;
+
+ LifeFormCategoriesAfghanistan(int value, String description)
+ {
+ this.value = value;
+ this.description = description;
+ }
+
+ public int getValue()
+ {
+ return value;
+ }
+
+ public String getDescription()
+ {
+ return description;
+ }
+
+ public static int getEnumBitWidth()
+ {
+ return 8;
+ }
+
+ public static LifeFormCategoriesAfghanistan getEnumForValue(int i)
+ {
+ for(LifeFormCategoriesAfghanistan val: LifeFormCategoriesAfghanistan.values()) {
+ if(val.getValue()==i)
+ return val;
+ }
+ System.err.println("No enumeration found for value " + i + " of enumeration LifeFormCategoriesAfghanistan");
+ return null;
+ }
+
+
+ public void marshal(DataOutputStream dos) throws IOException
+ {
+ dos.writeByte(getValue());
+ }
+
+ public void marshal(ByteBuffer buff) throws Exception
+ {
+ buff.put((byte)getValue());
+ }
+
+ public static LifeFormCategoriesAfghanistan unmarshalEnum (DataInputStream dis) throws Exception
+ {
+ /* try {
+ value = dis.readUnsignedByte();
+ }
+ catch(IOException ex) {
+ showError(ex);
+ } */
+
+ return getEnumForValue(dis.readByte());
+ }
+
+ public static LifeFormCategoriesAfghanistan unmarshalEnum(ByteBuffer buff) throws Exception
+ {
+ /*
+ try {
+ value = (int)buff.get();
+ }
+ catch(Exception ex) {
+ showError(ex);
+ }
+ */
+ return getEnumForValue(buff.get());
+ }
+
+ public int getMarshalledSize()
+ {
+ return 1; // 8 bits
+ }
+
+ @Override
+ public String toString()
+ {
+ return "LifeFormCategoriesAfghanistan: " + name() + ": " + getValue();
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormCategoriesUS.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormCategoriesUS.java
index 6bf07c3e2886e127d9705c5090603ab1d466fe2f..ca112c352147eefd91a3c1e6c1a970a35454180a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormCategoriesUS.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormCategoriesUS.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 476 marshal size 8<br>
- * Life Form Categories-U.S.
+ * LifeFormCategoriesU.S.
*/
public enum LifeFormCategoriesUS
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormExtraPersonalData.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormExtraPersonalData.java
index 0392d8329fd918512697a5187f84f08061203eda..2adfd514f7249738193a941c7199c4907a08e3e0 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormExtraPersonalData.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormExtraPersonalData.java
@@ -8,10 +8,10 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 477 marshal size 8<br>
- * Life Form Extra-Personal Data<br>
- * The 1's digit is reserved for Race/Ethnicity and the enumerations are taken from the U.S. OMB. The 10's digit is reserved for general age group. The 100's digit is reserved for gender, where 0 is Male and 1 is Female.
+ * LifeFormExtraPersonalData<br>
+ * The 1s digit is reserved for Race/Ethnicity and the enumerations are taken from the U.S. OMB. The 10s digit is reserved for general age group. The 100s digit is reserved for gender, where 0 is Male and 1 is Female.
*/
public enum LifeFormExtraPersonalData
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiMaterielRifles.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiMaterielRifles.java
index b0d171ef2773eb621c99f07d30acfba37a3c04e9..dc12507a3968025a5cac3bab0b3f9cd5c4d3c37f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiMaterielRifles.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiMaterielRifles.java
@@ -8,18 +8,18 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 510 marshal size 8<br>
- * Life Form-Human-Specific-Anti-Materiel Rifles
+ * LifeFormHumanSpecificAntiMaterielRifles
*/
public enum LifeFormHumanSpecificAntiMaterielRifles
{
/** Other */
OTHER (0, "Other"),
/** 12.7mm AW50 */
- $127MM_AW50 (10, "12.7mm AW50"),
+ NAME_127MM_AW50 (10, "12.7mm AW50"),
/** 12.7mm AW50F */
- $127MM_AW50F (11, "12.7mm AW50F");
+ NAME_127MM_AW50F (11, "12.7mm AW50F");
private int value;
private final String description;
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiTankMissiles.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiTankMissiles.java
index 44c7b9395bbaf2f9d31a5970e35ff19196609928..514019c4bce5a1a418a003980cf9ef0ba41ba7ba 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiTankMissiles.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiTankMissiles.java
@@ -8,160 +8,160 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 519 marshal size 8<br>
- * Life Form-Human-Specific-Anti Tank Missiles
+ * LifeFormHumanSpecificAntiTankMissiles
*/
public enum LifeFormHumanSpecificAntiTankMissiles
{
/** Other */
OTHER (0, "Other"),
/** 120mm Type 64 MAT KAM-3 */
- $120MM_TYPE_64_MAT_KAM_3 (30, "120mm Type 64 MAT KAM-3"),
+ NAME_120MM_TYPE_64_MAT_KAM_3 (30, "120mm Type 64 MAT KAM-3"),
/** 153mm Type 79 Jyu-MAT KAM-9 */
- $153MM_TYPE_79_JYU_MAT_KAM_9 (31, "153mm Type 79 Jyu-MAT KAM-9"),
+ NAME_153MM_TYPE_79_JYU_MAT_KAM_9 (31, "153mm Type 79 Jyu-MAT KAM-9"),
/** 120mm Type 87 Chu-MAT */
- $120MM_TYPE_87_CHU_MAT (32, "120mm Type 87 Chu-MAT"),
+ NAME_120MM_TYPE_87_CHU_MAT (32, "120mm Type 87 Chu-MAT"),
/** 140mm Type 01 LMAT */
- $140MM_TYPE_01_LMAT (33, "140mm Type 01 LMAT"),
+ NAME_140MM_TYPE_01_LMAT (33, "140mm Type 01 LMAT"),
/** 140mm M47 Dragon */
- $140MM_M47_DRAGON (58, "140mm M47 Dragon"),
+ NAME_140MM_M47_DRAGON (58, "140mm M47 Dragon"),
/** 140mm Saeghe 1-2 */
- $140MM_SAEGHE_1_2 (59, "140mm Saeghe 1-2"),
+ NAME_140MM_SAEGHE_1_2 (59, "140mm Saeghe 1-2"),
/** 127mm FGM-148 Javelin */
- $127MM_FGM_148_JAVELIN (60, "127mm FGM-148 Javelin"),
+ NAME_127MM_FGM_148_JAVELIN (60, "127mm FGM-148 Javelin"),
/** 139mm FGM-172 SRAW */
- $139MM_FGM_172_SRAW (63, "139mm FGM-172 SRAW"),
+ NAME_139MM_FGM_172_SRAW (63, "139mm FGM-172 SRAW"),
/** 139mm FGM-172B SRAW-MPV */
- $139MM_FGM_172B_SRAW_MPV (64, "139mm FGM-172B SRAW-MPV"),
+ NAME_139MM_FGM_172B_SRAW_MPV (64, "139mm FGM-172B SRAW-MPV"),
/** 152mm BGM-71 TOW */
- $152MM_BGM_71_TOW (68, "152mm BGM-71 TOW"),
+ NAME_152MM_BGM_71_TOW (68, "152mm BGM-71 TOW"),
/** 152mm Orev TOW II */
- $152MM_OREV_TOW_II (69, "152mm Orev TOW II"),
+ NAME_152MM_OREV_TOW_II (69, "152mm Orev TOW II"),
/** 120mm Vickers Vigilant / Clevite */
- $120MM_VICKERS_VIGILANT_CLEVITE (75, "120mm Vickers Vigilant / Clevite"),
+ NAME_120MM_VICKERS_VIGILANT_CLEVITE (75, "120mm Vickers Vigilant / Clevite"),
/** 110mm Bantam (Rb 53) */
- $110MM_BANTAM_RB_53 (80, "110mm Bantam (Rb 53)"),
+ NAME_110MM_BANTAM_RB_53 (80, "110mm Bantam (Rb 53)"),
/** 150mm RBS-56 BILL 1 */
- $150MM_RBS_56_BILL_1 (81, "150mm RBS-56 BILL 1"),
+ NAME_150MM_RBS_56_BILL_1 (81, "150mm RBS-56 BILL 1"),
/** 150mm RBS-56-2 BILL 2 */
- $150MM_RBS_56_2_BILL_2 (82, "150mm RBS-56-2 BILL 2"),
+ NAME_150MM_RBS_56_2_BILL_2 (82, "150mm RBS-56-2 BILL 2"),
/** 130mm Spike SR */
- $130MM_SPIKE_SR (85, "130mm Spike SR"),
+ NAME_130MM_SPIKE_SR (85, "130mm Spike SR"),
/** 130mm Spike MR (CLU) */
- $130MM_SPIKE_MR_CLU (86, "130mm Spike MR (CLU)"),
+ NAME_130MM_SPIKE_MR_CLU (86, "130mm Spike MR (CLU)"),
/** 130mm Spike LR (CLU) */
- $130MM_SPIKE_LR_CLU (87, "130mm Spike LR (CLU)"),
+ NAME_130MM_SPIKE_LR_CLU (87, "130mm Spike LR (CLU)"),
/** 60mm Mosquito */
- $60MM_MOSQUITO (95, "60mm Mosquito"),
+ NAME_60MM_MOSQUITO (95, "60mm Mosquito"),
/** 160mm SS.10 */
- $160MM_SS10 (98, "160mm SS.10"),
+ NAME_160MM_SS10 (98, "160mm SS.10"),
/** 103mm MILAN */
- $103MM_MILAN (100, "103mm MILAN"),
+ NAME_103MM_MILAN (100, "103mm MILAN"),
/** 115mm MILAN 2 */
- $115MM_MILAN_2 (101, "115mm MILAN 2"),
+ NAME_115MM_MILAN_2 (101, "115mm MILAN 2"),
/** 115mm MILAN 2T */
- $115MM_MILAN_2T (102, "115mm MILAN 2T"),
+ NAME_115MM_MILAN_2T (102, "115mm MILAN 2T"),
/** 115mm MILAN 3 */
- $115MM_MILAN_3 (103, "115mm MILAN 3"),
+ NAME_115MM_MILAN_3 (103, "115mm MILAN 3"),
/** 115mm MILAN ER */
- $115MM_MILAN_ER (104, "115mm MILAN ER"),
+ NAME_115MM_MILAN_ER (104, "115mm MILAN ER"),
/** 136mm ERYX */
- $136MM_ERYX (105, "136mm ERYX"),
+ NAME_136MM_ERYX (105, "136mm ERYX"),
/** 152mm Entac */
- $152MM_ENTAC (107, "152mm Entac"),
+ NAME_152MM_ENTAC (107, "152mm Entac"),
/** 125mm RAAD */
- $125MM_RAAD (110, "125mm RAAD"),
+ NAME_125MM_RAAD (110, "125mm RAAD"),
/** 125mm I-RAAD-T */
- $125MM_I_RAAD_T (111, "125mm I-RAAD-T"),
+ NAME_125MM_I_RAAD_T (111, "125mm I-RAAD-T"),
/** 152mm Toophan */
- $152MM_TOOPHAN (112, "152mm Toophan"),
+ NAME_152MM_TOOPHAN (112, "152mm Toophan"),
/** 152mm Toophan 2 */
- $152MM_TOOPHAN_2 (113, "152mm Toophan 2"),
+ NAME_152MM_TOOPHAN_2 (113, "152mm Toophan 2"),
/** 152mm Toophan 5 */
- $152MM_TOOPHAN_5 (114, "152mm Toophan 5"),
+ NAME_152MM_TOOPHAN_5 (114, "152mm Toophan 5"),
/** 136mm Bumbar */
- $136MM_BUMBAR (120, "136mm Bumbar"),
+ NAME_136MM_BUMBAR (120, "136mm Bumbar"),
/** 130mm Shershen PK-2 */
- $130MM_SHERSHEN_PK_2 (125, "130mm Shershen PK-2"),
+ NAME_130MM_SHERSHEN_PK_2 (125, "130mm Shershen PK-2"),
/** 152mm Shershen-Q P-2B */
- $152MM_SHERSHEN_Q_P_2B (126, "152mm Shershen-Q P-2B"),
+ NAME_152MM_SHERSHEN_Q_P_2B (126, "152mm Shershen-Q P-2B"),
/** 130mm Mectron MSS-1.2 */
- $130MM_MECTRON_MSS_12 (130, "130mm Mectron MSS-1.2"),
+ NAME_130MM_MECTRON_MSS_12 (130, "130mm Mectron MSS-1.2"),
/** 120mm HJ-8 */
- $120MM_HJ_8 (140, "120mm HJ-8"),
+ NAME_120MM_HJ_8 (140, "120mm HJ-8"),
/** 120mm HJ-8A */
- $120MM_HJ_8A (141, "120mm HJ-8A"),
+ NAME_120MM_HJ_8A (141, "120mm HJ-8A"),
/** 120mm HJ-8B */
- $120MM_HJ_8B (142, "120mm HJ-8B"),
+ NAME_120MM_HJ_8B (142, "120mm HJ-8B"),
/** 120mm HJ-8C */
- $120MM_HJ_8C (143, "120mm HJ-8C"),
+ NAME_120MM_HJ_8C (143, "120mm HJ-8C"),
/** 120mm HJ-8D */
- $120MM_HJ_8D (144, "120mm HJ-8D"),
+ NAME_120MM_HJ_8D (144, "120mm HJ-8D"),
/** 120mm HJ-8E */
- $120MM_HJ_8E (145, "120mm HJ-8E"),
+ NAME_120MM_HJ_8E (145, "120mm HJ-8E"),
/** 120mm HJ-8F */
- $120MM_HJ_8F (146, "120mm HJ-8F"),
+ NAME_120MM_HJ_8F (146, "120mm HJ-8F"),
/** 120mm HJ-8FAE */
- $120MM_HJ_8FAE (147, "120mm HJ-8FAE"),
+ NAME_120MM_HJ_8FAE (147, "120mm HJ-8FAE"),
/** 120mm HJ-8L */
- $120MM_HJ_8L (148, "120mm HJ-8L"),
+ NAME_120MM_HJ_8L (148, "120mm HJ-8L"),
/** 120mm HJ-8H */
- $120MM_HJ_8H (149, "120mm HJ-8H"),
+ NAME_120MM_HJ_8H (149, "120mm HJ-8H"),
/** 120mm HJ-8S */
- $120MM_HJ_8S (150, "120mm HJ-8S"),
+ NAME_120MM_HJ_8S (150, "120mm HJ-8S"),
/** 120mm Baktar-Shikan */
- $120MM_BAKTAR_SHIKAN (151, "120mm Baktar-Shikan"),
+ NAME_120MM_BAKTAR_SHIKAN (151, "120mm Baktar-Shikan"),
/** 120mm HJ-11 (AFT-11) */
- $120MM_HJ_11_AFT_11 (152, "120mm HJ-11 (AFT-11)"),
+ NAME_120MM_HJ_11_AFT_11 (152, "120mm HJ-11 (AFT-11)"),
/** 152mm HJ-9A */
- $152MM_HJ_9A (153, "152mm HJ-9A"),
+ NAME_152MM_HJ_9A (153, "152mm HJ-9A"),
/** 135mm HJ-12 Red Arrow */
- $135MM_HJ_12_RED_ARROW (154, "135mm HJ-12 Red Arrow"),
+ NAME_135MM_HJ_12_RED_ARROW (154, "135mm HJ-12 Red Arrow"),
/** 125mm HJ-73 MCLOS */
- $125MM_HJ_73_MCLOS (155, "125mm HJ-73 MCLOS"),
+ NAME_125MM_HJ_73_MCLOS (155, "125mm HJ-73 MCLOS"),
/** 125mm HJ-73B SACLOS */
- $125MM_HJ_73B_SACLOS (156, "125mm HJ-73B SACLOS"),
+ NAME_125MM_HJ_73B_SACLOS (156, "125mm HJ-73B SACLOS"),
/** 125mm HJ-73C SACLOS ERA */
- $125MM_HJ_73C_SACLOS_ERA (157, "125mm HJ-73C SACLOS ERA"),
+ NAME_125MM_HJ_73C_SACLOS_ERA (157, "125mm HJ-73C SACLOS ERA"),
/** 125mm AT-3 Sagger A/9M14 Malyutka */
- $125MM_AT_3_SAGGER_A_9M14_MALYUTKA (170, "125mm AT-3 Sagger A/9M14 Malyutka"),
+ NAME_125MM_AT_3_SAGGER_A_9M14_MALYUTKA (170, "125mm AT-3 Sagger A/9M14 Malyutka"),
/** 125mm AT-3B Sagger B/9M14M Malyutka-M */
- $125MM_AT_3B_SAGGER_B_9M14M_MALYUTKA_M (171, "125mm AT-3B Sagger B/9M14M Malyutka-M"),
+ NAME_125MM_AT_3B_SAGGER_B_9M14M_MALYUTKA_M (171, "125mm AT-3B Sagger B/9M14M Malyutka-M"),
/** 125mm AT-3C Sagger C/9M14P Malyutka-P */
- $125MM_AT_3C_SAGGER_C_9M14P_MALYUTKA_P (172, "125mm AT-3C Sagger C/9M14P Malyutka-P"),
+ NAME_125MM_AT_3C_SAGGER_C_9M14P_MALYUTKA_P (172, "125mm AT-3C Sagger C/9M14P Malyutka-P"),
/** 125mm AT-3D Sagger D/9M14-2 Malyutka-2 */
- $125MM_AT_3D_SAGGER_D_9M14_2_MALYUTKA_2 (173, "125mm AT-3D Sagger D/9M14-2 Malyutka-2"),
+ NAME_125MM_AT_3D_SAGGER_D_9M14_2_MALYUTKA_2 (173, "125mm AT-3D Sagger D/9M14-2 Malyutka-2"),
/** 125mm Susong-Po */
- $125MM_SUSONG_PO (174, "125mm Susong-Po"),
+ NAME_125MM_SUSONG_PO (174, "125mm Susong-Po"),
/** 125mm AT-3C POLK */
- $125MM_AT_3C_POLK (175, "125mm AT-3C POLK"),
+ NAME_125MM_AT_3C_POLK (175, "125mm AT-3C POLK"),
/** 125mm Kun Wu 1 */
- $125MM_KUN_WU_1 (176, "125mm Kun Wu 1"),
+ NAME_125MM_KUN_WU_1 (176, "125mm Kun Wu 1"),
/** 125mm Maliutka M2T */
- $125MM_MALIUTKA_M2T (177, "125mm Maliutka M2T"),
+ NAME_125MM_MALIUTKA_M2T (177, "125mm Maliutka M2T"),
/** 120mm AT-4A Spigot A/9M111 Fagot */
- $120MM_AT_4A_SPIGOT_A_9M111_FAGOT (178, "120mm AT-4A Spigot A/9M111 Fagot"),
+ NAME_120MM_AT_4A_SPIGOT_A_9M111_FAGOT (178, "120mm AT-4A Spigot A/9M111 Fagot"),
/** 120mm AT-4B Spigot B/9M111-2 Fagot */
- $120MM_AT_4B_SPIGOT_B_9M111_2_FAGOT (179, "120mm AT-4B Spigot B/9M111-2 Fagot"),
+ NAME_120MM_AT_4B_SPIGOT_B_9M111_2_FAGOT (179, "120mm AT-4B Spigot B/9M111-2 Fagot"),
/** 120mm AT-4C Spigot C/9M111M Faktoriya */
- $120MM_AT_4C_SPIGOT_C_9M111M_FAKTORIYA (180, "120mm AT-4C Spigot C/9M111M Faktoriya"),
+ NAME_120MM_AT_4C_SPIGOT_C_9M111M_FAKTORIYA (180, "120mm AT-4C Spigot C/9M111M Faktoriya"),
/** 135mm AT-5A Spandrel/9M113 Kronkurs */
- $135MM_AT_5A_SPANDREL_9M113_KRONKURS (181, "135mm AT-5A Spandrel/9M113 Kronkurs"),
+ NAME_135MM_AT_5A_SPANDREL_9M113_KRONKURS (181, "135mm AT-5A Spandrel/9M113 Kronkurs"),
/** 135mm AT-5B Spandrel/9M113M Kronkurs-M */
- $135MM_AT_5B_SPANDREL_9M113M_KRONKURS_M (182, "135mm AT-5B Spandrel/9M113M Kronkurs-M"),
+ NAME_135MM_AT_5B_SPANDREL_9M113M_KRONKURS_M (182, "135mm AT-5B Spandrel/9M113M Kronkurs-M"),
/** 135mm Tosan */
- $135MM_TOSAN (183, "135mm Tosan"),
+ NAME_135MM_TOSAN (183, "135mm Tosan"),
/** 94mm AT-7 Saxhorn/9K115 Metis */
- $94MM_AT_7_SAXHORN_9K115_METIS (184, "94mm AT-7 Saxhorn/9K115 Metis"),
+ NAME_94MM_AT_7_SAXHORN_9K115_METIS (184, "94mm AT-7 Saxhorn/9K115 Metis"),
/** 130mm AT-13 Saxhorn-2/9K115-2 Metis-M */
- $130MM_AT_13_SAXHORN_2_9K115_2_METIS_M (185, "130mm AT-13 Saxhorn-2/9K115-2 Metis-M"),
+ NAME_130MM_AT_13_SAXHORN_2_9K115_2_METIS_M (185, "130mm AT-13 Saxhorn-2/9K115-2 Metis-M"),
/** 152mm AT-14 Spriggan/9M133 Kornet */
- $152MM_AT_14_SPRIGGAN_9M133_KORNET (186, "152mm AT-14 Spriggan/9M133 Kornet"),
+ NAME_152MM_AT_14_SPRIGGAN_9M133_KORNET (186, "152mm AT-14 Spriggan/9M133 Kornet"),
/** 152mm Dehlavie */
- $152MM_DEHLAVIE (187, "152mm Dehlavie"),
+ NAME_152MM_DEHLAVIE (187, "152mm Dehlavie"),
/** 102mm Mathogo */
- $102MM_MATHOGO (200, "102mm Mathogo");
+ NAME_102MM_MATHOGO (200, "102mm Mathogo");
private int value;
private final String description;
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiTankRockets.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiTankRockets.java
index a504e574a07fa78c13609ad6d4d98bc0b21c078b..5311092541e4f00a7b4a48f4418f2195aaf55b5b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiTankRockets.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiTankRockets.java
@@ -8,150 +8,150 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 518 marshal size 8<br>
- * Life Form-Human-Specific-Anti Tank Rockets
+ * LifeFormHumanSpecificAntiTankRockets
*/
public enum LifeFormHumanSpecificAntiTankRockets
{
/** Other */
OTHER (0, "Other"),
/** 82mm B-300 */
- $82MM_B_300 (10, "82mm B-300"),
+ NAME_82MM_B_300 (10, "82mm B-300"),
/** 82mm Shipon */
- $82MM_SHIPON (11, "82mm Shipon"),
+ NAME_82MM_SHIPON (11, "82mm Shipon"),
/** 83mm MK153 Mod 0 SMAW */
- $83MM_MK153_MOD_0_SMAW (12, "83mm MK153 Mod 0 SMAW"),
+ NAME_83MM_MK153_MOD_0_SMAW (12, "83mm MK153 Mod 0 SMAW"),
/** 66mm M72 LAW */
- $66MM_M72_LAW (20, "66mm M72 LAW"),
+ NAME_66MM_M72_LAW (20, "66mm M72 LAW"),
/** 66mm M72A1 LAW */
- $66MM_M72A1_LAW (21, "66mm M72A1 LAW"),
+ NAME_66MM_M72A1_LAW (21, "66mm M72A1 LAW"),
/** 66mm M72A2 LAW */
- $66MM_M72A2_LAW (22, "66mm M72A2 LAW"),
+ NAME_66MM_M72A2_LAW (22, "66mm M72A2 LAW"),
/** 66mm M72A3 LAW */
- $66MM_M72A3_LAW (23, "66mm M72A3 LAW"),
+ NAME_66MM_M72A3_LAW (23, "66mm M72A3 LAW"),
/** 66mm M72A4 LAW */
- $66MM_M72A4_LAW (24, "66mm M72A4 LAW"),
+ NAME_66MM_M72A4_LAW (24, "66mm M72A4 LAW"),
/** 66mm M72A5 LAW */
- $66MM_M72A5_LAW (25, "66mm M72A5 LAW"),
+ NAME_66MM_M72A5_LAW (25, "66mm M72A5 LAW"),
/** 66mm M72A6 LAW */
- $66MM_M72A6_LAW (26, "66mm M72A6 LAW"),
+ NAME_66MM_M72A6_LAW (26, "66mm M72A6 LAW"),
/** 66mm M72A7 LAW */
- $66MM_M72A7_LAW (27, "66mm M72A7 LAW"),
+ NAME_66MM_M72A7_LAW (27, "66mm M72A7 LAW"),
/** 66mm M72E8 LAW */
- $66MM_M72E8_LAW (28, "66mm M72E8 LAW"),
+ NAME_66MM_M72E8_LAW (28, "66mm M72E8 LAW"),
/** 66mm M72E9 LAW */
- $66MM_M72E9_LAW (29, "66mm M72E9 LAW"),
+ NAME_66MM_M72E9_LAW (29, "66mm M72E9 LAW"),
/** 66mm M72E10 LAW */
- $66MM_M72E10_LAW (30, "66mm M72E10 LAW"),
+ NAME_66MM_M72E10_LAW (30, "66mm M72E10 LAW"),
/** 66mm M72AS LAW */
- $66MM_M72AS_LAW (31, "66mm M72AS LAW"),
+ NAME_66MM_M72AS_LAW (31, "66mm M72AS LAW"),
/** 94mm LAW 80 */
- $94MM_LAW_80 (35, "94mm LAW 80"),
+ NAME_94MM_LAW_80 (35, "94mm LAW 80"),
/** 60mm M1 Bazooka */
- $60MM_M1_BAZOOKA (40, "60mm M1 Bazooka"),
+ NAME_60MM_M1_BAZOOKA (40, "60mm M1 Bazooka"),
/** 60mm M1A1 Bazooka */
- $60MM_M1A1_BAZOOKA (41, "60mm M1A1 Bazooka"),
+ NAME_60MM_M1A1_BAZOOKA (41, "60mm M1A1 Bazooka"),
/** 60mm M9 Bazooka */
- $60MM_M9_BAZOOKA (42, "60mm M9 Bazooka"),
+ NAME_60MM_M9_BAZOOKA (42, "60mm M9 Bazooka"),
/** 60mm M9A1 Bazooka */
- $60MM_M9A1_BAZOOKA (43, "60mm M9A1 Bazooka"),
+ NAME_60MM_M9A1_BAZOOKA (43, "60mm M9A1 Bazooka"),
/** 89mm M20 Super Bazooka */
- $89MM_M20_SUPER_BAZOOKA (44, "89mm M20 Super Bazooka"),
+ NAME_89MM_M20_SUPER_BAZOOKA (44, "89mm M20 Super Bazooka"),
/** 89mm M20A1 Super Bazooka */
- $89MM_M20A1_SUPER_BAZOOKA (45, "89mm M20A1 Super Bazooka"),
+ NAME_89MM_M20A1_SUPER_BAZOOKA (45, "89mm M20A1 Super Bazooka"),
/** 89mm M20B1 Super Bazooka */
- $89MM_M20B1_SUPER_BAZOOKA (46, "89mm M20B1 Super Bazooka"),
+ NAME_89MM_M20B1_SUPER_BAZOOKA (46, "89mm M20B1 Super Bazooka"),
/** 89mm M20A1B1 Super Bazooka */
- $89MM_M20A1B1_SUPER_BAZOOKA (47, "89mm M20A1B1 Super Bazooka"),
+ NAME_89MM_M20A1B1_SUPER_BAZOOKA (47, "89mm M20A1B1 Super Bazooka"),
/** 89mm M25 Three Shot Bazooka */
- $89MM_M25_THREE_SHOT_BAZOOKA (48, "89mm M25 Three Shot Bazooka"),
+ NAME_89MM_M25_THREE_SHOT_BAZOOKA (48, "89mm M25 Three Shot Bazooka"),
/** 89mm Instalaza M65 */
- $89MM_INSTALAZA_M65 (49, "89mm Instalaza M65"),
+ NAME_89MM_INSTALAZA_M65 (49, "89mm Instalaza M65"),
/** 90mm Instalaza C90 */
- $90MM_INSTALAZA_C90 (50, "90mm Instalaza C90"),
+ NAME_90MM_INSTALAZA_C90 (50, "90mm Instalaza C90"),
/** 90mm C90-CR (M3) */
- $90MM_C90_CR_M3 (51, "90mm C90-CR (M3)"),
+ NAME_90MM_C90_CR_M3 (51, "90mm C90-CR (M3)"),
/** 90mm C90-CR-AM (M3) */
- $90MM_C90_CR_AM_M3 (52, "90mm C90-CR-AM (M3)"),
+ NAME_90MM_C90_CR_AM_M3 (52, "90mm C90-CR-AM (M3)"),
/** 90mm C90-CR-BK (M3) */
- $90MM_C90_CR_BK_M3 (53, "90mm C90-CR-BK (M3)"),
+ NAME_90MM_C90_CR_BK_M3 (53, "90mm C90-CR-BK (M3)"),
/** 90mm C90-CR-IN (M3) */
- $90MM_C90_CR_IN_M3 (54, "90mm C90-CR-IN (M3)"),
+ NAME_90MM_C90_CR_IN_M3 (54, "90mm C90-CR-IN (M3)"),
/** 60mm PzF 3 */
- $60MM_PZF_3 (60, "60mm PzF 3"),
+ NAME_60MM_PZF_3 (60, "60mm PzF 3"),
/** 60mm PzF 3-IT */
- $60MM_PZF_3_IT (61, "60mm PzF 3-IT"),
+ NAME_60MM_PZF_3_IT (61, "60mm PzF 3-IT"),
/** 60mm PzF 3 Bunkerfaust */
- $60MM_PZF_3_BUNKERFAUST (62, "60mm PzF 3 Bunkerfaust"),
+ NAME_60MM_PZF_3_BUNKERFAUST (62, "60mm PzF 3 Bunkerfaust"),
/** 44mm PzF 44 */
- $44MM_PZF_44 (65, "44mm PzF 44"),
+ NAME_44MM_PZF_44 (65, "44mm PzF 44"),
/** 30mm Panzerfaust 30 */
- $30MM_PANZERFAUST_30 (70, "30mm Panzerfaust 30"),
+ NAME_30MM_PANZERFAUST_30 (70, "30mm Panzerfaust 30"),
/** 50mm Panzerfaust 60 */
- $50MM_PANZERFAUST_60 (71, "50mm Panzerfaust 60"),
+ NAME_50MM_PANZERFAUST_60 (71, "50mm Panzerfaust 60"),
/** 60mm Panzerfaust 100 */
- $60MM_PANZERFAUST_100 (72, "60mm Panzerfaust 100"),
+ NAME_60MM_PANZERFAUST_100 (72, "60mm Panzerfaust 100"),
/** 60mm Panzerfaust 150 */
- $60MM_PANZERFAUST_150 (73, "60mm Panzerfaust 150"),
+ NAME_60MM_PANZERFAUST_150 (73, "60mm Panzerfaust 150"),
/** 88mm Panzerschreck RPzB */
- $88MM_PANZERSCHRECK_RPZB (75, "88mm Panzerschreck RPzB"),
+ NAME_88MM_PANZERSCHRECK_RPZB (75, "88mm Panzerschreck RPzB"),
/** 83mm RL-83 Blindicide */
- $83MM_RL_83_BLINDICIDE (80, "83mm RL-83 Blindicide"),
+ NAME_83MM_RL_83_BLINDICIDE (80, "83mm RL-83 Blindicide"),
/** 100mm RL-100 Blindicide */
- $100MM_RL_100_BLINDICIDE (81, "100mm RL-100 Blindicide"),
+ NAME_100MM_RL_100_BLINDICIDE (81, "100mm RL-100 Blindicide"),
/** 90mm M79 Osa (Wasp) */
- $90MM_M79_OSA_WASP (85, "90mm M79 Osa (Wasp)"),
+ NAME_90MM_M79_OSA_WASP (85, "90mm M79 Osa (Wasp)"),
/** 64mm M80 Zolja (Wasp) */
- $64MM_M80_ZOLJA_WASP (86, "64mm M80 Zolja (Wasp)"),
+ NAME_64MM_M80_ZOLJA_WASP (86, "64mm M80 Zolja (Wasp)"),
/** 67mm Armburst Crossbow */
- $67MM_ARMBURST_CROSSBOW (90, "67mm Armburst Crossbow"),
+ NAME_67MM_ARMBURST_CROSSBOW (90, "67mm Armburst Crossbow"),
/** 40mm Type-69 RPG */
- $40MM_TYPE_69_RPG (93, "40mm Type-69 RPG"),
+ NAME_40MM_TYPE_69_RPG (93, "40mm Type-69 RPG"),
/** 89mm PIAT */
- $89MM_PIAT (95, "89mm PIAT"),
+ NAME_89MM_PIAT (95, "89mm PIAT"),
/** 40mm RPG-2 */
- $40MM_RPG_2 (100, "40mm RPG-2"),
+ NAME_40MM_RPG_2 (100, "40mm RPG-2"),
/** 64mm RPG-18 Mukha */
- $64MM_RPG_18_MUKHA (101, "64mm RPG-18 Mukha"),
+ NAME_64MM_RPG_18_MUKHA (101, "64mm RPG-18 Mukha"),
/** 72.5mm RPG-22 Netto */
- $725MM_RPG_22_NETTO (102, "72.5mm RPG-22 Netto"),
+ NAME_725MM_RPG_22_NETTO (102, "72.5mm RPG-22 Netto"),
/** 72.5mm RPG-26 Aglen */
- $725MM_RPG_26_AGLEN (103, "72.5mm RPG-26 Aglen"),
+ NAME_725MM_RPG_26_AGLEN (103, "72.5mm RPG-26 Aglen"),
/** 105mm RPG-29 Vampir */
- $105MM_RPG_29_VAMPIR (104, "105mm RPG-29 Vampir"),
+ NAME_105MM_RPG_29_VAMPIR (104, "105mm RPG-29 Vampir"),
/** 105mm RPG-30 Kryuk */
- $105MM_RPG_30_KRYUK (105, "105mm RPG-30 Kryuk"),
+ NAME_105MM_RPG_30_KRYUK (105, "105mm RPG-30 Kryuk"),
/** 105mm RPG-32 Nashshab */
- $105MM_RPG_32_NASHSHAB (106, "105mm RPG-32 Nashshab"),
+ NAME_105MM_RPG_32_NASHSHAB (106, "105mm RPG-32 Nashshab"),
/** 40mm RPG-7 */
- $40MM_RPG_7 (110, "40mm RPG-7"),
+ NAME_40MM_RPG_7 (110, "40mm RPG-7"),
/** 40mm PSRL-1 (RPG-7USA) */
- $40MM_PSRL_1_RPG_7USA (111, "40mm PSRL-1 (RPG-7USA)"),
+ NAME_40MM_PSRL_1_RPG_7USA (111, "40mm PSRL-1 (RPG-7USA)"),
/** 40mm GS-777/PSRL-2 */
- $40MM_GS_777_PSRL_2 (112, "40mm GS-777/PSRL-2"),
+ NAME_40MM_GS_777_PSRL_2 (112, "40mm GS-777/PSRL-2"),
/** 68mm RPG-76 Komar (Mosquito) */
- $68MM_RPG_76_KOMAR_MOSQUITO (120, "68mm RPG-76 Komar (Mosquito)"),
+ NAME_68MM_RPG_76_KOMAR_MOSQUITO (120, "68mm RPG-76 Komar (Mosquito)"),
/** 120mm SEP Dard 120 */
- $120MM_SEP_DARD_120 (125, "120mm SEP Dard 120"),
+ NAME_120MM_SEP_DARD_120 (125, "120mm SEP Dard 120"),
/** 58mm WASP 58 */
- $58MM_WASP_58 (128, "58mm WASP 58"),
+ NAME_58MM_WASP_58 (128, "58mm WASP 58"),
/** 73mm LRAC 73-50 */
- $73MM_LRAC_73_50 (130, "73mm LRAC 73-50"),
+ NAME_73MM_LRAC_73_50 (130, "73mm LRAC 73-50"),
/** 89mm LRAC 89-F1 STRIM */
- $89MM_LRAC_89_F1_STRIM (131, "89mm LRAC 89-F1 STRIM"),
+ NAME_89MM_LRAC_89_F1_STRIM (131, "89mm LRAC 89-F1 STRIM"),
/** 90mm MATADOR (Man-Portable Anti-Tank, Anti-DOoR) */
- $90MM_MATADOR_MAN_PORTABLE_ANTI_TANK_ANTI_DOOR (135, "90mm MATADOR (Man-Portable Anti-Tank, Anti-DOoR)"),
+ NAME_90MM_MATADOR_MAN_PORTABLE_ANTI_TANK_ANTI_DOOR (135, "90mm MATADOR (Man-Portable Anti-Tank, Anti-DOoR)"),
/** 90mm MATADOR-MP */
- $90MM_MATADOR_MP (136, "90mm MATADOR-MP"),
+ NAME_90MM_MATADOR_MP (136, "90mm MATADOR-MP"),
/** 90mm MATADOR-WB */
- $90MM_MATADOR_WB (137, "90mm MATADOR-WB"),
+ NAME_90MM_MATADOR_WB (137, "90mm MATADOR-WB"),
/** 90mm MATADOR-AS */
- $90MM_MATADOR_AS (138, "90mm MATADOR-AS"),
+ NAME_90MM_MATADOR_AS (138, "90mm MATADOR-AS"),
/** 78mm MARA Anti-Tank Rocket Launcher */
- $78MM_MARA_ANTI_TANK_ROCKET_LAUNCHER (140, "78mm MARA Anti-Tank Rocket Launcher"),
+ NAME_78MM_MARA_ANTI_TANK_ROCKET_LAUNCHER (140, "78mm MARA Anti-Tank Rocket Launcher"),
/** 120mm Type-98 PF98 */
- $120MM_TYPE_98_PF98 (145, "120mm Type-98 PF98");
+ NAME_120MM_TYPE_98_PF98 (145, "120mm Type-98 PF98");
private int value;
private final String description;
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAssaultRifles.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAssaultRifles.java
index 0e8c393eaf53d9b2bddacdeb605dad0bdc306faa..33ac01b05918bdb8613537f4a6bcac315fde5841 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAssaultRifles.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAssaultRifles.java
@@ -8,132 +8,132 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 474 marshal size 8<br>
- * Life Form-Human-Specific-Assault Rifles
+ * LifeFormHumanSpecificAssaultRifles
*/
public enum LifeFormHumanSpecificAssaultRifles
{
/** Other */
OTHER (0, "Other"),
/** 4.5mm Interdynamics MKR */
- $45MM_INTERDYNAMICS_MKR (1, "4.5mm Interdynamics MKR"),
+ NAME_45MM_INTERDYNAMICS_MKR (1, "4.5mm Interdynamics MKR"),
/** 5.45mm AK-74 */
- $545MM_AK_74 (10, "5.45mm AK-74"),
+ NAME_545MM_AK_74 (10, "5.45mm AK-74"),
/** 5.45mm AKS-74 */
- $545MM_AKS_74 (11, "5.45mm AKS-74"),
+ NAME_545MM_AKS_74 (11, "5.45mm AKS-74"),
/** 5.45mm AK-74M */
- $545MM_AK_74M (12, "5.45mm AK-74M"),
+ NAME_545MM_AK_74M (12, "5.45mm AK-74M"),
/** 5.45mm Kbk wz. 1988 Tantal */
- $545MM_KBK_WZ_1988_TANTAL (13, "5.45mm Kbk wz. 1988 Tantal"),
- /** 5.56mm AK-47 */
- $556MM_AK_47 (30, "5.56mm AK-47"),
+ NAME_545MM_KBK_WZ_1988_TANTAL (13, "5.45mm Kbk wz. 1988 Tantal"),
+ /** 5.56mm AK-101 */
+ NAME_556MM_AK_101 (30, "5.56mm AK-101"),
/** 5.56mm Diemaco C7, Diemaco is now Colt Canada. */
- $556MM_DIEMACO_C7 (31, "5.56mm Diemaco C7"),
+ NAME_556MM_DIEMACO_C7 (31, "5.56mm Diemaco C7"),
/** 5.56mm Colt Canada C8 Carbine */
- $556MM_COLT_CANADA_C8_CARBINE (32, "5.56mm Colt Canada C8 Carbine"),
+ NAME_556MM_COLT_CANADA_C8_CARBINE (32, "5.56mm Colt Canada C8 Carbine"),
/** 5.56mm GIAT FAMAS G2 */
- $556MM_GIAT_FAMAS_G2 (33, "5.56mm GIAT FAMAS G2"),
+ NAME_556MM_GIAT_FAMAS_G2 (33, "5.56mm GIAT FAMAS G2"),
/** 5.56mm FN FNC */
- $556MM_FN_FNC (34, "5.56mm FN FNC"),
+ NAME_556MM_FN_FNC (34, "5.56mm FN FNC"),
/** 5.56mm HK G36 */
- $556MM_HK_G36 (35, "5.56mm HK G36"),
+ NAME_556MM_HK_G36 (35, "5.56mm HK G36"),
/** 5.56mm IMI Galil */
- $556MM_IMI_GALIL (36, "5.56mm IMI Galil"),
+ NAME_556MM_IMI_GALIL (36, "5.56mm IMI Galil"),
/** 5.56mm INSAS */
- $556MM_INSAS (37, "5.56mm INSAS"),
+ NAME_556MM_INSAS (37, "5.56mm INSAS"),
/** 5.56mm Daewoo K1 */
- $556MM_DAEWOO_K1 (38, "5.56mm Daewoo K1"),
+ NAME_556MM_DAEWOO_K1 (38, "5.56mm Daewoo K1"),
/** 5.56mm Daewoo K2 */
- $556MM_DAEWOO_K2 (39, "5.56mm Daewoo K2"),
+ NAME_556MM_DAEWOO_K2 (39, "5.56mm Daewoo K2"),
/** 5.56mm M16A1 */
- $556MM_M16A1 (40, "5.56mm M16A1"),
+ NAME_556MM_M16A1 (40, "5.56mm M16A1"),
/** 5.56mm M16A2/A3/A4 */
- $556MM_M16A2_A3_A4 (41, "5.56mm M16A2/A3/A4"),
+ NAME_556MM_M16A2_A3_A4 (41, "5.56mm M16A2/A3/A4"),
/** 5.56mm Colt M4 */
- $556MM_COLT_M4 (42, "5.56mm Colt M4"),
+ NAME_556MM_COLT_M4 (42, "5.56mm Colt M4"),
/** 5.56mm Colt M4 Special Operations Peculiar Modification (SOPMOD) */
- $556MM_COLT_M4_SPECIAL_OPERATIONS_PECULIAR_MODIFICATION_SOPMOD (43, "5.56mm Colt M4 Special Operations Peculiar Modification (SOPMOD)"),
+ NAME_556MM_COLT_M4_SPECIAL_OPERATIONS_PECULIAR_MODIFICATION_SOPMOD (43, "5.56mm Colt M4 Special Operations Peculiar Modification (SOPMOD)"),
/** 5.56mm Ruger Mini-14 */
- $556MM_RUGER_MINI_14 (44, "5.56mm Ruger Mini-14"),
+ NAME_556MM_RUGER_MINI_14 (44, "5.56mm Ruger Mini-14"),
/** 5.56mm Enfield SA-80A2 */
- $556MM_ENFIELD_SA_80A2 (45, "5.56mm Enfield SA-80A2"),
+ NAME_556MM_ENFIELD_SA_80A2 (45, "5.56mm Enfield SA-80A2"),
/** 5.56mm Pindad SS1 V1 */
- $556MM_PINDAD_SS1_V1 (46, "5.56mm Pindad SS1 V1"),
+ NAME_556MM_PINDAD_SS1_V1 (46, "5.56mm Pindad SS1 V1"),
/** 5.56mm Pindad SS1 V2 */
- $556MM_PINDAD_SS1_V2 (47, "5.56mm Pindad SS1 V2"),
+ NAME_556MM_PINDAD_SS1_V2 (47, "5.56mm Pindad SS1 V2"),
/** 5.56mm Pindad SS1 V3 */
- $556MM_PINDAD_SS1_V3 (48, "5.56mm Pindad SS1 V3"),
+ NAME_556MM_PINDAD_SS1_V3 (48, "5.56mm Pindad SS1 V3"),
/** 5.56mm Steyr AUG A1 */
- $556MM_STEYR_AUG_A1 (49, "5.56mm Steyr AUG A1"),
+ NAME_556MM_STEYR_AUG_A1 (49, "5.56mm Steyr AUG A1"),
/** 5.56mm T65 */
- $556MM_T65 (50, "5.56mm T65"),
+ NAME_556MM_T65 (50, "5.56mm T65"),
/** 5.56mm T91 */
- $556MM_T91 (51, "5.56mm T91"),
+ NAME_556MM_T91 (51, "5.56mm T91"),
/** 5.56mm Tavor TAR-21 */
- $556MM_TAVOR_TAR_21 (52, "5.56mm Tavor TAR-21"),
+ NAME_556MM_TAVOR_TAR_21 (52, "5.56mm Tavor TAR-21"),
/** 5.56mm Type CQ / M311 */
- $556MM_TYPE_CQ_M311 (53, "5.56mm Type CQ / M311"),
+ NAME_556MM_TYPE_CQ_M311 (53, "5.56mm Type CQ / M311"),
/** 5.56mm Daewoo K11 */
- $556MM_DAEWOO_K11 (54, "5.56mm Daewoo K11"),
+ NAME_556MM_DAEWOO_K11 (54, "5.56mm Daewoo K11"),
/** 5.56mm Austeyr F88 */
- $556MM_AUSTEYR_F88 (55, "5.56mm Austeyr F88"),
+ NAME_556MM_AUSTEYR_F88 (55, "5.56mm Austeyr F88"),
/** 5.56mm Austeyr F88-GLA */
- $556MM_AUSTEYR_F88_GLA (56, "5.56mm Austeyr F88-GLA"),
+ NAME_556MM_AUSTEYR_F88_GLA (56, "5.56mm Austeyr F88-GLA"),
/** 5.56mm Austeyr F88-S-A1 */
- $556MM_AUSTEYR_F88_S_A1 (57, "5.56mm Austeyr F88-S-A1"),
+ NAME_556MM_AUSTEYR_F88_S_A1 (57, "5.56mm Austeyr F88-S-A1"),
/** 5.56mm Austeyr F88-S-A2 */
- $556MM_AUSTEYR_F88_S_A2 (58, "5.56mm Austeyr F88-S-A2"),
+ NAME_556MM_AUSTEYR_F88_S_A2 (58, "5.56mm Austeyr F88-S-A2"),
/** 5.56mm Austeyr F88-C */
- $556MM_AUSTEYR_F88_C (59, "5.56mm Austeyr F88-C"),
+ NAME_556MM_AUSTEYR_F88_C (59, "5.56mm Austeyr F88-C"),
/** 5.56mm Austeyr F88-S-A1C */
- $556MM_AUSTEYR_F88_S_A1C (60, "5.56mm Austeyr F88-S-A1C"),
+ NAME_556MM_AUSTEYR_F88_S_A1C (60, "5.56mm Austeyr F88-S-A1C"),
/** 5.56mm Austeyr F88-S-A1 LTR */
- $556MM_AUSTEYR_F88_S_A1_LTR (61, "5.56mm Austeyr F88-S-A1 LTR"),
+ NAME_556MM_AUSTEYR_F88_S_A1_LTR (61, "5.56mm Austeyr F88-S-A1 LTR"),
/** 5.56mm Austeyr EF88 */
- $556MM_AUSTEYR_EF88 (62, "5.56mm Austeyr EF88"),
+ NAME_556MM_AUSTEYR_EF88 (62, "5.56mm Austeyr EF88"),
/** 5.56mm Bushmaster XM15 */
- $556MM_BUSHMASTER_XM15 (63, "5.56mm Bushmaster XM15"),
+ NAME_556MM_BUSHMASTER_XM15 (63, "5.56mm Bushmaster XM15"),
/** 5.56mm HK416 */
- $556MM_HK416 (64, "5.56mm HK416"),
+ NAME_556MM_HK416 (64, "5.56mm HK416"),
/** 5.56mm F90 */
- $556MM_F90 (65, "5.56mm F90"),
+ NAME_556MM_F90 (65, "5.56mm F90"),
/** 5.56mm F90(G) */
- $556MM_F90G (66, "5.56mm F90(G)"),
+ NAME_556MM_F90G (66, "5.56mm F90(G)"),
/** 5.56mm F90M */
- $556MM_F90M (67, "5.56mm F90M"),
+ NAME_556MM_F90M (67, "5.56mm F90M"),
/** 5.56mm F90M(G) */
- $556MM_F90MG (68, "5.56mm F90M(G)"),
+ NAME_556MM_F90MG (68, "5.56mm F90M(G)"),
/** 5.56mm F90CQB */
- $556MM_F90CQB (69, "5.56mm F90CQB"),
+ NAME_556MM_F90CQB (69, "5.56mm F90CQB"),
/** 5.8mm QBZ-95 (Type 95) */
- $58MM_QBZ_95_TYPE_95 (100, "5.8mm QBZ-95 (Type 95)"),
+ NAME_58MM_QBZ_95_TYPE_95 (100, "5.8mm QBZ-95 (Type 95)"),
/** 7.62mm AK-103 */
- $762MM_AK_103 (110, "7.62mm AK-103"),
+ NAME_762MM_AK_103 (110, "7.62mm AK-103"),
/** 7.62mm AK-104 */
- $762MM_AK_104 (111, "7.62mm AK-104"),
+ NAME_762MM_AK_104 (111, "7.62mm AK-104"),
/** 7.62mm AK-47 */
- $762MM_AK_47 (112, "7.62mm AK-47"),
+ NAME_762MM_AK_47 (112, "7.62mm AK-47"),
/** 7.62mm AKM */
- $762MM_AKM (113, "7.62mm AKM"),
+ NAME_762MM_AKM (113, "7.62mm AKM"),
/** 7.62mm AKS-47 */
- $762MM_AKS_47 (114, "7.62mm AKS-47"),
+ NAME_762MM_AKS_47 (114, "7.62mm AKS-47"),
/** 7.62mm HK G3A3 */
- $762MM_HK_G3A3 (115, "7.62mm HK G3A3"),
+ NAME_762MM_HK_G3A3 (115, "7.62mm HK G3A3"),
/** 7.62mm IMI Galil */
- $762MM_IMI_GALIL (116, "7.62mm IMI Galil"),
+ NAME_762MM_IMI_GALIL (116, "7.62mm IMI Galil"),
/** 7.62mm KLS */
- $762MM_KLS (117, "7.62mm KLS"),
+ NAME_762MM_KLS (117, "7.62mm KLS"),
/** 7.62mm SKS */
- $762MM_SKS (118, "7.62mm SKS"),
+ NAME_762MM_SKS (118, "7.62mm SKS"),
/** 7.62mm Type 56 */
- $762MM_TYPE_56 (119, "7.62mm Type 56"),
+ NAME_762MM_TYPE_56 (119, "7.62mm Type 56"),
/** 7.62mm Type 63/68 */
- $762MM_TYPE_63_68 (120, "7.62mm Type 63/68"),
+ NAME_762MM_TYPE_63_68 (120, "7.62mm Type 63/68"),
/** 7.62mm Type 81 */
- $762MM_TYPE_81 (121, "7.62mm Type 81"),
+ NAME_762MM_TYPE_81 (121, "7.62mm Type 81"),
/** 8mm Lebel M16 */
- $8MM_LEBEL_M16 (240, "8mm Lebel M16");
+ NAME_8MM_LEBEL_M16 (240, "8mm Lebel M16");
private int value;
private final String description;
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificDroneGuns.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificDroneGuns.java
index 4e1bf2190b7d2871ff5f7c4501b8aad28381db92..a59514d500581a0f3ef81abf628ef6aca06d2f48 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificDroneGuns.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificDroneGuns.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 524 marshal size 8<br>
- * Life Form-Human-Specific-Drone Guns
+ * LifeFormHumanSpecificDroneGuns
*/
public enum LifeFormHumanSpecificDroneGuns
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificEquipmentClass.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificEquipmentClass.java
index 10d931258f0989a473064eb5521a21c65cef7768..5dd1b4b4e13429ad4434e98d1edb77e654b5c955 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificEquipmentClass.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificEquipmentClass.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 505 marshal size 8<br>
- * Life Form-Human-Specific-Equipment Class
+ * LifeFormHumanSpecificEquipmentClass
*/
public enum LifeFormHumanSpecificEquipmentClass
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificFlameRockets.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificFlameRockets.java
index af01b3cd7367721131bacc6b98489d2ca0985706..766f304e0da3f313661c9c01c0a613ea6f265611 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificFlameRockets.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificFlameRockets.java
@@ -8,26 +8,26 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 522 marshal size 8<br>
- * Life Form-Human-Specific-Flame Rockets
+ * LifeFormHumanSpecificFlameRockets
*/
public enum LifeFormHumanSpecificFlameRockets
{
/** Other */
OTHER (0, "Other"),
/** 66mm M202 Flash */
- $66MM_M202_FLASH (20, "66mm M202 Flash"),
+ NAME_66MM_M202_FLASH (20, "66mm M202 Flash"),
/** 62mm FHJ-84 */
- $62MM_FHJ_84 (30, "62mm FHJ-84"),
+ NAME_62MM_FHJ_84 (30, "62mm FHJ-84"),
/** 90mm C90-CR-FIM (M3) */
- $90MM_C90_CR_FIM_M3 (40, "90mm C90-CR-FIM (M3)"),
+ NAME_90MM_C90_CR_FIM_M3 (40, "90mm C90-CR-FIM (M3)"),
/** 93mm RPO-A Shmel */
- $93MM_RPO_A_SHMEL (50, "93mm RPO-A Shmel"),
+ NAME_93MM_RPO_A_SHMEL (50, "93mm RPO-A Shmel"),
/** 93mm RPO-Z Shmel */
- $93MM_RPO_Z_SHMEL (51, "93mm RPO-Z Shmel"),
+ NAME_93MM_RPO_Z_SHMEL (51, "93mm RPO-Z Shmel"),
/** 93mm RPO-D Shmel */
- $93MM_RPO_D_SHMEL (52, "93mm RPO-D Shmel");
+ NAME_93MM_RPO_D_SHMEL (52, "93mm RPO-D Shmel");
private int value;
private final String description;
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificFlameThrowers.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificFlameThrowers.java
index 195fd3ffc4782fbf9f1c017a8052b226e07b73e1..866585074b27cce0ffe193efa9d4b41328a41e93 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificFlameThrowers.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificFlameThrowers.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 523 marshal size 8<br>
- * Life Form-Human-Specific-Flame Throwers
+ * LifeFormHumanSpecificFlameThrowers
*/
public enum LifeFormHumanSpecificFlameThrowers
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificGrenadeLaunchers.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificGrenadeLaunchers.java
index 4c2eec2dac3460b609baa9f89c9999cc98c5d266..c0eacf0e020f651ce41098d1800c7ad806a7137e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificGrenadeLaunchers.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificGrenadeLaunchers.java
@@ -8,94 +8,94 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 515 marshal size 8<br>
- * Life Form-Human-Specific-Grenade Launchers
+ * LifeFormHumanSpecificGrenadeLaunchers
*/
public enum LifeFormHumanSpecificGrenadeLaunchers
{
/** Other */
OTHER (0, "Other"),
/** 40x46mm Arsenal UGGL-M1 */
- $40X46MM_ARSENAL_UGGL_M1 (1, "40x46mm Arsenal UGGL-M1"),
+ NAME_40X46MM_ARSENAL_UGGL_M1 (1, "40x46mm Arsenal UGGL-M1"),
/** 40x46mm Arsenal MSGL */
- $40X46MM_ARSENAL_MSGL (2, "40x46mm Arsenal MSGL"),
+ NAME_40X46MM_ARSENAL_MSGL (2, "40x46mm Arsenal MSGL"),
/** 40mm VOG Arsenal MSGL */
- $40MM_VOG_ARSENAL_MSGL (3, "40mm VOG Arsenal MSGL"),
+ NAME_40MM_VOG_ARSENAL_MSGL (3, "40mm VOG Arsenal MSGL"),
/** 40x46mm Arsenal UBGL-M16 */
- $40X46MM_ARSENAL_UBGL_M16 (4, "40x46mm Arsenal UBGL-M16"),
+ NAME_40X46MM_ARSENAL_UBGL_M16 (4, "40x46mm Arsenal UBGL-M16"),
/** 40x46mm Arsenal UBGL-M8 */
- $40X46MM_ARSENAL_UBGL_M8 (5, "40x46mm Arsenal UBGL-M8"),
+ NAME_40X46MM_ARSENAL_UBGL_M8 (5, "40x46mm Arsenal UBGL-M8"),
/** 40x46mm Arsenal UBGL-M7 */
- $40X46MM_ARSENAL_UBGL_M7 (6, "40x46mm Arsenal UBGL-M7"),
+ NAME_40X46MM_ARSENAL_UBGL_M7 (6, "40x46mm Arsenal UBGL-M7"),
/** 30mm BS-1 Tishina */
- $30MM_BS_1_TISHINA (10, "30mm BS-1 Tishina"),
+ NAME_30MM_BS_1_TISHINA (10, "30mm BS-1 Tishina"),
/** 40mm BTS-203 */
- $40MM_BTS_203 (11, "40mm BTS-203"),
+ NAME_40MM_BTS_203 (11, "40mm BTS-203"),
/** 40mm Indumil IMC-40 */
- $40MM_INDUMIL_IMC_40 (12, "40mm Indumil IMC-40"),
+ NAME_40MM_INDUMIL_IMC_40 (12, "40mm Indumil IMC-40"),
/** 40mm VOG BG-15 */
- $40MM_VOG_BG_15 (20, "40mm VOG BG-15"),
+ NAME_40MM_VOG_BG_15 (20, "40mm VOG BG-15"),
/** 40mm VOG GP-25 Kostoyor */
- $40MM_VOG_GP_25_KOSTOYOR (21, "40mm VOG GP-25 Kostoyor"),
+ NAME_40MM_VOG_GP_25_KOSTOYOR (21, "40mm VOG GP-25 Kostoyor"),
/** 40mm VOG GP-30 Obuvka */
- $40MM_VOG_GP_30_OBUVKA (22, "40mm VOG GP-30 Obuvka"),
+ NAME_40MM_VOG_GP_30_OBUVKA (22, "40mm VOG GP-30 Obuvka"),
/** 40mm VOG GP-34 */
- $40MM_VOG_GP_34 (23, "40mm VOG GP-34"),
+ NAME_40MM_VOG_GP_34 (23, "40mm VOG GP-34"),
/** 40mm VOG RGM-40 Kastet */
- $40MM_VOG_RGM_40_KASTET (24, "40mm VOG RGM-40 Kastet"),
+ NAME_40MM_VOG_RGM_40_KASTET (24, "40mm VOG RGM-40 Kastet"),
/** 40mm VOG RG-6 */
- $40MM_VOG_RG_6 (25, "40mm VOG RG-6"),
+ NAME_40MM_VOG_RG_6 (25, "40mm VOG RG-6"),
/** 40x46mm M79 */
- $40X46MM_M79 (30, "40x46mm M79"),
+ NAME_40X46MM_M79 (30, "40x46mm M79"),
/** 40x46mm M203 */
- $40X46MM_M203 (31, "40x46mm M203"),
+ NAME_40X46MM_M203 (31, "40x46mm M203"),
/** 40x36mm M320 */
- $40X36MM_M320 (32, "40x36mm M320"),
+ NAME_40X36MM_M320 (32, "40x36mm M320"),
/** 40x46mm CIS 40 GL */
- $40X46MM_CIS_40_GL (35, "40x46mm CIS 40 GL"),
+ NAME_40X46MM_CIS_40_GL (35, "40x46mm CIS 40 GL"),
/** 40x46mm EAGLE GL */
- $40X46MM_EAGLE_GL (36, "40x46mm EAGLE GL"),
+ NAME_40X46MM_EAGLE_GL (36, "40x46mm EAGLE GL"),
/** 40x46mm HK AG36 */
- $40X46MM_HK_AG36 (37, "40x46mm HK AG36"),
+ NAME_40X46MM_HK_AG36 (37, "40x46mm HK AG36"),
/** 40x46mm HK AG-C/GLM */
- $40X46MM_HK_AG_C_GLM (38, "40x46mm HK AG-C/GLM"),
+ NAME_40X46MM_HK_AG_C_GLM (38, "40x46mm HK AG-C/GLM"),
/** 40x46mm HK69A1 */
- $40X46MM_HK69A1 (39, "40x46mm HK69A1"),
+ NAME_40X46MM_HK69A1 (39, "40x46mm HK69A1"),
/** 40x46mm Beretta GLX 160 */
- $40X46MM_BERETTA_GLX_160 (40, "40x46mm Beretta GLX 160"),
+ NAME_40X46MM_BERETTA_GLX_160 (40, "40x46mm Beretta GLX 160"),
/** 40x46mm ARDE UBGL */
- $40X46MM_ARDE_UBGL (41, "40x46mm ARDE UBGL"),
+ NAME_40X46MM_ARDE_UBGL (41, "40x46mm ARDE UBGL"),
/** 40x46mm XML148 */
- $40X46MM_XML148 (42, "40x46mm XML148"),
+ NAME_40X46MM_XML148 (42, "40x46mm XML148"),
/** 40x46mm China Lake GL */
- $40X46MM_CHINA_LAKE_GL (43, "40x46mm China Lake GL"),
+ NAME_40X46MM_CHINA_LAKE_GL (43, "40x46mm China Lake GL"),
/** 40x46mm Hawk MM-1 */
- $40X46MM_HAWK_MM_1 (44, "40x46mm Hawk MM-1"),
+ NAME_40X46MM_HAWK_MM_1 (44, "40x46mm Hawk MM-1"),
/** 25x40mm XM25 CDTE */
- $25X40MM_XM25_CDTE (50, "25x40mm XM25 CDTE"),
+ NAME_25X40MM_XM25_CDTE (50, "25x40mm XM25 CDTE"),
/** 37mm Milkor37/38 LL Stopper */
- $37MM_MILKOR37_38_LL_STOPPER (60, "37mm Milkor37/38 LL Stopper"),
+ NAME_37MM_MILKOR37_38_LL_STOPPER (60, "37mm Milkor37/38 LL Stopper"),
/** 40mm Milkor40 GL */
- $40MM_MILKOR40_GL (61, "40mm Milkor40 GL"),
+ NAME_40MM_MILKOR40_GL (61, "40mm Milkor40 GL"),
/** 40mm Milkor MGL */
- $40MM_MILKOR_MGL (62, "40mm Milkor MGL"),
+ NAME_40MM_MILKOR_MGL (62, "40mm Milkor MGL"),
/** 40x47mm Pallad wz1974 */
- $40X47MM_PALLAD_WZ1974 (65, "40x47mm Pallad wz1974"),
+ NAME_40X47MM_PALLAD_WZ1974 (65, "40x47mm Pallad wz1974"),
/** 40x47mm Pallad wz1983 */
- $40X47MM_PALLAD_WZ1983 (66, "40x47mm Pallad wz1983"),
+ NAME_40X47MM_PALLAD_WZ1983 (66, "40x47mm Pallad wz1983"),
/** UGL 200 Canister RWGL-3 */
UGL_200_CANISTER_RWGL_3 (70, "UGL 200 Canister RWGL-3"),
/** 20x30mm ST Daewoo K11 */
- $20X30MM_ST_DAEWOO_K11 (80, "20x30mm ST Daewoo K11"),
+ NAME_20X30MM_ST_DAEWOO_K11 (80, "20x30mm ST Daewoo K11"),
/** 35mm Type-91 BreechLoad GL */
- $35MM_TYPE_91_BREECHLOAD_GL (90, "35mm Type-91 BreechLoad GL"),
+ NAME_35MM_TYPE_91_BREECHLOAD_GL (90, "35mm Type-91 BreechLoad GL"),
/** 40x53mm CZW-40 */
- $40X53MM_CZW_40 (95, "40x53mm CZW-40"),
+ NAME_40X53MM_CZW_40 (95, "40x53mm CZW-40"),
/** 45mm DP-64 */
- $45MM_DP_64 (100, "45mm DP-64"),
+ NAME_45MM_DP_64 (100, "45mm DP-64"),
/** 20x42mm Neopup PAW-20 */
- $20X42MM_NEOPUP_PAW_20 (105, "20x42mm Neopup PAW-20");
+ NAME_20X42MM_NEOPUP_PAW_20 (105, "20x42mm Neopup PAW-20");
private int value;
private final String description;
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificGrenadeLaunchingMachineGun.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificGrenadeLaunchingMachineGun.java
index 00cd5e31f621fe175dd4a012fd6a6548e6ec2aa3..405cd3dc0882cc2506340ab33769a3ac83ee8bd6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificGrenadeLaunchingMachineGun.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificGrenadeLaunchingMachineGun.java
@@ -8,52 +8,52 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 517 marshal size 8<br>
- * Life Form-Human-Specific-Grenade Launching Machine Gun
+ * LifeFormHumanSpecificGrenadeLaunchingMachineGun
*/
public enum LifeFormHumanSpecificGrenadeLaunchingMachineGun
{
/** Other */
OTHER (0, "Other"),
/** 40x53mm HK GMG */
- $40X53MM_HK_GMG (20, "40x53mm HK GMG"),
+ NAME_40X53MM_HK_GMG (20, "40x53mm HK GMG"),
/** 40x53mm Mk47 Striker */
- $40X53MM_MK47_STRIKER (25, "40x53mm Mk47 Striker"),
+ NAME_40X53MM_MK47_STRIKER (25, "40x53mm Mk47 Striker"),
/** 40mm M75 */
- $40MM_M75 (26, "40mm M75"),
+ NAME_40MM_M75 (26, "40mm M75"),
/** 40mm M129 */
- $40MM_M129 (27, "40mm M129"),
+ NAME_40MM_M129 (27, "40mm M129"),
/** 40x46mm XM 174 */
- $40X46MM_XM_174 (28, "40x46mm XM 174"),
+ NAME_40X46MM_XM_174 (28, "40x46mm XM 174"),
/** 40x46mm Mk18 Mod 0 */
- $40X46MM_MK18_MOD_0 (29, "40x46mm Mk18 Mod 0"),
+ NAME_40X46MM_MK18_MOD_0 (29, "40x46mm Mk18 Mod 0"),
/** 40x53mm Mk19 */
- $40X53MM_MK19 (30, "40x53mm Mk19"),
+ NAME_40X53MM_MK19 (30, "40x53mm Mk19"),
/** 40x46mm Mk20 Mod 0 */
- $40X46MM_MK20_MOD_0 (31, "40x46mm Mk20 Mod 0"),
+ NAME_40X46MM_MK20_MOD_0 (31, "40x46mm Mk20 Mod 0"),
/** 30x29mm RAG-30/SAG-30 */
- $30X29MM_RAG_30_SAG_30 (40, "30x29mm RAG-30/SAG-30"),
+ NAME_30X29MM_RAG_30_SAG_30 (40, "30x29mm RAG-30/SAG-30"),
/** 30x29mm AGS-17 Plamya */
- $30X29MM_AGS_17_PLAMYA (41, "30x29mm AGS-17 Plamya"),
+ NAME_30X29MM_AGS_17_PLAMYA (41, "30x29mm AGS-17 Plamya"),
/** 30x29mm AGS-30 Atlant */
- $30X29MM_AGS_30_ATLANT (42, "30x29mm AGS-30 Atlant"),
+ NAME_30X29MM_AGS_30_ATLANT (42, "30x29mm AGS-30 Atlant"),
/** 40mm VOG AGS-40 Balkan */
- $40MM_VOG_AGS_40_BALKAN (43, "40mm VOG AGS-40 Balkan"),
+ NAME_40MM_VOG_AGS_40_BALKAN (43, "40mm VOG AGS-40 Balkan"),
/** 40x53mm SB LAG 40 */
- $40X53MM_SB_LAG_40 (44, "40x53mm SB LAG 40"),
+ NAME_40X53MM_SB_LAG_40 (44, "40x53mm SB LAG 40"),
/** 40x53mm Vektor Y3 */
- $40X53MM_VEKTOR_Y3 (50, "40x53mm Vektor Y3"),
+ NAME_40X53MM_VEKTOR_Y3 (50, "40x53mm Vektor Y3"),
/** 40x53mm CIS 40 */
- $40X53MM_CIS_40 (55, "40x53mm CIS 40"),
+ NAME_40X53MM_CIS_40 (55, "40x53mm CIS 40"),
/** 40x56mm Howa Type-96 */
- $40X56MM_HOWA_TYPE_96 (60, "40x56mm Howa Type-96"),
+ NAME_40X56MM_HOWA_TYPE_96 (60, "40x56mm Howa Type-96"),
/** 40x53mm Daewoo Precision Industries K4 */
- $40X53MM_DAEWOO_PRECISION_INDUSTRIES_K4 (65, "40x53mm Daewoo Precision Industries K4"),
+ NAME_40X53MM_DAEWOO_PRECISION_INDUSTRIES_K4 (65, "40x53mm Daewoo Precision Industries K4"),
/** 25x59mm XM307 Advanced Crew Served Weapon */
- $25X59MM_XM307_ADVANCED_CREW_SERVED_WEAPON (70, "25x59mm XM307 Advanced Crew Served Weapon"),
+ NAME_25X59MM_XM307_ADVANCED_CREW_SERVED_WEAPON (70, "25x59mm XM307 Advanced Crew Served Weapon"),
/** 35x32mm QLZ87 */
- $35X32MM_QLZ87 (80, "35x32mm QLZ87");
+ NAME_35X32MM_QLZ87 (80, "35x32mm QLZ87");
private int value;
private final String description;
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificHandGuns.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificHandGuns.java
index 16506c150ce71c43c4b111189d993fdb5d5e589b..57f025c9c172603ea387db67dc290c027191fa50 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificHandGuns.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificHandGuns.java
@@ -8,22 +8,42 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 513 marshal size 8<br>
- * Life Form-Human-Specific-Hand Guns
+ * LifeFormHumanSpecificHandGuns
*/
public enum LifeFormHumanSpecificHandGuns
{
/** Other */
OTHER (0, "Other"),
+ /** 5.45mm PSM */
+ NAME_545MM_PSM (1, "5.45mm PSM"),
/** 9mm MK3 SLP */
- $9MM_MK3_SLP (30, "9mm MK3 SLP"),
- /** 9mm Beretta 92S */
- $9MM_BERETTA_92S (31, "9mm Beretta 92S"),
+ NAME_9MM_MK3_SLP (30, "9mm MK3 SLP"),
+ /** 9mm Beretta 92S/92FS (M9) */
+ NAME_9MM_BERETTA_92S_92FS_M9 (31, "9mm Beretta 92S/92FS (M9)"),
/** 9mm HandK USP */
- $9MM_HK_USP (32, "9mm H&K USP"),
+ NAME_9MM_HK_USP (32, "9mm H&K USP"),
+ /** 9mm Stechkin APS */
+ NAME_9MM_STECHKIN_APS (33, "9mm Stechkin APS"),
+ /** 9mm Makarov PM */
+ NAME_9MM_MAKAROV_PM (34, "9mm Makarov PM"),
+ /** 9mm Smith and Wesson SD (Sigma) */
+ NAME_9MM_SMITH_AND_WESSON_SD_SIGMA (35, "9mm Smith and Wesson SD (Sigma)"),
+ /** 9mm Glock 17 */
+ NAME_9MM_GLOCK_17 (36, "9mm Glock 17"),
+ /** 9mm SIG Pro */
+ NAME_9MM_SIG_PRO (38, "9mm SIG Pro"),
+ /** 9mm Smith and Wesson SW1911 */
+ NAME_9MM_SMITH_AND_WESSON_SW1911 (39, "9mm Smith and Wesson SW1911"),
+ /** 9mm Smith and Wesson 5900-series */
+ NAME_9MM_SMITH_AND_WESSON_5900_SERIES (40, "9mm Smith and Wesson 5900-series"),
+ /** .45 Cal M1911 */
+ NAME_45_CAL_M1911 (41, ".45 Cal M1911"),
/** 9.07mm Ruger GP 100 */
- $907MM_RUGER_GP_100 (50, "9.07mm Ruger GP 100");
+ NAME_907MM_RUGER_GP_100 (50, "9.07mm Ruger GP 100"),
+ /** 10mm Glock 20 */
+ NAME_10MM_GLOCK_20 (60, "10mm Glock 20");
private int value;
private final String description;
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificHighPowerRifles.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificHighPowerRifles.java
index 7cedbee5eee020d50dfde7485f5795ae8a8af54c..6a0c432705f488307ea77f0b64a99288173170ff 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificHighPowerRifles.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificHighPowerRifles.java
@@ -8,32 +8,32 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 475 marshal size 8<br>
- * Life Form-Human-Specific-High Power Rifles
+ * LifeFormHumanSpecificHighPowerRifles
*/
public enum LifeFormHumanSpecificHighPowerRifles
{
/** Other */
OTHER (0, "Other"),
/** 7.62mm M14 */
- $762MM_M14 (10, "7.62mm M14"),
+ NAME_762MM_M14 (10, "7.62mm M14"),
/** 7.62mm Remington 700 */
- $762MM_REMINGTON_700 (11, "7.62mm Remington 700"),
+ NAME_762MM_REMINGTON_700 (11, "7.62mm Remington 700"),
/** 7.62mm SIG-Sauer SSG-2000 */
- $762MM_SIG_SAUER_SSG_2000 (12, "7.62mm SIG-Sauer SSG-2000"),
+ NAME_762MM_SIG_SAUER_SSG_2000 (12, "7.62mm SIG-Sauer SSG-2000"),
/** 7.62mm Stoner SR-25 */
- $762MM_STONER_SR_25 (13, "7.62mm Stoner SR-25"),
+ NAME_762MM_STONER_SR_25 (13, "7.62mm Stoner SR-25"),
/** 7.62mm Mosin-Nagant Model 1891/30 */
- $762MM_MOSIN_NAGANT_MODEL_1891_30 (14, "7.62mm Mosin-Nagant Model 1891/30"),
+ NAME_762MM_MOSIN_NAGANT_MODEL_1891_30 (14, "7.62mm Mosin-Nagant Model 1891/30"),
/** 7.62mm HK417 */
- $762MM_HK417 (15, "7.62mm HK417"),
- /** 7.62mm HK417 16" Recce */
- $762MM_HK417_16_RECCE (16, "7.62mm HK417 16' Recce"),
+ NAME_762MM_HK417 (15, "7.62mm HK417"),
+ /** 7.62mm HK417 16 Recce */
+ NAME_762MM_HK417_16_RECCE (16, "7.62mm HK417 16 Recce"),
/** 7.65mm BAR M1918 */
- $765MM_BAR_M1918 (50, "7.65mm BAR M1918"),
+ NAME_765MM_BAR_M1918 (50, "7.65mm BAR M1918"),
/** 7.65mm M1 Garand */
- $765MM_M1_GARAND (51, "7.65mm M1 Garand");
+ NAME_765MM_M1_GARAND (51, "7.65mm M1 Garand");
private int value;
private final String description;
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificLasersClass.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificLasersClass.java
new file mode 100644
index 0000000000000000000000000000000000000000..6b4d05adca6ac328a5c533610ab0715759750085
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificLasersClass.java
@@ -0,0 +1,102 @@
+package edu.nps.moves.dis7.enumerations;
+
+import java.nio.ByteBuffer;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+import edu.nps.moves.dis7.*;
+
+/**
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
+ * UID 527 marshal size 8<br>
+ * LifeFormHumanSpecificLasersClass
+ */
+public enum LifeFormHumanSpecificLasersClass
+{
+ /** Generic Laser Designator */
+ GENERIC_LASER_DESIGNATOR (1, "Generic Laser Designator"),
+ /** Generic Laser Pointer */
+ GENERIC_LASER_POINTER (2, "Generic Laser Pointer");
+
+ private int value;
+ private final String description;
+
+ LifeFormHumanSpecificLasersClass(int value, String description)
+ {
+ this.value = value;
+ this.description = description;
+ }
+
+ public int getValue()
+ {
+ return value;
+ }
+
+ public String getDescription()
+ {
+ return description;
+ }
+
+ public static int getEnumBitWidth()
+ {
+ return 8;
+ }
+
+ public static LifeFormHumanSpecificLasersClass getEnumForValue(int i)
+ {
+ for(LifeFormHumanSpecificLasersClass val: LifeFormHumanSpecificLasersClass.values()) {
+ if(val.getValue()==i)
+ return val;
+ }
+ System.err.println("No enumeration found for value " + i + " of enumeration LifeFormHumanSpecificLasersClass");
+ return null;
+ }
+
+
+ public void marshal(DataOutputStream dos) throws IOException
+ {
+ dos.writeByte(getValue());
+ }
+
+ public void marshal(ByteBuffer buff) throws Exception
+ {
+ buff.put((byte)getValue());
+ }
+
+ public static LifeFormHumanSpecificLasersClass unmarshalEnum (DataInputStream dis) throws Exception
+ {
+ /* try {
+ value = dis.readUnsignedByte();
+ }
+ catch(IOException ex) {
+ showError(ex);
+ } */
+
+ return getEnumForValue(dis.readByte());
+ }
+
+ public static LifeFormHumanSpecificLasersClass unmarshalEnum(ByteBuffer buff) throws Exception
+ {
+ /*
+ try {
+ value = (int)buff.get();
+ }
+ catch(Exception ex) {
+ showError(ex);
+ }
+ */
+ return getEnumForValue(buff.get());
+ }
+
+ public int getMarshalledSize()
+ {
+ return 1; // 8 bits
+ }
+
+ @Override
+ public String toString()
+ {
+ return "LifeFormHumanSpecificLasersClass: " + name() + ": " + getValue();
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificLogisticsEQClass.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificLogisticsEQClass.java
new file mode 100644
index 0000000000000000000000000000000000000000..0d5ff23052111b18a0061f635d0c20312b85651a
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificLogisticsEQClass.java
@@ -0,0 +1,100 @@
+package edu.nps.moves.dis7.enumerations;
+
+import java.nio.ByteBuffer;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+import edu.nps.moves.dis7.*;
+
+/**
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
+ * UID 525 marshal size 8<br>
+ * LifeFormHumanSpecificLogisticsEQClass
+ */
+public enum LifeFormHumanSpecificLogisticsEQClass
+{
+ /** Sling Load Pendant */
+ SLING_LOAD_PENDANT (1, "Sling Load Pendant");
+
+ private int value;
+ private final String description;
+
+ LifeFormHumanSpecificLogisticsEQClass(int value, String description)
+ {
+ this.value = value;
+ this.description = description;
+ }
+
+ public int getValue()
+ {
+ return value;
+ }
+
+ public String getDescription()
+ {
+ return description;
+ }
+
+ public static int getEnumBitWidth()
+ {
+ return 8;
+ }
+
+ public static LifeFormHumanSpecificLogisticsEQClass getEnumForValue(int i)
+ {
+ for(LifeFormHumanSpecificLogisticsEQClass val: LifeFormHumanSpecificLogisticsEQClass.values()) {
+ if(val.getValue()==i)
+ return val;
+ }
+ System.err.println("No enumeration found for value " + i + " of enumeration LifeFormHumanSpecificLogisticsEQClass");
+ return null;
+ }
+
+
+ public void marshal(DataOutputStream dos) throws IOException
+ {
+ dos.writeByte(getValue());
+ }
+
+ public void marshal(ByteBuffer buff) throws Exception
+ {
+ buff.put((byte)getValue());
+ }
+
+ public static LifeFormHumanSpecificLogisticsEQClass unmarshalEnum (DataInputStream dis) throws Exception
+ {
+ /* try {
+ value = dis.readUnsignedByte();
+ }
+ catch(IOException ex) {
+ showError(ex);
+ } */
+
+ return getEnumForValue(dis.readByte());
+ }
+
+ public static LifeFormHumanSpecificLogisticsEQClass unmarshalEnum(ByteBuffer buff) throws Exception
+ {
+ /*
+ try {
+ value = (int)buff.get();
+ }
+ catch(Exception ex) {
+ showError(ex);
+ }
+ */
+ return getEnumForValue(buff.get());
+ }
+
+ public int getMarshalledSize()
+ {
+ return 1; // 8 bits
+ }
+
+ @Override
+ public String toString()
+ {
+ return "LifeFormHumanSpecificLogisticsEQClass: " + name() + ": " + getValue();
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificMachineGuns.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificMachineGuns.java
index a5042cbdff89fc07b0b02f374a40c5bac15c0ee1..0e84d3de1079779bb64619ee03a404601d0c1844 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificMachineGuns.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificMachineGuns.java
@@ -8,186 +8,186 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 516 marshal size 8<br>
- * Life Form-Human-Specific-Machine Guns
+ * LifeFormHumanSpecificMachineGuns
*/
public enum LifeFormHumanSpecificMachineGuns
{
/** Other */
OTHER (0, "Other"),
/** 5.56x45mm XM214 Microgun Six-Pak */
- $556X45MM_XM214_MICROGUN_SIX_PAK (10, "5.56x45mm XM214 Microgun Six-Pak"),
+ NAME_556X45MM_XM214_MICROGUN_SIX_PAK (10, "5.56x45mm XM214 Microgun Six-Pak"),
/** 7.62x51mm M134/XM196 Minigun */
- $762X51MM_M134_XM196_MINIGUN (11, "7.62x51mm M134/XM196 Minigun"),
+ NAME_762X51MM_M134_XM196_MINIGUN (11, "7.62x51mm M134/XM196 Minigun"),
/** 5.56x45mm M249/FN Minimi SAW/LMG */
- $556X45MM_M249_FN_MINIMI_SAW_LMG (20, "5.56x45mm M249/FN Minimi SAW/LMG"),
+ NAME_556X45MM_M249_FN_MINIMI_SAW_LMG (20, "5.56x45mm M249/FN Minimi SAW/LMG"),
/** 5.56x45mm FN Minimi Mk3 LMG */
- $556X45MM_FN_MINIMI_MK3_LMG (21, "5.56x45mm FN Minimi Mk3 LMG"),
+ NAME_556X45MM_FN_MINIMI_MK3_LMG (21, "5.56x45mm FN Minimi Mk3 LMG"),
/** 7.62x51mm FN Minimi 7.62 Mk3 GPMG */
- $762X51MM_FN_MINIMI_762_MK3_GPMG (22, "7.62x51mm FN Minimi 7.62 Mk3 GPMG"),
+ NAME_762X51MM_FN_MINIMI_762_MK3_GPMG (22, "7.62x51mm FN Minimi 7.62 Mk3 GPMG"),
/** 7.62x63mm M1941 Johnson */
- $762X63MM_M1941_JOHNSON (25, "7.62x63mm M1941 Johnson"),
+ NAME_762X63MM_M1941_JOHNSON (25, "7.62x63mm M1941 Johnson"),
/** 7.62x63mm M1918 BAR */
- $762X63MM_M1918_BAR (26, "7.62x63mm M1918 BAR"),
+ NAME_762X63MM_M1918_BAR (26, "7.62x63mm M1918 BAR"),
/** 7.62x51mm M1919A4/Mk 21 Mod 0 Browning MMG */
- $762X51MM_M1919A4_MK_21_MOD_0_BROWNING_MMG (27, "7.62x51mm M1919A4/Mk 21 Mod 0 Browning MMG"),
+ NAME_762X51MM_M1919A4_MK_21_MOD_0_BROWNING_MMG (27, "7.62x51mm M1919A4/Mk 21 Mod 0 Browning MMG"),
/** 7.62x63mm M1919A6 Browning MMG */
- $762X63MM_M1919A6_BROWNING_MMG (28, "7.62x63mm M1919A6 Browning MMG"),
+ NAME_762X63MM_M1919A6_BROWNING_MMG (28, "7.62x63mm M1919A6 Browning MMG"),
/** 7.62x51mm M37 Browning MMG */
- $762X51MM_M37_BROWNING_MMG (29, "7.62x51mm M37 Browning MMG"),
+ NAME_762X51MM_M37_BROWNING_MMG (29, "7.62x51mm M37 Browning MMG"),
/** 5.56x45mm Ares Shrike 5.56 LMG */
- $556X45MM_ARES_SHRIKE_556_LMG (30, "5.56x45mm Ares Shrike 5.56 LMG"),
+ NAME_556X45MM_ARES_SHRIKE_556_LMG (30, "5.56x45mm Ares Shrike 5.56 LMG"),
/** 5.56x45mm LSAT LMG */
- $556X45MM_LSAT_LMG (31, "5.56x45mm LSAT LMG"),
+ NAME_556X45MM_LSAT_LMG (31, "5.56x45mm LSAT LMG"),
/** 5.56x45mm CMG-1 LMG */
- $556X45MM_CMG_1_LMG (32, "5.56x45mm CMG-1 LMG"),
+ NAME_556X45MM_CMG_1_LMG (32, "5.56x45mm CMG-1 LMG"),
/** 5.56x45mm CMG-2 LMG */
- $556X45MM_CMG_2_LMG (33, "5.56x45mm CMG-2 LMG"),
+ NAME_556X45MM_CMG_2_LMG (33, "5.56x45mm CMG-2 LMG"),
/** 5.56x45mm Stoner 63A LMG */
- $556X45MM_STONER_63A_LMG (34, "5.56x45mm Stoner 63A LMG"),
+ NAME_556X45MM_STONER_63A_LMG (34, "5.56x45mm Stoner 63A LMG"),
/** 5.56x45mm Ultimax 100 LMG */
- $556X45MM_ULTIMAX_100_LMG (35, "5.56x45mm Ultimax 100 LMG"),
+ NAME_556X45MM_ULTIMAX_100_LMG (35, "5.56x45mm Ultimax 100 LMG"),
/** 5.56x54mm Beretta AS70/90 LMG */
- $556X54MM_BERETTA_AS70_90_LMG (36, "5.56x54mm Beretta AS70/90 LMG"),
+ NAME_556X54MM_BERETTA_AS70_90_LMG (36, "5.56x54mm Beretta AS70/90 LMG"),
/** 5.56x45mm CETME Ameli LMG */
- $556X45MM_CETME_AMELI_LMG (37, "5.56x45mm CETME Ameli LMG"),
+ NAME_556X45MM_CETME_AMELI_LMG (37, "5.56x45mm CETME Ameli LMG"),
/** 5.56x45mm IMI Negev LMG */
- $556X45MM_IMI_NEGEV_LMG (38, "5.56x45mm IMI Negev LMG"),
+ NAME_556X45MM_IMI_NEGEV_LMG (38, "5.56x45mm IMI Negev LMG"),
/** 5.56x45mm INSAS LMG */
- $556X45MM_INSAS_LMG (39, "5.56x45mm INSAS LMG"),
+ NAME_556X45MM_INSAS_LMG (39, "5.56x45mm INSAS LMG"),
/** 5.56x45mm AUG LMG */
- $556X45MM_AUG_LMG (40, "5.56x45mm AUG LMG"),
+ NAME_556X45MM_AUG_LMG (40, "5.56x45mm AUG LMG"),
/** 5.56x45mm AUG HBAR LMG */
- $556X45MM_AUG_HBAR_LMG (41, "5.56x45mm AUG HBAR LMG"),
+ NAME_556X45MM_AUG_HBAR_LMG (41, "5.56x45mm AUG HBAR LMG"),
/** 5.56x45mm HK MG4 LMG */
- $556X45MM_HK_MG4_LMG (43, "5.56x45mm HK MG4 LMG"),
+ NAME_556X45MM_HK_MG4_LMG (43, "5.56x45mm HK MG4 LMG"),
/** 5.56x45mm HK23/GR-9 LMG */
- $556X45MM_HK23_GR_9_LMG (44, "5.56x45mm HK23/GR-9 LMG"),
+ NAME_556X45MM_HK23_GR_9_LMG (44, "5.56x45mm HK23/GR-9 LMG"),
/** 5.56x45mm M27 IAR SAW */
- $556X45MM_M27_IAR_SAW (46, "5.56x45mm M27 IAR SAW"),
+ NAME_556X45MM_M27_IAR_SAW (46, "5.56x45mm M27 IAR SAW"),
/** 5.56x45mm L86 LSW */
- $556X45MM_L86_LSW (47, "5.56x45mm L86 LSW"),
+ NAME_556X45MM_L86_LSW (47, "5.56x45mm L86 LSW"),
/** 5.56x45mm Daewoo K3 LMG */
- $556X45MM_DAEWOO_K3_LMG (48, "5.56x45mm Daewoo K3 LMG"),
+ NAME_556X45MM_DAEWOO_K3_LMG (48, "5.56x45mm Daewoo K3 LMG"),
/** 5.56x45mm Vector Mini SS GPMG */
- $556X45MM_VECTOR_MINI_SS_GPMG (49, "5.56x45mm Vector Mini SS GPMG"),
+ NAME_556X45MM_VECTOR_MINI_SS_GPMG (49, "5.56x45mm Vector Mini SS GPMG"),
/** 7.62x51mm M60 GPMG */
- $762X51MM_M60_GPMG (50, "7.62x51mm M60 GPMG"),
+ NAME_762X51MM_M60_GPMG (50, "7.62x51mm M60 GPMG"),
/** 7.62x51mm M60E3 GPMG */
- $762X51MM_M60E3_GPMG (51, "7.62x51mm M60E3 GPMG"),
+ NAME_762X51MM_M60E3_GPMG (51, "7.62x51mm M60E3 GPMG"),
/** 7.62x51mm M60E4 GPMG */
- $762X51MM_M60E4_GPMG (52, "7.62x51mm M60E4 GPMG"),
+ NAME_762X51MM_M60E4_GPMG (52, "7.62x51mm M60E4 GPMG"),
/** 7.62x51mm M60E6 GPMG */
- $762X51MM_M60E6_GPMG (53, "7.62x51mm M60E6 GPMG"),
+ NAME_762X51MM_M60E6_GPMG (53, "7.62x51mm M60E6 GPMG"),
/** 7.62x51mm Mark 48 GMPG */
- $762X51MM_MARK_48_GMPG (55, "7.62x51mm Mark 48 GMPG"),
+ NAME_762X51MM_MARK_48_GMPG (55, "7.62x51mm Mark 48 GMPG"),
/** 7.62x51mm M240/FN MAG 58 GPMG */
- $762X51MM_M240_FN_MAG_58_GPMG (58, "7.62x51mm M240/FN MAG 58 GPMG"),
+ NAME_762X51MM_M240_FN_MAG_58_GPMG (58, "7.62x51mm M240/FN MAG 58 GPMG"),
/** 7.62x51mm M240E4/M240B GPMG */
- $762X51MM_M240E4_M240B_GPMG (59, "7.62x51mm M240E4/M240B GPMG"),
+ NAME_762X51MM_M240E4_M240B_GPMG (59, "7.62x51mm M240E4/M240B GPMG"),
/** 7.62x51mm M240E1/M240D GPMG */
- $762X51MM_M240E1_M240D_GPMG (60, "7.62x51mm M240E1/M240D GPMG"),
+ NAME_762X51MM_M240E1_M240D_GPMG (60, "7.62x51mm M240E1/M240D GPMG"),
/** 7.62x51mm M240G GPMG */
- $762X51MM_M240G_GPMG (61, "7.62x51mm M240G GPMG"),
+ NAME_762X51MM_M240G_GPMG (61, "7.62x51mm M240G GPMG"),
/** 7.62x51mm M240E5/M240H GPMG */
- $762X51MM_M240E5_M240H_GPMG (62, "7.62x51mm M240E5/M240H GPMG"),
+ NAME_762X51MM_M240E5_M240H_GPMG (62, "7.62x51mm M240E5/M240H GPMG"),
/** 7.62x51mm M240L GPMG */
- $762X51MM_M240L_GPMG (63, "7.62x51mm M240L GPMG"),
+ NAME_762X51MM_M240L_GPMG (63, "7.62x51mm M240L GPMG"),
/** 7.62x39mm Kk 62 LMG */
- $762X39MM_KK_62_LMG (65, "7.62x39mm Kk 62 LMG"),
+ NAME_762X39MM_KK_62_LMG (65, "7.62x39mm Kk 62 LMG"),
/** 7.62x51mm Vector SS-77 GPMG */
- $762X51MM_VECTOR_SS_77_GPMG (70, "7.62x51mm Vector SS-77 GPMG"),
+ NAME_762X51MM_VECTOR_SS_77_GPMG (70, "7.62x51mm Vector SS-77 GPMG"),
/** 7.62x51mm SIG MG 710-3 GPMG */
- $762X51MM_SIG_MG_710_3_GPMG (71, "7.62x51mm SIG MG 710-3 GPMG"),
+ NAME_762X51MM_SIG_MG_710_3_GPMG (71, "7.62x51mm SIG MG 710-3 GPMG"),
/** 7.62x51mm Sterling 7.62 GMPG */
- $762X51MM_STERLING_762_GMPG (72, "7.62x51mm Sterling 7.62 GMPG"),
+ NAME_762X51MM_STERLING_762_GMPG (72, "7.62x51mm Sterling 7.62 GMPG"),
/** 7.62x51mm Sumitomo Type-62 GPMG */
- $762X51MM_SUMITOMO_TYPE_62_GPMG (73, "7.62x51mm Sumitomo Type-62 GPMG"),
+ NAME_762X51MM_SUMITOMO_TYPE_62_GPMG (73, "7.62x51mm Sumitomo Type-62 GPMG"),
/** 7.62x51mm Daewoo K12 GPMG */
- $762X51MM_DAEWOO_K12_GPMG (74, "7.62x51mm Daewoo K12 GPMG"),
+ NAME_762X51MM_DAEWOO_K12_GPMG (74, "7.62x51mm Daewoo K12 GPMG"),
/** 7.62x51mm MG 51 GPMG */
- $762X51MM_MG_51_GPMG (75, "7.62x51mm MG 51 GPMG"),
+ NAME_762X51MM_MG_51_GPMG (75, "7.62x51mm MG 51 GPMG"),
/** 7.62x51mm Rheinmetall MG 3 */
- $762X51MM_RHEINMETALL_MG_3 (76, "7.62x51mm Rheinmetall MG 3"),
+ NAME_762X51MM_RHEINMETALL_MG_3 (76, "7.62x51mm Rheinmetall MG 3"),
/** 7.62x51mm Rheinmetall MG 3KWS */
- $762X51MM_RHEINMETALL_MG_3KWS (77, "7.62x51mm Rheinmetall MG 3KWS"),
+ NAME_762X51MM_RHEINMETALL_MG_3KWS (77, "7.62x51mm Rheinmetall MG 3KWS"),
/** 7.62x51mm MG5/HK121 GPMG */
- $762X51MM_MG5_HK121_GPMG (80, "7.62x51mm MG5/HK121 GPMG"),
+ NAME_762X51MM_MG5_HK121_GPMG (80, "7.62x51mm MG5/HK121 GPMG"),
/** 7.62x51mm HK21 GPMG */
- $762X51MM_HK21_GPMG (81, "7.62x51mm HK21 GPMG"),
+ NAME_762X51MM_HK21_GPMG (81, "7.62x51mm HK21 GPMG"),
/** 7.62x51mm AA-52 GPMP */
- $762X51MM_AA_52_GPMP (85, "7.62x51mm AA-52 GPMP"),
+ NAME_762X51MM_AA_52_GPMP (85, "7.62x51mm AA-52 GPMP"),
/** 7.62x51mm UKM-2000 GPMG */
- $762X51MM_UKM_2000_GPMG (86, "7.62x51mm UKM-2000 GPMG"),
+ NAME_762X51MM_UKM_2000_GPMG (86, "7.62x51mm UKM-2000 GPMG"),
/** 7.62x54mm Uk vz. 59 GPMG */
- $762X54MM_UK_VZ_59_GPMG (88, "7.62x54mm Uk vz. 59 GPMG"),
+ NAME_762X54MM_UK_VZ_59_GPMG (88, "7.62x54mm Uk vz. 59 GPMG"),
/** 7.92x57mm MG 42 GPMG */
- $792X57MM_MG_42_GPMG (89, "7.92x57mm MG 42 GPMG"),
+ NAME_792X57MM_MG_42_GPMG (89, "7.92x57mm MG 42 GPMG"),
/** 12.7x99mm M2A1 Browning HMG */
- $127X99MM_M2A1_BROWNING_HMG (100, "12.7x99mm M2A1 Browning HMG"),
+ NAME_127X99MM_M2A1_BROWNING_HMG (100, "12.7x99mm M2A1 Browning HMG"),
/** 12.7x99mm M2HB Browning HMG */
- $127X99MM_M2HB_BROWNING_HMG (101, "12.7x99mm M2HB Browning HMG"),
+ NAME_127X99MM_M2HB_BROWNING_HMG (101, "12.7x99mm M2HB Browning HMG"),
/** 12.7x99mm M2HB-QCB Browning HMG */
- $127X99MM_M2HB_QCB_BROWNING_HMG (102, "12.7x99mm M2HB-QCB Browning HMG"),
+ NAME_127X99MM_M2HB_QCB_BROWNING_HMG (102, "12.7x99mm M2HB-QCB Browning HMG"),
/** 12.7x99mm M85C HMG */
- $127X99MM_M85C_HMG (105, "12.7x99mm M85C HMG"),
+ NAME_127X99MM_M85C_HMG (105, "12.7x99mm M85C HMG"),
/** 12.7x99mm Rheinmetall RMG.50 HMG */
- $127X99MM_RHEINMETALL_RMG50_HMG (108, "12.7x99mm Rheinmetall RMG.50 HMG"),
+ NAME_127X99MM_RHEINMETALL_RMG50_HMG (108, "12.7x99mm Rheinmetall RMG.50 HMG"),
/** 12.7x99mm HK25 HMG */
- $127X99MM_HK25_HMG (110, "12.7x99mm HK25 HMG"),
+ NAME_127X99MM_HK25_HMG (110, "12.7x99mm HK25 HMG"),
/** 12.7x99mm CIS 50MG */
- $127X99MM_CIS_50MG (112, "12.7x99mm CIS 50MG"),
+ NAME_127X99MM_CIS_50MG (112, "12.7x99mm CIS 50MG"),
/** 5.45x39mm IP-2 LMG */
- $545X39MM_IP_2_LMG (120, "5.45x39mm IP-2 LMG"),
+ NAME_545X39MM_IP_2_LMG (120, "5.45x39mm IP-2 LMG"),
/** 5.45x39mm Nikonov LMG */
- $545X39MM_NIKONOV_LMG (121, "5.45x39mm Nikonov LMG"),
+ NAME_545X39MM_NIKONOV_LMG (121, "5.45x39mm Nikonov LMG"),
/** 5.45x39mm M74 RPK */
- $545X39MM_M74_RPK (122, "5.45x39mm M74 RPK"),
+ NAME_545X39MM_M74_RPK (122, "5.45x39mm M74 RPK"),
/** 7.62x39mm M43 RPK */
- $762X39MM_M43_RPK (125, "7.62x39mm M43 RPK"),
+ NAME_762X39MM_M43_RPK (125, "7.62x39mm M43 RPK"),
/** 7.62x39mm RPD SAW */
- $762X39MM_RPD_SAW (126, "7.62x39mm RPD SAW"),
+ NAME_762X39MM_RPD_SAW (126, "7.62x39mm RPD SAW"),
/** 7.62x39mm Zastava M72 */
- $762X39MM_ZASTAVA_M72 (127, "7.62x39mm Zastava M72"),
+ NAME_762X39MM_ZASTAVA_M72 (127, "7.62x39mm Zastava M72"),
/** 7.62x39mm Type-81 LMG */
- $762X39MM_TYPE_81_LMG (128, "7.62x39mm Type-81 LMG"),
+ NAME_762X39MM_TYPE_81_LMG (128, "7.62x39mm Type-81 LMG"),
/** 7.62x51mm Zastava M77 */
- $762X51MM_ZASTAVA_M77 (135, "7.62x51mm Zastava M77"),
+ NAME_762X51MM_ZASTAVA_M77 (135, "7.62x51mm Zastava M77"),
/** 7.62x54mm PK GPMG */
- $762X54MM_PK_GPMG (140, "7.62x54mm PK GPMG"),
+ NAME_762X54MM_PK_GPMG (140, "7.62x54mm PK GPMG"),
/** 7.62x54mm AEK-999 GPMP */
- $762X54MM_AEK_999_GPMP (141, "7.62x54mm AEK-999 GPMP"),
+ NAME_762X54MM_AEK_999_GPMP (141, "7.62x54mm AEK-999 GPMP"),
/** 7.62x54mm Pecheneg GPMG */
- $762X54MM_PECHENEG_GPMG (142, "7.62x54mm Pecheneg GPMG"),
+ NAME_762X54MM_PECHENEG_GPMG (142, "7.62x54mm Pecheneg GPMG"),
/** 7.62x54mm Zastava M84 */
- $762X54MM_ZASTAVA_M84 (143, "7.62x54mm Zastava M84"),
+ NAME_762X54MM_ZASTAVA_M84 (143, "7.62x54mm Zastava M84"),
/** 7.62x54mm Type-67 GPMG */
- $762X54MM_TYPE_67_GPMG (144, "7.62x54mm Type-67 GPMG"),
+ NAME_762X54MM_TYPE_67_GPMG (144, "7.62x54mm Type-67 GPMG"),
/** 7.62x54mm Type-80 GPMG */
- $762X54MM_TYPE_80_GPMG (145, "7.62x54mm Type-80 GPMG"),
+ NAME_762X54MM_TYPE_80_GPMG (145, "7.62x54mm Type-80 GPMG"),
/** 12.7x108mm NSV HMG */
- $127X108MM_NSV_HMG (150, "12.7x108mm NSV HMG"),
+ NAME_127X108MM_NSV_HMG (150, "12.7x108mm NSV HMG"),
/** 12.7x108mm Kord HMG */
- $127X108MM_KORD_HMG (151, "12.7x108mm Kord HMG"),
+ NAME_127X108MM_KORD_HMG (151, "12.7x108mm Kord HMG"),
/** 12.7x108mm KPD-12.7 HMG */
- $127X108MM_KPD_127_HMG (152, "12.7x108mm KPD-12.7 HMG"),
+ NAME_127X108MM_KPD_127_HMG (152, "12.7x108mm KPD-12.7 HMG"),
/** 12.7x108mm Zastava M02 Coyotoe HMG */
- $127X108MM_ZASTAVA_M02_COYOTOE_HMG (153, "12.7x108mm Zastava M02 Coyotoe HMG"),
+ NAME_127X108MM_ZASTAVA_M02_COYOTOE_HMG (153, "12.7x108mm Zastava M02 Coyotoe HMG"),
/** 12.7x108mm Zastava M87 */
- $127X108MM_ZASTAVA_M87 (154, "12.7x108mm Zastava M87"),
+ NAME_127X108MM_ZASTAVA_M87 (154, "12.7x108mm Zastava M87"),
/** 12.7x108mm Type-77 HMG */
- $127X108MM_TYPE_77_HMG (155, "12.7x108mm Type-77 HMG"),
+ NAME_127X108MM_TYPE_77_HMG (155, "12.7x108mm Type-77 HMG"),
/** 12.7x108mm W85 HMG */
- $127X108MM_W85_HMG (156, "12.7x108mm W85 HMG"),
+ NAME_127X108MM_W85_HMG (156, "12.7x108mm W85 HMG"),
/** 12.7x108mm Type-90 HMG */
- $127X108MM_TYPE_90_HMG (157, "12.7x108mm Type-90 HMG"),
+ NAME_127X108MM_TYPE_90_HMG (157, "12.7x108mm Type-90 HMG"),
/** 5.8x42mm QJY-88 LMG */
- $58X42MM_QJY_88_LMG (164, "5.8x42mm QJY-88 LMG"),
+ NAME_58X42MM_QJY_88_LMG (164, "5.8x42mm QJY-88 LMG"),
/** 5.8x42mm QBB-95 DBP87 LMG */
- $58X42MM_QBB_95_DBP87_LMG (165, "5.8x42mm QBB-95 DBP87 LMG"),
+ NAME_58X42MM_QBB_95_DBP87_LMG (165, "5.8x42mm QBB-95 DBP87 LMG"),
/** 5.56x45mm QBB-95-1 LMG */
- $556X45MM_QBB_95_1_LMG (166, "5.56x45mm QBB-95-1 LMG");
+ NAME_556X45MM_QBB_95_1_LMG (166, "5.56x45mm QBB-95-1 LMG");
private int value;
private final String description;
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificManPortableAirDefenseSystem.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificManPortableAirDefenseSystem.java
index 08f88d8c396379cb6a4707da5cbde2a0225a6f78..1f3aa97d5b6f37003f942f93cf55a91c931286dc 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificManPortableAirDefenseSystem.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificManPortableAirDefenseSystem.java
@@ -8,56 +8,58 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 520 marshal size 8<br>
- * Life Form-Human-Specific-Man-Portable Air Defense System
+ * LifeFormHumanSpecificManPortableAirDefenseSystem
*/
public enum LifeFormHumanSpecificManPortableAirDefenseSystem
{
/** Other */
OTHER (0, "Other"),
- /** 70mm FIM-42 Redeye */
- $70MM_FIM_42_REDEYE (1, "70mm FIM-42 Redeye"),
+ /** 70mm FIM-43 Redeye */
+ NAME_70MM_FIM_43_REDEYE (1, "70mm FIM-43 Redeye"),
/** 70mm FIM-92 Stinger */
- $70MM_FIM_92_STINGER (2, "70mm FIM-92 Stinger"),
+ NAME_70MM_FIM_92_STINGER (2, "70mm FIM-92 Stinger"),
/** 76mm Blowpipe */
- $76MM_BLOWPIPE (10, "76mm Blowpipe"),
+ NAME_76MM_BLOWPIPE (10, "76mm Blowpipe"),
/** 76mm Starburst (Javelin S-15) */
- $76MM_STARBURST_JAVELIN_S_15 (11, "76mm Starburst (Javelin S-15)"),
+ NAME_76MM_STARBURST_JAVELIN_S_15 (11, "76mm Starburst (Javelin S-15)"),
/** 130mm Starstreak HVM */
- $130MM_STARSTREAK_HVM (12, "130mm Starstreak HVM"),
+ NAME_130MM_STARSTREAK_HVM (12, "130mm Starstreak HVM"),
/** 90mm Mistral */
- $90MM_MISTRAL (15, "90mm Mistral"),
+ NAME_90MM_MISTRAL (15, "90mm Mistral"),
/** 72mm 9K32M Strela-2 (SA-7) */
- $72MM_9K32M_STRELA_2_SA_7 (20, "72mm 9K32M Strela-2 (SA-7)"),
+ NAME_72MM_9K32M_STRELA_2_SA_7 (20, "72mm 9K32M Strela-2 (SA-7)"),
/** 72mm 9K36 Strela-3 (SA-14) */
- $72MM_9K36_STRELA_3_SA_14 (21, "72mm 9K36 Strela-3 (SA-14)"),
+ NAME_72MM_9K36_STRELA_3_SA_14 (21, "72mm 9K36 Strela-3 (SA-14)"),
/** 72mm 9K38 Igla (SA-18) */
- $72MM_9K38_IGLA_SA_18 (22, "72mm 9K38 Igla (SA-18)"),
+ NAME_72MM_9K38_IGLA_SA_18 (22, "72mm 9K38 Igla (SA-18)"),
/** 72mm 9K310 Igla-M (SA-16) */
- $72MM_9K310_IGLA_M_SA_16 (23, "72mm 9K310 Igla-M (SA-16)"),
- /** 72mm 9K333 Vebra (SA-25) */
- $72MM_9K333_VEBRA_SA_25 (24, "72mm 9K333 Vebra (SA-25)"),
+ NAME_72MM_9K310_IGLA_M_SA_16 (23, "72mm 9K310 Igla-M (SA-16)"),
+ /** 72mm 9K333 Verba (SA-25) */
+ NAME_72MM_9K333_VERBA_SA_25 (24, "72mm 9K333 Verba (SA-25)"),
+ /** 72mm 9K338 Igla-S (SA-24 Grinch) */
+ NAME_72MM_9K338_IGLA_S_SA_24_GRINCH (25, "72mm 9K338 Igla-S (SA-24 Grinch)"),
/** 72mm HN-5 Hong-Ying-5 */
- $72MM_HN_5_HONG_YING_5 (30, "72mm HN-5 Hong-Ying-5"),
+ NAME_72MM_HN_5_HONG_YING_5 (30, "72mm HN-5 Hong-Ying-5"),
/** 72mm QW-1 Vanguard */
- $72MM_QW_1_VANGUARD (31, "72mm QW-1 Vanguard"),
+ NAME_72MM_QW_1_VANGUARD (31, "72mm QW-1 Vanguard"),
/** 72mm QW-2 Vanguard 2 */
- $72MM_QW_2_VANGUARD_2 (32, "72mm QW-2 Vanguard 2"),
+ NAME_72MM_QW_2_VANGUARD_2 (32, "72mm QW-2 Vanguard 2"),
/** 90mm QW-3 */
- $90MM_QW_3 (33, "90mm QW-3"),
+ NAME_90MM_QW_3 (33, "90mm QW-3"),
/** 72mm FN-6 */
- $72MM_FN_6 (34, "72mm FN-6"),
+ NAME_72MM_FN_6 (34, "72mm FN-6"),
/** 71mm Misagh-1 */
- $71MM_MISAGH_1 (45, "71mm Misagh-1"),
+ NAME_71MM_MISAGH_1 (45, "71mm Misagh-1"),
/** 71mm Misagh-2 */
- $71MM_MISAGH_2 (46, "71mm Misagh-2"),
+ NAME_71MM_MISAGH_2 (46, "71mm Misagh-2"),
/** 80mm Type-91 Kin-SAM */
- $80MM_TYPE_91_KIN_SAM (50, "80mm Type-91 Kin-SAM"),
+ NAME_80MM_TYPE_91_KIN_SAM (50, "80mm Type-91 Kin-SAM"),
/** 80mm KP-SAM Shun-Gung (Chiron) */
- $80MM_KP_SAM_SHUN_GUNG_CHIRON (55, "80mm KP-SAM Shun-Gung (Chiron)"),
+ NAME_80MM_KP_SAM_SHUN_GUNG_CHIRON (55, "80mm KP-SAM Shun-Gung (Chiron)"),
/** 106mm RBS-70 */
- $106MM_RBS_70 (60, "106mm RBS-70");
+ NAME_106MM_RBS_70 (60, "106mm RBS-70");
private int value;
private final String description;
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificMortars.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificMortars.java
index 475f0cc896e4f3901d698c172e6e1fab2ef30f9e..d21f3e68f6ecc4ead4194150abc3d1d89bf82ff3 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificMortars.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificMortars.java
@@ -8,22 +8,22 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 512 marshal size 8<br>
- * Life Form-Human-Specific-Mortars
+ * LifeFormHumanSpecificMortars
*/
public enum LifeFormHumanSpecificMortars
{
/** Others */
OTHERS (0, "Others"),
/** 60mm M224 */
- $60MM_M224 (30, "60mm M224"),
+ NAME_60MM_M224 (30, "60mm M224"),
/** 81mm F2 */
- $81MM_F2 (50, "81mm F2"),
+ NAME_81MM_F2 (50, "81mm F2"),
/** 81mm L16 */
- $81MM_L16 (51, "81mm L16"),
+ NAME_81MM_L16 (51, "81mm L16"),
/** 81mm M252 */
- $81MM_M252 (52, "81mm M252");
+ NAME_81MM_M252 (52, "81mm M252");
private int value;
private final String description;
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificPersonalElectronicsClass.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificPersonalElectronicsClass.java
new file mode 100644
index 0000000000000000000000000000000000000000..78d3c2f373c2d1b2926d5e1ed85e6eb5e655f767
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificPersonalElectronicsClass.java
@@ -0,0 +1,100 @@
+package edu.nps.moves.dis7.enumerations;
+
+import java.nio.ByteBuffer;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+import edu.nps.moves.dis7.*;
+
+/**
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
+ * UID 526 marshal size 8<br>
+ * LifeFormHumanSpecificPersonalElectronicsClass
+ */
+public enum LifeFormHumanSpecificPersonalElectronicsClass
+{
+ /** Cell Phone */
+ CELL_PHONE (1, "Cell Phone");
+
+ private int value;
+ private final String description;
+
+ LifeFormHumanSpecificPersonalElectronicsClass(int value, String description)
+ {
+ this.value = value;
+ this.description = description;
+ }
+
+ public int getValue()
+ {
+ return value;
+ }
+
+ public String getDescription()
+ {
+ return description;
+ }
+
+ public static int getEnumBitWidth()
+ {
+ return 8;
+ }
+
+ public static LifeFormHumanSpecificPersonalElectronicsClass getEnumForValue(int i)
+ {
+ for(LifeFormHumanSpecificPersonalElectronicsClass val: LifeFormHumanSpecificPersonalElectronicsClass.values()) {
+ if(val.getValue()==i)
+ return val;
+ }
+ System.err.println("No enumeration found for value " + i + " of enumeration LifeFormHumanSpecificPersonalElectronicsClass");
+ return null;
+ }
+
+
+ public void marshal(DataOutputStream dos) throws IOException
+ {
+ dos.writeByte(getValue());
+ }
+
+ public void marshal(ByteBuffer buff) throws Exception
+ {
+ buff.put((byte)getValue());
+ }
+
+ public static LifeFormHumanSpecificPersonalElectronicsClass unmarshalEnum (DataInputStream dis) throws Exception
+ {
+ /* try {
+ value = dis.readUnsignedByte();
+ }
+ catch(IOException ex) {
+ showError(ex);
+ } */
+
+ return getEnumForValue(dis.readByte());
+ }
+
+ public static LifeFormHumanSpecificPersonalElectronicsClass unmarshalEnum(ByteBuffer buff) throws Exception
+ {
+ /*
+ try {
+ value = (int)buff.get();
+ }
+ catch(Exception ex) {
+ showError(ex);
+ }
+ */
+ return getEnumForValue(buff.get());
+ }
+
+ public int getMarshalledSize()
+ {
+ return 1; // 8 bits
+ }
+
+ @Override
+ public String toString()
+ {
+ return "LifeFormHumanSpecificPersonalElectronicsClass: " + name() + ": " + getValue();
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificRecoillessRifles.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificRecoillessRifles.java
index 904ee074503b760f779918bcbdd94bd7f11c82ac..fbb4e39a057ead2685853c18000b02217f4418dc 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificRecoillessRifles.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificRecoillessRifles.java
@@ -8,70 +8,70 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 521 marshal size 8<br>
- * Life Form-Human-Specific-Recoilless Rifles
+ * LifeFormHumanSpecificRecoillessRifles
*/
public enum LifeFormHumanSpecificRecoillessRifles
{
/** Other */
OTHER (0, "Other"),
/** 84mm M136 AT-4 CS */
- $84MM_M136_AT_4_CS (15, "84mm M136 AT-4 CS"),
+ NAME_84MM_M136_AT_4_CS (15, "84mm M136 AT-4 CS"),
/** 57mm M18 RR */
- $57MM_M18_RR (20, "57mm M18 RR"),
+ NAME_57MM_M18_RR (20, "57mm M18 RR"),
/** 75mm M20 RR */
- $75MM_M20_RR (21, "75mm M20 RR"),
+ NAME_75MM_M20_RR (21, "75mm M20 RR"),
/** 120mm M-28 Davy Crockett */
- $120MM_M_28_DAVY_CROCKETT (22, "120mm M-28 Davy Crockett"),
+ NAME_120MM_M_28_DAVY_CROCKETT (22, "120mm M-28 Davy Crockett"),
/** 155mm M-29 Davy Crockett */
- $155MM_M_29_DAVY_CROCKETT (23, "155mm M-29 Davy Crockett"),
+ NAME_155MM_M_29_DAVY_CROCKETT (23, "155mm M-29 Davy Crockett"),
/** 106mm M40 Recoilless Rifle */
- $106MM_M40_RECOILLESS_RIFLE (24, "106mm M40 Recoilless Rifle"),
+ NAME_106MM_M40_RECOILLESS_RIFLE (24, "106mm M40 Recoilless Rifle"),
/** 82mm M60 RR */
- $82MM_M60_RR (25, "82mm M60 RR"),
+ NAME_82MM_M60_RR (25, "82mm M60 RR"),
/** 90mm M67 RR */
- $90MM_M67_RR (26, "90mm M67 RR"),
+ NAME_90MM_M67_RR (26, "90mm M67 RR"),
/** 84mm M1 Carl Gustav */
- $84MM_M1_CARL_GUSTAV (30, "84mm M1 Carl Gustav"),
+ NAME_84MM_M1_CARL_GUSTAV (30, "84mm M1 Carl Gustav"),
/** 84mm M2 Carl Gustav */
- $84MM_M2_CARL_GUSTAV (31, "84mm M2 Carl Gustav"),
+ NAME_84MM_M2_CARL_GUSTAV (31, "84mm M2 Carl Gustav"),
/** 84mm M3 Carl Gustav */
- $84MM_M3_CARL_GUSTAV (32, "84mm M3 Carl Gustav"),
+ NAME_84MM_M3_CARL_GUSTAV (32, "84mm M3 Carl Gustav"),
/** 84mm M4 Carl Gustav */
- $84MM_M4_CARL_GUSTAV (33, "84mm M4 Carl Gustav"),
+ NAME_84MM_M4_CARL_GUSTAV (33, "84mm M4 Carl Gustav"),
/** 74mm Pansarskott m/68 Miniman */
- $74MM_PANSARSKOTT_M_68_MINIMAN (35, "74mm Pansarskott m/68 Miniman"),
+ NAME_74MM_PANSARSKOTT_M_68_MINIMAN (35, "74mm Pansarskott m/68 Miniman"),
/** 84mm ALAC */
- $84MM_ALAC (40, "84mm ALAC"),
+ NAME_84MM_ALAC (40, "84mm ALAC"),
/** 82mm B-10 RR */
- $82MM_B_10_RR (45, "82mm B-10 RR"),
+ NAME_82MM_B_10_RR (45, "82mm B-10 RR"),
/** 107mm B-11 RR */
- $107MM_B_11_RR (46, "107mm B-11 RR"),
+ NAME_107MM_B_11_RR (46, "107mm B-11 RR"),
/** 80mm Breda Folgore */
- $80MM_BREDA_FOLGORE (50, "80mm Breda Folgore"),
+ NAME_80MM_BREDA_FOLGORE (50, "80mm Breda Folgore"),
/** 120mm BAT RR */
- $120MM_BAT_RR (55, "120mm BAT RR"),
+ NAME_120MM_BAT_RR (55, "120mm BAT RR"),
/** 73mm SPG-9 Kopye */
- $73MM_SPG_9_KOPYE (60, "73mm SPG-9 Kopye"),
+ NAME_73MM_SPG_9_KOPYE (60, "73mm SPG-9 Kopye"),
/** 88mm RCL 3.45in */
- $88MM_RCL_345IN (65, "88mm RCL 3.45in"),
+ NAME_88MM_RCL_345IN (65, "88mm RCL 3.45in"),
/** 90mm Pvpj 110 */
- $90MM_PVPJ_110 (70, "90mm Pvpj 110"),
+ NAME_90MM_PVPJ_110 (70, "90mm Pvpj 110"),
/** 50mm Jagdfaust */
- $50MM_JAGDFAUST (75, "50mm Jagdfaust"),
+ NAME_50MM_JAGDFAUST (75, "50mm Jagdfaust"),
/** 30mm Rheinmetall RMK30 */
- $30MM_RHEINMETALL_RMK30 (80, "30mm Rheinmetall RMK30"),
+ NAME_30MM_RHEINMETALL_RMK30 (80, "30mm Rheinmetall RMK30"),
/** 88mm 55 S 55 Raikka */
- $88MM_55_S_55_RAIKKA (90, "88mm 55 S 55 Raikka"),
+ NAME_88MM_55_S_55_RAIKKA (90, "88mm 55 S 55 Raikka"),
/** 95mm 95 S 58-61 */
- $95MM_95_S_58_61 (91, "95mm 95 S 58-61"),
+ NAME_95MM_95_S_58_61 (91, "95mm 95 S 58-61"),
/** 73mm LG40 */
- $73MM_LG40 (95, "73mm LG40"),
+ NAME_73MM_LG40 (95, "73mm LG40"),
/** 105mm LG40 */
- $105MM_LG40 (96, "105mm LG40"),
+ NAME_105MM_LG40 (96, "105mm LG40"),
/** 105mm LG42 */
- $105MM_LG42 (97, "105mm LG42");
+ NAME_105MM_LG42 (97, "105mm LG42");
private int value;
private final String description;
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificShotGuns.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificShotGuns.java
index 4ea1033f7e45282e24fc2524a2491b40b990a013..79cdf02b7fe2d8c404a08be88083370ff1c54a73 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificShotGuns.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificShotGuns.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 511 marshal size 8<br>
- * Life Form-Human-Specific-Shot Guns
+ * LifeFormHumanSpecificShotGuns
*/
public enum LifeFormHumanSpecificShotGuns
{
@@ -23,113 +23,113 @@ public enum LifeFormHumanSpecificShotGuns
/** Browning Auto-5 */
BROWNING_AUTO_5 (22, "Browning Auto-5"),
/** 18.5mm Browning Citori O/U 12 Gauge */
- $185MM_BROWNING_CITORI_O_U_12_GAUGE (23, "18.5mm Browning Citori O/U 12 Gauge"),
+ NAME_185MM_BROWNING_CITORI_O_U_12_GAUGE (23, "18.5mm Browning Citori O/U 12 Gauge"),
/** 16.8mm Browning Citori O/U 16 Gauge */
- $168MM_BROWNING_CITORI_O_U_16_GAUGE (24, "16.8mm Browning Citori O/U 16 Gauge"),
+ NAME_168MM_BROWNING_CITORI_O_U_16_GAUGE (24, "16.8mm Browning Citori O/U 16 Gauge"),
/** 15.6mm Browning Citori O/U 20 Gauge */
- $156MM_BROWNING_CITORI_O_U_20_GAUGE (25, "15.6mm Browning Citori O/U 20 Gauge"),
+ NAME_156MM_BROWNING_CITORI_O_U_20_GAUGE (25, "15.6mm Browning Citori O/U 20 Gauge"),
/** 14mm Browning Citori O/U 28 Gauge */
- $14MM_BROWNING_CITORI_O_U_28_GAUGE (26, "14mm Browning Citori O/U 28 Gauge"),
+ NAME_14MM_BROWNING_CITORI_O_U_28_GAUGE (26, "14mm Browning Citori O/U 28 Gauge"),
/** 10.4mm Browning Citori O/U .410 Bore */
- $104MM_BROWNING_CITORI_O_U_410_BORE (27, "10.4mm Browning Citori O/U .410 Bore"),
+ NAME_104MM_BROWNING_CITORI_O_U_410_BORE (27, "10.4mm Browning Citori O/U .410 Bore"),
/** 18.5mm Browning Double Automatic 12 Gauge */
- $185MM_BROWNING_DOUBLE_AUTOMATIC_12_GAUGE (28, "18.5mm Browning Double Automatic 12 Gauge"),
+ NAME_185MM_BROWNING_DOUBLE_AUTOMATIC_12_GAUGE (28, "18.5mm Browning Double Automatic 12 Gauge"),
/** 18.5mm Ithaca 37 12 Gauge */
- $185MM_ITHACA_37_12_GAUGE (29, "18.5mm Ithaca 37 12 Gauge"),
+ NAME_185MM_ITHACA_37_12_GAUGE (29, "18.5mm Ithaca 37 12 Gauge"),
/** 16.8mm Ithaca 37 16 Gauge */
- $168MM_ITHACA_37_16_GAUGE (30, "16.8mm Ithaca 37 16 Gauge"),
+ NAME_168MM_ITHACA_37_16_GAUGE (30, "16.8mm Ithaca 37 16 Gauge"),
/** 15.6mm Ithaca 37 20 Gauge */
- $156MM_ITHACA_37_20_GAUGE (31, "15.6mm Ithaca 37 20 Gauge"),
+ NAME_156MM_ITHACA_37_20_GAUGE (31, "15.6mm Ithaca 37 20 Gauge"),
/** 14mm Ithaca 37 28 Gauge */
- $14MM_ITHACA_37_28_GAUGE (32, "14mm Ithaca 37 28 Gauge"),
+ NAME_14MM_ITHACA_37_28_GAUGE (32, "14mm Ithaca 37 28 Gauge"),
/** 19.7mm Ithaca Mag-10 SA 10 Gauge */
- $197MM_ITHACA_MAG_10_SA_10_GAUGE (33, "19.7mm Ithaca Mag-10 SA 10 Gauge"),
+ NAME_197MM_ITHACA_MAG_10_SA_10_GAUGE (33, "19.7mm Ithaca Mag-10 SA 10 Gauge"),
/** 19.7mm Marlin Model 55 10 Gauge */
- $197MM_MARLIN_MODEL_55_10_GAUGE (34, "19.7mm Marlin Model 55 10 Gauge"),
+ NAME_197MM_MARLIN_MODEL_55_10_GAUGE (34, "19.7mm Marlin Model 55 10 Gauge"),
/** 18.5mm Marlin Model 55 12 Gauge */
- $185MM_MARLIN_MODEL_55_12_GAUGE (35, "18.5mm Marlin Model 55 12 Gauge"),
+ NAME_185MM_MARLIN_MODEL_55_12_GAUGE (35, "18.5mm Marlin Model 55 12 Gauge"),
/** 16.8mm Marlin Model 55 16 Gauge */
- $168MM_MARLIN_MODEL_55_16_GAUGE (36, "16.8mm Marlin Model 55 16 Gauge"),
+ NAME_168MM_MARLIN_MODEL_55_16_GAUGE (36, "16.8mm Marlin Model 55 16 Gauge"),
/** 15.6mm Marlin Model 55 20 Gauge */
- $156MM_MARLIN_MODEL_55_20_GAUGE (37, "15.6mm Marlin Model 55 20 Gauge"),
+ NAME_156MM_MARLIN_MODEL_55_20_GAUGE (37, "15.6mm Marlin Model 55 20 Gauge"),
/** 18.5mm Mossberg 500 12 Gauge */
- $185MM_MOSSBERG_500_12_GAUGE (38, "18.5mm Mossberg 500 12 Gauge"),
+ NAME_185MM_MOSSBERG_500_12_GAUGE (38, "18.5mm Mossberg 500 12 Gauge"),
/** 15.6mm Mossberg 500 20 Gauge */
- $156MM_MOSSBERG_500_20_GAUGE (39, "15.6mm Mossberg 500 20 Gauge"),
+ NAME_156MM_MOSSBERG_500_20_GAUGE (39, "15.6mm Mossberg 500 20 Gauge"),
/** 10.4mm Mossberg 500 .410 Bore */
- $104MM_MOSSBERG_500_410_BORE (40, "10.4mm Mossberg 500 .410 Bore"),
+ NAME_104MM_MOSSBERG_500_410_BORE (40, "10.4mm Mossberg 500 .410 Bore"),
/** 18.5mm Mossberg 590 12 Gauge */
- $185MM_MOSSBERG_590_12_GAUGE (41, "18.5mm Mossberg 590 12 Gauge"),
+ NAME_185MM_MOSSBERG_590_12_GAUGE (41, "18.5mm Mossberg 590 12 Gauge"),
/** 15.6mm Mossberg 590 20 Gauge */
- $156MM_MOSSBERG_590_20_GAUGE (42, "15.6mm Mossberg 590 20 Gauge"),
+ NAME_156MM_MOSSBERG_590_20_GAUGE (42, "15.6mm Mossberg 590 20 Gauge"),
/** 10.4mm Mossberg 590 .410 Bore */
- $104MM_MOSSBERG_590_410_BORE (43, "10.4mm Mossberg 590 .410 Bore"),
+ NAME_104MM_MOSSBERG_590_410_BORE (43, "10.4mm Mossberg 590 .410 Bore"),
/** 18.5mm Mossberg 930 SA 12 Gauge */
- $185MM_MOSSBERG_930_SA_12_GAUGE (44, "18.5mm Mossberg 930 SA 12 Gauge"),
+ NAME_185MM_MOSSBERG_930_SA_12_GAUGE (44, "18.5mm Mossberg 930 SA 12 Gauge"),
/** Remington Model 11 SA */
REMINGTON_MODEL_11_SA (45, "Remington Model 11 SA"),
/** Remington Model 10 12 Gauge */
REMINGTON_MODEL_10_12_GAUGE (46, "Remington Model 10 12 Gauge"),
/** 15.6mm Remington Model 17 20 Gauge */
- $156MM_REMINGTON_MODEL_17_20_GAUGE (47, "15.6mm Remington Model 17 20 Gauge"),
+ NAME_156MM_REMINGTON_MODEL_17_20_GAUGE (47, "15.6mm Remington Model 17 20 Gauge"),
/** Remington Model 31 */
REMINGTON_MODEL_31 (48, "Remington Model 31"),
/** Remington Model 11-48 SA */
REMINGTON_MODEL_11_48_SA (49, "Remington Model 11-48 SA"),
/** 18.5mm Remington 870 12 Gauge */
- $185MM_REMINGTON_870_12_GAUGE (50, "18.5mm Remington 870 12 Gauge"),
+ NAME_185MM_REMINGTON_870_12_GAUGE (50, "18.5mm Remington 870 12 Gauge"),
/** 16.8mm Remington 870 16 Gauge */
- $168MM_REMINGTON_870_16_GAUGE (51, "16.8mm Remington 870 16 Gauge"),
+ NAME_168MM_REMINGTON_870_16_GAUGE (51, "16.8mm Remington 870 16 Gauge"),
/** 15.6mm Remington 870 20 Gauge */
- $156MM_REMINGTON_870_20_GAUGE (52, "15.6mm Remington 870 20 Gauge"),
- /** 14mm Remington 870 28 Gauge */
- $14MM_REMINGTON_870_28_GAUGE (53, "14mm Remington 870 28 Gauge"),
+ NAME_156MM_REMINGTON_870_20_GAUGE (52, "15.6mm Remington 870 20 Gauge"),
+ /** 14mm Remington 870 28 Gauge */
+ NAME_14MM_REMINGTON_870_28_GAUGE (53, "14mm Remington 870 28 Gauge"),
/** 10.4mm Remington 870 .410 Bore */
- $104MM_REMINGTON_870_410_BORE (54, "10.4mm Remington 870 .410 Bore"),
+ NAME_104MM_REMINGTON_870_410_BORE (54, "10.4mm Remington 870 .410 Bore"),
/** Remington Model 58 SA */
REMINGTON_MODEL_58_SA (55, "Remington Model 58 SA"),
/** 18.5mm Remington 878 SA 12 Gauge */
- $185MM_REMINGTON_878_SA_12_GAUGE (56, "18.5mm Remington 878 SA 12 Gauge"),
+ NAME_185MM_REMINGTON_878_SA_12_GAUGE (56, "18.5mm Remington 878 SA 12 Gauge"),
/** 18.5mm Remington Model 1100 SA 12 Gauge */
- $185MM_REMINGTON_MODEL_1100_SA_12_GAUGE (57, "18.5mm Remington Model 1100 SA 12 Gauge"),
+ NAME_185MM_REMINGTON_MODEL_1100_SA_12_GAUGE (57, "18.5mm Remington Model 1100 SA 12 Gauge"),
/** 16.8mm Remington Model 1100 SA 16 Gauge */
- $168MM_REMINGTON_MODEL_1100_SA_16_GAUGE (58, "16.8mm Remington Model 1100 SA 16 Gauge"),
+ NAME_168MM_REMINGTON_MODEL_1100_SA_16_GAUGE (58, "16.8mm Remington Model 1100 SA 16 Gauge"),
/** 15.6mm Remington Model 1100 SA 20 Gauge */
- $156MM_REMINGTON_MODEL_1100_SA_20_GAUGE (59, "15.6mm Remington Model 1100 SA 20 Gauge"),
+ NAME_156MM_REMINGTON_MODEL_1100_SA_20_GAUGE (59, "15.6mm Remington Model 1100 SA 20 Gauge"),
/** 14mm Remington Model 1100 SA 28 Gauge */
- $14MM_REMINGTON_MODEL_1100_SA_28_GAUGE (60, "14mm Remington Model 1100 SA 28 Gauge"),
+ NAME_14MM_REMINGTON_MODEL_1100_SA_28_GAUGE (60, "14mm Remington Model 1100 SA 28 Gauge"),
/** 10.4mm Remington Model 1100 SA .410 Bore */
- $104MM_REMINGTON_MODEL_1100_SA_410_BORE (61, "10.4mm Remington Model 1100 SA .410 Bore"),
+ NAME_104MM_REMINGTON_MODEL_1100_SA_410_BORE (61, "10.4mm Remington Model 1100 SA .410 Bore"),
/** 18.5mm Remington 11-87 SA 12 Gauge */
- $185MM_REMINGTON_11_87_SA_12_GAUGE (62, "18.5mm Remington 11-87 SA 12 Gauge"),
+ NAME_185MM_REMINGTON_11_87_SA_12_GAUGE (62, "18.5mm Remington 11-87 SA 12 Gauge"),
/** 15.6mm Remington 11-87 SA 20 Gauge */
- $156MM_REMINGTON_11_87_SA_20_GAUGE (63, "15.6mm Remington 11-87 SA 20 Gauge"),
+ NAME_156MM_REMINGTON_11_87_SA_20_GAUGE (63, "15.6mm Remington 11-87 SA 20 Gauge"),
/** 19.7mm Remington Model SP-10 SA 10 Gauge */
- $197MM_REMINGTON_MODEL_SP_10_SA_10_GAUGE (64, "19.7mm Remington Model SP-10 SA 10 Gauge"),
+ NAME_197MM_REMINGTON_MODEL_SP_10_SA_10_GAUGE (64, "19.7mm Remington Model SP-10 SA 10 Gauge"),
/** 18.5mm Remington 887 12 Gauge */
- $185MM_REMINGTON_887_12_GAUGE (65, "18.5mm Remington 887 12 Gauge"),
+ NAME_185MM_REMINGTON_887_12_GAUGE (65, "18.5mm Remington 887 12 Gauge"),
/** 18.5mm Remington Sparta 100 SxS 12 Gauge */
- $185MM_REMINGTON_SPARTA_100_SXS_12_GAUGE (70, "18.5mm Remington Sparta 100 SxS 12 Gauge"),
+ NAME_185MM_REMINGTON_SPARTA_100_SXS_12_GAUGE (70, "18.5mm Remington Sparta 100 SxS 12 Gauge"),
/** 15.6mm Remington Sparta 100 SxS 20 Gauge */
- $156MM_REMINGTON_SPARTA_100_SXS_20_GAUGE (71, "15.6mm Remington Sparta 100 SxS 20 Gauge"),
+ NAME_156MM_REMINGTON_SPARTA_100_SXS_20_GAUGE (71, "15.6mm Remington Sparta 100 SxS 20 Gauge"),
/** 10.4mm Remington Sparta 100 SxS .410 Bore */
- $104MM_REMINGTON_SPARTA_100_SXS_410_BORE (72, "10.4mm Remington Sparta 100 SxS .410 Bore"),
+ NAME_104MM_REMINGTON_SPARTA_100_SXS_410_BORE (72, "10.4mm Remington Sparta 100 SxS .410 Bore"),
/** 18.5mm Remington Spartan 310 O/U 12 Gauge */
- $185MM_REMINGTON_SPARTAN_310_O_U_12_GAUGE (73, "18.5mm Remington Spartan 310 O/U 12 Gauge"),
+ NAME_185MM_REMINGTON_SPARTAN_310_O_U_12_GAUGE (73, "18.5mm Remington Spartan 310 O/U 12 Gauge"),
/** 15.6mm Remington Spartan 310 O/U 20 Gauge */
- $156MM_REMINGTON_SPARTAN_310_O_U_20_GAUGE (74, "15.6mm Remington Spartan 310 O/U 20 Gauge"),
+ NAME_156MM_REMINGTON_SPARTAN_310_O_U_20_GAUGE (74, "15.6mm Remington Spartan 310 O/U 20 Gauge"),
/** 14mm Remington Spartan 310 O/U 28 Gauge */
- $14MM_REMINGTON_SPARTAN_310_O_U_28_GAUGE (75, "14mm Remington Spartan 310 O/U 28 Gauge"),
+ NAME_14MM_REMINGTON_SPARTAN_310_O_U_28_GAUGE (75, "14mm Remington Spartan 310 O/U 28 Gauge"),
/** 10.4mm Remington Spartan 310 O/U .410 Bore */
- $104MM_REMINGTON_SPARTAN_310_O_U_410_BORE (76, "10.4mm Remington Spartan 310 O/U .410 Bore"),
+ NAME_104MM_REMINGTON_SPARTAN_310_O_U_410_BORE (76, "10.4mm Remington Spartan 310 O/U .410 Bore"),
/** 18.5mm Remington Spartan 453 SA 12 Gauge */
- $185MM_REMINGTON_SPARTAN_453_SA_12_GAUGE (77, "18.5mm Remington Spartan 453 SA 12 Gauge"),
+ NAME_185MM_REMINGTON_SPARTAN_453_SA_12_GAUGE (77, "18.5mm Remington Spartan 453 SA 12 Gauge"),
/** 18.5mm Winchester Model 1200 12 Gauge */
- $185MM_WINCHESTER_MODEL_1200_12_GAUGE (80, "18.5mm Winchester Model 1200 12 Gauge"),
+ NAME_185MM_WINCHESTER_MODEL_1200_12_GAUGE (80, "18.5mm Winchester Model 1200 12 Gauge"),
/** 16.8mm Winchester Model 1200 16 Gauge */
- $168MM_WINCHESTER_MODEL_1200_16_GAUGE (81, "16.8mm Winchester Model 1200 16 Gauge"),
+ NAME_168MM_WINCHESTER_MODEL_1200_16_GAUGE (81, "16.8mm Winchester Model 1200 16 Gauge"),
/** 15.6mm Winchester Model 1200 20 Gauge */
- $156MM_WINCHESTER_MODEL_1200_20_GAUGE (82, "15.6mm Winchester Model 1200 20 Gauge"),
+ NAME_156MM_WINCHESTER_MODEL_1200_20_GAUGE (82, "15.6mm Winchester Model 1200 20 Gauge"),
/** Winchester Model 1887/1901 */
WINCHESTER_MODEL_1887_1901 (83, "Winchester Model 1887/1901"),
/** Winchester Model 1897 */
@@ -141,39 +141,39 @@ public enum LifeFormHumanSpecificShotGuns
/** Winchester Model 37 SxS */
WINCHESTER_MODEL_37_SXS (87, "Winchester Model 37 SxS"),
/** 18.5mm HR Ultraslug SxS 12 Gauge */
- $185MM_HR_ULTRASLUG_SXS_12_GAUGE (88, "18.5mm HR Ultraslug SxS 12 Gauge"),
+ NAME_185MM_HR_ULTRASLUG_SXS_12_GAUGE (88, "18.5mm HR Ultraslug SxS 12 Gauge"),
/** 15.6mm HR Ultraslug SxS 20 Gauge */
- $156MM_HR_ULTRASLUG_SXS_20_GAUGE (89, "15.6mm HR Ultraslug SxS 20 Gauge"),
+ NAME_156MM_HR_ULTRASLUG_SXS_20_GAUGE (89, "15.6mm HR Ultraslug SxS 20 Gauge"),
/** 18.5mm Ciener Ultimate O/U 12 Gauge */
- $185MM_CIENER_ULTIMATE_O_U_12_GAUGE (90, "18.5mm Ciener Ultimate O/U 12 Gauge"),
+ NAME_185MM_CIENER_ULTIMATE_O_U_12_GAUGE (90, "18.5mm Ciener Ultimate O/U 12 Gauge"),
/** 18.5mm Coach Gun SxS Double Barrel 12 Gauge */
- $185MM_COACH_GUN_SXS_DOUBLE_BARREL_12_GAUGE (91, "18.5mm Coach Gun SxS Double Barrel 12 Gauge"),
+ NAME_185MM_COACH_GUN_SXS_DOUBLE_BARREL_12_GAUGE (91, "18.5mm Coach Gun SxS Double Barrel 12 Gauge"),
/** 18.5mm Ruger Gold Label SxS 12 Gauge */
- $185MM_RUGER_GOLD_LABEL_SXS_12_GAUGE (92, "18.5mm Ruger Gold Label SxS 12 Gauge"),
+ NAME_185MM_RUGER_GOLD_LABEL_SXS_12_GAUGE (92, "18.5mm Ruger Gold Label SxS 12 Gauge"),
/** 18.5mm High Standard Model 10 SA 12 Gauge */
- $185MM_HIGH_STANDARD_MODEL_10_SA_12_GAUGE (93, "18.5mm High Standard Model 10 SA 12 Gauge"),
+ NAME_185MM_HIGH_STANDARD_MODEL_10_SA_12_GAUGE (93, "18.5mm High Standard Model 10 SA 12 Gauge"),
/** 18.5mm Kel-Tex KSG 12 Gauge */
- $185MM_KEL_TEX_KSG_12_GAUGE (94, "18.5mm Kel-Tex KSG 12 Gauge"),
+ NAME_185MM_KEL_TEX_KSG_12_GAUGE (94, "18.5mm Kel-Tex KSG 12 Gauge"),
/** 18.5 KAC Masterkey 12 Gauge */
- $185_KAC_MASTERKEY_12_GAUGE (95, "18.5 KAC Masterkey 12 Gauge"),
+ NAME_185_KAC_MASTERKEY_12_GAUGE (95, "18.5 KAC Masterkey 12 Gauge"),
/** 18.5mm M26 M.A.S.S. 12 Gauge */
- $185MM_M26_MASS_12_GAUGE (96, "18.5mm M26 M.A.S.S. 12 Gauge"),
+ NAME_185MM_M26_MASS_12_GAUGE (96, "18.5mm M26 M.A.S.S. 12 Gauge"),
/** 18.5mm SRM Arms M1216 SA 12 Gauge */
- $185MM_SRM_ARMS_M1216_SA_12_GAUGE (97, "18.5mm SRM Arms M1216 SA 12 Gauge"),
+ NAME_185MM_SRM_ARMS_M1216_SA_12_GAUGE (97, "18.5mm SRM Arms M1216 SA 12 Gauge"),
/** 18.5mm AA-12 FA Atchisson Assault */
- $185MM_AA_12_FA_ATCHISSON_ASSAULT (98, "18.5mm AA-12 FA Atchisson Assault"),
+ NAME_185MM_AA_12_FA_ATCHISSON_ASSAULT (98, "18.5mm AA-12 FA Atchisson Assault"),
/** 18.5mm Pancor Jackhammer FA 12 Gauge */
- $185MM_PANCOR_JACKHAMMER_FA_12_GAUGE (99, "18.5mm Pancor Jackhammer FA 12 Gauge"),
+ NAME_185MM_PANCOR_JACKHAMMER_FA_12_GAUGE (99, "18.5mm Pancor Jackhammer FA 12 Gauge"),
/** 18.5mm USAS-12 FA 12 Gauge */
- $185MM_USAS_12_FA_12_GAUGE (110, "18.5mm USAS-12 FA 12 Gauge"),
+ NAME_185MM_USAS_12_FA_12_GAUGE (110, "18.5mm USAS-12 FA 12 Gauge"),
/** 18.5mm MAUL SA 12 Gauge */
- $185MM_MAUL_SA_12_GAUGE (111, "18.5mm MAUL SA 12 Gauge"),
+ NAME_185MM_MAUL_SA_12_GAUGE (111, "18.5mm MAUL SA 12 Gauge"),
/** 18.5mm FN SLP SA 12 Gauge */
- $185MM_FN_SLP_SA_12_GAUGE (112, "18.5mm FN SLP SA 12 Gauge"),
+ NAME_185MM_FN_SLP_SA_12_GAUGE (112, "18.5mm FN SLP SA 12 Gauge"),
/** 18.5mm FN TPS 12 Gauge */
- $185MM_FN_TPS_12_GAUGE (113, "18.5mm FN TPS 12 Gauge"),
+ NAME_185MM_FN_TPS_12_GAUGE (113, "18.5mm FN TPS 12 Gauge"),
/** 18.5mm ENARM Pentagun SA 12 Gauge */
- $185MM_ENARM_PENTAGUN_SA_12_GAUGE (115, "18.5mm ENARM Pentagun SA 12 Gauge"),
+ NAME_185MM_ENARM_PENTAGUN_SA_12_GAUGE (115, "18.5mm ENARM Pentagun SA 12 Gauge"),
/** Stevens Model 520/620 */
STEVENS_MODEL_520_620 (116, "Stevens Model 520/620"),
/** Stoeger Coach Gun SxS */
@@ -181,117 +181,117 @@ public enum LifeFormHumanSpecificShotGuns
/** Stoeger Condor O/U */
STOEGER_CONDOR_O_U (118, "Stoeger Condor O/U"),
/** 18.5mm Armscor Model 30 SA 12 Gauge */
- $185MM_ARMSCOR_MODEL_30_SA_12_GAUGE (120, "18.5mm Armscor Model 30 SA 12 Gauge"),
+ NAME_185MM_ARMSCOR_MODEL_30_SA_12_GAUGE (120, "18.5mm Armscor Model 30 SA 12 Gauge"),
/** Weatherby SA-08 SA */
WEATHERBY_SA_08_SA (121, "Weatherby SA-08 SA"),
/** 18.5mm Fabarm SDASS Tactical 12 Gauge */
- $185MM_FABARM_SDASS_TACTICAL_12_GAUGE (122, "18.5mm Fabarm SDASS Tactical 12 Gauge"),
+ NAME_185MM_FABARM_SDASS_TACTICAL_12_GAUGE (122, "18.5mm Fabarm SDASS Tactical 12 Gauge"),
/** 18.5mm MAG-7 12 Gauge */
- $185MM_MAG_7_12_GAUGE (123, "18.5mm MAG-7 12 Gauge"),
+ NAME_185MM_MAG_7_12_GAUGE (123, "18.5mm MAG-7 12 Gauge"),
/** 18.5mm Neostead 12 Gauge */
- $185MM_NEOSTEAD_12_GAUGE (124, "18.5mm Neostead 12 Gauge"),
+ NAME_185MM_NEOSTEAD_12_GAUGE (124, "18.5mm Neostead 12 Gauge"),
/** 18.5mm Armsel Striker SA 12 Gauge */
- $185MM_ARMSEL_STRIKER_SA_12_GAUGE (125, "18.5mm Armsel Striker SA 12 Gauge"),
+ NAME_185MM_ARMSEL_STRIKER_SA_12_GAUGE (125, "18.5mm Armsel Striker SA 12 Gauge"),
/** 18.5mm Parker Hale Rogun SA 12 Gauge */
- $185MM_PARKER_HALE_ROGUN_SA_12_GAUGE (127, "18.5mm Parker Hale Rogun SA 12 Gauge"),
+ NAME_185MM_PARKER_HALE_ROGUN_SA_12_GAUGE (127, "18.5mm Parker Hale Rogun SA 12 Gauge"),
/** 26mm RGA-86 Revolver */
- $26MM_RGA_86_REVOLVER (130, "26mm RGA-86 Revolver"),
+ NAME_26MM_RGA_86_REVOLVER (130, "26mm RGA-86 Revolver"),
/** 18.5mm Sjorgren SA 12 Gauge */
- $185MM_SJORGREN_SA_12_GAUGE (131, "18.5mm Sjorgren SA 12 Gauge"),
+ NAME_185MM_SJORGREN_SA_12_GAUGE (131, "18.5mm Sjorgren SA 12 Gauge"),
/** 18.5mm Akdal MKA 1919 SA 12 Gauge */
- $185MM_AKDAL_MKA_1919_SA_12_GAUGE (132, "18.5mm Akdal MKA 1919 SA 12 Gauge"),
+ NAME_185MM_AKDAL_MKA_1919_SA_12_GAUGE (132, "18.5mm Akdal MKA 1919 SA 12 Gauge"),
/** 18.5mm Retay Masai Mara SA 12 Gauge */
- $185MM_RETAY_MASAI_MARA_SA_12_GAUGE (133, "18.5mm Retay Masai Mara SA 12 Gauge"),
+ NAME_185MM_RETAY_MASAI_MARA_SA_12_GAUGE (133, "18.5mm Retay Masai Mara SA 12 Gauge"),
/** 18.5mm Safir T-14 SA 12 Gauge */
- $185MM_SAFIR_T_14_SA_12_GAUGE (134, "18.5mm Safir T-14 SA 12 Gauge"),
+ NAME_185MM_SAFIR_T_14_SA_12_GAUGE (134, "18.5mm Safir T-14 SA 12 Gauge"),
/** 18.5mm Benelli M1 Super 90 SA 12 Gauge */
- $185MM_BENELLI_M1_SUPER_90_SA_12_GAUGE (150, "18.5mm Benelli M1 Super 90 SA 12 Gauge"),
+ NAME_185MM_BENELLI_M1_SUPER_90_SA_12_GAUGE (150, "18.5mm Benelli M1 Super 90 SA 12 Gauge"),
/** 15.6mm Benelli M1 Super 90 SA 20 Gauge */
- $156MM_BENELLI_M1_SUPER_90_SA_20_GAUGE (151, "15.6mm Benelli M1 Super 90 SA 20 Gauge"),
+ NAME_156MM_BENELLI_M1_SUPER_90_SA_20_GAUGE (151, "15.6mm Benelli M1 Super 90 SA 20 Gauge"),
/** 18.5mm Benelli M3 Super 90 SA 12 Gauge */
- $185MM_BENELLI_M3_SUPER_90_SA_12_GAUGE (152, "18.5mm Benelli M3 Super 90 SA 12 Gauge"),
+ NAME_185MM_BENELLI_M3_SUPER_90_SA_12_GAUGE (152, "18.5mm Benelli M3 Super 90 SA 12 Gauge"),
/** 15.6mm Benelli M3 Super 90 SA 20 Gauge */
- $156MM_BENELLI_M3_SUPER_90_SA_20_GAUGE (153, "15.6mm Benelli M3 Super 90 SA 20 Gauge"),
+ NAME_156MM_BENELLI_M3_SUPER_90_SA_20_GAUGE (153, "15.6mm Benelli M3 Super 90 SA 20 Gauge"),
/** 18.5mm Benelli M4 Super 90 SA 12 Gauge */
- $185MM_BENELLI_M4_SUPER_90_SA_12_GAUGE (154, "18.5mm Benelli M4 Super 90 SA 12 Gauge"),
+ NAME_185MM_BENELLI_M4_SUPER_90_SA_12_GAUGE (154, "18.5mm Benelli M4 Super 90 SA 12 Gauge"),
/** 18.5mm Benelli Nova 12 Gauge */
- $185MM_BENELLI_NOVA_12_GAUGE (155, "18.5mm Benelli Nova 12 Gauge"),
+ NAME_185MM_BENELLI_NOVA_12_GAUGE (155, "18.5mm Benelli Nova 12 Gauge"),
/** 15.6mm Benelli Nove 20 Gauge */
- $156MM_BENELLI_NOVE_20_GAUGE (156, "15.6mm Benelli Nove 20 Gauge"),
+ NAME_156MM_BENELLI_NOVE_20_GAUGE (156, "15.6mm Benelli Nove 20 Gauge"),
/** 18.5mm Benelli Raffaello SA 12 Gauge */
- $185MM_BENELLI_RAFFAELLO_SA_12_GAUGE (157, "18.5mm Benelli Raffaello SA 12 Gauge"),
+ NAME_185MM_BENELLI_RAFFAELLO_SA_12_GAUGE (157, "18.5mm Benelli Raffaello SA 12 Gauge"),
/** 18.5mm Benelli Supernova 12 Gauge */
- $185MM_BENELLI_SUPERNOVA_12_GAUGE (158, "18.5mm Benelli Supernova 12 Gauge"),
+ NAME_185MM_BENELLI_SUPERNOVA_12_GAUGE (158, "18.5mm Benelli Supernova 12 Gauge"),
/** 18.5mm Benelli Vinci SA 12 Gauge */
- $185MM_BENELLI_VINCI_SA_12_GAUGE (159, "18.5mm Benelli Vinci SA 12 Gauge"),
+ NAME_185MM_BENELLI_VINCI_SA_12_GAUGE (159, "18.5mm Benelli Vinci SA 12 Gauge"),
/** 18.5mm Beretta 1201FP SA 12 Gauge */
- $185MM_BERETTA_1201FP_SA_12_GAUGE (160, "18.5mm Beretta 1201FP SA 12 Gauge"),
+ NAME_185MM_BERETTA_1201FP_SA_12_GAUGE (160, "18.5mm Beretta 1201FP SA 12 Gauge"),
/** 18.5mm Beretta 682 O/U 12 Gauge */
- $185MM_BERETTA_682_O_U_12_GAUGE (161, "18.5mm Beretta 682 O/U 12 Gauge"),
+ NAME_185MM_BERETTA_682_O_U_12_GAUGE (161, "18.5mm Beretta 682 O/U 12 Gauge"),
/** 15.6mm Beretta 682 O/U 20 Gauge */
- $156MM_BERETTA_682_O_U_20_GAUGE (162, "15.6mm Beretta 682 O/U 20 Gauge"),
+ NAME_156MM_BERETTA_682_O_U_20_GAUGE (162, "15.6mm Beretta 682 O/U 20 Gauge"),
/** 14mm Beretta 682 O/U 28 Gauge */
- $14MM_BERETTA_682_O_U_28_GAUGE (163, "14mm Beretta 682 O/U 28 Gauge"),
+ NAME_14MM_BERETTA_682_O_U_28_GAUGE (163, "14mm Beretta 682 O/U 28 Gauge"),
/** 10.4mm Beretta 682 O/U .410 Bore */
- $104MM_BERETTA_682_O_U_410_BORE (164, "10.4mm Beretta 682 O/U .410 Bore"),
+ NAME_104MM_BERETTA_682_O_U_410_BORE (164, "10.4mm Beretta 682 O/U .410 Bore"),
/** 18.5mm Beretta A303 SA 12 Gauge */
- $185MM_BERETTA_A303_SA_12_GAUGE (165, "18.5mm Beretta A303 SA 12 Gauge"),
+ NAME_185MM_BERETTA_A303_SA_12_GAUGE (165, "18.5mm Beretta A303 SA 12 Gauge"),
/** 18.5mm Beretta AL391 SA 12 Gauge */
- $185MM_BERETTA_AL391_SA_12_GAUGE (166, "18.5mm Beretta AL391 SA 12 Gauge"),
+ NAME_185MM_BERETTA_AL391_SA_12_GAUGE (166, "18.5mm Beretta AL391 SA 12 Gauge"),
/** 15.6mm Beretta AL391 SA 20 Gauge */
- $156MM_BERETTA_AL391_SA_20_GAUGE (167, "15.6mm Beretta AL391 SA 20 Gauge"),
+ NAME_156MM_BERETTA_AL391_SA_20_GAUGE (167, "15.6mm Beretta AL391 SA 20 Gauge"),
/** 18.5mm Beretta DT-10 O/U 12 Gauge */
- $185MM_BERETTA_DT_10_O_U_12_GAUGE (168, "18.5mm Beretta DT-10 O/U 12 Gauge"),
+ NAME_185MM_BERETTA_DT_10_O_U_12_GAUGE (168, "18.5mm Beretta DT-10 O/U 12 Gauge"),
/** Beretta Silver Pigeon O/U */
BERETTA_SILVER_PIGEON_O_U (169, "Beretta Silver Pigeon O/U"),
/** 18.5mm Beretta Xtrema 2 SA 12 Gauge */
- $185MM_BERETTA_XTREMA_2_SA_12_GAUGE (170, "18.5mm Beretta Xtrema 2 SA 12 Gauge"),
+ NAME_185MM_BERETTA_XTREMA_2_SA_12_GAUGE (170, "18.5mm Beretta Xtrema 2 SA 12 Gauge"),
/** 15.6mm Franchi AL-48 SA 20 Gauge */
- $156MM_FRANCHI_AL_48_SA_20_GAUGE (171, "15.6mm Franchi AL-48 SA 20 Gauge"),
+ NAME_156MM_FRANCHI_AL_48_SA_20_GAUGE (171, "15.6mm Franchi AL-48 SA 20 Gauge"),
/** 14mm Franchi AL-48 SA 28 Gauge */
- $14MM_FRANCHI_AL_48_SA_28_GAUGE (172, "14mm Franchi AL-48 SA 28 Gauge"),
+ NAME_14MM_FRANCHI_AL_48_SA_28_GAUGE (172, "14mm Franchi AL-48 SA 28 Gauge"),
/** 10.4mm Franchi mod .410 FA .410 Bore */
- $104MM_FRANCHI_MOD_410_FA_410_BORE (173, "10.4mm Franchi mod .410 FA .410 Bore"),
+ NAME_104MM_FRANCHI_MOD_410_FA_410_BORE (173, "10.4mm Franchi mod .410 FA .410 Bore"),
/** 18.5mm Franchi SPAS-12 SA 12 Gauge */
- $185MM_FRANCHI_SPAS_12_SA_12_GAUGE (174, "18.5mm Franchi SPAS-12 SA 12 Gauge"),
+ NAME_185MM_FRANCHI_SPAS_12_SA_12_GAUGE (174, "18.5mm Franchi SPAS-12 SA 12 Gauge"),
/** 18.5mm Franchi SPAS-15 SA 12 Gauge */
- $185MM_FRANCHI_SPAS_15_SA_12_GAUGE (175, "18.5mm Franchi SPAS-15 SA 12 Gauge"),
+ NAME_185MM_FRANCHI_SPAS_15_SA_12_GAUGE (175, "18.5mm Franchi SPAS-15 SA 12 Gauge"),
/** 18.5mm Valtro PM-5/PM-5-350 12 Gauge */
- $185MM_VALTRO_PM_5_PM_5_350_12_GAUGE (176, "18.5mm Valtro PM-5/PM-5-350 12 Gauge"),
+ NAME_185MM_VALTRO_PM_5_PM_5_350_12_GAUGE (176, "18.5mm Valtro PM-5/PM-5-350 12 Gauge"),
/** Blazer F3 O/U */
BLAZER_F3_O_U (180, "Blazer F3 O/U"),
/** 18.5mm HK FABARM FP6 12 Gauge */
- $185MM_HK_FABARM_FP6_12_GAUGE (181, "18.5mm HK FABARM FP6 12 Gauge"),
+ NAME_185MM_HK_FABARM_FP6_12_GAUGE (181, "18.5mm HK FABARM FP6 12 Gauge"),
/** 18.5mm HK CAWS FA 12 Gauge */
- $185MM_HK_CAWS_FA_12_GAUGE (182, "18.5mm HK CAWS FA 12 Gauge"),
+ NAME_185MM_HK_CAWS_FA_12_GAUGE (182, "18.5mm HK CAWS FA 12 Gauge"),
/** 18.5mm Baikal MP-153 SA 12 Gauge */
- $185MM_BAIKAL_MP_153_SA_12_GAUGE (200, "18.5mm Baikal MP-153 SA 12 Gauge"),
+ NAME_185MM_BAIKAL_MP_153_SA_12_GAUGE (200, "18.5mm Baikal MP-153 SA 12 Gauge"),
/** 18.5mm Bandayevsky RB-12 12 Gauge */
- $185MM_BANDAYEVSKY_RB_12_12_GAUGE (201, "18.5mm Bandayevsky RB-12 12 Gauge"),
+ NAME_185MM_BANDAYEVSKY_RB_12_12_GAUGE (201, "18.5mm Bandayevsky RB-12 12 Gauge"),
/** 18.5mm Molot Bekas-M 12 Gauge */
- $185MM_MOLOT_BEKAS_M_12_GAUGE (202, "18.5mm Molot Bekas-M 12 Gauge"),
+ NAME_185MM_MOLOT_BEKAS_M_12_GAUGE (202, "18.5mm Molot Bekas-M 12 Gauge"),
/** 16.8mm Molot Bekas-M 16 Gauge */
- $168MM_MOLOT_BEKAS_M_16_GAUGE (203, "16.8mm Molot Bekas-M 16 Gauge"),
+ NAME_168MM_MOLOT_BEKAS_M_16_GAUGE (203, "16.8mm Molot Bekas-M 16 Gauge"),
/** 18.5mm TOZ-194 12 Gauge */
- $185MM_TOZ_194_12_GAUGE (204, "18.5mm TOZ-194 12 Gauge"),
+ NAME_185MM_TOZ_194_12_GAUGE (204, "18.5mm TOZ-194 12 Gauge"),
/** 23mm KS-23 */
- $23MM_KS_23 (205, "23mm KS-23"),
+ NAME_23MM_KS_23 (205, "23mm KS-23"),
/** MTs-255 Revoler 12 Gauge */
MTS_255_REVOLER_12_GAUGE (206, "MTs-255 Revoler 12 Gauge"),
/** 18.5mm RMB-93 12 Gauge */
- $185MM_RMB_93_12_GAUGE (207, "18.5mm RMB-93 12 Gauge"),
+ NAME_185MM_RMB_93_12_GAUGE (207, "18.5mm RMB-93 12 Gauge"),
/** 18.5mm Saiga-12 SA 12 Gauge */
- $185MM_SAIGA_12_SA_12_GAUGE (208, "18.5mm Saiga-12 SA 12 Gauge"),
+ NAME_185MM_SAIGA_12_SA_12_GAUGE (208, "18.5mm Saiga-12 SA 12 Gauge"),
/** 15.6mm Saiga-12 SA 20 Gauge */
- $156MM_SAIGA_12_SA_20_GAUGE (209, "15.6mm Saiga-12 SA 20 Gauge"),
+ NAME_156MM_SAIGA_12_SA_20_GAUGE (209, "15.6mm Saiga-12 SA 20 Gauge"),
/** 10.4mm Saiga-12 SA .410 Bore */
- $104MM_SAIGA_12_SA_410_BORE (210, "10.4mm Saiga-12 SA .410 Bore"),
+ NAME_104MM_SAIGA_12_SA_410_BORE (210, "10.4mm Saiga-12 SA .410 Bore"),
/** 18.5mm Vepr-12 SA 12 Gauge */
- $185MM_VEPR_12_SA_12_GAUGE (211, "18.5mm Vepr-12 SA 12 Gauge"),
+ NAME_185MM_VEPR_12_SA_12_GAUGE (211, "18.5mm Vepr-12 SA 12 Gauge"),
/** 18.5mm Fort 500 12 Gauge */
- $185MM_FORT_500_12_GAUGE (212, "18.5mm Fort 500 12 Gauge"),
+ NAME_185MM_FORT_500_12_GAUGE (212, "18.5mm Fort 500 12 Gauge"),
/** 18.5mm Norinco HP9-1 12 Gauge */
- $185MM_NORINCO_HP9_1_12_GAUGE (220, "18.5mm Norinco HP9-1 12 Gauge");
+ NAME_185MM_NORINCO_HP9_1_12_GAUGE (220, "18.5mm Norinco HP9-1 12 Gauge");
private int value;
private final String description;
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificSniper.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificSniper.java
index 2ab75b6bb2b28a30d81f5f12291488394a099e95..0be58b81f93f7a922ff1d3183190b7a698dce2cc 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificSniper.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificSniper.java
@@ -8,66 +8,66 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 481 marshal size 8<br>
- * Life Form-Human-Specific-Sniper
+ * LifeFormHumanSpecificSniper
*/
public enum LifeFormHumanSpecificSniper
{
/** Other */
OTHER (0, "Other"),
/** 5.8mm QBU-88 (Type 88) */
- $58MM_QBU_88_TYPE_88 (1, "5.8mm QBU-88 (Type 88)"),
+ NAME_58MM_QBU_88_TYPE_88 (1, "5.8mm QBU-88 (Type 88)"),
/** 7.62mm C3 */
- $762MM_C3 (30, "7.62mm C3"),
+ NAME_762MM_C3 (30, "7.62mm C3"),
/** 7.62mm FR F2 */
- $762MM_FR_F2 (31, "7.62mm FR F2"),
+ NAME_762MM_FR_F2 (31, "7.62mm FR F2"),
/** 7.62mm AWM-F (G22) */
- $762MM_AWM_F_G22 (32, "7.62mm AWM-F (G22)"),
+ NAME_762MM_AWM_F_G22 (32, "7.62mm AWM-F (G22)"),
/** 7.62mm G3 SG/1 */
- $762MM_G3_SG_1 (33, "7.62mm G3 SG/1"),
+ NAME_762MM_G3_SG_1 (33, "7.62mm G3 SG/1"),
/** 7.62mm Galil Sniper */
- $762MM_GALIL_SNIPER (34, "7.62mm Galil Sniper"),
+ NAME_762MM_GALIL_SNIPER (34, "7.62mm Galil Sniper"),
/** 7.62mm L96A1 */
- $762MM_L96A1 (35, "7.62mm L96A1"),
+ NAME_762MM_L96A1 (35, "7.62mm L96A1"),
/** 7.62mm M14 DMR */
- $762MM_M14_DMR (36, "7.62mm M14 DMR"),
+ NAME_762MM_M14_DMR (36, "7.62mm M14 DMR"),
/** 7.62mm M24 Sniper Weapon System (SWS) */
- $762MM_M24_SNIPER_WEAPON_SYSTEM_SWS (37, "7.62mm M24 Sniper Weapon System (SWS)"),
+ NAME_762MM_M24_SNIPER_WEAPON_SYSTEM_SWS (37, "7.62mm M24 Sniper Weapon System (SWS)"),
/** 7.62mm M40A1/A3 */
- $762MM_M40A1_A3 (38, "7.62mm M40A1/A3"),
+ NAME_762MM_M40A1_A3 (38, "7.62mm M40A1/A3"),
/** 7.62mm Steyr SSG 69 */
- $762MM_STEYR_SSG_69 (39, "7.62mm Steyr SSG 69"),
+ NAME_762MM_STEYR_SSG_69 (39, "7.62mm Steyr SSG 69"),
/** 7.62mm SVD (Dragunov) */
- $762MM_SVD_DRAGUNOV (40, "7.62mm SVD (Dragunov)"),
+ NAME_762MM_SVD_DRAGUNOV (40, "7.62mm SVD (Dragunov)"),
/** 7.62mm TYPE 79 */
- $762MM_TYPE_79 (41, "7.62mm TYPE 79"),
+ NAME_762MM_TYPE_79 (41, "7.62mm TYPE 79"),
/** 7.62mm SR-25 MK11 */
- $762MM_SR_25_MK11 (42, "7.62mm SR-25 MK11"),
+ NAME_762MM_SR_25_MK11 (42, "7.62mm SR-25 MK11"),
/** 7.62mm AW SR-98 */
- $762MM_AW_SR_98 (43, "7.62mm AW SR-98"),
+ NAME_762MM_AW_SR_98 (43, "7.62mm AW SR-98"),
/** 7.62mm Blaser R93 */
- $762MM_BLASER_R93 (44, "7.62mm Blaser R93"),
+ NAME_762MM_BLASER_R93 (44, "7.62mm Blaser R93"),
/** 7.7mm TYPE 99 */
- $77MM_TYPE_99 (100, "7.7mm TYPE 99"),
+ NAME_77MM_TYPE_99 (100, "7.7mm TYPE 99"),
/** 8.58mm Blaser R93 Tactical 2 */
- $858MM_BLASER_R93_TACTICAL_2 (105, "8.58mm Blaser R93 Tactical 2"),
+ NAME_858MM_BLASER_R93_TACTICAL_2 (105, "8.58mm Blaser R93 Tactical 2"),
/** 9mm VSS Vintorez */
- $9MM_VSS_VINTOREZ (110, "9mm VSS Vintorez"),
+ NAME_9MM_VSS_VINTOREZ (110, "9mm VSS Vintorez"),
/** 12.7mm Steyr HS .50 */
- $127MM_STEYR_HS_50 (170, "12.7mm Steyr HS .50"),
+ NAME_127MM_STEYR_HS_50 (170, "12.7mm Steyr HS .50"),
/** 12.7mm M82A1A Special Applications Scoped Rifle (SASR) */
- $127MM_M82A1A_SPECIAL_APPLICATIONS_SCOPED_RIFLE_SASR (171, "12.7mm M82A1A Special Applications Scoped Rifle (SASR)"),
+ NAME_127MM_M82A1A_SPECIAL_APPLICATIONS_SCOPED_RIFLE_SASR (171, "12.7mm M82A1A Special Applications Scoped Rifle (SASR)"),
/** 12.7mm NSV */
- $127MM_NSV (172, "12.7mm NSV"),
+ NAME_127MM_NSV (172, "12.7mm NSV"),
/** 12.7mm OSV-96 */
- $127MM_OSV_96 (173, "12.7mm OSV-96"),
+ NAME_127MM_OSV_96 (173, "12.7mm OSV-96"),
/** 12.7mm Rangemaster 50 */
- $127MM_RANGEMASTER_50 (174, "12.7mm Rangemaster 50"),
+ NAME_127MM_RANGEMASTER_50 (174, "12.7mm Rangemaster 50"),
/** 12.7mm V94 */
- $127MM_V94 (175, "12.7mm V94"),
+ NAME_127MM_V94 (175, "12.7mm V94"),
/** 20mm Denel NTW-20 */
- $20MM_DENEL_NTW_20 (200, "20mm Denel NTW-20");
+ NAME_20MM_DENEL_NTW_20 (200, "20mm Denel NTW-20");
private int value;
private final String description;
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificSubMachineGun.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificSubMachineGun.java
index 365e1d89f754980f28755bbf512aede3a42a1926..97e1d4812c96aa6d1a5246febc30ead51cc67ae1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificSubMachineGun.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificSubMachineGun.java
@@ -8,38 +8,38 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 482 marshal size 8<br>
- * Life Form-Human-Specific-Sub Machine Gun
+ * LifeFormHumanSpecificSubMachineGun
*/
public enum LifeFormHumanSpecificSubMachineGun
{
/** Other */
OTHER (0, "Other"),
/** 5.45mm AKS-74U (AKSU-74) */
- $545MM_AKS_74U_AKSU_74 (10, "5.45mm AKS-74U (AKSU-74)"),
+ NAME_545MM_AKS_74U_AKSU_74 (10, "5.45mm AKS-74U (AKSU-74)"),
/** 5.56mm Daewoo K1A */
- $556MM_DAEWOO_K1A (20, "5.56mm Daewoo K1A"),
+ NAME_556MM_DAEWOO_K1A (20, "5.56mm Daewoo K1A"),
/** 9mm Daewoo K7 */
- $9MM_DAEWOO_K7 (60, "9mm Daewoo K7"),
+ NAME_9MM_DAEWOO_K7 (60, "9mm Daewoo K7"),
/** 9mm MAC-10 */
- $9MM_MAC_10 (61, "9mm MAC-10"),
+ NAME_9MM_MAC_10 (61, "9mm MAC-10"),
/** 9mm Madsen MK II */
- $9MM_MADSEN_MK_II (62, "9mm Madsen MK II"),
+ NAME_9MM_MADSEN_MK_II (62, "9mm Madsen MK II"),
/** 9mm Mini-Uzi */
- $9MM_MINI_UZI (63, "9mm Mini-Uzi"),
+ NAME_9MM_MINI_UZI (63, "9mm Mini-Uzi"),
/** 9mm Model 83 Skorpion SMG */
- $9MM_MODEL_83_SKORPION_SMG (64, "9mm Model 83 Skorpion SMG"),
+ NAME_9MM_MODEL_83_SKORPION_SMG (64, "9mm Model 83 Skorpion SMG"),
/** 9mm MP5A2 */
- $9MM_MP5A2 (65, "9mm MP5A2"),
+ NAME_9MM_MP5A2 (65, "9mm MP5A2"),
/** 9mm MP5-N */
- $9MM_MP5_N (66, "9mm MP5-N"),
+ NAME_9MM_MP5_N (66, "9mm MP5-N"),
/** 9mm Sterling SMG */
- $9MM_STERLING_SMG (67, "9mm Sterling SMG"),
+ NAME_9MM_STERLING_SMG (67, "9mm Sterling SMG"),
/** 9mm Type CF-05 */
- $9MM_TYPE_CF_05 (68, "9mm Type CF-05"),
+ NAME_9MM_TYPE_CF_05 (68, "9mm Type CF-05"),
/** 9mm Uzi */
- $9MM_UZI (69, "9mm Uzi");
+ NAME_9MM_UZI (69, "9mm Uzi");
private int value;
private final String description;
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificWeaponNonspecific.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificWeaponNonspecific.java
index ead806ff8b87954841aa21da00eaefbfa7c6ea8c..296cbb3a28275050355b1919684a62b90279aea6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificWeaponNonspecific.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificWeaponNonspecific.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 514 marshal size 8<br>
- * Life Form-Human-Specific-Weapon Non-specific
+ * LifeFormHumanSpecificWeaponNonspecific
*/
public enum LifeFormHumanSpecificWeaponNonspecific
{
@@ -19,7 +19,11 @@ public enum LifeFormHumanSpecificWeaponNonspecific
/** Knife */
KNIFE (10, "Knife"),
/** Machete */
- MACHETE (50, "Machete");
+ MACHETE (50, "Machete"),
+ /** Explosive Vest */
+ EXPLOSIVE_VEST (100, "Explosive Vest"),
+ /** M18A1 Claymore */
+ M18A1_CLAYMORE (150, "M18A1 Claymore");
private int value;
private final String description;
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSubcategoryEquipmentClass.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSubcategoryEquipmentClass.java
index 43fd48fa95785388b6b5354451f04c74612a3c93..2a9088f4bcd548ce795979a8536b2afda329436f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSubcategoryEquipmentClass.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSubcategoryEquipmentClass.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 473 marshal size 8<br>
- * Life Form-Human-Subcategory-Equipment Class
+ * LifeFormHumanSubcategoryEquipmentClass
*/
public enum LifeFormHumanSubcategoryEquipmentClass
{
@@ -44,8 +44,11 @@ public enum LifeFormHumanSubcategoryEquipmentClass
/** Sensors, Subcategories 151-159 are restricted to sensor equipment classes. */
SENSORS (151, "Sensors"),
/** LifeFormHumanSpecificEquipmentClass */ SIGNAL_SENSOR_2 (152, "Signal Sensor"),
+ /** LifeFormHumanSpecificLasersClass */ LASERS_2 (153, "Lasers"),
/** Animal Companion, Subcategories 160-169 are restricted to animal companion classes. */
- ANIMAL_COMPANION (160, "Animal Companion");
+ ANIMAL_COMPANION (160, "Animal Companion"),
+ /** LifeFormHumanSpecificPersonalElectronicsClass */ PERSONAL_ELECTRONICS_2 (171, "Personal Electronics"),
+ /** LifeFormHumanSpecificLogisticsEQClass */ LOGISTICS_EQUIPMENT_2 (172, "Logistics Equipment");
private int value;
private final String description;
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormLandCategories.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormLandCategories.java
index ef8448674a215a4454e441b161098681680e1b24..01fad495b7a2d325666df5c731cb8f1d27bb3625 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormLandCategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormLandCategories.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 472 marshal size 8<br>
- * Life Form Land Categories
+ * LifeFormLandCategories
*/
public enum LifeFormLandCategories implements Category
{
@@ -52,6 +52,8 @@ public enum LifeFormLandCategories implements Category
EMERGENCY_MEDICAL_TECHNICIAN_EMT (131, "Emergency Medical Technician (EMT)"),
/** Firefighter */
FIREFIGHTER (132, "Firefighter"),
+ /** Press */
+ PRESS (133, "Press"),
/** SubcategoriesforLandCategory200Mammal */ MAMMAL_2 (200, "Mammal"),
/** SubcategoriesforLandCategory201Reptile */ REPTILE_2 (201, "Reptile"),
/** SubcategoriesforLandCategory202Amphibian */ AMPHIBIAN_2 (202, "Amphibian"),
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormSubsurfaceCategories.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormSubsurfaceCategories.java
index 5cb291be956be45420c46a46e7ff353aa3177941..1513b71ea6a9f542536025174fd1b5eafc7d55b2 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormSubsurfaceCategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormSubsurfaceCategories.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 479 marshal size 8<br>
- * Life Form Subsurface Categories
+ * LifeFormSubsurfaceCategories
*/
public enum LifeFormSubsurfaceCategories
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsAppearance.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsAppearance.java
index 13702b88750b3079e80db6c92b9764d488fdfd8b..9107edb1d9a16ea2c0fffe62a6785d9403c51da7 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsAppearance.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsAppearance.java
@@ -3,16 +3,16 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 37 marshal size 32<br>
- * Life Forms Appearance
+ * LifeFormsAppearance
*/
public class LifeFormsAppearance extends DisBitSet
{
/**
* Describes the visual paint design, Use {@link AppearancePaintScheme} values for this field
*/
- public static Bits PAINT_SCHEME = new Bits(0, 1, AppearancePaintScheme.class);
+ public static Bits PAINTSCHEME = new Bits(0, 1, AppearancePaintScheme.class);
/**
* Describes the visual appearance of the severity of any injury, Use {@link AppearanceLifeformHealth} values for this field
*/
@@ -20,63 +20,63 @@ public class LifeFormsAppearance extends DisBitSet
/**
* Describes the manner and degree to which the life form is complying, Use {@link AppearanceLifeFormComplianceStatus} values for this field
*/
- public static Bits COMPLIANCE_STATUS = new Bits(5, 4, AppearanceLifeFormComplianceStatus.class);
+ public static Bits COMPLIANCESTATUS = new Bits(5, 4, AppearanceLifeFormComplianceStatus.class);
/**
* Describes whether signal smoke is being used or not
*/
- public static Bits SIGNAL_SMOKE_IN_USE = new Bits(11, 1);
+ public static Bits SIGNALSMOKEINUSE = new Bits(11, 1);
/**
* Describes whether flash lights are on or off
*/
- public static Bits FLASH_LIGHTS_ON = new Bits(12, 1);
+ public static Bits FLASHLIGHTSON = new Bits(12, 1);
/**
* Describes whether a signal mirror is being used or not
*/
- public static Bits SIGNAL_MIRROR_IN_USE = new Bits(13, 1);
+ public static Bits SIGNALMIRRORINUSE = new Bits(13, 1);
/**
* Describes whether an IR strobe is on or off
*/
- public static Bits IR_STROBE_ON = new Bits(14, 1);
+ public static Bits IRSTROBEON = new Bits(14, 1);
/**
* Describes whether an IR illuminator (flare) is on or off
*/
- public static Bits IR_ILLUMINATOR_ON = new Bits(15, 1);
+ public static Bits IRILLUMINATORON = new Bits(15, 1);
/**
* Describes the posture (position) of the life form, Use {@link AppearanceLifeFormPosture} values for this field
*/
- public static Bits LIFE_FORM_POSTURE = new Bits(16, 4, AppearanceLifeFormPosture.class);
+ public static Bits LIFEFORMPOSTURE = new Bits(16, 4, AppearanceLifeFormPosture.class);
/**
* Describes whether the entity is frozen and should not be dead reckoned
*/
- public static Bits IS_FROZEN = new Bits(21, 1);
+ public static Bits ISFROZEN = new Bits(21, 1);
/**
* Describes whether or not the life form is mounted/hoisted on another platform, such as a troop transport or helicopter hoist
*/
- public static Bits MOUNTED_HOISTED_STATUS = new Bits(22, 1);
+ public static Bits MOUNTED_HOISTEDSTATUS = new Bits(22, 1);
/**
* Describes whether the entity is active or deactivated, Use {@link AppearanceEntityorObjectState} values for this field
*/
public static Bits STATE = new Bits(23, 1, AppearanceEntityorObjectState.class);
/**
- * Describes the position of the life form's primary weapon/implement, Use {@link AppearanceLifeFormWeaponImplement} values for this field
+ * Describes the position of the life forms primary weapon/implement, Use {@link AppearanceLifeFormWeaponImplement} values for this field
*/
- public static Bits WEAPON_IMPLEMENT_1 = new Bits(24, 2, AppearanceLifeFormWeaponImplement.class);
+ public static Bits WEAPON_IMPLEMENT1 = new Bits(24, 2, AppearanceLifeFormWeaponImplement.class);
/**
- * Describes the position of the life form's secondary weapon/implement, Use {@link AppearanceLifeFormWeaponImplement} values for this field
+ * Describes the position of the life forms secondary weapon/implement, Use {@link AppearanceLifeFormWeaponImplement} values for this field
*/
- public static Bits WEAPON_IMPLEMENT_2 = new Bits(26, 2, AppearanceLifeFormWeaponImplement.class);
+ public static Bits WEAPON_IMPLEMENT2 = new Bits(26, 2, AppearanceLifeFormWeaponImplement.class);
/**
* Describes the camouflage color, Use {@link AppearanceCamouflageType} values for this field
*/
- public static Bits CAMOUFLAGE_TYPE = new Bits(28, 2, AppearanceCamouflageType.class);
+ public static Bits CAMOUFLAGETYPE = new Bits(28, 2, AppearanceCamouflageType.class);
/**
* Describes whether or not the life form is in a prepared concealed position, Use {@link AppearanceConcealedPosition} values for this field
*/
- public static Bits CONCEALED_STATIONARY = new Bits(30, 1, AppearanceConcealedPosition.class);
+ public static Bits CONCEALEDSTATIONARY = new Bits(30, 1, AppearanceConcealedPosition.class);
/**
* Describes whether or not the life form uses concealment during movement, Use {@link AppearanceConcealedMovement} values for this field
*/
- public static Bits CONCEALED_MOVEMENT = new Bits(31, 1, AppearanceConcealedMovement.class);
+ public static Bits CONCEALEDMOVEMENT = new Bits(31, 1, AppearanceConcealedMovement.class);
public static class Bits
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsCapabilities.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsCapabilities.java
index ee2633c50bf7ff20d2a450f6974577789cc2afa8..2ac7f62b9e95905b1d5f83531e91787768e2f67e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsCapabilities.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsCapabilities.java
@@ -3,20 +3,20 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 456 marshal size 32<br>
- * Life Forms Capabilities
+ * LifeFormsCapabilities
*/
public class LifeFormsCapabilities extends DisBitSet implements EntityCapabilities
{
/**
* Describes whether the entity is able to supply some type of ammunition in response to an appropriate service request
*/
- public static Bits AMMUNITION_SUPPLY = new Bits(0, 1);
+ public static Bits AMMUNITIONSUPPLY = new Bits(0, 1);
/**
* Describes whether the entity is able to supply some type of fuel in response to an appropriate service request
*/
- public static Bits FUEL_SUPPLY = new Bits(1, 1);
+ public static Bits FUELSUPPLY = new Bits(1, 1);
/**
* Describes whether the entity is able to provide recovery (e.g., towing) services in response to an appropriate service request
*/
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryCISWeapons.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryCISWeapons.java
index 94c58ef8f2265e25ba0736f0f1d6524ad682e2d6..25b01e9a015f65d2bd64000e6a64ff2705519eaf 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryCISWeapons.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryCISWeapons.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 17 marshal size 8<br>
- * Life Forms-Subcategory-C.I.S. Weapons
+ * LifeFormsSubcategoryC.I.S.Weapons
*/
public enum LifeFormsSubcategoryCISWeapons implements SubCategory
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryFrenchWeapons.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryFrenchWeapons.java
index b447043498fcaa1effffe9d9e0131fd7f0ba4ecf..5909a67491991595d7933d5b4e55e6a700b32d8a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryFrenchWeapons.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryFrenchWeapons.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 19 marshal size 8<br>
- * Life Forms-Subcategory-French Weapons
+ * LifeFormsSubcategoryFrenchWeapons
*/
public enum LifeFormsSubcategoryFrenchWeapons implements SubCategory
{
@@ -27,7 +27,7 @@ public enum LifeFormsSubcategoryFrenchWeapons implements SubCategory
/** AA-52 machine gun */
AA_52_MACHINE_GUN (6, "AA-52 machine gun"),
/** 58-mm rifle grenade */
- $58_MM_RIFLE_GRENADE (7, "58-mm rifle grenade"),
+ NAME_58_MM_RIFLE_GRENADE (7, "58-mm rifle grenade"),
/** FR-F1 sniper rifle */
FR_F1_SNIPER_RIFLE (8, "FR-F1 sniper rifle");
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryGermanWeapons.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryGermanWeapons.java
index f0f3ca675f2450f642324faebf03a9e80ddd9c45..d921e04fd6a89a3d673b88b75d7b2afcf43957e5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryGermanWeapons.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryGermanWeapons.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 20 marshal size 8<br>
- * Life Forms-Subcategory-German Weapons
+ * LifeFormsSubcategoryGermanWeapons
*/
public enum LifeFormsSubcategoryGermanWeapons implements SubCategory
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryIranianWeapons.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryIranianWeapons.java
index 87d034705a625610dbefd6e51d39b0ca7139bedb..fee785073c5ef80e588f9d72907f84e28e1ccba6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryIranianWeapons.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryIranianWeapons.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 471 marshal size 8<br>
- * Life Forms-Subcategory-Iranian Weapons
+ * LifeFormsSubcategoryIranianWeapons
*/
public enum LifeFormsSubcategoryIranianWeapons implements SubCategory
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryUKWeapons.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryUKWeapons.java
index 2cb9be2acdb5cd8fe8f8460205282cbccf863124..af952497285caa69b05a201c17347cf4bb688b5c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryUKWeapons.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryUKWeapons.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 18 marshal size 8<br>
- * Life Forms-Subcategory-U.K. Weapons
+ * LifeFormsSubcategoryU.K.Weapons
*/
public enum LifeFormsSubcategoryUKWeapons implements SubCategory
{
@@ -21,7 +21,7 @@ public enum LifeFormsSubcategoryUKWeapons implements SubCategory
/** Javelin */
JAVELIN (3, "Javelin"),
/** 51-mm mortar */
- $51_MM_MORTAR (4, "51-mm mortar"),
+ NAME_51_MM_MORTAR (4, "51-mm mortar"),
/** SLR 7.62-mm rifle */
SLR_762_MM_RIFLE (5, "SLR 7.62-mm rifle"),
/** Sterling 9-mm submachine gun */
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryUSWeapons.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryUSWeapons.java
index d3a3b49045f0ab0a9d562485c9e3a9d7adaa1a99..e9b30c818f3517992ccfaa448bbcf720b569b388 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryUSWeapons.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryUSWeapons.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 16 marshal size 8<br>
- * Life Forms-Subcategory-U.S. Weapons
+ * LifeFormsSubcategoryU.S.Weapons
*/
public enum LifeFormsSubcategoryUSWeapons implements SubCategory
{
@@ -24,8 +24,8 @@ public enum LifeFormsSubcategoryUSWeapons implements SubCategory
DE_COCKER_KP90DC_45 (4, "De-cocker KP90DC .45"),
/** De-cocker KP91DC .40 */
DE_COCKER_KP91DC_40 (5, "De-cocker KP91DC .40"),
- /** General officer's Model 15 .45 */
- GENERAL_OFFICERS_MODEL_15_45 (6, "General officer's Model 15 .45"),
+ /** General officers Model 15 .45 */
+ GENERAL_OFFICERS_MODEL_15_45 (6, "General officers Model 15 .45"),
/** Nova 9-mm, LaFrance */
NOVA_9_MM_LAFRANCE (7, "Nova 9-mm, LaFrance"),
/** Personal Defense Weapon MP5K-PDW 9-mm */
@@ -33,7 +33,7 @@ public enum LifeFormsSubcategoryUSWeapons implements SubCategory
/** Silenced Colt .45, LaFrance */
SILENCED_COLT_45_LAFRANCE (9, "Silenced Colt .45, LaFrance"),
/** 5900-series 9-mm, Smith and Wesson (SandW) */
- $5900_SERIES_9_MM_SMITH_WESSON_SW (10, "5900-series 9-mm, Smith & Wesson (S&W)"),
+ NAME_5900_SERIES_9_MM_SMITH_WESSON_SW (10, "5900-series 9-mm, Smith & Wesson (S&W)"),
/** M9 */
M9 (11, "M9"),
/** Model 1911A1, Springfield Armory */
@@ -109,7 +109,7 @@ public enum LifeFormsSubcategoryUSWeapons implements SubCategory
/** MP5/10 10-mm */
MP5_10_10_MM (47, "MP5/10 10-mm"),
/** 9-mm, Colt */
- $9_MM_COLT (48, "9-mm, Colt"),
+ NAME_9_MM_COLT (48, "9-mm, Colt"),
/** Ingram */
INGRAM (49, "Ingram"),
/** Externally powered (EPG) 7.62-mm, Ares */
@@ -139,7 +139,7 @@ public enum LifeFormsSubcategoryUSWeapons implements SubCategory
/** M1919A4 .30-cal, Browning */
M1919A4_30_CAL_BROWNING (62, "M1919A4 .30-cal, Browning"),
/** .50-cal, Browning */
- $50_CAL_BROWNING (63, ".50-cal, Browning"),
+ NAME_50_CAL_BROWNING (63, ".50-cal, Browning"),
/** Colored-smoke hand grenade M18 */
COLORED_SMOKE_HAND_GRENADE_M18 (64, "Colored-smoke hand grenade M18"),
/** Colored-smoke grenades, Federal Laboratories */
@@ -232,8 +232,8 @@ public enum LifeFormsSubcategoryUSWeapons implements SubCategory
RIFLE_LAUNCHER_ANTI_ARMOR_MUNITION_RAAM_OLIN (108, "Rifle-launcher Anti-Armor Munition (RAAM), Olin"),
/** Rocket launcher M-20 3.5-in */
ROCKET_LAUNCHER_M_20_35_IN (109, "Rocket launcher M-20 3.5-in"),
- /** Rocket launcher, Enhanced M72 "E series" HEAT, 66-mm */
- ROCKET_LAUNCHER_ENHANCED_M72_E_SERIES_HEAT_66_MM (110, "Rocket launcher, Enhanced M72 'E series' HEAT, 66-mm"),
+ /** Rocket launcher, Enhanced M72 E series HEAT, 66-mm */
+ ROCKET_LAUNCHER_ENHANCED_M72_E_SERIES_HEAT_66_MM (110, "Rocket launcher, Enhanced M72 E series HEAT, 66-mm"),
/** Selective fire weapon AC-556 5.56-mm, Ruger */
SELECTIVE_FIRE_WEAPON_AC_556_556_MM_RUGER (111, "Selective fire weapon AC-556 5.56-mm, Ruger"),
/** Selective fire weapon AC-556F 5.56-mm, Ruger */
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeSavingEquipment.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeSavingEquipment.java
index 3f91a469f1dd19d82ffa73633e3d58d650f6ad70..c5c78d620ec2bab843cfada2cdbf160aef053f3b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeSavingEquipment.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeSavingEquipment.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
- * UID 633 marshal size null<br>
- * Life-Saving Equipment<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
+ * UID 633 marshal size 8<br>
+ * LifeSavingEquipment<br>
* Subcategories for Surface Platform Category 101. For Subcategory 1-3. Use the Extra field to specify the capacity 1-255 persons.
*/
public enum LifeSavingEquipment implements SubCategory
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceBreach.java b/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceBreach.java
index 30580fd9328d88ed7ff6aff6ad3877a767faa931..b0bf4de58fbfd59fc8b628a05e0c0e36c40070db 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceBreach.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceBreach.java
@@ -3,9 +3,9 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 238 marshal size 16<br>
- * Linear Object Appearance-Breach
+ * LinearObjectAppearanceBreach
*/
public class LinearObjectAppearanceBreach extends DisBitSet
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceExhaustSmoke.java b/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceExhaustSmoke.java
index 5949356e450dafd0af73735259a24ff6725c41b7..ab0204061cfbf0ce5bab781688d1219d23526fac 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceExhaustSmoke.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceExhaustSmoke.java
@@ -3,24 +3,24 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 236 marshal size 16<br>
- * Linear Object Appearance-Exhaust smoke
+ * LinearObjectAppearanceExhaustsmoke
*/
public class LinearObjectAppearanceExhaustSmoke extends DisBitSet
{
/**
* 8-bit unsigned integer indicating the percent opacity of the smoke (0..100)
*/
- public static Bits OPACITY_PERCENT = new Bits(0, 8);
+ public static Bits OPACITYPERCENT = new Bits(0, 8);
/**
* Describes whether or not the smoke is attached to the vehicle
*/
- public static Bits SMOKE_IS_ATTACHED = new Bits(8, 1);
+ public static Bits SMOKEISATTACHED = new Bits(8, 1);
/**
* Describes the chemical content of the smoke, Use {@link AppearanceObjectSpecificChemicalType} values for this field
*/
- public static Bits CHEMICAL_TYPE = new Bits(9, 2, AppearanceObjectSpecificChemicalType.class);
+ public static Bits CHEMICALTYPE = new Bits(9, 2, AppearanceObjectSpecificChemicalType.class);
public static class Bits
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceMinefieldLaneMarker.java b/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceMinefieldLaneMarker.java
index 37f1c12413b9a7185b400b669fcd82a7edd1b9af..f0777ab6e4a354f41e06fed15983ce27781cde9a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceMinefieldLaneMarker.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceMinefieldLaneMarker.java
@@ -3,16 +3,16 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 237 marshal size 16<br>
- * Linear Object Appearance-Minefield Lane Marker
+ * LinearObjectAppearanceMinefieldLaneMarker
*/
public class LinearObjectAppearanceMinefieldLaneMarker extends DisBitSet
{
/**
* Describes the visible side of the lane marker, Use {@link AppearanceLinearObjectLaneMarkerVisible} values for this field
*/
- public static Bits VISIBLE_SIDE = new Bits(0, 2, AppearanceLinearObjectLaneMarkerVisible.class);
+ public static Bits VISIBLESIDE = new Bits(0, 2, AppearanceLinearObjectLaneMarkerVisible.class);
public static class Bits
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceSpeedBump.java b/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceSpeedBump.java
index aaa6897a260db0199cc83df8a6b3df8bc1b75ca1..7797e27021398ccc51ce025b079fa43fb2bb8add 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceSpeedBump.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceSpeedBump.java
@@ -3,9 +3,9 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 489 marshal size 32<br>
- * Linear Object Appearance-Speed Bump
+ * LinearObjectAppearanceSpeedBump
*/
public class LinearObjectAppearanceSpeedBump extends DisBitSet
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceTankDitchAndConcertinaWire.java b/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceTankDitchAndConcertinaWire.java
index 482392b9979aa16501a2b6446598b098982341b1..a584ee71ceabc1d0c32b6feaf0f3ab6b9326f872 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceTankDitchAndConcertinaWire.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceTankDitchAndConcertinaWire.java
@@ -3,24 +3,24 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 235 marshal size 16<br>
- * Linear Object Appearance-Tank Ditch and Concertina Wire
+ * LinearObjectAppearanceTankDitchandConcertinaWire
*/
public class LinearObjectAppearanceTankDitchAndConcertinaWire extends DisBitSet
{
/**
* Describes the breached appearance of the object, Use {@link AppearanceLinearObjectTankDitchBreach} values for this field
*/
- public static Bits BREACH_STATE = new Bits(0, 2, AppearanceLinearObjectTankDitchBreach.class);
+ public static Bits BREACHSTATE = new Bits(0, 2, AppearanceLinearObjectTankDitchBreach.class);
/**
* 8-bit unsigned integer indicating the fixed length in meters of a breached segment
*/
- public static Bits BREACH_LENGTH = new Bits(16, 8);
+ public static Bits BREACHLENGTH = new Bits(16, 8);
/**
* 8-bit record where each bit indicates whether its associated segment is breached or not, such that bit 0 of the record is the first segment
*/
- public static Bits BREACH_LOCATION = new Bits(24, 8);
+ public static Bits BREACHLOCATION = new Bits(24, 8);
public static class Bits
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceWire.java b/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceWire.java
index 3656e111545e566b142bba8cdd35c1ea78905eb9..50f57182f6d7690fe3bd7aadcf21cbce1b7e9a1e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceWire.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceWire.java
@@ -3,9 +3,9 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 488 marshal size 32<br>
- * Linear Object Appearance-Wire
+ * LinearObjectAppearanceWire
*/
public class LinearObjectAppearanceWire extends DisBitSet
{
@@ -20,7 +20,7 @@ public class LinearObjectAppearanceWire extends DisBitSet
/**
* Describes whether the wire is buried or not
*/
- public static Bits IS_BURIED = new Bits(20, 1);
+ public static Bits ISBURIED = new Bits(20, 1);
public static class Bits
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Link1111BDataTerminalSetIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/Link1111BDataTerminalSetIndicator.java
index 7b4188f6b29e9c56b9f16c53da1e820f7cc30dc4..9f2de62600b6f5a4c41544f9a9f5b9103d5442a5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Link1111BDataTerminalSetIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Link1111BDataTerminalSetIndicator.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 469 marshal size 8<br>
- * Link 11/11B Data Terminal Set Indicator
+ * Link11DataTerminalSetIndicator
*/
public enum Link1111BDataTerminalSetIndicator
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Link1111BFidelityLevel.java b/src-generated/edu/nps/moves/dis7/enumerations/Link1111BFidelityLevel.java
index 1a204f0e3e63d00513d972a08458038bbe941035..696c3a34c2340fcedfc3b17c80c14543b292aee4 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Link1111BFidelityLevel.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Link1111BFidelityLevel.java
@@ -8,14 +8,14 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 467 marshal size 8<br>
- * Link 11/11B Fidelity Level
+ * Link11/11BFidelityLevel
*/
public enum Link1111BFidelityLevel
{
- /** No Statement */
- NO_STATEMENT (0, "No Statement"),
+ /** Fidelity Level 0 */
+ FIDELITY_LEVEL_0 (0, "Fidelity Level 0"),
/** Fidelity Level 1 */
FIDELITY_LEVEL_1 (1, "Fidelity Level 1"),
/** Fidelity Level 2 */
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Link1111BModeofOperation.java b/src-generated/edu/nps/moves/dis7/enumerations/Link1111BModeofOperation.java
index 6a8e73953f45c656ce96a70d85b8e2598319335c..812ccd708d6e068c825d23bba31dcf45bacb4d44 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Link1111BModeofOperation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Link1111BModeofOperation.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 470 marshal size 16<br>
- * Link 11/11B Mode of Operation
+ * Link11ModeofOperation
*/
public enum Link1111BModeofOperation
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Link1111BTerminalMode.java b/src-generated/edu/nps/moves/dis7/enumerations/Link1111BTerminalMode.java
index 14e8c895a3d0c424e5b70fca096e2a25649cabde..07e908c44e43ee59c7e67522086ff0d79902b074 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Link1111BTerminalMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Link1111BTerminalMode.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 468 marshal size 8<br>
- * Link 11/11B Terminal Mode
+ * Link11TerminalMode
*/
public enum Link1111BTerminalMode
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Link11BDataSignalingRate.java b/src-generated/edu/nps/moves/dis7/enumerations/Link11BDataSignalingRate.java
new file mode 100644
index 0000000000000000000000000000000000000000..827a4f9f1a1663fe0f2bc04556204f177d93c62d
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Link11BDataSignalingRate.java
@@ -0,0 +1,110 @@
+package edu.nps.moves.dis7.enumerations;
+
+import java.nio.ByteBuffer;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+import edu.nps.moves.dis7.*;
+
+/**
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
+ * UID 740 marshal size 8<br>
+ * Link11BDataSignalingRate
+ */
+public enum Link11BDataSignalingRate
+{
+ /** No Statement */
+ NO_STATEMENT (0, "No Statement"),
+ /** Not Used */
+ NOT_USED (1, "Not Used"),
+ /** Not Used */
+ NOT_USED_2 (2, "Not Used"),
+ /** 1200 bps */
+ NAME_1200_BPS (3, "1200 bps"),
+ /** 2400 bps */
+ NAME_2400_BPS (4, "2400 bps"),
+ /** 600 bps */
+ NAME_600_BPS (5, "600 bps");
+
+ private int value;
+ private final String description;
+
+ Link11BDataSignalingRate(int value, String description)
+ {
+ this.value = value;
+ this.description = description;
+ }
+
+ public int getValue()
+ {
+ return value;
+ }
+
+ public String getDescription()
+ {
+ return description;
+ }
+
+ public static int getEnumBitWidth()
+ {
+ return 8;
+ }
+
+ public static Link11BDataSignalingRate getEnumForValue(int i)
+ {
+ for(Link11BDataSignalingRate val: Link11BDataSignalingRate.values()) {
+ if(val.getValue()==i)
+ return val;
+ }
+ System.err.println("No enumeration found for value " + i + " of enumeration Link11BDataSignalingRate");
+ return null;
+ }
+
+
+ public void marshal(DataOutputStream dos) throws IOException
+ {
+ dos.writeByte(getValue());
+ }
+
+ public void marshal(ByteBuffer buff) throws Exception
+ {
+ buff.put((byte)getValue());
+ }
+
+ public static Link11BDataSignalingRate unmarshalEnum (DataInputStream dis) throws Exception
+ {
+ /* try {
+ value = dis.readUnsignedByte();
+ }
+ catch(IOException ex) {
+ showError(ex);
+ } */
+
+ return getEnumForValue(dis.readByte());
+ }
+
+ public static Link11BDataSignalingRate unmarshalEnum(ByteBuffer buff) throws Exception
+ {
+ /*
+ try {
+ value = (int)buff.get();
+ }
+ catch(Exception ex) {
+ showError(ex);
+ }
+ */
+ return getEnumForValue(buff.get());
+ }
+
+ public int getMarshalledSize()
+ {
+ return 1; // 8 bits
+ }
+
+ @Override
+ public String toString()
+ {
+ return "Link11BDataSignalingRate: " + name() + ": " + getValue();
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Link11BLinkState.java b/src-generated/edu/nps/moves/dis7/enumerations/Link11BLinkState.java
new file mode 100644
index 0000000000000000000000000000000000000000..4803ae83976c3bae216c2b3595b342fb7e9b2488
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Link11BLinkState.java
@@ -0,0 +1,108 @@
+package edu.nps.moves.dis7.enumerations;
+
+import java.nio.ByteBuffer;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+import edu.nps.moves.dis7.*;
+
+/**
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
+ * UID 737 marshal size 8<br>
+ * Link11BLinkState
+ */
+public enum Link11BLinkState
+{
+ /** No Statement */
+ NO_STATEMENT (0, "No Statement"),
+ /** Inactive */
+ INACTIVE (1, "Inactive"),
+ /** Ready */
+ READY (2, "Ready"),
+ /** Active */
+ ACTIVE (3, "Active"),
+ /** Operational */
+ OPERATIONAL (4, "Operational");
+
+ private int value;
+ private final String description;
+
+ Link11BLinkState(int value, String description)
+ {
+ this.value = value;
+ this.description = description;
+ }
+
+ public int getValue()
+ {
+ return value;
+ }
+
+ public String getDescription()
+ {
+ return description;
+ }
+
+ public static int getEnumBitWidth()
+ {
+ return 8;
+ }
+
+ public static Link11BLinkState getEnumForValue(int i)
+ {
+ for(Link11BLinkState val: Link11BLinkState.values()) {
+ if(val.getValue()==i)
+ return val;
+ }
+ System.err.println("No enumeration found for value " + i + " of enumeration Link11BLinkState");
+ return null;
+ }
+
+
+ public void marshal(DataOutputStream dos) throws IOException
+ {
+ dos.writeByte(getValue());
+ }
+
+ public void marshal(ByteBuffer buff) throws Exception
+ {
+ buff.put((byte)getValue());
+ }
+
+ public static Link11BLinkState unmarshalEnum (DataInputStream dis) throws Exception
+ {
+ /* try {
+ value = dis.readUnsignedByte();
+ }
+ catch(IOException ex) {
+ showError(ex);
+ } */
+
+ return getEnumForValue(dis.readByte());
+ }
+
+ public static Link11BLinkState unmarshalEnum(ByteBuffer buff) throws Exception
+ {
+ /*
+ try {
+ value = (int)buff.get();
+ }
+ catch(Exception ex) {
+ showError(ex);
+ }
+ */
+ return getEnumForValue(buff.get());
+ }
+
+ public int getMarshalledSize()
+ {
+ return 1; // 8 bits
+ }
+
+ @Override
+ public String toString()
+ {
+ return "Link11BLinkState: " + name() + ": " + getValue();
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Link11BMessageSubType.java b/src-generated/edu/nps/moves/dis7/enumerations/Link11BMessageSubType.java
new file mode 100644
index 0000000000000000000000000000000000000000..557645bb241e3e7d85b24a44b609444b7d8551b6
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Link11BMessageSubType.java
@@ -0,0 +1,104 @@
+package edu.nps.moves.dis7.enumerations;
+
+import java.nio.ByteBuffer;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+import edu.nps.moves.dis7.*;
+
+/**
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
+ * UID 739 marshal size 8<br>
+ * Link11BMessageSubType
+ */
+public enum Link11BMessageSubType
+{
+ /** No Statement */
+ NO_STATEMENT (0, "No Statement"),
+ /** Transmission Frame */
+ TRANSMISSION_FRAME (1, "Transmission Frame"),
+ /** Standby Signal */
+ STANDBY_SIGNAL (2, "Standby Signal");
+
+ private int value;
+ private final String description;
+
+ Link11BMessageSubType(int value, String description)
+ {
+ this.value = value;
+ this.description = description;
+ }
+
+ public int getValue()
+ {
+ return value;
+ }
+
+ public String getDescription()
+ {
+ return description;
+ }
+
+ public static int getEnumBitWidth()
+ {
+ return 8;
+ }
+
+ public static Link11BMessageSubType getEnumForValue(int i)
+ {
+ for(Link11BMessageSubType val: Link11BMessageSubType.values()) {
+ if(val.getValue()==i)
+ return val;
+ }
+ System.err.println("No enumeration found for value " + i + " of enumeration Link11BMessageSubType");
+ return null;
+ }
+
+
+ public void marshal(DataOutputStream dos) throws IOException
+ {
+ dos.writeByte(getValue());
+ }
+
+ public void marshal(ByteBuffer buff) throws Exception
+ {
+ buff.put((byte)getValue());
+ }
+
+ public static Link11BMessageSubType unmarshalEnum (DataInputStream dis) throws Exception
+ {
+ /* try {
+ value = dis.readUnsignedByte();
+ }
+ catch(IOException ex) {
+ showError(ex);
+ } */
+
+ return getEnumForValue(dis.readByte());
+ }
+
+ public static Link11BMessageSubType unmarshalEnum(ByteBuffer buff) throws Exception
+ {
+ /*
+ try {
+ value = (int)buff.get();
+ }
+ catch(Exception ex) {
+ showError(ex);
+ }
+ */
+ return getEnumForValue(buff.get());
+ }
+
+ public int getMarshalledSize()
+ {
+ return 1; // 8 bits
+ }
+
+ @Override
+ public String toString()
+ {
+ return "Link11BMessageSubType: " + name() + ": " + getValue();
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Link11BModeofOperation.java b/src-generated/edu/nps/moves/dis7/enumerations/Link11BModeofOperation.java
new file mode 100644
index 0000000000000000000000000000000000000000..5dbd607b4fad496b692a814edee6a3cc68e58057
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Link11BModeofOperation.java
@@ -0,0 +1,91 @@
+package edu.nps.moves.dis7.enumerations;
+
+import java.nio.ByteBuffer;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+import edu.nps.moves.dis7.*;
+
+/**
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
+ * UID 738 marshal size 16<br>
+ * Link11BModeofOperation
+ */
+public enum Link11BModeofOperation
+{
+ /** No Statement */
+ NO_STATEMENT (0, "No Statement"),
+ /** Full Transmission of Data */
+ FULL_TRANSMISSION_OF_DATA (1, "Full Transmission of Data"),
+ /** Limited Transmission of Data */
+ LIMITED_TRANSMISSION_OF_DATA (2, "Limited Transmission of Data"),
+ /** Receive only */
+ RECEIVE_ONLY (3, "Receive only");
+
+ private int value;
+ private final String description;
+
+ Link11BModeofOperation(int value, String description)
+ {
+ this.value = value;
+ this.description = description;
+ }
+
+ public int getValue()
+ {
+ return value;
+ }
+
+ public String getDescription()
+ {
+ return description;
+ }
+
+ public static int getEnumBitWidth()
+ {
+ return 16;
+ }
+
+ public static Link11BModeofOperation getEnumForValue(int i)
+ {
+ for(Link11BModeofOperation val: Link11BModeofOperation.values()) {
+ if(val.getValue()==i)
+ return val;
+ }
+ System.err.println("No enumeration found for value " + i + " of enumeration Link11BModeofOperation");
+ return null;
+ }
+
+
+ public void marshal(DataOutputStream dos) throws IOException
+ {
+ dos.writeShort(getValue());
+ }
+
+ public void marshal(ByteBuffer buff) throws Exception
+ {
+ buff.putShort((short)getValue());
+ }
+
+ public static Link11BModeofOperation unmarshalEnum (DataInputStream dis) throws Exception
+ {
+ return getEnumForValue(dis.readUnsignedShort());
+ }
+
+ public static Link11BModeofOperation unmarshalEnum (ByteBuffer buff) throws Exception
+ {
+ return getEnumForValue(buff.getShort());
+ }
+
+ public int getMarshalledSize()
+ {
+ return 2; // 16 bits
+ }
+
+ @Override
+ public String toString()
+ {
+ return "Link11BModeofOperation: " + name() + ": " + getValue();
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Link11BModulationStandard.java b/src-generated/edu/nps/moves/dis7/enumerations/Link11BModulationStandard.java
new file mode 100644
index 0000000000000000000000000000000000000000..1a1d7c9e46ffe5ee0c2e433944a8f26a571b742f
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Link11BModulationStandard.java
@@ -0,0 +1,102 @@
+package edu.nps.moves.dis7.enumerations;
+
+import java.nio.ByteBuffer;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+import edu.nps.moves.dis7.*;
+
+/**
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
+ * UID 741 marshal size 8<br>
+ * Link11BModulationStandard
+ */
+public enum Link11BModulationStandard
+{
+ /** No Statement */
+ NO_STATEMENT (0, "No Statement"),
+ /** CCITT V.23 */
+ CCITT_V23 (1, "CCITT V.23");
+
+ private int value;
+ private final String description;
+
+ Link11BModulationStandard(int value, String description)
+ {
+ this.value = value;
+ this.description = description;
+ }
+
+ public int getValue()
+ {
+ return value;
+ }
+
+ public String getDescription()
+ {
+ return description;
+ }
+
+ public static int getEnumBitWidth()
+ {
+ return 8;
+ }
+
+ public static Link11BModulationStandard getEnumForValue(int i)
+ {
+ for(Link11BModulationStandard val: Link11BModulationStandard.values()) {
+ if(val.getValue()==i)
+ return val;
+ }
+ System.err.println("No enumeration found for value " + i + " of enumeration Link11BModulationStandard");
+ return null;
+ }
+
+
+ public void marshal(DataOutputStream dos) throws IOException
+ {
+ dos.writeByte(getValue());
+ }
+
+ public void marshal(ByteBuffer buff) throws Exception
+ {
+ buff.put((byte)getValue());
+ }
+
+ public static Link11BModulationStandard unmarshalEnum (DataInputStream dis) throws Exception
+ {
+ /* try {
+ value = dis.readUnsignedByte();
+ }
+ catch(IOException ex) {
+ showError(ex);
+ } */
+
+ return getEnumForValue(dis.readByte());
+ }
+
+ public static Link11BModulationStandard unmarshalEnum(ByteBuffer buff) throws Exception
+ {
+ /*
+ try {
+ value = (int)buff.get();
+ }
+ catch(Exception ex) {
+ showError(ex);
+ }
+ */
+ return getEnumForValue(buff.get());
+ }
+
+ public int getMarshalledSize()
+ {
+ return 1; // 8 bits
+ }
+
+ @Override
+ public String toString()
+ {
+ return "Link11BModulationStandard: " + name() + ": " + getValue();
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Link11DataSignallingRate.java b/src-generated/edu/nps/moves/dis7/enumerations/Link11DataSignallingRate.java
new file mode 100644
index 0000000000000000000000000000000000000000..1dc39a8f58556fefde153e75fba14959156d0ec4
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Link11DataSignallingRate.java
@@ -0,0 +1,108 @@
+package edu.nps.moves.dis7.enumerations;
+
+import java.nio.ByteBuffer;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+import edu.nps.moves.dis7.*;
+
+/**
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
+ * UID 732 marshal size 8<br>
+ * Link11DataSignallingRate
+ */
+public enum Link11DataSignallingRate
+{
+ /** No Statement */
+ NO_STATEMENT (0, "No Statement"),
+ /** 1364 bps */
+ NAME_1364_BPS (1, "1364 bps"),
+ /** 2250 bps */
+ NAME_2250_BPS (2, "2250 bps"),
+ /** 1200 bps */
+ NAME_1200_BPS (3, "1200 bps"),
+ /** 2400 bps */
+ NAME_2400_BPS (4, "2400 bps");
+
+ private int value;
+ private final String description;
+
+ Link11DataSignallingRate(int value, String description)
+ {
+ this.value = value;
+ this.description = description;
+ }
+
+ public int getValue()
+ {
+ return value;
+ }
+
+ public String getDescription()
+ {
+ return description;
+ }
+
+ public static int getEnumBitWidth()
+ {
+ return 8;
+ }
+
+ public static Link11DataSignallingRate getEnumForValue(int i)
+ {
+ for(Link11DataSignallingRate val: Link11DataSignallingRate.values()) {
+ if(val.getValue()==i)
+ return val;
+ }
+ System.err.println("No enumeration found for value " + i + " of enumeration Link11DataSignallingRate");
+ return null;
+ }
+
+
+ public void marshal(DataOutputStream dos) throws IOException
+ {
+ dos.writeByte(getValue());
+ }
+
+ public void marshal(ByteBuffer buff) throws Exception
+ {
+ buff.put((byte)getValue());
+ }
+
+ public static Link11DataSignallingRate unmarshalEnum (DataInputStream dis) throws Exception
+ {
+ /* try {
+ value = dis.readUnsignedByte();
+ }
+ catch(IOException ex) {
+ showError(ex);
+ } */
+
+ return getEnumForValue(dis.readByte());
+ }
+
+ public static Link11DataSignallingRate unmarshalEnum(ByteBuffer buff) throws Exception
+ {
+ /*
+ try {
+ value = (int)buff.get();
+ }
+ catch(Exception ex) {
+ showError(ex);
+ }
+ */
+ return getEnumForValue(buff.get());
+ }
+
+ public int getMarshalledSize()
+ {
+ return 1; // 8 bits
+ }
+
+ @Override
+ public String toString()
+ {
+ return "Link11DataSignallingRate: " + name() + ": " + getValue();
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Link11MessageSubType.java b/src-generated/edu/nps/moves/dis7/enumerations/Link11MessageSubType.java
new file mode 100644
index 0000000000000000000000000000000000000000..6df4346bb0d3fdb4502c36a6005da65643fbfeb4
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Link11MessageSubType.java
@@ -0,0 +1,108 @@
+package edu.nps.moves.dis7.enumerations;
+
+import java.nio.ByteBuffer;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+import edu.nps.moves.dis7.*;
+
+/**
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
+ * UID 730 marshal size 8<br>
+ * Link11MessageSubType
+ */
+public enum Link11MessageSubType
+{
+ /** No Statement */
+ NO_STATEMENT (0, "No Statement"),
+ /** Interrogation */
+ INTERROGATION (1, "Interrogation"),
+ /** Intermediate Data */
+ INTERMEDIATE_DATA (2, "Intermediate Data"),
+ /** Final Data */
+ FINAL_DATA (3, "Final Data"),
+ /** Final Data and Interrogation */
+ FINAL_DATA_AND_INTERROGATION (4, "Final Data and Interrogation");
+
+ private int value;
+ private final String description;
+
+ Link11MessageSubType(int value, String description)
+ {
+ this.value = value;
+ this.description = description;
+ }
+
+ public int getValue()
+ {
+ return value;
+ }
+
+ public String getDescription()
+ {
+ return description;
+ }
+
+ public static int getEnumBitWidth()
+ {
+ return 8;
+ }
+
+ public static Link11MessageSubType getEnumForValue(int i)
+ {
+ for(Link11MessageSubType val: Link11MessageSubType.values()) {
+ if(val.getValue()==i)
+ return val;
+ }
+ System.err.println("No enumeration found for value " + i + " of enumeration Link11MessageSubType");
+ return null;
+ }
+
+
+ public void marshal(DataOutputStream dos) throws IOException
+ {
+ dos.writeByte(getValue());
+ }
+
+ public void marshal(ByteBuffer buff) throws Exception
+ {
+ buff.put((byte)getValue());
+ }
+
+ public static Link11MessageSubType unmarshalEnum (DataInputStream dis) throws Exception
+ {
+ /* try {
+ value = dis.readUnsignedByte();
+ }
+ catch(IOException ex) {
+ showError(ex);
+ } */
+
+ return getEnumForValue(dis.readByte());
+ }
+
+ public static Link11MessageSubType unmarshalEnum(ByteBuffer buff) throws Exception
+ {
+ /*
+ try {
+ value = (int)buff.get();
+ }
+ catch(Exception ex) {
+ showError(ex);
+ }
+ */
+ return getEnumForValue(buff.get());
+ }
+
+ public int getMarshalledSize()
+ {
+ return 1; // 8 bits
+ }
+
+ @Override
+ public String toString()
+ {
+ return "Link11MessageSubType: " + name() + ": " + getValue();
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Link11MessageTypeIdentifier.java b/src-generated/edu/nps/moves/dis7/enumerations/Link11MessageTypeIdentifier.java
new file mode 100644
index 0000000000000000000000000000000000000000..d6dffe71b596f9a876f7b1d3a7cb94f50970ccb1
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Link11MessageTypeIdentifier.java
@@ -0,0 +1,112 @@
+package edu.nps.moves.dis7.enumerations;
+
+import java.nio.ByteBuffer;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+import edu.nps.moves.dis7.*;
+
+/**
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
+ * UID 731 marshal size 8<br>
+ * Link11MessageTypeIdentifier
+ */
+public enum Link11MessageTypeIdentifier
+{
+ /** No Statement */
+ NO_STATEMENT (0, "No Statement"),
+ /** Net Test */
+ NET_TEST (1, "Net Test"),
+ /** Roll Call */
+ ROLL_CALL (2, "Roll Call"),
+ /** Picket Reply */
+ PICKET_REPLY (3, "Picket Reply"),
+ /** Short Broadcast */
+ SHORT_BROADCAST (4, "Short Broadcast"),
+ /** Broadcast */
+ BROADCAST (5, "Broadcast"),
+ /** Net Sync */
+ NET_SYNC (6, "Net Sync");
+
+ private int value;
+ private final String description;
+
+ Link11MessageTypeIdentifier(int value, String description)
+ {
+ this.value = value;
+ this.description = description;
+ }
+
+ public int getValue()
+ {
+ return value;
+ }
+
+ public String getDescription()
+ {
+ return description;
+ }
+
+ public static int getEnumBitWidth()
+ {
+ return 8;
+ }
+
+ public static Link11MessageTypeIdentifier getEnumForValue(int i)
+ {
+ for(Link11MessageTypeIdentifier val: Link11MessageTypeIdentifier.values()) {
+ if(val.getValue()==i)
+ return val;
+ }
+ System.err.println("No enumeration found for value " + i + " of enumeration Link11MessageTypeIdentifier");
+ return null;
+ }
+
+
+ public void marshal(DataOutputStream dos) throws IOException
+ {
+ dos.writeByte(getValue());
+ }
+
+ public void marshal(ByteBuffer buff) throws Exception
+ {
+ buff.put((byte)getValue());
+ }
+
+ public static Link11MessageTypeIdentifier unmarshalEnum (DataInputStream dis) throws Exception
+ {
+ /* try {
+ value = dis.readUnsignedByte();
+ }
+ catch(IOException ex) {
+ showError(ex);
+ } */
+
+ return getEnumForValue(dis.readByte());
+ }
+
+ public static Link11MessageTypeIdentifier unmarshalEnum(ByteBuffer buff) throws Exception
+ {
+ /*
+ try {
+ value = (int)buff.get();
+ }
+ catch(Exception ex) {
+ showError(ex);
+ }
+ */
+ return getEnumForValue(buff.get());
+ }
+
+ public int getMarshalledSize()
+ {
+ return 1; // 8 bits
+ }
+
+ @Override
+ public String toString()
+ {
+ return "Link11MessageTypeIdentifier: " + name() + ": " + getValue();
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Link11SignalIntegrationInterval.java b/src-generated/edu/nps/moves/dis7/enumerations/Link11SignalIntegrationInterval.java
new file mode 100644
index 0000000000000000000000000000000000000000..0b9bbada19d2b285c87d4f9fab031946fcc3780f
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Link11SignalIntegrationInterval.java
@@ -0,0 +1,106 @@
+package edu.nps.moves.dis7.enumerations;
+
+import java.nio.ByteBuffer;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+import edu.nps.moves.dis7.*;
+
+/**
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
+ * UID 733 marshal size 8<br>
+ * Link11SignalIntegrationInterval<br>
+ * UID table only for historical purposes. Do not add new entries
+ */
+public enum Link11SignalIntegrationInterval
+{
+
+ /** No Statement */
+ NO_STATEMENT (0, "No Statement"),
+ /** 9 ms */
+ NAME_9_MS (1, "9 ms"),
+ /** 18 ms */
+ NAME_18_MS (2, "18 ms");
+
+ private int value;
+ private final String description;
+
+ Link11SignalIntegrationInterval(int value, String description)
+ {
+ this.value = value;
+ this.description = description;
+ }
+
+ public int getValue()
+ {
+ return value;
+ }
+
+ public String getDescription()
+ {
+ return description;
+ }
+
+ public static int getEnumBitWidth()
+ {
+ return 8;
+ }
+
+ public static Link11SignalIntegrationInterval getEnumForValue(int i)
+ {
+ for(Link11SignalIntegrationInterval val: Link11SignalIntegrationInterval.values()) {
+ if(val.getValue()==i)
+ return val;
+ }
+ System.err.println("No enumeration found for value " + i + " of enumeration Link11SignalIntegrationInterval");
+ return null;
+ }
+
+
+ public void marshal(DataOutputStream dos) throws IOException
+ {
+ dos.writeByte(getValue());
+ }
+
+ public void marshal(ByteBuffer buff) throws Exception
+ {
+ buff.put((byte)getValue());
+ }
+
+ public static Link11SignalIntegrationInterval unmarshalEnum (DataInputStream dis) throws Exception
+ {
+ /* try {
+ value = dis.readUnsignedByte();
+ }
+ catch(IOException ex) {
+ showError(ex);
+ } */
+
+ return getEnumForValue(dis.readByte());
+ }
+
+ public static Link11SignalIntegrationInterval unmarshalEnum(ByteBuffer buff) throws Exception
+ {
+ /*
+ try {
+ value = (int)buff.get();
+ }
+ catch(Exception ex) {
+ showError(ex);
+ }
+ */
+ return getEnumForValue(buff.get());
+ }
+
+ public int getMarshalledSize()
+ {
+ return 1; // 8 bits
+ }
+
+ @Override
+ public String toString()
+ {
+ return "Link11SignalIntegrationInterval: " + name() + ": " + getValue();
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Link11SignalWaveform.java b/src-generated/edu/nps/moves/dis7/enumerations/Link11SignalWaveform.java
new file mode 100644
index 0000000000000000000000000000000000000000..5f98ff810b105456e6874ec4f278327b914fabc9
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Link11SignalWaveform.java
@@ -0,0 +1,104 @@
+package edu.nps.moves.dis7.enumerations;
+
+import java.nio.ByteBuffer;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+import edu.nps.moves.dis7.*;
+
+/**
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
+ * UID 734 marshal size 8<br>
+ * Link11SignalWaveform
+ */
+public enum Link11SignalWaveform
+{
+ /** No Statement - CLEW Format */
+ NO_STATEMENT_CLEW_FORMAT (0, "No Statement - CLEW Format"),
+ /** Conventional Link Eleven Waveform (CLEW) */
+ CONVENTIONAL_LINK_ELEVEN_WAVEFORM_CLEW (1, "Conventional Link Eleven Waveform (CLEW)"),
+ /** Single Tone Link Eleven Waveform (SLEW) */
+ SINGLE_TONE_LINK_ELEVEN_WAVEFORM_SLEW (2, "Single Tone Link Eleven Waveform (SLEW)");
+
+ private int value;
+ private final String description;
+
+ Link11SignalWaveform(int value, String description)
+ {
+ this.value = value;
+ this.description = description;
+ }
+
+ public int getValue()
+ {
+ return value;
+ }
+
+ public String getDescription()
+ {
+ return description;
+ }
+
+ public static int getEnumBitWidth()
+ {
+ return 8;
+ }
+
+ public static Link11SignalWaveform getEnumForValue(int i)
+ {
+ for(Link11SignalWaveform val: Link11SignalWaveform.values()) {
+ if(val.getValue()==i)
+ return val;
+ }
+ System.err.println("No enumeration found for value " + i + " of enumeration Link11SignalWaveform");
+ return null;
+ }
+
+
+ public void marshal(DataOutputStream dos) throws IOException
+ {
+ dos.writeByte(getValue());
+ }
+
+ public void marshal(ByteBuffer buff) throws Exception
+ {
+ buff.put((byte)getValue());
+ }
+
+ public static Link11SignalWaveform unmarshalEnum (DataInputStream dis) throws Exception
+ {
+ /* try {
+ value = dis.readUnsignedByte();
+ }
+ catch(IOException ex) {
+ showError(ex);
+ } */
+
+ return getEnumForValue(dis.readByte());
+ }
+
+ public static Link11SignalWaveform unmarshalEnum(ByteBuffer buff) throws Exception
+ {
+ /*
+ try {
+ value = (int)buff.get();
+ }
+ catch(Exception ex) {
+ showError(ex);
+ }
+ */
+ return getEnumForValue(buff.get());
+ }
+
+ public int getMarshalledSize()
+ {
+ return 1; // 8 bits
+ }
+
+ @Override
+ public String toString()
+ {
+ return "Link11SignalWaveform: " + name() + ": " + getValue();
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Link11_11BEncryptionFlag.java b/src-generated/edu/nps/moves/dis7/enumerations/Link11_11BEncryptionFlag.java
new file mode 100644
index 0000000000000000000000000000000000000000..6136249304c6f8f85bd3bc262b6cc210c278721c
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Link11_11BEncryptionFlag.java
@@ -0,0 +1,102 @@
+package edu.nps.moves.dis7.enumerations;
+
+import java.nio.ByteBuffer;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+import edu.nps.moves.dis7.*;
+
+/**
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
+ * UID 735 marshal size 8<br>
+ * Link11/11BEncryptionFlag
+ */
+public enum Link11_11BEncryptionFlag
+{
+ /** No Encryption Used */
+ NO_ENCRYPTION_USED (0, "No Encryption Used"),
+ /** Encryption Used */
+ ENCRYPTION_USED (1, "Encryption Used");
+
+ private int value;
+ private final String description;
+
+ Link11_11BEncryptionFlag(int value, String description)
+ {
+ this.value = value;
+ this.description = description;
+ }
+
+ public int getValue()
+ {
+ return value;
+ }
+
+ public String getDescription()
+ {
+ return description;
+ }
+
+ public static int getEnumBitWidth()
+ {
+ return 8;
+ }
+
+ public static Link11_11BEncryptionFlag getEnumForValue(int i)
+ {
+ for(Link11_11BEncryptionFlag val: Link11_11BEncryptionFlag.values()) {
+ if(val.getValue()==i)
+ return val;
+ }
+ System.err.println("No enumeration found for value " + i + " of enumeration Link11_11BEncryptionFlag");
+ return null;
+ }
+
+
+ public void marshal(DataOutputStream dos) throws IOException
+ {
+ dos.writeByte(getValue());
+ }
+
+ public void marshal(ByteBuffer buff) throws Exception
+ {
+ buff.put((byte)getValue());
+ }
+
+ public static Link11_11BEncryptionFlag unmarshalEnum (DataInputStream dis) throws Exception
+ {
+ /* try {
+ value = dis.readUnsignedByte();
+ }
+ catch(IOException ex) {
+ showError(ex);
+ } */
+
+ return getEnumForValue(dis.readByte());
+ }
+
+ public static Link11_11BEncryptionFlag unmarshalEnum(ByteBuffer buff) throws Exception
+ {
+ /*
+ try {
+ value = (int)buff.get();
+ }
+ catch(Exception ex) {
+ showError(ex);
+ }
+ */
+ return getEnumForValue(buff.get());
+ }
+
+ public int getMarshalledSize()
+ {
+ return 1; // 8 bits
+ }
+
+ @Override
+ public String toString()
+ {
+ return "Link11_11BEncryptionFlag: " + name() + ": " + getValue();
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Link16Version.java b/src-generated/edu/nps/moves/dis7/enumerations/Link16Version.java
new file mode 100644
index 0000000000000000000000000000000000000000..1b0e58053bc583c5b24bfcd39ef3d5fec8ea5e50
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Link16Version.java
@@ -0,0 +1,118 @@
+package edu.nps.moves.dis7.enumerations;
+
+import java.nio.ByteBuffer;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+import edu.nps.moves.dis7.*;
+
+/**
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
+ * UID 800 marshal size 8<br>
+ * Link16Version
+ */
+public enum Link16Version
+{
+ /** No Statement */
+ NO_STATEMENT (0, "No Statement"),
+ /** MIL-STD-6016C */
+ MIL_STD_6016C (1, "MIL-STD-6016C"),
+ /** MIL-STD-6016D */
+ MIL_STD_6016D (2, "MIL-STD-6016D"),
+ /** MIL-STD-6016E */
+ MIL_STD_6016E (3, "MIL-STD-6016E"),
+ /** MIL-STD-6016F */
+ MIL_STD_6016F (4, "MIL-STD-6016F"),
+ /** MIL-STD-6016F C1 */
+ MIL_STD_6016F_C1 (5, "MIL-STD-6016F C1"),
+ /** STANAG 5516 Ed 3 */
+ STANAG_5516_ED_3 (103, "STANAG 5516 Ed 3"),
+ /** STANAG 5516 Ed 4 */
+ STANAG_5516_ED_4 (104, "STANAG 5516 Ed 4"),
+ /** STANAG 5516 Ed 5 */
+ STANAG_5516_ED_5 (105, "STANAG 5516 Ed 5"),
+ /** STANAG 5516 Ed 6 */
+ STANAG_5516_ED_6 (106, "STANAG 5516 Ed 6");
+
+ private int value;
+ private final String description;
+
+ Link16Version(int value, String description)
+ {
+ this.value = value;
+ this.description = description;
+ }
+
+ public int getValue()
+ {
+ return value;
+ }
+
+ public String getDescription()
+ {
+ return description;
+ }
+
+ public static int getEnumBitWidth()
+ {
+ return 8;
+ }
+
+ public static Link16Version getEnumForValue(int i)
+ {
+ for(Link16Version val: Link16Version.values()) {
+ if(val.getValue()==i)
+ return val;
+ }
+ System.err.println("No enumeration found for value " + i + " of enumeration Link16Version");
+ return null;
+ }
+
+
+ public void marshal(DataOutputStream dos) throws IOException
+ {
+ dos.writeByte(getValue());
+ }
+
+ public void marshal(ByteBuffer buff) throws Exception
+ {
+ buff.put((byte)getValue());
+ }
+
+ public static Link16Version unmarshalEnum (DataInputStream dis) throws Exception
+ {
+ /* try {
+ value = dis.readUnsignedByte();
+ }
+ catch(IOException ex) {
+ showError(ex);
+ } */
+
+ return getEnumForValue(dis.readByte());
+ }
+
+ public static Link16Version unmarshalEnum(ByteBuffer buff) throws Exception
+ {
+ /*
+ try {
+ value = (int)buff.get();
+ }
+ catch(Exception ex) {
+ showError(ex);
+ }
+ */
+ return getEnumForValue(buff.get());
+ }
+
+ public int getMarshalledSize()
+ {
+ return 1; // 8 bits
+ }
+
+ @Override
+ public String toString()
+ {
+ return "Link16Version: " + name() + ": " + getValue();
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Material.java b/src-generated/edu/nps/moves/dis7/enumerations/Material.java
index cf832680083c3b594adf8cb2384fbe1156b11e0e..ab3b97dee4d19e274b9ea3563662338eb14ce530 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Material.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Material.java
@@ -8,7 +8,7 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 466 marshal size 4<br>
* Material
*/
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MessageTypeIdentifier.java b/src-generated/edu/nps/moves/dis7/enumerations/MessageTypeIdentifier.java
new file mode 100644
index 0000000000000000000000000000000000000000..d703c02025ec4a8b897fa8e404dafafd04a1b3d5
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MessageTypeIdentifier.java
@@ -0,0 +1,114 @@
+package edu.nps.moves.dis7.enumerations;
+
+import java.nio.ByteBuffer;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+import edu.nps.moves.dis7.*;
+
+/**
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
+ * UID 176 marshal size 8<br>
+ * MessageTypeIdentifier
+ */
+public enum MessageTypeIdentifier
+{
+ /** JTIDS Header/Messages */
+ JTIDS_HEADER_MESSAGES (0, "JTIDS Header/Messages"),
+ /** RTT A/B */
+ RTT_A_B (1, "RTT A/B"),
+ /** RTT Reply */
+ RTT_REPLY (2, "RTT Reply"),
+ /** JTIDS Voice CVSD */
+ JTIDS_VOICE_CVSD (3, "JTIDS Voice CVSD"),
+ /** JTIDS Voice LPC10 */
+ JTIDS_VOICE_LPC10 (4, "JTIDS Voice LPC10"),
+ /** JTIDS Voice LPC12 */
+ JTIDS_VOICE_LPC12 (5, "JTIDS Voice LPC12"),
+ /** JTIDS LET */
+ JTIDS_LET (6, "JTIDS LET"),
+ /** VMF */
+ VMF (7, "VMF");
+
+ private int value;
+ private final String description;
+
+ MessageTypeIdentifier(int value, String description)
+ {
+ this.value = value;
+ this.description = description;
+ }
+
+ public int getValue()
+ {
+ return value;
+ }
+
+ public String getDescription()
+ {
+ return description;
+ }
+
+ public static int getEnumBitWidth()
+ {
+ return 8;
+ }
+
+ public static MessageTypeIdentifier getEnumForValue(int i)
+ {
+ for(MessageTypeIdentifier val: MessageTypeIdentifier.values()) {
+ if(val.getValue()==i)
+ return val;
+ }
+ System.err.println("No enumeration found for value " + i + " of enumeration MessageTypeIdentifier");
+ return null;
+ }
+
+
+ public void marshal(DataOutputStream dos) throws IOException
+ {
+ dos.writeByte(getValue());
+ }
+
+ public void marshal(ByteBuffer buff) throws Exception
+ {
+ buff.put((byte)getValue());
+ }
+
+ public static MessageTypeIdentifier unmarshalEnum (DataInputStream dis) throws Exception
+ {
+ /* try {
+ value = dis.readUnsignedByte();
+ }
+ catch(IOException ex) {
+ showError(ex);
+ } */
+
+ return getEnumForValue(dis.readByte());
+ }
+
+ public static MessageTypeIdentifier unmarshalEnum(ByteBuffer buff) throws Exception
+ {
+ /*
+ try {
+ value = (int)buff.get();
+ }
+ catch(Exception ex) {
+ showError(ex);
+ }
+ */
+ return getEnumForValue(buff.get());
+ }
+
+ public int getMarshalledSize()
+ {
+ return 1; // 8 bits
+ }
+
+ @Override
+ public String toString()
+ {
+ return "MessageTypeIdentifier: " + name() + ": " + getValue();
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceActiveStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceActiveStatus.java
index 314b41da337874d66d05abf13d65db308abac6f3..d8d9aea4563cfe4d75f379ca0700e4dda019ad67 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceActiveStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceActiveStatus.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 419 marshal size 1<br>
- * Minefield Appearance-Active Status
+ * MinefieldAppearanceActiveStatus
*/
public enum MinefieldAppearanceActiveStatus
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceLane.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceLane.java
index c6fbfbcfd6730363d9304ca7e23a4530a407b65c..37a0bb599b3ce8ecea35f0fbc6f57d30c307fdaf 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceLane.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceLane.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 420 marshal size 1<br>
- * Minefield Appearance-Lane
+ * MinefieldAppearanceLane
*/
public enum MinefieldAppearanceLane
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceMinefieldType.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceMinefieldType.java
index 3288b6b88c64a438840c2fdca36df6ebd62b73e9..4695078ff19070b66d245326deee4d05aba82aba 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceMinefieldType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceMinefieldType.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 418 marshal size 2<br>
- * Minefield Appearance-Minefield Type
+ * MinefieldAppearanceMinefieldType
*/
public enum MinefieldAppearanceMinefieldType
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceState.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceState.java
index 127ff014ed924f00234ba62eddeeb625f75da4c7..e3ece6c76b70ba93b5d8701a5cb81828ea69b3f1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceState.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 421 marshal size 1<br>
- * Minefield Appearance-State
+ * MinefieldAppearanceState
*/
public enum MinefieldAppearanceState
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldDataFusing.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldDataFusing.java
index 9326e09324e8e3e5a7422e69d7d37ca26cc72d18..c7dcaa570e47eb6b89deeeddcad2abc7c8587d11 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldDataFusing.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldDataFusing.java
@@ -3,9 +3,9 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 192 marshal size 16<br>
- * Minefield Data-Fusing
+ * MinefieldDataFusing
*/
public class MinefieldDataFusing extends DisBitSet
{
@@ -20,7 +20,7 @@ public class MinefieldDataFusing extends DisBitSet
/**
* Describes whether the mine has an Anti-Handling device
*/
- public static Bits HAS_ANTI_HANDLING_DEVICE = new Bits(14, 1);
+ public static Bits HASANTIHANDLINGDEVICE = new Bits(14, 1);
public static class Bits
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldDataPaintScheme.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldDataPaintScheme.java
index eb1ef0b0f1650b751dcc4fd854ab5b86a9a32b9d..b0b18db58e4c2fbcb1279a105c2f0636b8d35391 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldDataPaintScheme.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldDataPaintScheme.java
@@ -3,9 +3,9 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 202 marshal size 8<br>
- * Minefield Data-Paint Scheme
+ * MinefieldDataPaintScheme
*/
public class MinefieldDataPaintScheme extends DisBitSet
{
@@ -16,7 +16,7 @@ public class MinefieldDataPaintScheme extends DisBitSet
/**
* Identifies the paint scheme of the mine, Use {@link MinefieldPaintSchemePaintScheme} values for this field
*/
- public static Bits PAINT_SCHEME = new Bits(2, 6, MinefieldPaintSchemePaintScheme.class);
+ public static Bits PAINTSCHEME = new Bits(2, 6, MinefieldPaintSchemePaintScheme.class);
public static class Bits
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldFusingFuseType.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldFusingFuseType.java
index c326a97a1bc7f135ef147bb0994ca966251d41b9..884dbfed1b57c20ba729c7ac312f9ba947911837 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldFusingFuseType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldFusingFuseType.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 422 marshal size 7<br>
- * Minefield Fusing-Fuse Type
+ * MinefieldFusingFuseType
*/
public enum MinefieldFusingFuseType
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldPaintSchemeAlgae.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldPaintSchemeAlgae.java
index 7ee7119cc5df3cc9078ec0613884c076e3833395..4a2303ef56c486f08785036ce8137e62f0c92743 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldPaintSchemeAlgae.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldPaintSchemeAlgae.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 424 marshal size 2<br>
- * Minefield Paint Scheme-Algae
+ * MinefieldPaintSchemeAlgae
*/
public enum MinefieldPaintSchemeAlgae
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldPaintSchemePaintScheme.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldPaintSchemePaintScheme.java
index 412b7cd007cc75c3aa3e5e3ffb00a6280a187ab0..5d0dd866c65a1a305016145d30e687c9c4137c80 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldPaintSchemePaintScheme.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldPaintSchemePaintScheme.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 425 marshal size 6<br>
- * Minefield Paint Scheme-Paint Scheme
+ * MinefieldPaintSchemePaintScheme
*/
public enum MinefieldPaintSchemePaintScheme
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypes.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypes.java
index a5dd8638a8f23d1e46cda90ea972e3b25455f369..4e7ef7cbe940947d9d87293e38f3b12a58e8d283 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypes.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypes.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 193 marshal size 4<br>
- * Minefield-Sensor Types
+ * MinefieldSensorTypes
*/
public enum MinefieldSensorTypes
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesFLIR.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesFLIR.java
index fb75cb73f6461fd5929a88381930a1c9b3aa452e..73bd5d61ff8cc0a7dcfda09862cadc1285e19198 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesFLIR.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesFLIR.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 195 marshal size 12<br>
- * Minefield-Sensor Types-FLIR
+ * MinefieldSensorTypesFLIR
*/
public enum MinefieldSensorTypesFLIR
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesLaser.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesLaser.java
index aa6d0abf6802495248dcf82bd9c3414178de7b3e..6ccf589cc10b5a38602be174af96605d69589b4a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesLaser.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesLaser.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 198 marshal size 12<br>
- * Minefield-Sensor Types-Laser
+ * MinefieldSensorTypesLaser
*/
public enum MinefieldSensorTypesLaser
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesMagnetic.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesMagnetic.java
index 9b740b38c686480d4a371c47afe7d8c29dc80897..41d3328a68a8b2ff17ca582ad1744ca33c7e82c8 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesMagnetic.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesMagnetic.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 197 marshal size 12<br>
- * Minefield-Sensor Types-Magnetic
+ * MinefieldSensorTypesMagnetic
*/
public enum MinefieldSensorTypesMagnetic
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesMultispectral.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesMultispectral.java
index e4a617034940c43216681327610280009385e896..f0ce68b250e3d230c9daab631d2c8da2b809ae10 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesMultispectral.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesMultispectral.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 201 marshal size 12<br>
- * Minefield-Sensor Types-Multispectral
+ * MinefieldSensorTypesMultispectral
*/
public enum MinefieldSensorTypesMultispectral
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesOptical.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesOptical.java
index c4afbacd65b7e817a62a98403603bb2874e70576..45d1fa76289ff24949b5dde9f05483639eddbeb9 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesOptical.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesOptical.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 194 marshal size 12<br>
- * Minefield-Sensor Types-Optical
+ * MinefieldSensorTypesOptical
*/
public enum MinefieldSensorTypesOptical
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesPhysical.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesPhysical.java
index c85930b8a00ef18ef857b65bf8cc1f36b3d21fb6..9d566597e10936ad221e2f172ce1fad77bc7af6a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesPhysical.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesPhysical.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 200 marshal size 12<br>
- * Minefield-Sensor Types-Physical
+ * MinefieldSensorTypesPhysical
*/
public enum MinefieldSensorTypesPhysical
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesRADAR.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesRADAR.java
index 6bb4281fac07ccc8477b1104141bc34690f5dd24..1a322575455fcdaadd949c93577d63959f72aa40 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesRADAR.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesRADAR.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 196 marshal size 12<br>
- * Minefield-Sensor Types-RADAR
+ * MinefieldSensorTypesRADAR
*/
public enum MinefieldSensorTypesRADAR
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesSONAR.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesSONAR.java
index 3ff2c7dd651e181a7d4dc94902e0d7c049e0c6f9..d041d5dade90a208ac00f2a5c440a3769747ca3b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesSONAR.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesSONAR.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 199 marshal size 12<br>
- * Minefield-Sensor Types-SONAR
+ * MinefieldSensorTypesSONAR
*/
public enum MinefieldSensorTypesSONAR
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldStateAppearanceBitMap.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldStateAppearanceBitMap.java
index a5d94fc85f1937d79675e87867b1fd6b75877eba..46b62bf6a525285d4babc15ae5c03ced3e53dc40 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldStateAppearanceBitMap.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldStateAppearanceBitMap.java
@@ -3,20 +3,20 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 190 marshal size 16<br>
- * Minefield State-Appearance Bit Map
+ * MinefieldStateAppearanceBitMap
*/
public class MinefieldStateAppearanceBitMap extends DisBitSet
{
/**
* Identifies the type of minefield, Use {@link MinefieldAppearanceMinefieldType} values for this field
*/
- public static Bits MINEFIELD_TYPE = new Bits(0, 2, MinefieldAppearanceMinefieldType.class);
+ public static Bits MINEFIELDTYPE = new Bits(0, 2, MinefieldAppearanceMinefieldType.class);
/**
* Describes whether the minefield is active or inactive, Use {@link MinefieldAppearanceActiveStatus} values for this field
*/
- public static Bits ACTIVE_STATUS = new Bits(2, 1, MinefieldAppearanceActiveStatus.class);
+ public static Bits ACTIVESTATUS = new Bits(2, 1, MinefieldAppearanceActiveStatus.class);
/**
* Identifies whether the minefield has an active or inactive lane, Use {@link MinefieldAppearanceLane} values for this field
*/
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldStateProtocolMode.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldStateProtocolMode.java
index f8615d77a7e8dbfade788678b9af9bff89f16217..108aa25be3375b5abdfdcfcb7a62f47c59614b73 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldStateProtocolMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldStateProtocolMode.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 336 marshal size 2<br>
- * Minefield State-Protocol Mode
+ * MinefieldStateProtocolMode
*/
public enum MinefieldStateProtocolMode
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Mode5IFFMission.java b/src-generated/edu/nps/moves/dis7/enumerations/Mode5IFFMission.java
index ccafa0d8d5369967ee3e415862c12d518d7c3513..b403bd9a55edc64d27d73d6bfc322179065987bb 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Mode5IFFMission.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Mode5IFFMission.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 346 marshal size 3<br>
- * Mode 5 IFF Mission
+ * Mode5IFFMission
*/
public enum Mode5IFFMission
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Mode5LevelSelection.java b/src-generated/edu/nps/moves/dis7/enumerations/Mode5LevelSelection.java
index dd8f5ba2d753151376e2726c3af05875140d8c64..e228afb668c52da804f493448071f4f3c47fbc6b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Mode5LevelSelection.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Mode5LevelSelection.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 412 marshal size 1<br>
- * Mode 5 Level Selection
+ * Mode5LevelSelection
*/
public enum Mode5LevelSelection
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Mode5LocationErrors.java b/src-generated/edu/nps/moves/dis7/enumerations/Mode5LocationErrors.java
index 3efb7c532cd6f8c90bdd52a72871a90a08e914a3..58172ea3e41b4053687437fa8206ce39e230d7dd 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Mode5LocationErrors.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Mode5LocationErrors.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 423 marshal size 1<br>
- * Mode 5 Location Errors
+ * Mode5LocationErrors
*/
public enum Mode5LocationErrors
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Mode5MessageFormatsStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/Mode5MessageFormatsStatus.java
index 94cd4be007309803cca5d574ad70c03444a79dbf..01c71c3c1d801dae5c1f8dce6d836057d0b0d082 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Mode5MessageFormatsStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Mode5MessageFormatsStatus.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 380 marshal size 1<br>
- * Mode 5 Message Formats Status
+ * Mode5MessageFormatsStatus
*/
public enum Mode5MessageFormatsStatus
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Mode5PlatformType.java b/src-generated/edu/nps/moves/dis7/enumerations/Mode5PlatformType.java
index df72c926c9fdf701b8e8d5afe49bb44074e4e484..d3b1e111f3934b683920c4c139675bcd2d0d8fa8 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Mode5PlatformType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Mode5PlatformType.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 396 marshal size 1<br>
- * Mode 5 Platform Type
+ * Mode5PlatformType
*/
public enum Mode5PlatformType
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Mode5Reply.java b/src-generated/edu/nps/moves/dis7/enumerations/Mode5Reply.java
index 27bdcf0dc5d3a216b4a04de8ba196c724848266c..6a4b485bba8a87d1651387739c61c555d223cd9f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Mode5Reply.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Mode5Reply.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 350 marshal size 3<br>
- * Mode 5 Reply
+ * Mode5Reply
*/
public enum Mode5Reply
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Mode5SAltitudeResolution.java b/src-generated/edu/nps/moves/dis7/enumerations/Mode5SAltitudeResolution.java
index ecd7b62f74b41b738797e42bbf562bd1a459bcb8..3eeb366ca66f2ae12d8b9ba7a5d9167ad8000539 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Mode5SAltitudeResolution.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Mode5SAltitudeResolution.java
@@ -8,16 +8,16 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 361 marshal size 1<br>
- * Mode 5/S Altitude Resolution
+ * Mode5/SAltitudeResolution
*/
public enum Mode5SAltitudeResolution
{
/** 100-foot */
- $100_FOOT (0, "100-foot"),
+ NAME_100_FOOT (0, "100-foot"),
/** 25-foot */
- $25_FOOT (1, "25-foot");
+ NAME_25_FOOT (1, "25-foot");
private int value;
private final String description;
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Mode5SquitterType.java b/src-generated/edu/nps/moves/dis7/enumerations/Mode5SquitterType.java
index 2065e1dbc2192a7459d49aaf53062711f464748e..5196c884a45cb927737dc8279261aa7fe0b2dddf 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Mode5SquitterType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Mode5SquitterType.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 352 marshal size 3<br>
- * Mode 5 Squitter Type
+ * Mode5SquitterType
*/
public enum Mode5SquitterType
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ModeCAltitudeIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/ModeCAltitudeIndicator.java
index b1309985645b85687f97882734ad6d08f0b08938..f63d2a050640ae8494bdd51ee5d61bb461002d9a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ModeCAltitudeIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ModeCAltitudeIndicator.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 340 marshal size 1<br>
- * Mode C Altitude Indicator
+ * ModeCAltitudeIndicator
*/
public enum ModeCAltitudeIndicator
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ModeSInterrogatorIdentifierICType.java b/src-generated/edu/nps/moves/dis7/enumerations/ModeSInterrogatorIdentifierICType.java
index bb98733dfad3a4054d86c2fd1f69ece69db0a890..fedc55af7dfbc9f0c2542c9190f5ad631366e416 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ModeSInterrogatorIdentifierICType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ModeSInterrogatorIdentifierICType.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 348 marshal size 1<br>
- * Mode S Interrogator Identifier IC Type
+ * ModeSInterrogatorIdentifierICType
*/
public enum ModeSInterrogatorIdentifierICType
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ModeSInterrogatorStatusTransmitState.java b/src-generated/edu/nps/moves/dis7/enumerations/ModeSInterrogatorStatusTransmitState.java
index f3c55040fb50694f23b755f193d4918da8fe3771..b955298459dd26f0cc9240ddf32a773b105eff59 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ModeSInterrogatorStatusTransmitState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ModeSInterrogatorStatusTransmitState.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 347 marshal size 3<br>
- * Mode S Interrogator Status Transmit State
+ * ModeSInterrogatorStatusTransmitState
*/
public enum ModeSInterrogatorStatusTransmitState
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ModeSSquitterRecordSource.java b/src-generated/edu/nps/moves/dis7/enumerations/ModeSSquitterRecordSource.java
index d1fcfb9fe1762b3e5e3e60be57b93a2e439c6be7..e576152dbf32ac83a5785834b4800dcce6ce8b39 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ModeSSquitterRecordSource.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ModeSSquitterRecordSource.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 355 marshal size 1<br>
- * Mode S Squitter Record Source
+ * ModeSSquitterRecordSource
*/
public enum ModeSSquitterRecordSource
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ModeSSquitterType.java b/src-generated/edu/nps/moves/dis7/enumerations/ModeSSquitterType.java
index cfd32d4f90875d796d46e8a4ba1dfc07c33b95f7..c4c5a3426b642b7f5cc1bf71bb41b702f7be6076 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ModeSSquitterType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ModeSSquitterType.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 354 marshal size 3<br>
- * Mode S Squitter Type
+ * ModeSSquitterType
*/
public enum ModeSSquitterType
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MunitionAppearance.java b/src-generated/edu/nps/moves/dis7/enumerations/MunitionAppearance.java
index d2c639e4fa2923ed5600e8242268b3cda57cc0ec..1806b9cff624edc5c257b687edc554e5972012ca 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MunitionAppearance.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MunitionAppearance.java
@@ -3,9 +3,9 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 36 marshal size 32<br>
- * Munition Appearance
+ * MunitionAppearance
*/
public class MunitionAppearance extends DisBitSet
{
@@ -16,31 +16,31 @@ public class MunitionAppearance extends DisBitSet
/**
* Describes whether or not smoke or vapor is emanating from the entity
*/
- public static Bits IS_SMOKE_VAPOR_EMANATING = new Bits(5, 1);
+ public static Bits ISSMOKE_VAPOREMANATING = new Bits(5, 1);
/**
* Describes whether or not the engine is emitting smoke
*/
- public static Bits IS_ENGINE_EMITTING_SMOKE = new Bits(6, 1);
+ public static Bits ISENGINEEMITTINGSMOKE = new Bits(6, 1);
/**
* Describes the size of the vapor trail, Use {@link AppearanceTrailingEffects} values for this field
*/
- public static Bits VAPOR_TRAIL_SIZE = new Bits(7, 2, AppearanceTrailingEffects.class);
+ public static Bits VAPORTRAILSIZE = new Bits(7, 2, AppearanceTrailingEffects.class);
/**
* Describes whether the entity is burning and flames are visible
*/
- public static Bits IS_FLAMING = new Bits(15, 1);
+ public static Bits ISFLAMING = new Bits(15, 1);
/**
- * Describes whether or not the guided munition's launch flash is present
+ * Describes whether or not the guided munitions launch flash is present
*/
- public static Bits LAUNCH_FLASH_PRESENT = new Bits(16, 1);
+ public static Bits LAUNCHFLASHPRESENT = new Bits(16, 1);
/**
* Describes whether the entity is frozen and should not be dead reckoned
*/
- public static Bits IS_FROZEN = new Bits(21, 1);
+ public static Bits ISFROZEN = new Bits(21, 1);
/**
* Describes whether the power plant is on or off
*/
- public static Bits POWER_PLANT_ON = new Bits(22, 1);
+ public static Bits POWERPLANTON = new Bits(22, 1);
/**
* Describes whether the entity is active or deactivated, Use {@link AppearanceEntityorObjectState} values for this field
*/
@@ -48,7 +48,7 @@ public class MunitionAppearance extends DisBitSet
/**
* Describes the status of the cover or shroud, Use {@link CoverShroudStatus} values for this field
*/
- public static Bits COVER_SHROUD_STATUS = new Bits(24, 2, CoverShroudStatus.class);
+ public static Bits COVER_SHROUDSTATUS = new Bits(24, 2, CoverShroudStatus.class);
/**
* Describes whether or not the entity is masked or cloaked
*/
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MunitionCapabilities.java b/src-generated/edu/nps/moves/dis7/enumerations/MunitionCapabilities.java
index bbf6742afa014ae68a3d97c7900d82ba139b4108..8f2e4184513db980fe303a4d626c2f0cc8678b30 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MunitionCapabilities.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MunitionCapabilities.java
@@ -3,9 +3,9 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 455 marshal size 32<br>
- * Munition Capabilities
+ * MunitionCapabilities
*/
public class MunitionCapabilities extends DisBitSet implements EntityCapabilities
{
@@ -14,9 +14,9 @@ public class MunitionCapabilities extends DisBitSet implements EntityCapabilitie
*/
public static Bits RESERVED = new Bits(0, 5);
/**
- * The Entity is an IED or contains an IED. The extended appearance record (if available) will identify how well hidden the IED is on the Entity. An Attached Part (if applicable, for instance a jury-rigged munition does not apply here) will identify the IED explicitly.
+ * The Entity is an IED or contains an IED. The extended appearance record (if available) will identify how well hidden the IED is on the Entity. An Attached Part (if applicable, for instance a jury-rigged munition does not apply here) will identify the IED explicitly.
*/
- public static Bits IED_PRESENCE_INDICATOR = new Bits(7, 1);
+ public static Bits IEDPRESENCEINDICATOR = new Bits(7, 1);
public static class Bits
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MunitionCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/MunitionCategory.java
index f37658f61b3a606003ed6526d29ea2ead28aef22..bad797cb1d4a41ac3b2d9b208541b8e0e2c3928f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MunitionCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MunitionCategory.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 15 marshal size 8<br>
- * Munition Category
+ * MunitionCategory
*/
public enum MunitionCategory implements Category
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MunitionDescriptorFuse.java b/src-generated/edu/nps/moves/dis7/enumerations/MunitionDescriptorFuse.java
index bfd68a3ae89f1d084bb6d0d88cd36ccd38135d71..b3d904275e0f22d7529dff2fedb8f7b46277e3ed 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MunitionDescriptorFuse.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MunitionDescriptorFuse.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 61 marshal size 16<br>
- * Munition Descriptor-Fuse
+ * MunitionDescriptorFuse
*/
public enum MunitionDescriptorFuse
{
@@ -41,41 +41,41 @@ public enum MunitionDescriptorFuse
/** Contact, Delayed */
CONTACT_DELAYED (1200, "Contact, Delayed"),
/** 10 ms Delay */
- $10_MS_DELAY (1201, "10 ms Delay"),
+ NAME_10_MS_DELAY (1201, "10 ms Delay"),
/** 20 ms Delay */
- $20_MS_DELAY (1202, "20 ms Delay"),
+ NAME_20_MS_DELAY (1202, "20 ms Delay"),
/** 50 ms Delay */
- $50_MS_DELAY (1205, "50 ms Delay"),
+ NAME_50_MS_DELAY (1205, "50 ms Delay"),
/** 60 ms Delay */
- $60_MS_DELAY (1206, "60 ms Delay"),
+ NAME_60_MS_DELAY (1206, "60 ms Delay"),
/** 100 ms Delay */
- $100_MS_DELAY (1210, "100 ms Delay"),
+ NAME_100_MS_DELAY (1210, "100 ms Delay"),
/** 125 ms Delay */
- $125_MS_DELAY (1212, "125 ms Delay"),
+ NAME_125_MS_DELAY (1212, "125 ms Delay"),
/** 250 ms Delay */
- $250_MS_DELAY (1225, "250 ms Delay"),
+ NAME_250_MS_DELAY (1225, "250 ms Delay"),
/** 5 ms Delay */
- $5_MS_DELAY (1250, "5 ms Delay"),
+ NAME_5_MS_DELAY (1250, "5 ms Delay"),
/** 15 ms Delay */
- $15_MS_DELAY (1251, "15 ms Delay"),
+ NAME_15_MS_DELAY (1251, "15 ms Delay"),
/** 25 ms Delay */
- $25_MS_DELAY (1252, "25 ms Delay"),
+ NAME_25_MS_DELAY (1252, "25 ms Delay"),
/** 30 ms Delay */
- $30_MS_DELAY (1253, "30 ms Delay"),
+ NAME_30_MS_DELAY (1253, "30 ms Delay"),
/** 35 ms Delay */
- $35_MS_DELAY (1254, "35 ms Delay"),
+ NAME_35_MS_DELAY (1254, "35 ms Delay"),
/** 40 ms Delay */
- $40_MS_DELAY (1255, "40 ms Delay"),
+ NAME_40_MS_DELAY (1255, "40 ms Delay"),
/** 45 ms Delay */
- $45_MS_DELAY (1256, "45 ms Delay"),
+ NAME_45_MS_DELAY (1256, "45 ms Delay"),
/** 90 ms Delay */
- $90_MS_DELAY (1257, "90 ms Delay"),
+ NAME_90_MS_DELAY (1257, "90 ms Delay"),
/** 120 ms Delay */
- $120_MS_DELAY (1258, "120 ms Delay"),
+ NAME_120_MS_DELAY (1258, "120 ms Delay"),
/** 180 ms Delay */
- $180_MS_DELAY (1259, "180 ms Delay"),
+ NAME_180_MS_DELAY (1259, "180 ms Delay"),
/** 240 ms Delay */
- $240_MS_DELAY (1260, "240 ms Delay"),
+ NAME_240_MS_DELAY (1260, "240 ms Delay"),
/** Contact, Electronic (Oblique Contact) */
CONTACT_ELECTRONIC_OBLIQUE_CONTACT (1300, "Contact, Electronic (Oblique Contact)"),
/** Contact, Graze */
@@ -123,19 +123,19 @@ public enum MunitionDescriptorFuse
/** Timed, Short Delay Impact */
TIMED_SHORT_DELAY_IMPACT (2700, "Timed, Short Delay Impact"),
/** 10 ms Delay */
- $10_MS_DELAY_2 (2701, "10 ms Delay"),
+ NAME_10_MS_DELAY_2 (2701, "10 ms Delay"),
/** 20 ms Delay */
- $20_MS_DELAY_2 (2702, "20 ms Delay"),
+ NAME_20_MS_DELAY_2 (2702, "20 ms Delay"),
/** 50 ms Delay */
- $50_MS_DELAY_2 (2705, "50 ms Delay"),
+ NAME_50_MS_DELAY_2 (2705, "50 ms Delay"),
/** 60 ms Delay */
- $60_MS_DELAY_2 (2706, "60 ms Delay"),
+ NAME_60_MS_DELAY_2 (2706, "60 ms Delay"),
/** 100 ms Delay */
- $100_MS_DELAY_2 (2710, "100 ms Delay"),
+ NAME_100_MS_DELAY_2 (2710, "100 ms Delay"),
/** 125 ms Delay */
- $125_MS_DELAY_2 (2712, "125 ms Delay"),
+ NAME_125_MS_DELAY_2 (2712, "125 ms Delay"),
/** 250 ms Delay */
- $250_MS_DELAY_2 (2725, "250 ms Delay"),
+ NAME_250_MS_DELAY_2 (2725, "250 ms Delay"),
/** Timed, Nose Mounted Variable Delay */
TIMED_NOSE_MOUNTED_VARIABLE_DELAY (2800, "Timed, Nose Mounted Variable Delay"),
/** Timed, Long Delay Side */
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MunitionDescriptorWarhead.java b/src-generated/edu/nps/moves/dis7/enumerations/MunitionDescriptorWarhead.java
index d5c0193edb2dbf4fbf58f63089cffda7af229acf..9a1d4bd314d98d61c867bedae32348f569274cee 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MunitionDescriptorWarhead.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MunitionDescriptorWarhead.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 60 marshal size 16<br>
- * Munition Descriptor-Warhead
+ * MunitionDescriptorWarhead
*/
public enum MunitionDescriptorWarhead
{
@@ -23,11 +23,11 @@ public enum MunitionDescriptorWarhead
/** Glass Beads */
GLASS_BEADS (0030, "Glass Beads"),
/** 1 um */
- $1_UM (0031, "1 um"),
+ NAME_1_UM (0031, "1 um"),
/** 5 um */
- $5_UM (0032, "5 um"),
+ NAME_5_UM (0032, "5 um"),
/** 10 um */
- $10_UM (0033, "10 um"),
+ NAME_10_UM (0033, "10 um"),
/** High Explosive (HE) */
HIGH_EXPLOSIVE_HE (1000, "High Explosive (HE)"),
/** HE, Plastic */
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MunitionDomain.java b/src-generated/edu/nps/moves/dis7/enumerations/MunitionDomain.java
index 705cbc23038273ba4b51dcd844a1b4f62d3e5da4..37e2bb073a440b8df343c5b078a59d5283beb8e1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MunitionDomain.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MunitionDomain.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 14 marshal size 8<br>
- * Munition Domain
+ * MunitionDomain
*/
public enum MunitionDomain
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MunitionExpendableStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/MunitionExpendableStatus.java
index be0cace5450926f2ae389de7cba4ebcb14b95135..9e1c0e62b29e954b03d526710cc478a52925722a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MunitionExpendableStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MunitionExpendableStatus.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 327 marshal size 8<br>
- * Munition/Expendable Status
+ * Munition/ExpendableStatus
*/
public enum MunitionExpendableStatus
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/NETIDRecordFrequencyTable.java b/src-generated/edu/nps/moves/dis7/enumerations/NETIDRecordFrequencyTable.java
index 7f82b15d5850223877e1cbb4aff6d2f68342ad0e..9db4d4be8253371def35e63fa17cd51a5305c8b8 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/NETIDRecordFrequencyTable.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/NETIDRecordFrequencyTable.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 299 marshal size 2<br>
- * NET ID Record-Frequency Table
+ * NETIDRecordFrequencyTable
*/
public enum NETIDRecordFrequencyTable
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/NETIDRecordMode.java b/src-generated/edu/nps/moves/dis7/enumerations/NETIDRecordMode.java
index 06e2684ed8d5b24338abff8be28152bd95e66fd6..f7a83df65fc78d911be38fabd09fdb48eb1dc0b8 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/NETIDRecordMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/NETIDRecordMode.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 298 marshal size 2<br>
- * NET ID Record-Mode
+ * NETIDRecordMode
*/
public enum NETIDRecordMode
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/NavigationSource.java b/src-generated/edu/nps/moves/dis7/enumerations/NavigationSource.java
index debeb8243a6ea155cd1e72d751f25d0f4e19021d..36e78c044695fb8db7d2c5fbd8fb185b180c016f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/NavigationSource.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/NavigationSource.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 359 marshal size 8<br>
- * Navigation Source
+ * NavigationSource
*/
public enum NavigationSource
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/NonHumanLifeFormsAppearance.java b/src-generated/edu/nps/moves/dis7/enumerations/NonHumanLifeFormsAppearance.java
index e3431e2d6abea0b01c1cf58c77882104a2db6ae3..eb51b5e8f36171a5b36c776e255695740b7f6fe8 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/NonHumanLifeFormsAppearance.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/NonHumanLifeFormsAppearance.java
@@ -3,9 +3,9 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 480 marshal size 32<br>
- * Non-Human Life Forms Appearance
+ * NonHumanLifeFormsAppearance
*/
public class NonHumanLifeFormsAppearance extends DisBitSet
{
@@ -16,11 +16,11 @@ public class NonHumanLifeFormsAppearance extends DisBitSet
/**
* Describes whether the entity is frozen and should not be dead reckoned
*/
- public static Bits IS_FROZEN = new Bits(21, 1);
+ public static Bits ISFROZEN = new Bits(21, 1);
/**
* Describes whether or not the life form is mounted/hoisted on another platform, such as a troop transport or helicopter hoist
*/
- public static Bits MOUNTED_HOISTED_STATUS = new Bits(22, 1);
+ public static Bits MOUNTED_HOISTEDSTATUS = new Bits(22, 1);
/**
* Describes whether the entity is active or deactivated, Use {@link AppearanceEntityorObjectState} values for this field
*/
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ObjectKind.java b/src-generated/edu/nps/moves/dis7/enumerations/ObjectKind.java
index 7a836ea2a5647fa3aef221abce84c6ef452825fd..909ba0648671f19e41eff647f94ea11f9594f1de 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ObjectKind.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ObjectKind.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 225 marshal size 8<br>
- * Object Kind
+ * ObjectKind
*/
public enum ObjectKind
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ObjectStateAppearanceGeneral.java b/src-generated/edu/nps/moves/dis7/enumerations/ObjectStateAppearanceGeneral.java
index bab516441342e493c23f9b1286d83276a6a0bcc1..d31a6f0e2ee82b45b3241ce0e4f1e904c9b328d4 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ObjectStateAppearanceGeneral.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ObjectStateAppearanceGeneral.java
@@ -3,16 +3,16 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 229 marshal size 16<br>
- * Object State Appearance-General
+ * ObjectStateAppearanceGeneral
*/
public class ObjectStateAppearanceGeneral extends DisBitSet
{
/**
* 8-bit unsigned integer indicating the percent completion of the object (0..100)
*/
- public static Bits PERCENT_COMPLETE = new Bits(0, 8);
+ public static Bits PERCENTCOMPLETE = new Bits(0, 8);
/**
* Describes the damaged appearance, Use {@link AppearanceObjectGeneralDamage} values for this field
*/
@@ -28,15 +28,15 @@ public class ObjectStateAppearanceGeneral extends DisBitSet
/**
* Describes whether or not there is a smoke plume
*/
- public static Bits IS_SMOKING = new Bits(12, 1);
+ public static Bits ISSMOKING = new Bits(12, 1);
/**
* Describes whether the object is burning and flames are visible
*/
- public static Bits IS_FLAMING = new Bits(13, 1);
+ public static Bits ISFLAMING = new Bits(13, 1);
/**
* Describes whether the object has or contains an IED, Use {@link AppearanceObjectGeneralIEDPresent} values for this field
*/
- public static Bits IED_PRESENT = new Bits(14, 2, AppearanceObjectGeneralIEDPresent.class);
+ public static Bits IEDPRESENT = new Bits(14, 2, AppearanceObjectGeneralIEDPresent.class);
public static class Bits
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ObjectStateModificationArealObject.java b/src-generated/edu/nps/moves/dis7/enumerations/ObjectStateModificationArealObject.java
index d35d126d1614c2ba26eb4babd18723aebdb4d081..bdd3076aedaa8b63f4111b8a5f987dd753fce98b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ObjectStateModificationArealObject.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ObjectStateModificationArealObject.java
@@ -3,16 +3,16 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 242 marshal size 16<br>
- * Object State-Modification-Areal Object
+ * ObjectStateModificationArealObject
*/
public class ObjectStateModificationArealObject extends DisBitSet
{
/**
* Describes whether any locations of the areal object have been modified since the last update number
*/
- public static Bits IS_LOCATION_MODIFIED = new Bits(0, 1);
+ public static Bits ISLOCATIONMODIFIED = new Bits(0, 1);
public static class Bits
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ObjectStateModificationLinearObject.java b/src-generated/edu/nps/moves/dis7/enumerations/ObjectStateModificationLinearObject.java
index 3cae88bd4dfc10fd50039cf275c3c0b678cbe21d..ed9e951be2f7b04fd25543a0d8562297d6f644bd 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ObjectStateModificationLinearObject.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ObjectStateModificationLinearObject.java
@@ -3,20 +3,20 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 241 marshal size 16<br>
- * Object State-Modification-Linear Object
+ * ObjectStateModificationLinearObject
*/
public class ObjectStateModificationLinearObject extends DisBitSet
{
/**
* Describes whether the location of the linear segment has been modified since the last update number
*/
- public static Bits IS_LOCATION_MODIFIED = new Bits(0, 1);
+ public static Bits ISLOCATIONMODIFIED = new Bits(0, 1);
/**
* Describes whether the orientation of the linear segment has been modified since the last update number
*/
- public static Bits IS_ORIENTATION_MODIFIED = new Bits(1, 1);
+ public static Bits ISORIENTATIONMODIFIED = new Bits(1, 1);
public static class Bits
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ObjectStateModificationPointObject.java b/src-generated/edu/nps/moves/dis7/enumerations/ObjectStateModificationPointObject.java
index 9297d7851aeaf8b662ca8352c55b74083569418f..6279b002d3607834bc040e38209e544b8b5511f9 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ObjectStateModificationPointObject.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ObjectStateModificationPointObject.java
@@ -3,20 +3,20 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 240 marshal size 16<br>
- * Object State-Modification-Point Object
+ * ObjectStateModificationPointObject
*/
public class ObjectStateModificationPointObject extends DisBitSet
{
/**
* Describes whether the point object location has been modified since the last update number
*/
- public static Bits IS_LOCATION_MODIFIED = new Bits(0, 1);
+ public static Bits ISLOCATIONMODIFIED = new Bits(0, 1);
/**
* Describes whether the point object orientation has been modified since the last update number
*/
- public static Bits IS_ORIENTATION_MODIFIED = new Bits(1, 1);
+ public static Bits ISORIENTATIONMODIFIED = new Bits(1, 1);
public static class Bits
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/OwnershipStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/OwnershipStatus.java
index 5016bcc34ba50f42a6b903bc6db2ba2a5d0a5a79..75a8e0c28a8b57facca5b94c753e65d537e2164f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/OwnershipStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/OwnershipStatus.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 332 marshal size 8<br>
- * Ownership Status
+ * OwnershipStatus
*/
public enum OwnershipStatus
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Parachute.java b/src-generated/edu/nps/moves/dis7/enumerations/Parachute.java
index a1d08f19083f3d4ffa90ab4b67a0ed85eb8ad694..ce315355df9cd17a3968b714aed9c7fabf22d789 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Parachute.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Parachute.java
@@ -8,7 +8,7 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 401 marshal size 2<br>
* Parachute
*/
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PhysicalAssociationTypeGroups.java b/src-generated/edu/nps/moves/dis7/enumerations/PhysicalAssociationTypeGroups.java
index f84ec2adfb72e406e5a1b3b27385c2d69693943c..bb79c3caad584e3e84b1096fe50856bed8055fd6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PhysicalAssociationTypeGroups.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PhysicalAssociationTypeGroups.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 322 marshal size 8<br>
- * Physical Association Type Groups
+ * PhysicalAssociationTypeGroups
*/
public enum PhysicalAssociationTypeGroups
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCategory.java
index 062d7fc1e82b727cece3bd692d88cb1b976ff0af..4d20e2c426101292526d774efd4b98d657c92f10 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCategory.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 10 marshal size 8<br>
- * Platform-Air Category
+ * PlatformAirCategory
*/
public enum PlatformAirCategory implements Category
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianFixedWingAircraftSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianFixedWingAircraftSubcategories.java
index ff40bd8e1f4d01e71cd6d061b81cad5c4db5af1d..75d22909e924a253bea8e96ef85b7d10f848c402 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianFixedWingAircraftSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianFixedWingAircraftSubcategories.java
@@ -8,10 +8,10 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 277 marshal size 8<br>
- * Platform-Air Civilian Fixed Wing Aircraft Subcategories<br>
- * Subcategories for Air Platform Categories 84-88. Subcategory values have the type of engine in the 10's digit and the number of engines in the 1's digit.
+ * PlatformAirCivilianFixedWingAircraftSubcategories<br>
+ * Subcategories for Air Platform Categories 84-88. Subcategory values have the type of engine in the 10s digit and the number of engines in the 1s digit.
*/
public enum PlatformAirCivilianFixedWingAircraftSubcategories implements SubCategory
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianGliderSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianGliderSubcategories.java
index 9d5f77af0c474ac4426abe237a121f0e335a115c..1bbd03608c229efd70ad0557a10c2253d5a4cecb 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianGliderSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianGliderSubcategories.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 276 marshal size 8<br>
- * Platform-Air Civilian Glider Subcategories<br>
+ * PlatformAirCivilianGliderSubcategories<br>
* Subcategories for Air Platform Category 83
*/
public enum PlatformAirCivilianGliderSubcategories implements SubCategory
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianHelicopterSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianHelicopterSubcategories.java
index 76d79dd8a73a5c1e31ffa0f5353be3299f5f1a29..bd393969ed0cf835cf2576b3f4fe6762780d475a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianHelicopterSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianHelicopterSubcategories.java
@@ -8,10 +8,10 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 278 marshal size 8<br>
- * Platform-Air Civilian Helicopter Subcategories<br>
- * Subcategories for Air Platform Categories 90-92. Subcategory values have the number of rotors in the 10's digit and the rotor configuration in the 1's digit.
+ * PlatformAirCivilianHelicopterSubcategories<br>
+ * Subcategories for Air Platform Categories 90-92. Subcategory values have the number of rotors in the 10s digit and the rotor configuration in the 1s digit.
*/
public enum PlatformAirCivilianHelicopterSubcategories implements SubCategory
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianLighterthanAirAirshipSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianLighterthanAirAirshipSubcategories.java
index cceba41745127044c1f1758f85bd05f823088deb..d9c8de4d630f1d8d492b5654bbd1801ddb7bf0c7 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianLighterthanAirAirshipSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianLighterthanAirAirshipSubcategories.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 280 marshal size 8<br>
- * Platform-Air Civilian Lighter than Air, Airship Subcategories<br>
+ * PlatformAirCivilianLighterthanAir,AirshipSubcategories<br>
* Subcategories for Air Platform Category 101
*/
public enum PlatformAirCivilianLighterthanAirAirshipSubcategories implements SubCategory
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianLighterthanAirBalloonSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianLighterthanAirBalloonSubcategories.java
index b63375d2174c395182aa086fc62233180dad5aa5..daef3c5a05bbd9a8279ec00c4d334aff5633bd2e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianLighterthanAirBalloonSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianLighterthanAirBalloonSubcategories.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 279 marshal size 8<br>
- * Platform-Air Civilian Lighter than Air, Balloon Subcategories<br>
+ * PlatformAirCivilianLighterthanAir,BalloonSubcategories<br>
* Subcategories for Air Platform Category 100
*/
public enum PlatformAirCivilianLighterthanAirBalloonSubcategories implements SubCategory
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianUltralightNonrigidWingAircraftSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianUltralightNonrigidWingAircraftSubcategories.java
index 35b7b5374f5893afa5970bf9e932fe3ed7465346..0e78bc19caff21b96e612ebdf38addce05bb3835 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianUltralightNonrigidWingAircraftSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianUltralightNonrigidWingAircraftSubcategories.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 274 marshal size 8<br>
- * Platform-Air Civilian Ultralight Non-rigid Wing Aircraft Subcategories<br>
+ * PlatformAirCivilianUltralightNonrigidWingAircraftSubcategories<br>
* Subcategories for Air Platform Category 80
*/
public enum PlatformAirCivilianUltralightNonrigidWingAircraftSubcategories implements SubCategory
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianUltralightRigidWingAircraftSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianUltralightRigidWingAircraftSubcategories.java
index e994255decdac4b731e5e5df24264d73fcb87ec1..2c6f16426558694cc3f806fb78b166bad81b7b85 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianUltralightRigidWingAircraftSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianUltralightRigidWingAircraftSubcategories.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 275 marshal size 8<br>
- * Platform-Air Civilian Ultralight Rigid Wing Aircraft Subcategories<br>
+ * PlatformAirCivilianUltralightRigidWingAircraftSubcategories<br>
* Subcategories for Air Platform Category 81
*/
public enum PlatformAirCivilianUltralightRigidWingAircraftSubcategories implements SubCategory
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformDomain.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformDomain.java
index 09e5ae069ef245524e2e6674b5627aca5819af0d..782e9770a28d6eb618860fc74ba0c6a86c0f0297 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformDomain.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformDomain.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 8 marshal size 8<br>
- * Platform Domain
+ * PlatformDomain
*/
public enum PlatformDomain
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandBusSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandBusSubcategories.java
index f4ef2262e61df3344a035e23788760a9d2fb1148..3dbb41292fe1431d5c728900722879d30a336304 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandBusSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandBusSubcategories.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 429 marshal size 8<br>
- * Platform-Land-Bus Subcategories<br>
+ * PlatformLandBusSubcategories<br>
* Subcategories for Land Platform Category 82
*/
public enum PlatformLandBusSubcategories
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandCarSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandCarSubcategories.java
index 4ce3d0f4b60f6406b1a8dadb37b15c26028b2b3f..aa5a3328a2ebda05d72f4327cf14981b3bd3994b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandCarSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandCarSubcategories.java
@@ -8,10 +8,10 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 428 marshal size 8<br>
- * Platform-Land-Car Subcategories<br>
- * Subcategories for Land Platform Category 81. Subcategory values have the general form/style in the 10's/100's digits and the size in the 1's digit. A zero in the 1's digit indicates an unspecified size.
+ * PlatformLandCarSubcategories<br>
+ * Subcategories for Land Platform Category 81. Subcategory values have the general form/style in the 10s/100s digits and the size in the 1s digit. A zero in the 1s digit indicates an unspecified size.
*/
public enum PlatformLandCarSubcategories implements SubCategory
{
@@ -31,41 +31,41 @@ public enum PlatformLandCarSubcategories implements SubCategory
/** Generic, Oversize, ACRISS O */
GENERIC_OVERSIZE (15, "Generic, Oversize"),
/** 2-Door (Coupe), No specific enumerations may be placed in this subcategory */
- $2_DOOR_COUPE (20, "2-Door (Coupe)"),
+ NAME_2_DOOR_COUPE (20, "2-Door (Coupe)"),
/** 2-Door (Coupe), Mini/Microcar (Tiny) */
- $2_DOOR_COUPE_MINI_MICROCAR_TINY (21, "2-Door (Coupe), Mini/Microcar (Tiny)"),
+ NAME_2_DOOR_COUPE_MINI_MICROCAR_TINY (21, "2-Door (Coupe), Mini/Microcar (Tiny)"),
/** 2-Door (Coupe), Economy/Compact (Small) */
- $2_DOOR_COUPE_ECONOMY_COMPACT_SMALL (22, "2-Door (Coupe), Economy/Compact (Small)"),
+ NAME_2_DOOR_COUPE_ECONOMY_COMPACT_SMALL (22, "2-Door (Coupe), Economy/Compact (Small)"),
/** 2-Door (Coupe), Intermediate/Standard (Medium) */
- $2_DOOR_COUPE_INTERMEDIATE_STANDARD_MEDIUM (23, "2-Door (Coupe), Intermediate/Standard (Medium)"),
+ NAME_2_DOOR_COUPE_INTERMEDIATE_STANDARD_MEDIUM (23, "2-Door (Coupe), Intermediate/Standard (Medium)"),
/** 3-Door Hatchback, No specific enumerations may be placed in this subcategory */
- $3_DOOR_HATCHBACK (30, "3-Door Hatchback"),
+ NAME_3_DOOR_HATCHBACK (30, "3-Door Hatchback"),
/** 3-Door Hatchback, Mini/Microcar (Tiny) */
- $3_DOOR_HATCHBACK_MINI_MICROCAR_TINY (31, "3-Door Hatchback, Mini/Microcar (Tiny)"),
+ NAME_3_DOOR_HATCHBACK_MINI_MICROCAR_TINY (31, "3-Door Hatchback, Mini/Microcar (Tiny)"),
/** 3-Door Hatchback, Economy/Compact (Small) */
- $3_DOOR_HATCHBACK_ECONOMY_COMPACT_SMALL (32, "3-Door Hatchback, Economy/Compact (Small)"),
+ NAME_3_DOOR_HATCHBACK_ECONOMY_COMPACT_SMALL (32, "3-Door Hatchback, Economy/Compact (Small)"),
/** 4-Door Sedan, No specific enumerations may be placed in this subcategory */
- $4_DOOR_SEDAN (40, "4-Door Sedan"),
+ NAME_4_DOOR_SEDAN (40, "4-Door Sedan"),
/** 4-Door Sedan, Mini/Microcar (Tiny) */
- $4_DOOR_SEDAN_MINI_MICROCAR_TINY (41, "4-Door Sedan, Mini/Microcar (Tiny)"),
+ NAME_4_DOOR_SEDAN_MINI_MICROCAR_TINY (41, "4-Door Sedan, Mini/Microcar (Tiny)"),
/** 4-Door Sedan, Economy/Compact (Small) */
- $4_DOOR_SEDAN_ECONOMY_COMPACT_SMALL (42, "4-Door Sedan, Economy/Compact (Small)"),
+ NAME_4_DOOR_SEDAN_ECONOMY_COMPACT_SMALL (42, "4-Door Sedan, Economy/Compact (Small)"),
/** 4-Door Sedan, Intermediate/Standard (Medium) */
- $4_DOOR_SEDAN_INTERMEDIATE_STANDARD_MEDIUM (43, "4-Door Sedan, Intermediate/Standard (Medium)"),
+ NAME_4_DOOR_SEDAN_INTERMEDIATE_STANDARD_MEDIUM (43, "4-Door Sedan, Intermediate/Standard (Medium)"),
/** 4-Door Sedan, Full/Premium/Luxury (Large) */
- $4_DOOR_SEDAN_FULL_PREMIUM_LUXURY_LARGE (44, "4-Door Sedan, Full/Premium/Luxury (Large)"),
+ NAME_4_DOOR_SEDAN_FULL_PREMIUM_LUXURY_LARGE (44, "4-Door Sedan, Full/Premium/Luxury (Large)"),
/** 4-Door Sedan, Oversize */
- $4_DOOR_SEDAN_OVERSIZE (45, "4-Door Sedan, Oversize"),
+ NAME_4_DOOR_SEDAN_OVERSIZE (45, "4-Door Sedan, Oversize"),
/** 5-Door Hatchback, No specific enumerations may be placed in this subcategory */
- $5_DOOR_HATCHBACK (50, "5-Door Hatchback"),
+ NAME_5_DOOR_HATCHBACK (50, "5-Door Hatchback"),
/** 5-Door Hatchback, Mini/Microcar (Tiny) */
- $5_DOOR_HATCHBACK_MINI_MICROCAR_TINY (51, "5-Door Hatchback, Mini/Microcar (Tiny)"),
+ NAME_5_DOOR_HATCHBACK_MINI_MICROCAR_TINY (51, "5-Door Hatchback, Mini/Microcar (Tiny)"),
/** 5-Door Hatchback, Economy/Compact (Small) */
- $5_DOOR_HATCHBACK_ECONOMY_COMPACT_SMALL (52, "5-Door Hatchback, Economy/Compact (Small)"),
+ NAME_5_DOOR_HATCHBACK_ECONOMY_COMPACT_SMALL (52, "5-Door Hatchback, Economy/Compact (Small)"),
/** 5-Door Hatchback, Intermediate/Standard (Medium) */
- $5_DOOR_HATCHBACK_INTERMEDIATE_STANDARD_MEDIUM (53, "5-Door Hatchback, Intermediate/Standard (Medium)"),
+ NAME_5_DOOR_HATCHBACK_INTERMEDIATE_STANDARD_MEDIUM (53, "5-Door Hatchback, Intermediate/Standard (Medium)"),
/** 5-Door Hatchback, Full/Premium/Luxury (Large) */
- $5_DOOR_HATCHBACK_FULL_PREMIUM_LUXURY_LARGE (54, "5-Door Hatchback, Full/Premium/Luxury (Large)"),
+ NAME_5_DOOR_HATCHBACK_FULL_PREMIUM_LUXURY_LARGE (54, "5-Door Hatchback, Full/Premium/Luxury (Large)"),
/** Wagon, No specific enumerations may be placed in this subcategory */
WAGON (60, "Wagon"),
/** Wagon, Economy/Compact (Small) */
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandCategory.java
index b1ae949ccf7c8c1858bf5ddb8b8bd295d46e8f75..2acbbde5e107aae2704cea3fae2f078b3b94ecc0 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandCategory.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 9 marshal size 8<br>
- * Platform-Land Category
+ * PlatformLandCategory
*/
public enum PlatformLandCategory implements Category
{
@@ -22,8 +22,8 @@ public enum PlatformLandCategory implements Category
ARMORED_FIGHTING_VEHICLE (2, "Armored Fighting Vehicle"),
/** Armored Utility Vehicle, Engineering vehicle, tracked load carriers, towing vehicles, recovery vehicles, AVLB, etc. */
ARMORED_UTILITY_VEHICLE (3, "Armored Utility Vehicle"),
- /** Self-propelled Artillery, Guns and howitzers */
- SELF_PROPELLED_ARTILLERY (4, "Self-propelled Artillery"),
+ /** Self-Propelled Artillery */
+ SELF_PROPELLED_ARTILLERY (4, "Self-Propelled Artillery"),
/** Towed Artillery, Anti-Tank guns, guns and howitzers */
TOWED_ARTILLERY (5, "Towed Artillery"),
/** Small Wheeled Utility Vehicle, 0-1.25 tons */
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandConstructionSpecialtyVehicleSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandConstructionSpecialtyVehicleSubcategories.java
index 8ed401c5f87a567d69175c745b7919b246503ea4..83369c79545da7ae9cd8bc68dd6c1fe11d24792f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandConstructionSpecialtyVehicleSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandConstructionSpecialtyVehicleSubcategories.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 434 marshal size 8<br>
- * Platform-Land-Construction Specialty Vehicle Subcategories<br>
+ * PlatformLandConstructionSpecialtyVehicleSubcategories<br>
* Subcategories for Land Platform Category 87
*/
public enum PlatformLandConstructionSpecialtyVehicleSubcategories implements SubCategory
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandFarmSpecialtyVehicleSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandFarmSpecialtyVehicleSubcategories.java
index d84ebf47906c8975fb8d627843f292e4c8bff200..10b491ed9bc2effa5f37f50ce6c63699d7ae7fca 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandFarmSpecialtyVehicleSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandFarmSpecialtyVehicleSubcategories.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 435 marshal size 8<br>
- * Platform-Land-Farm Specialty Vehicle Subcategories<br>
+ * PlatformLandFarmSpecialtyVehicleSubcategories<br>
* Subcategories for Land Platform Category 88
*/
public enum PlatformLandFarmSpecialtyVehicleSubcategories implements SubCategory
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMotorcycleSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMotorcycleSubcategories.java
index 8c3971a0154c9f2a6869a6edf73f3cc4ee75422f..cede9bdbe364e945e18bf3c789c8d18d606f075d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMotorcycleSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMotorcycleSubcategories.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 427 marshal size 8<br>
- * Platform-Land-Motorcycle Subcategories<br>
+ * PlatformLandMotorcycleSubcategories<br>
* Subcategories for Land Platform Category 80
*/
public enum PlatformLandMotorcycleSubcategories implements SubCategory
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMultipleUnitCargoTruckSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMultipleUnitCargoTruckSubcategories.java
index 79666b5b85d3a6a0398c471b675158bf1d29b762..38f00eb2068163ec8be73044d1e57ac7d51a8a5f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMultipleUnitCargoTruckSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMultipleUnitCargoTruckSubcategories.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 432 marshal size 8<br>
- * Platform-Land-Multiple Unit Cargo Truck Subcategories<br>
+ * PlatformLandMultipleUnitCargoTruckSubcategories<br>
* Subcategories for Land Platform Category 85
*/
public enum PlatformLandMultipleUnitCargoTruckSubcategories implements SubCategory
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMultipleUnitUtilityEmergencyTruckSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMultipleUnitUtilityEmergencyTruckSubcategories.java
index 246c6d6624f84f8daec4c7458817e28928c7a2a4..c5092513cc9b2402adac067822c0ac1d93ec948e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMultipleUnitUtilityEmergencyTruckSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMultipleUnitUtilityEmergencyTruckSubcategories.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 433 marshal size 8<br>
- * Platform-Land-Multiple Unit Utility Emergency Truck Subcategories<br>
+ * PlatformLandMultipleUnitUtilityEmergencyTruckSubcategories<br>
* Subcategories for Land Platform Category 86
*/
public enum PlatformLandMultipleUnitUtilityEmergencyTruckSubcategories implements SubCategory
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandNonmotorizedSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandNonmotorizedSubcategories.java
index 7b25b676614cc3ffc003cd1f4321ea33b7cec218..b578aaf1e2bde8a38a06b2399ae524af6ac53d28 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandNonmotorizedSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandNonmotorizedSubcategories.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 438 marshal size 8<br>
- * Platform-Land-Non-motorized Subcategories<br>
+ * PlatformLandNonmotorizedSubcategories<br>
* Subcategories for Land Platform Category 91
*/
public enum PlatformLandNonmotorizedSubcategories
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandRecreationalSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandRecreationalSubcategories.java
index 2e3325b62ac9c59d1efdcb0a8366bceae930f0b9..c30f0a89c87d0a0e8dab4ad2918e990277c3c360 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandRecreationalSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandRecreationalSubcategories.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 437 marshal size 8<br>
- * Platform-Land-Recreational Subcategories<br>
+ * PlatformLandRecreationalSubcategories<br>
* Subcategories for Land Platform Category 90
*/
public enum PlatformLandRecreationalSubcategories implements SubCategory
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandSingleUnitCargoTruckSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandSingleUnitCargoTruckSubcategories.java
index a52003f095698cb4b876d92a6509745affe6f727..6f4356b314e70aa14e3ad7fcdeea141a9c204305 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandSingleUnitCargoTruckSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandSingleUnitCargoTruckSubcategories.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 430 marshal size 8<br>
- * Platform-Land-Single Unit Cargo Truck Subcategories<br>
+ * PlatformLandSingleUnitCargoTruckSubcategories<br>
* Subcategories for Land Platform Category 83
*/
public enum PlatformLandSingleUnitCargoTruckSubcategories implements SubCategory
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandSingleUnitUtilityEmergencyTruckSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandSingleUnitUtilityEmergencyTruckSubcategories.java
index 07841871ddb06c5b3961f92ca6a69c5e0e62d6d7..efe7d2ac236b68f013a904ddbc65a9cc39c31c9d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandSingleUnitUtilityEmergencyTruckSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandSingleUnitUtilityEmergencyTruckSubcategories.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 431 marshal size 8<br>
- * Platform-Land-Single Unit Utility Emergency Truck Subcategories<br>
+ * PlatformLandSingleUnitUtilityEmergencyTruckSubcategories<br>
* Subcategories for Land Platform Category 84
*/
public enum PlatformLandSingleUnitUtilityEmergencyTruckSubcategories implements SubCategory
@@ -24,6 +24,8 @@ public enum PlatformLandSingleUnitUtilityEmergencyTruckSubcategories implements
FIRE_PARAMEDIC_TRUCK (2, "Fire/Paramedic Truck"),
/** Ambulance, Advanced Life Support */
AMBULANCE_ADVANCED_LIFE_SUPPORT (3, "Ambulance, Advanced Life Support"),
+ /** Ambulance Pickup Truck */
+ AMBULANCE_PICKUP_TRUCK (4, "Ambulance Pickup Truck"),
/** Fire Engine */
FIRE_ENGINE (10, "Fire Engine"),
/** Aerial Ladder Fire Engine */
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandTrailerSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandTrailerSubcategories.java
index c4f089682b17f70b53f582dcdc53332ba95c283b..6410a5d13fb2a8c0d1c570987673d273b1ea2410 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandTrailerSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandTrailerSubcategories.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 436 marshal size 8<br>
- * Platform-Land-Trailer Subcategories<br>
+ * PlatformLandTrailerSubcategories<br>
* Subcategories for Land Platform Category 89
*/
public enum PlatformLandTrailerSubcategories implements SubCategory
@@ -69,7 +69,9 @@ public enum PlatformLandTrailerSubcategories implements SubCategory
/** Trailer, Kitchen */
TRAILER_KITCHEN (25, "Trailer, Kitchen"),
/** Trailer, UltraLight Aircraft */
- TRAILER_ULTRALIGHT_AIRCRAFT (26, "Trailer, UltraLight Aircraft");
+ TRAILER_ULTRALIGHT_AIRCRAFT (26, "Trailer, UltraLight Aircraft"),
+ /** Trailer, Heavy Equipment */
+ TRAILER_HEAVY_EQUIPMENT (27, "Trailer, Heavy Equipment");
private int value;
private final String description;
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandTrainsSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandTrainsSubcategories.java
index 4e7d3cd95b8c3d7624565f9d6795bb664a1d456b..98ce16511b741dfcbe451253349acd4e200f3600 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandTrainsSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandTrainsSubcategories.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 439 marshal size 8<br>
- * Platform-Land-Trains Subcategories<br>
+ * PlatformLandTrainsSubcategories<br>
* Subcategories for Land Platform Category 92
*/
public enum PlatformLandTrainsSubcategories implements SubCategory
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandUtilityEmergencyCarSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandUtilityEmergencyCarSubcategories.java
index 572aa44ad5f532f80c9939cb649bd1aadad0c583..14078fe915dac279ef26cad3f0c890e0e7480102 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandUtilityEmergencyCarSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandUtilityEmergencyCarSubcategories.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 440 marshal size 8<br>
- * Platform-Land-Utility Emergency Car Subcategories<br>
+ * PlatformLandUtilityEmergencyCarSubcategories<br>
* Subcategories for Land Platform Category 93
*/
public enum PlatformLandUtilityEmergencyCarSubcategories implements SubCategory
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSpaceCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSpaceCategory.java
index 766046e3b4fa7f3a9d69aac747e1c05256305ec3..2968d3193efb39227d39f3b2c0ae985a88e6d3cc 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSpaceCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSpaceCategory.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 13 marshal size 8<br>
- * Platform-Space Category
+ * PlatformSpaceCategory
*/
public enum PlatformSpaceCategory implements Category
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCategory.java
index a727b6f4f3f192c3f8cf6fc02db9eb9f14553706..53f9812da7d4ba9137cc8ed6a70dda65952a5d46 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCategory.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 12 marshal size 8<br>
- * Platform-Subsurface Category
+ * PlatformSubsurfaceCategory
*/
public enum PlatformSubsurfaceCategory implements Category
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSemiSubmersiblesSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSemiSubmersiblesSubcategories.java
index 6d42dd3c7acb58e55a2deb0967021b3577bc3bc1..ba7b9a3c1f16ec4429a1fd29b5f7568d7e40818a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSemiSubmersiblesSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSemiSubmersiblesSubcategories.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 508 marshal size 8<br>
- * Platform-Subsurface-Civilian Semi-Submersibles-Subcategories<br>
+ * PlatformSubsurfaceCivilianSemiSubmersiblesSubcategories<br>
* Subcategories for Subsurface Platform Category 82
*/
public enum PlatformSubsurfaceCivilianSemiSubmersiblesSubcategories implements SubCategory
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSubmarineSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSubmarineSubcategories.java
index 03f518b98e4252a9b05e85e804d7b145d48aca8c..c94ce893ab695771404081ac474ca785120a9ea4 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSubmarineSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSubmarineSubcategories.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 506 marshal size 8<br>
- * Platform-Subsurface-Civilian Submarine-Subcategories<br>
+ * PlatformSubsurfaceCivilianSubmarineSubcategories<br>
* Subcategories for Subsurface Platform Category 80
*/
public enum PlatformSubsurfaceCivilianSubmarineSubcategories implements SubCategory
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSubmersibleSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSubmersibleSubcategories.java
index 2f1081ea9759ba2f024bbd3cb60d3c4c6224575b..af875a3dcb6e635907eacf4753bf2f4cda2b0714 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSubmersibleSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSubmersibleSubcategories.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 507 marshal size 8<br>
- * Platform-Subsurface-Civilian Submersible-Subcategories<br>
+ * PlatformSubsurfaceCivilianSubmersibleSubcategories<br>
* Subcategories for Subsurface Platform Category 81
*/
public enum PlatformSubsurfaceCivilianSubmersibleSubcategories implements SubCategory
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceCategory.java
index ae9ff314d9a353920353794687e4bb5cbed2ea9a..700306f6ace6c4bb9fe9f7d4589cd4302758d3f1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceCategory.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 11 marshal size 8<br>
- * Platform-Surface Category
+ * PlatformSurfaceCategory
*/
public enum PlatformSurfaceCategory implements Category
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceDryCargoShipSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceDryCargoShipSubcategories.java
index 38c1b20981bffbd0df92f0ceb2ba6fe4f5f33ce8..d864c48807c3cdf8cefdff37fb4735410c637003 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceDryCargoShipSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceDryCargoShipSubcategories.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 442 marshal size 8<br>
- * Platform-Surface-Dry Cargo Ship Subcategories<br>
+ * PlatformSurfaceDryCargoShipSubcategories<br>
* Subcategories for Surface Platform Category 81.
*/
public enum PlatformSurfaceDryCargoShipSubcategories implements SubCategory
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceFishingVesselSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceFishingVesselSubcategories.java
index 53b51406f420b41c63b3fd43e5704d2bdbacf12d..ec53455c691c50a3f505f0592f8038e40dade025 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceFishingVesselSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceFishingVesselSubcategories.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 447 marshal size 8<br>
- * Platform-Surface Fishing Vessel Subcategories<br>
+ * PlatformSurfaceFishingVesselSubcategories<br>
* Subcategories for Surface Platform Category 86.
*/
public enum PlatformSurfaceFishingVesselSubcategories implements SubCategory
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceOtherVesselsSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceOtherVesselsSubcategories.java
index 2b4fe660b916228c1a0deeccd427835686dfabec..52293860f4e6797c1d25ae6175a9dc7ee79fb130 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceOtherVesselsSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceOtherVesselsSubcategories.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 448 marshal size 8<br>
- * Platform-Surface Other Vessels Subcategories<br>
+ * PlatformSurfaceOtherVesselsSubcategories<br>
* Subcategories for Surface Platform Category 87.
*/
public enum PlatformSurfaceOtherVesselsSubcategories implements SubCategory
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePassengerVesselSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePassengerVesselSubcategories.java
index 5aefbe58c195cba1cb78ea82eb09c9f1d701ac9a..a584de01e04ab92f630cc244ebda7620cb0dfc0d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePassengerVesselSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePassengerVesselSubcategories.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 441 marshal size 8<br>
- * Platform-Surface-Passenger Vessel Subcategories<br>
+ * PlatformSurfacePassengerVesselSubcategories<br>
* Subcategories for Surface Platform Category 80.
*/
public enum PlatformSurfacePassengerVesselSubcategories implements SubCategory
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePrivateMotorboatSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePrivateMotorboatSubcategories.java
index bea7e0c1bae3f2cedd0ae0cc68eb2d7f6deb6bec..c45c7eee0a714befc38b56c2f6a324972d081895 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePrivateMotorboatSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePrivateMotorboatSubcategories.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 445 marshal size 8<br>
- * Platform-Surface Private Motorboat Subcategories<br>
+ * PlatformSurfacePrivateMotorboatSubcategories<br>
* Subcategories for Surface Platform Category 84.
*/
public enum PlatformSurfacePrivateMotorboatSubcategories implements SubCategory
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePrivateSailboatSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePrivateSailboatSubcategories.java
index 114322483df139bc9398f1aab37d865b5c121719..6744abf5f6a659d7d1d964f3038ea6bbbb243c23 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePrivateSailboatSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePrivateSailboatSubcategories.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 446 marshal size 8<br>
- * Platform-Surface Private Sailboat Subcategories<br>
+ * PlatformSurfacePrivateSailboatSubcategories<br>
* Subcategories for Surface Platform Category 85.
*/
public enum PlatformSurfacePrivateSailboatSubcategories implements SubCategory
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceSupportVesselSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceSupportVesselSubcategories.java
index 82cd8b3121dbf11a9bea2460336d97bd8223c9f7..2c207835f5dc57ab05613b0a784ff01fd6b0ee53 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceSupportVesselSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceSupportVesselSubcategories.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 444 marshal size 8<br>
- * Platform-Surface Support Vessel Subcategories<br>
+ * PlatformSurfaceSupportVesselSubcategories<br>
* Subcategories for Surface Platform Category 83
*/
public enum PlatformSurfaceSupportVesselSubcategories implements SubCategory
@@ -25,7 +25,15 @@ public enum PlatformSurfaceSupportVesselSubcategories implements SubCategory
/** Dive Support Vessel */
DIVE_SUPPORT_VESSEL (4, "Dive Support Vessel"),
/** Fireboat */
- FIREBOAT (5, "Fireboat");
+ FIREBOAT (5, "Fireboat"),
+ /** Well Stimulation Vessel (WSV) */
+ WELL_STIMULATION_VESSEL_WSV (6, "Well Stimulation Vessel (WSV)"),
+ /** Anchor Handling Tug Supply Vessel (AHTS) */
+ ANCHOR_HANDLING_TUG_SUPPLY_VESSEL_AHTS (7, "Anchor Handling Tug Supply Vessel (AHTS)"),
+ /** Offshore Construction Vessel (OCV) */
+ OFFSHORE_CONSTRUCTION_VESSEL_OCV (8, "Offshore Construction Vessel (OCV)"),
+ /** Emergency Response and Rescue Vessel (ERRV) */
+ EMERGENCY_RESPONSE_AND_RESCUE_VESSEL_ERRV (9, "Emergency Response and Rescue Vessel (ERRV)");
private int value;
private final String description;
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceTankerSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceTankerSubcategories.java
index afc48efa514c3b1b629b987b820dba81193df079..818d99e129b55d438469b33a8aaed67cc6de1c9e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceTankerSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceTankerSubcategories.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 443 marshal size 8<br>
- * Platform-Surface Tanker Subcategories<br>
+ * PlatformSurfaceTankerSubcategories<br>
* Subcategories for Surface Platform Category 82.
*/
public enum PlatformSurfaceTankerSubcategories implements SubCategory
@@ -28,10 +28,10 @@ public enum PlatformSurfaceTankerSubcategories implements SubCategory
CRUDE_OIL_TANKER_UP_TO_159_999_DWT (5, "Crude Oil Tanker (up to 159,999 DWT)"),
/** Liquid Bulk Tanker */
LIQUID_BULK_TANKER (6, "Liquid Bulk Tanker"),
- /** Very Large Crude Carrier (160,000–319,999 DWT) */
- VERY_LARGE_CRUDE_CARRIER_160_000_319_999_DWT (7, "Very Large Crude Carrier (160,000–319,999 DWT)"),
- /** Ultra Large Crude Carrier (320,000–549,999 DWT) */
- ULTRA_LARGE_CRUDE_CARRIER_320_000_549_999_DWT (8, "Ultra Large Crude Carrier (320,000–549,999 DWT)"),
+ /** Very Large Crude Carrier (160,000-319,999 DWT) */
+ VERY_LARGE_CRUDE_CARRIER_160_000_319_999_DWT (7, "Very Large Crude Carrier (160,000-319,999 DWT)"),
+ /** Ultra Large Crude Carrier (320,000-549,999 DWT) */
+ ULTRA_LARGE_CRUDE_CARRIER_320_000_549_999_DWT (8, "Ultra Large Crude Carrier (320,000-549,999 DWT)"),
/** Condensate Storage Tanker */
CONDENSATE_STORAGE_TANKER (9, "Condensate Storage Tanker");
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceAirGroundBurst.java b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceAirGroundBurst.java
index 146274f6d2fd93a72ecd6e6710d12aeb5189c205..13310507aeb30a15076273b944fd47139dc1adca 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceAirGroundBurst.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceAirGroundBurst.java
@@ -3,16 +3,16 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 232 marshal size 16<br>
- * Point Object Appearance-Air/Ground Burst
+ * PointObjectAppearanceAir/GroundBurst
*/
public class PointObjectAppearanceAirGroundBurst extends DisBitSet
{
/**
* 8-bit unsigned integer indicating the percent opacity of the smoke (0..100)
*/
- public static Bits OPACITY_PERCENT = new Bits(0, 8);
+ public static Bits OPACITYPERCENT = new Bits(0, 8);
/**
* 8-bit unsigned integer indicating the radius in meters of the cylinder which approximates an individual burst
*/
@@ -24,11 +24,11 @@ public class PointObjectAppearanceAirGroundBurst extends DisBitSet
/**
* 6-bit unsigned integer indicating the number of bursts in the instance of tactical smoke
*/
- public static Bits NUMBER_OF_BURSTS = new Bits(24, 6);
+ public static Bits NUMBEROFBURSTS = new Bits(24, 6);
/**
* Describes the chemical content of the smoke, Use {@link AppearanceObjectSpecificChemicalType} values for this field
*/
- public static Bits CHEMICAL_TYPE = new Bits(30, 2, AppearanceObjectSpecificChemicalType.class);
+ public static Bits CHEMICALTYPE = new Bits(30, 2, AppearanceObjectSpecificChemicalType.class);
public static class Bits
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceBuildingRubble.java b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceBuildingRubble.java
index 56e9eb0284324b6808beadd2e8910bc8f0be641d..ad22d4abcdbb0092743e8e82b0ac3360c421fe90 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceBuildingRubble.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceBuildingRubble.java
@@ -3,9 +3,9 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 483 marshal size 32<br>
- * Point Object Appearance-Building Rubble
+ * PointObjectAppearanceBuildingRubble
*/
public class PointObjectAppearanceBuildingRubble extends DisBitSet
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceBuildingStructure.java b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceBuildingStructure.java
index 539c584eff90863f2b2e3fb4e24ce9b8cda51a12..01180e6a6d5b93f0f51ce5c102be89bf7991bb4e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceBuildingStructure.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceBuildingStructure.java
@@ -3,9 +3,9 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 230 marshal size 16<br>
- * Point Object Appearance-Building/Structure
+ * PointObjectAppearanceBuilding/Structure
*/
public class PointObjectAppearanceBuildingStructure extends DisBitSet
{
@@ -16,11 +16,11 @@ public class PointObjectAppearanceBuildingStructure extends DisBitSet
/**
* Describes the visual paint design, Use {@link BuildingPaintScheme} values for this field
*/
- public static Bits PAINT_SCHEME = new Bits(8, 8, BuildingPaintScheme.class);
+ public static Bits PAINTSCHEME = new Bits(8, 8, BuildingPaintScheme.class);
/**
* Describes whether the aperture (e.g., tent) is open or closed
*/
- public static Bits IS_APERTURE_OPEN = new Bits(16, 1);
+ public static Bits ISAPERTUREOPEN = new Bits(16, 1);
public static class Bits
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceCrater.java b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceCrater.java
index 7bceec5302f631f230ddbe63d9cfe0ee7cf8ec71..dd4685a8e204ab3f2b268717474f632ff66022c0 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceCrater.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceCrater.java
@@ -3,9 +3,9 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 233 marshal size 16<br>
- * Point Object Appearance-Crater
+ * PointObjectAppearanceCrater
*/
public class PointObjectAppearanceCrater extends DisBitSet
{
@@ -24,7 +24,7 @@ public class PointObjectAppearanceCrater extends DisBitSet
/**
* Describes the breached appearance of the object, Use {@link AppearanceLinearObjectTankDitchBreach} values for this field
*/
- public static Bits BREACH_STATE = new Bits(30, 2, AppearanceLinearObjectTankDitchBreach.class);
+ public static Bits BREACHSTATE = new Bits(30, 2, AppearanceLinearObjectTankDitchBreach.class);
public static class Bits
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceDisturbedEarthRoad.java b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceDisturbedEarthRoad.java
index 83c53c2b60b9f38775cc216716442fe2bf6413ad..bc464ae0ed9b2d74f900083eeb1651d57635ad81 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceDisturbedEarthRoad.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceDisturbedEarthRoad.java
@@ -3,9 +3,9 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 485 marshal size 32<br>
- * Point Object Appearance-Disturbed Earth / Road
+ * PointObjectAppearanceDisturbedEarth/Road
*/
public class PointObjectAppearanceDisturbedEarthRoad extends DisBitSet
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceLogCribAbatisEtAl.java b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceLogCribAbatisEtAl.java
index 094206865cdf0bbd5f0d94cf0f1108e5317d0055..f4093a64fb946e7624569f183450e8bf6c8db871 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceLogCribAbatisEtAl.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceLogCribAbatisEtAl.java
@@ -3,16 +3,16 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 231 marshal size 16<br>
- * Point Object Appearance-Log crib, Abatis, Vehicle defilade, and Infantry fighting position
+ * PointObjectAppearanceLogcrib,Abatis,Vehicledefilade,andInfantryfightingposition
*/
public class PointObjectAppearanceLogCribAbatisEtAl extends DisBitSet
{
/**
* Describes the breached appearance of the object, Use {@link AppearanceObjectSpecificBreachState} values for this field
*/
- public static Bits BREACH_STATE = new Bits(0, 2, AppearanceObjectSpecificBreachState.class);
+ public static Bits BREACHSTATE = new Bits(0, 2, AppearanceObjectSpecificBreachState.class);
public static class Bits
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearancePothole.java b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearancePothole.java
index 37f7c11051e723829ae6b5013a541d630708da25..4174eb797e3a94c37ffef2340775579eb4f4a454 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearancePothole.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearancePothole.java
@@ -3,9 +3,9 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 486 marshal size 32<br>
- * Point Object Appearance-Pothole
+ * PointObjectAppearancePothole
*/
public class PointObjectAppearancePothole extends DisBitSet
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceRibbonBridge.java b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceRibbonBridge.java
index 6a9e362081471932ccf8e862c21c69c89952751f..0560c356de362fea3b2262ce75561137c9e53fbc 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceRibbonBridge.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceRibbonBridge.java
@@ -3,16 +3,16 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 234 marshal size 16<br>
- * Point Object Appearance-Ribbon Bridge
+ * PointObjectAppearanceRibbonBridge
*/
public class PointObjectAppearanceRibbonBridge extends DisBitSet
{
/**
* 8-bit unsigned integer indicating the number of segments composing the ribbon bridge
*/
- public static Bits NUMBER_OF_SEGMENTS = new Bits(0, 8);
+ public static Bits NUMBEROFSEGMENTS = new Bits(0, 8);
public static class Bits
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceStationaryBridgeAndAVLB.java b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceStationaryBridgeAndAVLB.java
index f33befacad57d98e59c9d453d3130f899563d514..f77ab7e0e53fd7570a508103b8de7feb7f814b1d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceStationaryBridgeAndAVLB.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceStationaryBridgeAndAVLB.java
@@ -3,9 +3,9 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 484 marshal size 32<br>
- * Point Object Appearance-Stationary Bridge and AVLB
+ * PointObjectAppearanceStationaryBridgeandAVLB
*/
public class PointObjectAppearanceStationaryBridgeAndAVLB extends DisBitSet
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceTree.java b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceTree.java
index 1f28050780aefc5394d3c726436ff523d4d577af..156305b453f2e7a24ef113bf6fcdba2c0655affe 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceTree.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceTree.java
@@ -3,9 +3,9 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 487 marshal size 32<br>
- * Point Object Appearance-Tree
+ * PointObjectAppearanceTree
*/
public class PointObjectAppearanceTree extends DisBitSet
{
@@ -16,7 +16,7 @@ public class PointObjectAppearanceTree extends DisBitSet
/**
* Indicates the leaf coverage, Use {@link LeafCoverage} values for this field
*/
- public static Bits LEAF_COVERAGE = new Bits(2, 2, LeafCoverage.class);
+ public static Bits LEAFCOVERAGE = new Bits(2, 2, LeafCoverage.class);
public static class Bits
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/RadioAppearance.java b/src-generated/edu/nps/moves/dis7/enumerations/RadioAppearance.java
index feebecac2e10d9a827c6351a80bc3b34fe7aa1d1..71a546e1ebfc72ec8610543fcc1d0af8bbbfde66 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/RadioAppearance.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RadioAppearance.java
@@ -3,16 +3,16 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 41 marshal size 32<br>
- * Radio Appearance
+ * RadioAppearance
*/
public class RadioAppearance extends DisBitSet
{
/**
* Describes whether the entity is frozen and should not be dead reckoned
*/
- public static Bits IS_FROZEN = new Bits(21, 1);
+ public static Bits ISFROZEN = new Bits(21, 1);
/**
* Describes whether the entity is active or deactivated, Use {@link AppearanceEntityorObjectState} values for this field
*/
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/RadioCapabilities.java b/src-generated/edu/nps/moves/dis7/enumerations/RadioCapabilities.java
index 10a201cf0da4a7f9d3f2cfff6698423b43675133..e2eab9b96c8de252ff0e0cbc0c21effb73d7fc6f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/RadioCapabilities.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RadioCapabilities.java
@@ -3,9 +3,9 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 460 marshal size 32<br>
- * Radio Capabilities
+ * RadioCapabilities
*/
public class RadioCapabilities extends DisBitSet implements EntityCapabilities
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/RadioCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/RadioCategory.java
index e91a8cd7a412ef6b0305c64447768c989d082fd6..dcab5f4e513f9436184b7e5782af82fe936091f8 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/RadioCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RadioCategory.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 22 marshal size 8<br>
- * Radio Category
+ * RadioCategory
*/
public enum RadioCategory implements Category
{
@@ -96,8 +96,12 @@ public enum RadioCategory implements Category
COMBAT_SEARCH_AND_RESCUE_CSAR_RADIO (40, "Combat Search and Rescue (CSAR) Radio"),
/** Counter Unmanned Aircraft System (C-UAS) Radio */
COUNTER_UNMANNED_AIRCRAFT_SYSTEM_C_UAS_RADIO (41, "Counter Unmanned Aircraft System (C-UAS) Radio"),
+ /** Emergency Position-Indicating Radio Beacons (EPIRB) */
+ EMERGENCY_POSITION_INDICATING_RADIO_BEACONS_EPIRB (42, "Emergency Position-Indicating Radio Beacons (EPIRB)"),
/** Electronic Attack Systems */
- ELECTRONIC_ATTACK_SYSTEMS (50, "Electronic Attack Systems");
+ ELECTRONIC_ATTACK_SYSTEMS (50, "Electronic Attack Systems"),
+ /** Tactical Targeting Network Technology (TTNT) */
+ TACTICAL_TARGETING_NETWORK_TECHNOLOGY_TTNT (51, "Tactical Targeting Network Technology (TTNT)");
private int value;
private final String description;
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/RadioSubcategory.java b/src-generated/edu/nps/moves/dis7/enumerations/RadioSubcategory.java
index 96f401618cb5c212002337c648b6896315298608..90b513bf46fc7bac78dda20c7b78da97b428267a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/RadioSubcategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RadioSubcategory.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 23 marshal size 16<br>
- * Radio Subcategory<br>
+ * RadioSubcategory<br>
* JETDS Specific Series are reserved in the range 11-100. Each set allows for 255 radios.
*/
public enum RadioSubcategory implements SubCategory
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ReceiverReceiverState.java b/src-generated/edu/nps/moves/dis7/enumerations/ReceiverReceiverState.java
index f732a92b8c1b211c2d7c78b2c6da272e7f2a8c10..0f0bef13170ee8e95ad4ac6d7e0357c9e404bf34 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ReceiverReceiverState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ReceiverReceiverState.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 179 marshal size 16<br>
- * Receiver-Receiver State
+ * ReceiverReceiverState
*/
public enum ReceiverReceiverState
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/RecordQueryREventType.java b/src-generated/edu/nps/moves/dis7/enumerations/RecordQueryREventType.java
index 0049256b054aaaf47bc934a89dd5aa3d1bbdfcb4..9f87a0ad0b0312a5d21178f99f31abfd75d0936c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/RecordQueryREventType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RecordQueryREventType.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 334 marshal size 16<br>
- * Record Query-R-Event Type
+ * RecordQueryREventType
*/
public enum RecordQueryREventType
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/RecordREventType.java b/src-generated/edu/nps/moves/dis7/enumerations/RecordREventType.java
index cfc7fab7240a8d07d287a53b7443eca852f4c7e4..ec729be0c4cac605b56169c7f507a418680afa84 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/RecordREventType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RecordREventType.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 333 marshal size 16<br>
- * Record-R-Event Type
+ * RecordREventType
*/
public enum RecordREventType
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/RepairCompleteRepair.java b/src-generated/edu/nps/moves/dis7/enumerations/RepairCompleteRepair.java
index d49d2473931af8f5cf00c557fa6ab54f5a3e8ada..fef44716ed71b51c4232d7a2913cdbd2d62f9b4b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/RepairCompleteRepair.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RepairCompleteRepair.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 64 marshal size 16<br>
- * Repair Complete-Repair
+ * RepairCompleteRepair
*/
public enum RepairCompleteRepair
{
@@ -74,24 +74,24 @@ public enum RepairCompleteRepair
GUN_ELEVATION_DRIVE (2000, "gun elevation drive"),
/** gun stabilization system */
GUN_STABILIZATION_SYSTEM (2010, "gun stabilization system"),
- /** gunner's primary sight (GPS) */
- GUNNERS_PRIMARY_SIGHT_GPS (2020, "gunner's primary sight (GPS)"),
- /** commander's extension to the GPS */
- COMMANDERS_EXTENSION_TO_THE_GPS (2030, "commander's extension to the GPS"),
+ /** gunners primary sight (GPS) */
+ GUNNERS_PRIMARY_SIGHT_GPS (2020, "gunners primary sight (GPS)"),
+ /** commanders extension to the GPS */
+ COMMANDERS_EXTENSION_TO_THE_GPS (2030, "commanders extension to the GPS"),
/** loading mechanism */
LOADING_MECHANISM (2040, "loading mechanism"),
- /** gunner's auxiliary sight */
- GUNNERS_AUXILIARY_SIGHT (2050, "gunner's auxiliary sight"),
- /** gunner's control panel */
- GUNNERS_CONTROL_PANEL (2060, "gunner's control panel"),
- /** gunner's control assembly handle(s) */
- GUNNERS_CONTROL_ASSEMBLY_HANDLES (2070, "gunner's control assembly handle(s)"),
- /** commander's control handles/assembly */
- COMMANDERS_CONTROL_HANDLES_ASSEMBLY (2090, "commander's control handles/assembly"),
- /** commander's weapon station */
- COMMANDERS_WEAPON_STATION (2100, "commander's weapon station"),
- /** commander's independent thermal viewer (CITV) */
- COMMANDERS_INDEPENDENT_THERMAL_VIEWER_CITV (2110, "commander's independent thermal viewer (CITV)"),
+ /** gunners auxiliary sight */
+ GUNNERS_AUXILIARY_SIGHT (2050, "gunners auxiliary sight"),
+ /** gunners control panel */
+ GUNNERS_CONTROL_PANEL (2060, "gunners control panel"),
+ /** gunners control assembly handle(s) */
+ GUNNERS_CONTROL_ASSEMBLY_HANDLES (2070, "gunners control assembly handle(s)"),
+ /** commanders control handles/assembly */
+ COMMANDERS_CONTROL_HANDLES_ASSEMBLY (2090, "commanders control handles/assembly"),
+ /** commanders weapon station */
+ COMMANDERS_WEAPON_STATION (2100, "commanders weapon station"),
+ /** commanders independent thermal viewer (CITV) */
+ COMMANDERS_INDEPENDENT_THERMAL_VIEWER_CITV (2110, "commanders independent thermal viewer (CITV)"),
/** general weapons */
GENERAL_WEAPONS (2120, "general weapons"),
/** fuel transfer pump */
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/RepairGroups.java b/src-generated/edu/nps/moves/dis7/enumerations/RepairGroups.java
index c15b3800548288e3aa4b61e36092b3a5f43adceb..018c4eb2cc0958d594ee30c6b7bd13eada3e7a65 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/RepairGroups.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RepairGroups.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 272 marshal size 8<br>
- * Repair Groups
+ * RepairGroups
*/
public enum RepairGroups
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/RepairResponseRepairResult.java b/src-generated/edu/nps/moves/dis7/enumerations/RepairResponseRepairResult.java
index 35f7c494e750576d5d300e6d18c4110e5227be5f..dae4e0652df825723c753a99c1342d656d6f64be 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/RepairResponseRepairResult.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RepairResponseRepairResult.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 65 marshal size 8<br>
- * Repair Response-Repair Result
+ * RepairResponseRepairResult
*/
public enum RepairResponseRepairResult
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ReplyAmplification.java b/src-generated/edu/nps/moves/dis7/enumerations/ReplyAmplification.java
index 801fab68fd9b328143574712d469df3b4b49dce8..427c2bd0ffdab45eb3f722bbb290b0f26a85781c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ReplyAmplification.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ReplyAmplification.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 373 marshal size 8<br>
- * Reply Amplification
+ * ReplyAmplification
*/
public enum ReplyAmplification
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/RequiredReliabilityService.java b/src-generated/edu/nps/moves/dis7/enumerations/RequiredReliabilityService.java
index daf5d52cdabaecd5ed430cca0e70f4aff3cfe816..e42aa3774c5544ffa6c877e4d2b7051abd8dba0d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/RequiredReliabilityService.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RequiredReliabilityService.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 74 marshal size 8<br>
- * Required Reliability Service
+ * RequiredReliabilityService
*/
public enum RequiredReliabilityService
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SISOSTD002Version.java b/src-generated/edu/nps/moves/dis7/enumerations/SISOSTD002Version.java
new file mode 100644
index 0000000000000000000000000000000000000000..5185b648a9c245f4181d6dc826301314bc18d0ba
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SISOSTD002Version.java
@@ -0,0 +1,100 @@
+package edu.nps.moves.dis7.enumerations;
+
+import java.nio.ByteBuffer;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+import edu.nps.moves.dis7.*;
+
+/**
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
+ * UID 736 marshal size 8<br>
+ * SISOSTD002Version
+ */
+public enum SISOSTD002Version
+{
+ /** SISO-STD-002-2006 */
+ SISO_STD_002_2006 (0, "SISO-STD-002-2006");
+
+ private int value;
+ private final String description;
+
+ SISOSTD002Version(int value, String description)
+ {
+ this.value = value;
+ this.description = description;
+ }
+
+ public int getValue()
+ {
+ return value;
+ }
+
+ public String getDescription()
+ {
+ return description;
+ }
+
+ public static int getEnumBitWidth()
+ {
+ return 8;
+ }
+
+ public static SISOSTD002Version getEnumForValue(int i)
+ {
+ for(SISOSTD002Version val: SISOSTD002Version.values()) {
+ if(val.getValue()==i)
+ return val;
+ }
+ System.err.println("No enumeration found for value " + i + " of enumeration SISOSTD002Version");
+ return null;
+ }
+
+
+ public void marshal(DataOutputStream dos) throws IOException
+ {
+ dos.writeByte(getValue());
+ }
+
+ public void marshal(ByteBuffer buff) throws Exception
+ {
+ buff.put((byte)getValue());
+ }
+
+ public static SISOSTD002Version unmarshalEnum (DataInputStream dis) throws Exception
+ {
+ /* try {
+ value = dis.readUnsignedByte();
+ }
+ catch(IOException ex) {
+ showError(ex);
+ } */
+
+ return getEnumForValue(dis.readByte());
+ }
+
+ public static SISOSTD002Version unmarshalEnum(ByteBuffer buff) throws Exception
+ {
+ /*
+ try {
+ value = (int)buff.get();
+ }
+ catch(Exception ex) {
+ showError(ex);
+ }
+ */
+ return getEnumForValue(buff.get());
+ }
+
+ public int getMarshalledSize()
+ {
+ return 1; // 8 bits
+ }
+
+ @Override
+ public String toString()
+ {
+ return "SISOSTD002Version: " + name() + ": " + getValue();
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Season.java b/src-generated/edu/nps/moves/dis7/enumerations/Season.java
index 05972736bee18b9165dc3a11fc1c7f26a0186e3e..19a808269be6d4c04e38edd8c9fb29a4729a6d2e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Season.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Season.java
@@ -8,7 +8,7 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 465 marshal size 2<br>
* Season
*/
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SensorEmitterAppearance.java b/src-generated/edu/nps/moves/dis7/enumerations/SensorEmitterAppearance.java
index 9a5cb3bd00660fe710735fa761a41d90ccc868a9..84ea53931a34519f38b0aed82ac5db4d56dbc98c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SensorEmitterAppearance.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SensorEmitterAppearance.java
@@ -3,24 +3,24 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 43 marshal size 32<br>
- * Sensor/Emitter Appearance
+ * Sensor/EmitterAppearance
*/
public class SensorEmitterAppearance extends DisBitSet
{
/**
* Describes the visual paint design, Use {@link AppearancePaintScheme} values for this field
*/
- public static Bits PAINT_SCHEME = new Bits(0, 1, AppearancePaintScheme.class);
+ public static Bits PAINTSCHEME = new Bits(0, 1, AppearancePaintScheme.class);
/**
* Describes whether it is capable of moving on its own power
*/
- public static Bits MOBILITY_KILLED = new Bits(1, 1);
+ public static Bits MOBILITYKILLED = new Bits(1, 1);
/**
* Describes whether it is capable of carrying out its mission (e.g., damaged antenna)
*/
- public static Bits MISSION_KILLED = new Bits(2, 1);
+ public static Bits MISSIONKILLED = new Bits(2, 1);
/**
* Describes the damaged appearance, Use {@link AppearanceDamage} values for this field
*/
@@ -28,43 +28,43 @@ public class SensorEmitterAppearance extends DisBitSet
/**
* Describes whether or not smoke is emanating from the entity
*/
- public static Bits IS_SMOKE_EMANATING = new Bits(5, 1);
+ public static Bits ISSMOKEEMANATING = new Bits(5, 1);
/**
* Describes whether or not the engine is emitting smoke
*/
- public static Bits IS_ENGINE_EMITTING_SMOKE = new Bits(6, 1);
+ public static Bits ISENGINEEMITTINGSMOKE = new Bits(6, 1);
/**
* Describes the size of the trailing effects, Use {@link AppearanceTrailingEffects} values for this field
*/
- public static Bits TRAILING_EFFECTS = new Bits(7, 2, AppearanceTrailingEffects.class);
+ public static Bits TRAILINGEFFECTS = new Bits(7, 2, AppearanceTrailingEffects.class);
/**
* Describes whether the lights are on or off
*/
- public static Bits LIGHTS_ON = new Bits(12, 1);
+ public static Bits LIGHTSON = new Bits(12, 1);
/**
* Describes whether the entity is burning and flames are visible
*/
- public static Bits IS_FLAMING = new Bits(15, 1);
+ public static Bits ISFLAMING = new Bits(15, 1);
/**
* Describes whether the antenna is raised or not
*/
- public static Bits ANTENNA_RAISED = new Bits(16, 1);
+ public static Bits ANTENNARAISED = new Bits(16, 1);
/**
* Describes the camouflage color, Use {@link AppearanceCamouflageType} values for this field
*/
- public static Bits CAMOUFLAGE_TYPE = new Bits(17, 2, AppearanceCamouflageType.class);
+ public static Bits CAMOUFLAGETYPE = new Bits(17, 2, AppearanceCamouflageType.class);
/**
* Describes the type of concealment, Use {@link AppearanceConcealedPosition} values for this field
*/
- public static Bits CONCEALED_POSITION = new Bits(19, 1, AppearanceConcealedPosition.class);
+ public static Bits CONCEALEDPOSITION = new Bits(19, 1, AppearanceConcealedPosition.class);
/**
* Describes whether the entity is frozen and should not be dead reckoned
*/
- public static Bits IS_FROZEN = new Bits(21, 1);
+ public static Bits ISFROZEN = new Bits(21, 1);
/**
* Describes whether the power plant is on or off
*/
- public static Bits POWER_PLANT_ON = new Bits(22, 1);
+ public static Bits POWERPLANTON = new Bits(22, 1);
/**
* Describes whether the entity is active or deactivated, Use {@link AppearanceEntityorObjectState} values for this field
*/
@@ -72,15 +72,15 @@ public class SensorEmitterAppearance extends DisBitSet
/**
* Describes whether or not the tent is extended
*/
- public static Bits TENT_EXTENDED = new Bits(24, 1);
+ public static Bits TENTEXTENDED = new Bits(24, 1);
/**
* Describes whether blackout lights are on or off
*/
- public static Bits BLACKOUT_LIGHTS_ON = new Bits(26, 1);
+ public static Bits BLACKOUTLIGHTSON = new Bits(26, 1);
/**
* Describes whether interior lights are on or off
*/
- public static Bits INTERIOR_LIGHTS_ON = new Bits(29, 1);
+ public static Bits INTERIORLIGHTSON = new Bits(29, 1);
public static class Bits
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SensorEmitterCapabilities.java b/src-generated/edu/nps/moves/dis7/enumerations/SensorEmitterCapabilities.java
index 62aa252e4bc27885e6ed6225667a195a4ecb9010..2129475ee33e91b014dd50bc8aa7bd6b317a0cb0 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SensorEmitterCapabilities.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SensorEmitterCapabilities.java
@@ -3,9 +3,9 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 462 marshal size 32<br>
- * Sensor/Emitter Capabilities
+ * Sensor/EmitterCapabilities
*/
public class SensorEmitterCapabilities extends DisBitSet implements EntityCapabilities
{
@@ -14,17 +14,17 @@ public class SensorEmitterCapabilities extends DisBitSet implements EntityCapabi
*/
public static Bits RESERVED = new Bits(0, 5);
/**
- * The Entity is able to be carried as a sling load payload. The extended appearance record (if available) will identify if it is currently sling loaded and entity association and/or entity offset records (if available) will provide additional sling load details (such as carrier).
+ * The Entity is able to be carried as a sling load payload. The extended appearance record (if available) will identify if it is currently sling loaded and entity association and/or entity offset records (if available) will provide additional sling load details (such as carrier).
*/
- public static Bits SLING_LOADABLE = new Bits(6, 1);
+ public static Bits SLINGLOADABLE = new Bits(6, 1);
/**
- * The Entity is an IED or contains an IED. The extended appearance record (if available) will identify how well hidden the IED is on the Entity. An Attached Part (if applicable, for instance a jury-rigged munition does not apply here) will identify the IED explicitly.
+ * The Entity is an IED or contains an IED. The extended appearance record (if available) will identify how well hidden the IED is on the Entity. An Attached Part (if applicable, for instance a jury-rigged munition does not apply here) will identify the IED explicitly.
*/
- public static Bits IED_PRESENCE_INDICATOR = new Bits(7, 1);
+ public static Bits IEDPRESENCEINDICATOR = new Bits(7, 1);
/**
* The Entity (normally a virtual manned module) can be task organized into an existing mixed mode unit (where mixed mode is intended to comprise a combination of computer-generated forces and virtual or even live forces).
*/
- public static Bits TASK_ORGANIZABLE = new Bits(8, 1);
+ public static Bits TASKORGANIZABLE = new Bits(8, 1);
public static class Bits
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SensorEmitterCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/SensorEmitterCategory.java
index c953a7f21addd0a31d76e8fdfadd3c159977a1d5..79221f57c590169a0fe84744774eb9a214e7bb88 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SensorEmitterCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SensorEmitterCategory.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 28 marshal size 8<br>
- * Sensor/Emitter Category
+ * Sensor/EmitterCategory
*/
public enum SensorEmitterCategory implements Category
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SensorOnOffStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/SensorOnOffStatus.java
index 452aded8df30210fa57b8d5f42a4112934828086..d30ef8bac7791150315a4c1c6da71092e6871ea9 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SensorOnOffStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SensorOnOffStatus.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 331 marshal size 8<br>
- * Sensor On/Off Status
+ * SensorOn/OffStatus
*/
public enum SensorOnOffStatus
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SensorRecordSensorTypeOtherActiveSensors.java b/src-generated/edu/nps/moves/dis7/enumerations/SensorRecordSensorTypeOtherActiveSensors.java
index b301fc9a5cfa8262c4470f236e4ff70b90c2d5a8..1e31eb8496fc958e05fc41fc0928f41b5ad5928d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SensorRecordSensorTypeOtherActiveSensors.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SensorRecordSensorTypeOtherActiveSensors.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 325 marshal size 16<br>
- * Sensor Record-Sensor Type-Other Active Sensors
+ * SensorRecordSensorTypeOtherActiveSensors
*/
public enum SensorRecordSensorTypeOtherActiveSensors
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SensorRecordSensorTypePassiveSensors.java b/src-generated/edu/nps/moves/dis7/enumerations/SensorRecordSensorTypePassiveSensors.java
index 2ab66aaf794816f06ad905d09d53d525de58263e..584f3204bf2a441deeb74a2536b4a8c56d540703 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SensorRecordSensorTypePassiveSensors.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SensorRecordSensorTypePassiveSensors.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 326 marshal size 16<br>
- * Sensor Record-Sensor Type-Passive Sensors
+ * SensorRecordSensorTypePassiveSensors
*/
public enum SensorRecordSensorTypePassiveSensors
{
@@ -66,18 +66,18 @@ public enum SensorRecordSensorTypePassiveSensors
BOW_21 (60024, "BOW-21"),
/** Chaparral IRST */
CHAPARRAL_IRST (60025, "Chaparral IRST"),
- /** */
- undef (60026, ""),
- /** */
- undef_2 (60027, ""),
- /** */
- undef_3 (60028, ""),
- /** */
- undef_4 (60029, ""),
- /** */
- undef_5 (60030, ""),
- /** */
- undef_6 (60031, ""),
+ /** NATOID_FlankerIRST */
+ NATOID_FLANKERIRST (60026, "NATOID_FlankerIRST"),
+ /** NATOID_FoxbatIRST */
+ NATOID_FOXBATIRST (60027, "NATOID_FoxbatIRST"),
+ /** NATOID_FoxhoundIRST */
+ NATOID_FOXHOUNDIRST (60028, "NATOID_FoxhoundIRST"),
+ /** NATOID_FulcrumIRST */
+ NATOID_FULCRUMIRST (60029, "NATOID_FulcrumIRST"),
+ /** NATOID_HavocIRST */
+ NATOID_HAVOCIRST (60030, "NATOID_HavocIRST"),
+ /** NATOID_HindIRST */
+ NATOID_HINDIRST (60031, "NATOID_HindIRST"),
/** KJ-200 */
KJ_200 (60032, "KJ-200"),
/** KJ-8602 */
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SensorTypeSource.java b/src-generated/edu/nps/moves/dis7/enumerations/SensorTypeSource.java
index 66edb6810663f31f0547ffc9788d39e210616e9b..57c31767339986dd88ac78fb99aff67169330c02 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SensorTypeSource.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SensorTypeSource.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 414 marshal size 8<br>
- * Sensor Type Source
+ * SensorTypeSource
*/
public enum SensorTypeSource
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SeparationVPPreEntityIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/SeparationVPPreEntityIndicator.java
index 06ac0dedda69da4eaa25e1b94aae0a89d0ed87b6..32a801a13a55f8b323ca1c7b0aa042594b3a3a0b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SeparationVPPreEntityIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SeparationVPPreEntityIndicator.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 283 marshal size 8<br>
- * Separation VP-Pre-Entity Indicator
+ * SeparationVPPreEntityIndicator
*/
public enum SeparationVPPreEntityIndicator
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SeparationVPReasonforSeparation.java b/src-generated/edu/nps/moves/dis7/enumerations/SeparationVPReasonforSeparation.java
index 984e3f5d9d8bde9e2e6081246c9502c5da1c1ecf..94b11b8d6eaa626c7d4cd2bee4888c899a1b1473 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SeparationVPReasonforSeparation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SeparationVPReasonforSeparation.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 282 marshal size 8<br>
- * Separation VP-Reason for Separation
+ * SeparationVPReasonforSeparation
*/
public enum SeparationVPReasonforSeparation
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ServiceRequestServiceTypeRequested.java b/src-generated/edu/nps/moves/dis7/enumerations/ServiceRequestServiceTypeRequested.java
index efeef6b0fde787e17a8a321999a4255956a73f9c..b6c4e9911d1df21949703cd05f69954d7854ebef 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ServiceRequestServiceTypeRequested.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ServiceRequestServiceTypeRequested.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 63 marshal size 8<br>
- * Service Request-Service Type Requested
+ * ServiceRequestServiceTypeRequested
*/
public enum ServiceRequestServiceTypeRequested
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SignalEncodingClass.java b/src-generated/edu/nps/moves/dis7/enumerations/SignalEncodingClass.java
index 0ae8f79dd528604efcdc5476a7c44e01a2f98f67..6c292ea9ce9c2c5c30b6cf72d83ccc65bd2c7e98 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SignalEncodingClass.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SignalEncodingClass.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 270 marshal size 2<br>
- * Signal-Encoding Class
+ * SignalEncodingClass
*/
public enum SignalEncodingClass
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SignalEncodingType.java b/src-generated/edu/nps/moves/dis7/enumerations/SignalEncodingType.java
index 66f4dc41360aa921831b286d5a657ad3601ee21d..9a2b202c50ecfe8397df59b5fb5f0d518589aa35 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SignalEncodingType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SignalEncodingType.java
@@ -8,22 +8,22 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 271 marshal size 14<br>
- * Signal-Encoding Type
+ * SignalEncodingType
*/
public enum SignalEncodingType
{
/** 8-bit mu-law (ITU-T G.711) */
- $8_BIT_MU_LAW_ITU_T_G711 (1, "8-bit mu-law (ITU-T G.711)"),
- /** CVSD (MIL-STD-188-113), There are variants of CVSD encoding types that exist in the DIS community. These are not compatible with each other. At least two additional types of CVSD, known as CCTT CVSD and CECOM CVSD, also use Enumeration value 2.  Make sure that if you are using CVSD that your system is compatible with other systems playing in an exercise. */
+ NAME_8_BIT_MU_LAW_ITU_T_G711 (1, "8-bit mu-law (ITU-T G.711)"),
+ /** CVSD (MIL-STD-188-113), There are variants of CVSD encoding types that exist in the DIS community. These are not compatible with each other. At least two additional types of CVSD, known as CCTT CVSD and CECOM CVSD, also use Enumeration value 2.  Make sure that if you are using CVSD that your system is compatible with other systems playing in an exercise. */
CVSD_MIL_STD_188_113 (2, "CVSD (MIL-STD-188-113)"),
/** ADPCM (ITU-T G.726) */
ADPCM_ITU_T_G726 (3, "ADPCM (ITU-T G.726)"),
/** 16-bit Linear PCM 2’s complement, Big Endian */
- $16_BIT_LINEAR_PCM_2S_COMPLEMENT_BIG_ENDIAN (4, "16-bit Linear PCM 2’s complement, Big Endian"),
+ NAME_16_BIT_LINEAR_PCM_2S_COMPLEMENT_BIG_ENDIAN (4, "16-bit Linear PCM 2’s complement, Big Endian"),
/** 8-bit Linear PCM, unsigned */
- $8_BIT_LINEAR_PCM_UNSIGNED (5, "8-bit Linear PCM, unsigned"),
+ NAME_8_BIT_LINEAR_PCM_UNSIGNED (5, "8-bit Linear PCM, unsigned"),
/** VQ (Vector Quantization) */
VQ_VECTOR_QUANTIZATION (6, "VQ (Vector Quantization)"),
/** (unavailable for use) */
@@ -34,8 +34,10 @@ public enum SignalEncodingType
GSM_HALF_RATE_ETSI_0620 (9, "GSM Half-Rate (ETSI 06.20)"),
/** Speex Narrow Band, http://www.speex.org/ */
SPEEX_NARROW_BAND (10, "Speex Narrow Band"),
+ /** Opus, https://tools.ietf.org/html/rfc6716 */
+ OPUS (11, "Opus"),
/** 16-bit Linear PCM 2’s complement, Little Endian */
- $16_BIT_LINEAR_PCM_2S_COMPLEMENT_LITTLE_ENDIAN (100, "16-bit Linear PCM 2’s complement, Little Endian"),
+ NAME_16_BIT_LINEAR_PCM_2S_COMPLEMENT_LITTLE_ENDIAN (100, "16-bit Linear PCM 2’s complement, Little Endian"),
/** (unavailable for use) */
UNAVAILABLE_FOR_USE_2 (255, "(unavailable for use)");
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SignalTDLType.java b/src-generated/edu/nps/moves/dis7/enumerations/SignalTDLType.java
index 5b712a46fcb985fc0497986807cf743dde7f6892..1190426fcc79a1c5590eb4d014cf8a99eeedd87b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SignalTDLType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SignalTDLType.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 178 marshal size 16<br>
- * Signal-TDL Type
+ * SignalTDLType
*/
public enum SignalTDLType
{
@@ -203,7 +203,9 @@ public enum SignalTDLType
/** JPALS Data Link */
JPALS_DATA_LINK (125, "JPALS Data Link"),
/** OneSAF IADS Communications Link */
- ONESAF_IADS_COMMUNICATIONS_LINK (126, "OneSAF IADS Communications Link");
+ ONESAF_IADS_COMMUNICATIONS_LINK (126, "OneSAF IADS Communications Link"),
+ /** Tactical Targeting Network Technology (TTNT) Application */
+ TACTICAL_TARGETING_NETWORK_TECHNOLOGY_TTNT_APPLICATION (127, "Tactical Targeting Network Technology (TTNT) Application");
private int value;
private final String description;
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SignalUserProtocolIdentificationNumber.java b/src-generated/edu/nps/moves/dis7/enumerations/SignalUserProtocolIdentificationNumber.java
index 7b42ccf7efa643820c110ad6c32fcf5062cf98d3..12faaf1871658eaf302a9b023c626cef69f15c35 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SignalUserProtocolIdentificationNumber.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SignalUserProtocolIdentificationNumber.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
- * UID 177 marshal size 14<br>
- * Signal-User Protocol Identification Number
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
+ * UID 177 marshal size 32<br>
+ * SignalUserProtocolIdentificationNumber
*/
public enum SignalUserProtocolIdentificationNumber
{
@@ -81,7 +81,9 @@ public enum SignalUserProtocolIdentificationNumber
/** Image File Transfer Message */
IMAGE_FILE_TRANSFER_MESSAGE (7030, "Image File Transfer Message"),
/** Geotag Data Message */
- GEOTAG_DATA_MESSAGE (7040, "Geotag Data Message");
+ GEOTAG_DATA_MESSAGE (7040, "Geotag Data Message"),
+ /** Tactical Video Regeneration Data */
+ TACTICAL_VIDEO_REGENERATION_DATA (7050, "Tactical Video Regeneration Data");
private int value;
private final String description;
@@ -104,7 +106,7 @@ public enum SignalUserProtocolIdentificationNumber
public static int getEnumBitWidth()
{
- return 14;
+ return 32;
}
public static SignalUserProtocolIdentificationNumber getEnumForValue(int i)
@@ -120,32 +122,32 @@ public enum SignalUserProtocolIdentificationNumber
public void marshal(DataOutputStream dos) throws IOException
{
- dos.writeShort(getValue());
+ dos.writeInt(getValue());
}
- public void marshal(ByteBuffer buff) throws Exception
+ public void marshal(ByteBuffer buff)
{
- buff.putShort((short)getValue());
+ buff.putInt(getValue());
}
public static SignalUserProtocolIdentificationNumber unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue(dis.readUnsignedShort());
+ return getEnumForValue(dis.readInt());
}
- public static SignalUserProtocolIdentificationNumber unmarshalEnum (ByteBuffer buff) throws Exception
+ public static SignalUserProtocolIdentificationNumber unmarshalEnum (ByteBuffer buff)
{
- return getEnumForValue(buff.getShort());
- }
+ return getEnumForValue(buff.getInt());
+ }
public int getMarshalledSize()
{
- return 2; // 16 bits
+ return 4; // 32 bits
}
@Override
public String toString()
{
- return "SignalUserProtocolIdentificationNumber: " + name() + ": " + getValue();
+ return "SignalUserProtocolIdentificationNumber: " + name() + ": " + getValue();
}
}
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SpacePlatformAppearance.java b/src-generated/edu/nps/moves/dis7/enumerations/SpacePlatformAppearance.java
index bf773032b0226f4424e29c4cd8c5d72d0f0ac61e..9d1d69ac7d0515033ab463bf66adb9e899436d18 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SpacePlatformAppearance.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SpacePlatformAppearance.java
@@ -3,20 +3,20 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 35 marshal size 32<br>
- * Space Platform Appearance
+ * SpacePlatformAppearance
*/
public class SpacePlatformAppearance extends DisBitSet
{
/**
* Describes the visual paint design, Use {@link AppearancePaintScheme} values for this field
*/
- public static Bits PAINT_SCHEME = new Bits(0, 1, AppearancePaintScheme.class);
+ public static Bits PAINTSCHEME = new Bits(0, 1, AppearancePaintScheme.class);
/**
* Describes whether it is capable of moving on its own power
*/
- public static Bits MOBILITY_KILLED = new Bits(1, 1);
+ public static Bits MOBILITYKILLED = new Bits(1, 1);
/**
* Describes the damaged appearance, Use {@link AppearanceDamage} values for this field
*/
@@ -24,23 +24,23 @@ public class SpacePlatformAppearance extends DisBitSet
/**
* Describes whether or not smoke or vapor is emanating from the entity
*/
- public static Bits IS_SMOKE_VAPOR_EMANATING = new Bits(5, 1);
+ public static Bits ISSMOKE_VAPOREMANATING = new Bits(5, 1);
/**
* Describes whether or not the engine is emitting smoke
*/
- public static Bits IS_ENGINE_EMITTING_SMOKE = new Bits(6, 1);
+ public static Bits ISENGINEEMITTINGSMOKE = new Bits(6, 1);
/**
* Describes whether the entity is burning and flames are visible
*/
- public static Bits IS_FLAMING = new Bits(15, 1);
+ public static Bits ISFLAMING = new Bits(15, 1);
/**
* Describes whether the entity is frozen and should not be dead reckoned
*/
- public static Bits IS_FROZEN = new Bits(21, 1);
+ public static Bits ISFROZEN = new Bits(21, 1);
/**
* Describes whether the power plant is on or off
*/
- public static Bits POWER_PLANT_ON = new Bits(22, 1);
+ public static Bits POWERPLANTON = new Bits(22, 1);
/**
* Describes whether the entity is active or deactivated, Use {@link AppearanceEntityorObjectState} values for this field
*/
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SpacePlatformCapabilities.java b/src-generated/edu/nps/moves/dis7/enumerations/SpacePlatformCapabilities.java
index 42d0f32af3e5276912e5cae52abd932ecb57aee1..b1ae784771fc56629aece4a631dca475e2e7df6a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SpacePlatformCapabilities.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SpacePlatformCapabilities.java
@@ -3,20 +3,20 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 454 marshal size 32<br>
- * Space Platform Capabilities
+ * SpacePlatformCapabilities
*/
public class SpacePlatformCapabilities extends DisBitSet implements EntityCapabilities
{
/**
* Describes whether the entity is able to supply some type of ammunition in response to an appropriate service request
*/
- public static Bits AMMUNITION_SUPPLY = new Bits(0, 1);
+ public static Bits AMMUNITIONSUPPLY = new Bits(0, 1);
/**
* Describes whether the entity is able to supply some type of fuel in response to an appropriate service request
*/
- public static Bits FUEL_SUPPLY = new Bits(1, 1);
+ public static Bits FUELSUPPLY = new Bits(1, 1);
/**
* Describes whether the entity is able to provide recovery (e.g., towing) services in response to an appropriate service request
*/
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SpecificDimensionEnumerationsforAirAreaSize.java b/src-generated/edu/nps/moves/dis7/enumerations/SpecificDimensionEnumerationsforAirAreaSize.java
index 022dc34e07fabfe068be2db0777e006b1f0bbb1a..9570befee99761b13febe98221a611a7cfa53ff4 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SpecificDimensionEnumerationsforAirAreaSize.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SpecificDimensionEnumerationsforAirAreaSize.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 132 marshal size 8<br>
- * Specific Dimension Enumerations for Air Area Size<br>
+ * SpecificDimensionEnumerationsforAirAreaSize<br>
* The gaps in enumeration values are intentional and are reserved for future additions.
*/
public enum SpecificDimensionEnumerationsforAirAreaSize
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SpecificDimensionEnumerationsforLandAreaSize.java b/src-generated/edu/nps/moves/dis7/enumerations/SpecificDimensionEnumerationsforLandAreaSize.java
index f0aac18eda2cff54f78af3f4165ee585326f5093..73dc8230e7453c17809d7ec25a0ef60df6a946ef 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SpecificDimensionEnumerationsforLandAreaSize.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SpecificDimensionEnumerationsforLandAreaSize.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 131 marshal size 8<br>
- * Specific Dimension Enumerations for Land Area Size<br>
+ * SpecificDimensionEnumerationsforLandAreaSize<br>
* The gaps in enumeration values are intentional and are reserved for future additions.
*/
public enum SpecificDimensionEnumerationsforLandAreaSize
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SpotChaffStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/SpotChaffStatus.java
index 004812857d9c6e3786c25229e25e86e1b2b35ea4..09278b211184b26171ca8aaa1b384d6a35179453 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SpotChaffStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SpotChaffStatus.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 404 marshal size 2<br>
- * Spot Chaff Status
+ * SpotChaffStatus
*/
public enum SpotChaffStatus
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/StopFreezeFrozenBehavior.java b/src-generated/edu/nps/moves/dis7/enumerations/StopFreezeFrozenBehavior.java
index fa74dddf613f5bdca5e74cec1f3f5e31e9bc6a9d..4c21ece8e427d9392730ae37cc2404399c810e45 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/StopFreezeFrozenBehavior.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/StopFreezeFrozenBehavior.java
@@ -3,24 +3,24 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 68 marshal size 8<br>
- * Stop/Freeze-Frozen Behavior
+ * Stop/FreezeFrozenBehavior
*/
public class StopFreezeFrozenBehavior extends DisBitSet
{
/**
* Describes whether a simulation application should run the internal simulation clock or not
*/
- public static Bits RUN_SIMULATION_CLOCK = new Bits(0, 1);
+ public static Bits RUNSIMULATIONCLOCK = new Bits(0, 1);
/**
* Describes whether a simulation application should transmit updates and interactions or not
*/
- public static Bits TRANSMIT_UPDATES = new Bits(1, 1);
+ public static Bits TRANSMITUPDATES = new Bits(1, 1);
/**
* Describes whether a simulation application should update simulation models of other entities via received updates or interactions
*/
- public static Bits PROCESS_UPDATES = new Bits(2, 1);
+ public static Bits PROCESSUPDATES = new Bits(2, 1);
public static class Bits
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/StopFreezeReason.java b/src-generated/edu/nps/moves/dis7/enumerations/StopFreezeReason.java
index 8457e30f389a28bf9a60566ea717b59edc1c7613..53dd6020f7465dd258b5757d1fa4bba9b87478e3 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/StopFreezeReason.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/StopFreezeReason.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 67 marshal size 8<br>
- * Stop/Freeze-Reason
+ * Stop/FreezeReason
*/
public enum StopFreezeReason
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory200Bird.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory200Bird.java
index 9acdf02c4a6eeb22087cf070a4ff99612e99d1af..338a0c9baba88a53bcd23e933985fafa2cf82a9e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory200Bird.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory200Bird.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 110 marshal size 8<br>
- * Subcategories for Air Category 200 - Bird
+ * SubcategoriesforAirCategory200Bird
*/
public enum SubcategoriesforAirCategory200Bird implements SubCategory
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory201Insect.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory201Insect.java
index f23151dbf0ff47f268c53b1882dedf2f22190d51..50ac54bd638d77e27cc861d2cff1a70e8b8ddf16 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory201Insect.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory201Insect.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 111 marshal size 8<br>
- * Subcategories for Air Category 201 - Insect
+ * SubcategoriesforAirCategory201Insect
*/
public enum SubcategoriesforAirCategory201Insect implements SubCategory
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory202Mammal.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory202Mammal.java
index b340f350dc113388a53096020124d0cb63ee102b..31d8a0f856c6c81fa0b7fabe6ec0746c30ec26b2 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory202Mammal.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory202Mammal.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 112 marshal size 8<br>
- * Subcategories for Air Category 202 - Mammal
+ * SubcategoriesforAirCategory202Mammal
*/
public enum SubcategoriesforAirCategory202Mammal implements SubCategory
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory200Mammal.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory200Mammal.java
index d0248076f1e31243034a4fdc277ca09f46833067..6b32d22741ee850218968f87b7dc50debaa7761a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory200Mammal.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory200Mammal.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 100 marshal size 8<br>
- * Subcategories for Land Category 200 - Mammal<br>
+ * SubcategoriesforLandCategory200Mammal<br>
* 1-199 Domesticated animals, 200-255 Wild animals
*/
public enum SubcategoriesforLandCategory200Mammal implements SubCategory
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory201Reptile.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory201Reptile.java
index 959a2eaeba5bccf57fa76ab6f431493ec476b988..d3c03057c342540587eb653b77c518f45a044a0e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory201Reptile.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory201Reptile.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 101 marshal size 8<br>
- * Subcategories for Land Category 201 - Reptile
+ * SubcategoriesforLandCategory201Reptile
*/
public enum SubcategoriesforLandCategory201Reptile implements SubCategory
{
@@ -50,7 +50,7 @@ public enum SubcategoriesforLandCategory201Reptile implements SubCategory
COBRA (66, "Cobra"),
/** Australian Brown Snake */
AUSTRALIAN_BROWN_SNAKE (67, "Australian Brown Snake"),
- /** Tortoise, 90-119 Turtle/Tortoise */
+ /** Tortoise, 90-119 Turtle/Tortoise */
TORTOISE (90, "Tortoise"),
/** Turtle */
TURTLE (100, "Turtle"),
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory202Amphibian.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory202Amphibian.java
index 0c919fce594d9102d4319ab4d5c2d9b175552468..c749bb2a2a0b97a1c43fcb73ed2057259ce4b192 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory202Amphibian.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory202Amphibian.java
@@ -8,13 +8,13 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 102 marshal size 8<br>
- * Subcategories for Land Category 202 - Amphibian
+ * SubcategoriesforLandCategory202Amphibian
*/
public enum SubcategoriesforLandCategory202Amphibian implements SubCategory
{
- /** Frog, 1-169 Frog/Toad */
+ /** Frog, 1-169 Frog/Toad */
FROG (1, "Frog"),
/** Toad */
TOAD (2, "Toad"),
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory203Insect.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory203Insect.java
index 2faa3cb7f51fc88a5e442f4bd85aa18357e4af5b..01cce0d02114b0dd0c4125d3701284d3f90297d3 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory203Insect.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory203Insect.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 103 marshal size 8<br>
- * Subcategories for Land Category 203 - Insect
+ * SubcategoriesforLandCategory203Insect
*/
public enum SubcategoriesforLandCategory203Insect implements SubCategory
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory204Arachnid.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory204Arachnid.java
index c1131895dcf41a5603f3c973e178c7ca05fc1184..f1a667d02ddf96d6c9ff2be4e57f57fb0a8ccf2b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory204Arachnid.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory204Arachnid.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 104 marshal size 8<br>
- * Subcategories for Land Category 204 - Arachnid
+ * SubcategoriesforLandCategory204Arachnid
*/
public enum SubcategoriesforLandCategory204Arachnid implements SubCategory
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory205Mollusk.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory205Mollusk.java
index 9676f7fd54b2546fbffd34a78b50272ade4793e1..4abfc5927ecf161ae1320cdcc2c2db5266a83a7b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory205Mollusk.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory205Mollusk.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 105 marshal size 8<br>
- * Subcategories for Land Category 205 - Mollusk
+ * SubcategoriesforLandCategory205Mollusk
*/
public enum SubcategoriesforLandCategory205Mollusk implements SubCategory
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory206Marsupial.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory206Marsupial.java
index f1fd780c108ff85e990c0888c40923c75d74da10..2f14ef702a472c302bdf81e4c0b2624f98dfc8e3 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory206Marsupial.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory206Marsupial.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 106 marshal size 8<br>
- * Subcategories for Land Category 206 - Marsupial<br>
+ * SubcategoriesforLandCategory206Marsupial<br>
* 1-99 Ameridelphia, 100-250 Australidelphia
*/
public enum SubcategoriesforLandCategory206Marsupial
@@ -20,8 +20,8 @@ public enum SubcategoriesforLandCategory206Marsupial
BROWN_FOUR_EYED_OPOSSUM (1, "Brown Four-Eyed Opossum"),
/** Bushy-Tailed Opossum */
BUSHY_TAILED_OPOSSUM (2, "Bushy-Tailed Opossum"),
- /** Tate's Shrew Opossum, 90-99 Shrew Opossum */
- TATES_SHREW_OPOSSUM (90, "Tate's Shrew Opossum"),
+ /** Tates Shrew Opossum, 90-99 Shrew Opossum */
+ TATES_SHREW_OPOSSUM (90, "Tates Shrew Opossum"),
/** Greater Bilby, 100-109 Bandicoots and Bilbies */
GREATER_BILBY (100, "Greater Bilby"),
/** Tasmanian Devil, 110-149 Carnivorous Marsupials */
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory200Fish.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory200Fish.java
index 771df4a0cbd3ff7d8bc26a614f6aab0cadfeda88..19f45ea33dff6d3f84b8b3e2e120e2ddd055c1df 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory200Fish.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory200Fish.java
@@ -8,13 +8,13 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 120 marshal size 8<br>
- * Subcategories for Subsurface Category 200 - Fish
+ * SubcategoriesforSubsurfaceCategory200Fish
*/
public enum SubcategoriesforSubsurfaceCategory200Fish implements SubCategory
{
- /** Forage Fish, Small Schooling, 1-29 Small size schooling (forage) fish (herring-like, sardines, squid, krill) */
+ /** Forage Fish, Small Schooling, 1-29 Small size schooling (forage) fish (herring-like, sardines, squid, krill) */
FORAGE_FISH_SMALL_SCHOOLING (1, "Forage Fish, Small Schooling"),
/** Herring */
HERRING (2, "Herring"),
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory201Mammal.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory201Mammal.java
index 04b38fcb9b802c343e3f476d8e186693923cbf73..ca8467d4693247d8b8f74dd9717bf45bc160822a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory201Mammal.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory201Mammal.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 121 marshal size 8<br>
- * Subcategories for Subsurface Category 201 - Mammal
+ * SubcategoriesforSubsurfaceCategory201Mammal
*/
public enum SubcategoriesforSubsurfaceCategory201Mammal implements SubCategory
{
@@ -30,8 +30,8 @@ public enum SubcategoriesforSubsurfaceCategory201Mammal implements SubCategory
SOUTHERN_BOTTLENOSE_WHALE (7, "Southern Bottlenose Whale"),
/** Bowhead Whale */
BOWHEAD_WHALE (8, "Bowhead Whale"),
- /** Bryde's Whale */
- BRYDES_WHALE (9, "Bryde's Whale"),
+ /** Brydes Whale */
+ BRYDES_WHALE (9, "Brydes Whale"),
/** Dwarf Sperm Whale */
DWARF_SPERM_WHALE (10, "Dwarf Sperm Whale"),
/** Finback Whale */
@@ -92,10 +92,10 @@ public enum SubcategoriesforSubsurfaceCategory201Mammal implements SubCategory
HARBOUR_PORPOISE (101, "Harbour Porpoise"),
/** Californian Porpoise */
CALIFORNIAN_PORPOISE (102, "Californian Porpoise"),
- /** Dall's Porpoise */
- DALLS_PORPOISE (103, "Dall's Porpoise"),
- /** Burmeister's Porpoise */
- BURMEISTERS_PORPOISE (104, "Burmeister's Porpoise"),
+ /** Dalls Porpoise */
+ DALLS_PORPOISE (103, "Dalls Porpoise"),
+ /** Burmeisters Porpoise */
+ BURMEISTERS_PORPOISE (104, "Burmeisters Porpoise"),
/** Seal, 120-129 Seal */
SEAL (120, "Seal"),
/** Bearded Seal */
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory202Mollusk.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory202Mollusk.java
index c080a87c2dbde40daad1803df80b79007e6e5161..3f55cd901bb54260731b8aa05e8923bf06c4c7cd 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory202Mollusk.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory202Mollusk.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 122 marshal size 8<br>
- * Subcategories for Subsurface Category 202 - Mollusk
+ * SubcategoriesforSubsurfaceCategory202Mollusk
*/
public enum SubcategoriesforSubsurfaceCategory202Mollusk implements SubCategory
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory203Crustacean.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory203Crustacean.java
index 9bdb672f33dbcd483afad822bbcf95f17ed3c4d8..1083724b7d8e2da1a69fdb8416b2eaf6b61cc585 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory203Crustacean.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory203Crustacean.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 123 marshal size 8<br>
- * Subcategories for Subsurface Category 203 - Crustacean
+ * SubcategoriesforSubsurfaceCategory203Crustacean
*/
public enum SubcategoriesforSubsurfaceCategory203Crustacean implements SubCategory
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory204Insect.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory204Insect.java
index 85d740aff2c6915b1d583ca3067b5e72c0f1d7bf..70bfca865e89027a2e192379d91497871956a61e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory204Insect.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory204Insect.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 124 marshal size 8<br>
- * Subcategories for Subsurface Category 204 - Insect
+ * SubcategoriesforSubsurfaceCategory204Insect
*/
public enum SubcategoriesforSubsurfaceCategory204Insect implements SubCategory
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubsurfacePlatformAppearance.java b/src-generated/edu/nps/moves/dis7/enumerations/SubsurfacePlatformAppearance.java
index f7886d94a509521a5ee6a82ab1456c659ccad63e..80e1d35473bcd7d19e504b2f0653754d00d4d1d9 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubsurfacePlatformAppearance.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubsurfacePlatformAppearance.java
@@ -3,20 +3,20 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 34 marshal size 32<br>
- * Subsurface Platform Appearance
+ * SubsurfacePlatformAppearance
*/
public class SubsurfacePlatformAppearance extends DisBitSet
{
/**
* Describes the visual paint design, Use {@link AppearancePaintScheme} values for this field
*/
- public static Bits PAINT_SCHEME = new Bits(0, 1, AppearancePaintScheme.class);
+ public static Bits PAINTSCHEME = new Bits(0, 1, AppearancePaintScheme.class);
/**
* Describes whether it is capable of moving on its own power
*/
- public static Bits MOBILITY_KILLED = new Bits(1, 1);
+ public static Bits MOBILITYKILLED = new Bits(1, 1);
/**
* Describes the damaged appearance, Use {@link AppearanceDamage} values for this field
*/
@@ -24,11 +24,11 @@ public class SubsurfacePlatformAppearance extends DisBitSet
/**
* Describes whether or not smoke is emanating from the entity
*/
- public static Bits IS_SMOKE_EMANATING = new Bits(5, 1);
+ public static Bits ISSMOKEEMANATING = new Bits(5, 1);
/**
* Describes whether or not the engine is emitting smoke
*/
- public static Bits IS_ENGINE_EMITTING_SMOKE = new Bits(6, 1);
+ public static Bits ISENGINEEMITTINGSMOKE = new Bits(6, 1);
/**
* Describes whether the hatch is open or closed, Use {@link AppearanceSubsurfaceHatch} values for this field
*/
@@ -36,19 +36,19 @@ public class SubsurfacePlatformAppearance extends DisBitSet
/**
* Describes whether running lights are on or off
*/
- public static Bits RUNNING_LIGHTS_ON = new Bits(12, 1);
+ public static Bits RUNNINGLIGHTSON = new Bits(12, 1);
/**
* Describes whether the entity is burning and flames are visible
*/
- public static Bits IS_FLAMING = new Bits(15, 1);
+ public static Bits ISFLAMING = new Bits(15, 1);
/**
* Describes whether the entity is frozen and should not be dead reckoned
*/
- public static Bits IS_FROZEN = new Bits(21, 1);
+ public static Bits ISFROZEN = new Bits(21, 1);
/**
* Describes whether the power plant is on or off
*/
- public static Bits POWER_PLANT_ON = new Bits(22, 1);
+ public static Bits POWERPLANTON = new Bits(22, 1);
/**
* Describes whether the entity is active or deactivated, Use {@link AppearanceEntityorObjectState} values for this field
*/
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubsurfacePlatformCapabilities.java b/src-generated/edu/nps/moves/dis7/enumerations/SubsurfacePlatformCapabilities.java
index 0a25a10b393a2b1134843ba752d6b771c6e1bdc5..cb190ed9237ef11456bdd5ff8b07d1cf95954747 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubsurfacePlatformCapabilities.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubsurfacePlatformCapabilities.java
@@ -3,20 +3,20 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 453 marshal size 32<br>
- * Subsurface Platform Capabilities
+ * SubsurfacePlatformCapabilities
*/
public class SubsurfacePlatformCapabilities extends DisBitSet implements EntityCapabilities
{
/**
* Describes whether the entity is able to supply some type of ammunition in response to an appropriate service request
*/
- public static Bits AMMUNITION_SUPPLY = new Bits(0, 1);
+ public static Bits AMMUNITIONSUPPLY = new Bits(0, 1);
/**
* Describes whether the entity is able to supply some type of fuel in response to an appropriate service request
*/
- public static Bits FUEL_SUPPLY = new Bits(1, 1);
+ public static Bits FUELSUPPLY = new Bits(1, 1);
/**
* Describes whether the entity is able to provide recovery (e.g., towing) services in response to an appropriate service request
*/
@@ -30,17 +30,17 @@ public class SubsurfacePlatformCapabilities extends DisBitSet implements EntityC
*/
public static Bits RESERVED = new Bits(4, 1);
/**
- * The Entity is able to be carried as a sling load payload. The extended appearance record (if available) will identify if it is currently sling loaded and entity association and/or entity offset records (if available) will provide additional sling load details (such as carrier).
+ * The Entity is able to be carried as a sling load payload. The extended appearance record (if available) will identify if it is currently sling loaded and entity association and/or entity offset records (if available) will provide additional sling load details (such as carrier).
*/
- public static Bits SLING_LOADABLE = new Bits(6, 1);
+ public static Bits SLINGLOADABLE = new Bits(6, 1);
/**
- * The Entity is an IED or contains an IED. The extended appearance record (if available) will identify how well hidden the IED is on the Entity. An Attached Part (if applicable, for instance a jury-rigged munition does not apply here) will identify the IED explicitly.
+ * The Entity is an IED or contains an IED. The extended appearance record (if available) will identify how well hidden the IED is on the Entity. An Attached Part (if applicable, for instance a jury-rigged munition does not apply here) will identify the IED explicitly.
*/
- public static Bits IED_PRESENCE_INDICATOR = new Bits(7, 1);
+ public static Bits IEDPRESENCEINDICATOR = new Bits(7, 1);
/**
* The Entity (normally a virtual manned module) can be task organized into an existing mixed mode unit (where mixed mode is intended to comprise a combination of computer-generated forces and virtual or even live forces).
*/
- public static Bits TASK_ORGANIZABLE = new Bits(8, 1);
+ public static Bits TASKORGANIZABLE = new Bits(8, 1);
public static class Bits
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SupplyAppearance.java b/src-generated/edu/nps/moves/dis7/enumerations/SupplyAppearance.java
index b61bd9926bfc88c986112f7b28d5e30d75b8ac95..651726ad4c452054aa9d2b49757e0fa7970cacec 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SupplyAppearance.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SupplyAppearance.java
@@ -3,32 +3,32 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 40 marshal size 32<br>
- * Supply Appearance
+ * SupplyAppearance
*/
public class SupplyAppearance extends DisBitSet
{
/**
* Describes the visual paint design, Use {@link AppearancePaintScheme} values for this field
*/
- public static Bits PAINT_SCHEME = new Bits(0, 1, AppearancePaintScheme.class);
+ public static Bits PAINTSCHEME = new Bits(0, 1, AppearancePaintScheme.class);
/**
* Describes the damaged appearance, Use {@link AppearanceDamage} values for this field
*/
public static Bits DAMAGE = new Bits(3, 2, AppearanceDamage.class);
/**
- * Describes the status of a supply's parachute, Use {@link Parachute} values for this field
+ * Describes the status of a supplys parachute, Use {@link Parachute} values for this field
*/
- public static Bits PARACHUTE_STATUS = new Bits(7, 2, Parachute.class);
+ public static Bits PARACHUTESTATUS = new Bits(7, 2, Parachute.class);
/**
* Describes whether the entity is burning and flames are visible
*/
- public static Bits IS_FLAMING = new Bits(15, 1);
+ public static Bits ISFLAMING = new Bits(15, 1);
/**
* Describes whether the entity is frozen and should not be dead reckoned
*/
- public static Bits IS_FROZEN = new Bits(21, 1);
+ public static Bits ISFROZEN = new Bits(21, 1);
/**
* Describes whether the entity is active or deactivated, Use {@link AppearanceEntityorObjectState} values for this field
*/
@@ -36,7 +36,7 @@ public class SupplyAppearance extends DisBitSet
/**
* Describes the deployed status, Use {@link AppearanceSupplyDeployed} values for this field
*/
- public static Bits DEPLOYED_STATUS = new Bits(24, 2, AppearanceSupplyDeployed.class);
+ public static Bits DEPLOYEDSTATUS = new Bits(24, 2, AppearanceSupplyDeployed.class);
/**
* Describes whether or not the entity is masked or cloaked
*/
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SupplyCapabilities.java b/src-generated/edu/nps/moves/dis7/enumerations/SupplyCapabilities.java
index 699be87af5e8448f7efd29f150d6a7fbc01257a6..fdb5c10c18514dada9a643338dc09dcbf7fc77f4 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SupplyCapabilities.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SupplyCapabilities.java
@@ -3,32 +3,32 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 459 marshal size 32<br>
- * Supply Capabilities
+ * SupplyCapabilities
*/
public class SupplyCapabilities extends DisBitSet implements EntityCapabilities
{
/**
* Describes whether the entity is able to supply some type of ammunition in response to an appropriate service request
*/
- public static Bits AMMUNITION_SUPPLY = new Bits(0, 1);
+ public static Bits AMMUNITIONSUPPLY = new Bits(0, 1);
/**
* Describes whether the entity is able to supply some type of fuel in response to an appropriate service request
*/
- public static Bits FUEL_SUPPLY = new Bits(1, 1);
+ public static Bits FUELSUPPLY = new Bits(1, 1);
/**
* This entry is reserved for backward compatibility and may not be reused
*/
public static Bits RESERVED = new Bits(2, 3);
/**
- * The Entity is able to be carried as a sling load payload. The extended appearance record (if available) will identify if it is currently sling loaded and entity association and/or entity offset records (if available) will provide additional sling load details (such as carrier).
+ * The Entity is able to be carried as a sling load payload. The extended appearance record (if available) will identify if it is currently sling loaded and entity association and/or entity offset records (if available) will provide additional sling load details (such as carrier).
*/
- public static Bits SLING_LOADABLE = new Bits(6, 1);
+ public static Bits SLINGLOADABLE = new Bits(6, 1);
/**
- * The Entity is an IED or contains an IED. The extended appearance record (if available) will identify how well hidden the IED is on the Entity. An Attached Part (if applicable, for instance a jury-rigged munition does not apply here) will identify the IED explicitly.
+ * The Entity is an IED or contains an IED. The extended appearance record (if available) will identify how well hidden the IED is on the Entity. An Attached Part (if applicable, for instance a jury-rigged munition does not apply here) will identify the IED explicitly.
*/
- public static Bits IED_PRESENCE_INDICATOR = new Bits(7, 1);
+ public static Bits IEDPRESENCEINDICATOR = new Bits(7, 1);
public static class Bits
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SupplyDomain.java b/src-generated/edu/nps/moves/dis7/enumerations/SupplyDomain.java
index 817b4ba301f7c77eea3420b11444a2d7be6613f6..8a6a29fe88d81a05e78bef46c4301e298dbbdb8c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SupplyDomain.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SupplyDomain.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 600 marshal size 8<br>
- * Supply Domain
+ * SupplyDomain
*/
public enum SupplyDomain
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SupplyFuelType.java b/src-generated/edu/nps/moves/dis7/enumerations/SupplyFuelType.java
index 03eead2d4335b787b2bce75cbed627207e976f28..c1ea1f6446dfbdf82ff2db87ff37222bc258191c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SupplyFuelType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SupplyFuelType.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 413 marshal size 8<br>
- * Supply-Fuel Type<br>
+ * SupplyFuelType<br>
* Specific values for Supply Subcategory Fuels (1).
*/
public enum SupplyFuelType
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SurfacePlatformAppearance.java b/src-generated/edu/nps/moves/dis7/enumerations/SurfacePlatformAppearance.java
index 6796d0edfb25aae257976402496431f1d7b5d48b..ec52913367c3d138d97ee5089922d0927078f5c5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SurfacePlatformAppearance.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SurfacePlatformAppearance.java
@@ -3,20 +3,20 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 33 marshal size 32<br>
- * Surface Platform Appearance
+ * SurfacePlatformAppearance
*/
public class SurfacePlatformAppearance extends DisBitSet
{
/**
* Describes the visual paint design, Use {@link AppearancePaintScheme} values for this field
*/
- public static Bits PAINT_SCHEME = new Bits(0, 1, AppearancePaintScheme.class);
+ public static Bits PAINTSCHEME = new Bits(0, 1, AppearancePaintScheme.class);
/**
* Describes whether it is capable of moving on its own power
*/
- public static Bits MOBILITY_KILLED = new Bits(1, 1);
+ public static Bits MOBILITYKILLED = new Bits(1, 1);
/**
* Describes the damaged appearance, Use {@link AppearanceDamage} values for this field
*/
@@ -24,31 +24,31 @@ public class SurfacePlatformAppearance extends DisBitSet
/**
* Describes whether or not smoke is emanating from the entity
*/
- public static Bits IS_SMOKE_EMANATING = new Bits(5, 1);
+ public static Bits ISSMOKEEMANATING = new Bits(5, 1);
/**
* Describes whether or not the engine is emitting smoke
*/
- public static Bits IS_ENGINE_EMITTING_SMOKE = new Bits(6, 1);
+ public static Bits ISENGINEEMITTINGSMOKE = new Bits(6, 1);
/**
* Describes the size of the wake trailing effect, Use {@link AppearanceTrailingEffects} values for this field
*/
- public static Bits WAKE_SIZE = new Bits(7, 2, AppearanceTrailingEffects.class);
+ public static Bits WAKESIZE = new Bits(7, 2, AppearanceTrailingEffects.class);
/**
* Describes whether running lights are on or off
*/
- public static Bits RUNNING_LIGHTS_ON = new Bits(12, 1);
+ public static Bits RUNNINGLIGHTSON = new Bits(12, 1);
/**
* Describes whether the entity is burning and flames are visible
*/
- public static Bits IS_FLAMING = new Bits(15, 1);
+ public static Bits ISFLAMING = new Bits(15, 1);
/**
* Describes whether the entity is frozen and should not be dead reckoned
*/
- public static Bits IS_FROZEN = new Bits(21, 1);
+ public static Bits ISFROZEN = new Bits(21, 1);
/**
* Describes whether the power plant is on or off
*/
- public static Bits POWER_PLANT_ON = new Bits(22, 1);
+ public static Bits POWERPLANTON = new Bits(22, 1);
/**
* Describes whether the entity is active or deactivated, Use {@link AppearanceEntityorObjectState} values for this field
*/
@@ -56,11 +56,11 @@ public class SurfacePlatformAppearance extends DisBitSet
/**
* Describes whether spot lights are on or off
*/
- public static Bits SPOT_LIGHTS_ON = new Bits(28, 1);
+ public static Bits SPOTLIGHTSON = new Bits(28, 1);
/**
* Describes whether interior lights are on or off
*/
- public static Bits INTERIOR_LIGHTS_ON = new Bits(29, 1);
+ public static Bits INTERIORLIGHTSON = new Bits(29, 1);
public static class Bits
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SurfacePlatformCapabilities.java b/src-generated/edu/nps/moves/dis7/enumerations/SurfacePlatformCapabilities.java
index 0f4ef516f1ffb7f5e9980727fa19da942c9402d0..f3d8f05ce5004bdd080632f0bcb21a16f7a70de5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SurfacePlatformCapabilities.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SurfacePlatformCapabilities.java
@@ -3,20 +3,20 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 452 marshal size 32<br>
- * Surface Platform Capabilities
+ * SurfacePlatformCapabilities
*/
public class SurfacePlatformCapabilities extends DisBitSet implements EntityCapabilities
{
/**
* Describes whether the entity is able to supply some type of ammunition in response to an appropriate service request
*/
- public static Bits AMMUNITION_SUPPLY = new Bits(0, 1);
+ public static Bits AMMUNITIONSUPPLY = new Bits(0, 1);
/**
* Describes whether the entity is able to supply some type of fuel in response to an appropriate service request
*/
- public static Bits FUEL_SUPPLY = new Bits(1, 1);
+ public static Bits FUELSUPPLY = new Bits(1, 1);
/**
* Describes whether the entity is able to provide recovery (e.g., towing) services in response to an appropriate service request
*/
@@ -30,17 +30,17 @@ public class SurfacePlatformCapabilities extends DisBitSet implements EntityCapa
*/
public static Bits RESERVED = new Bits(4, 1);
/**
- * The Entity is able to be carried as a sling load payload. The extended appearance record (if available) will identify if it is currently sling loaded and entity association and/or entity offset records (if available) will provide additional sling load details (such as carrier).
+ * The Entity is able to be carried as a sling load payload. The extended appearance record (if available) will identify if it is currently sling loaded and entity association and/or entity offset records (if available) will provide additional sling load details (such as carrier).
*/
- public static Bits SLING_LOADABLE = new Bits(6, 1);
+ public static Bits SLINGLOADABLE = new Bits(6, 1);
/**
- * The Entity is an IED or contains an IED. The extended appearance record (if available) will identify how well hidden the IED is on the Entity. An Attached Part (if applicable, for instance a jury-rigged munition does not apply here) will identify the IED explicitly.
+ * The Entity is an IED or contains an IED. The extended appearance record (if available) will identify how well hidden the IED is on the Entity. An Attached Part (if applicable, for instance a jury-rigged munition does not apply here) will identify the IED explicitly.
*/
- public static Bits IED_PRESENCE_INDICATOR = new Bits(7, 1);
+ public static Bits IEDPRESENCEINDICATOR = new Bits(7, 1);
/**
* The Entity (normally a virtual manned module) can be task organized into an existing mixed mode unit (where mixed mode is intended to comprise a combination of computer-generated forces and virtual or even live forces).
*/
- public static Bits TASK_ORGANIZABLE = new Bits(8, 1);
+ public static Bits TASKORGANIZABLE = new Bits(8, 1);
public static class Bits
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SurveillanceStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/SurveillanceStatus.java
index 8ce4c313ecbab3da7f61f98634aa54c2942f76b1..eb6a009deedb1c425ab6d45d7f5603fbb22a4a11 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SurveillanceStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SurveillanceStatus.java
@@ -8,7 +8,7 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 365 marshal size 2<br>
* Surveillance/Status
*/
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TCASACASBasicAdvancedIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/TCASACASBasicAdvancedIndicator.java
index 35e9e3277ba27c13e49eb286293cf504e7ba19bd..fe208edfcfcb934159b8da89c84e07ddbb32ef9b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TCASACASBasicAdvancedIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TCASACASBasicAdvancedIndicator.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 341 marshal size 1<br>
- * TCAS/ACAS Basic/Advanced Indicator
+ * TCAS/ACASBasic/AdvancedIndicator
*/
public enum TCASACASBasicAdvancedIndicator
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TCASACASIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/TCASACASIndicator.java
index d5fecbd3dc301f0fc4468549750b60168582b8b1..d39b1120969ce8f594d0e028cd97d20c89ac55f0 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TCASACASIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TCASACASIndicator.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 342 marshal size 1<br>
- * TCAS/ACAS Indicator
+ * TCAS/ACASIndicator
*/
public enum TCASACASIndicator
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TCASACASSoftwareVersion.java b/src-generated/edu/nps/moves/dis7/enumerations/TCASACASSoftwareVersion.java
index 83c80137b33eafa8c3c12d3492b2fbce369fd981..6f4d12b07a16aec976b338ac8c7281706a67b5b9 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TCASACASSoftwareVersion.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TCASACASSoftwareVersion.java
@@ -8,18 +8,18 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 343 marshal size 3<br>
- * TCAS/ACAS Software Version
+ * TCAS/ACASSoftwareVersion
*/
public enum TCASACASSoftwareVersion
{
/** No Statement */
NO_STATEMENT (0, "No Statement"),
/** 6.0.2 */
- $602 (1, "6.0.2"),
+ NAME_602 (1, "6.0.2"),
/** 7.0 */
- $70 (2, "7.0");
+ NAME_70 (2, "7.0");
private int value;
private final String description;
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TCASACASType.java b/src-generated/edu/nps/moves/dis7/enumerations/TCASACASType.java
index 90a7fd54c94ac7ae5c490632d22376258a855b37..b525c0a613bbd99e63775cd501eed44db879c892 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TCASACASType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TCASACASType.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 344 marshal size 3<br>
- * TCAS/ACAS Type
+ * TCAS/ACASType
*/
public enum TCASACASType
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TCASIIIType.java b/src-generated/edu/nps/moves/dis7/enumerations/TCASIIIType.java
index 42bc973948f39045fe9d3607783152924e145b24..f70be7985f6ea89f884c2acc47cd8a37173424f8 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TCASIIIType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TCASIIIType.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 345 marshal size 1<br>
- * TCAS I/II Type
+ * TCASI/IIType
*/
public enum TCASIIIType
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TILinkType.java b/src-generated/edu/nps/moves/dis7/enumerations/TILinkType.java
index f33c907395d3204523988627d6cd78f1fd43f1bb..c41148aeaa3d4bd195fc92bdb03bfa3df13d7ff7 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TILinkType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TILinkType.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 370 marshal size 16<br>
- * T/I Link Type
+ * T/ILinkType
*/
public enum TILinkType
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TimeSlotAllocationLevel.java b/src-generated/edu/nps/moves/dis7/enumerations/TimeSlotAllocationLevel.java
new file mode 100644
index 0000000000000000000000000000000000000000..882f564d08aa264c8fa885595a60e3a4e4518ab8
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TimeSlotAllocationLevel.java
@@ -0,0 +1,108 @@
+package edu.nps.moves.dis7.enumerations;
+
+import java.nio.ByteBuffer;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+import edu.nps.moves.dis7.*;
+
+/**
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
+ * UID 172 marshal size 8<br>
+ * TimeSlotAllocationLevel
+ */
+public enum TimeSlotAllocationLevel
+{
+ /** Low Fidelity Level 0 */
+ LOW_FIDELITY_LEVEL_0 (0, "Low Fidelity Level 0"),
+ /** Low Fidelity Level 1 */
+ LOW_FIDELITY_LEVEL_1 (1, "Low Fidelity Level 1"),
+ /** Medium Fidelity Level 2 */
+ MEDIUM_FIDELITY_LEVEL_2 (2, "Medium Fidelity Level 2"),
+ /** Medium Fidelity Level 3 */
+ MEDIUM_FIDELITY_LEVEL_3 (3, "Medium Fidelity Level 3"),
+ /** High Fidelity Level 4 */
+ HIGH_FIDELITY_LEVEL_4 (4, "High Fidelity Level 4");
+
+ private int value;
+ private final String description;
+
+ TimeSlotAllocationLevel(int value, String description)
+ {
+ this.value = value;
+ this.description = description;
+ }
+
+ public int getValue()
+ {
+ return value;
+ }
+
+ public String getDescription()
+ {
+ return description;
+ }
+
+ public static int getEnumBitWidth()
+ {
+ return 8;
+ }
+
+ public static TimeSlotAllocationLevel getEnumForValue(int i)
+ {
+ for(TimeSlotAllocationLevel val: TimeSlotAllocationLevel.values()) {
+ if(val.getValue()==i)
+ return val;
+ }
+ System.err.println("No enumeration found for value " + i + " of enumeration TimeSlotAllocationLevel");
+ return null;
+ }
+
+
+ public void marshal(DataOutputStream dos) throws IOException
+ {
+ dos.writeByte(getValue());
+ }
+
+ public void marshal(ByteBuffer buff) throws Exception
+ {
+ buff.put((byte)getValue());
+ }
+
+ public static TimeSlotAllocationLevel unmarshalEnum (DataInputStream dis) throws Exception
+ {
+ /* try {
+ value = dis.readUnsignedByte();
+ }
+ catch(IOException ex) {
+ showError(ex);
+ } */
+
+ return getEnumForValue(dis.readByte());
+ }
+
+ public static TimeSlotAllocationLevel unmarshalEnum(ByteBuffer buff) throws Exception
+ {
+ /*
+ try {
+ value = (int)buff.get();
+ }
+ catch(Exception ex) {
+ showError(ex);
+ }
+ */
+ return getEnumForValue(buff.get());
+ }
+
+ public int getMarshalledSize()
+ {
+ return 1; // 8 bits
+ }
+
+ @Override
+ public String toString()
+ {
+ return "TimeSlotAllocationLevel: " + name() + ": " + getValue();
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TimeTypeSource.java b/src-generated/edu/nps/moves/dis7/enumerations/TimeTypeSource.java
index e388e5ca4cc898d7331986de1e71f771624b4b89..a588a4ada178999f60217c79ca52fd175dfe7846 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TimeTypeSource.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TimeTypeSource.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 367 marshal size 2<br>
- * Time Type Source
+ * TimeTypeSource
*/
public enum TimeTypeSource
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransferControlTransferType.java b/src-generated/edu/nps/moves/dis7/enumerations/TransferControlTransferType.java
index 311b1bc2f1fcde0b8fb4a2eb93b4220dec320331..d0b158a6d04b7e1e092f29e17c3736bf906ac8fa 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransferControlTransferType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransferControlTransferType.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 224 marshal size 8<br>
- * Transfer Control-Transfer Type
+ * TransferControlTransferType
*/
public enum TransferControlTransferType
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmissionIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmissionIndicator.java
index ac7aebdc7a26199566eb64c53366719794ad1033..f0f52a6949961c38b7e07a5dc850c03e2d5f572d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmissionIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmissionIndicator.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 372 marshal size 8<br>
- * Transmission Indicator
+ * TransmissionIndicator
*/
public enum TransmissionIndicator
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterAntennaPatternReferenceSystem.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterAntennaPatternReferenceSystem.java
index 7aaa98065f7d50a0d20e0f5ca9130d3da5397d09..c49d20eea916075eeefa679d4477eeef03e5a9ff 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterAntennaPatternReferenceSystem.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterAntennaPatternReferenceSystem.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 168 marshal size 8<br>
- * Transmitter-Antenna Pattern-Reference System
+ * TransmitterAntennaPatternReferenceSystem
*/
public enum TransmitterAntennaPatternReferenceSystem
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterAntennaPatternType.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterAntennaPatternType.java
index e265bef3d6b67abb3aa293d661d277ba497dfb93..b0f96726ab999e90ca98018a27a016a4024def02 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterAntennaPatternType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterAntennaPatternType.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 167 marshal size 16<br>
- * Transmitter-Antenna Pattern Type
+ * TransmitterAntennaPatternType
*/
public enum TransmitterAntennaPatternType
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterCryptoSystem.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterCryptoSystem.java
index c8923ce9ad2d0b14cb5948639579cef2a997b43c..75af538b7bd2cebfa46ad653f04515888f332f1f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterCryptoSystem.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterCryptoSystem.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 166 marshal size 16<br>
- * Transmitter-Crypto System
+ * TransmitterCryptoSystem
*/
public enum TransmitterCryptoSystem
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAmplitudeModulation.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAmplitudeModulation.java
index 196d6be84dba589587c1e9afe1bc6470dd215a93..7b76f5e87c860bbc1bb0b77e232fff5eb4398e16 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAmplitudeModulation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAmplitudeModulation.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 156 marshal size 16<br>
- * Transmitter-Detail-Amplitude Modulation
+ * TransmitterDetailAmplitudeModulation
*/
public enum TransmitterDetailAmplitudeModulation
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAmplitudeandAngleModulation.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAmplitudeandAngleModulation.java
index 3776b0c67288603e7bac746b65c90fa0efc4d00f..171dfc6c460c423450fc7a3c0ebe829f44923066 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAmplitudeandAngleModulation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAmplitudeandAngleModulation.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 157 marshal size 16<br>
- * Transmitter-Detail-Amplitude and Angle Modulation
+ * TransmitterDetailAmplitudeandAngleModulation
*/
public enum TransmitterDetailAmplitudeandAngleModulation
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAnglemodulation.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAnglemodulation.java
index c3a64e20a1afb46b5edd29fa4f0eeb97013d73bc..ec39e7f00f1bb762a160a1bc8ceed17685503e33 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAnglemodulation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAnglemodulation.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 158 marshal size 16<br>
- * Transmitter-Detail-Angle modulation
+ * TransmitterDetailAnglemodulation
*/
public enum TransmitterDetailAnglemodulation
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailCarrierPhaseShiftModulation.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailCarrierPhaseShiftModulation.java
index 16e5275d782f9292a9919ba4067e06cf4fc0c192..1eb5d6eb7a394a09954b18586131127121d49e63 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailCarrierPhaseShiftModulation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailCarrierPhaseShiftModulation.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 162 marshal size 16<br>
- * Transmitter-Detail-Carrier Phase Shift Modulation
+ * TransmitterDetailCarrierPhaseShiftModulation
*/
public enum TransmitterDetailCarrierPhaseShiftModulation
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailCombinationModulation.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailCombinationModulation.java
index bb84c193d9ded4bea57aeb92b63bb4bdf8ec5a5d..1658a3847a4fecf77c3fec04108b674b1e334e9b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailCombinationModulation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailCombinationModulation.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 159 marshal size 16<br>
- * Transmitter-Detail-Combination Modulation
+ * TransmitterDetailCombinationModulation
*/
public enum TransmitterDetailCombinationModulation
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailPulseModulation.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailPulseModulation.java
index 6e46dcb8acbaac90f681277447a30477efec794b..e1ec727eddc3cb68377b396df56192158f743fd0 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailPulseModulation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailPulseModulation.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 160 marshal size 16<br>
- * Transmitter-Detail-Pulse Modulation
+ * TransmitterDetailPulseModulation
*/
public enum TransmitterDetailPulseModulation
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailSATCOMModulation.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailSATCOMModulation.java
index baba458bcaf9f2c779b6144ea044d342ecb84e53..c3ebddd746f51d387cc50cf59e5c43fe8c9eba6f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailSATCOMModulation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailSATCOMModulation.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 589 marshal size 16<br>
- * Transmitter-Detail-SATCOM-Modulation
+ * TransmitterDetailSATCOMModulation
*/
public enum TransmitterDetailSATCOMModulation
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailUnmodulatedModulation.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailUnmodulatedModulation.java
index 86a2ce7dcbe2328d43213801e0772939aef7360d..a4ae371d3856c45167b74728a76f721e0976a909 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailUnmodulatedModulation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailUnmodulatedModulation.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 161 marshal size 16<br>
- * Transmitter-Detail-Unmodulated Modulation
+ * TransmitterDetailUnmodulatedModulation
*/
public enum TransmitterDetailUnmodulatedModulation
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterInputSource.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterInputSource.java
index dbf8511e1be220ae1c8fbd63518dfadf3527d7ad..20667a418c22b90a3b92212271cf123f42a79248 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterInputSource.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterInputSource.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 165 marshal size 8<br>
- * Transmitter-Input Source
+ * TransmitterInputSource
*/
public enum TransmitterInputSource
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterMajorModulation.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterMajorModulation.java
index efa97cb10a6d8ae96f6f2b274def0af3a7daac0d..c2a4097e2dfd786c06bcaf8b75d854de22894750 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterMajorModulation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterMajorModulation.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 155 marshal size 16<br>
- * Transmitter-Major Modulation
+ * TransmitterMajorModulation
*/
public enum TransmitterMajorModulation
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterModulationTypeSystem.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterModulationTypeSystem.java
index 8b5c7197f5a922e447b2956766c1c711bb5011f4..ba6e041632d8e6536bac21ddeb27766052c9bc75 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterModulationTypeSystem.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterModulationTypeSystem.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 163 marshal size 16<br>
- * Transmitter-Modulation Type System
+ * TransmitterModulationTypeSystem
*/
public enum TransmitterModulationTypeSystem
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterTransmitState.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterTransmitState.java
index 6e446344544186908db277873d6ca9b372be9814..49dcd59d6c11aca178e72d0e81110d9be6e62ae6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterTransmitState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterTransmitState.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 164 marshal size 8<br>
- * Transmitter-Transmit State
+ * TransmitterTransmitState
*/
public enum TransmitterTransmitState
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransponderInterrogatorIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/TransponderInterrogatorIndicator.java
index 6f5573cee50d453ca14e84a9f716ad73835f5b70..6210fbf67fb848eb19578a4c073874d8db9c4312 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransponderInterrogatorIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransponderInterrogatorIndicator.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 337 marshal size 1<br>
- * Transponder/Interrogator Indicator
+ * Transponder/InterrogatorIndicator
*/
public enum TransponderInterrogatorIndicator
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TurnRateSource.java b/src-generated/edu/nps/moves/dis7/enumerations/TurnRateSource.java
index c20f96cba5d535b6bb387f96df47da919d7f5efd..153e1c180c7460bad1ad6b92f0e9963666f2722e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TurnRateSource.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TurnRateSource.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 366 marshal size 2<br>
- * Turn Rate Source
+ * TurnRateSource
*/
public enum TurnRateSource
{
@@ -19,7 +19,7 @@ public enum TurnRateSource
/** Less Than 1-Degree Turn or Not Turning */
LESS_THAN_1_DEGREE_TURN_OR_NOT_TURNING (1, "Less Than 1-Degree Turn or Not Turning"),
/** 1-Degree or Greater Turn Rate */
- $1_DEGREE_OR_GREATER_TURN_RATE (2, "1-Degree or Greater Turn Rate");
+ NAME_1_DEGREE_OR_GREATER_TURN_RATE (2, "1-Degree or Greater Turn Rate");
private int value;
private final String description;
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/UAAcousticEmitterSystemFunction.java b/src-generated/edu/nps/moves/dis7/enumerations/UAAcousticEmitterSystemFunction.java
index f69ee881763154df9de984322bedfc90b2fa0d33..f26f933ecc7c4ecd4a77295739717f77da3dda94 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/UAAcousticEmitterSystemFunction.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/UAAcousticEmitterSystemFunction.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 145 marshal size 8<br>
- * UA-Acoustic Emitter System Function
+ * UAAcousticEmitterSystemFunction
*/
public enum UAAcousticEmitterSystemFunction
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/UAAcousticSystemName.java b/src-generated/edu/nps/moves/dis7/enumerations/UAAcousticSystemName.java
index b3be375778576fb8d3172550499ff0acff9a2f85..b1334023b76ac0dd9e7db5e284f1b6909e2b64be 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/UAAcousticSystemName.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/UAAcousticSystemName.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 144 marshal size 16<br>
- * UA-Acoustic System Name
+ * UAAcousticSystemName
*/
public enum UAAcousticSystemName
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/UAActiveEmissionParameterIndex.java b/src-generated/edu/nps/moves/dis7/enumerations/UAActiveEmissionParameterIndex.java
index 9205a1f13ce9680e5c6796358cd1cd90a8197cab..c5188745b46f0875e50f01adb275ef2bce6715b9 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/UAActiveEmissionParameterIndex.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/UAActiveEmissionParameterIndex.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 146 marshal size 16<br>
- * UA-Active Emission Parameter Index
+ * UAActiveEmissionParameterIndex
*/
public enum UAActiveEmissionParameterIndex
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/UAAdditionalPassiveActivityParameterIndex.java b/src-generated/edu/nps/moves/dis7/enumerations/UAAdditionalPassiveActivityParameterIndex.java
index 56270e3167faef6900e4cd68af22a0873406e0e0..f3227f7e37b68eed11ec2ed1d6efea5922f85de9 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/UAAdditionalPassiveActivityParameterIndex.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/UAAdditionalPassiveActivityParameterIndex.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 150 marshal size 16<br>
- * UA-Additional Passive Activity Parameter Index
+ * UAAdditionalPassiveActivityParameterIndex
*/
public enum UAAdditionalPassiveActivityParameterIndex
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/UAPassiveParameterIndex.java b/src-generated/edu/nps/moves/dis7/enumerations/UAPassiveParameterIndex.java
index 2f5160628ed2f78be2dc3d97d1884885f3af5246..74386e8af9ba65d75e3cc3be5fe4a53a56600883 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/UAPassiveParameterIndex.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/UAPassiveParameterIndex.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 148 marshal size 16<br>
- * UA-Passive Parameter Index
+ * UAPassiveParameterIndex
*/
public enum UAPassiveParameterIndex
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/UAPropulsionPlantConfiguration.java b/src-generated/edu/nps/moves/dis7/enumerations/UAPropulsionPlantConfiguration.java
index e1e218e843659b7f8b817b25cbc6538b2c8c909e..b1458ba31e4ab3007d1f10252441e4664e051973 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/UAPropulsionPlantConfiguration.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/UAPropulsionPlantConfiguration.java
@@ -3,9 +3,9 @@ package edu.nps.moves.dis7.enumerations;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 149 marshal size 16<br>
- * UA-Propulsion Plant Configuration
+ * UAPropulsionPlantConfiguration
*/
public class UAPropulsionPlantConfiguration extends DisBitSet
{
@@ -16,7 +16,7 @@ public class UAPropulsionPlantConfiguration extends DisBitSet
/**
* Describes whether the hull-mounted masker is on or off
*/
- public static Bits HULL_MOUNTED_MASKER_ON = new Bits(7, 1);
+ public static Bits HULLMOUNTEDMASKERON = new Bits(7, 1);
public static class Bits
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/UAPropulsionPlantConfigurationConfiguration.java b/src-generated/edu/nps/moves/dis7/enumerations/UAPropulsionPlantConfigurationConfiguration.java
index 9bc958cbf677b8845e48c29d348e0559dd1134b0..8f94e515c68d5b5e79d4c109ca3939594b7e1813 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/UAPropulsionPlantConfigurationConfiguration.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/UAPropulsionPlantConfigurationConfiguration.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 335 marshal size 7<br>
- * UA Propulsion Plant Configuration-Configuration
+ * UAPropulsionPlantConfigurationConfiguration
*/
public enum UAPropulsionPlantConfigurationConfiguration
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/UAScanPattern.java b/src-generated/edu/nps/moves/dis7/enumerations/UAScanPattern.java
index 9ae66b4d5da6f79ef903063c9611f2a06701be0b..fa4cb42c8e63032c02f57aa8f7f93c3d865cc5fd 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/UAScanPattern.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/UAScanPattern.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 147 marshal size 16<br>
- * UA-Scan Pattern
+ * UAScanPattern
*/
public enum UAScanPattern
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/UAStateChangeUpdateIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/UAStateChangeUpdateIndicator.java
index 102e9fb88a56de86dd84c6bcfb3ca8672f61e370..02b757ba0ab21b104310ebc721bbbd6867194858 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/UAStateChangeUpdateIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/UAStateChangeUpdateIndicator.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 143 marshal size 8<br>
- * UA-State/Change Update Indicator
+ * UAState/ChangeUpdateIndicator
*/
public enum UAStateChangeUpdateIndicator
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/VariableParameterRecordType.java b/src-generated/edu/nps/moves/dis7/enumerations/VariableParameterRecordType.java
index 225a03231e5e24b720318f076f5df30768c87c61..01fdafbe5b255ca248aeb1167165d15be6c434e1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/VariableParameterRecordType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/VariableParameterRecordType.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 56 marshal size 8<br>
- * Variable Parameter Record Type
+ * VariableParameterRecordType
*/
public enum VariableParameterRecordType
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/VariableRecordType.java b/src-generated/edu/nps/moves/dis7/enumerations/VariableRecordType.java
index 59f43f8a2e1723b51d85dcd2b9e0d34dfb3d864b..562039ee3d5fa2f5511299eee44bb4466bcb3809 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/VariableRecordType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/VariableRecordType.java
@@ -8,12 +8,14 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 66 marshal size 32<br>
- * Variable Record Types
+ * VariableRecordTypes
*/
public enum VariableRecordType
{
+ /** Entity ID List */
+ ENTITY_ID_LIST (1, "Entity ID List"),
/** DDCP Join Transaction Join Request Message */
DDCP_JOIN_TRANSACTION_JOIN_REQUEST_MESSAGE (1001, "DDCP Join Transaction Join Request Message"),
/** DDCP Set Playback Window Transaction Set Playback Window Request Message */
@@ -307,25 +309,25 @@ public enum VariableRecordType
/** Ammunition */
AMMUNITION (24000, "Ammunition"),
/** 120-mm HEAT, quantity */
- $120_MM_HEAT_QUANTITY (24001, "120-mm HEAT, quantity"),
+ NAME_120_MM_HEAT_QUANTITY (24001, "120-mm HEAT, quantity"),
/** 120-mm SABOT, quantity */
- $120_MM_SABOT_QUANTITY (24002, "120-mm SABOT, quantity"),
+ NAME_120_MM_SABOT_QUANTITY (24002, "120-mm SABOT, quantity"),
/** 12.7-mm M8, quantity */
- $127_MM_M8_QUANTITY (24003, "12.7-mm M8, quantity"),
+ NAME_127_MM_M8_QUANTITY (24003, "12.7-mm M8, quantity"),
/** 12.7-mm M20, quantity */
- $127_MM_M20_QUANTITY (24004, "12.7-mm M20, quantity"),
+ NAME_127_MM_M20_QUANTITY (24004, "12.7-mm M20, quantity"),
/** 7.62-mm M62, quantity */
- $762_MM_M62_QUANTITY (24005, "7.62-mm M62, quantity"),
+ NAME_762_MM_M62_QUANTITY (24005, "7.62-mm M62, quantity"),
/** M250 UKL8A1, quantity */
M250_UKL8A1_QUANTITY (24006, "M250 UKL8A1, quantity"),
/** M250 UKL8A3, quantity */
M250_UKL8A3_QUANTITY (24007, "M250 UKL8A3, quantity"),
/** 7.62-mm M80, quantity */
- $762_MM_M80_QUANTITY (24008, "7.62-mm M80, quantity"),
+ NAME_762_MM_M80_QUANTITY (24008, "7.62-mm M80, quantity"),
/** 12.7-mm, quantity */
- $127_MM_QUANTITY (24009, "12.7-mm, quantity"),
+ NAME_127_MM_QUANTITY (24009, "12.7-mm, quantity"),
/** 7.62-mm, quantity */
- $762_MM_QUANTITY (24010, "7.62-mm, quantity"),
+ NAME_762_MM_QUANTITY (24010, "7.62-mm, quantity"),
/** Mines, quantity */
MINES_QUANTITY (24060, "Mines, quantity"),
/** Type */
@@ -1049,6 +1051,8 @@ public enum VariableRecordType
TACTICAL_DRIVER_STATUS (100068, "Tactical Driver Status"),
/** Sonar System Status */
SONAR_SYSTEM_STATUS (100100, "Sonar System Status"),
+ /** Accomplished accept */
+ ACCOMPLISHED_ACCEPT (100160, "Accomplished accept"),
/** Upper latitude */
UPPER_LATITUDE (100161, "Upper latitude"),
/** Latitude-South (Location of weather cell) */
@@ -1057,8 +1061,6 @@ public enum VariableRecordType
WESTERN_LONGITUDE (100163, "Western longitude"),
/** Longitude-West (location of weather cell) */
LONGITUDE_WEST_LOCATION_OF_WEATHER_CELL (100164, "Longitude-West (location of weather cell)"),
- /** Accomplished accept */
- ACCOMPLISHED_ACCEPT (100160, "Accomplished accept"),
/** CD ROM Number (Disk ID for terrain) */
CD_ROM_NUMBER_DISK_ID_FOR_TERRAIN (100165, "CD ROM Number (Disk ID for terrain)"),
/** DTED disk ID */
@@ -1713,6 +1715,60 @@ public enum VariableRecordType
FFS_AIRDROP_REQUEST_DATA (270165, "FFS Airdrop Request Data"),
/** FFS Airdrop Data */
FFS_AIRDROP_DATA (270166, "FFS Airdrop Data"),
+ /** Horizontal Circular Error Probable (m) */
+ HORIZONTAL_CIRCULAR_ERROR_PROBABLE_M (300000, "Horizontal Circular Error Probable (m)"),
+ /** Horizontal Position Error (m) */
+ HORIZONTAL_POSITION_ERROR_M (300001, "Horizontal Position Error (m)"),
+ /** Vertical Position Error (m) */
+ VERTICAL_POSITION_ERROR_M (300002, "Vertical Position Error (m)"),
+ /** Horizontal Velocity Error (m/s) */
+ HORIZONTAL_VELOCITY_ERROR_M_S (300003, "Horizontal Velocity Error (m/s)"),
+ /** Vertical Velocity Error (m/s) */
+ VERTICAL_VELOCITY_ERROR_M_S (300004, "Vertical Velocity Error (m/s)"),
+ /** 4th Lowest Jammer to Signal Ratio for P(Y)-L1 (dB) */
+ NAME_4TH_LOWEST_JAMMER_TO_SIGNAL_RATIO_FOR_PY_L1_DB (300005, "4th Lowest Jammer to Signal Ratio for P(Y)-L1 (dB)"),
+ /** 4th Lowest Jammer to Signal Ratio for P(Y)-L2 (dB) */
+ NAME_4TH_LOWEST_JAMMER_TO_SIGNAL_RATIO_FOR_PY_L2_DB (300006, "4th Lowest Jammer to Signal Ratio for P(Y)-L2 (dB)"),
+ /** GPS Figure of Merit */
+ GPS_FIGURE_OF_MERIT (300007, "GPS Figure of Merit"),
+ /** Weapon Transfer GPS State */
+ WEAPON_TRANSFER_GPS_STATE (300008, "Weapon Transfer GPS State"),
+ /** Weapon Transfer Horizontal Position Error (m) */
+ WEAPON_TRANSFER_HORIZONTAL_POSITION_ERROR_M (300009, "Weapon Transfer Horizontal Position Error (m)"),
+ /** Weapon Transfer Vertical Position Error (m) */
+ WEAPON_TRANSFER_VERTICAL_POSITION_ERROR_M (300010, "Weapon Transfer Vertical Position Error (m)"),
+ /** Weapon Transfer Vertical Position Error (m) */
+ WEAPON_TRANSFER_VERTICAL_POSITION_ERROR_M_2 (300011, "Weapon Transfer Vertical Position Error (m)"),
+ /** Weapon Transfer Horizontal Velocity Error (m/s) */
+ WEAPON_TRANSFER_HORIZONTAL_VELOCITY_ERROR_M_S (300012, "Weapon Transfer Horizontal Velocity Error (m/s)"),
+ /** Time Transfer Error (sec) */
+ TIME_TRANSFER_ERROR_SEC (300013, "Time Transfer Error (sec)"),
+ /** Age of Ephemeris (sec) */
+ AGE_OF_EPHEMERIS_SEC (300014, "Age of Ephemeris (sec)"),
+ /** Non-Flyout Munition Entity Request DIS Type Enumeration */
+ NON_FLYOUT_MUNITION_ENTITY_REQUEST_DIS_TYPE_ENUMERATION (300016, "Non-Flyout Munition Entity Request DIS Type Enumeration"),
+ /** Non-Flyout Munition Entity Request Launch Point X (m) */
+ NON_FLYOUT_MUNITION_ENTITY_REQUEST_LAUNCH_POINT_X_M (300017, "Non-Flyout Munition Entity Request Launch Point X (m)"),
+ /** Non-Flyout Munition Entity Request Launch Point Y (m) */
+ NON_FLYOUT_MUNITION_ENTITY_REQUEST_LAUNCH_POINT_Y_M (300018, "Non-Flyout Munition Entity Request Launch Point Y (m)"),
+ /** Non-Flyout Munition Entity Request Launch Point Z (m) */
+ NON_FLYOUT_MUNITION_ENTITY_REQUEST_LAUNCH_POINT_Z_M (300019, "Non-Flyout Munition Entity Request Launch Point Z (m)"),
+ /** Non-Flyout Munition Entity Request Maximum Altitude (m MSL) */
+ NON_FLYOUT_MUNITION_ENTITY_REQUEST_MAXIMUM_ALTITUDE_M_MSL (300020, "Non-Flyout Munition Entity Request Maximum Altitude (m MSL)"),
+ /** Non-Flyout Munition Entity Request Flight Path */
+ NON_FLYOUT_MUNITION_ENTITY_REQUEST_FLIGHT_PATH (300021, "Non-Flyout Munition Entity Request Flight Path"),
+ /** Non-Flyout Munition Entity Request Impact Point X (m) */
+ NON_FLYOUT_MUNITION_ENTITY_REQUEST_IMPACT_POINT_X_M (300022, "Non-Flyout Munition Entity Request Impact Point X (m)"),
+ /** Non-Flyout Munition Entity Request Impact Point Y (m) */
+ NON_FLYOUT_MUNITION_ENTITY_REQUEST_IMPACT_POINT_Y_M (300023, "Non-Flyout Munition Entity Request Impact Point Y (m)"),
+ /** Non-Flyout Munition Entity Request Impact Point Z (m) */
+ NON_FLYOUT_MUNITION_ENTITY_REQUEST_IMPACT_POINT_Z_M (300024, "Non-Flyout Munition Entity Request Impact Point Z (m)"),
+ /** Non-Flyout Munition Entity Request Elapsed Flight Time (sec) */
+ NON_FLYOUT_MUNITION_ENTITY_REQUEST_ELAPSED_FLIGHT_TIME_SEC (300025, "Non-Flyout Munition Entity Request Elapsed Flight Time (sec)"),
+ /** Non-Flyout Munition Entity Request Launch Time (sec) */
+ NON_FLYOUT_MUNITION_ENTITY_REQUEST_LAUNCH_TIME_SEC (300026, "Non-Flyout Munition Entity Request Launch Time (sec)"),
+ /** Time Error (sec) */
+ TIME_ERROR_SEC (300027, "Time Error (sec)"),
/** Link 16 Command Variety 1 */
LINK_16_COMMAND_VARIETY_1 (301100, "Link 16 Command Variety 1"),
/** Push */
@@ -1819,6 +1875,58 @@ public enum VariableRecordType
FORMATION_F2F_NPG (301255, "Formation F2F NPG"),
/** Formation F2F Channel */
FORMATION_F2F_CHANNEL (301256, "Formation F2F Channel"),
+ /** JLVC (JSPA) LogReport */
+ JLVC_JSPA_LOGREPORT (400008, "JLVC (JSPA) LogReport"),
+ /** JLVC (JSPA) SupplyAdjust */
+ JLVC_JSPA_SUPPLYADJUST (400009, "JLVC (JSPA) SupplyAdjust"),
+ /** JLVC (JSPA) EntityControl */
+ JLVC_JSPA_ENTITYCONTROL (400010, "JLVC (JSPA) EntityControl"),
+ /** JLVC (JSPA) HealthUpdate */
+ JLVC_JSPA_HEALTHUPDATE (400011, "JLVC (JSPA) HealthUpdate"),
+ /** JLVC (JSPA) RepairComplete */
+ JLVC_JSPA_REPAIRCOMPLETE (400012, "JLVC (JSPA) RepairComplete"),
+ /** JLVC (JSPA) UnitActivation */
+ JLVC_JSPA_UNITACTIVATION (400013, "JLVC (JSPA) UnitActivation"),
+ /** JLVC (JSPA) BattleDamageRepair */
+ JLVC_JSPA_BATTLEDAMAGEREPAIR (400014, "JLVC (JSPA) BattleDamageRepair"),
+ /** JLVC (JSPA) Minefield */
+ JLVC_JSPA_MINEFIELD (400015, "JLVC (JSPA) Minefield"),
+ /** JLVC (JSPA) Wire */
+ JLVC_JSPA_WIRE (400016, "JLVC (JSPA) Wire"),
+ /** JLVC (JSPA) Abatis */
+ JLVC_JSPA_ABATIS (400017, "JLVC (JSPA) Abatis"),
+ /** JLVC (JSPA) Crater */
+ JLVC_JSPA_CRATER (400018, "JLVC (JSPA) Crater"),
+ /** JLVC (JSPA) Ditch */
+ JLVC_JSPA_DITCH (400019, "JLVC (JSPA) Ditch"),
+ /** JLVC (JSPA) Lanes */
+ JLVC_JSPA_LANES (400020, "JLVC (JSPA) Lanes"),
+ /** JLVC (JSPA) IED */
+ JLVC_JSPA_IED (400021, "JLVC (JSPA) IED"),
+ /** JLVC (JSPA) Rubble */
+ JLVC_JSPA_RUBBLE (400022, "JLVC (JSPA) Rubble"),
+ /** JLVC (JSPA) SubmergedBarrier */
+ JLVC_JSPA_SUBMERGEDBARRIER (400023, "JLVC (JSPA) SubmergedBarrier"),
+ /** JLVC (JSPA) FloatingBarrier */
+ JLVC_JSPA_FLOATINGBARRIER (400024, "JLVC (JSPA) FloatingBarrier"),
+ /** JLVC (JSPA) Foxhole */
+ JLVC_JSPA_FOXHOLE (400025, "JLVC (JSPA) Foxhole"),
+ /** JLVC (JSPA) VehicleHole */
+ JLVC_JSPA_VEHICLEHOLE (400026, "JLVC (JSPA) VehicleHole"),
+ /** JLVC (JSPA) VehicleFortification */
+ JLVC_JSPA_VEHICLEFORTIFICATION (400027, "JLVC (JSPA) VehicleFortification"),
+ /** JLVC (JSPA) Sandbag */
+ JLVC_JSPA_SANDBAG (400028, "JLVC (JSPA) Sandbag"),
+ /** JLVC (JSPA) Checkpoint */
+ JLVC_JSPA_CHECKPOINT (400029, "JLVC (JSPA) Checkpoint"),
+ /** JLVC (JSPA) ContamCloud2D */
+ JLVC_JSPA_CONTAMCLOUD2D (400030, "JLVC (JSPA) ContamCloud2D"),
+ /** JLVC (JSPA) PopulationEffect */
+ JLVC_JSPA_POPULATIONEFFECT (400031, "JLVC (JSPA) PopulationEffect"),
+ /** JLVC (JSPA) Mine */
+ JLVC_JSPA_MINE (400032, "JLVC (JSPA) Mine"),
+ /** JLVC (JSPA) SeaMinefield */
+ JLVC_JSPA_SEAMINEFIELD (400033, "JLVC (JSPA) SeaMinefield"),
/** Munition */
MUNITION (500001, "Munition"),
/** Engine Fuel */
@@ -1933,10 +2041,10 @@ public enum VariableRecordType
ANTI_COLLISION_LIGHT_STATUS (553013, "Anti-Collision Light Status"),
/** Nav/Formation Flash Rate */
NAV_FORMATION_FLASH_RATE (553014, "Nav/Formation Flash Rate"),
- /** Anti-Col. 'On' Duration */
- ANTI_COL_ON_DURATION (553015, "Anti-Col. 'On' Duration"),
- /** Anti-Col. 'Off' Duration */
- ANTI_COL_OFF_DURATION (553016, "Anti-Col. 'Off' Duration"),
+ /** Anti-Col. On Duration */
+ ANTI_COL_ON_DURATION (553015, "Anti-Col. On Duration"),
+ /** Anti-Col. Off Duration */
+ ANTI_COL_OFF_DURATION (553016, "Anti-Col. Off Duration"),
/** Intercept Status */
INTERCEPT_STATUS (553017, "Intercept Status"),
/** LifeForm Signaling Device Type */
@@ -2013,10 +2121,10 @@ public enum VariableRecordType
OCCLUSION_OVERRIDE (555008, "Occlusion Override"),
/** Commit Range */
COMMIT_RANGE (556001, "Commit Range"),
- /** Current Scenario IFF Mode 4A Code for This Threat's Affiliation */
- CURRENT_SCENARIO_IFF_MODE_4A_CODE_FOR_THIS_THREATS_AFFILIATION (556007, "Current Scenario IFF Mode 4A Code for This Threat's Affiliation"),
- /** Current Scenario IFF Mode 4B Code for This Threat's Affiliation */
- CURRENT_SCENARIO_IFF_MODE_4B_CODE_FOR_THIS_THREATS_AFFILIATION (556008, "Current Scenario IFF Mode 4B Code for This Threat's Affiliation"),
+ /** Current Scenario IFF Mode 4A Code for This Threats Affiliation */
+ CURRENT_SCENARIO_IFF_MODE_4A_CODE_FOR_THIS_THREATS_AFFILIATION (556007, "Current Scenario IFF Mode 4A Code for This Threats Affiliation"),
+ /** Current Scenario IFF Mode 4B Code for This Threats Affiliation */
+ CURRENT_SCENARIO_IFF_MODE_4B_CODE_FOR_THIS_THREATS_AFFILIATION (556008, "Current Scenario IFF Mode 4B Code for This Threats Affiliation"),
/** Ok to Engage Waypoint Number */
OK_TO_ENGAGE_WAYPOINT_NUMBER (556016, "Ok to Engage Waypoint Number"),
/** Max Speed at Sea Level */
@@ -2159,8 +2267,8 @@ public enum VariableRecordType
GLOBAL_CONTROL_FREEZE_WEAPONS_QUANTITY_ON_ALL_OWNSHIPS (610043, "Global Control - Freeze Weapons Quantity On All Ownships"),
/** Global Control - Freeze Fuel Quantity On All Ownships */
GLOBAL_CONTROL_FREEZE_FUEL_QUANTITY_ON_ALL_OWNSHIPS (610044, "Global Control - Freeze Fuel Quantity On All Ownships"),
- /** Global Control- Freeze Kill Override On All Ownships */
- GLOBAL_CONTROL_FREEZE_KILL_OVERRIDE_ON_ALL_OWNSHIPS (610045, "Global Control- Freeze Kill Override On All Ownships"),
+ /** Global Control - Freeze Kill Override On All Ownships */
+ GLOBAL_CONTROL_FREEZE_KILL_OVERRIDE_ON_ALL_OWNSHIPS (610045, "Global Control - Freeze Kill Override On All Ownships"),
/** Global Control - Freeze Crash Override On All Ownships */
GLOBAL_CONTROL_FREEZE_CRASH_OVERRIDE_ON_ALL_OWNSHIPS (610046, "Global Control - Freeze Crash Override On All Ownships"),
/** Ownship OFP Block Number */
@@ -2295,6 +2403,16 @@ public enum VariableRecordType
OPERATIONAL_LIMITS (700005, "Operational Limits"),
/** Event Marker Message */
EVENT_MARKER_MESSAGE (1000620, "Event Marker Message"),
+ /** Receiver Aircraft Aero Model Data */
+ RECEIVER_AIRCRAFT_AERO_MODEL_DATA (2000000, "Receiver Aircraft Aero Model Data"),
+ /** Tanker Aircraft Aero Model Data */
+ TANKER_AIRCRAFT_AERO_MODEL_DATA (2000010, "Tanker Aircraft Aero Model Data"),
+ /** Boom Aircraft Aero Model Data */
+ BOOM_AIRCRAFT_AERO_MODEL_DATA (2000020, "Boom Aircraft Aero Model Data"),
+ /** Access to Image Generator Data */
+ ACCESS_TO_IMAGE_GENERATOR_DATA (2000030, "Access to Image Generator Data"),
+ /** Host Load Numbers */
+ HOST_LOAD_NUMBERS (2000040, "Host Load Numbers"),
/** Extended Fire Event Reports */
EXTENDED_FIRE_EVENT_REPORTS (5005001, "Extended Fire Event Reports"),
/** Battle Damage Assessment (BDA) Event Report */
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/VariantsforAirCategory200Bird.java b/src-generated/edu/nps/moves/dis7/enumerations/VariantsforAirCategory200Bird.java
index 9f606e541d839143b985a734f45bd6a50cfcac87..864220d40fe4066b55b4379037f2a49cdc010bb1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/VariantsforAirCategory200Bird.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/VariantsforAirCategory200Bird.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 136 marshal size 8<br>
- * Variants for Air Category 200 - Bird
+ * VariantsforAirCategory200Bird
*/
public enum VariantsforAirCategory200Bird
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/VariantsforLandCategoriesReptilesAmphibiansInsectsandArachnids.java b/src-generated/edu/nps/moves/dis7/enumerations/VariantsforLandCategoriesReptilesAmphibiansInsectsandArachnids.java
index 45dcd28fda03c4efa5aea85c878a9bb16018d549..b1403908f5d08545e8a7f7e3156ff2b54c6f7821 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/VariantsforLandCategoriesReptilesAmphibiansInsectsandArachnids.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/VariantsforLandCategoriesReptilesAmphibiansInsectsandArachnids.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 135 marshal size 8<br>
- * Variants for Land Categories Reptiles, Amphibians, Insects, and Arachnids
+ * VariantsforLandCategoriesReptiles,Amphibians,Insects,andArachnids
*/
public enum VariantsforLandCategoriesReptilesAmphibiansInsectsandArachnids
{
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/VariantsforSubsurfaceCategory201Mammal.java b/src-generated/edu/nps/moves/dis7/enumerations/VariantsforSubsurfaceCategory201Mammal.java
index 1712304c6cff63393b83bea849aa2fd9da726886..72d2ed7efed350af54a62c2a194e921a9ed2d432 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/VariantsforSubsurfaceCategory201Mammal.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/VariantsforSubsurfaceCategory201Mammal.java
@@ -8,9 +8,9 @@ import java.io.IOException;
import edu.nps.moves.dis7.*;
/**
- * Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
+ * Generated from XML, SISO-REF-010-v28, 2020-05-07<br>
* UID 139 marshal size 8<br>
- * Variants for Subsurface Category 201 - Mammal
+ * VariantsforSubsurfaceCategory201Mammal
*/
public enum VariantsforSubsurfaceCategory201Mammal
{
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/AGCandGateStealer/AGCandGateStealer.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AGCandGateStealer/AGCandGateStealer.java
index b3152c5dd81d83a00f93135513e22b0a822a20f1..321844ebacee64b8422b38317c94ea00e1cacb06 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/AGCandGateStealer/AGCandGateStealer.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AGCandGateStealer/AGCandGateStealer.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/AGCandGateStealer/AGCandRGPO/AGCandRGPO.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AGCandGateStealer/AGCandRGPO/AGCandRGPO.java
index 7d708b839824656c317ade7ba6b370ee6f04fcd2..ed44b3ccf46d4aff8692f0ad5c5fc8d2535f37bf 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/AGCandGateStealer/AGCandRGPO/AGCandRGPO.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AGCandGateStealer/AGCandRGPO/AGCandRGPO.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/AGCandGateStealer/AGCandRGPOandVGPO/AGCandRGPOandVGPO.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AGCandGateStealer/AGCandRGPOandVGPO/AGCandRGPOandVGPO.java
index fc130732d01d5f18c1fc12b20c57a0dfb58b0a90..b170266865bb30d7ab42bb5bc329d4511591873a 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/AGCandGateStealer/AGCandRGPOandVGPO/AGCandRGPOandVGPO.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AGCandGateStealer/AGCandRGPOandVGPO/AGCandRGPOandVGPO.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/AGCandGateStealer/AGCandVGPO/AGCandVGPO.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AGCandGateStealer/AGCandVGPO/AGCandVGPO.java
index e6d03b8d4be2531a255e0b01d01bdfe969175fb4..5696fb6fb6b83317f82b93b07fa2f6e2124de3dd 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/AGCandGateStealer/AGCandVGPO/AGCandVGPO.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AGCandGateStealer/AGCandVGPO/AGCandVGPO.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/Analyzer/Analyzer.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Analyzer/Analyzer.java
index 2d363f6805105506f9d5439dbb9080dddc810353..066dbe12d878d9a3f04dd3f86f72707c8d5459d8 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/Analyzer/Analyzer.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Analyzer/Analyzer.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/Angle.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/Angle.java
index 13d1af963a4055f69b2a80b49e6ab3745e49fc79..7e7a4e7c961046c14bbcb197ba1bb3cb0a9b6ff1 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/Angle.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/Angle.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/AngleGateWalk_Off/AngleGateWalk_Off.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/AngleGateWalk_Off/AngleGateWalk_Off.java
index e5346e925cd14009bfe98b8e4ab051b5932cc09f..4ba2163480e20bfc0def7b987ced12ab848d30c6 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/AngleGateWalk_Off/AngleGateWalk_Off.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/AngleGateWalk_Off/AngleGateWalk_Off.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/CooperativeAngleCAJ/CooperativeAngleCAJ.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/CooperativeAngleCAJ/CooperativeAngleCAJ.java
index 1abe5ee6e75a1534e2c21526f1e83b3cf54d8db2..e96d510fe62525965236bd4485dd2145929da3fa 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/CooperativeAngleCAJ/CooperativeAngleCAJ.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/CooperativeAngleCAJ/CooperativeAngleCAJ.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/Cross_Eye/Cross_Eye.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/Cross_Eye/Cross_Eye.java
index 9bbbbaffd42a5de023744510cb03e4a2e70fbec9..30e82a72e23cbd70c0fbd788bfc823b449186372 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/Cross_Eye/Cross_Eye.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/Cross_Eye/Cross_Eye.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/Cross_Polarization/Cross_Polarization.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/Cross_Polarization/Cross_Polarization.java
index fe58151598e33a0f8fe5ca900a8cb97ae906c616..9f998567a9fc943539846a1f4405cfc52a369660 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/Cross_Polarization/Cross_Polarization.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/Cross_Polarization/Cross_Polarization.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/Delta/Delta.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/Delta/Delta.java
index 431cfee830ee8769fd4c4b822c8102142668f45c..ce8d73c4f5c2003b60b36cb3a85cc4d68592c17f 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/Delta/Delta.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/Delta/Delta.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/InverseGainakaInverseAmplitude/InverseGainakaInverseAmplitude.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/InverseGainakaInverseAmplitude/InverseGainakaInverseAmplitude.java
index 3971864df259f1824cb494d239a0fa8b0f9d9245..3f0edf07f6ca0b6e80b6c5be22b016f719ca862b 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/InverseGainakaInverseAmplitude/InverseGainakaInverseAmplitude.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/InverseGainakaInverseAmplitude/InverseGainakaInverseAmplitude.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/Sea_Bounced/Sea_Bounced.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/Sea_Bounced/Sea_Bounced.java
index 4470ca3390e518360a285ace36855023ee5536fe..09cff6d68315d763d3fa5a25380702c893dd3eea 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/Sea_Bounced/Sea_Bounced.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/Sea_Bounced/Sea_Bounced.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/SweptSquareWaveSSW/SweptSquareWaveSSW.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/SweptSquareWaveSSW/SweptSquareWaveSSW.java
index df58b20384f06d2230d6e0d419fbe3a55935f701..87c07b32d16883ab4344464029fed1e3dfc029c4 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/SweptSquareWaveSSW/SweptSquareWaveSSW.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/SweptSquareWaveSSW/SweptSquareWaveSSW.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/TerrainBounce/TerrainBounce.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/TerrainBounce/TerrainBounce.java
index d6af75d3a70454aad051d267982b7bfe1ab1bf54..3a919a3195543a984715fd48710205e9fe3415ee 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/TerrainBounce/TerrainBounce.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/TerrainBounce/TerrainBounce.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandFalseTarget/AngleandFalseTarget.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandFalseTarget/AngleandFalseTarget.java
index 69fd702018f4237c534e655befa976e575b8c36c..c5b5536f96d5be6f8ad6de5d5deb35cfc585450c 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandFalseTarget/AngleandFalseTarget.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandFalseTarget/AngleandFalseTarget.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/AngleandVelocityFalseTargetsVFT.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/AngleandVelocityFalseTargetsVFT.java
index 22b14bf33ee7a61d445ea1880136486768cae588..a8d03aab5fa801a069e5ba339b7d632c32c07852 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/AngleandVelocityFalseTargetsVFT.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/AngleandVelocityFalseTargetsVFT.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/InverseGainandVFT/InverseGainandVFT.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/InverseGainandVFT/InverseGainandVFT.java
index 56fe75c3b7d71bf02e561e3602dab0cbb1af0a25..3d0147f2bbdc34df9fadb103bc1288250ae85480 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/InverseGainandVFT/InverseGainandVFT.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/InverseGainandVFT/InverseGainandVFT.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/SSWandVFT/SSWandVFT.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/SSWandVFT/SSWandVFT.java
index 3f3f102b2fca5d2d43cbbb74505b157ea2083d02..b2f2699530ed56de624cb95222b4b6c4cc6d5fc6 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/SSWandVFT/SSWandVFT.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/SSWandVFT/SSWandVFT.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandFalseTarget/RFTandSSW/RFTandSSW.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandFalseTarget/RFTandSSW/RFTandSSW.java
index dff4d4826fe585c273de522d6eef73c4ed3eb381..17ef1a4ccdc42264ac02c2b4a9683875d49ca44c 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandFalseTarget/RFTandSSW/RFTandSSW.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandFalseTarget/RFTandSSW/RFTandSSW.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandFalseTarget/RangeFalseTargetsRFTandInverseGain/RangeFalseTargetsRFTandInverseGain.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandFalseTarget/RangeFalseTargetsRFTandInverseGain/RangeFalseTargetsRFTandInverseGain.java
index 5c099d810297a69dd7dbee55e3fd8aea82ad6f92..3ad59408bee34af14b091d142a69281941d10887 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandFalseTarget/RangeFalseTargetsRFTandInverseGain/RangeFalseTargetsRFTandInverseGain.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandFalseTarget/RangeFalseTargetsRFTandInverseGain/RangeFalseTargetsRFTandInverseGain.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/AngleandGateStealer.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/AngleandGateStealer.java
index 0625374ba51aa8b19444191a7d6d75144d36a7de..531ecda8c0092d58eeb339fd5c0e6dd9d1b4b9ef 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/AngleandGateStealer.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/AngleandGateStealer.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/Cross_Polarization_RGPOandVGPO/Cross_Polarization_RGPOandVGPO.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/Cross_Polarization_RGPOandVGPO/Cross_Polarization_RGPOandVGPO.java
index 7189baa00e07239baa3eb3da2cb875c1273926e4..8939047a3d10f37771e7af860964d660eda2a712 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/Cross_Polarization_RGPOandVGPO/Cross_Polarization_RGPOandVGPO.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/Cross_Polarization_RGPOandVGPO/Cross_Polarization_RGPOandVGPO.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/Cross_PolarizationandRangeGatePull_OffRGPO/Cross_PolarizationandRangeGatePull_OffRGPO.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/Cross_PolarizationandRangeGatePull_OffRGPO/Cross_PolarizationandRangeGatePull_OffRGPO.java
index 2c1af3a521ce0bf358adc6b90f80a8640640e67b..692e9c8fb257865d35d58299d99e2260949b66c6 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/Cross_PolarizationandRangeGatePull_OffRGPO/Cross_PolarizationandRangeGatePull_OffRGPO.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/Cross_PolarizationandRangeGatePull_OffRGPO/Cross_PolarizationandRangeGatePull_OffRGPO.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/Cross_PolarizationandVelocityGatePull_OffVGPO/Cross_PolarizationandVelocityGatePull_OffVGPO.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/Cross_PolarizationandVelocityGatePull_OffVGPO/Cross_PolarizationandVelocityGatePull_OffVGPO.java
index 41aa56856b788654dc65047effb3942ec2b1a618..bcc428e8f2973bb1b3226445a9db5241ebcbbf5e 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/Cross_PolarizationandVelocityGatePull_OffVGPO/Cross_PolarizationandVelocityGatePull_OffVGPO.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/Cross_PolarizationandVelocityGatePull_OffVGPO/Cross_PolarizationandVelocityGatePull_OffVGPO.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/InverseGainandRGPO/InverseGainandRGPO.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/InverseGainandRGPO/InverseGainandRGPO.java
index bebf4476c8d310dd66b706f50549561cec4ea0af..34d676bbdfadf00621d5b62a82cca6191d878c39 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/InverseGainandRGPO/InverseGainandRGPO.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/InverseGainandRGPO/InverseGainandRGPO.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/InverseGainandRGPOandVGPO/InverseGainandRGPOandVGPO.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/InverseGainandRGPOandVGPO/InverseGainandRGPOandVGPO.java
index 24e6d8da8fdf65f2d368e5d969e63b8b4e13adf7..2ca85867a012ee63da52525cbe0bd7076f17de50 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/InverseGainandRGPOandVGPO/InverseGainandRGPOandVGPO.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/InverseGainandRGPOandVGPO/InverseGainandRGPOandVGPO.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/InverseGainandVGPO/InverseGainandVGPO.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/InverseGainandVGPO/InverseGainandVGPO.java
index d95befeeaaa17f3c40014835f8b16f016ab918ed..749c143be05b621de1a222a13043aa0b959c583c 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/InverseGainandVGPO/InverseGainandVGPO.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/InverseGainandVGPO/InverseGainandVGPO.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/RGPOandSSW/RGPOandSSW.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/RGPOandSSW/RGPOandSSW.java
index bfa8cbc53b4455a639ae5b9a0aefeb928fe8d4d8..f383c26fea8e39ceada0078a86ad13c9d4c91d77 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/RGPOandSSW/RGPOandSSW.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/RGPOandSSW/RGPOandSSW.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/SSWandVGPO/SSWandVGPO.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/SSWandVGPO/SSWandVGPO.java
index d6a71e1da4bd7d85cb21e3cd07d85b3736584147..5892cbf3f62fc11eef42a25284c434bcd1353046 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/SSWandVGPO/SSWandVGPO.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/SSWandVGPO/SSWandVGPO.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandRandomRangeProgramsRANRAP/AngleandRandomRangeProgramsRANRAP.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandRandomRangeProgramsRANRAP/AngleandRandomRangeProgramsRANRAP.java
index 1448ff0f9b36ce724f0c39542164e4f92ecb0645..c0a0d9926442926b76fbffebc47ea15871d29499 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandRandomRangeProgramsRANRAP/AngleandRandomRangeProgramsRANRAP.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandRandomRangeProgramsRANRAP/AngleandRandomRangeProgramsRANRAP.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandRandomRangeProgramsRANRAP/RANRAPandSSW/RANRAPandSSW.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandRandomRangeProgramsRANRAP/RANRAPandSSW/RANRAPandSSW.java
index 412b9e3c1651691b0a279e498b94ade9508462ce..6cf35a0a14ce79232cfe9abafd720b98fbf60425 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandRandomRangeProgramsRANRAP/RANRAPandSSW/RANRAPandSSW.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandRandomRangeProgramsRANRAP/RANRAPandSSW/RANRAPandSSW.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandVelocity/AngleandVelocity.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandVelocity/AngleandVelocity.java
index 625b7573dae6ba01b354675f87e1df520af6a2e0..95a49cd96c873181063bf6c5cfd0961274cd4b32 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandVelocity/AngleandVelocity.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandVelocity/AngleandVelocity.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandVelocity/InverseGainandVBM/InverseGainandVBM.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandVelocity/InverseGainandVBM/InverseGainandVBM.java
index 2b08b490ace5afe4a75c5a18302414bbfb17f1eb..5ae062b473aee26e0357d13b5b804b5192db5a5a 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandVelocity/InverseGainandVBM/InverseGainandVBM.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandVelocity/InverseGainandVBM/InverseGainandVBM.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandVelocity/SSWandVBM/SSWandVBM.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandVelocity/SSWandVBM/SSWandVBM.java
index 0f8b350fc556f0452032a5d0f2d873affc427417..5ebe903b3a152ea427f56950ba5d8fac25a04783 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandVelocity/SSWandVBM/SSWandVBM.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandVelocity/SSWandVBM/SSWandVBM.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/AutomaticGainControlAGC/AutomaticGainControlAGC.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AutomaticGainControlAGC/AutomaticGainControlAGC.java
index 750ee9154c54aa0c2dae5b84d9791fdcc757c6f7..878bd65a006b7f6e76c7022fc292fff2203f407b 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/AutomaticGainControlAGC/AutomaticGainControlAGC.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AutomaticGainControlAGC/AutomaticGainControlAGC.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/Colinear/Colinear.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Colinear/Colinear.java
index 4934ae6888606fa7c475ded33885962b9a284f1d..2064fb1ae1cc6c8a1984f97b06c4e2254583383a 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/Colinear/Colinear.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Colinear/Colinear.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/ConstantFalseAlarmRate/ConstantFalseAlarmRate.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/ConstantFalseAlarmRate/ConstantFalseAlarmRate.java
index d27a6259e83b51e3d1e67b1709d3e66aded89a74..8de061e2ad1dcf032edb4d8b8cac70e9caf5fc58 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/ConstantFalseAlarmRate/ConstantFalseAlarmRate.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/ConstantFalseAlarmRate/ConstantFalseAlarmRate.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/Deception.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Deception.java
index d9f5409130339159150759d7c33559526d6009b6..d3c8c06178355bdad26e432c7c768a3f27659a9a 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/Deception.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Deception.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/DoubleCross/DoubleCross.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/DoubleCross/DoubleCross.java
index 263f265d2914a6069b774705188147f2e1723483..f88b856868632f1b51ffaef097c48cd0ddc92bd8 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/DoubleCross/DoubleCross.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/DoubleCross/DoubleCross.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/DownLink/DownLink.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/DownLink/DownLink.java
index fce111e59abe0097f6c8c96f1aea48c6f943091a..be0de159e6276382fd7cdf224056fa4fd65f1d73 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/DownLink/DownLink.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/DownLink/DownLink.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/FalseTarget/CoherentFalseTargets/CoherentFalseTargets.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/FalseTarget/CoherentFalseTargets/CoherentFalseTargets.java
index d3db69ebe58fd651bf1671aae5a70693562daac1..987c6667f6126cbe834f526444b4bb7754f5a1c3 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/FalseTarget/CoherentFalseTargets/CoherentFalseTargets.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/FalseTarget/CoherentFalseTargets/CoherentFalseTargets.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/FalseTarget/FalseDopplerTargetFDT/FalseDopplerTargetFDT.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/FalseTarget/FalseDopplerTargetFDT/FalseDopplerTargetFDT.java
index 029907866acea6a852b4732440bdcce71e372c8c..debd177dc8ba9188a6fc61262a6769a6e5f2b6b0 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/FalseTarget/FalseDopplerTargetFDT/FalseDopplerTargetFDT.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/FalseTarget/FalseDopplerTargetFDT/FalseDopplerTargetFDT.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/FalseTarget/FalseTarget.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/FalseTarget/FalseTarget.java
index ca52a94b4ea6dc453fcd272a4e2dd46db382c17d..d92b0dcf7ed19e584c6af43e87ac9c178efbe9eb 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/FalseTarget/FalseTarget.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/FalseTarget/FalseTarget.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/FalseTarget/MultipleFalseTargets/MultipleFalseTargets.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/FalseTarget/MultipleFalseTargets/MultipleFalseTargets.java
index 3c2c8afe457d12d2b3ae22e670f133c60410674f..2cfaf455e1a7f0d83e7a0e99a6f35b619f43126b 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/FalseTarget/MultipleFalseTargets/MultipleFalseTargets.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/FalseTarget/MultipleFalseTargets/MultipleFalseTargets.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/FalseTarget/RangeFalseTargetsRFT/RangeFalseTargetsRFT.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/FalseTarget/RangeFalseTargetsRFT/RangeFalseTargetsRFT.java
index d747af5c5e6fb763b5bec61afc269572c7f977e8..4f65f9d557aa9f63487c8afeff705e44f5546145 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/FalseTarget/RangeFalseTargetsRFT/RangeFalseTargetsRFT.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/FalseTarget/RangeFalseTargetsRFT/RangeFalseTargetsRFT.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/FalseTarget/Transponder/Transponder.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/FalseTarget/Transponder/Transponder.java
index c3f02d9a78fd8c3c6754b41e0e862e20e35212d0..623c8257038e621c75809224207095c4714fe7be 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/FalseTarget/Transponder/Transponder.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/FalseTarget/Transponder/Transponder.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/FalseTarget/VelocityFalseTargetsVFT/VelocityFalseTargetsVFT.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/FalseTarget/VelocityFalseTargetsVFT/VelocityFalseTargetsVFT.java
index 46c96a14ed6723b5fed3081f7f4e34d5d6f10a42..8746fe07cc908c2cc8e74f5dc87c41e6359622af 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/FalseTarget/VelocityFalseTargetsVFT/VelocityFalseTargetsVFT.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/FalseTarget/VelocityFalseTargetsVFT/VelocityFalseTargetsVFT.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/FigureEight/FigureEight.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/FigureEight/FigureEight.java
index ebab2b0cd621dde7ec8aa7dc0a9d0196ff2e7546..3a321d95d7de7f1d27e082bbdc6519762e049cb9 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/FigureEight/FigureEight.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/FigureEight/FigureEight.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/GateStealer/ChirpGateStealerCGS/ChirpGateStealerCGS.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/GateStealer/ChirpGateStealerCGS/ChirpGateStealerCGS.java
index 9e4f7a5d3393c846dd4905457d8e7f28389d2917..c5956e427b338114119000177d1385631a53b7c3 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/GateStealer/ChirpGateStealerCGS/ChirpGateStealerCGS.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/GateStealer/ChirpGateStealerCGS/ChirpGateStealerCGS.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/GateStealer/GateStealer.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/GateStealer/GateStealer.java
index edfb48fd3c2091bf665912e8cc561519d4ad5ffc..7a493a7a207518a98a47e58f896c0cdd959c98a9 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/GateStealer/GateStealer.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/GateStealer/GateStealer.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/GateStealer/RGPOandVGPO/RGPOandVGPO.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/GateStealer/RGPOandVGPO/RGPOandVGPO.java
index 2e5ae0b8771c01fc029e12d0f0655de49c98e02b..b4422c51e132ef2a11956a0821aabf85d6dd017f 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/GateStealer/RGPOandVGPO/RGPOandVGPO.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/GateStealer/RGPOandVGPO/RGPOandVGPO.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/GateStealer/RangeGatePull_OffRGPO/RangeGatePull_OffRGPO.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/GateStealer/RangeGatePull_OffRGPO/RangeGatePull_OffRGPO.java
index c86641e344472d4d35046b800b12e768c32d4fef..6bc83f906d27e9a0bc79a146e044389801558822 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/GateStealer/RangeGatePull_OffRGPO/RangeGatePull_OffRGPO.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/GateStealer/RangeGatePull_OffRGPO/RangeGatePull_OffRGPO.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/GateStealer/VGPOakaVelocityGateStealer_VGS/VGPOakaVelocityGateStealer_VGS.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/GateStealer/VGPOakaVelocityGateStealer_VGS/VGPOakaVelocityGateStealer_VGS.java
index d6eb9495cefd82d05086311b725f397bad991aab..2b572a39afd8aa9ee887efbb3e64064881e8907b 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/GateStealer/VGPOakaVelocityGateStealer_VGS/VGPOakaVelocityGateStealer_VGS.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/GateStealer/VGPOakaVelocityGateStealer_VGS/VGPOakaVelocityGateStealer_VGS.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/GateStealerandRepeater/GateStealerandRepeater.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/GateStealerandRepeater/GateStealerandRepeater.java
index 0fd1571043bfc43f823e7edba6992f8670ddef68..efc263074e89892f8024cf8f0e12a5cd079e17b0 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/GateStealerandRepeater/GateStealerandRepeater.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/GateStealerandRepeater/GateStealerandRepeater.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/GateStealerandRepeater/RepeaterSweptAmplitudeModulationRSAMandVGPO/RepeaterSweptAmplitudeModulationRSAMandVGPO.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/GateStealerandRepeater/RepeaterSweptAmplitudeModulationRSAMandVGPO/RepeaterSweptAmplitudeModulationRSAMandVGPO.java
index c54b2f07da5e1d8f6d4eac565d247a2894e6acb0..6326a56a1e62ac5eff320e6223c6c90cf708ed97 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/GateStealerandRepeater/RepeaterSweptAmplitudeModulationRSAMandVGPO/RepeaterSweptAmplitudeModulationRSAMandVGPO.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/GateStealerandRepeater/RepeaterSweptAmplitudeModulationRSAMandVGPO/RepeaterSweptAmplitudeModulationRSAMandVGPO.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/GlintEnhance/GlintEnhance.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/GlintEnhance/GlintEnhance.java
index 44553b829dba5992bc1c50a6f3b21040807c9240..64e82ee8972303cbfd9d4b6a42429d5146206fd2 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/GlintEnhance/GlintEnhance.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/GlintEnhance/GlintEnhance.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/ImageFrequency/ImageFrequency.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/ImageFrequency/ImageFrequency.java
index 8ebdae982accf6c5d2e2f6240f377a4a1277fcbf..6fb9b7dc262913746e37f394bdf5af09058a899d 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/ImageFrequency/ImageFrequency.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/ImageFrequency/ImageFrequency.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/JitteredPulseRepetitionFrequency/JitteredPulseRepetitionFrequency.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/JitteredPulseRepetitionFrequency/JitteredPulseRepetitionFrequency.java
index b283bd8fdd1452d08b512ce3544b92756787d144..3ff4757c2e57eaf373e838a88e428a5b58bd5bc6 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/JitteredPulseRepetitionFrequency/JitteredPulseRepetitionFrequency.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/JitteredPulseRepetitionFrequency/JitteredPulseRepetitionFrequency.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/JitteredPulseWidth/JitteredPulseWidth.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/JitteredPulseWidth/JitteredPulseWidth.java
index d1c024dbb304af132602ef8a443f84edba4d2066..c6094cb7c0e5c2589ff070208a15a07bf6481e6d 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/JitteredPulseWidth/JitteredPulseWidth.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/JitteredPulseWidth/JitteredPulseWidth.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/PseudorandomNoisePRN/PseudorandomNoisePRN.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/PseudorandomNoisePRN/PseudorandomNoisePRN.java
index 81a17f94eb9a532fd4ea8ab4f4068ad4c84c3782..3ed63dda312c951d42504589b62b8a55aa86f4f8 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/PseudorandomNoisePRN/PseudorandomNoisePRN.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/PseudorandomNoisePRN/PseudorandomNoisePRN.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/Pulse/Pulse.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Pulse/Pulse.java
index 4d18bcc25c9c6ca5380feda8aa5d09b393121a67..25028f6a6b99ea60496272e31c2fa08fd157826d 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/Pulse/Pulse.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Pulse/Pulse.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/PulseCompressionDeception/PulseCompressionDeception.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/PulseCompressionDeception/PulseCompressionDeception.java
index dfad96ad919dc58d7d39b837090824436e05ebb9..b9b2a5eab63d5ae0d7e443d1bc78d5047dc917bb 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/PulseCompressionDeception/PulseCompressionDeception.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/PulseCompressionDeception/PulseCompressionDeception.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/RandomRangeProgramsRANRAP/RandomRangeProgramsRANRAP.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/RandomRangeProgramsRANRAP/RandomRangeProgramsRANRAP.java
index b92029c3729a1cb5d44602da6dac5257fbba88ef..a9c0556b9d275af109df068d7eb37d53ce67d1d6 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/RandomRangeProgramsRANRAP/RandomRangeProgramsRANRAP.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/RandomRangeProgramsRANRAP/RandomRangeProgramsRANRAP.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/Refraction/Refraction.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Refraction/Refraction.java
index 5dddeb3aca2571be4eb2ad8765151b7707404411..0c6f8073cfc08de9098c000d9d0602fc7c0132bd 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/Refraction/Refraction.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Refraction/Refraction.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/ContinuousWaveRepeater/ContinuousWaveRepeater.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/ContinuousWaveRepeater/ContinuousWaveRepeater.java
index 2816e8d8e72c4d6e9bf2424995553d0cfed0c182..1610197fc23b1f5fee08a6816fd8d1ac26934102 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/ContinuousWaveRepeater/ContinuousWaveRepeater.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/ContinuousWaveRepeater/ContinuousWaveRepeater.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/MultipleFrequencyRepeaterMFR/MultipleFrequencyRepeaterMFR.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/MultipleFrequencyRepeaterMFR/MultipleFrequencyRepeaterMFR.java
index 96e8823691d0f029ff46a24ac686a9e78335e134..14b36ed373c9d4efbade48a4cc9456cdd13925a8 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/MultipleFrequencyRepeaterMFR/MultipleFrequencyRepeaterMFR.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/MultipleFrequencyRepeaterMFR/MultipleFrequencyRepeaterMFR.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/NarrowBandRepeaterNoiseNBRN/NarrowBandRepeaterNoiseNBRN.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/NarrowBandRepeaterNoiseNBRN/NarrowBandRepeaterNoiseNBRN.java
index fbbac1bfdfe408ea1d6512f581bffa03bba3d807..4aaa0b1c04393fbab76db3034cf56cb3bc122646 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/NarrowBandRepeaterNoiseNBRN/NarrowBandRepeaterNoiseNBRN.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/NarrowBandRepeaterNoiseNBRN/NarrowBandRepeaterNoiseNBRN.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RandomDopplerRD/RandomDopplerRD.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RandomDopplerRD/RandomDopplerRD.java
index e8d32ba1da91405c4371fbf0e0ba3cfa5ed49ee5..1a80591fb41ce39721ed25cb6d97b232d76be020 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RandomDopplerRD/RandomDopplerRD.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RandomDopplerRD/RandomDopplerRD.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/Repeater.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/Repeater.java
index 27da364ad0fea426a70d7c86de6409809895caba..d68535decdbaf5168bf0d4c8bf0e118a695bf561 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/Repeater.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/Repeater.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelA/DRFMLevelA.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelA/DRFMLevelA.java
index 9b11b732dd84c7b0f99003b53985d7c7ceb86961..887710ea18484719db00ec6e099d9285d79840a8 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelA/DRFMLevelA.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelA/DRFMLevelA.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelB/DRFMLevelB.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelB/DRFMLevelB.java
index 0bee611f5030c40772fceb0f1c6a0b22caa942d3..6f3462eb67c04678645e29a4f240c84281625de2 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelB/DRFMLevelB.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelB/DRFMLevelB.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelC/DRFMLevelC.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelC/DRFMLevelC.java
index 2e7445d2e146e91832bdc477af0fbb50ce904ad1..40bd87b793620fa7c0d8240a4fc6cd25e02ed481 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelC/DRFMLevelC.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelC/DRFMLevelC.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelD/DRFMLevelD.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelD/DRFMLevelD.java
index 3136d015d41782aaedee589aed34ebe234491e79..7681874bef87d01be7519ecac00965106848dd47 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelD/DRFMLevelD.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelD/DRFMLevelD.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelE/DRFMLevelE.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelE/DRFMLevelE.java
index 935771632d571610cdbb74f1c2a58e8fa80035a7..53605d08f6256e2c72fcc056efdbe50d54bbd8d1 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelE/DRFMLevelE.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelE/DRFMLevelE.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/RepeaterDigitalRadioFrequencyMemoryDRFM.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/RepeaterDigitalRadioFrequencyMemoryDRFM.java
index 7ecdf0cbe0bba2f85d6c875028776c02409037d1..248e56518fa70b909620f621c4f4cd9134fb3474 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/RepeaterDigitalRadioFrequencyMemoryDRFM.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/RepeaterDigitalRadioFrequencyMemoryDRFM.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterNoise/RepeaterNoise.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterNoise/RepeaterNoise.java
index 23606fb3c869d210347e546e1d93eeccf0b3389c..0dee347144b86b953265eab47d874385b4adc825 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterNoise/RepeaterNoise.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterNoise/RepeaterNoise.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterSweptAmplitudeModulationRSAM/RepeaterSweptAmplitudeModulationRSAM.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterSweptAmplitudeModulationRSAM/RepeaterSweptAmplitudeModulationRSAM.java
index 241e344551428b4477483a4df7eb3e627d95489c..b575182a57535bdc94480d8e1c846bdc20cab143 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterSweptAmplitudeModulationRSAM/RepeaterSweptAmplitudeModulationRSAM.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterSweptAmplitudeModulationRSAM/RepeaterSweptAmplitudeModulationRSAM.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/Scintillation/Scintillation.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Scintillation/Scintillation.java
index 15d2591e2965b50e1436b29a920024b67a3c06e8..629e3d9c0204c1e97185cafb7d147b99e7b01657 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/Scintillation/Scintillation.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Scintillation/Scintillation.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/Serrodyne/Serrodyne.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Serrodyne/Serrodyne.java
index c6c6c9d4011fc24f43df427bd17e1653a7340b7c..f91ffaefbe5cba3143330f29945a1d1c0cc5ad22 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/Serrodyne/Serrodyne.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Serrodyne/Serrodyne.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Deception/Velocity/Velocity.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Velocity/Velocity.java
index 0a215fabf397a50b4855f6dea111b53918d48d7b..13f006d32300ccb9bc668c61ec026f03b02ae134 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Deception/Velocity/Velocity.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Velocity/Velocity.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandFMbyNoise/AngleandFMbyNoise.java b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandFMbyNoise/AngleandFMbyNoise.java
index 14440c1ac9eb3ab0b49ea029d49845a353521c47..47ac38c42f8a391bf1f74cbfe54482f59b533d55 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandFMbyNoise/AngleandFMbyNoise.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandFMbyNoise/AngleandFMbyNoise.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandFMbyNoise/FMbyNoiseandInverseGain/FMbyNoiseandInverseGain.java b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandFMbyNoise/FMbyNoiseandInverseGain/FMbyNoiseandInverseGain.java
index 7a7446500fd0e26cf934299145470981525ebcd8..ec28a0de829d33bdc1e585167b6d8f608cba20cc 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandFMbyNoise/FMbyNoiseandInverseGain/FMbyNoiseandInverseGain.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandFMbyNoise/FMbyNoiseandInverseGain/FMbyNoiseandInverseGain.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandFMbyNoise/FMbyNoiseandSSW/FMbyNoiseandSSW.java b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandFMbyNoise/FMbyNoiseandSSW/FMbyNoiseandSSW.java
index ce9b7ed972594b7de816bd3c50b8b0d359ad81fe..f21112c9af3e8b9605029bc2ca5250962e21246a 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandFMbyNoise/FMbyNoiseandSSW/FMbyNoiseandSSW.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandFMbyNoise/FMbyNoiseandSSW/FMbyNoiseandSSW.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/AngleandBarrage.java b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/AngleandBarrage.java
index 70d2427b35aaec9299e972e04218d2aff12e39c6..e641913313a4b19a1f6d033d4df04bfa6a0b642e 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/AngleandBarrage.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/AngleandBarrage.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/BarrageandInverseGain/BarrageandInverseGain.java b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/BarrageandInverseGain/BarrageandInverseGain.java
index 335e02088023441ec605d6540b260eee4f7e71ac..beb2a63282be423531bc22410a01ba3acd71d9a5 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/BarrageandInverseGain/BarrageandInverseGain.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/BarrageandInverseGain/BarrageandInverseGain.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/BarrageandSSW/BarrageandSSW.java b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/BarrageandSSW/BarrageandSSW.java
index 96734b731914ab1956ed62a74ca63a0782bb3987..0f3606a9ae80977905f9616f3aa5a28052c89bb3 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/BarrageandSSW/BarrageandSSW.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/BarrageandSSW/BarrageandSSW.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandNoise/AngleandNoise.java b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandNoise/AngleandNoise.java
index 8f01200372978b85102b959ef22b9c2f32424cc4..8672bc062357ded790d47edd25834f52e9992df6 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandNoise/AngleandNoise.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandNoise/AngleandNoise.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandPseudorandomAM/AngleandPseudorandomAM.java b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandPseudorandomAM/AngleandPseudorandomAM.java
index b92fa7102c4cd0050f4bf705b7b00b65cc6dd423..c15f8cc5b739454ff207732968bf6d7d9bc164c0 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandPseudorandomAM/AngleandPseudorandomAM.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandPseudorandomAM/AngleandPseudorandomAM.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandPseudorandomAM/InverseGainandPseudorandomAM/InverseGainandPseudorandomAM.java b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandPseudorandomAM/InverseGainandPseudorandomAM/InverseGainandPseudorandomAM.java
index 8f9dee23241843aa0da94096cd57d48929f89934..966413ac28015a2735a9e934aaa2e2fd04e7f714 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandPseudorandomAM/InverseGainandPseudorandomAM/InverseGainandPseudorandomAM.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandPseudorandomAM/InverseGainandPseudorandomAM/InverseGainandPseudorandomAM.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandPseudorandomAM/PseudorandomAMandSSW/PseudorandomAMandSSW.java b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandPseudorandomAM/PseudorandomAMandSSW/PseudorandomAMandSSW.java
index 057a0361289120163362f4c19bb9b9c5f1afc5b8..24de61a51836f4c5b7afd1be26ce224e0a1dccea 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandPseudorandomAM/PseudorandomAMandSSW/PseudorandomAMandSSW.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandPseudorandomAM/PseudorandomAMandSSW/PseudorandomAMandSSW.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandSpot/AngleandSpot.java b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandSpot/AngleandSpot.java
index 931aa52c890c6e491e273a8b476cae9686020539..6131eb7b50564eb5857187b368db93bd40ed625e 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandSpot/AngleandSpot.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandSpot/AngleandSpot.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandSpot/InverseGainandLowLevelNoise/InverseGainandLowLevelNoise.java b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandSpot/InverseGainandLowLevelNoise/InverseGainandLowLevelNoise.java
index 41910aa880917b9d3c24a760e11ad4d53c3775ce..d673d8f05e4ab82777e5f130c1b2f3a3f240ee57 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandSpot/InverseGainandLowLevelNoise/InverseGainandLowLevelNoise.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandSpot/InverseGainandLowLevelNoise/InverseGainandLowLevelNoise.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandSpot/InverseGainandSpotNoise/InverseGainandSpotNoise.java b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandSpot/InverseGainandSpotNoise/InverseGainandSpotNoise.java
index 7f8d1648b190da04dce806d21bc657b780d18a1e..07e18f92877abd58a8e6fdc63ea8657be9011939 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandSpot/InverseGainandSpotNoise/InverseGainandSpotNoise.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandSpot/InverseGainandSpotNoise/InverseGainandSpotNoise.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandSpot/SpotandSSW/SpotandSSW.java b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandSpot/SpotandSSW/SpotandSSW.java
index 43c91b941db2d2520f9fe3df425b5d6aaededdb7..328a996f93a763693f92e13ac2cbbb79c219ad08 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandSpot/SpotandSSW/SpotandSSW.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandSpot/SpotandSSW/SpotandSSW.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/DeceptionandNoise.java b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/DeceptionandNoise.java
index 4e4ceea997dc205bde051a666767b0f8702e938b..3f162a28fb2c64be5cb5e2e6c89f7c68cf8cf918 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/DeceptionandNoise.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/DeceptionandNoise.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/FalseTargetDeceptionandSweptNoise/FalseTargetDeceptionandSweptNoise.java b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/FalseTargetDeceptionandSweptNoise/FalseTargetDeceptionandSweptNoise.java
index 1d0178f31b9438fd8cc4719e452def2e5bcc73c9..fc764a9f96ae6d158cf6fdbe6773850ce60ee3ad 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/FalseTargetDeceptionandSweptNoise/FalseTargetDeceptionandSweptNoise.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/FalseTargetDeceptionandSweptNoise/FalseTargetDeceptionandSweptNoise.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/GateStealerandNoise/GateStealerandNoise.java b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/GateStealerandNoise/GateStealerandNoise.java
index c2d21ce2da4caff39928c8e3a9de9fc306999eed..11578fd7aaeec9e8821728bac66bb54908e77687 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/GateStealerandNoise/GateStealerandNoise.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/GateStealerandNoise/GateStealerandNoise.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandRGPO/LowLevelNoiseandRGPO/LowLevelNoiseandRGPO.java b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandRGPO/LowLevelNoiseandRGPO/LowLevelNoiseandRGPO.java
index 42ee6ce35c9c38608719a33808660badc5092bfc..5f0aa10c937ebca116e73c6e44e6cfe0fbc293e6 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandRGPO/LowLevelNoiseandRGPO/LowLevelNoiseandRGPO.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandRGPO/LowLevelNoiseandRGPO/LowLevelNoiseandRGPO.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandRGPO/NoiseandRGPO.java b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandRGPO/NoiseandRGPO.java
index df6b30a9097c2413c83f2b3e18372b3db3b59805..2c5dacc5e0f480a4c1f29f59096e721b937ab749 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandRGPO/NoiseandRGPO.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandRGPO/NoiseandRGPO.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandVGPO/LowLevelNoiseandVGPO/LowLevelNoiseandVGPO.java b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandVGPO/LowLevelNoiseandVGPO/LowLevelNoiseandVGPO.java
index 68013395e5b9f2a2b9c2800415e768ec05d5fa3c..2c96edc6424cefc94cdc64872043545ac27981d7 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandVGPO/LowLevelNoiseandVGPO/LowLevelNoiseandVGPO.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandVGPO/LowLevelNoiseandVGPO/LowLevelNoiseandVGPO.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandVGPO/NoiseandVGPO.java b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandVGPO/NoiseandVGPO.java
index 085950e031ea707f18aca8a4fcd35e2bf8c1c8a5..8d1dbe1f54d46c6b6ac9f40240bf6678ac2b5b12 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandVGPO/NoiseandVGPO.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandVGPO/NoiseandVGPO.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Noise/AmplitudeModulationAMNoise/AmplitudeModulationAMNoise.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/AmplitudeModulationAMNoise/AmplitudeModulationAMNoise.java
index 2c4a96940473bd52e66d63c1a916c22b66f887a0..b127f5e81eb00489696401b91a955e52c324e3a7 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Noise/AmplitudeModulationAMNoise/AmplitudeModulationAMNoise.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/AmplitudeModulationAMNoise/AmplitudeModulationAMNoise.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Noise/BarrageNoise/BarrageNoise.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/BarrageNoise/BarrageNoise.java
index 60ae4dd263f42bf91c0ce950db9678cf9e9333a3..e2cf9ce8316f22b463ed30b5a6a57e97baf9a696 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Noise/BarrageNoise/BarrageNoise.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/BarrageNoise/BarrageNoise.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Noise/BarrageNoise/Click/Click.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/BarrageNoise/Click/Click.java
index f68e613925396cea7a3ac10b353e3ab90b2a3867..3152122e32d67ef2eb84db2297fe4d11dc1acdfe 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Noise/BarrageNoise/Click/Click.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/BarrageNoise/Click/Click.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Noise/BarrageNoise/SourceNoise/SourceNoise.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/BarrageNoise/SourceNoise/SourceNoise.java
index e8ebf94c05d009b2227263c01963658d0280b543..2609b1bccfa7a5d35cdfc755a603c71954039d58 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Noise/BarrageNoise/SourceNoise/SourceNoise.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/BarrageNoise/SourceNoise/SourceNoise.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Noise/BistaticClutter/BistaticClutter.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/BistaticClutter/BistaticClutter.java
index d7b38490863ad6cbb90131e89605fa90474d3dc3..2d41a700902a1b65a1cfa651b7af88c7b07cb844 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Noise/BistaticClutter/BistaticClutter.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/BistaticClutter/BistaticClutter.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Noise/Comb/Comb.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/Comb/Comb.java
index f2856ab03c42b7851b66c79fc2125b5fb5cf9842..46cd1026af2a11314fa39d4548a153a9fbc3a151 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Noise/Comb/Comb.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/Comb/Comb.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Noise/CooperativeBlinkedNoiseCBN/CooperativeBlinkedNoiseCBN.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/CooperativeBlinkedNoiseCBN/CooperativeBlinkedNoiseCBN.java
index 27cdd1bc81229c7269bd15b19ce354d7db6fb4d1..3f5a1e7cb34a566f15761c6e58b1b4e4ad0a0e3a 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Noise/CooperativeBlinkedNoiseCBN/CooperativeBlinkedNoiseCBN.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/CooperativeBlinkedNoiseCBN/CooperativeBlinkedNoiseCBN.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Noise/DopplerNoise/DopplerNoise.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/DopplerNoise/DopplerNoise.java
index 8e512a81d8455d7fb7a0b7e4c63b84e03fe11e7e..77ea9f6e3e13c96822bcbd5861290e269ecc5f6a 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Noise/DopplerNoise/DopplerNoise.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/DopplerNoise/DopplerNoise.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Noise/FrequencyModulationFMbyNoise/FrequencyModulationFMbyNoise.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/FrequencyModulationFMbyNoise/FrequencyModulationFMbyNoise.java
index f0ded17033e2148b6d99b0d68ab08945089a0fd9..bc9cec2c0038fe1b4a5723ecebc50d028f619d23 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Noise/FrequencyModulationFMbyNoise/FrequencyModulationFMbyNoise.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/FrequencyModulationFMbyNoise/FrequencyModulationFMbyNoise.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Noise/ImpulseNoise/ImpulseNoise.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/ImpulseNoise/ImpulseNoise.java
index f0fd806f3529fc36fee6a08d9e2dfad0c4ca0c01..1e3fd1df52c3bfe9dff309874ad2ec1fee749e01 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Noise/ImpulseNoise/ImpulseNoise.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/ImpulseNoise/ImpulseNoise.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Noise/Noise.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/Noise.java
index 75e0d57b894b4e5664f2b12b119891c4dbb01051..529bf52fdd39f52b3c5d06c8a0c2ac1fbf77ed60 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Noise/Noise.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/Noise.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Noise/PartialBand/PartialBand.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/PartialBand/PartialBand.java
index 636841b80876fdec01d58635baf7f10f6236a06c..cce292654c360ad8b980ee9b055e1b83d2d59075 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Noise/PartialBand/PartialBand.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/PartialBand/PartialBand.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Noise/PseudorandomAM/PseudorandomAM.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/PseudorandomAM/PseudorandomAM.java
index 18436eabef236a39789826e1ab3b468e86951343..994fcc78825f8246beca1e48ec44896febf8a2e5 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Noise/PseudorandomAM/PseudorandomAM.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/PseudorandomAM/PseudorandomAM.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Noise/PulseNoise/PulseNoise.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/PulseNoise/PulseNoise.java
index 44b4c0a0a6186496057eeaa9cd7bada716e91787..bf24a6e1f427545d6145e837a2f12a034525c3b3 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Noise/PulseNoise/PulseNoise.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/PulseNoise/PulseNoise.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Noise/Quasi_NoiseakaPseudorandom/Quasi_NoiseakaPseudorandom.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/Quasi_NoiseakaPseudorandom/Quasi_NoiseakaPseudorandom.java
index f7e25420481651e8f8e659346dfaec82aea1e532..a326e326907717f3e92c7c156a35ab506b119676 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Noise/Quasi_NoiseakaPseudorandom/Quasi_NoiseakaPseudorandom.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/Quasi_NoiseakaPseudorandom/Quasi_NoiseakaPseudorandom.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Noise/RangeBinMaskingRBMakaCoverPulse/RangeBinMaskingRBMakaCoverPulse.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/RangeBinMaskingRBMakaCoverPulse/RangeBinMaskingRBMakaCoverPulse.java
index b6328848e6970b57534029e4bf18554b332329c7..31e41edd6e79c2b6a9e1c9ce560c236dfd0a5d96 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Noise/RangeBinMaskingRBMakaCoverPulse/RangeBinMaskingRBMakaCoverPulse.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/RangeBinMaskingRBMakaCoverPulse/RangeBinMaskingRBMakaCoverPulse.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Noise/RangeBinMaskingRBMakaCoverPulse/RangeBinMaskingwithVelocityBinMasking/RangeBinMaskingwithVelocityBinMasking.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/RangeBinMaskingRBMakaCoverPulse/RangeBinMaskingwithVelocityBinMasking/RangeBinMaskingwithVelocityBinMasking.java
index 02ce482471f754fddf07a35378dade32b1b22da3..5b427192b72862d2f0ce829370a7c54d4aabe0c4 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Noise/RangeBinMaskingRBMakaCoverPulse/RangeBinMaskingwithVelocityBinMasking/RangeBinMaskingwithVelocityBinMasking.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/RangeBinMaskingRBMakaCoverPulse/RangeBinMaskingwithVelocityBinMasking/RangeBinMaskingwithVelocityBinMasking.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Noise/RepeaterNoise/NarrowbandRepeaterNoise/NarrowbandRepeaterNoise.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/RepeaterNoise/NarrowbandRepeaterNoise/NarrowbandRepeaterNoise.java
index 8db54e537bbf2816b35588941615a85620855fa4..1a560f224f0bf076ad8f5896f78ce6e21b7d09bc 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Noise/RepeaterNoise/NarrowbandRepeaterNoise/NarrowbandRepeaterNoise.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/RepeaterNoise/NarrowbandRepeaterNoise/NarrowbandRepeaterNoise.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Noise/RepeaterNoise/RepeaterNoise.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/RepeaterNoise/RepeaterNoise.java
index 7ca54c58507acf7c50a846d0215fae3fa5f4b11f..4aecf7851a3a532780be0c611d1fe8bc05344a56 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Noise/RepeaterNoise/RepeaterNoise.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/RepeaterNoise/RepeaterNoise.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Noise/RepeaterNoise/WideBandRepeaterNoise/WideBandRepeaterNoise.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/RepeaterNoise/WideBandRepeaterNoise/WideBandRepeaterNoise.java
index 74d29b56a877585a992ed6517415ca1d19c4b8b8..442331ebeee6dad506c4ffbe0d2b2b3580bc1383 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Noise/RepeaterNoise/WideBandRepeaterNoise/WideBandRepeaterNoise.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/RepeaterNoise/WideBandRepeaterNoise/WideBandRepeaterNoise.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Noise/SpotNoise/AutomaticSpotNoiseASJ/AutomaticSpotNoiseASJ.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/SpotNoise/AutomaticSpotNoiseASJ/AutomaticSpotNoiseASJ.java
index bf1cbc586062ffdd00ea49ff6ed967c2a10c1311..93d9cc0173e61d0501c16443087bf608c1c799fd 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Noise/SpotNoise/AutomaticSpotNoiseASJ/AutomaticSpotNoiseASJ.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/SpotNoise/AutomaticSpotNoiseASJ/AutomaticSpotNoiseASJ.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Noise/SpotNoise/BlinkingSpotNoise/BlinkingSpotNoise.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/SpotNoise/BlinkingSpotNoise/BlinkingSpotNoise.java
index d319e2a9623c78311f33cd84f08b86d4aeab8199..647da5f1c5b38b02586815c601ced47a127587ad 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Noise/SpotNoise/BlinkingSpotNoise/BlinkingSpotNoise.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/SpotNoise/BlinkingSpotNoise/BlinkingSpotNoise.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Noise/SpotNoise/BurstSpotNoise/BurstSpotNoise.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/SpotNoise/BurstSpotNoise/BurstSpotNoise.java
index 33b979e47b9f4aeb707b1253deba86e1bc1a4636..f46a4c62d7b2d2793ff97ee8eda61e41147b570c 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Noise/SpotNoise/BurstSpotNoise/BurstSpotNoise.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/SpotNoise/BurstSpotNoise/BurstSpotNoise.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Noise/SpotNoise/DopplerSpotNoise/DopplerSpotNoise.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/SpotNoise/DopplerSpotNoise/DopplerSpotNoise.java
index f90a9ae83f3e4a4fcd20a0ba77a2e76d25b51187..ae1baaa1e400366e0bfb054a4aa90b58031bab3d 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Noise/SpotNoise/DopplerSpotNoise/DopplerSpotNoise.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/SpotNoise/DopplerSpotNoise/DopplerSpotNoise.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Noise/SpotNoise/SkirtFrequency/SkirtFrequency.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/SpotNoise/SkirtFrequency/SkirtFrequency.java
index 3aef9d658595e019c07cf58a9c01701b17a1e475..cc4c787548bc47c985ebc6ccba075adefe00b72a 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Noise/SpotNoise/SkirtFrequency/SkirtFrequency.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/SpotNoise/SkirtFrequency/SkirtFrequency.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Noise/SpotNoise/SpotNoise.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/SpotNoise/SpotNoise.java
index fd76b3f2395a8fd02936e68d95c74c67460d6066..32b1b14dea7f2bc835e8049e6f4fe91e41cce5c8 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Noise/SpotNoise/SpotNoise.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/SpotNoise/SpotNoise.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/FrequencySwept/FrequencySwept.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/FrequencySwept/FrequencySwept.java
index 5685a4fe2857db02705e8318bf7038616a640a55..e9865049b1887a3bf2140d182bb44584121ecee0 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/FrequencySwept/FrequencySwept.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/FrequencySwept/FrequencySwept.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/SweptAM/SweptAM.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/SweptAM/SweptAM.java
index adbf1505fa00b1468b44c7be3a2bbf95f39ac5e0..622b57f16200fb6259f48665650b74a02d9193ee 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/SweptAM/SweptAM.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/SweptAM/SweptAM.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/SweptNoiseakaSweptSpotNoise_Sweep.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/SweptNoiseakaSweptSpotNoise_Sweep.java
index 096a920736c4e617cb7628743d2e682bb9b66274..fd93ad5a796dffe241f7c8b545659bd29058ad66 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/SweptNoiseakaSweptSpotNoise_Sweep.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/SweptNoiseakaSweptSpotNoise_Sweep.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Noise/VelocityBinMaskingVBM/VelocityBinMaskingVBM.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/VelocityBinMaskingVBM/VelocityBinMaskingVBM.java
index 3351859cc471a37ac08964dc1aa12098e60c9ff8..db1f0f6e761c6160839d99db5059cccde91a2710 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Noise/VelocityBinMaskingVBM/VelocityBinMaskingVBM.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/VelocityBinMaskingVBM/VelocityBinMaskingVBM.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Special/Special.java b/src-generated/edu/nps/moves/dis7/jammers/Special/Special.java
index 2d679a279c94e5882cf362167c0c2eb5ef9cdf06..439d964fa5b0ac708d4e59d34c9fb86f6069a44a 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Special/Special.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Special/Special.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/jammers/Special/SuperJam/SuperJam.java b/src-generated/edu/nps/moves/dis7/jammers/Special/SuperJam/SuperJam.java
index bb4e28631c1d5861c82ad0f3f340bd578b1f7e97..80f8df8db69e8103f88e10d027be4e0ee8af0659 100644
--- a/src-generated/edu/nps/moves/dis7/jammers/Special/SuperJam/SuperJam.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Special/SuperJam/SuperJam.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* Jamming technique uid: 284
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/ArealObject/ArealObject.java b/src-generated/edu/nps/moves/dis7/objecttypes/ArealObject/ArealObject.java
index 4bd41bc515ca0dda65cb2a5b73e79251de53b1dc..a1d81feac5cad62a4c74c898826e9529419ac5e4 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/ArealObject/ArealObject.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/ArealObject/ArealObject.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 228
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/ArealObject/Obstacle/Minefield/Hasty/Hasty.java b/src-generated/edu/nps/moves/dis7/objecttypes/ArealObject/Obstacle/Minefield/Hasty/Hasty.java
index e8a0a0fc98a020dece4f62cb1943c23e5721e7b9..9cfe406bbcd51230ffdb877c52768e327c857241 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/ArealObject/Obstacle/Minefield/Hasty/Hasty.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/ArealObject/Obstacle/Minefield/Hasty/Hasty.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 228
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/ArealObject/Obstacle/Minefield/Minefield.java b/src-generated/edu/nps/moves/dis7/objecttypes/ArealObject/Obstacle/Minefield/Minefield.java
index cfee68278c5740f0a0cc698828dcc643f56d6916..f813d4775abb073fb148fc739fde23b702f3e951 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/ArealObject/Obstacle/Minefield/Minefield.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/ArealObject/Obstacle/Minefield/Minefield.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 228
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/ArealObject/Obstacle/Minefield/Other/Other.java b/src-generated/edu/nps/moves/dis7/objecttypes/ArealObject/Obstacle/Minefield/Other/Other.java
index 87b631b62c0fcf1473e91af7b5e39d72f3f5fbfc..4c16543562257cdffce82177f32f3c6aa7a00fce 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/ArealObject/Obstacle/Minefield/Other/Other.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/ArealObject/Obstacle/Minefield/Other/Other.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 228
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/ArealObject/Obstacle/Minefield/Prepared/Prepared.java b/src-generated/edu/nps/moves/dis7/objecttypes/ArealObject/Obstacle/Minefield/Prepared/Prepared.java
index 94517fe4726310e764b387bc214d6de58a71573b..1f6675d91d333c27de14adf14d887bb599fbb853 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/ArealObject/Obstacle/Minefield/Prepared/Prepared.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/ArealObject/Obstacle/Minefield/Prepared/Prepared.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 228
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/ArealObject/Obstacle/Minefield/Scattered/Scattered.java b/src-generated/edu/nps/moves/dis7/objecttypes/ArealObject/Obstacle/Minefield/Scattered/Scattered.java
index 04ffa70c40f397d1f13a531af7eb4c36eb156a59..684fa8a80e5580ae9ff43a99c4e0111354885f95 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/ArealObject/Obstacle/Minefield/Scattered/Scattered.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/ArealObject/Obstacle/Minefield/Scattered/Scattered.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 228
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/ArealObject/Obstacle/Minefield/Solitary/Solitary.java b/src-generated/edu/nps/moves/dis7/objecttypes/ArealObject/Obstacle/Minefield/Solitary/Solitary.java
index c7698170eca598b97ce4ac074de24d0f8539ebe0..265c13533c6004535c3d0eef6d13107fb24d8d04 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/ArealObject/Obstacle/Minefield/Solitary/Solitary.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/ArealObject/Obstacle/Minefield/Solitary/Solitary.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 228
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/ArealObject/Obstacle/Obstacle.java b/src-generated/edu/nps/moves/dis7/objecttypes/ArealObject/Obstacle/Obstacle.java
index 417f9fe35508ccd74f9cb87d712d5e213c22f9c7..c3a1229c7271374c6fb9dca11d2d4112d3b710f9 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/ArealObject/Obstacle/Obstacle.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/ArealObject/Obstacle/Obstacle.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 228
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/ArealObject/Obstacle/Other/Other.java b/src-generated/edu/nps/moves/dis7/objecttypes/ArealObject/Obstacle/Other/Other.java
index d923aa2a2bbc3f42f1ad57d1d78c7145a29d318e..5832e9fb2bf86886493725b31b637f9c6fba378b 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/ArealObject/Obstacle/Other/Other.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/ArealObject/Obstacle/Other/Other.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 228
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Culturalfeature/Culturalfeature.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Culturalfeature/Culturalfeature.java
index 346d2dc929320e5429613e16ede453dc59322815..3b15252d530886cea3e0f47a18e2e2a5d84880c1 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Culturalfeature/Culturalfeature.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Culturalfeature/Culturalfeature.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 227
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Culturalfeature/Tracks_Tire/Tracks_Tire.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Culturalfeature/Tracks_Tire/Tracks_Tire.java
index c425a2fd81e87b33d3e9c65d278f36ca75b800a5..251e64debeecc9e547303d7f481fcf0e3c760094 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Culturalfeature/Tracks_Tire/Tracks_Tire.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Culturalfeature/Tracks_Tire/Tracks_Tire.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 227
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Culturalfeature/Wire/Wire.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Culturalfeature/Wire/Wire.java
index 68590a8d5a17b3057c58d294577da12f9ba1647d..dec75060ca73b3d3a556698b56dee4b0b0c19c2a 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Culturalfeature/Wire/Wire.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Culturalfeature/Wire/Wire.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 227
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Culturalfeature/Wire/Wire_Crush/Wire_Crush.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Culturalfeature/Wire/Wire_Crush/Wire_Crush.java
index af1b3f5f73dd0aca4b605519c94bc56238958d59..c335dd650ccc8000aa0ba5db90e78ca20826d9f1 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Culturalfeature/Wire/Wire_Crush/Wire_Crush.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Culturalfeature/Wire/Wire_Crush/Wire_Crush.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 227
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/LinearObject.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/LinearObject.java
index 7e398bf7f2b5bd4cfb55507bc9564beaa4168d4a..3e84922f1baa30ef1bc21f664e06654acc7fb2ce 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/LinearObject.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/LinearObject.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 227
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/ChainLinkFence/ChainLinkFence.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/ChainLinkFence/ChainLinkFence.java
index 1fc25a22e78de7a99393807c2f7639b6a1c56583..3727cf31151465b8cdc255894c70bee9f2faf8e7 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/ChainLinkFence/ChainLinkFence.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/ChainLinkFence/ChainLinkFence.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 227
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/ConcertinaWire/ConcertinaWire.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/ConcertinaWire/ConcertinaWire.java
index 694b802847f59026d86e7139d58837247da95e57..ca0bff581f26827c272f4837ec4537040f86e5f5 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/ConcertinaWire/ConcertinaWire.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/ConcertinaWire/ConcertinaWire.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 227
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/ConcertinaWire/Other/Other.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/ConcertinaWire/Other/Other.java
index 5d13aca4fdf7ebb6af306cf91fe2045247cdcdfd..c2e87aa9d1b7939704f5fdea352072d86b8795e6 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/ConcertinaWire/Other/Other.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/ConcertinaWire/Other/Other.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 227
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/ConcertinaWire/_2_Roll/_2_Roll.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/ConcertinaWire/_2_Roll/_2_Roll.java
index 6776fa84705a2cba473e83a391b0af28af775016..a3aeec24435ed067294260e3f17d73aa8465d27e 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/ConcertinaWire/_2_Roll/_2_Roll.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/ConcertinaWire/_2_Roll/_2_Roll.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 227
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/ConcertinaWire/_3_Roll/_3_Roll.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/ConcertinaWire/_3_Roll/_3_Roll.java
index 43ff13a81c1fb4b93b22a459c7f8953334235b70..f6bc5d391d628e72db7eaa611501a761f2bf57ee 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/ConcertinaWire/_3_Roll/_3_Roll.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/ConcertinaWire/_3_Roll/_3_Roll.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 227
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/ConcreteBarrier/ConcreteBarrier.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/ConcreteBarrier/ConcreteBarrier.java
index 73bd97f16e216331b98205ca4cb040e0a0b3353f..cfb854665ac4a316ca33168dd4d00cc8321af239 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/ConcreteBarrier/ConcreteBarrier.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/ConcreteBarrier/ConcreteBarrier.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 227
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/Obstacle.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/Obstacle.java
index c6d82f4f84f3f52aa39d55cd89f74ea0d38ffffe..b5081ffbbf2040cf847ff1f46b41fac04d27d101 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/Obstacle.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/Obstacle.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 227
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/Other/Other.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/Other/Other.java
index f572533120f035c87acd87f5415770022ed7f244..1310ae4d198d904ff3c529a4698b6ed9bb6ea0de 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/Other/Other.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/Other/Other.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 227
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/Rut/Rut.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/Rut/Rut.java
index 2934fb5ab0816e26ff8ee64dc117c8877ee37b64..769c09347d81e27adf0eb6d494548293d53ec037 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/Rut/Rut.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/Rut/Rut.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 227
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/SpeedBump/SpeedBump.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/SpeedBump/SpeedBump.java
index 79a8e79ffacca417e4683b9ba52d98986a59ae6b..41213188caadb0486bdc3ca884e24b60889e20c8 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/SpeedBump/SpeedBump.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/SpeedBump/SpeedBump.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 227
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/TankDitch/Other/Other.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/TankDitch/Other/Other.java
index 4b0b4e7977fc69d4df99363027e12864916ae90c..471eaa1f9621ae4f9946eb40a52f583ee9ad6b22 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/TankDitch/Other/Other.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/TankDitch/Other/Other.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 227
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/TankDitch/TankDitch.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/TankDitch/TankDitch.java
index b617bb5ae7607275dbb579e06af94154a5282ab7..94185489951e56b60f8370ca5fa370796bc7cb78 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/TankDitch/TankDitch.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/TankDitch/TankDitch.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 227
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclebreach/Breach/Breach.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclebreach/Breach/Breach.java
index 8a75b76ef91a3b77c5926e1d7a9f11bec9c5e455..b007c544cbcaabd48bcc74e52c68e91b2c2215a3 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclebreach/Breach/Breach.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclebreach/Breach/Breach.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 227
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclebreach/Breach/Other/Other.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclebreach/Breach/Other/Other.java
index 28702a5b03e5cf15b44bc9ebda24f3cb2f9b5bf2..c0b1c1931187be1619391166f0b02514b6d4a52f 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclebreach/Breach/Other/Other.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclebreach/Breach/Other/Other.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 227
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclebreach/Obstaclebreach.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclebreach/Obstaclebreach.java
index 1cbe8c1ebc2456f62bec7011a8378fafdfbd4700..8523534a6dee9f09dee7aaa2897c1df49c9ab86f 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclebreach/Obstaclebreach.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclebreach/Obstaclebreach.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 227
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclebreach/Other/Other.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclebreach/Other/Other.java
index 94ad7a39c5e6e7352b4a74edfbdca53da66654e3..8f95e7848a94d98a0687b09e81b81451a81e440b 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclebreach/Other/Other.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclebreach/Other/Other.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 227
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclemarker/MinefieldLaneMarker/MinefieldLaneMarker.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclemarker/MinefieldLaneMarker/MinefieldLaneMarker.java
index 7f7d52fdc38d37a5fa7c0226ee91affbb1de51c7..45acc0d736679bff766f5f4b5cbc4705856a34ca 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclemarker/MinefieldLaneMarker/MinefieldLaneMarker.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclemarker/MinefieldLaneMarker/MinefieldLaneMarker.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 227
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclemarker/MinefieldLaneMarker/Other/Other.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclemarker/MinefieldLaneMarker/Other/Other.java
index 9b702b7fcabee6130616920e5f7015b111c6deef..f7562439867cb70450876d167d02a29e95a93c1e 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclemarker/MinefieldLaneMarker/Other/Other.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclemarker/MinefieldLaneMarker/Other/Other.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 227
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclemarker/Obstaclemarker.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclemarker/Obstaclemarker.java
index 1e5c3523c2adb58c9ea8c97e59d9a0cbc3f123ba..251f70770d20474c68e01449dce5683678cfaf27 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclemarker/Obstaclemarker.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclemarker/Obstaclemarker.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 227
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclemarker/Other/Other.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclemarker/Other/Other.java
index 773b8e46cbbd85ccd607a1d229ad6eca436f98d5..5c90cfbec8edfd1b7c1f79d4d96fe6edf274c0f5 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclemarker/Other/Other.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclemarker/Other/Other.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 227
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Tacticalsmoke/ExhaustSmoke/ExhaustSmoke.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Tacticalsmoke/ExhaustSmoke/ExhaustSmoke.java
index 609ae285301ef9bb20ffe3245827632dd8626b57..ce09f62b0b76070dbbc60da7974139cd733b66d9 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Tacticalsmoke/ExhaustSmoke/ExhaustSmoke.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Tacticalsmoke/ExhaustSmoke/ExhaustSmoke.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 227
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Tacticalsmoke/ExhaustSmoke/Other/Other.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Tacticalsmoke/ExhaustSmoke/Other/Other.java
index 180a739186df7b604e14fcc243172313bf9f461f..b28bbd556c9645d1df53d509e2790fd667f7f695 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Tacticalsmoke/ExhaustSmoke/Other/Other.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Tacticalsmoke/ExhaustSmoke/Other/Other.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 227
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Tacticalsmoke/Other/Other.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Tacticalsmoke/Other/Other.java
index 80bdb6c5e2d2edf6976b955f512a75a526c3219f..e65a9ee9a597f19652a234dc5fe4a3c6a17ed957 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Tacticalsmoke/Other/Other.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Tacticalsmoke/Other/Other.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 227
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Tacticalsmoke/Tacticalsmoke.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Tacticalsmoke/Tacticalsmoke.java
index 28b05f9771475b8f014138b369ff4d4755da2f2a..f7188b50c65537a77786f113773df61aa962c1b1 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Tacticalsmoke/Tacticalsmoke.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Tacticalsmoke/Tacticalsmoke.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 227
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/BuildingRubble/BuildingRubble.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/BuildingRubble/BuildingRubble.java
index 4f7294fdc99c79a9fdc22d1238fb6d947def757b..6ef31a9068e46abe4833fdedc0145d6bd9c1b9ad 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/BuildingRubble/BuildingRubble.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/BuildingRubble/BuildingRubble.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/BuildingRubble/Other/Other.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/BuildingRubble/Other/Other.java
index 66d5f68cf50f492f89796f178db19e9d82fcdb38..9c20fc8a984ff2a83370b4f1997b4c6f4af2fc8f 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/BuildingRubble/Other/Other.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/BuildingRubble/Other/Other.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/ApartmentBuilding/ApartmentBuilding.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/ApartmentBuilding/ApartmentBuilding.java
index a136d5e92ddaf6ba94cd78f98bb9248d25156268..1d1f66999d9a7c3ef4fefe810807c92bb1df0d91 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/ApartmentBuilding/ApartmentBuilding.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/ApartmentBuilding/ApartmentBuilding.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/Building_Structure.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/Building_Structure.java
index 1b08c0d14b4fba4b5e29fc77501b9c657935304d..54738d75ce1e845ea0979dbe411fe3a73898615c 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/Building_Structure.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/Building_Structure.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/Church/Church.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/Church/Church.java
index 016fc64c79bc2aa968b954a8344c4a9614c66bea..03798a791b0062639f148718db9d056e6bb2c450 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/Church/Church.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/Church/Church.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/FOB_GuardTower/FOB_GuardTower.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/FOB_GuardTower/FOB_GuardTower.java
index dd7bcb9a096b2707d0bda4b897051b98904c1dcf..cad9f8bcf49a1478290b44ac015bd2a3dc8df3d4 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/FOB_GuardTower/FOB_GuardTower.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/FOB_GuardTower/FOB_GuardTower.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/FOB_TrailerOffice/FOB_TrailerOffice.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/FOB_TrailerOffice/FOB_TrailerOffice.java
index 0e8fbbf19a2c833670ee32e4a893e015cef54c02..bc146444d5b886ec7f8b3a3d80894be8df075541 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/FOB_TrailerOffice/FOB_TrailerOffice.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/FOB_TrailerOffice/FOB_TrailerOffice.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/GovernmentBuilding/GovernmentBuilding.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/GovernmentBuilding/GovernmentBuilding.java
index 7561e6ea0d9153ed93adee3675ce43c889915e3d..17d2659a14bf450d512dc38fbfbe67fe2e19bf93 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/GovernmentBuilding/GovernmentBuilding.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/GovernmentBuilding/GovernmentBuilding.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/GuardHouse/GuardHouse.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/GuardHouse/GuardHouse.java
index a942be66303b5678b6f5a55cd8c9bd7654649e6c..34ea9e397c306a3ed8c8735927ab85bc3b314090 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/GuardHouse/GuardHouse.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/GuardHouse/GuardHouse.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/Hanger/Hanger.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/Hanger/Hanger.java
index 01f2b9d2e032b2484229eb3678cb5086e8e725bf..25e4539b7e3a95c1b20912e5f760907bb9dd5c64 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/Hanger/Hanger.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/Hanger/Hanger.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/IndustrialBuilding/IndustrialBuilding.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/IndustrialBuilding/IndustrialBuilding.java
index dc46cb409c744b0d7e88ad5cf0cac504239b7b75..13fb777dd99316292d95aa7a03f2a74597e6fd5b 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/IndustrialBuilding/IndustrialBuilding.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/IndustrialBuilding/IndustrialBuilding.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/MicrowaveTower/MicrowaveTower.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/MicrowaveTower/MicrowaveTower.java
index c98e24efa004aa2bdcf40b11bbe365dc9f768e80..0287dd90ce410d7d4649444460b53c4274b8d2d4 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/MicrowaveTower/MicrowaveTower.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/MicrowaveTower/MicrowaveTower.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/Other/Other.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/Other/Other.java
index 36c0374a8862a7c9adb17388638c3cb618340858..2df0fd6f3f9754d4c2f7d11c14b29c4df074d490 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/Other/Other.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/Other/Other.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/PortaPotty/PortaPotty.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/PortaPotty/PortaPotty.java
index eabefa2a749b6e444b234a72a2269f8b67e09108..b28657d4f3764e753e0e07b44086145579803d27 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/PortaPotty/PortaPotty.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/PortaPotty/PortaPotty.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/PowerPylon/PowerPylon.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/PowerPylon/PowerPylon.java
index 2f83f8d70aab33ffbf35ede8f7892f38803beb00..2532f3128fc512df7a861b8cb2139c27a508b87b 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/PowerPylon/PowerPylon.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/PowerPylon/PowerPylon.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/RadioTower_1000ft/RadioTower_1000ft.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/RadioTower_1000ft/RadioTower_1000ft.java
index 716278cd85a3046f5a95f15176f4ba8ef25fe757..e1892e4f65143264178ab811d6063bf91be7780a 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/RadioTower_1000ft/RadioTower_1000ft.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/RadioTower_1000ft/RadioTower_1000ft.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/RadioTower_100ft/RadioTower_100ft.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/RadioTower_100ft/RadioTower_100ft.java
index 972a90c62e74873a1f17ab238f67e9583ec483b5..4a168320c36f696b9003745063cb7b01f7b27623 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/RadioTower_100ft/RadioTower_100ft.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/RadioTower_100ft/RadioTower_100ft.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/RadioTower_500ft/RadioTower_500ft.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/RadioTower_500ft/RadioTower_500ft.java
index b7cb4b24b49caa9476c25a14c81b440c0ca3ea16..9462653f3d4883e460d944375ce8b516fa7a8850 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/RadioTower_500ft/RadioTower_500ft.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/RadioTower_500ft/RadioTower_500ft.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/Radio_TVTower/Radio_TVTower.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/Radio_TVTower/Radio_TVTower.java
index 661c6f7fa621c09969968df93bce9f60ffa10028..d9020555bb87ab918641f971cd9daf12ea5aa0b9 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/Radio_TVTower/Radio_TVTower.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/Radio_TVTower/Radio_TVTower.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/School/School.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/School/School.java
index 19a66b037f50778ef6e3cdf127d105fb698b135a..002faa314068f67deb286ae8f0bfa58c84b2d8b6 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/School/School.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/School/School.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/TransformerYard/TransformerYard.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/TransformerYard/TransformerYard.java
index 59a49c3a4e7877ee4cf06ca2483a42bcf557ab6d..a32c66db6c165ee89247060208ba65f7d5dd1486 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/TransformerYard/TransformerYard.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/TransformerYard/TransformerYard.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/Windmill/Windmill.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/Windmill/Windmill.java
index ec257c23a9c0697af94244506fbdc84bcda92a02..5c9a8d3151d835abb2b19a313ad867136ec5dce7 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/Windmill/Windmill.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/Windmill/Windmill.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding.java
index db632946282394ac0ba3128434494acf34b6c198..b992079d953635c590eec685bcdb0485cfc7ef37 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding_Bridge_Single/Container_BasedBuilding_Bridge_Single.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding_Bridge_Single/Container_BasedBuilding_Bridge_Single.java
index 012976203b4bb2a102fd4b52edf27b0daef84a91..6e4d9a4744306f37a56bfd815399cdc3a4c0445d 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding_Bridge_Single/Container_BasedBuilding_Bridge_Single.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding_Bridge_Single/Container_BasedBuilding_Bridge_Single.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding_FOB/Container_BasedBuilding_FOB.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding_FOB/Container_BasedBuilding_FOB.java
index 10b8150c1cec67d3981fc2fa48abf11f6d53c9f2..de186c1c4d539f0f093adb712e0549061c9e8269 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding_FOB/Container_BasedBuilding_FOB.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding_FOB/Container_BasedBuilding_FOB.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding_House_Double/Container_BasedBuilding_House_Double.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding_House_Double/Container_BasedBuilding_House_Double.java
index 3b1a05cac26085c2b959b0b37ae7029f4d626f90..14e18433467034e04b6e326be0c60045ca6b13a4 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding_House_Double/Container_BasedBuilding_House_Double.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding_House_Double/Container_BasedBuilding_House_Double.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding_House_Single/Container_BasedBuilding_House_Single.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding_House_Single/Container_BasedBuilding_House_Single.java
index ebd58c363873b11c893dc9d510b736051b440060..01da1f4ecde1b6d22a0836787baa1efb4feeb9ed 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding_House_Single/Container_BasedBuilding_House_Single.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding_House_Single/Container_BasedBuilding_House_Single.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding_House_Single_Railing/Container_BasedBuilding_House_Single_Railing.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding_House_Single_Railing/Container_BasedBuilding_House_Single_Railing.java
index 47f0225d00143aa56c007a84dac361171810a20a..5f6977fd4150541a438db59a6806b13f1846c9f0 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding_House_Single_Railing/Container_BasedBuilding_House_Single_Railing.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding_House_Single_Railing/Container_BasedBuilding_House_Single_Railing.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding_Mosque_Single/Container_BasedBuilding_Mosque_Single.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding_Mosque_Single/Container_BasedBuilding_Mosque_Single.java
index 7a022a23470a5ee1cbfa0ad3e21ac82150c9ac0d..c5a0c1642b15ef77e6cbb9093440933fdab428fc 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding_Mosque_Single/Container_BasedBuilding_Mosque_Single.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding_Mosque_Single/Container_BasedBuilding_Mosque_Single.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding_Store_Single/Container_BasedBuilding_Store_Single.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding_Store_Single/Container_BasedBuilding_Store_Single.java
index 0e7a3e29c6ebd8ab663c3ede3ee3d9de24d30391..67a1092af948bcebaca0c50e0a7f074fcd926675 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding_Store_Single/Container_BasedBuilding_Store_Single.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding_Store_Single/Container_BasedBuilding_Store_Single.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Culturalfeature.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Culturalfeature.java
index e5875ad0b80b7f4f0165cc3358f456ac4b66660d..6b757efa91c0c96cff272c792e8690d505cb03cf 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Culturalfeature.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Culturalfeature.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/DisturbedEarth/DisturbedEarth.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/DisturbedEarth/DisturbedEarth.java
index 2efa3f34a13630b371c3487da30d7b80d9ad5d7b..cfff545dc47aaff96939514f8fb21706a48d6d8f 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/DisturbedEarth/DisturbedEarth.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/DisturbedEarth/DisturbedEarth.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/DisturbedRoad/DisturbedRoad.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/DisturbedRoad/DisturbedRoad.java
index e9b071d73f520a785dacdc1550dad6b9ce6e84ce..5d9f953bd7d6e4bd918462fec22ced7615fc8474 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/DisturbedRoad/DisturbedRoad.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/DisturbedRoad/DisturbedRoad.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/DisturbedRoad/DisturbedRoad_Asphalt/DisturbedRoad_Asphalt.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/DisturbedRoad/DisturbedRoad_Asphalt/DisturbedRoad_Asphalt.java
index 2f0eb4ccab163c3d3c3f6918e0b4372d4a67aedc..7e9845f064002ec3d8e6b63181538b4e33a04c4a 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/DisturbedRoad/DisturbedRoad_Asphalt/DisturbedRoad_Asphalt.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/DisturbedRoad/DisturbedRoad_Asphalt/DisturbedRoad_Asphalt.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/DisturbedRoad/DisturbedRoad_Concrete/DisturbedRoad_Concrete.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/DisturbedRoad/DisturbedRoad_Concrete/DisturbedRoad_Concrete.java
index 4447a32a883a0753224577306276ffe0b5a08db2..4bd0aacb3bee49d41932b0f890a634aac538b418 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/DisturbedRoad/DisturbedRoad_Concrete/DisturbedRoad_Concrete.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/DisturbedRoad/DisturbedRoad_Concrete/DisturbedRoad_Concrete.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/DisturbedRoad/DisturbedRoad_Gravel/DisturbedRoad_Gravel.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/DisturbedRoad/DisturbedRoad_Gravel/DisturbedRoad_Gravel.java
index 510dc3dcb84e97946a98cd78bdf55c4b1b5bfcdb..b207d52e31243cbc6cd89f87a7f15f595b586071 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/DisturbedRoad/DisturbedRoad_Gravel/DisturbedRoad_Gravel.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/DisturbedRoad/DisturbedRoad_Gravel/DisturbedRoad_Gravel.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/IndustrialProcessingPlant/IndustrialProcessingPlant.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/IndustrialProcessingPlant/IndustrialProcessingPlant.java
index 7f882c33490a51c7a33adbe7dfa1b4e42cf5b0bc..c32da7b63ac3e632277b98625623bd146d54b87f 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/IndustrialProcessingPlant/IndustrialProcessingPlant.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/IndustrialProcessingPlant/IndustrialProcessingPlant.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/IndustrialProcessingPlant/OilRefinery/OilRefinery.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/IndustrialProcessingPlant/OilRefinery/OilRefinery.java
index 2f0c893f39d85826c066a29d9556f059261c4289..24ce85e371fbd3c0311989109c52b3726d311bd8 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/IndustrialProcessingPlant/OilRefinery/OilRefinery.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/IndustrialProcessingPlant/OilRefinery/OilRefinery.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
@@ -15,6 +15,6 @@ public class OilRefinery extends ObjectType
setDomain(PlatformDomain.getEnumForValue(1));
setObjectKind(ObjectKind.getEnumForValue(3)); // Cultural feature
setCategory((byte)13); // Industrial Processing Plant
- setSubCategory((byte)1); // Oil Refinery
+ setSubCategory((byte)1); // Oil Refinery
}
}
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding.java
index 977070ec120f00d860fe78f778c989175a0ba26d..c243e51910907c2edeb222519576c66d1a09404b 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_Apartment/MOUTBuilding_Apartment.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_Apartment/MOUTBuilding_Apartment.java
index 995ef25c270fd2aa1f650f684df8453aac3ae7e0..d961fa9ee1c3710037c5385a49d6c92759511e93 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_Apartment/MOUTBuilding_Apartment.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_Apartment/MOUTBuilding_Apartment.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_Church/MOUTBuilding_Church.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_Church/MOUTBuilding_Church.java
index 3e07dab4d0f494bcec8e09d795e1ae22cea9ae5a..6d5fa9a15ec17844382d587718c4fa65b3287024 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_Church/MOUTBuilding_Church.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_Church/MOUTBuilding_Church.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_ControlTower/MOUTBuilding_ControlTower.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_ControlTower/MOUTBuilding_ControlTower.java
index f8fafa11318c38d458b0100a1a8562d6511dbedf..eff9c9806e8dace90df740442ac963f0f646f18d 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_ControlTower/MOUTBuilding_ControlTower.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_ControlTower/MOUTBuilding_ControlTower.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_FarmHouse/MOUTBuilding_FarmHouse.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_FarmHouse/MOUTBuilding_FarmHouse.java
index e6893c9ec1f89371d536611d9d992ce160eb7eae..05100f7f0ac11b1769148046092e240cef297515 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_FarmHouse/MOUTBuilding_FarmHouse.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_FarmHouse/MOUTBuilding_FarmHouse.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_FireStation/MOUTBuilding_FireStation.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_FireStation/MOUTBuilding_FireStation.java
index 9e8d1434eb76b5bb7a93ca24458af2bcd0520ea3..f242a139efd9c1b3b2b964ce504891ae58d7fe49 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_FireStation/MOUTBuilding_FireStation.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_FireStation/MOUTBuilding_FireStation.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_GasStation/MOUTBuilding_GasStation.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_GasStation/MOUTBuilding_GasStation.java
index 738ed9fb9010091370661a5f56ebf4b32b737e06..c975cfbeb293078e1df4f3423cf8eac5fb285ace 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_GasStation/MOUTBuilding_GasStation.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_GasStation/MOUTBuilding_GasStation.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_Hospital/MOUTBuilding_Hospital.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_Hospital/MOUTBuilding_Hospital.java
index f0ac3d9fab31914b23e95493ae4f512986627051..9f18a893e1bc084ba7cb5d0cac574902d28ecdfd 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_Hospital/MOUTBuilding_Hospital.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_Hospital/MOUTBuilding_Hospital.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_House/MOUTBuilding_House.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_House/MOUTBuilding_House.java
index 2f13bd04bbb6b1297f01136bc949ce8c482254fa..62487041d493f10253a55a5d342197cbb153d75a 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_House/MOUTBuilding_House.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_House/MOUTBuilding_House.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_MudbrickHouse/MOUTBuilding_MudbrickHouse.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_MudbrickHouse/MOUTBuilding_MudbrickHouse.java
index 1d1d64ba7d2770103084334f6f2cec42f5e62f8b..397c221e9704472548121f250a46022a74f9d111 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_MudbrickHouse/MOUTBuilding_MudbrickHouse.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_MudbrickHouse/MOUTBuilding_MudbrickHouse.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_MudbrickStore/MOUTBuilding_MudbrickStore.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_MudbrickStore/MOUTBuilding_MudbrickStore.java
index 85d3566cf93760ec332209f5c35fcac895defd38..65fbff861716dc5551d293e6ccb39bcf262f3f91 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_MudbrickStore/MOUTBuilding_MudbrickStore.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_MudbrickStore/MOUTBuilding_MudbrickStore.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_OfficeBuilding/MOUTBuilding_OfficeBuilding.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_OfficeBuilding/MOUTBuilding_OfficeBuilding.java
index 04b68ad7a4d35acc6149367753fe89ca2e82f3c1..ab504d99d47763dc54985013f080bd072dcbacfd 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_OfficeBuilding/MOUTBuilding_OfficeBuilding.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_OfficeBuilding/MOUTBuilding_OfficeBuilding.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_PoliceStation/MOUTBuilding_PoliceStation.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_PoliceStation/MOUTBuilding_PoliceStation.java
index c132fd2f25fd342adeb804f9ecc91633594d9b6a..125d7c4c91a0ec31482bd99ac5704557d843d058 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_PoliceStation/MOUTBuilding_PoliceStation.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_PoliceStation/MOUTBuilding_PoliceStation.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_PowerStation/MOUTBuilding_PowerStation.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_PowerStation/MOUTBuilding_PowerStation.java
index e8be3ae8ae84fff5841734711b7f99c4df25c8cc..fd88af7255265a233cd3c97055749a28116413ae 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_PowerStation/MOUTBuilding_PowerStation.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_PowerStation/MOUTBuilding_PowerStation.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_School/MOUTBuilding_School.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_School/MOUTBuilding_School.java
index 21006616f50f3100cfcd0f67fc5be3cbadaad2fd..88dd8f441c69a0d1c9884cc3e20ff40f1ff6f103 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_School/MOUTBuilding_School.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_School/MOUTBuilding_School.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_Store/MOUTBuilding_Store.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_Store/MOUTBuilding_Store.java
index 10988095795f0f7f9a00378367bf6ee1e09bfc60..60532a48baef8192349f716f228d38e744d9a29a 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_Store/MOUTBuilding_Store.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_Store/MOUTBuilding_Store.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_Warehouse/MOUTBuilding_Warehouse.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_Warehouse/MOUTBuilding_Warehouse.java
index 5b88e64403bf6db7fd95ae268ebf77d9a7ac4dee..0fd554fefdc7cbbf48c7deb1223b3237f71a91c9 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_Warehouse/MOUTBuilding_Warehouse.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_Warehouse/MOUTBuilding_Warehouse.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_WaterTower/MOUTBuilding_WaterTower.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_WaterTower/MOUTBuilding_WaterTower.java
index 2bae29d09b69dc437536a61e763d72087bf4f283..fbf054ab08a4aeb248a4a0b1e4cbbbebab5884d8 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_WaterTower/MOUTBuilding_WaterTower.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_WaterTower/MOUTBuilding_WaterTower.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MaintenanceStructure/LargeAreaMaintenanceShelterLAMSAviationMaintenanceAM/LargeAreaMaintenanceShelterLAMSAviationMaintenanceAM.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MaintenanceStructure/LargeAreaMaintenanceShelterLAMSAviationMaintenanceAM/LargeAreaMaintenanceShelterLAMSAviationMaintenanceAM.java
index 61566453fad25fd63d66ddb30872421a32cec2ae..6481f861963c9b2345c1538d6e7abf888428e96f 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MaintenanceStructure/LargeAreaMaintenanceShelterLAMSAviationMaintenanceAM/LargeAreaMaintenanceShelterLAMSAviationMaintenanceAM.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MaintenanceStructure/LargeAreaMaintenanceShelterLAMSAviationMaintenanceAM/LargeAreaMaintenanceShelterLAMSAviationMaintenanceAM.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MaintenanceStructure/LargeAreaMaintenanceShelterLAMSVehicleMaintenanceVM/LargeAreaMaintenanceShelterLAMSVehicleMaintenanceVM.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MaintenanceStructure/LargeAreaMaintenanceShelterLAMSVehicleMaintenanceVM/LargeAreaMaintenanceShelterLAMSVehicleMaintenanceVM.java
index 3fb15d020a42988d4c4a9eb6d7e6ab1d5c78310e..b13f201078ebeb7758a7ea883550bc2fbf15b624 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MaintenanceStructure/LargeAreaMaintenanceShelterLAMSVehicleMaintenanceVM/LargeAreaMaintenanceShelterLAMSVehicleMaintenanceVM.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MaintenanceStructure/LargeAreaMaintenanceShelterLAMSVehicleMaintenanceVM/LargeAreaMaintenanceShelterLAMSVehicleMaintenanceVM.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MaintenanceStructure/LightweightMaintenanceEnclosureLME_Bradley/LightweightMaintenanceEnclosureLME_Bradley.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MaintenanceStructure/LightweightMaintenanceEnclosureLME_Bradley/LightweightMaintenanceEnclosureLME_Bradley.java
index 9dc67ace8c0d29be76a5db9541bea5e4fae61638..7b05549a48d1b0d7a2b26be5e01fe83ff8fe086a 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MaintenanceStructure/LightweightMaintenanceEnclosureLME_Bradley/LightweightMaintenanceEnclosureLME_Bradley.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MaintenanceStructure/LightweightMaintenanceEnclosureLME_Bradley/LightweightMaintenanceEnclosureLME_Bradley.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MaintenanceStructure/LightweightMaintenanceEnclosureLME_M1/LightweightMaintenanceEnclosureLME_M1.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MaintenanceStructure/LightweightMaintenanceEnclosureLME_M1/LightweightMaintenanceEnclosureLME_M1.java
index a2e2c61f491f83800804d7cd832957b496a9beb5..5b6843d9f2905e83ea3bff38649cfa72369c7b53 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MaintenanceStructure/LightweightMaintenanceEnclosureLME_M1/LightweightMaintenanceEnclosureLME_M1.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MaintenanceStructure/LightweightMaintenanceEnclosureLME_M1/LightweightMaintenanceEnclosureLME_M1.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MaintenanceStructure/MaintenanceStructure.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MaintenanceStructure/MaintenanceStructure.java
index d56a92fda977dc27de8ae2b772b5227bce3605d3..473ace90d746b8e3a612819e64e6be05820aaf27 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MaintenanceStructure/MaintenanceStructure.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MaintenanceStructure/MaintenanceStructure.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Other/Other.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Other/Other.java
index 1ff89d8720fc263471fb78b9245d3c8f0ea5e5d1..ea38f3fd3a969c52da6f8341d713eebd2800ac28 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Other/Other.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Other/Other.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Pump/Pump.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Pump/Pump.java
index 6dedb1dc7f0a2709e4abe2077e190b436b3908e4..b0b8b4b9744a540deb028f4434285f4dc58a64b3 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Pump/Pump.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Pump/Pump.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Pump/Pump_Gas/Pump_Gas.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Pump/Pump_Gas/Pump_Gas.java
index 2750b829c50815732e7a5c05e0ca5e5f43925c29..824669146d21c7c10a5688fcf977bc871c12a9aa 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Pump/Pump_Gas/Pump_Gas.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Pump/Pump_Gas/Pump_Gas.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent.java
index 21204f0056db88c70cd90d0328a7ac7124b4f913..a9285fb4ce77a1c8ff6b915eafdc2481ee0083e1 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent_Arctic/Tent_Arctic.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent_Arctic/Tent_Arctic.java
index edc762622784fd1dbef111a04e956f112c6ceff0..3dbd27c96d498cbd47861584adcf7c7c6e3becc4 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent_Arctic/Tent_Arctic.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent_Arctic/Tent_Arctic.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent_Bedouin/Tent_Bedouin.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent_Bedouin/Tent_Bedouin.java
index 65ef0cf432c5bb09e39e21309a47898acc7f47bd..09c74636245c96ccfe0cad5dabd1ae88ac211f2e 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent_Bedouin/Tent_Bedouin.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent_Bedouin/Tent_Bedouin.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent_ChemicallyandBiologicalProtectedShelterCBPS/Tent_ChemicallyandBiologicalProtectedShelterCBPS.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent_ChemicallyandBiologicalProtectedShelterCBPS/Tent_ChemicallyandBiologicalProtectedShelterCBPS.java
index 61b55c491673d821b453656f66e29bc1a37428ba..07b7dbc74c22cf9379ab3bf62b1df2d706b4a233 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent_ChemicallyandBiologicalProtectedShelterCBPS/Tent_ChemicallyandBiologicalProtectedShelterCBPS.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent_ChemicallyandBiologicalProtectedShelterCBPS/Tent_ChemicallyandBiologicalProtectedShelterCBPS.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent_ExpandableFrame/Tent_ExpandableFrame.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent_ExpandableFrame/Tent_ExpandableFrame.java
index 4ae40e4b0c972e739867023f922b98ed1007e9c5..2d7f9b0710758ca8b20af6b3ee80eedf663c858a 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent_ExpandableFrame/Tent_ExpandableFrame.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent_ExpandableFrame/Tent_ExpandableFrame.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent_Fritsche/Tent_Fritsche.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent_Fritsche/Tent_Fritsche.java
index ae3a701cf854baefd0fe7e468a1fe761337ff856..abd55dc8e76aa54d676562eb8c2f732ea187a0b8 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent_Fritsche/Tent_Fritsche.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent_Fritsche/Tent_Fritsche.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent_Kuchi/Tent_Kuchi.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent_Kuchi/Tent_Kuchi.java
index 3d59f740dd9b88c13fdb75b061dd88e0f22a9bc4..1f6b900842544201c9e1a9cc99e7f033c833a9cc 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent_Kuchi/Tent_Kuchi.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent_Kuchi/Tent_Kuchi.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent_Large/Tent_Large.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent_Large/Tent_Large.java
index 9e824ad59e9d2a6ea9913d3cf7d69ce1d48f80d4..9c4638c4911f79dc6b56e0364839ca0162b8bc37 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent_Large/Tent_Large.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent_Large/Tent_Large.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent_Medium/Tent_Medium.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent_Medium/Tent_Medium.java
index a067ad95ef02dffb2d6dfdb99c9e8196ac2119d9..92d1dbf6057d8f2f32f43e420d2097a085bcf511 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent_Medium/Tent_Medium.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent_Medium/Tent_Medium.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent_ModularGeneralPurposeTentSystemMGPTS/Tent_ModularGeneralPurposeTentSystemMGPTS.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent_ModularGeneralPurposeTentSystemMGPTS/Tent_ModularGeneralPurposeTentSystemMGPTS.java
index 5965900796e2552f0fbf019c31176296a1b5f98a..03cfa92dbc1aaba03b94a7e13882a997e252905c 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent_ModularGeneralPurposeTentSystemMGPTS/Tent_ModularGeneralPurposeTentSystemMGPTS.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent_ModularGeneralPurposeTentSystemMGPTS/Tent_ModularGeneralPurposeTentSystemMGPTS.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent_Small/Tent_Small.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent_Small/Tent_Small.java
index 16be6ab06e76a10222b8af30302679c4512bbfe7..f492ad9dd5868021ebb027ddf531655e53e08780 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent_Small/Tent_Small.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent_Small/Tent_Small.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent_TEMPER/Tent_TEMPER.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent_TEMPER/Tent_TEMPER.java
index c510559e1cdb9bb10c5af92a348d83cf0384d7a8..2c65909bfb780f0faecd7bb9f47b67d989e43973 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent_TEMPER/Tent_TEMPER.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent_TEMPER/Tent_TEMPER.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tree_Deciduous/Tree_Deciduous.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tree_Deciduous/Tree_Deciduous.java
index 511ebd2838953419961b8354aff9b5f726f25afc..8be450ad1e0d8b8a38d188b831fa0d64c7355449 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tree_Deciduous/Tree_Deciduous.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tree_Deciduous/Tree_Deciduous.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tree_Deciduous/Tree_Deciduous_Large/Tree_Deciduous_Large.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tree_Deciduous/Tree_Deciduous_Large/Tree_Deciduous_Large.java
index 1746f7250c8d1e51a112b599b15bd9fbbc40a51f..ab5bb53ac6cd1f5d7a74ff0965702d93c3284f2b 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tree_Deciduous/Tree_Deciduous_Large/Tree_Deciduous_Large.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tree_Deciduous/Tree_Deciduous_Large/Tree_Deciduous_Large.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tree_Deciduous/Tree_Deciduous_Medium/Tree_Deciduous_Medium.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tree_Deciduous/Tree_Deciduous_Medium/Tree_Deciduous_Medium.java
index b111fefc0f7b4919e8eb76a29132587d50660d2b..7f11b54f5a59f4044245145daa91691657167722 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tree_Deciduous/Tree_Deciduous_Medium/Tree_Deciduous_Medium.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tree_Deciduous/Tree_Deciduous_Medium/Tree_Deciduous_Medium.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tree_Deciduous/Tree_Deciduous_Small/Tree_Deciduous_Small.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tree_Deciduous/Tree_Deciduous_Small/Tree_Deciduous_Small.java
index c006f1ee2a7a2ff7c7a4975f885239e1e5ef9e3b..78c7de6f21c2506fdffcd2405d693d1e3aeca7ae 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tree_Deciduous/Tree_Deciduous_Small/Tree_Deciduous_Small.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tree_Deciduous/Tree_Deciduous_Small/Tree_Deciduous_Small.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tree_Evergreen/Tree_Evergreen.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tree_Evergreen/Tree_Evergreen.java
index 9e3b18e135cc720a18726f15ff59116d20b7f117..802b1f800f72416aa59806e41c5df050930cfecd 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tree_Evergreen/Tree_Evergreen.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tree_Evergreen/Tree_Evergreen.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tree_Evergreen/Tree_Evergreen_Large/Tree_Evergreen_Large.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tree_Evergreen/Tree_Evergreen_Large/Tree_Evergreen_Large.java
index 3bc10fb0e656ca4ed67eb2064deeb4c8808d716d..2efde5b0fa73036050056f6e9bf81af9c86dc2b6 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tree_Evergreen/Tree_Evergreen_Large/Tree_Evergreen_Large.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tree_Evergreen/Tree_Evergreen_Large/Tree_Evergreen_Large.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tree_Evergreen/Tree_Evergreen_Medium/Tree_Evergreen_Medium.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tree_Evergreen/Tree_Evergreen_Medium/Tree_Evergreen_Medium.java
index bab07ed63a3c281b94793123ef0e3a803d19c378..a9cfdbb254f9921e3092e9d9f3f0ee39e3b842ef 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tree_Evergreen/Tree_Evergreen_Medium/Tree_Evergreen_Medium.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tree_Evergreen/Tree_Evergreen_Medium/Tree_Evergreen_Medium.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tree_Evergreen/Tree_Evergreen_Small/Tree_Evergreen_Small.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tree_Evergreen/Tree_Evergreen_Small/Tree_Evergreen_Small.java
index c890fbfa5624fd32528116d395be725db8805a15..1b743fda75f7e97998661f65ee11e177c4cfdd3a 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tree_Evergreen/Tree_Evergreen_Small/Tree_Evergreen_Small.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tree_Evergreen/Tree_Evergreen_Small/Tree_Evergreen_Small.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/UtilityPole/UtilityPole.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/UtilityPole/UtilityPole.java
index f5282165c5fcf25ad225836b2f6816dc0e751369..71033ee6c0cc69c8e48edeabde92444f7881913b 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/UtilityPole/UtilityPole.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/UtilityPole/UtilityPole.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/EnvironmentalObject/EnvironmentalObject.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/EnvironmentalObject/EnvironmentalObject.java
index bfd053040e9736dba840613c9f58f84c02074054..87fc370b1acbaddd9bdc2138a4cdb860827aac43 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/EnvironmentalObject/EnvironmentalObject.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/EnvironmentalObject/EnvironmentalObject.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/EnvironmentalObject/Flood/Flood.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/EnvironmentalObject/Flood/Flood.java
index d976f8b914b10a0af648afeb21a2ff213d71280e..b44ab08519e7a50522f26aad948817e8b067495f 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/EnvironmentalObject/Flood/Flood.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/EnvironmentalObject/Flood/Flood.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/EnvironmentalObject/Flood/Flood_Large/Flood_Large.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/EnvironmentalObject/Flood/Flood_Large/Flood_Large.java
index b70826a9c140c19f14bb6eb9a74c90a0249c3ab9..3cc9029396b2fb697ea853860d32fb881c83640c 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/EnvironmentalObject/Flood/Flood_Large/Flood_Large.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/EnvironmentalObject/Flood/Flood_Large/Flood_Large.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/EnvironmentalObject/Flood/Flood_Medium/Flood_Medium.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/EnvironmentalObject/Flood/Flood_Medium/Flood_Medium.java
index 2aa6e56fe18e235cfa4c62a9639b14df21e27c98..12f499c32d6179333fc6f90d546910e9954cfa15 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/EnvironmentalObject/Flood/Flood_Medium/Flood_Medium.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/EnvironmentalObject/Flood/Flood_Medium/Flood_Medium.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/EnvironmentalObject/Flood/Flood_Small/Flood_Small.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/EnvironmentalObject/Flood/Flood_Small/Flood_Small.java
index 23dc41b9448d61ee5f1a501a868156c32f73a1a3..407bb9ceb2b54b5284b3544c05f6dd6e5983d7f7 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/EnvironmentalObject/Flood/Flood_Small/Flood_Small.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/EnvironmentalObject/Flood/Flood_Small/Flood_Small.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Abatis/Abatis.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Abatis/Abatis.java
index 0e6943a6b79ba1be1aedc639d6b63d35d9d4b149..ba77b26ca74321a45a974dd182ae50a16e417545 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Abatis/Abatis.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Abatis/Abatis.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Abatis/Other/Other.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Abatis/Other/Other.java
index 8c056f27ea7224cd4428efb293f51c469f7da710..c9683e46554dc978d3e47f2a4a4ddeb237b8eab1 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Abatis/Other/Other.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Abatis/Other/Other.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Abatis/_14Tree/_14Tree.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Abatis/_14Tree/_14Tree.java
index 8fcb1c266b8ccdabebe59bdbf3fc60bfbac4ef3a..0562d8a661d281c1ba844f8486355d1dfdd4c189 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Abatis/_14Tree/_14Tree.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Abatis/_14Tree/_14Tree.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Abatis/_8Tree/_8Tree.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Abatis/_8Tree/_8Tree.java
index e24aa3757efd8a0d3f172196eaa3e0986f2564c4..659c7041ac31b2954953a3d60c0398ce0d30c234 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Abatis/_8Tree/_8Tree.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Abatis/_8Tree/_8Tree.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Barrier/Barrier.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Barrier/Barrier.java
index 6128ae1bf25b8852fad3f3ad7c04ce4b42521ab8..c447173915934af2edbe86f303c9147bef830a96 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Barrier/Barrier.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Barrier/Barrier.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Barrier/Barrier_Construction/Barrier_Construction.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Barrier/Barrier_Construction/Barrier_Construction.java
index 5cb9d26aa543e5855145e663f48d1c33e991c0a1..4e44510de9993c11a9813e668b3e09f95783786f 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Barrier/Barrier_Construction/Barrier_Construction.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Barrier/Barrier_Construction/Barrier_Construction.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Barrier/Barrier_Fence_Chain_6_foot/Barrier_Fence_Chain_6_foot.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Barrier/Barrier_Fence_Chain_6_foot/Barrier_Fence_Chain_6_foot.java
index 7e397705d5c78e979622ecc31f4cce243d1801f6..a7589fa4848d9f121e0731b5a83230c9f1df8ded 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Barrier/Barrier_Fence_Chain_6_foot/Barrier_Fence_Chain_6_foot.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Barrier/Barrier_Fence_Chain_6_foot/Barrier_Fence_Chain_6_foot.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Barrier/Barrier_Fence_Wood_6_foot/Barrier_Fence_Wood_6_foot.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Barrier/Barrier_Fence_Wood_6_foot/Barrier_Fence_Wood_6_foot.java
index 900fd955c58c81bb4e1344fef3fa124720844cfb..d89af3f09967fdc04dc8dea354e9c63f1ce0fce6 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Barrier/Barrier_Fence_Wood_6_foot/Barrier_Fence_Wood_6_foot.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Barrier/Barrier_Fence_Wood_6_foot/Barrier_Fence_Wood_6_foot.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Barrier/Barrier_HESCOBasket_Double_Stacked/Barrier_HESCOBasket_Double_Stacked.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Barrier/Barrier_HESCOBasket_Double_Stacked/Barrier_HESCOBasket_Double_Stacked.java
index e191300635f4819aa9368cd5d312270e5f9d77ec..fae3d5673e995a11ea5d580f64943758fd7ddd44 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Barrier/Barrier_HESCOBasket_Double_Stacked/Barrier_HESCOBasket_Double_Stacked.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Barrier/Barrier_HESCOBasket_Double_Stacked/Barrier_HESCOBasket_Double_Stacked.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Barrier/Barrier_HESCOBasket_Large/Barrier_HESCOBasket_Large.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Barrier/Barrier_HESCOBasket_Large/Barrier_HESCOBasket_Large.java
index 6d86f2b0551d3a2ddfbf7fa77593ad2a0cf696cc..4d7b7e4462171b01fb774acc383013f289f99fb1 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Barrier/Barrier_HESCOBasket_Large/Barrier_HESCOBasket_Large.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Barrier/Barrier_HESCOBasket_Large/Barrier_HESCOBasket_Large.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Barrier/Barrier_HESCOBasket_Medium/Barrier_HESCOBasket_Medium.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Barrier/Barrier_HESCOBasket_Medium/Barrier_HESCOBasket_Medium.java
index be9cbd05505dc88029afdb462f64e3e89847deef..6b7ccf200663a9412f11497bdef9145e87ac32ed 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Barrier/Barrier_HESCOBasket_Medium/Barrier_HESCOBasket_Medium.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Barrier/Barrier_HESCOBasket_Medium/Barrier_HESCOBasket_Medium.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Barrier/Barrier_HESCOBasket_Small/Barrier_HESCOBasket_Small.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Barrier/Barrier_HESCOBasket_Small/Barrier_HESCOBasket_Small.java
index 2b79262e4e73eba5878a1f10376eaccdb1dbe40c..b9e1b161030baa62129ee24af216e50f2795dd30 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Barrier/Barrier_HESCOBasket_Small/Barrier_HESCOBasket_Small.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Barrier/Barrier_HESCOBasket_Small/Barrier_HESCOBasket_Small.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Barrier/Barrier_Jersey_Plastic/Barrier_Jersey_Plastic.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Barrier/Barrier_Jersey_Plastic/Barrier_Jersey_Plastic.java
index db82ee01a364368776a81f99c2c4f90757c04c31..d40cab6ac7e88aac3257fe4ae9605312c18e5c11 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Barrier/Barrier_Jersey_Plastic/Barrier_Jersey_Plastic.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Barrier/Barrier_Jersey_Plastic/Barrier_Jersey_Plastic.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Barrier/Barrier_Texas/Barrier_Texas.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Barrier/Barrier_Texas/Barrier_Texas.java
index d6b8d39c3998c6e08cc770e1c739030d2105d583..fc528677cc88b3d91ec4cd81a0c9f17085c7c63c 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Barrier/Barrier_Texas/Barrier_Texas.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Barrier/Barrier_Texas/Barrier_Texas.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Barrier/DragonsTeeth/DragonsTeeth.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Barrier/DragonsTeeth/DragonsTeeth.java
index 962689717a88094820e9b14b837464f453f7fe65..3f881f9fad06b8fcf4407332d655d110bd94a4ef 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Barrier/DragonsTeeth/DragonsTeeth.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Barrier/DragonsTeeth/DragonsTeeth.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Crater/Crater.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Crater/Crater.java
index bae72842f67495978bfd9cbf6df21203740befcc..3f1fa029ebb7c7e16e35efe6f69d0d5e0071ee98 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Crater/Crater.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Crater/Crater.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Crater/Large/Large.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Crater/Large/Large.java
index ec1b1a0297c8437a24d64620c4d20656a1fe7036..8ba214823ce94a2b7388e67203aef24e223e4d67 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Crater/Large/Large.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Crater/Large/Large.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Crater/Medium/Medium.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Crater/Medium/Medium.java
index 015c7d9cba2e4f69c648a086ac477fdb41ff04aa..805091afa45ff5b56a8ce7ebe9ee61e524bea46f 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Crater/Medium/Medium.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Crater/Medium/Medium.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Crater/Other/Other.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Crater/Other/Other.java
index 1947a6f4d704336b28ee5d7830ba00e869318852..db1ad5ae63c3eab48c9f776b3b101b3ca75c3c7d 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Crater/Other/Other.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Crater/Other/Other.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Crater/Small/Small.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Crater/Small/Small.java
index bb13e83462e4274bb671dd7fe3a57bc1aa41856c..f1bc5224ba3c98d232db0ed4e81a648ef282465d 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Crater/Small/Small.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Crater/Small/Small.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/LogCrib/LogCrib.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/LogCrib/LogCrib.java
index bd564178444b04b58ef8647ae77762df91bb657c..c68ee1a76d62b326e8eed09339a12643c71fea60 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/LogCrib/LogCrib.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/LogCrib/LogCrib.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/LogCrib/Other/Other.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/LogCrib/Other/Other.java
index 5ed40c2fb0659b5d83d7ebb20d992e452bc68243..232fa8d8242b6d4ed3bbb85c59593f40d3f3a9ba 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/LogCrib/Other/Other.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/LogCrib/Other/Other.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/LogCrib/Rectangular/Rectangular.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/LogCrib/Rectangular/Rectangular.java
index c2f6810dc88478046adb5036033afbce9e04ba75..8ead30012bb118d6e52360e0bf99c73a4429205f 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/LogCrib/Rectangular/Rectangular.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/LogCrib/Rectangular/Rectangular.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/LogCrib/Triangular/Triangular.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/LogCrib/Triangular/Triangular.java
index 94dd0d44552aff534a0229a024b3f39bff00ae3e..95950dc8fcd1cd7ec93020ea229a280303554fc7 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/LogCrib/Triangular/Triangular.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/LogCrib/Triangular/Triangular.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Obstacle.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Obstacle.java
index 969146ebb911168f7a606e5a3620575fd8d8e1dc..97f5765fec56113146adba4c7758281dad0aaae4 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Obstacle.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Obstacle.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Other/Other.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Other/Other.java
index 8f0dd9d360e33119bcd1f35af8100de0cefd7552..bf333f72a0fb791e06fe3935f33b64b7f2328a1b 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Other/Other.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Other/Other.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/PotHole/PotHole.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/PotHole/PotHole.java
index 31476d225f4b1bff11ef6d26892ee9949181818b..3f8bea3b4745d5b1622bdb5edb61905c0f4a7b60 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/PotHole/PotHole.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/PotHole/PotHole.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/RockDrop/RockDrop.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/RockDrop/RockDrop.java
index d54ed4ef4a144ecf702f16c340168384794ecd1a..ea9e9d255f364d78f2d50df402c0f2726f41e601 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/RockDrop/RockDrop.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/RockDrop/RockDrop.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/RockDrop/RockDrop_Covered/RockDrop_Covered.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/RockDrop/RockDrop_Covered/RockDrop_Covered.java
index 4355c911e86260e4349b8298ea3ecad8f93e67ab..5a5518ad6146732b43eacf72ea3b035db6e6f1fe 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/RockDrop/RockDrop_Covered/RockDrop_Covered.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/RockDrop/RockDrop_Covered/RockDrop_Covered.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/RockDrop/RockDrop_Uncovered/RockDrop_Uncovered.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/RockDrop/RockDrop_Uncovered/RockDrop_Uncovered.java
index e211db4ef0ae9f571c6f427279b7ee6dfadca2f9..fcce4d06ba68bdd86428636c5eeeb82223c85091 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/RockDrop/RockDrop_Uncovered/RockDrop_Uncovered.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/RockDrop/RockDrop_Uncovered/RockDrop_Uncovered.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstaclemarker/NBCHazardMarker/NBCHazardMarker.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstaclemarker/NBCHazardMarker/NBCHazardMarker.java
index 6924c42137576a20b29d0b7561404c2ff833a5e9..a03182c16cd5cdd4b31f20df5c450812980cf84f 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstaclemarker/NBCHazardMarker/NBCHazardMarker.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstaclemarker/NBCHazardMarker/NBCHazardMarker.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstaclemarker/Obstaclemarker.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstaclemarker/Obstaclemarker.java
index c28173fea6d559fac4717328c4fe64218223a093..a5908c46de7bf07f6c13db29f46c88ee5b3d9af7 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstaclemarker/Obstaclemarker.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstaclemarker/Obstaclemarker.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/AVLB/AVLB.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/AVLB/AVLB.java
index 64ca4f1a02597a8269688f724cd4be4993658972..ba434c82c8f0086968c9f5f96b32fe562c9ee3a3 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/AVLB/AVLB.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/AVLB/AVLB.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/AVLB/JointAssaultBridgeJAB/JointAssaultBridgeJAB.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/AVLB/JointAssaultBridgeJAB/JointAssaultBridgeJAB.java
index aa157ab342bcf675faa090ca1ca7f7767c475e27..b8f86198ce6efcdab74de45994e9f86111a405c1 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/AVLB/JointAssaultBridgeJAB/JointAssaultBridgeJAB.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/AVLB/JointAssaultBridgeJAB/JointAssaultBridgeJAB.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/AVLB/M60A1/M60A1.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/AVLB/M60A1/M60A1.java
index 6bdb406c76773ed09f897327b1f6c0a63324e571..f7768d828cd13623d288d499216e5d6fc8f00be6 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/AVLB/M60A1/M60A1.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/AVLB/M60A1/M60A1.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/AVLB/MTU20/MTU20.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/AVLB/MTU20/MTU20.java
index b5e12ecd193e1977008d591835c4d0bbe518af2a..be54b0aea5e36b442816af92c0eefb9ffbe55e48 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/AVLB/MTU20/MTU20.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/AVLB/MTU20/MTU20.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/AVLB/Other/Other.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/AVLB/Other/Other.java
index f2b03b04fafb52c90fe1bf39dea300090c7dd4b8..ece56ec9fc25e20b4dab377ce39ba7ea2e4971d1 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/AVLB/Other/Other.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/AVLB/Other/Other.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/Other/Other.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/Other/Other.java
index 4f802b3cc0f73552c07f3cd23b11b86cafda0d86..8699e19362072166197200fe8e9ac10b37eefae3 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/Other/Other.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/Other/Other.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/Passageway.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/Passageway.java
index ad741598a4ab8777f942b20adeb532dfc7aa8ed8..d67fa29e02038b2f4bf539be314bd047453dec68 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/Passageway.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/Passageway.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/Pier/Pier.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/Pier/Pier.java
index a958105128557e2bec12eb7769b7144f94f03917..ffc8ebd1dd9adcedd31d85adfd942b3a5cda9da5 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/Pier/Pier.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/Pier/Pier.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/RibbonBridge/Other/Other.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/RibbonBridge/Other/Other.java
index ae9419cbdc5b074ea266b88d7564dd8f87bdd44e..ed1d0f57510b76f6fb70ebc9c9f2a4079e859a50 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/RibbonBridge/Other/Other.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/RibbonBridge/Other/Other.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/RibbonBridge/RibbonBridge.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/RibbonBridge/RibbonBridge.java
index abf31122de07c97e8907f9309644d21c49b742e3..7a5eddd9de741899e4c6dfee53adb5689d16791e 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/RibbonBridge/RibbonBridge.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/RibbonBridge/RibbonBridge.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/RibbonBridge/_2_Lane/_2_Lane.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/RibbonBridge/_2_Lane/_2_Lane.java
index 27285dc8b61ae4ea44040fbad64eb7159d99b194..a1d31b60b33151e81ce1b2a1efbca544ffbad42f 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/RibbonBridge/_2_Lane/_2_Lane.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/RibbonBridge/_2_Lane/_2_Lane.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/RibbonBridge/_4_Lane/_4_Lane.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/RibbonBridge/_4_Lane/_4_Lane.java
index 2ee263eead6958de250abb87389bc94f2506da7e..7e6b305bde6cc6112af91528ed41d0867fb9aafb 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/RibbonBridge/_4_Lane/_4_Lane.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/RibbonBridge/_4_Lane/_4_Lane.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/StationaryBridge/Other/Other.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/StationaryBridge/Other/Other.java
index ef7f3ec367691091696b6c1efefa18914d591c33..ba19e446b56c33387055d2e9333779ec6736acc3 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/StationaryBridge/Other/Other.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/StationaryBridge/Other/Other.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/StationaryBridge/StationaryBridge.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/StationaryBridge/StationaryBridge.java
index 49693e940a744b623424991d10d04f2075256853..c30f4afeb1f4aaffc04470146cca32dd053b8b48 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/StationaryBridge/StationaryBridge.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/StationaryBridge/StationaryBridge.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/StationaryBridge/_2_Lane/_2_Lane.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/StationaryBridge/_2_Lane/_2_Lane.java
index 774d352bb30de54806104eff3808d3580f18b7a9..34f933e4289b2bf51e05666fd917fa0197482258 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/StationaryBridge/_2_Lane/_2_Lane.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/StationaryBridge/_2_Lane/_2_Lane.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/StationaryBridge/_4_Lane/_4_Lane.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/StationaryBridge/_4_Lane/_4_Lane.java
index ad087961a06a80811067deabb0755403838ac225..e5c5082300e849e33a1525766f39d47e3888323b 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/StationaryBridge/_4_Lane/_4_Lane.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/StationaryBridge/_4_Lane/_4_Lane.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/PointObject.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/PointObject.java
index ef4d1e799149adb4d91c6bf60939545bc0373a1c..ddc59543bed8f1ae9651444e178e1175edfd7a50 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/PointObject.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/PointObject.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/InfantryFightingPosition/CoveredMachineGunBunker/CoveredMachineGunBunker.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/InfantryFightingPosition/CoveredMachineGunBunker/CoveredMachineGunBunker.java
index fc27c52c8729feea3ca3d0d9334da1b77ee2cee9..c9f8a98f4402c3320a303c52a3378e922adb8f52 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/InfantryFightingPosition/CoveredMachineGunBunker/CoveredMachineGunBunker.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/InfantryFightingPosition/CoveredMachineGunBunker/CoveredMachineGunBunker.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/InfantryFightingPosition/HastyFightingPosition/HastyFightingPosition.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/InfantryFightingPosition/HastyFightingPosition/HastyFightingPosition.java
index 01a3916ebe521de46d9b969838e7235e14550ea0..adf01ce940f473199f80eeb0a2b3a57921c45666 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/InfantryFightingPosition/HastyFightingPosition/HastyFightingPosition.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/InfantryFightingPosition/HastyFightingPosition/HastyFightingPosition.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/InfantryFightingPosition/InfantryFightingPosition.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/InfantryFightingPosition/InfantryFightingPosition.java
index bf0e33156e5e1aff908fdfe4a6827866b22b8c51..e93e3bb0e048c7a8b7ba7be0bcbac66cc655774a 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/InfantryFightingPosition/InfantryFightingPosition.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/InfantryFightingPosition/InfantryFightingPosition.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/InfantryFightingPosition/Non_CoveredInfantryPosition/Non_CoveredInfantryPosition.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/InfantryFightingPosition/Non_CoveredInfantryPosition/Non_CoveredInfantryPosition.java
index 8cd4d6de73fe87131e502639de09d833c3853909..f2f6f5b491b69fd847c82db74732cb7714223088 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/InfantryFightingPosition/Non_CoveredInfantryPosition/Non_CoveredInfantryPosition.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/InfantryFightingPosition/Non_CoveredInfantryPosition/Non_CoveredInfantryPosition.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/InfantryFightingPosition/Non_CoveredMachineGunBunker/Non_CoveredMachineGunBunker.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/InfantryFightingPosition/Non_CoveredMachineGunBunker/Non_CoveredMachineGunBunker.java
index 38db9665418134abfc73bf7490ddd8eddbec993e..04dde4e9b48943d2f286eb6e27f7d223dc10ad30 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/InfantryFightingPosition/Non_CoveredMachineGunBunker/Non_CoveredMachineGunBunker.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/InfantryFightingPosition/Non_CoveredMachineGunBunker/Non_CoveredMachineGunBunker.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/InfantryFightingPosition/Other/Other.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/InfantryFightingPosition/Other/Other.java
index d724a1d28f2bb960c70b623d77328bb29c903c57..7d1de029655ef8e06bb1b99cb5a34de43683e869 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/InfantryFightingPosition/Other/Other.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/InfantryFightingPosition/Other/Other.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/InfantryFightingPosition/OverheadCoveredInfantryPosition/OverheadCoveredInfantryPosition.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/InfantryFightingPosition/OverheadCoveredInfantryPosition/OverheadCoveredInfantryPosition.java
index b8431dc1dc6c9fa7bde1ebda2926629f2f003a6e..947cb758ab7ae9f678eada47a028c8914a9c877b 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/InfantryFightingPosition/OverheadCoveredInfantryPosition/OverheadCoveredInfantryPosition.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/InfantryFightingPosition/OverheadCoveredInfantryPosition/OverheadCoveredInfantryPosition.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/Other/Other.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/Other/Other.java
index a5303522cb77810513db4b29f9b3beee5f29c3b0..d42dd3fc3d7dd67981d0b925aa7fb9e72ce34262 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/Other/Other.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/Other/Other.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/Preparedposition.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/Preparedposition.java
index 686a40bca9fdc7cf2011fa4ee9e9a40d8da10846..9d98c940316eabddfa3a020dbbce2b3355b75b5d 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/Preparedposition.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/Preparedposition.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/VehicleDefilade/ArmoredVehicle/ArmoredVehicle.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/VehicleDefilade/ArmoredVehicle/ArmoredVehicle.java
index eb0db339dc4a3865c5ab752a099778e25c0d4bb0..e2460d888cd36cc06ea7feafb5dc131c814b6448 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/VehicleDefilade/ArmoredVehicle/ArmoredVehicle.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/VehicleDefilade/ArmoredVehicle/ArmoredVehicle.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/VehicleDefilade/FightingVehicle/FightingVehicle.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/VehicleDefilade/FightingVehicle/FightingVehicle.java
index 914a4e7c41042ce9fce496eab9d2e6bc1e0c7d27..34f8fb2a51772ea9f9afc0d0aef1ecd6a8f42547 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/VehicleDefilade/FightingVehicle/FightingVehicle.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/VehicleDefilade/FightingVehicle/FightingVehicle.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/VehicleDefilade/MortarCarrier/MortarCarrier.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/VehicleDefilade/MortarCarrier/MortarCarrier.java
index 525b4f5297da7a1d0492782dfc24cacae5671b73..ca53a36aa2e53e6c436ef4af997421746d4d570c 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/VehicleDefilade/MortarCarrier/MortarCarrier.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/VehicleDefilade/MortarCarrier/MortarCarrier.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/VehicleDefilade/Other/Other.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/VehicleDefilade/Other/Other.java
index c8a9228a8f60a84ef00fc2d13ca8be667908fd4e..e2401478446e1ef7686acbd071d95441b3fc655a 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/VehicleDefilade/Other/Other.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/VehicleDefilade/Other/Other.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/VehicleDefilade/Tank/Tank.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/VehicleDefilade/Tank/Tank.java
index 71d380f0428314524f2a238f345f238ccfa5dd54..eaf8d4c7048b1187afc1d2c4896bc4340c24153c 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/VehicleDefilade/Tank/Tank.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/VehicleDefilade/Tank/Tank.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/VehicleDefilade/VehicleDefilade.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/VehicleDefilade/VehicleDefilade.java
index fb79b947c7b4cb02bf99e163fbec8981aa670f93..d7545e7e91c5b2e5f772a6bf5043060219431607 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/VehicleDefilade/VehicleDefilade.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/VehicleDefilade/VehicleDefilade.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/AirBurst/AirBurst.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/AirBurst/AirBurst.java
index 83265af57d645b717d62a3ff9f3430bd13c47e91..21dd36e89103fb580a66b593333e5799cd22e4e0 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/AirBurst/AirBurst.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/AirBurst/AirBurst.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/AirBurst/Grenade/Grenade.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/AirBurst/Grenade/Grenade.java
index d8df536667ce92940c93538d5a45119afdd04a67..bf2667aec8e326b07a0d3da74dcf418712c6706b 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/AirBurst/Grenade/Grenade.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/AirBurst/Grenade/Grenade.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/AirBurst/Other/Other.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/AirBurst/Other/Other.java
index 6a228bbbea83c83ff33d3a9c2bef89ce7c3334a4..55ebf3a365fde15dc55ad0630b320494f6ab4405 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/AirBurst/Other/Other.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/AirBurst/Other/Other.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/GroundBurst/Artillery/Artillery.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/GroundBurst/Artillery/Artillery.java
index 7be84490f6d15b189e603ba1b6098ff0d5c5c9ee..d16e14c3a40c405754b51c5bf84164b213e37328 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/GroundBurst/Artillery/Artillery.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/GroundBurst/Artillery/Artillery.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/GroundBurst/GroundBurst.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/GroundBurst/GroundBurst.java
index dd1f17a871624a384f4b8069294e07d8c52960ba..385a4958eaf15e34b291816943b7eb4cbc4c877a 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/GroundBurst/GroundBurst.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/GroundBurst/GroundBurst.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/GroundBurst/Other/Other.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/GroundBurst/Other/Other.java
index fdf39059686f0fc6c96c9e551f7b526594a42fa4..571754cf34db5351e097ad9e2112078b8d769fe3 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/GroundBurst/Other/Other.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/GroundBurst/Other/Other.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/Other/Other.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/Other/Other.java
index 500cdd6897d8b9b493739801e2087988d1334ab8..d9ab05d6a7917944fd7b621a9d46e1957049810f 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/Other/Other.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/Other/Other.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/TacticalSmoke_Canister/M18_Green/M18_Green.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/TacticalSmoke_Canister/M18_Green/M18_Green.java
index 1b6d86c31cab81bc85c102dd3138f1f749d5d704..25bb4e0efb6c290ad00e7c66a9b3634b3973a242 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/TacticalSmoke_Canister/M18_Green/M18_Green.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/TacticalSmoke_Canister/M18_Green/M18_Green.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/TacticalSmoke_Canister/M18_Red/M18_Red.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/TacticalSmoke_Canister/M18_Red/M18_Red.java
index fa268cf5f2f59cc22bde03661917ee63b9483cfa..dc299f4bb0e10b4984b08eb3c66fbd475ed8a1a8 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/TacticalSmoke_Canister/M18_Red/M18_Red.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/TacticalSmoke_Canister/M18_Red/M18_Red.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/TacticalSmoke_Canister/M18_Violet/M18_Violet.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/TacticalSmoke_Canister/M18_Violet/M18_Violet.java
index a17c254bcc6fa31e57b5781087184594a9f05875..537b6ed1a8cc548992154893a8b06c4e4c142b9b 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/TacticalSmoke_Canister/M18_Violet/M18_Violet.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/TacticalSmoke_Canister/M18_Violet/M18_Violet.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/TacticalSmoke_Canister/M18_Yellow/M18_Yellow.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/TacticalSmoke_Canister/M18_Yellow/M18_Yellow.java
index 06968a8481fe7d8a49f346bcb1d871102d915d55..91653d44e8160da8c6a20a181e3c9920da7146a0 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/TacticalSmoke_Canister/M18_Yellow/M18_Yellow.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/TacticalSmoke_Canister/M18_Yellow/M18_Yellow.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/TacticalSmoke_Canister/M83_White/M83_White.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/TacticalSmoke_Canister/M83_White/M83_White.java
index d87bb2d1a9bef7978fe59ee1e1541a109aea8fbe..7fa35362b97cf6015d10a6eefa79fd6f8751edab 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/TacticalSmoke_Canister/M83_White/M83_White.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/TacticalSmoke_Canister/M83_White/M83_White.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/TacticalSmoke_Canister/TacticalSmoke_Canister.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/TacticalSmoke_Canister/TacticalSmoke_Canister.java
index 938c7e9db581886e369257437ce85712b0e5b3c2..76eaaf37c0b71698d852d45d90ec630128f6c9a7 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/TacticalSmoke_Canister/TacticalSmoke_Canister.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/TacticalSmoke_Canister/TacticalSmoke_Canister.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/
diff --git a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/Tacticalsmoke.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/Tacticalsmoke.java
index de62198cbb691f64f11736034826a8b556b5c0b6..16aa53de83bd11646d4f6aec7233532bab6d6b43 100644
--- a/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/Tacticalsmoke.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/Tacticalsmoke.java
@@ -4,7 +4,7 @@ import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * SISO-REF-010-v25, 2018-08-29
+ * SISO-REF-010-v28, 2020-05-07
*
* ObjectType uid: 226
*/