diff --git a/src-generated/edu/nps/moves/dis7/APA.java b/src-generated/edu/nps/moves/dis7/APA.java
index 68a1d08c91d25b298ec02829edf2e15a257629a7..1e2bc072e2425a18a4082959b1b24670e8e12c8a 100644
--- a/src-generated/edu/nps/moves/dis7/APA.java
+++ b/src-generated/edu/nps/moves/dis7/APA.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -65,15 +65,16 @@ public short getValue()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeShort( (short)parameterIndex);
- dos.writeShort( (short)value);
+ dos.writeShort(parameterIndex);
+ dos.writeShort(value);
}
catch(Exception e)
{
@@ -83,9 +84,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -99,7 +101,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -172,7 +174,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" parameterIndex: ").append(parameterIndex).append("\n");
sb.append(" value: ").append(value).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/AcknowledgePdu.java b/src-generated/edu/nps/moves/dis7/AcknowledgePdu.java
index 01d6010091d73736e7713df21b96e02cf96b4554..35c62b2865948c9e20631e274e560782a264050f 100644
--- a/src-generated/edu/nps/moves/dis7/AcknowledgePdu.java
+++ b/src-generated/edu/nps/moves/dis7/AcknowledgePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -86,8 +86,9 @@ public int getRequestID()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -96,7 +97,7 @@ public void marshal(DataOutputStream dos) throws Exception
{
acknowledgeFlag.marshal(dos);
responseFlag.marshal(dos);
- dos.writeInt( (int)requestID);
+ dos.writeInt(requestID);
}
catch(Exception e)
{
@@ -106,9 +107,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -126,7 +128,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -200,7 +202,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" acknowledgeFlag: ").append(acknowledgeFlag).append("\n");
sb.append(" responseFlag: ").append(responseFlag).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/AcknowledgeRPdu.java b/src-generated/edu/nps/moves/dis7/AcknowledgeRPdu.java
index 6744f85146829de5e6cec7baff24b5aed5e19978..201a8f0b4318ac64fe8c40d7408c187d1167bf7c 100644
--- a/src-generated/edu/nps/moves/dis7/AcknowledgeRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/AcknowledgeRPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -86,8 +86,9 @@ public int getRequestID()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -96,7 +97,7 @@ public void marshal(DataOutputStream dos) throws Exception
{
acknowledgeFlag.marshal(dos);
responseFlag.marshal(dos);
- dos.writeInt( (int)requestID);
+ dos.writeInt(requestID);
}
catch(Exception e)
{
@@ -106,9 +107,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -126,7 +128,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -200,7 +202,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" acknowledgeFlag: ").append(acknowledgeFlag).append("\n");
sb.append(" responseFlag: ").append(responseFlag).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/AcknowledgeReliablePdu.java b/src-generated/edu/nps/moves/dis7/AcknowledgeReliablePdu.java
index 91062c1300261e6348a94101ea626c4da06dc12d..dcf00d2776e160cfda8e9c5069a74e4725bf049d 100644
--- a/src-generated/edu/nps/moves/dis7/AcknowledgeReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/AcknowledgeReliablePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
diff --git a/src-generated/edu/nps/moves/dis7/AcousticEmitter.java b/src-generated/edu/nps/moves/dis7/AcousticEmitter.java
index a439f49ca0690b2651e5100d6037068e49663bf5..2ac202cac2213e3ac47b05c4a5156daeaebacb01 100644
--- a/src-generated/edu/nps/moves/dis7/AcousticEmitter.java
+++ b/src-generated/edu/nps/moves/dis7/AcousticEmitter.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -84,8 +84,9 @@ public byte getAcousticIDNumber()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -93,7 +94,7 @@ public void marshal(DataOutputStream dos) throws Exception
{
acousticSystemName.marshal(dos);
acousticFunction.marshal(dos);
- dos.writeByte( (byte)acousticIDNumber);
+ dos.writeByte(acousticIDNumber);
}
catch(Exception e)
{
@@ -103,9 +104,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -121,7 +123,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -197,7 +199,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" acousticSystemName: ").append(acousticSystemName).append("\n");
sb.append(" acousticFunction: ").append(acousticFunction).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/ActionRequestPdu.java b/src-generated/edu/nps/moves/dis7/ActionRequestPdu.java
index aea9131f141b56dfbdd4127c78fe6207db74c569..8b909b5efa0cc7122c01296975452c2231dfa3b7 100644
--- a/src-generated/edu/nps/moves/dis7/ActionRequestPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ActionRequestPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -15,7 +15,7 @@ import edu.nps.moves.dis7.enumerations.*;
*/
public class ActionRequestPdu extends SimulationManagementFamilyPdu implements Serializable
{
- /** identifies the request being made by the simulaton manager */
+ /** 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 */
@@ -119,18 +119,19 @@ public List<VariableDatum> getVariableDatums()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
super.marshal(dos);
try
{
- dos.writeInt( (int)requestID);
+ dos.writeInt(requestID);
actionID.marshal(dos);
- dos.writeInt( (int)fixedDatums.size());
- dos.writeInt( (int)variableDatums.size());
+ dos.writeInt(fixedDatums.size());
+ dos.writeInt(variableDatums.size());
for(int idx = 0; idx < fixedDatums.size(); idx++)
{
@@ -154,9 +155,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -190,7 +192,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -213,14 +215,14 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < fixedDatums.size(); idx++)
{
- FixedDatum aFixedDatum = (FixedDatum)fixedDatums.get(idx);
+ FixedDatum aFixedDatum = fixedDatums.get(idx);
aFixedDatum.marshal(buff);
}
for(int idx = 0; idx < variableDatums.size(); idx++)
{
- VariableDatum aVariableDatum = (VariableDatum)variableDatums.get(idx);
+ VariableDatum aVariableDatum = variableDatums.get(idx);
aVariableDatum.marshal(buff);
}
@@ -301,7 +303,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" requestID: ").append(requestID).append("\n");
sb.append(" actionID: ").append(actionID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/ActionRequestRPdu.java b/src-generated/edu/nps/moves/dis7/ActionRequestRPdu.java
index 64b7fab909df0c285d97c3ee43f284f931937dd3..49a4457888a0748c44ed6c9822cc9bbe4eb237ad 100644
--- a/src-generated/edu/nps/moves/dis7/ActionRequestRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ActionRequestRPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -170,8 +170,9 @@ public List<VariableDatum> getVariableDatumRecords()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -179,12 +180,12 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
requiredReliabilityService.marshal(dos);
- dos.writeByte( (byte)pad1);
- dos.writeShort( (short)pad2);
- dos.writeInt( (int)requestID);
+ dos.writeByte(pad1);
+ dos.writeShort(pad2);
+ dos.writeInt(requestID);
actionID.marshal(dos);
- dos.writeInt( (int)fixedDatumRecords.size());
- dos.writeInt( (int)variableDatumRecords.size());
+ dos.writeInt(fixedDatumRecords.size());
+ dos.writeInt(variableDatumRecords.size());
for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
{
@@ -208,9 +209,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -250,7 +252,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -276,14 +278,14 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
{
- FixedDatum aFixedDatum = (FixedDatum)fixedDatumRecords.get(idx);
+ FixedDatum aFixedDatum = fixedDatumRecords.get(idx);
aFixedDatum.marshal(buff);
}
for(int idx = 0; idx < variableDatumRecords.size(); idx++)
{
- VariableDatum aVariableDatum = (VariableDatum)variableDatumRecords.get(idx);
+ VariableDatum aVariableDatum = variableDatumRecords.get(idx);
aVariableDatum.marshal(buff);
}
@@ -370,7 +372,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
sb.append(" pad1: ").append(pad1).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/ActionRequestReliablePdu.java b/src-generated/edu/nps/moves/dis7/ActionRequestReliablePdu.java
index 9d6b65999cbc2c9fc2809a0ddad9aa35b3dff07c..a1d0465733075f5eb3ae871bd9a0e7092e5e46bb 100644
--- a/src-generated/edu/nps/moves/dis7/ActionRequestReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/ActionRequestReliablePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
diff --git a/src-generated/edu/nps/moves/dis7/ActionResponsePdu.java b/src-generated/edu/nps/moves/dis7/ActionResponsePdu.java
index 5c9da6f327e216bc6b048afe0f3005879c25a7d0..13f3c4a747d38f564bc9efc6965221a8d2485f24 100644
--- a/src-generated/edu/nps/moves/dis7/ActionResponsePdu.java
+++ b/src-generated/edu/nps/moves/dis7/ActionResponsePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -119,18 +119,19 @@ public List<VariableDatum> getVariableDatums()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
super.marshal(dos);
try
{
- dos.writeInt( (int)requestID);
+ dos.writeInt(requestID);
requestStatus.marshal(dos);
- dos.writeInt( (int)fixedDatums.size());
- dos.writeInt( (int)variableDatums.size());
+ dos.writeInt(fixedDatums.size());
+ dos.writeInt(variableDatums.size());
for(int idx = 0; idx < fixedDatums.size(); idx++)
{
@@ -154,9 +155,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -190,7 +192,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -213,14 +215,14 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < fixedDatums.size(); idx++)
{
- FixedDatum aFixedDatum = (FixedDatum)fixedDatums.get(idx);
+ FixedDatum aFixedDatum = fixedDatums.get(idx);
aFixedDatum.marshal(buff);
}
for(int idx = 0; idx < variableDatums.size(); idx++)
{
- VariableDatum aVariableDatum = (VariableDatum)variableDatums.get(idx);
+ VariableDatum aVariableDatum = variableDatums.get(idx);
aVariableDatum.marshal(buff);
}
@@ -301,7 +303,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" requestID: ").append(requestID).append("\n");
sb.append(" requestStatus: ").append(requestStatus).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/ActionResponseRPdu.java b/src-generated/edu/nps/moves/dis7/ActionResponseRPdu.java
index 9e95af039bcf78dc8433bf1031218fab7d51287a..4a6046460ab67d55e0081ce44ee022b537ce7c10 100644
--- a/src-generated/edu/nps/moves/dis7/ActionResponseRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ActionResponseRPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -119,18 +119,19 @@ public List<VariableDatum> getVariableDatumRecords()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
super.marshal(dos);
try
{
- dos.writeInt( (int)requestID);
+ dos.writeInt(requestID);
responseStatus.marshal(dos);
- dos.writeInt( (int)fixedDatumRecords.size());
- dos.writeInt( (int)variableDatumRecords.size());
+ dos.writeInt(fixedDatumRecords.size());
+ dos.writeInt(variableDatumRecords.size());
for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
{
@@ -154,9 +155,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -190,7 +192,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -213,14 +215,14 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
{
- FixedDatum aFixedDatum = (FixedDatum)fixedDatumRecords.get(idx);
+ FixedDatum aFixedDatum = fixedDatumRecords.get(idx);
aFixedDatum.marshal(buff);
}
for(int idx = 0; idx < variableDatumRecords.size(); idx++)
{
- VariableDatum aVariableDatum = (VariableDatum)variableDatumRecords.get(idx);
+ VariableDatum aVariableDatum = variableDatumRecords.get(idx);
aVariableDatum.marshal(buff);
}
@@ -301,7 +303,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" requestID: ").append(requestID).append("\n");
sb.append(" responseStatus: ").append(responseStatus).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/ActionResponseReliablePdu.java b/src-generated/edu/nps/moves/dis7/ActionResponseReliablePdu.java
index 42ac1c397dbd0274940a8eb7d2adb85576d5adfc..bc892f2835ba0641853c113e06d2f11ef32d6825 100644
--- a/src-generated/edu/nps/moves/dis7/ActionResponseReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/ActionResponseReliablePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
diff --git a/src-generated/edu/nps/moves/dis7/AggregateIdentifier.java b/src-generated/edu/nps/moves/dis7/AggregateIdentifier.java
index 5eaca06cb01e091b6f3a41d4791081a77e307ac6..9ed0a92c97fc69ff0050f4d5073a570e9001eed2 100644
--- a/src-generated/edu/nps/moves/dis7/AggregateIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/AggregateIdentifier.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -67,15 +67,16 @@ public short getAggregateID()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
simulationAddress.marshal(dos);
- dos.writeShort( (short)aggregateID);
+ dos.writeShort(aggregateID);
}
catch(Exception e)
{
@@ -85,9 +86,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -100,7 +102,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -173,7 +175,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
sb.append(" aggregateID: ").append(aggregateID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/AggregateMarking.java b/src-generated/edu/nps/moves/dis7/AggregateMarking.java
index bce9e5455d940a630a84eed81a8ba50400897ce6..78743f8630b0e246a78f995140c0bb4cc49da2cb 100644
--- a/src-generated/edu/nps/moves/dis7/AggregateMarking.java
+++ b/src-generated/edu/nps/moves/dis7/AggregateMarking.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -67,8 +67,9 @@ public byte[] getCharacters()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -88,9 +89,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -105,7 +107,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -187,7 +189,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" characterSet: ").append(characterSet).append("\n");
sb.append(" characters: ").append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/AggregateStatePdu.java b/src-generated/edu/nps/moves/dis7/AggregateStatePdu.java
index cab46213ffb575171b68a0b79f8f3351d3ebbfa5..bda5e8cbb53c5a4bfa29ca0349425259f3a296d4 100644
--- a/src-generated/edu/nps/moves/dis7/AggregateStatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/AggregateStatePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -333,8 +333,9 @@ public List<VariableDatum> getVariableDatumList()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -351,10 +352,10 @@ public void marshal(DataOutputStream dos) throws Exception
orientation.marshal(dos);
centerOfMass.marshal(dos);
velocity.marshal(dos);
- dos.writeShort( (short)aggregateIDList.size());
- dos.writeShort( (short)entityIDList.size());
- dos.writeShort( (short)silentAggregateSystemList.size());
- dos.writeShort( (short)silentEntitySystemList.size());
+ dos.writeShort(aggregateIDList.size());
+ dos.writeShort(entityIDList.size());
+ dos.writeShort(silentAggregateSystemList.size());
+ dos.writeShort(silentEntitySystemList.size());
for(int idx = 0; idx < aggregateIDList.size(); idx++)
{
@@ -384,7 +385,7 @@ public void marshal(DataOutputStream dos) throws Exception
aEntityType.marshal(dos);
}
- dos.writeInt( (int)variableDatumList.size());
+ dos.writeInt(variableDatumList.size());
for(int idx = 0; idx < variableDatumList.size(); idx++)
{
@@ -401,9 +402,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -475,7 +477,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -508,14 +510,14 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < aggregateIDList.size(); idx++)
{
- AggregateIdentifier aAggregateIdentifier = (AggregateIdentifier)aggregateIDList.get(idx);
+ AggregateIdentifier aAggregateIdentifier = aggregateIDList.get(idx);
aAggregateIdentifier.marshal(buff);
}
for(int idx = 0; idx < entityIDList.size(); idx++)
{
- EntityID aEntityID = (EntityID)entityIDList.get(idx);
+ EntityID aEntityID = entityIDList.get(idx);
aEntityID.marshal(buff);
}
@@ -523,14 +525,14 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < silentAggregateSystemList.size(); idx++)
{
- EntityType aEntityType = (EntityType)silentAggregateSystemList.get(idx);
+ EntityType aEntityType = silentAggregateSystemList.get(idx);
aEntityType.marshal(buff);
}
for(int idx = 0; idx < silentEntitySystemList.size(); idx++)
{
- EntityType aEntityType = (EntityType)silentEntitySystemList.get(idx);
+ EntityType aEntityType = silentEntitySystemList.get(idx);
aEntityType.marshal(buff);
}
@@ -538,7 +540,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < variableDatumList.size(); idx++)
{
- VariableDatum aVariableDatum = (VariableDatum)variableDatumList.get(idx);
+ VariableDatum aVariableDatum = variableDatumList.get(idx);
aVariableDatum.marshal(buff);
}
@@ -672,7 +674,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" aggregateID: ").append(aggregateID).append("\n");
sb.append(" forceID: ").append(forceID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/AggregateType.java b/src-generated/edu/nps/moves/dis7/AggregateType.java
index 3502314e8f5f4ec18f10d0655c541ce403c10e57..ed7c26dcb6d6720347ddbabc3ea6096bf9e8b637 100644
--- a/src-generated/edu/nps/moves/dis7/AggregateType.java
+++ b/src-generated/edu/nps/moves/dis7/AggregateType.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -151,8 +151,9 @@ public byte getExtra()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -161,10 +162,10 @@ public void marshal(DataOutputStream dos) throws Exception
aggregateKind.marshal(dos);
domain.marshal(dos);
country.marshal(dos);
- dos.writeByte( (byte)category);
+ dos.writeByte(category);
subcategory.marshal(dos);
specificInfo.marshal(dos);
- dos.writeByte( (byte)extra);
+ dos.writeByte(extra);
}
catch(Exception e)
{
@@ -174,9 +175,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -200,7 +202,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -288,7 +290,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" aggregateKind: ").append(aggregateKind).append("\n");
sb.append(" domain: ").append(domain).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/Align.java b/src-generated/edu/nps/moves/dis7/Align.java
index 3c32fc99aaf1cdf4b623e9e9020b1e63cc3d29e2..c02ff5463ce1d3d4a6ccf339b7f89bc4dc84cc11 100644
--- a/src-generated/edu/nps/moves/dis7/Align.java
+++ b/src-generated/edu/nps/moves/dis7/Align.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -111,7 +111,7 @@ public class Align
dis.read();
}
catch(IOException ex) {
- ex.printStackTrace();
+ ex.printStackTrace(System.err);
throw new RuntimeException("IOException ex: "+ex.getLocalizedMessage());
}
}
@@ -122,7 +122,7 @@ public class Align
dos.writeByte(0);
}
catch(IOException ex) {
- ex.printStackTrace();
+ ex.printStackTrace(System.err);
throw new RuntimeException("IOException ex: "+ex.getLocalizedMessage());
}
diff --git a/src-generated/edu/nps/moves/dis7/AngleDeception.java b/src-generated/edu/nps/moves/dis7/AngleDeception.java
index 5abc46508b94f69e21cef46d54a053c6d6f1ab94..0fba4f739e17ce018f17482e40d375ec77c3326c 100644
--- a/src-generated/edu/nps/moves/dis7/AngleDeception.java
+++ b/src-generated/edu/nps/moves/dis7/AngleDeception.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -290,29 +290,30 @@ public int getPadding3()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeInt( (int)recordType);
- dos.writeShort( (short)recordLength);
- dos.writeShort( (short)padding);
- dos.writeByte( (byte)emitterNumber);
- dos.writeByte( (byte)beamNumber);
+ dos.writeInt(recordType);
+ dos.writeShort(recordLength);
+ dos.writeShort(padding);
+ dos.writeByte(emitterNumber);
+ dos.writeByte(beamNumber);
stateIndicator.marshal(dos);
- dos.writeByte( (byte)padding2);
- dos.writeFloat( (float)azimuthOffset);
- dos.writeFloat( (float)azimuthWidth);
- dos.writeFloat( (float)azimuthPullRate);
- dos.writeFloat( (float)azimuthPullAcceleration);
- dos.writeFloat( (float)elevationOffset);
- dos.writeFloat( (float)elevationWidth);
- dos.writeFloat( (float)elevationPullRate);
- dos.writeFloat( (float)elevationPullAcceleration);
- dos.writeInt( (int)padding3);
+ 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)
{
@@ -322,9 +323,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -366,7 +368,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -481,7 +483,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" recordType: ").append(recordType).append("\n");
sb.append(" recordLength: ").append(recordLength).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/AngularVelocityVector.java b/src-generated/edu/nps/moves/dis7/AngularVelocityVector.java
index 98c6981f720cdb07a995d6d729caadb033c84e9b..51b61b7264b1754b327374d9310fb2eebeabc04a 100644
--- a/src-generated/edu/nps/moves/dis7/AngularVelocityVector.java
+++ b/src-generated/edu/nps/moves/dis7/AngularVelocityVector.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -84,16 +84,17 @@ public float getZ()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeFloat( (float)x);
- dos.writeFloat( (float)y);
- dos.writeFloat( (float)z);
+ dos.writeFloat(x);
+ dos.writeFloat(y);
+ dos.writeFloat(z);
}
catch(Exception e)
{
@@ -103,9 +104,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -121,7 +123,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -197,7 +199,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" x: ").append(x).append("\n");
sb.append(" y: ").append(y).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/AntennaLocation.java b/src-generated/edu/nps/moves/dis7/AntennaLocation.java
index ff5f2cccba981b0164b0bde3ace2cc9894080de1..8540a61c2ca8ca0afd26dd7f6e46e4e356a3c220 100644
--- a/src-generated/edu/nps/moves/dis7/AntennaLocation.java
+++ b/src-generated/edu/nps/moves/dis7/AntennaLocation.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -67,8 +67,9 @@ public Vector3Float getRelativeAntennaLocation()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -85,9 +86,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -99,7 +101,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -172,7 +174,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" antennaLocation: ").append(antennaLocation).append("\n");
sb.append(" relativeAntennaLocation: ").append(relativeAntennaLocation).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/Appearance.java b/src-generated/edu/nps/moves/dis7/Appearance.java
index cecf352b0989e8021948d8627f98499e412a3aa3..265a760b93c63b1ef9f5529773928147458916c8 100644
--- a/src-generated/edu/nps/moves/dis7/Appearance.java
+++ b/src-generated/edu/nps/moves/dis7/Appearance.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -97,17 +97,18 @@ public int getAudio()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeInt( (int)visual);
- dos.writeInt( (int)ir);
- dos.writeInt( (int)em);
- dos.writeInt( (int)audio);
+ dos.writeInt(visual);
+ dos.writeInt(ir);
+ dos.writeInt(em);
+ dos.writeInt(audio);
}
catch(Exception e)
{
@@ -117,9 +118,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -137,7 +139,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -216,7 +218,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" visual: ").append(visual).append("\n");
sb.append(" ir: ").append(ir).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/AppearancePdu.java b/src-generated/edu/nps/moves/dis7/AppearancePdu.java
index ac64683edef41b0412cf2bb0205b1c8e3cdcd729..28b1f15d4bf488482fdce860d39220169c431472 100644
--- a/src-generated/edu/nps/moves/dis7/AppearancePdu.java
+++ b/src-generated/edu/nps/moves/dis7/AppearancePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -165,8 +165,9 @@ public Appearance getAppearanceFields()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -174,7 +175,7 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
liveEntityId.marshal(dos);
- dos.writeShort( (short)appearanceFlags);
+ dos.writeShort(appearanceFlags);
forceId.marshal(dos);
entityType.marshal(dos);
alternateEntityType.marshal(dos);
@@ -190,9 +191,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -214,7 +216,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -303,7 +305,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" liveEntityId: ").append(liveEntityId).append("\n");
sb.append(" appearanceFlags: ").append(appearanceFlags).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/ArealObjectStatePdu.java b/src-generated/edu/nps/moves/dis7/ArealObjectStatePdu.java
index 65ffa06c584ce1687d38eebe2fb5f31979d0b3c6..3d00c27148fb1f7e0f2bdad66aec04567cff6f19 100644
--- a/src-generated/edu/nps/moves/dis7/ArealObjectStatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/ArealObjectStatePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -230,8 +230,9 @@ public List<Vector3Double> getObjectLocation()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -240,13 +241,13 @@ public void marshal(DataOutputStream dos) throws Exception
{
objectID.marshal(dos);
referencedObjectID.marshal(dos);
- dos.writeShort( (short)updateNumber);
+ dos.writeShort(updateNumber);
forceID.marshal(dos);
modifications.marshal(dos);
objectType.marshal(dos);
- dos.writeInt( (int)specificObjectAppearance);
- dos.writeShort( (short)generalObjectAppearance);
- dos.writeShort( (short)objectLocation.size());
+ dos.writeInt(specificObjectAppearance);
+ dos.writeShort(generalObjectAppearance);
+ dos.writeShort(objectLocation.size());
requesterID.marshal(dos);
receivingID.marshal(dos);
@@ -265,9 +266,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -302,7 +304,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -332,7 +334,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < objectLocation.size(); idx++)
{
- Vector3Double aVector3Double = (Vector3Double)objectLocation.get(idx);
+ Vector3Double aVector3Double = objectLocation.get(idx);
aVector3Double.marshal(buff);
}
@@ -417,7 +419,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" objectID: ").append(objectID).append("\n");
sb.append(" referencedObjectID: ").append(referencedObjectID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/ArticulatedPartVP.java b/src-generated/edu/nps/moves/dis7/ArticulatedPartVP.java
index 6ffc26f0f2f0c54ecc707fb821888fafefb8fa2e..603a7baaa9e12f07c29e6c317b3344e695f99aad 100644
--- a/src-generated/edu/nps/moves/dis7/ArticulatedPartVP.java
+++ b/src-generated/edu/nps/moves/dis7/ArticulatedPartVP.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -134,19 +134,20 @@ public int getPadding()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
recordType.marshal(dos);
- dos.writeByte( (byte)changeIndicator);
- dos.writeShort( (short)partAttachedTo);
- dos.writeInt( (int)parameterType);
- dos.writeFloat( (float)parameterValue);
- dos.writeInt( (int)padding);
+ dos.writeByte(changeIndicator);
+ dos.writeShort(partAttachedTo);
+ dos.writeInt(parameterType);
+ dos.writeFloat(parameterValue);
+ dos.writeInt(padding);
}
catch(Exception e)
{
@@ -156,9 +157,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -180,7 +182,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -265,7 +267,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" recordType: ").append(recordType).append("\n");
sb.append(" changeIndicator: ").append(changeIndicator).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/ArticulatedPartsPdu.java b/src-generated/edu/nps/moves/dis7/ArticulatedPartsPdu.java
index 00501f920336107f65ae4f31ba019019a726ba6a..0b0c18e13e8abd1135677f4a6a44205c34440f9a 100644
--- a/src-generated/edu/nps/moves/dis7/ArticulatedPartsPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ArticulatedPartsPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -74,8 +74,9 @@ public List<VariableParameter> getVariableParameters()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -83,7 +84,7 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
liveEntityId.marshal(dos);
- dos.writeByte( (byte)variableParameters.size());
+ dos.writeByte(variableParameters.size());
for(int idx = 0; idx < variableParameters.size(); idx++)
{
@@ -100,9 +101,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -124,7 +126,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -145,7 +147,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < variableParameters.size(); idx++)
{
- VariableParameter aVariableParameter = (VariableParameter)variableParameters.get(idx);
+ VariableParameter aVariableParameter = variableParameters.get(idx);
aVariableParameter.marshal(buff);
}
@@ -212,7 +214,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" liveEntityId: ").append(liveEntityId).append("\n");
sb.append(" variableParameters: ").append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/Association.java b/src-generated/edu/nps/moves/dis7/Association.java
index e2d451ac4d780fd6b8144448c9d7cce8cdb13c23..f28489394d6bfe9171d088d81a234bf1b3a9a611 100644
--- a/src-generated/edu/nps/moves/dis7/Association.java
+++ b/src-generated/edu/nps/moves/dis7/Association.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -100,15 +100,16 @@ public Vector3Double getAssociatedLocation()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
associationType.marshal(dos);
- dos.writeByte( (byte)padding);
+ dos.writeByte(padding);
associatedEntityID.marshal(dos);
associatedLocation.marshal(dos);
}
@@ -120,9 +121,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -138,7 +140,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -217,7 +219,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" associationType: ").append(associationType).append("\n");
sb.append(" padding: ").append(padding).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/AttachedPartVP.java b/src-generated/edu/nps/moves/dis7/AttachedPartVP.java
index 2e1b08fd0ba2020841b9d726e0f00ff1d975ec3c..cb3813869b56054d03bc16c055e4637eae374b4b 100644
--- a/src-generated/edu/nps/moves/dis7/AttachedPartVP.java
+++ b/src-generated/edu/nps/moves/dis7/AttachedPartVP.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -118,8 +118,9 @@ public EntityType getAttachedPartType()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -127,7 +128,7 @@ public void marshal(DataOutputStream dos) throws Exception
{
recordType.marshal(dos);
detachedIndicator.marshal(dos);
- dos.writeShort( (short)partAttachedTo);
+ dos.writeShort(partAttachedTo);
parameterType.marshal(dos);
attachedPartType.marshal(dos);
}
@@ -139,9 +140,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -160,7 +162,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -242,7 +244,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" recordType: ").append(recordType).append("\n");
sb.append(" detachedIndicator: ").append(detachedIndicator).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/Attribute.java b/src-generated/edu/nps/moves/dis7/Attribute.java
index 2fc05fcc2b31bc625d88244d10a23751b5b034bb..e3644dc7081a9056183cf82455cef371e2d00246 100644
--- a/src-generated/edu/nps/moves/dis7/Attribute.java
+++ b/src-generated/edu/nps/moves/dis7/Attribute.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -71,15 +71,16 @@ public byte[] getRecordSpecificFields()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeInt( (int)recordType);
- dos.writeShort( (short)recordSpecificFields.length);
+ dos.writeInt(recordType);
+ dos.writeShort(recordSpecificFields.length);
for(int idx = 0; idx < recordSpecificFields.length; idx++)
dos.writeByte(recordSpecificFields[idx]);
@@ -94,9 +95,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -115,7 +117,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -201,7 +203,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" recordType: ").append(recordType).append("\n");
sb.append(" recordSpecificFields: ").append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/AttributePdu.java b/src-generated/edu/nps/moves/dis7/AttributePdu.java
index dbe9e75ee04b0a1dc65345de48970d91589c172d..9c0a25d20631f8f10bb23d0538aa636b4427e1ea 100644
--- a/src-generated/edu/nps/moves/dis7/AttributePdu.java
+++ b/src-generated/edu/nps/moves/dis7/AttributePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -195,8 +195,9 @@ public List<AttributeRecordSet> getAttributeRecordSets()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -204,14 +205,14 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
originatingSimulationAddress.marshal(dos);
- dos.writeInt( (int)padding1);
- dos.writeShort( (short)padding2);
+ dos.writeInt(padding1);
+ dos.writeShort(padding2);
attributeRecordPduType.marshal(dos);
attributeRecordProtocolVersion.marshal(dos);
masterAttributeRecordType.marshal(dos);
actionCode.marshal(dos);
- dos.writeByte( (byte)padding3);
- dos.writeShort( (short)attributeRecordSets.size());
+ dos.writeByte(padding3);
+ dos.writeShort(attributeRecordSets.size());
for(int idx = 0; idx < attributeRecordSets.size(); idx++)
{
@@ -228,9 +229,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -266,7 +268,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -294,7 +296,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < attributeRecordSets.size(); idx++)
{
- AttributeRecordSet aAttributeRecordSet = (AttributeRecordSet)attributeRecordSets.get(idx);
+ AttributeRecordSet aAttributeRecordSet = attributeRecordSets.get(idx);
aAttributeRecordSet.marshal(buff);
}
@@ -375,7 +377,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" originatingSimulationAddress: ").append(originatingSimulationAddress).append("\n");
sb.append(" padding1: ").append(padding1).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/AttributeRecordSet.java b/src-generated/edu/nps/moves/dis7/AttributeRecordSet.java
index 2a7ba31319be56c40c52260138b108a64c2196c5..739df9a313122c72d0f45ac3d19c8c36c9ed595a 100644
--- a/src-generated/edu/nps/moves/dis7/AttributeRecordSet.java
+++ b/src-generated/edu/nps/moves/dis7/AttributeRecordSet.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -71,15 +71,16 @@ public List<Attribute> getAttributeRecords()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
entityId.marshal(dos);
- dos.writeShort( (short)attributeRecords.size());
+ dos.writeShort(attributeRecords.size());
for(int idx = 0; idx < attributeRecords.size(); idx++)
{
@@ -96,9 +97,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -118,7 +120,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -138,7 +140,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < attributeRecords.size(); idx++)
{
- Attribute aAttribute = (Attribute)attributeRecords.get(idx);
+ Attribute aAttribute = attributeRecords.get(idx);
aAttribute.marshal(buff);
}
@@ -208,7 +210,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" entityId: ").append(entityId).append("\n");
sb.append(" attributeRecords: ").append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/BeamAntennaPattern.java b/src-generated/edu/nps/moves/dis7/BeamAntennaPattern.java
index 537e33671b07fe89bd2a02d2d1aa67820e7ef894..3690f14a82e42a4256a790faa1824d15f93e9314 100644
--- a/src-generated/edu/nps/moves/dis7/BeamAntennaPattern.java
+++ b/src-generated/edu/nps/moves/dis7/BeamAntennaPattern.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -199,23 +199,24 @@ public int getPadding3()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
beamDirection.marshal(dos);
- dos.writeFloat( (float)azimuthBeamwidth);
- dos.writeFloat( (float)elevationBeamwidth);
+ dos.writeFloat(azimuthBeamwidth);
+ dos.writeFloat(elevationBeamwidth);
referenceSystem.marshal(dos);
- dos.writeByte( (byte)padding1);
- dos.writeShort( (short)padding2);
- dos.writeFloat( (float)ez);
- dos.writeFloat( (float)ex);
- dos.writeFloat( (float)phase);
- dos.writeInt( (int)padding3);
+ dos.writeByte(padding1);
+ dos.writeShort(padding2);
+ dos.writeFloat(ez);
+ dos.writeFloat(ex);
+ dos.writeFloat(phase);
+ dos.writeInt(padding3);
}
catch(Exception e)
{
@@ -225,9 +226,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -256,7 +258,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -353,7 +355,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" beamDirection: ").append(beamDirection).append("\n");
sb.append(" azimuthBeamwidth: ").append(azimuthBeamwidth).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/BeamData.java b/src-generated/edu/nps/moves/dis7/BeamData.java
index 1d4237a8609ee0ee7d250935f171943547808969..7bbc6cc9facc6e5af00a2e4aef43d9dc0b53ac89 100644
--- a/src-generated/edu/nps/moves/dis7/BeamData.java
+++ b/src-generated/edu/nps/moves/dis7/BeamData.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -118,18 +118,19 @@ public float getBeamSweepSync()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeFloat( (float)beamAzimuthCenter);
- dos.writeFloat( (float)beamAzimuthSweep);
- dos.writeFloat( (float)beamElevationCenter);
- dos.writeFloat( (float)beamElevationSweep);
- dos.writeFloat( (float)beamSweepSync);
+ dos.writeFloat(beamAzimuthCenter);
+ dos.writeFloat(beamAzimuthSweep);
+ dos.writeFloat(beamElevationCenter);
+ dos.writeFloat(beamElevationSweep);
+ dos.writeFloat(beamSweepSync);
}
catch(Exception e)
{
@@ -139,9 +140,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -161,7 +163,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -243,7 +245,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" beamAzimuthCenter: ").append(beamAzimuthCenter).append("\n");
sb.append(" beamAzimuthSweep: ").append(beamAzimuthSweep).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/BeamStatus.java b/src-generated/edu/nps/moves/dis7/BeamStatus.java
index c3ee452e8569a00468264d7ebd803788a99c1159..486b290a1f4e39dbbd9dbfc1a6639c6d9d7aab52 100644
--- a/src-generated/edu/nps/moves/dis7/BeamStatus.java
+++ b/src-generated/edu/nps/moves/dis7/BeamStatus.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -50,8 +50,9 @@ public BeamStatusBeamState getBeamState()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -67,9 +68,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -81,7 +83,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -151,7 +153,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" beamState: ").append(beamState).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/BlankingSector.java b/src-generated/edu/nps/moves/dis7/BlankingSector.java
index d82ef80307dca8beef7c5a41ec3b55b205190a2b..fdd1a6c30f6fa0d7ba61bc82c68c32a1e0064466 100644
--- a/src-generated/edu/nps/moves/dis7/BlankingSector.java
+++ b/src-generated/edu/nps/moves/dis7/BlankingSector.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -242,26 +242,27 @@ public long getPadding3()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeInt( (int)recordType);
- dos.writeShort( (short)recordLength);
- dos.writeShort( (short)padding);
- dos.writeByte( (byte)emitterNumber);
- dos.writeByte( (byte)beamNumber);
+ dos.writeInt(recordType);
+ dos.writeShort(recordLength);
+ dos.writeShort(padding);
+ dos.writeByte(emitterNumber);
+ dos.writeByte(beamNumber);
stateIndicator.marshal(dos);
- dos.writeByte( (byte)padding2);
- dos.writeFloat( (float)leftAzimuth);
- dos.writeFloat( (float)rightAzimuth);
- dos.writeFloat( (float)lowerElevation);
- dos.writeFloat( (float)upperElevation);
- dos.writeFloat( (float)residualPower);
- dos.writeLong( (long)padding3);
+ dos.writeByte(padding2);
+ dos.writeFloat(leftAzimuth);
+ dos.writeFloat(rightAzimuth);
+ dos.writeFloat(lowerElevation);
+ dos.writeFloat(upperElevation);
+ dos.writeFloat(residualPower);
+ dos.writeLong(padding3);
}
catch(Exception e)
{
@@ -271,9 +272,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -309,7 +311,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -415,7 +417,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" recordType: ").append(recordType).append("\n");
sb.append(" recordLength: ").append(recordLength).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/Category.java b/src-generated/edu/nps/moves/dis7/Category.java
index 977070f93773b4533db418b17a96470b05a6a9e8..d211d9d21bf88f9ad037a1b14d3d7594ab382a3e 100644
--- a/src-generated/edu/nps/moves/dis7/Category.java
+++ b/src-generated/edu/nps/moves/dis7/Category.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -11,6 +11,15 @@ package edu.nps.moves.dis7;
*/
public interface Category
{
+ /**
+ *
+ * @return the value of this SubCategory
+ */
int getValue();
+
+ /**
+ *
+ * @return the description of this SubCategory
+ */
String getDescription();
}
diff --git a/src-generated/edu/nps/moves/dis7/ChangeOptions.java b/src-generated/edu/nps/moves/dis7/ChangeOptions.java
index 121a055d0028cbfd82d8fb4ae294ca8629ad1cd5..60524fe4377a416d2ab83d478af2f39083affe2b 100644
--- a/src-generated/edu/nps/moves/dis7/ChangeOptions.java
+++ b/src-generated/edu/nps/moves/dis7/ChangeOptions.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -49,14 +49,15 @@ public byte getValue()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeByte( (byte)value);
+ dos.writeByte(value);
}
catch(Exception e)
{
@@ -66,9 +67,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -80,7 +82,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -150,7 +152,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" value: ").append(value).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/ClockTime.java b/src-generated/edu/nps/moves/dis7/ClockTime.java
index 338fcbaa881be6884e342c29f4d344e3cba8d0b5..380dc66e9a8fa790325db6076a5b8d9f34de6226 100644
--- a/src-generated/edu/nps/moves/dis7/ClockTime.java
+++ b/src-generated/edu/nps/moves/dis7/ClockTime.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -67,15 +67,16 @@ public int getTimePastHour()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeInt( (int)hour);
- dos.writeInt( (int)timePastHour);
+ dos.writeInt(hour);
+ dos.writeInt(timePastHour);
}
catch(Exception e)
{
@@ -85,9 +86,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -101,7 +103,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -174,7 +176,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" hour: ").append(hour).append("\n");
sb.append(" timePastHour: ").append(timePastHour).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/CollisionElasticPdu.java b/src-generated/edu/nps/moves/dis7/CollisionElasticPdu.java
index cf7651244a04eab5a9fa33adf8a2a7adb556ae36..f127d06c86f67354aaf31a69597300dbe4a87883 100644
--- a/src-generated/edu/nps/moves/dis7/CollisionElasticPdu.java
+++ b/src-generated/edu/nps/moves/dis7/CollisionElasticPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -290,8 +290,9 @@ public float getCoefficientOfRestitution()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -301,18 +302,18 @@ public void marshal(DataOutputStream dos) throws Exception
issuingEntityID.marshal(dos);
collidingEntityID.marshal(dos);
collisionEventID.marshal(dos);
- dos.writeShort( (short)pad);
+ dos.writeShort(pad);
contactVelocity.marshal(dos);
- dos.writeFloat( (float)mass);
+ dos.writeFloat(mass);
locationOfImpact.marshal(dos);
- dos.writeFloat( (float)collisionIntermediateResultXX);
- dos.writeFloat( (float)collisionIntermediateResultXY);
- dos.writeFloat( (float)collisionIntermediateResultXZ);
- dos.writeFloat( (float)collisionIntermediateResultYY);
- dos.writeFloat( (float)collisionIntermediateResultYZ);
- dos.writeFloat( (float)collisionIntermediateResultZZ);
+ dos.writeFloat(collisionIntermediateResultXX);
+ dos.writeFloat(collisionIntermediateResultXY);
+ dos.writeFloat(collisionIntermediateResultXZ);
+ dos.writeFloat(collisionIntermediateResultYY);
+ dos.writeFloat(collisionIntermediateResultYZ);
+ dos.writeFloat(collisionIntermediateResultZZ);
unitSurfaceNormal.marshal(dos);
- dos.writeFloat( (float)coefficientOfRestitution);
+ dos.writeFloat(coefficientOfRestitution);
}
catch(Exception e)
{
@@ -322,9 +323,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -360,7 +362,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -470,7 +472,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" issuingEntityID: ").append(issuingEntityID).append("\n");
sb.append(" collidingEntityID: ").append(collidingEntityID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/CollisionPdu.java b/src-generated/edu/nps/moves/dis7/CollisionPdu.java
index cab7054dd33afa6efd4345719e91864241b87e6a..d9602c9b70fbd6f1fb9415a142232365a803913b 100644
--- a/src-generated/edu/nps/moves/dis7/CollisionPdu.java
+++ b/src-generated/edu/nps/moves/dis7/CollisionPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -171,8 +171,9 @@ public Vector3Float getLocation()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -183,9 +184,9 @@ public void marshal(DataOutputStream dos) throws Exception
collidingEntityID.marshal(dos);
eventID.marshal(dos);
collisionType.marshal(dos);
- dos.writeByte( (byte)pad);
+ dos.writeByte(pad);
velocity.marshal(dos);
- dos.writeFloat( (float)mass);
+ dos.writeFloat(mass);
location.marshal(dos);
}
catch(Exception e)
@@ -196,9 +197,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -221,7 +223,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -310,7 +312,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" issuingEntityID: ").append(issuingEntityID).append("\n");
sb.append(" collidingEntityID: ").append(collidingEntityID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/CommentPdu.java b/src-generated/edu/nps/moves/dis7/CommentPdu.java
index 764db87399c47c55fbf8817331c024dcc7b199d3..64ba26f55e1395363cb25c661abb15af98763d75 100644
--- a/src-generated/edu/nps/moves/dis7/CommentPdu.java
+++ b/src-generated/edu/nps/moves/dis7/CommentPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -64,16 +64,17 @@ public List<VariableDatum> getVariableDatums()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
super.marshal(dos);
try
{
- dos.writeInt( (int)numberOfFixedDatumRecords);
- dos.writeInt( (int)variableDatums.size());
+ dos.writeInt(numberOfFixedDatumRecords);
+ dos.writeInt(variableDatums.size());
for(int idx = 0; idx < variableDatums.size(); idx++)
{
@@ -90,9 +91,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -115,7 +117,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -136,7 +138,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < variableDatums.size(); idx++)
{
- VariableDatum aVariableDatum = (VariableDatum)variableDatums.get(idx);
+ VariableDatum aVariableDatum = variableDatums.get(idx);
aVariableDatum.marshal(buff);
}
@@ -202,7 +204,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" variableDatums: ").append("\n");
variableDatums.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
diff --git a/src-generated/edu/nps/moves/dis7/CommentRPdu.java b/src-generated/edu/nps/moves/dis7/CommentRPdu.java
index d087637e7de9e7befd9cc39ce59ea23346192a1b..8c15cb3dc6985ce451485a29a7e5fd27f6bd6942 100644
--- a/src-generated/edu/nps/moves/dis7/CommentRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/CommentRPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -64,16 +64,17 @@ public List<VariableDatum> getVariableDatumRecords()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
super.marshal(dos);
try
{
- dos.writeInt( (int)numberOfFixedDatumRecords);
- dos.writeInt( (int)variableDatumRecords.size());
+ dos.writeInt(numberOfFixedDatumRecords);
+ dos.writeInt(variableDatumRecords.size());
for(int idx = 0; idx < variableDatumRecords.size(); idx++)
{
@@ -90,9 +91,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -115,7 +117,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -136,7 +138,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < variableDatumRecords.size(); idx++)
{
- VariableDatum aVariableDatum = (VariableDatum)variableDatumRecords.get(idx);
+ VariableDatum aVariableDatum = variableDatumRecords.get(idx);
aVariableDatum.marshal(buff);
}
@@ -202,7 +204,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" variableDatumRecords: ").append("\n");
variableDatumRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
diff --git a/src-generated/edu/nps/moves/dis7/CommentReliablePdu.java b/src-generated/edu/nps/moves/dis7/CommentReliablePdu.java
index e114bad6fe2a2b389f834da6ef9ad2c9c66060f9..2436de28157a57044b8559cff02c58aa5569f33c 100644
--- a/src-generated/edu/nps/moves/dis7/CommentReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/CommentReliablePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
diff --git a/src-generated/edu/nps/moves/dis7/CommunicationsNodeID.java b/src-generated/edu/nps/moves/dis7/CommunicationsNodeID.java
index 89eb47b90719c31e5b344d919cbf100863ee98ee..d4b48880d9a986b74ade2737980e1551485f0721 100644
--- a/src-generated/edu/nps/moves/dis7/CommunicationsNodeID.java
+++ b/src-generated/edu/nps/moves/dis7/CommunicationsNodeID.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -65,15 +65,16 @@ public short getElementID()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
entityID.marshal(dos);
- dos.writeShort( (short)elementID);
+ dos.writeShort(elementID);
}
catch(Exception e)
{
@@ -83,9 +84,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -98,7 +100,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -171,7 +173,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" entityID: ").append(entityID).append("\n");
sb.append(" elementID: ").append(elementID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/CreateEntityPdu.java b/src-generated/edu/nps/moves/dis7/CreateEntityPdu.java
index 9d4de4bb1f749a08d879c4d501b4ab9ddac33f7d..38d6b5d3e1679df19d046779e37cda79835ebb89 100644
--- a/src-generated/edu/nps/moves/dis7/CreateEntityPdu.java
+++ b/src-generated/edu/nps/moves/dis7/CreateEntityPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -52,15 +52,16 @@ public int getRequestID()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
super.marshal(dos);
try
{
- dos.writeInt( (int)requestID);
+ dos.writeInt(requestID);
}
catch(Exception e)
{
@@ -70,9 +71,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -86,7 +88,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -154,7 +156,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" requestID: ").append(requestID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/CreateEntityRPdu.java b/src-generated/edu/nps/moves/dis7/CreateEntityRPdu.java
index 91a3d0c74ae91b1e27b935215276b449e2429819..024387ea6a7802ba0e2b3263a15d8f8722f601bc 100644
--- a/src-generated/edu/nps/moves/dis7/CreateEntityRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/CreateEntityRPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -101,8 +101,9 @@ public int getRequestID()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -110,9 +111,9 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
requiredReliabilityService.marshal(dos);
- dos.writeByte( (byte)pad1);
- dos.writeShort( (short)pad2);
- dos.writeInt( (int)requestID);
+ dos.writeByte(pad1);
+ dos.writeShort(pad2);
+ dos.writeInt(requestID);
}
catch(Exception e)
{
@@ -122,9 +123,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -144,7 +146,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -221,7 +223,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
sb.append(" pad1: ").append(pad1).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/CreateEntityReliablePdu.java b/src-generated/edu/nps/moves/dis7/CreateEntityReliablePdu.java
index b7fc6385be83d066fed15ba449c3f3a3a524b60f..4d7d7464e1239f3ffcfa4b45a888faef6b0340ba 100644
--- a/src-generated/edu/nps/moves/dis7/CreateEntityReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/CreateEntityReliablePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
diff --git a/src-generated/edu/nps/moves/dis7/DataFilterRecord.java b/src-generated/edu/nps/moves/dis7/DataFilterRecord.java
index 36a8eea574e1bba58b518249d8e396d2f0bfd47d..ad92d3a147907f01f47888164015ace3ca5e6ccf 100644
--- a/src-generated/edu/nps/moves/dis7/DataFilterRecord.java
+++ b/src-generated/edu/nps/moves/dis7/DataFilterRecord.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -61,14 +61,15 @@ public int getBitFlags()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeInt( (int)bitFlags);
+ dos.writeInt(bitFlags);
}
catch(Exception e)
{
@@ -78,9 +79,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -92,7 +94,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -162,7 +164,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ 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");
diff --git a/src-generated/edu/nps/moves/dis7/DataPdu.java b/src-generated/edu/nps/moves/dis7/DataPdu.java
index 4d39c94d252d41da58412522a06d549a712cb6f8..ae6fb84b1c17286984b4d2cc1dc60b8fe3322b04 100644
--- a/src-generated/edu/nps/moves/dis7/DataPdu.java
+++ b/src-generated/edu/nps/moves/dis7/DataPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -119,18 +119,19 @@ public List<VariableDatum> getVariableDatums()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
super.marshal(dos);
try
{
- dos.writeInt( (int)requestID);
- dos.writeInt( (int)padding1);
- dos.writeInt( (int)fixedDatums.size());
- dos.writeInt( (int)variableDatums.size());
+ dos.writeInt(requestID);
+ dos.writeInt(padding1);
+ dos.writeInt(fixedDatums.size());
+ dos.writeInt(variableDatums.size());
for(int idx = 0; idx < fixedDatums.size(); idx++)
{
@@ -154,9 +155,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -190,7 +192,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -213,14 +215,14 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < fixedDatums.size(); idx++)
{
- FixedDatum aFixedDatum = (FixedDatum)fixedDatums.get(idx);
+ FixedDatum aFixedDatum = fixedDatums.get(idx);
aFixedDatum.marshal(buff);
}
for(int idx = 0; idx < variableDatums.size(); idx++)
{
- VariableDatum aVariableDatum = (VariableDatum)variableDatums.get(idx);
+ VariableDatum aVariableDatum = variableDatums.get(idx);
aVariableDatum.marshal(buff);
}
@@ -301,7 +303,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" requestID: ").append(requestID).append("\n");
sb.append(" padding1: ").append(padding1).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/DataQueryDatumSpecification.java b/src-generated/edu/nps/moves/dis7/DataQueryDatumSpecification.java
index f47b5125cbf5a384ef1934867569ce52185ae949..c6b62e1ba086f1cbef47d0072209e08189a5a636 100644
--- a/src-generated/edu/nps/moves/dis7/DataQueryDatumSpecification.java
+++ b/src-generated/edu/nps/moves/dis7/DataQueryDatumSpecification.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -83,15 +83,16 @@ public List<UnsignedDISInteger> getVariableDatumIDList()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeInt( (int)fixedDatumIDList.size());
- dos.writeInt( (int)variableDatumIDList.size());
+ dos.writeInt(fixedDatumIDList.size());
+ dos.writeInt(variableDatumIDList.size());
for(int idx = 0; idx < fixedDatumIDList.size(); idx++)
{
@@ -115,9 +116,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -145,7 +147,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -165,14 +167,14 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < fixedDatumIDList.size(); idx++)
{
- UnsignedDISInteger aUnsignedDISInteger = (UnsignedDISInteger)fixedDatumIDList.get(idx);
+ UnsignedDISInteger aUnsignedDISInteger = fixedDatumIDList.get(idx);
aUnsignedDISInteger.marshal(buff);
}
for(int idx = 0; idx < variableDatumIDList.size(); idx++)
{
- UnsignedDISInteger aUnsignedDISInteger = (UnsignedDISInteger)variableDatumIDList.get(idx);
+ UnsignedDISInteger aUnsignedDISInteger = variableDatumIDList.get(idx);
aUnsignedDISInteger.marshal(buff);
}
@@ -252,7 +254,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" fixedDatumIDList: ").append("\n");
fixedDatumIDList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
diff --git a/src-generated/edu/nps/moves/dis7/DataQueryPdu.java b/src-generated/edu/nps/moves/dis7/DataQueryPdu.java
index 00e17a9f7a5f60a8b3fe1a223b2f33307358c08d..ebf2ddc955aa9767d317ab3e26de30684b336dc0 100644
--- a/src-generated/edu/nps/moves/dis7/DataQueryPdu.java
+++ b/src-generated/edu/nps/moves/dis7/DataQueryPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -119,18 +119,19 @@ public List<VariableDatum> getVariableDatums()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
super.marshal(dos);
try
{
- dos.writeInt( (int)requestID);
- dos.writeInt( (int)timeInterval);
- dos.writeInt( (int)fixedDatums.size());
- dos.writeInt( (int)variableDatums.size());
+ dos.writeInt(requestID);
+ dos.writeInt(timeInterval);
+ dos.writeInt(fixedDatums.size());
+ dos.writeInt(variableDatums.size());
for(int idx = 0; idx < fixedDatums.size(); idx++)
{
@@ -154,9 +155,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -190,7 +192,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -213,14 +215,14 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < fixedDatums.size(); idx++)
{
- FixedDatum aFixedDatum = (FixedDatum)fixedDatums.get(idx);
+ FixedDatum aFixedDatum = fixedDatums.get(idx);
aFixedDatum.marshal(buff);
}
for(int idx = 0; idx < variableDatums.size(); idx++)
{
- VariableDatum aVariableDatum = (VariableDatum)variableDatums.get(idx);
+ VariableDatum aVariableDatum = variableDatums.get(idx);
aVariableDatum.marshal(buff);
}
@@ -301,7 +303,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" requestID: ").append(requestID).append("\n");
sb.append(" timeInterval: ").append(timeInterval).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/DataQueryRPdu.java b/src-generated/edu/nps/moves/dis7/DataQueryRPdu.java
index 4364dc21637a15b0e2aa0fe7e93fbdd7ba5f92f2..36e74d807291eecb26276b5e0fd8585b6ecd42a2 100644
--- a/src-generated/edu/nps/moves/dis7/DataQueryRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/DataQueryRPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -170,8 +170,9 @@ public List<VariableDatum> getVariableDatumRecords()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -179,12 +180,12 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
requiredReliabilityService.marshal(dos);
- dos.writeByte( (byte)pad1);
- dos.writeShort( (short)pad2);
- dos.writeInt( (int)requestID);
- dos.writeInt( (int)timeInterval);
- dos.writeInt( (int)fixedDatumRecords.size());
- dos.writeInt( (int)variableDatumRecords.size());
+ 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++)
{
@@ -208,9 +209,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -250,7 +252,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -276,14 +278,14 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
{
- FixedDatum aFixedDatum = (FixedDatum)fixedDatumRecords.get(idx);
+ FixedDatum aFixedDatum = fixedDatumRecords.get(idx);
aFixedDatum.marshal(buff);
}
for(int idx = 0; idx < variableDatumRecords.size(); idx++)
{
- VariableDatum aVariableDatum = (VariableDatum)variableDatumRecords.get(idx);
+ VariableDatum aVariableDatum = variableDatumRecords.get(idx);
aVariableDatum.marshal(buff);
}
@@ -370,7 +372,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
sb.append(" pad1: ").append(pad1).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/DataQueryReliablePdu.java b/src-generated/edu/nps/moves/dis7/DataQueryReliablePdu.java
index e32011a9fe49e9e5158699d301c847a5299b1cd4..77cf1d749b93215bc43646758db6abbcb52ee908 100644
--- a/src-generated/edu/nps/moves/dis7/DataQueryReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/DataQueryReliablePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
diff --git a/src-generated/edu/nps/moves/dis7/DataRPdu.java b/src-generated/edu/nps/moves/dis7/DataRPdu.java
index 2dffba64831d34dd7bf24ae65d2fadf890e8e91b..b818ccc6c97cde9ed39334ac4f13b34c41ff86dd 100644
--- a/src-generated/edu/nps/moves/dis7/DataRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/DataRPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -153,20 +153,21 @@ public List<VariableDatum> getVariableDatumRecords()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
super.marshal(dos);
try
{
- dos.writeInt( (int)requestID);
+ dos.writeInt(requestID);
requiredReliabilityService.marshal(dos);
- dos.writeByte( (byte)pad1);
- dos.writeShort( (short)pad2);
- dos.writeInt( (int)fixedDatumRecords.size());
- dos.writeInt( (int)variableDatumRecords.size());
+ dos.writeByte(pad1);
+ dos.writeShort(pad2);
+ dos.writeInt(fixedDatumRecords.size());
+ dos.writeInt(variableDatumRecords.size());
for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
{
@@ -190,9 +191,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -230,7 +232,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -255,14 +257,14 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
{
- FixedDatum aFixedDatum = (FixedDatum)fixedDatumRecords.get(idx);
+ FixedDatum aFixedDatum = fixedDatumRecords.get(idx);
aFixedDatum.marshal(buff);
}
for(int idx = 0; idx < variableDatumRecords.size(); idx++)
{
- VariableDatum aVariableDatum = (VariableDatum)variableDatumRecords.get(idx);
+ VariableDatum aVariableDatum = variableDatumRecords.get(idx);
aVariableDatum.marshal(buff);
}
@@ -347,7 +349,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" requestID: ").append(requestID).append("\n");
sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/DataReliablePdu.java b/src-generated/edu/nps/moves/dis7/DataReliablePdu.java
index 2e308768cda713f1870449fca4aad6cc613222a7..4d1fb78548b26094347eaf43f4c8007be183f848 100644
--- a/src-generated/edu/nps/moves/dis7/DataReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/DataReliablePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
diff --git a/src-generated/edu/nps/moves/dis7/DatumSpecification.java b/src-generated/edu/nps/moves/dis7/DatumSpecification.java
index d35b8f2972549dd912c96d65a983e84ba114f3ee..7cbee05506835cb54792945d6e8e611591972e62 100644
--- a/src-generated/edu/nps/moves/dis7/DatumSpecification.java
+++ b/src-generated/edu/nps/moves/dis7/DatumSpecification.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -83,15 +83,16 @@ public List<VariableDatum> getVariableDatumIDList()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeInt( (int)fixedDatumIDList.size());
- dos.writeInt( (int)variableDatumIDList.size());
+ dos.writeInt(fixedDatumIDList.size());
+ dos.writeInt(variableDatumIDList.size());
for(int idx = 0; idx < fixedDatumIDList.size(); idx++)
{
@@ -115,9 +116,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -145,7 +147,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -165,14 +167,14 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < fixedDatumIDList.size(); idx++)
{
- FixedDatum aFixedDatum = (FixedDatum)fixedDatumIDList.get(idx);
+ FixedDatum aFixedDatum = fixedDatumIDList.get(idx);
aFixedDatum.marshal(buff);
}
for(int idx = 0; idx < variableDatumIDList.size(); idx++)
{
- VariableDatum aVariableDatum = (VariableDatum)variableDatumIDList.get(idx);
+ VariableDatum aVariableDatum = variableDatumIDList.get(idx);
aVariableDatum.marshal(buff);
}
@@ -252,7 +254,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" fixedDatumIDList: ").append("\n");
fixedDatumIDList.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
diff --git a/src-generated/edu/nps/moves/dis7/DeadReckoningParameters.java b/src-generated/edu/nps/moves/dis7/DeadReckoningParameters.java
index b488bdae78769c63bc5d4e07b03729d9b1a7fa1d..8fbb894a65e21ee3659f8509b0fb48cd43ece2ab 100644
--- a/src-generated/edu/nps/moves/dis7/DeadReckoningParameters.java
+++ b/src-generated/edu/nps/moves/dis7/DeadReckoningParameters.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -101,8 +101,9 @@ public Vector3Float getEntityAngularVelocity()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -124,9 +125,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -143,7 +145,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -231,7 +233,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" deadReckoningAlgorithm: ").append(deadReckoningAlgorithm).append("\n");
sb.append(" parameters: ").append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/DesignatorPdu.java b/src-generated/edu/nps/moves/dis7/DesignatorPdu.java
index e56764c02208e8a098d96eb780c08720e0e96907..0a3d95c447ec43614a49a498519d9b8df8f45785 100644
--- a/src-generated/edu/nps/moves/dis7/DesignatorPdu.java
+++ b/src-generated/edu/nps/moves/dis7/DesignatorPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -239,8 +239,9 @@ public Vector3Float getEntityLinearAcceleration()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -251,13 +252,13 @@ public void marshal(DataOutputStream dos) throws Exception
codeName.marshal(dos);
designatedEntityID.marshal(dos);
designatorCode.marshal(dos);
- dos.writeFloat( (float)designatorPower);
- dos.writeFloat( (float)designatorWavelength);
+ dos.writeFloat(designatorPower);
+ dos.writeFloat(designatorWavelength);
designatorSpotWrtDesignated.marshal(dos);
designatorSpotLocation.marshal(dos);
deadReckoningAlgorithm.marshal(dos);
- dos.writeByte( (byte)padding1);
- dos.writeShort( (short)padding2);
+ dos.writeByte(padding1);
+ dos.writeShort(padding2);
entityLinearAcceleration.marshal(dos);
}
catch(Exception e)
@@ -268,9 +269,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -301,7 +303,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -402,7 +404,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" designatingEntityID: ").append(designatingEntityID).append("\n");
sb.append(" codeName: ").append(codeName).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/DetonationPdu.java b/src-generated/edu/nps/moves/dis7/DetonationPdu.java
index 13d711f579a93d151747436a58d78c69c94f00df..1b258491aa557e699641df15b54c2ba8a8e9e035 100644
--- a/src-generated/edu/nps/moves/dis7/DetonationPdu.java
+++ b/src-generated/edu/nps/moves/dis7/DetonationPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -230,8 +230,9 @@ public List<VariableParameter> getVariableParameters()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -247,8 +248,8 @@ public void marshal(DataOutputStream dos) throws Exception
descriptor.marshal(dos);
locationOfEntityCoordinates.marshal(dos);
detonationResult.marshal(dos);
- dos.writeByte( (byte)variableParameters.size());
- dos.writeShort( (short)pad);
+ dos.writeByte(variableParameters.size());
+ dos.writeShort(pad);
for(int idx = 0; idx < variableParameters.size(); idx++)
{
@@ -265,9 +266,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -300,7 +302,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -330,7 +332,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < variableParameters.size(); idx++)
{
- VariableParameter aVariableParameter = (VariableParameter)variableParameters.get(idx);
+ VariableParameter aVariableParameter = variableParameters.get(idx);
aVariableParameter.marshal(buff);
}
@@ -415,7 +417,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" sourceEntityID: ").append(sourceEntityID).append("\n");
sb.append(" targetEntityID: ").append(targetEntityID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/DirectedEnergyAreaAimpoint.java b/src-generated/edu/nps/moves/dis7/DirectedEnergyAreaAimpoint.java
index 997c2d222f18f62f90f06fa1bbd8bf0ebb92ba0c..a1da16bc7c2003ba2eedeac2293ac1eb82947354 100644
--- a/src-generated/edu/nps/moves/dis7/DirectedEnergyAreaAimpoint.java
+++ b/src-generated/edu/nps/moves/dis7/DirectedEnergyAreaAimpoint.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -137,18 +137,19 @@ public List<DirectedEnergyTargetEnergyDeposition> getDirectedEnergyTargetEnergyD
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeInt( (int)recordType);
- dos.writeShort( (short)recordLength);
- dos.writeShort( (short)padding);
- dos.writeShort( (short)beamAntennaParameterList.size());
- dos.writeShort( (short)directedEnergyTargetEnergyDepositionRecordList.size());
+ 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++)
{
@@ -173,9 +174,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -211,7 +213,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -234,14 +236,14 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < beamAntennaParameterList.size(); idx++)
{
- BeamAntennaPattern aBeamAntennaPattern = (BeamAntennaPattern)beamAntennaParameterList.get(idx);
+ BeamAntennaPattern aBeamAntennaPattern = beamAntennaParameterList.get(idx);
aBeamAntennaPattern.marshal(buff);
}
for(int idx = 0; idx < directedEnergyTargetEnergyDepositionRecordList.size(); idx++)
{
- DirectedEnergyTargetEnergyDeposition aDirectedEnergyTargetEnergyDeposition = (DirectedEnergyTargetEnergyDeposition)directedEnergyTargetEnergyDepositionRecordList.get(idx);
+ DirectedEnergyTargetEnergyDeposition aDirectedEnergyTargetEnergyDeposition = directedEnergyTargetEnergyDepositionRecordList.get(idx);
aDirectedEnergyTargetEnergyDeposition.marshal(buff);
}
@@ -329,7 +331,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" recordType: ").append(recordType).append("\n");
sb.append(" recordLength: ").append(recordLength).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/DirectedEnergyDamage.java b/src-generated/edu/nps/moves/dis7/DirectedEnergyDamage.java
index a08bb629e9b0fa41f9b133d47085aa3550624dcb..a31eb875962ca36a5e2341813992d3e4dcc7e053 100644
--- a/src-generated/edu/nps/moves/dis7/DirectedEnergyDamage.java
+++ b/src-generated/edu/nps/moves/dis7/DirectedEnergyDamage.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -237,25 +237,26 @@ public short getPadding2()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeInt( (int)recordType);
- dos.writeShort( (short)recordLength);
- dos.writeShort( (short)padding);
+ dos.writeInt(recordType);
+ dos.writeShort(recordLength);
+ dos.writeShort(padding);
damageLocation.marshal(dos);
- dos.writeFloat( (float)damageDiameter);
- dos.writeFloat( (float)temperature);
+ dos.writeFloat(damageDiameter);
+ dos.writeFloat(temperature);
componentIdentification.marshal(dos);
componentDamageStatus.marshal(dos);
componentVisualDamageStatus.marshal(dos);
componentVisualSmokeColor.marshal(dos);
fireEventID.marshal(dos);
- dos.writeShort( (short)padding2);
+ dos.writeShort(padding2);
}
catch(Exception e)
{
@@ -265,9 +266,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -298,7 +300,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -401,7 +403,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" recordType: ").append(recordType).append("\n");
sb.append(" recordLength: ").append(recordLength).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/DirectedEnergyFirePdu.java b/src-generated/edu/nps/moves/dis7/DirectedEnergyFirePdu.java
index 2d9408f713f6f5c136d2740b34245ae82f4cfd75..a62334ed4afb75deb92c1191e38ff3433ab37251 100644
--- a/src-generated/edu/nps/moves/dis7/DirectedEnergyFirePdu.java
+++ b/src-generated/edu/nps/moves/dis7/DirectedEnergyFirePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -326,8 +326,9 @@ public List<StandardVariableSpecification> getDERecords()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -338,19 +339,19 @@ public void marshal(DataOutputStream dos) throws Exception
eventID.marshal(dos);
munitionType.marshal(dos);
shotStartTime.marshal(dos);
- dos.writeFloat( (float)commulativeShotTime);
+ dos.writeFloat(commulativeShotTime);
apertureEmitterLocation.marshal(dos);
- dos.writeFloat( (float)apertureDiameter);
- dos.writeFloat( (float)wavelength);
- dos.writeInt( (int)pad1);
- dos.writeFloat( (float)pulseRepititionFrequency);
- dos.writeFloat( (float)pulseWidth);
+ dos.writeFloat(apertureDiameter);
+ dos.writeFloat(wavelength);
+ dos.writeInt(pad1);
+ dos.writeFloat(pulseRepititionFrequency);
+ dos.writeFloat(pulseWidth);
flags.marshal(dos);
pulseShape.marshal(dos);
- dos.writeByte( (byte)pad2);
- dos.writeInt( (int)pad3);
- dos.writeShort( (short)pad4);
- dos.writeShort( (short)dERecords.size());
+ dos.writeByte(pad2);
+ dos.writeInt(pad3);
+ dos.writeShort(pad4);
+ dos.writeShort(dERecords.size());
for(int idx = 0; idx < dERecords.size(); idx++)
{
@@ -367,9 +368,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -416,7 +418,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -452,7 +454,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < dERecords.size(); idx++)
{
- StandardVariableSpecification aStandardVariableSpecification = (StandardVariableSpecification)dERecords.get(idx);
+ StandardVariableSpecification aStandardVariableSpecification = dERecords.get(idx);
aStandardVariableSpecification.marshal(buff);
}
@@ -549,7 +551,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" firingEntityID: ").append(firingEntityID).append("\n");
sb.append(" eventID: ").append(eventID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/DirectedEnergyPrecisionAimpoint.java b/src-generated/edu/nps/moves/dis7/DirectedEnergyPrecisionAimpoint.java
index db66d458223e53b3dc360df79bf7500ba9b01962..7ef0e725bb9a783e1432b1ebc95395423c036c44 100644
--- a/src-generated/edu/nps/moves/dis7/DirectedEnergyPrecisionAimpoint.java
+++ b/src-generated/edu/nps/moves/dis7/DirectedEnergyPrecisionAimpoint.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -288,28 +288,29 @@ public int getPadding2()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeInt( (int)recordType);
- dos.writeShort( (short)recordLength);
- dos.writeShort( (short)padding);
+ 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( (byte)targetComponentID);
+ dos.writeByte(targetComponentID);
beamSpotType.marshal(dos);
- dos.writeFloat( (float)beamSpotCrossSectionSemiMajorAxis);
- dos.writeFloat( (float)beamSpotCrossSectionSemiMinorAxis);
- dos.writeFloat( (float)beamSpotCrossSectionOrientationAngle);
- dos.writeFloat( (float)peakIrradiance);
- dos.writeInt( (int)padding2);
+ dos.writeFloat(beamSpotCrossSectionSemiMajorAxis);
+ dos.writeFloat(beamSpotCrossSectionSemiMinorAxis);
+ dos.writeFloat(beamSpotCrossSectionOrientationAngle);
+ dos.writeFloat(peakIrradiance);
+ dos.writeInt(padding2);
}
catch(Exception e)
{
@@ -319,9 +320,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -356,7 +358,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -468,7 +470,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" recordType: ").append(recordType).append("\n");
sb.append(" recordLength: ").append(recordLength).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/DirectedEnergyTargetEnergyDeposition.java b/src-generated/edu/nps/moves/dis7/DirectedEnergyTargetEnergyDeposition.java
index f5d47a2bd654c891e8844d01dcff9b01734d4329..3629b76b4761e83172bf21b59a14b60d0c2c63cb 100644
--- a/src-generated/edu/nps/moves/dis7/DirectedEnergyTargetEnergyDeposition.java
+++ b/src-generated/edu/nps/moves/dis7/DirectedEnergyTargetEnergyDeposition.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -84,16 +84,17 @@ public float getPeakIrradiance()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
targetEntityID.marshal(dos);
- dos.writeShort( (short)padding);
- dos.writeFloat( (float)peakIrradiance);
+ dos.writeShort(padding);
+ dos.writeFloat(peakIrradiance);
}
catch(Exception e)
{
@@ -103,9 +104,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -120,7 +122,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -196,7 +198,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" targetEntityID: ").append(targetEntityID).append("\n");
sb.append(" padding: ").append(padding).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/DisBitSet.java b/src-generated/edu/nps/moves/dis7/DisBitSet.java
index 5151a96d6d832ee11795755f8730fa5710e628f9..a2ea35364b09e0e48f18a811e35a0377223c401f 100644
--- a/src-generated/edu/nps/moves/dis7/DisBitSet.java
+++ b/src-generated/edu/nps/moves/dis7/DisBitSet.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
diff --git a/src-generated/edu/nps/moves/dis7/DisTime.java b/src-generated/edu/nps/moves/dis7/DisTime.java
index af14b78943120f8907e6b2f07f6fe24f4d98c06b..906479313d4bd95a90de6a2bd06ef152c85901f4 100644
--- a/src-generated/edu/nps/moves/dis7/DisTime.java
+++ b/src-generated/edu/nps/moves/dis7/DisTime.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -109,14 +109,14 @@ public class DisTime
// 2^31-1 DIS time units in an hour. 3600 sec/hr X 1000 msec/sec divided into the number of
// msec since the start of the hour gives the percentage of DIS time units in the hour, times
// the number of DIS time units per hour, equals the time value
- double val = (((double) diff) / (3600.0 * 1000.0)) * Integer.MAX_VALUE;
+ double val = (diff / (3600.0 * 1000.0)) * Integer.MAX_VALUE;
int ts = (int) val;
return ts;
}
/**
- * Returns the absolute timestamp, assuminng that this host is sync'd to NTP.
+ * Returns the absolute timestamp, assuming that this host is sync'd to NTP.
* Fix to bitshift by mvormelch.
* @return DIS time units, get absolute timestamp
*/
diff --git a/src-generated/edu/nps/moves/dis7/DistributedEmissionsFamilyPdu.java b/src-generated/edu/nps/moves/dis7/DistributedEmissionsFamilyPdu.java
index 793cada2349a5f371e3cf23ca100e774719723c9..62b33a4c985540cd03398f917085602fbf225430 100644
--- a/src-generated/edu/nps/moves/dis7/DistributedEmissionsFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/DistributedEmissionsFamilyPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -35,8 +35,9 @@ public int getMarshalledSize()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -52,9 +53,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -66,7 +68,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -131,7 +133,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
return sb.toString();
diff --git a/src-generated/edu/nps/moves/dis7/Domain.java b/src-generated/edu/nps/moves/dis7/Domain.java
index abc12492d4527c2d582f55aece1a1c5837e8cd48..e679edd8bdac683dd8836f95b326c0a59b629b15 100644
--- a/src-generated/edu/nps/moves/dis7/Domain.java
+++ b/src-generated/edu/nps/moves/dis7/Domain.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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;
@@ -33,17 +33,33 @@ public class Domain
private Method getDescription;
//@formatter:off
+
+ /**
+ *
+ * @param d
+ * @return
+ */
public static Domain inst(PlatformDomain d)
{
return _inst(d);
} // uid 8
- public static Domain inst(MunitionDomain d)
+ /**
+ *
+ * @param d
+ * @return
+ */
+ public static Domain inst(MunitionDomain d)
{
return _inst(d);
} // uid 14
- public static Domain inst(SupplyDomain d)
+ /**
+ *
+ * @param d
+ * @return
+ */
+ public static Domain inst(SupplyDomain d)
{
return _inst(d);
} // uid 600
@@ -76,32 +92,57 @@ public class Domain
}
}
- public int getValue()
+ /**
+ *
+ * @return
+ */
+ public int getValue()
{
- return (Integer) invoke(getValue, (Object[]) null);
+ return (Integer) invoke(getValue, null);
}
- public String getDescription()
+ /**
+ *
+ * @return
+ */
+ public String getDescription()
{
- return (String) invoke(getDescription, (Object[]) null);
+ return (String) invoke(getDescription, null);
}
- public int getMarshalledSize()
+ /**
+ *
+ * @return
+ */
+ public int getMarshalledSize()
{
- return (Integer) invoke(mSize, (Object[]) null);
+ return (Integer) invoke(mSize, null);
}
- public void marshal(DataOutputStream dos)
+ /**
+ *
+ * @param dos
+ */
+ public void marshal(DataOutputStream dos)
{
invoke(marshalDos, new Object[]{dos});
}
- public void marshal(ByteBuffer buff)
+ /**
+ *
+ * @param buff
+ */
+ public void marshal(ByteBuffer buff)
{
invoke(marshalBuff, new Object[]{buff});
}
- public int unmarshal(DataInputStream dis)
+ /**
+ *
+ * @param dis
+ * @return
+ */
+ public int unmarshal(DataInputStream dis)
{
Object o = invoke(unmarshalDis, new Object[]{dis});
enumInst = o;
@@ -109,7 +150,12 @@ public class Domain
return getMarshalledSize();
}
- public int unmarshal(ByteBuffer buff)
+ /**
+ *
+ * @param buff
+ * @return
+ */
+ public int unmarshal(ByteBuffer buff)
{
Object o = invoke(unmarshalBuff, new Object[]{buff});
enumInst = o;
diff --git a/src-generated/edu/nps/moves/dis7/EEFundamentalParameterData.java b/src-generated/edu/nps/moves/dis7/EEFundamentalParameterData.java
index b4f4a84476f82a46a05d240c7f98b3e3b7d55fe5..e858c357d11a740bd036fa0fedd1723337a6aa64 100644
--- a/src-generated/edu/nps/moves/dis7/EEFundamentalParameterData.java
+++ b/src-generated/edu/nps/moves/dis7/EEFundamentalParameterData.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -118,18 +118,19 @@ public float getPulseWidth()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeFloat( (float)frequency);
- dos.writeFloat( (float)frequencyRange);
- dos.writeFloat( (float)effectiveRadiatedPower);
- dos.writeFloat( (float)pulseRepetitionFrequency);
- dos.writeFloat( (float)pulseWidth);
+ dos.writeFloat(frequency);
+ dos.writeFloat(frequencyRange);
+ dos.writeFloat(effectiveRadiatedPower);
+ dos.writeFloat(pulseRepetitionFrequency);
+ dos.writeFloat(pulseWidth);
}
catch(Exception e)
{
@@ -139,9 +140,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -161,7 +163,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -243,7 +245,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" frequency: ").append(frequency).append("\n");
sb.append(" frequencyRange: ").append(frequencyRange).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/ElectromagneticEmissionPdu.java b/src-generated/edu/nps/moves/dis7/ElectromagneticEmissionPdu.java
index 3d27d76880346703698b44f1d6f6efb904f7ed90..e204b2af539ae0afe13996437ef6db5f34cc87be 100644
--- a/src-generated/edu/nps/moves/dis7/ElectromagneticEmissionPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ElectromagneticEmissionPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -129,8 +129,9 @@ public List<ElectronicEmitter> getSystems()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -140,8 +141,8 @@ public void marshal(DataOutputStream dos) throws Exception
emittingEntityID.marshal(dos);
eventID.marshal(dos);
stateUpdateIndicator.marshal(dos);
- dos.writeByte( (byte)systems.size());
- dos.writeShort( (short)paddingForEmissionsPdu);
+ dos.writeByte(systems.size());
+ dos.writeShort(paddingForEmissionsPdu);
for(int idx = 0; idx < systems.size(); idx++)
{
@@ -158,9 +159,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -187,7 +189,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -211,7 +213,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < systems.size(); idx++)
{
- ElectronicEmitter aElectronicEmitter = (ElectronicEmitter)systems.get(idx);
+ ElectronicEmitter aElectronicEmitter = systems.get(idx);
aElectronicEmitter.marshal(buff);
}
@@ -284,7 +286,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" emittingEntityID: ").append(emittingEntityID).append("\n");
sb.append(" eventID: ").append(eventID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/ElectronicEmitter.java b/src-generated/edu/nps/moves/dis7/ElectronicEmitter.java
index 749c963e3b97678d110a6acb3a4cb212487884fd..813b684b749c3faf13f2255d6f090305ed75e734 100644
--- a/src-generated/edu/nps/moves/dis7/ElectronicEmitter.java
+++ b/src-generated/edu/nps/moves/dis7/ElectronicEmitter.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -108,15 +108,16 @@ public List<EmitterBeam> getBeams()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeByte( (byte)systemDataLength);
- dos.writeByte( (byte)beams.size());
+ dos.writeByte(systemDataLength);
+ dos.writeByte(beams.size());
emitterSystem.marshal(dos);
location.marshal(dos);
@@ -135,9 +136,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -160,7 +162,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -182,7 +184,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < beams.size(); idx++)
{
- EmitterBeam aEmitterBeam = (EmitterBeam)beams.get(idx);
+ EmitterBeam aEmitterBeam = beams.get(idx);
aEmitterBeam.marshal(buff);
}
@@ -256,7 +258,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" systemDataLength: ").append(systemDataLength).append("\n");
sb.append(" emitterSystem: ").append(emitterSystem).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/EmitterBeam.java b/src-generated/edu/nps/moves/dis7/EmitterBeam.java
index d05fc1f5777cb34abba9f21faddc0810adce7b2e..3c2adde19eabd15c1aef4f26096d094b2c2b5bff 100644
--- a/src-generated/edu/nps/moves/dis7/EmitterBeam.java
+++ b/src-generated/edu/nps/moves/dis7/EmitterBeam.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -201,20 +201,21 @@ public List<TrackJamData> getTrackJamData()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeByte( (byte)beamDataLength);
- dos.writeByte( (byte)beamNumber);
- dos.writeShort( (short)beamParameterIndex);
+ dos.writeByte(beamDataLength);
+ dos.writeByte(beamNumber);
+ dos.writeShort(beamParameterIndex);
fundamentalParameterData.marshal(dos);
beamData.marshal(dos);
beamFunction.marshal(dos);
- dos.writeByte( (byte)trackJamData.size());
+ dos.writeByte(trackJamData.size());
highDensityTrackJam.marshal(dos);
beamStatus.marshal(dos);
jammingTechnique.marshal(dos);
@@ -234,9 +235,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -269,7 +271,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -297,7 +299,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < trackJamData.size(); idx++)
{
- TrackJamData aTrackJamData = (TrackJamData)trackJamData.get(idx);
+ TrackJamData aTrackJamData = trackJamData.get(idx);
aTrackJamData.marshal(buff);
}
@@ -383,7 +385,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" beamDataLength: ").append(beamDataLength).append("\n");
sb.append(" beamNumber: ").append(beamNumber).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/EmitterSystem.java b/src-generated/edu/nps/moves/dis7/EmitterSystem.java
index 829056562dc35baa9fcb8900ffecf5e95c3fb36b..528c336a158492004c972817b24e9e6f904b2566 100644
--- a/src-generated/edu/nps/moves/dis7/EmitterSystem.java
+++ b/src-generated/edu/nps/moves/dis7/EmitterSystem.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -84,8 +84,9 @@ public byte getEmitterIDNumber()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -93,7 +94,7 @@ public void marshal(DataOutputStream dos) throws Exception
{
emitterName.marshal(dos);
emitterFunction.marshal(dos);
- dos.writeByte( (byte)emitterIDNumber);
+ dos.writeByte(emitterIDNumber);
}
catch(Exception e)
{
@@ -103,9 +104,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -121,7 +123,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -197,7 +199,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" emitterName: ").append(emitterName).append("\n");
sb.append(" emitterFunction: ").append(emitterFunction).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/EngineFuel.java b/src-generated/edu/nps/moves/dis7/EngineFuel.java
index b9b72cf9a3df2de97420a105b2e0a2f72d206d9f..2240ab85acad74068b02674aeb28677e3f0ec4d6 100644
--- a/src-generated/edu/nps/moves/dis7/EngineFuel.java
+++ b/src-generated/edu/nps/moves/dis7/EngineFuel.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -118,18 +118,19 @@ public byte getPadding()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeInt( (int)fuelQuantity);
+ dos.writeInt(fuelQuantity);
fuelMeasurementUnits.marshal(dos);
fuelType.marshal(dos);
fuelLocation.marshal(dos);
- dos.writeByte( (byte)padding);
+ dos.writeByte(padding);
}
catch(Exception e)
{
@@ -139,9 +140,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -161,7 +163,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -243,7 +245,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" fuelQuantity: ").append(fuelQuantity).append("\n");
sb.append(" fuelMeasurementUnits: ").append(fuelMeasurementUnits).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/EngineFuelReload.java b/src-generated/edu/nps/moves/dis7/EngineFuelReload.java
index 88d0c803d0f7bd66ac08fce749777483e83f25ad..53c98e27873b66bc7d7179599a1f32355819cd7b 100644
--- a/src-generated/edu/nps/moves/dis7/EngineFuelReload.java
+++ b/src-generated/edu/nps/moves/dis7/EngineFuelReload.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -169,21 +169,22 @@ public byte getPadding()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeInt( (int)standardQuantity);
- dos.writeInt( (int)maximumQuantity);
- dos.writeInt( (int)standardQuantityReloadTime);
- dos.writeInt( (int)maximumQuantityReloadTime);
+ dos.writeInt(standardQuantity);
+ dos.writeInt(maximumQuantity);
+ dos.writeInt(standardQuantityReloadTime);
+ dos.writeInt(maximumQuantityReloadTime);
fuelMeasurmentUnits.marshal(dos);
fuelType.marshal(dos);
fuelLocation.marshal(dos);
- dos.writeByte( (byte)padding);
+ dos.writeByte(padding);
}
catch(Exception e)
{
@@ -193,9 +194,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -221,7 +223,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -312,7 +314,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" standardQuantity: ").append(standardQuantity).append("\n");
sb.append(" maximumQuantity: ").append(maximumQuantity).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/EntityAssociationVP.java b/src-generated/edu/nps/moves/dis7/EntityAssociationVP.java
index eabc91d2c016bce69fbe63c15e685826c9d633f4..d49f3031d5e4c3eeda2f02ec8d06382c48bed21f 100644
--- a/src-generated/edu/nps/moves/dis7/EntityAssociationVP.java
+++ b/src-generated/edu/nps/moves/dis7/EntityAssociationVP.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -186,8 +186,9 @@ public short getGroupNumber()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -201,7 +202,7 @@ public void marshal(DataOutputStream dos) throws Exception
ownStationLocation.marshal(dos);
physicalConnectionType.marshal(dos);
groupMemberType.marshal(dos);
- dos.writeShort( (short)groupNumber);
+ dos.writeShort(groupNumber);
}
catch(Exception e)
{
@@ -211,9 +212,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -240,7 +242,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -334,7 +336,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" recordType: ").append(recordType).append("\n");
sb.append(" changeIndicator: ").append(changeIndicator).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/EntityCapabilities.java b/src-generated/edu/nps/moves/dis7/EntityCapabilities.java
index 016f9560d975c0a08b58b68f09dcf4a258510b52..99754a365924ce285eb2f7ec43e87631a272982b 100644
--- a/src-generated/edu/nps/moves/dis7/EntityCapabilities.java
+++ b/src-generated/edu/nps/moves/dis7/EntityCapabilities.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
diff --git a/src-generated/edu/nps/moves/dis7/EntityDamageStatusPdu.java b/src-generated/edu/nps/moves/dis7/EntityDamageStatusPdu.java
index 47bbed16767dec63576ed563bc8c11c0c5af0e6f..f10479e3ae9b87267f66579ce0f43faa94acbb17 100644
--- a/src-generated/edu/nps/moves/dis7/EntityDamageStatusPdu.java
+++ b/src-generated/edu/nps/moves/dis7/EntityDamageStatusPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -109,8 +109,9 @@ public List<DirectedEnergyDamage> getDamageDescriptionRecords()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -118,9 +119,9 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
damagedEntityID.marshal(dos);
- dos.writeShort( (short)padding1);
- dos.writeShort( (short)padding2);
- dos.writeShort( (short)damageDescriptionRecords.size());
+ dos.writeShort(padding1);
+ dos.writeShort(padding2);
+ dos.writeShort(damageDescriptionRecords.size());
for(int idx = 0; idx < damageDescriptionRecords.size(); idx++)
{
@@ -137,9 +138,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -165,7 +167,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -188,7 +190,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < damageDescriptionRecords.size(); idx++)
{
- DirectedEnergyDamage aDirectedEnergyDamage = (DirectedEnergyDamage)damageDescriptionRecords.get(idx);
+ DirectedEnergyDamage aDirectedEnergyDamage = damageDescriptionRecords.get(idx);
aDirectedEnergyDamage.marshal(buff);
}
@@ -259,7 +261,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" damagedEntityID: ").append(damagedEntityID).append("\n");
sb.append(" padding1: ").append(padding1).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/EntityID.java b/src-generated/edu/nps/moves/dis7/EntityID.java
index c4f96ac37cf2cfab6959862e9a960a40ecd6b0e0..95dace71284bafdb43ab18a8b65beed9834be1d7 100644
--- a/src-generated/edu/nps/moves/dis7/EntityID.java
+++ b/src-generated/edu/nps/moves/dis7/EntityID.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -84,16 +84,17 @@ public short getEntityID()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeShort( (short)siteID);
- dos.writeShort( (short)applicationID);
- dos.writeShort( (short)entityID);
+ dos.writeShort(siteID);
+ dos.writeShort(applicationID);
+ dos.writeShort(entityID);
}
catch(Exception e)
{
@@ -103,9 +104,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -121,7 +123,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -197,7 +199,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" siteID: ").append(siteID).append("\n");
sb.append(" applicationID: ").append(applicationID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/EntityIdentifier.java b/src-generated/edu/nps/moves/dis7/EntityIdentifier.java
index 0a9bb4dc4a0b77cd02c0d9dd1339ab454d435c17..7732bf6aa066cf0dbb72cce08b0412fbc0402879 100644
--- a/src-generated/edu/nps/moves/dis7/EntityIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/EntityIdentifier.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -67,15 +67,16 @@ public short getEntityNumber()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
simulationAddress.marshal(dos);
- dos.writeShort( (short)entityNumber);
+ dos.writeShort(entityNumber);
}
catch(Exception e)
{
@@ -85,9 +86,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -100,7 +102,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -173,7 +175,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
sb.append(" entityNumber: ").append(entityNumber).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/EntityInformationFamilyPdu.java b/src-generated/edu/nps/moves/dis7/EntityInformationFamilyPdu.java
index b77ffc5fad2b6c605b422e0fc2941a4af37bb606..ad4be250472027ec5bc7272070542ac34e96e59f 100644
--- a/src-generated/edu/nps/moves/dis7/EntityInformationFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/EntityInformationFamilyPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -35,8 +35,9 @@ public int getMarshalledSize()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -52,9 +53,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -66,7 +68,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -131,7 +133,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
return sb.toString();
diff --git a/src-generated/edu/nps/moves/dis7/EntityManagementFamilyPdu.java b/src-generated/edu/nps/moves/dis7/EntityManagementFamilyPdu.java
index d4bfc1831649cd08675c4fac0d2d2f57d0c997c9..bca365563709a3096ec279203e75ae03bb56a914 100644
--- a/src-generated/edu/nps/moves/dis7/EntityManagementFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/EntityManagementFamilyPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -35,8 +35,9 @@ public int getMarshalledSize()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -52,9 +53,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -66,7 +68,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -131,7 +133,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
return sb.toString();
diff --git a/src-generated/edu/nps/moves/dis7/EntityMarking.java b/src-generated/edu/nps/moves/dis7/EntityMarking.java
index 1416b15f7f2ad1927ccced96ee3e30d09ed6599d..f9f724bebc113aad526b87e86aa9ba742dedef5c 100644
--- a/src-generated/edu/nps/moves/dis7/EntityMarking.java
+++ b/src-generated/edu/nps/moves/dis7/EntityMarking.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -67,8 +67,9 @@ public byte[] getCharacters()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -88,9 +89,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -105,7 +107,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -187,7 +189,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" characterSet: ").append(characterSet).append("\n");
sb.append(" characters: ").append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/EntityStatePdu.java b/src-generated/edu/nps/moves/dis7/EntityStatePdu.java
index a062c8bbe83c1b097d60c09ba230d3303969c6cf..22fa540e490242c1e37ae96a304dafea204fb25b 100644
--- a/src-generated/edu/nps/moves/dis7/EntityStatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/EntityStatePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -246,8 +246,9 @@ public List<VariableParameter> getVariableParameters()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -256,13 +257,13 @@ public void marshal(DataOutputStream dos) throws Exception
{
entityID.marshal(dos);
forceId.marshal(dos);
- dos.writeByte( (byte)variableParameters.size());
+ dos.writeByte(variableParameters.size());
entityType.marshal(dos);
alternativeEntityType.marshal(dos);
entityLinearVelocity.marshal(dos);
entityLocation.marshal(dos);
entityOrientation.marshal(dos);
- dos.writeInt( (int)entityAppearance);
+ dos.writeInt(entityAppearance);
deadReckoningParameters.marshal(dos);
marking.marshal(dos);
capabilities.marshal(dos);
@@ -282,9 +283,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -318,7 +320,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -349,7 +351,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < variableParameters.size(); idx++)
{
- VariableParameter aVariableParameter = (VariableParameter)variableParameters.get(idx);
+ VariableParameter aVariableParameter = variableParameters.get(idx);
aVariableParameter.marshal(buff);
}
@@ -436,7 +438,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" entityID: ").append(entityID).append("\n");
sb.append(" forceId: ").append(forceId).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/EntityStateUpdatePdu.java b/src-generated/edu/nps/moves/dis7/EntityStateUpdatePdu.java
index fe02b9ae32f200bf6e98ea2c3bc965f4c68fc5ed..ce97c298501f13eb36af5aeade31d549b7311f0a 100644
--- a/src-generated/edu/nps/moves/dis7/EntityStateUpdatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/EntityStateUpdatePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -162,8 +162,9 @@ public List<VariableParameter> getVariableParameters()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -171,12 +172,12 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
entityID.marshal(dos);
- dos.writeByte( (byte)padding1);
- dos.writeByte( (byte)variableParameters.size());
+ dos.writeByte(padding1);
+ dos.writeByte(variableParameters.size());
entityLinearVelocity.marshal(dos);
entityLocation.marshal(dos);
entityOrientation.marshal(dos);
- dos.writeInt( (int)entityAppearance);
+ dos.writeInt(entityAppearance);
for(int idx = 0; idx < variableParameters.size(); idx++)
{
@@ -193,9 +194,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -224,7 +226,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -250,7 +252,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < variableParameters.size(); idx++)
{
- VariableParameter aVariableParameter = (VariableParameter)variableParameters.get(idx);
+ VariableParameter aVariableParameter = variableParameters.get(idx);
aVariableParameter.marshal(buff);
}
@@ -327,7 +329,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" entityID: ").append(entityID).append("\n");
sb.append(" padding1: ").append(padding1).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/EntityType.java b/src-generated/edu/nps/moves/dis7/EntityType.java
index a97146eaf95f9e870926ae66f4623cacb60a1767..ec666ad11239f4e6eeb3b82e091620c00b1c7157 100644
--- a/src-generated/edu/nps/moves/dis7/EntityType.java
+++ b/src-generated/edu/nps/moves/dis7/EntityType.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -151,8 +151,9 @@ public byte getExtra()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -161,10 +162,10 @@ public void marshal(DataOutputStream dos) throws Exception
entityKind.marshal(dos);
domain.marshal(dos);
country.marshal(dos);
- dos.writeByte( (byte)category);
- dos.writeByte( (byte)subCategory);
- dos.writeByte( (byte)specific);
- dos.writeByte( (byte)extra);
+ dos.writeByte(category);
+ dos.writeByte(subCategory);
+ dos.writeByte(specific);
+ dos.writeByte(extra);
}
catch(Exception e)
{
@@ -174,9 +175,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -199,7 +201,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -287,7 +289,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" entityKind: ").append(entityKind).append("\n");
sb.append(" domain: ").append(domain).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/EntityTypeRaw.java b/src-generated/edu/nps/moves/dis7/EntityTypeRaw.java
index 04ab23d11c61f1e1c45f4d96863a5c596e2d0451..cdf1dae870d388fcdffe07ac42bbd8a582f07187 100644
--- a/src-generated/edu/nps/moves/dis7/EntityTypeRaw.java
+++ b/src-generated/edu/nps/moves/dis7/EntityTypeRaw.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -151,20 +151,21 @@ public byte getExtra()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
entityKind.marshal(dos);
- dos.writeByte( (byte)domain);
- dos.writeShort( (short)country);
- dos.writeByte( (byte)category);
- dos.writeByte( (byte)subCategory);
- dos.writeByte( (byte)specific);
- dos.writeByte( (byte)extra);
+ dos.writeByte(domain);
+ dos.writeShort(country);
+ dos.writeByte(category);
+ dos.writeByte(subCategory);
+ dos.writeByte(specific);
+ dos.writeByte(extra);
}
catch(Exception e)
{
@@ -174,9 +175,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -200,7 +202,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -288,7 +290,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" entityKind: ").append(entityKind).append("\n");
sb.append(" domain: ").append(domain).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/EntityTypeVP.java b/src-generated/edu/nps/moves/dis7/EntityTypeVP.java
index 311bed55b5cae2b4915bd4a50707d9dc36b250bd..6a8956ef8c940c0b49e1f4e858cc2e4872a6858e 100644
--- a/src-generated/edu/nps/moves/dis7/EntityTypeVP.java
+++ b/src-generated/edu/nps/moves/dis7/EntityTypeVP.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -118,8 +118,9 @@ public int getPadding1()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -128,8 +129,8 @@ public void marshal(DataOutputStream dos) throws Exception
recordType.marshal(dos);
changeIndicator.marshal(dos);
entityType.marshal(dos);
- dos.writeShort( (short)padding);
- dos.writeInt( (int)padding1);
+ dos.writeShort(padding);
+ dos.writeInt(padding1);
}
catch(Exception e)
{
@@ -139,9 +140,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -160,7 +162,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -242,7 +244,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" recordType: ").append(recordType).append("\n");
sb.append(" changeIndicator: ").append(changeIndicator).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/EnumNotFoundException.java b/src-generated/edu/nps/moves/dis7/EnumNotFoundException.java
index dc49e20e0a1bc4dcb25d687263964ddf71a624ce..39cd6c92495f30f1477fb7bb4add91a863a1ba73 100644
--- a/src-generated/edu/nps/moves/dis7/EnumNotFoundException.java
+++ b/src-generated/edu/nps/moves/dis7/EnumNotFoundException.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
diff --git a/src-generated/edu/nps/moves/dis7/Environment.java b/src-generated/edu/nps/moves/dis7/Environment.java
index 5d5ba3ad3f218bbca5c475e6921c9c086839388b..8004254a37e5b44778d5a59dff0aa1787877480e 100644
--- a/src-generated/edu/nps/moves/dis7/Environment.java
+++ b/src-generated/edu/nps/moves/dis7/Environment.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -121,17 +121,18 @@ public byte[] getGeometry()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
environmentType.marshal(dos);
- dos.writeShort( (short)length);
- dos.writeByte( (byte)index);
- dos.writeByte( (byte)padding1);
+ dos.writeShort(length);
+ dos.writeByte(index);
+ dos.writeByte(padding1);
for(int idx = 0; idx < geometry.length; idx++)
dos.writeByte(geometry[idx]);
@@ -146,9 +147,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -171,7 +173,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -264,7 +266,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" environmentType: ").append(environmentType).append("\n");
sb.append(" length: ").append(length).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/EnvironmentalProcessPdu.java b/src-generated/edu/nps/moves/dis7/EnvironmentalProcessPdu.java
index 12d326cfb3e4fffcb24d7f9ec6871dcb6af5449e..889c1b2cf97cedfdc2a25fa943a02925132c10a6 100644
--- a/src-generated/edu/nps/moves/dis7/EnvironmentalProcessPdu.java
+++ b/src-generated/edu/nps/moves/dis7/EnvironmentalProcessPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -145,8 +145,9 @@ public List<Environment> getEnvironmentRecords()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -157,8 +158,8 @@ public void marshal(DataOutputStream dos) throws Exception
environmentType.marshal(dos);
modelType.marshal(dos);
environmentStatus.marshal(dos);
- dos.writeShort( (short)environmentRecords.size());
- dos.writeShort( (short)sequenceNumber);
+ dos.writeShort(environmentRecords.size());
+ dos.writeShort(sequenceNumber);
for(int idx = 0; idx < environmentRecords.size(); idx++)
{
@@ -175,9 +176,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -205,7 +207,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -230,7 +232,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < environmentRecords.size(); idx++)
{
- Environment aEnvironment = (Environment)environmentRecords.get(idx);
+ Environment aEnvironment = environmentRecords.get(idx);
aEnvironment.marshal(buff);
}
@@ -305,7 +307,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" environementalProcessID: ").append(environementalProcessID).append("\n");
sb.append(" environmentType: ").append(environmentType).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/EulerAngles.java b/src-generated/edu/nps/moves/dis7/EulerAngles.java
index d8b2e4b0dbf2cea7f98c09c442776f3e93c1e162..a6542050654f4a51a3b57fe91e86bd60226a64a4 100644
--- a/src-generated/edu/nps/moves/dis7/EulerAngles.java
+++ b/src-generated/edu/nps/moves/dis7/EulerAngles.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -81,16 +81,17 @@ public float getPhi()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeFloat( (float)psi);
- dos.writeFloat( (float)theta);
- dos.writeFloat( (float)phi);
+ dos.writeFloat(psi);
+ dos.writeFloat(theta);
+ dos.writeFloat(phi);
}
catch(Exception e)
{
@@ -100,9 +101,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -118,7 +120,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -194,7 +196,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" psi: ").append(psi).append("\n");
sb.append(" theta: ").append(theta).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/EventIdentifier.java b/src-generated/edu/nps/moves/dis7/EventIdentifier.java
index 1aa2c2afc6516a1a5e9a17c65c73ceadcca75762..7b30e613636e06443f0c055d2625c5b5a24c3437 100644
--- a/src-generated/edu/nps/moves/dis7/EventIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/EventIdentifier.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -66,15 +66,16 @@ public short getEventNumber()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
simulationAddress.marshal(dos);
- dos.writeShort( (short)eventNumber);
+ dos.writeShort(eventNumber);
}
catch(Exception e)
{
@@ -84,9 +85,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -99,7 +101,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -172,7 +174,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
sb.append(" eventNumber: ").append(eventNumber).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/EventIdentifierLiveEntity.java b/src-generated/edu/nps/moves/dis7/EventIdentifierLiveEntity.java
index fda0d93204568dea647514f090edec6754dc42f7..bbb5b7205e9bd66eb2d0253d04fda2d2286ec2e8 100644
--- a/src-generated/edu/nps/moves/dis7/EventIdentifierLiveEntity.java
+++ b/src-generated/edu/nps/moves/dis7/EventIdentifierLiveEntity.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -81,16 +81,17 @@ public short getEventNumber()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeByte( (byte)siteNumber);
- dos.writeByte( (byte)applicationNumber);
- dos.writeShort( (short)eventNumber);
+ dos.writeByte(siteNumber);
+ dos.writeByte(applicationNumber);
+ dos.writeShort(eventNumber);
}
catch(Exception e)
{
@@ -100,9 +101,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -118,7 +120,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -194,7 +196,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" siteNumber: ").append(siteNumber).append("\n");
sb.append(" applicationNumber: ").append(applicationNumber).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/EventReportPdu.java b/src-generated/edu/nps/moves/dis7/EventReportPdu.java
index 1a0a2d2108a0df7654bb2bfe55e5e79add845e5a..5644db8fa386364c2eac87b1d5b8b838f7ab91d4 100644
--- a/src-generated/edu/nps/moves/dis7/EventReportPdu.java
+++ b/src-generated/edu/nps/moves/dis7/EventReportPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -119,8 +119,9 @@ public List<VariableDatum> getVariableDatums()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -128,9 +129,9 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
eventType.marshal(dos);
- dos.writeInt( (int)padding1);
- dos.writeInt( (int)fixedDatums.size());
- dos.writeInt( (int)variableDatums.size());
+ dos.writeInt(padding1);
+ dos.writeInt(fixedDatums.size());
+ dos.writeInt(variableDatums.size());
for(int idx = 0; idx < fixedDatums.size(); idx++)
{
@@ -154,9 +155,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -190,7 +192,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -213,14 +215,14 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < fixedDatums.size(); idx++)
{
- FixedDatum aFixedDatum = (FixedDatum)fixedDatums.get(idx);
+ FixedDatum aFixedDatum = fixedDatums.get(idx);
aFixedDatum.marshal(buff);
}
for(int idx = 0; idx < variableDatums.size(); idx++)
{
- VariableDatum aVariableDatum = (VariableDatum)variableDatums.get(idx);
+ VariableDatum aVariableDatum = variableDatums.get(idx);
aVariableDatum.marshal(buff);
}
@@ -301,7 +303,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" eventType: ").append(eventType).append("\n");
sb.append(" padding1: ").append(padding1).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/EventReportRPdu.java b/src-generated/edu/nps/moves/dis7/EventReportRPdu.java
index 269ba162c3792651a71b7ee6692ca2cc59e3afaf..40309a0e7e2dba9901e9b413428df5383f6e5f05 100644
--- a/src-generated/edu/nps/moves/dis7/EventReportRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/EventReportRPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -119,8 +119,9 @@ public List<VariableDatum> getVariableDatumRecords()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -128,9 +129,9 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
eventType.marshal(dos);
- dos.writeInt( (int)pad1);
- dos.writeInt( (int)fixedDatumRecords.size());
- dos.writeInt( (int)variableDatumRecords.size());
+ dos.writeInt(pad1);
+ dos.writeInt(fixedDatumRecords.size());
+ dos.writeInt(variableDatumRecords.size());
for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
{
@@ -154,9 +155,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -190,7 +192,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -213,14 +215,14 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
{
- FixedDatum aFixedDatum = (FixedDatum)fixedDatumRecords.get(idx);
+ FixedDatum aFixedDatum = fixedDatumRecords.get(idx);
aFixedDatum.marshal(buff);
}
for(int idx = 0; idx < variableDatumRecords.size(); idx++)
{
- VariableDatum aVariableDatum = (VariableDatum)variableDatumRecords.get(idx);
+ VariableDatum aVariableDatum = variableDatumRecords.get(idx);
aVariableDatum.marshal(buff);
}
@@ -301,7 +303,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" eventType: ").append(eventType).append("\n");
sb.append(" pad1: ").append(pad1).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/EventReportReliablePdu.java b/src-generated/edu/nps/moves/dis7/EventReportReliablePdu.java
index 406639667873f2a031ce7ff37d5520ecad40b91e..f74dc742d11220b0c859a3f080e7eb1b736ec5b4 100644
--- a/src-generated/edu/nps/moves/dis7/EventReportReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/EventReportReliablePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
diff --git a/src-generated/edu/nps/moves/dis7/Expendable.java b/src-generated/edu/nps/moves/dis7/Expendable.java
index 4b88b09f46b839785ee1e030ea95fea573e0b49c..6bffcbb00683fc218e26353fe06c651907c1e1e2 100644
--- a/src-generated/edu/nps/moves/dis7/Expendable.java
+++ b/src-generated/edu/nps/moves/dis7/Expendable.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -115,18 +115,19 @@ public byte getPadding()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
expendable.marshal(dos);
- dos.writeInt( (int)station);
- dos.writeShort( (short)quantity);
+ dos.writeInt(station);
+ dos.writeShort(quantity);
expendableStatus.marshal(dos);
- dos.writeByte( (byte)padding);
+ dos.writeByte(padding);
}
catch(Exception e)
{
@@ -136,9 +137,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -157,7 +159,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -239,7 +241,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" expendable: ").append(expendable).append("\n");
sb.append(" station: ").append(station).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/ExpendableDescriptor.java b/src-generated/edu/nps/moves/dis7/ExpendableDescriptor.java
index bd221904333f0f5be789fb96d8664e1cb39cd1b0..d8796d8c8fda0c85899eb13b842117b80eee4e3b 100644
--- a/src-generated/edu/nps/moves/dis7/ExpendableDescriptor.java
+++ b/src-generated/edu/nps/moves/dis7/ExpendableDescriptor.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -67,15 +67,16 @@ public long getPadding()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
expendableType.marshal(dos);
- dos.writeLong( (long)padding);
+ dos.writeLong(padding);
}
catch(Exception e)
{
@@ -85,9 +86,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -100,7 +102,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -173,7 +175,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" expendableType: ").append(expendableType).append("\n");
sb.append(" padding: ").append(padding).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/ExpendableReload.java b/src-generated/edu/nps/moves/dis7/ExpendableReload.java
index 9444b3be50fa4c56d68a685c4f9b107e948b9836..bfa693468e4300d011810ab916657e30dd5bc542 100644
--- a/src-generated/edu/nps/moves/dis7/ExpendableReload.java
+++ b/src-generated/edu/nps/moves/dis7/ExpendableReload.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -130,19 +130,20 @@ public int getMaximumQuantityReloadTime()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
expendable.marshal(dos);
- dos.writeInt( (int)station);
- dos.writeShort( (short)standardQuantity);
- dos.writeShort( (short)maximumQuantity);
- dos.writeInt( (int)standardQuantityReloadTime);
- dos.writeInt( (int)maximumQuantityReloadTime);
+ dos.writeInt(station);
+ dos.writeShort(standardQuantity);
+ dos.writeShort(maximumQuantity);
+ dos.writeInt(standardQuantityReloadTime);
+ dos.writeInt(maximumQuantityReloadTime);
}
catch(Exception e)
{
@@ -152,9 +153,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -175,7 +177,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -260,7 +262,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" expendable: ").append(expendable).append("\n");
sb.append(" station: ").append(station).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/ExplosionDescriptor.java b/src-generated/edu/nps/moves/dis7/ExplosionDescriptor.java
index 1c8dd2a1afd811da19683a8667465052d74b6dff..20df76cda51513bfb2f98881769b46184ab892ca 100644
--- a/src-generated/edu/nps/moves/dis7/ExplosionDescriptor.java
+++ b/src-generated/edu/nps/moves/dis7/ExplosionDescriptor.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -101,8 +101,9 @@ public float getExplosiveForce()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -110,8 +111,8 @@ public void marshal(DataOutputStream dos) throws Exception
{
explodingObject.marshal(dos);
explosiveMaterial.marshal(dos);
- dos.writeShort( (short)padding);
- dos.writeFloat( (float)explosiveForce);
+ dos.writeShort(padding);
+ dos.writeFloat(explosiveForce);
}
catch(Exception e)
{
@@ -121,9 +122,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -140,7 +142,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -219,7 +221,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" explodingObject: ").append(explodingObject).append("\n");
sb.append(" explosiveMaterial: ").append(explosiveMaterial).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/FalseTargetsAttribute.java b/src-generated/edu/nps/moves/dis7/FalseTargetsAttribute.java
index 3d97ef7c28a4ba0dfb0f65d377fa74028f1c975d..2c22a5792e3bb756e23691d0ad75978a9f43fd71 100644
--- a/src-generated/edu/nps/moves/dis7/FalseTargetsAttribute.java
+++ b/src-generated/edu/nps/moves/dis7/FalseTargetsAttribute.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -274,28 +274,29 @@ public float getFirstTargetOffset()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeInt( (int)recordType);
- dos.writeShort( (short)recordLength);
- dos.writeShort( (short)padding);
- dos.writeByte( (byte)emitterNumber);
- dos.writeByte( (byte)beamNumber);
+ dos.writeInt(recordType);
+ dos.writeShort(recordLength);
+ dos.writeShort(padding);
+ dos.writeByte(emitterNumber);
+ dos.writeByte(beamNumber);
stateIndicator.marshal(dos);
- dos.writeByte( (byte)padding2);
- dos.writeShort( (short)padding3);
- dos.writeShort( (short)falseTargetCount);
- dos.writeFloat( (float)walkSpeed);
- dos.writeFloat( (float)walkAcceleration);
- dos.writeFloat( (float)maximumWalkDistance);
- dos.writeFloat( (float)keepTime);
- dos.writeFloat( (float)echoSpacing);
- dos.writeFloat( (float)firstTargetOffset);
+ 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)
{
@@ -305,9 +306,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -347,7 +349,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -459,7 +461,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" recordType: ").append(recordType).append("\n");
sb.append(" recordLength: ").append(recordLength).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/FastEntityStatePdu.java b/src-generated/edu/nps/moves/dis7/FastEntityStatePdu.java
index 392afb1ccc7d85b034f2bf11104c6be3774e7f8f..010bcf22ecdcc2855b0da152a5d175de9bec98b4 100644
--- a/src-generated/edu/nps/moves/dis7/FastEntityStatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/FastEntityStatePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -701,59 +701,60 @@ public List<VariableParameter> getVariableParameters()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
super.marshal(dos);
try
{
- dos.writeShort( (short)site);
- dos.writeShort( (short)application);
- dos.writeShort( (short)entity);
- dos.writeByte( (byte)forceId);
- dos.writeByte( (byte)variableParameters.size());
- dos.writeByte( (byte)entityKind);
- dos.writeByte( (byte)domain);
- dos.writeShort( (short)country);
- dos.writeByte( (byte)category);
- dos.writeByte( (byte)subcategory);
- dos.writeByte( (byte)specific);
- dos.writeByte( (byte)extra);
- dos.writeByte( (byte)altEntityKind);
- dos.writeByte( (byte)altDomain);
- dos.writeShort( (short)altCountry);
- dos.writeByte( (byte)altCategory);
- dos.writeByte( (byte)altSubcategory);
- dos.writeByte( (byte)altSpecific);
- dos.writeByte( (byte)altExtra);
- dos.writeFloat( (float)xVelocity);
- dos.writeFloat( (float)yVelocity);
- dos.writeFloat( (float)zVelocity);
- dos.writeDouble( (double)xLocation);
- dos.writeDouble( (double)yLocation);
- dos.writeDouble( (double)zLocation);
- dos.writeFloat( (float)psi);
- dos.writeFloat( (float)theta);
- dos.writeFloat( (float)phi);
- dos.writeInt( (int)entityAppearance);
- dos.writeByte( (byte)deadReckoningAlgorithm);
+ 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( (float)xAcceleration);
- dos.writeFloat( (float)yAcceleration);
- dos.writeFloat( (float)zAcceleration);
- dos.writeFloat( (float)xAngularVelocity);
- dos.writeFloat( (float)yAngularVelocity);
- dos.writeFloat( (float)zAngularVelocity);
+ 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( (short)capabilities);
+ dos.writeShort(capabilities);
for(int idx = 0; idx < variableParameters.size(); idx++)
{
@@ -770,9 +771,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -871,7 +873,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -935,7 +937,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < variableParameters.size(); idx++)
{
- VariableParameter aVariableParameter = (VariableParameter)variableParameters.get(idx);
+ VariableParameter aVariableParameter = variableParameters.get(idx);
aVariableParameter.marshal(buff);
}
@@ -1088,7 +1090,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" site: ").append(site).append("\n");
sb.append(" application: ").append(application).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/FirePdu.java b/src-generated/edu/nps/moves/dis7/FirePdu.java
index 0c6b6518768ed56d14ae1695bbef1429f996d005..5fc94223d33990af352307a7971ad859282a96b6 100644
--- a/src-generated/edu/nps/moves/dis7/FirePdu.java
+++ b/src-generated/edu/nps/moves/dis7/FirePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -27,7 +27,7 @@ public class FirePdu extends WarfareFamilyPdu implements Serializable
/** 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 representedby 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). */
@@ -188,8 +188,9 @@ public float getRange()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -200,11 +201,11 @@ public void marshal(DataOutputStream dos) throws Exception
targetEntityID.marshal(dos);
munitionExpendibleID.marshal(dos);
eventID.marshal(dos);
- dos.writeInt( (int)fireMissionIndex);
+ dos.writeInt(fireMissionIndex);
locationInWorldCoordinates.marshal(dos);
descriptor.marshal(dos);
velocity.marshal(dos);
- dos.writeFloat( (float)range);
+ dos.writeFloat(range);
}
catch(Exception e)
{
@@ -214,9 +215,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -239,7 +241,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -331,7 +333,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" firingEntityID: ").append(firingEntityID).append("\n");
sb.append(" targetEntityID: ").append(targetEntityID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/FixedDatum.java b/src-generated/edu/nps/moves/dis7/FixedDatum.java
index 727fc56dfe81f8e76f68267c8f38d7934ffa986e..0bb54012bf8224c1d91c8267a0b8406906a2f23c 100644
--- a/src-generated/edu/nps/moves/dis7/FixedDatum.java
+++ b/src-generated/edu/nps/moves/dis7/FixedDatum.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -67,15 +67,16 @@ public int getFixedDatumValue()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
fixedDatumID.marshal(dos);
- dos.writeInt( (int)fixedDatumValue);
+ dos.writeInt(fixedDatumValue);
}
catch(Exception e)
{
@@ -85,9 +86,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -101,7 +103,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -174,7 +176,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" fixedDatumID: ").append(fixedDatumID).append("\n");
sb.append(" fixedDatumValue: ").append(fixedDatumValue).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/FundamentalOperationalData.java b/src-generated/edu/nps/moves/dis7/FundamentalOperationalData.java
index 48563805bc91966349cd48cb8335305d3a74d95c..be7bacce99d84e3950915e951c3a152edbf8ad32 100644
--- a/src-generated/edu/nps/moves/dis7/FundamentalOperationalData.java
+++ b/src-generated/edu/nps/moves/dis7/FundamentalOperationalData.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -203,23 +203,24 @@ public short getParameter6()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeByte( (byte)systemStatus);
- dos.writeByte( (byte)dataField1);
- dos.writeByte( (byte)informationLayers);
- dos.writeByte( (byte)dataField2);
- dos.writeShort( (short)parameter1);
- dos.writeShort( (short)parameter2);
- dos.writeShort( (short)parameter3);
- dos.writeShort( (short)parameter4);
- dos.writeShort( (short)parameter5);
- dos.writeShort( (short)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)
{
@@ -229,9 +230,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -261,7 +263,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -358,7 +360,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" systemStatus: ").append(systemStatus).append("\n");
sb.append(" dataField1: ").append(dataField1).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/GridAxisDescriptor.java b/src-generated/edu/nps/moves/dis7/GridAxisDescriptor.java
index 9f5603614db57226a6be5bdd40f8d2c661f1f7ef..9e4ca460035a88a037af8bc21bf0a40b6a3718de 100644
--- a/src-generated/edu/nps/moves/dis7/GridAxisDescriptor.java
+++ b/src-generated/edu/nps/moves/dis7/GridAxisDescriptor.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -117,17 +117,18 @@ public GridAxisDescriptorAxisType getAxisType()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeDouble( (double)domainInitialXi);
- dos.writeDouble( (double)domainFinalXi);
- dos.writeShort( (short)domainPointsXi);
- dos.writeByte( (byte)interleafFactor);
+ dos.writeDouble(domainInitialXi);
+ dos.writeDouble(domainFinalXi);
+ dos.writeShort(domainPointsXi);
+ dos.writeByte(interleafFactor);
axisType.marshal(dos);
}
catch(Exception e)
@@ -138,9 +139,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -160,7 +162,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -242,7 +244,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" domainInitialXi: ").append(domainInitialXi).append("\n");
sb.append(" domainFinalXi: ").append(domainFinalXi).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/GridAxisDescriptorFixed.java b/src-generated/edu/nps/moves/dis7/GridAxisDescriptorFixed.java
index b2e1597cdd04d47fdd27e3f22d97b79078edd344..28237aeda533ea46dacc8fc7be847710869e4938 100644
--- a/src-generated/edu/nps/moves/dis7/GridAxisDescriptorFixed.java
+++ b/src-generated/edu/nps/moves/dis7/GridAxisDescriptorFixed.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -68,16 +68,17 @@ public short getInitialIndex()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
super.marshal(dos);
try
{
- dos.writeShort( (short)numberOfPointsOnXiAxis);
- dos.writeShort( (short)initialIndex);
+ dos.writeShort(numberOfPointsOnXiAxis);
+ dos.writeShort(initialIndex);
}
catch(Exception e)
{
@@ -87,9 +88,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -105,7 +107,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -176,7 +178,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" numberOfPointsOnXiAxis: ").append(numberOfPointsOnXiAxis).append("\n");
sb.append(" initialIndex: ").append(initialIndex).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/GridAxisDescriptorVariable.java b/src-generated/edu/nps/moves/dis7/GridAxisDescriptorVariable.java
index 1a7b6fe73753054c95dc0c259ca8f34a87c2d08a..85baa2bae18543b7d77a4c7dff8e5d458024b838 100644
--- a/src-generated/edu/nps/moves/dis7/GridAxisDescriptorVariable.java
+++ b/src-generated/edu/nps/moves/dis7/GridAxisDescriptorVariable.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -122,18 +122,19 @@ public short[] getXiValues()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
super.marshal(dos);
try
{
- dos.writeShort( (short)numberOfPointsOnXiAxis);
- dos.writeShort( (short)initialIndex);
- dos.writeDouble( (double)coordinateScaleXi);
- dos.writeDouble( (double)coordinateOffsetXi);
+ dos.writeShort(numberOfPointsOnXiAxis);
+ dos.writeShort(initialIndex);
+ dos.writeDouble(coordinateScaleXi);
+ dos.writeDouble(coordinateOffsetXi);
for(int idx = 0; idx < xiValues.length; idx++)
dos.writeShort(xiValues[idx]);
@@ -148,9 +149,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -175,7 +177,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -266,7 +268,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" numberOfPointsOnXiAxis: ").append(numberOfPointsOnXiAxis).append("\n");
sb.append(" initialIndex: ").append(initialIndex).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/GridData.java b/src-generated/edu/nps/moves/dis7/GridData.java
index 7a2e5bb3f60033290deb6c42fe2de48b1250314f..9700cd83fec4c230949052bc5a4eab1c6875dca0 100644
--- a/src-generated/edu/nps/moves/dis7/GridData.java
+++ b/src-generated/edu/nps/moves/dis7/GridData.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -67,8 +67,9 @@ public GriddedDataDataRepresentation getDataRepresentation()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -85,9 +86,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -101,7 +103,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -174,7 +176,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" sampleType: ").append(sampleType).append("\n");
sb.append(" dataRepresentation: ").append(dataRepresentation).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/GridDataType0.java b/src-generated/edu/nps/moves/dis7/GridDataType0.java
index 28c45db01c12955647c8fc2102ad250ec1483d8a..761117b8263936dee246898ea328cf59033a65d5 100644
--- a/src-generated/edu/nps/moves/dis7/GridDataType0.java
+++ b/src-generated/edu/nps/moves/dis7/GridDataType0.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -56,15 +56,16 @@ public byte[] getDataValues()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
super.marshal(dos);
try
{
- dos.writeShort( (short)dataValues.length);
+ dos.writeShort(dataValues.length);
for(int idx = 0; idx < dataValues.length; idx++)
dos.writeByte(dataValues[idx]);
@@ -79,9 +80,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -100,7 +102,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -181,7 +183,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" dataValues: ").append("\n");
sb.append(Arrays.toString(dataValues)).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/GridDataType1.java b/src-generated/edu/nps/moves/dis7/GridDataType1.java
index bd10f474c668d5a439082d6b7a60318c9eb53a55..ff3ea3ed511c90f886ad2b645786a6748a5cfee2 100644
--- a/src-generated/edu/nps/moves/dis7/GridDataType1.java
+++ b/src-generated/edu/nps/moves/dis7/GridDataType1.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -88,17 +88,18 @@ public short[] getDataValues()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
super.marshal(dos);
try
{
- dos.writeFloat( (float)fieldScale);
- dos.writeFloat( (float)fieldOffset);
- dos.writeShort( (short)dataValues.length);
+ dos.writeFloat(fieldScale);
+ dos.writeFloat(fieldOffset);
+ dos.writeShort(dataValues.length);
for(int idx = 0; idx < dataValues.length; idx++)
dos.writeShort(dataValues[idx]);
@@ -113,9 +114,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -138,7 +140,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -225,7 +227,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" fieldScale: ").append(fieldScale).append("\n");
sb.append(" fieldOffset: ").append(fieldOffset).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/GridDataType2.java b/src-generated/edu/nps/moves/dis7/GridDataType2.java
index fc99186952227de4762132336900356c0fb76fb4..7b875d720891fa74485dc3f8f94229b99802f79b 100644
--- a/src-generated/edu/nps/moves/dis7/GridDataType2.java
+++ b/src-generated/edu/nps/moves/dis7/GridDataType2.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -69,16 +69,17 @@ public float[] getDataValues()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
super.marshal(dos);
try
{
- dos.writeShort( (short)dataValues.length);
- dos.writeShort( (short)padding);
+ dos.writeShort(dataValues.length);
+ dos.writeShort(padding);
for(int idx = 0; idx < dataValues.length; idx++)
dos.writeFloat(dataValues[idx]);
@@ -92,9 +93,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -113,7 +115,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -195,7 +197,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" padding: ").append(padding).append("\n");
sb.append(" dataValues: ").append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/GriddedDataPdu.java b/src-generated/edu/nps/moves/dis7/GriddedDataPdu.java
index 4d96e48b7f0d99c648dcc22145a135d691caa982..0e9a3f4e1ee7d3f0bcd1a3fe8627ebfb6052ffea 100644
--- a/src-generated/edu/nps/moves/dis7/GriddedDataPdu.java
+++ b/src-generated/edu/nps/moves/dis7/GriddedDataPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -302,8 +302,9 @@ public List<GridData> getGridDataRecords()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -311,19 +312,19 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
environmentalSimulationApplicationID.marshal(dos);
- dos.writeShort( (short)fieldNumber);
- dos.writeShort( (short)pduNumber);
- dos.writeShort( (short)pduTotal);
+ dos.writeShort(fieldNumber);
+ dos.writeShort(pduNumber);
+ dos.writeShort(pduTotal);
coordinateSystem.marshal(dos);
- dos.writeByte( (byte)gridDataRecords.size());
+ dos.writeByte(gridDataRecords.size());
constantGrid.marshal(dos);
environmentType.marshal(dos);
orientation.marshal(dos);
sampleTime.marshal(dos);
- dos.writeInt( (int)totalValues);
- dos.writeByte( (byte)vectorDimension);
- dos.writeByte( (byte)padding1);
- dos.writeShort( (short)padding2);
+ dos.writeInt(totalValues);
+ dos.writeByte(vectorDimension);
+ dos.writeByte(padding1);
+ dos.writeShort(padding2);
for(int idx = 0; idx < gridAxisDescriptors.size(); idx++)
{
@@ -347,9 +348,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -399,7 +401,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -432,14 +434,14 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < gridAxisDescriptors.size(); idx++)
{
- GridAxisDescriptor aGridAxisDescriptor = (GridAxisDescriptor)gridAxisDescriptors.get(idx);
+ GridAxisDescriptor aGridAxisDescriptor = gridAxisDescriptors.get(idx);
aGridAxisDescriptor.marshal(buff);
}
for(int idx = 0; idx < gridDataRecords.size(); idx++)
{
- GridData aGridData = (GridData)gridDataRecords.get(idx);
+ GridData aGridData = gridDataRecords.get(idx);
aGridData.marshal(buff);
}
@@ -541,7 +543,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" environmentalSimulationApplicationID: ").append(environmentalSimulationApplicationID).append("\n");
sb.append(" fieldNumber: ").append(fieldNumber).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/GroupID.java b/src-generated/edu/nps/moves/dis7/GroupID.java
index 92e3a5d4167bad281b8e7c56233574a856ee24cb..e40a1a31c7afb74c79b96930894ebe42b633966b 100644
--- a/src-generated/edu/nps/moves/dis7/GroupID.java
+++ b/src-generated/edu/nps/moves/dis7/GroupID.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -67,15 +67,16 @@ public short getGroupNumber()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
simulationAddress.marshal(dos);
- dos.writeShort( (short)groupNumber);
+ dos.writeShort(groupNumber);
}
catch(Exception e)
{
@@ -85,9 +86,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -100,7 +102,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -173,7 +175,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
sb.append(" groupNumber: ").append(groupNumber).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/IFFData.java b/src-generated/edu/nps/moves/dis7/IFFData.java
index b4a8a4c00efe097790671b52f5903ba45cf6ddf9..2d4afb40702269fe405675a431679a3c090d5f9c 100644
--- a/src-generated/edu/nps/moves/dis7/IFFData.java
+++ b/src-generated/edu/nps/moves/dis7/IFFData.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -86,15 +86,16 @@ public byte[] getRecordSpecificFields()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
recordType.marshal(dos);
- dos.writeShort( (short)recordLength);
+ dos.writeShort(recordLength);
for(int idx = 0; idx < recordSpecificFields.length; idx++)
dos.writeByte(recordSpecificFields[idx]);
@@ -109,9 +110,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -130,7 +132,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -217,7 +219,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" recordType: ").append(recordType).append("\n");
sb.append(" recordLength: ").append(recordLength).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/IFFFundamentalParameterData.java b/src-generated/edu/nps/moves/dis7/IFFFundamentalParameterData.java
index 632b47d3d0b4dc8c11046b24b5c8daf06cc9dc17..d5c5bf4590be967b739dc998486e7d29287d4710 100644
--- a/src-generated/edu/nps/moves/dis7/IFFFundamentalParameterData.java
+++ b/src-generated/edu/nps/moves/dis7/IFFFundamentalParameterData.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -152,18 +152,19 @@ public byte[] getSystemSpecificData()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeFloat( (float)erp);
- dos.writeFloat( (float)frequency);
- dos.writeFloat( (float)pgrf);
- dos.writeFloat( (float)pulseWidth);
- dos.writeInt( (int)burstLength);
+ 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++)
@@ -178,9 +179,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -205,7 +207,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -302,7 +304,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" erp: ").append(erp).append("\n");
sb.append(" frequency: ").append(frequency).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/IFFLayer2Pdu.java b/src-generated/edu/nps/moves/dis7/IFFLayer2Pdu.java
index 1c9d6a0293513366425d160ebe8f30587b263f3b..6360ec5721e6a99a0a91c41e32a75d95d26caecf 100644
--- a/src-generated/edu/nps/moves/dis7/IFFLayer2Pdu.java
+++ b/src-generated/edu/nps/moves/dis7/IFFLayer2Pdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -124,8 +124,9 @@ public List<IFFFundamentalParameterData> getFundamentalIFFParameters()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -134,9 +135,9 @@ public void marshal(DataOutputStream dos) throws Exception
{
layerHeader.marshal(dos);
beamData.marshal(dos);
- dos.writeByte( (byte)secondaryOpParameter1);
- dos.writeByte( (byte)secondaryOpParameter2);
- dos.writeShort( (short)fundamentalIFFParameters.size());
+ dos.writeByte(secondaryOpParameter1);
+ dos.writeByte(secondaryOpParameter2);
+ dos.writeShort(fundamentalIFFParameters.size());
for(int idx = 0; idx < fundamentalIFFParameters.size(); idx++)
{
@@ -153,9 +154,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -182,7 +184,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -206,7 +208,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < fundamentalIFFParameters.size(); idx++)
{
- IFFFundamentalParameterData aIFFFundamentalParameterData = (IFFFundamentalParameterData)fundamentalIFFParameters.get(idx);
+ IFFFundamentalParameterData aIFFFundamentalParameterData = fundamentalIFFParameters.get(idx);
aIFFFundamentalParameterData.marshal(buff);
}
@@ -279,7 +281,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" layerHeader: ").append(layerHeader).append("\n");
sb.append(" beamData: ").append(beamData).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/IFFPdu.java b/src-generated/edu/nps/moves/dis7/IFFPdu.java
index 9c0a47bace46f3c3ab742d01a09cc4f33f92606e..2025f435b8e7d9ce241ddc6bb99ae4fa8f08871c 100644
--- a/src-generated/edu/nps/moves/dis7/IFFPdu.java
+++ b/src-generated/edu/nps/moves/dis7/IFFPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -20,7 +20,7 @@ public class IFFPdu extends DistributedEmissionsFamilyPdu implements Serializabl
/** Number generated by the issuing simulation to associate realted events. */
protected EventIdentifier eventID = new EventIdentifier();
- /** Location wrt entity. There is some ambugiuity 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 */
@@ -151,8 +151,9 @@ public FundamentalOperationalData getFundamentalParameters()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -163,8 +164,8 @@ public void marshal(DataOutputStream dos) throws Exception
eventID.marshal(dos);
location.marshal(dos);
systemID.marshal(dos);
- dos.writeByte( (byte)systemDesignator);
- dos.writeByte( (byte)systemSpecificData);
+ dos.writeByte(systemDesignator);
+ dos.writeByte(systemSpecificData);
fundamentalParameters.marshal(dos);
}
catch(Exception e)
@@ -175,9 +176,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -198,7 +200,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -284,7 +286,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" emittingEntityId: ").append(emittingEntityId).append("\n");
sb.append(" eventID: ").append(eventID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/IOCommsNodeRecord.java b/src-generated/edu/nps/moves/dis7/IOCommsNodeRecord.java
index 754762871d32e315453fe1f3778a9fe576d0f43b..39aa6e18fe439aa362787659e8ccdee33a255204 100644
--- a/src-generated/edu/nps/moves/dis7/IOCommsNodeRecord.java
+++ b/src-generated/edu/nps/moves/dis7/IOCommsNodeRecord.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -116,8 +116,9 @@ public CommunicationsNodeID getCommsNodeId()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -125,9 +126,9 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
recordType.marshal(dos);
- dos.writeShort( (short)recordLength);
+ dos.writeShort(recordLength);
commsNodeType.marshal(dos);
- dos.writeByte( (byte)padding);
+ dos.writeByte(padding);
commsNodeId.marshal(dos);
}
catch(Exception e)
@@ -138,9 +139,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -161,7 +163,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -241,7 +243,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" recordType: ").append(recordType).append("\n");
sb.append(" recordLength: ").append(recordLength).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/IOEffectRecord.java b/src-generated/edu/nps/moves/dis7/IOEffectRecord.java
index 5a5e6a806c49e5292eebe8da3491453bf034cd25..780273000b72b83f43b81e95a9d556e6f342d431 100644
--- a/src-generated/edu/nps/moves/dis7/IOEffectRecord.java
+++ b/src-generated/edu/nps/moves/dis7/IOEffectRecord.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -183,8 +183,9 @@ public short getPadding()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -192,14 +193,14 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
recordType.marshal(dos);
- dos.writeShort( (short)recordLength);
+ dos.writeShort(recordLength);
ioStatus.marshal(dos);
ioLinkType.marshal(dos);
ioEffect.marshal(dos);
- dos.writeByte( (byte)ioEffectDutyCycle);
- dos.writeShort( (short)ioEffectDuration);
+ dos.writeByte(ioEffectDutyCycle);
+ dos.writeShort(ioEffectDuration);
ioProcess.marshal(dos);
- dos.writeShort( (short)padding);
+ dos.writeShort(padding);
}
catch(Exception e)
{
@@ -209,9 +210,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -241,7 +243,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -333,7 +335,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" recordType: ").append(recordType).append("\n");
sb.append(" recordLength: ").append(recordLength).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/IORecord.java b/src-generated/edu/nps/moves/dis7/IORecord.java
index 4f3c1090b17329055b5f7af117f66012bd27785f..f0251c841c591e86bd9e9eb77a06febe49627ecf 100644
--- a/src-generated/edu/nps/moves/dis7/IORecord.java
+++ b/src-generated/edu/nps/moves/dis7/IORecord.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -33,8 +33,9 @@ public int getMarshalledSize()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -49,9 +50,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -61,7 +63,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -128,7 +130,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
return sb.toString();
diff --git a/src-generated/edu/nps/moves/dis7/IdentificationFriendOrFoePdu.java b/src-generated/edu/nps/moves/dis7/IdentificationFriendOrFoePdu.java
index 967d24340d45deae0a3b959d0ad488c4bb4a2c9a..160e0e5192c3fced12811cfc7c909c7ed6c44cec 100644
--- a/src-generated/edu/nps/moves/dis7/IdentificationFriendOrFoePdu.java
+++ b/src-generated/edu/nps/moves/dis7/IdentificationFriendOrFoePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
diff --git a/src-generated/edu/nps/moves/dis7/IffDataSpecification.java b/src-generated/edu/nps/moves/dis7/IffDataSpecification.java
index 759112e2d84f40c509ac867318a1ae30d6771f74..3978de5caeed1acb48a4c6324c90288ef6712e11 100644
--- a/src-generated/edu/nps/moves/dis7/IffDataSpecification.java
+++ b/src-generated/edu/nps/moves/dis7/IffDataSpecification.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -58,14 +58,15 @@ public List<IFFData> getIffDataRecords()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeShort( (short)iffDataRecords.size());
+ dos.writeShort(iffDataRecords.size());
for(int idx = 0; idx < iffDataRecords.size(); idx++)
{
@@ -82,9 +83,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -103,7 +105,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -122,7 +124,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < iffDataRecords.size(); idx++)
{
- IFFData aIFFData = (IFFData)iffDataRecords.get(idx);
+ IFFData aIFFData = iffDataRecords.get(idx);
aIFFData.marshal(buff);
}
@@ -190,7 +192,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" iffDataRecords: ").append("\n");
iffDataRecords.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
diff --git a/src-generated/edu/nps/moves/dis7/InformationOperationsActionPdu.java b/src-generated/edu/nps/moves/dis7/InformationOperationsActionPdu.java
index 98596466551b4033e7728f82ef4cb4072b9f5280..1dd5645c134cf47f6e0f6a61c31a8b7f4dbf65fe 100644
--- a/src-generated/edu/nps/moves/dis7/InformationOperationsActionPdu.java
+++ b/src-generated/edu/nps/moves/dis7/InformationOperationsActionPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -224,8 +224,9 @@ public List<IORecord> getIoRecords()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -233,16 +234,16 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
receivingSimID.marshal(dos);
- dos.writeInt( (int)requestID);
+ dos.writeInt(requestID);
IOWarfareType.marshal(dos);
IOSimulationSource.marshal(dos);
IOActionType.marshal(dos);
IOActionPhase.marshal(dos);
- dos.writeInt( (int)padding1);
+ dos.writeInt(padding1);
ioAttackerID.marshal(dos);
ioPrimaryTargetID.marshal(dos);
- dos.writeShort( (short)padding2);
- dos.writeShort( (short)ioRecords.size());
+ dos.writeShort(padding2);
+ dos.writeShort(ioRecords.size());
for(int idx = 0; idx < ioRecords.size(); idx++)
{
@@ -259,9 +260,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -299,7 +301,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -329,7 +331,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < ioRecords.size(); idx++)
{
- IORecord aIORecord = (IORecord)ioRecords.get(idx);
+ IORecord aIORecord = ioRecords.get(idx);
aIORecord.marshal(buff);
}
@@ -414,7 +416,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" receivingSimID: ").append(receivingSimID).append("\n");
sb.append(" requestID: ").append(requestID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/InformationOperationsFamilyPdu.java b/src-generated/edu/nps/moves/dis7/InformationOperationsFamilyPdu.java
index ff7182045e3be493aa5b333848e22345bbf955cc..fc309f8d499e021e8c7259540afd67615963816b 100644
--- a/src-generated/edu/nps/moves/dis7/InformationOperationsFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/InformationOperationsFamilyPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -51,8 +51,9 @@ public EntityID getOriginatingSimID()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -69,9 +70,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -84,7 +86,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -152,7 +154,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" originatingSimID: ").append(originatingSimID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/InformationOperationsReportPdu.java b/src-generated/edu/nps/moves/dis7/InformationOperationsReportPdu.java
index 7aa6b22e266a22d0e3921e6830c6b6f9939d8208..849ecc52b30c101c0d8ccf3ce05f19fc1b4d8118 100644
--- a/src-generated/edu/nps/moves/dis7/InformationOperationsReportPdu.java
+++ b/src-generated/edu/nps/moves/dis7/InformationOperationsReportPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -172,8 +172,9 @@ public List<IORecord> getIoRecords()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -182,12 +183,12 @@ public void marshal(DataOutputStream dos) throws Exception
{
ioSimSource.marshal(dos);
ioReportType.marshal(dos);
- dos.writeByte( (byte)padding1);
+ dos.writeByte(padding1);
ioAttackerID.marshal(dos);
ioPrimaryTargetID.marshal(dos);
- dos.writeShort( (short)padding2);
- dos.writeShort( (short)padding3);
- dos.writeShort( (short)ioRecords.size());
+ dos.writeShort(padding2);
+ dos.writeShort(padding3);
+ dos.writeShort(ioRecords.size());
for(int idx = 0; idx < ioRecords.size(); idx++)
{
@@ -204,9 +205,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -239,7 +241,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -266,7 +268,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < ioRecords.size(); idx++)
{
- IORecord aIORecord = (IORecord)ioRecords.get(idx);
+ IORecord aIORecord = ioRecords.get(idx);
aIORecord.marshal(buff);
}
@@ -345,7 +347,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" ioSimSource: ").append(ioSimSource).append("\n");
sb.append(" ioReportType: ").append(ioReportType).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/IntercomCommunicationsParameters.java b/src-generated/edu/nps/moves/dis7/IntercomCommunicationsParameters.java
index 5b49bc4c2ed1161a79a3b89f05f028997489c3e9..8395b47317cd8247ab8dcafee39c585ab8f997f2 100644
--- a/src-generated/edu/nps/moves/dis7/IntercomCommunicationsParameters.java
+++ b/src-generated/edu/nps/moves/dis7/IntercomCommunicationsParameters.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -10,7 +10,7 @@ import java.io.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * Intercom communcations parameters. Section 6.2.46
+ * 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
@@ -87,15 +87,16 @@ public byte[] getRecordSpecificField()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
recordType.marshal(dos);
- dos.writeShort( (short)recordLength);
+ dos.writeShort(recordLength);
for(int idx = 0; idx < recordSpecificField.length; idx++)
dos.writeByte(recordSpecificField[idx]);
@@ -110,9 +111,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -131,7 +133,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -218,7 +220,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" recordType: ").append(recordType).append("\n");
sb.append(" recordLength: ").append(recordLength).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/IntercomControlPdu.java b/src-generated/edu/nps/moves/dis7/IntercomControlPdu.java
index d41faa72be343d6d0e1f4d7e59bab96e6e600182..acbfc74452645b06eade37c2fc83cc424a5c318b 100644
--- a/src-generated/edu/nps/moves/dis7/IntercomControlPdu.java
+++ b/src-generated/edu/nps/moves/dis7/IntercomControlPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -245,8 +245,9 @@ public List<IntercomCommunicationsParameters> getIntercomParameters()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -254,17 +255,17 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
controlType.marshal(dos);
- dos.writeByte( (byte)communicationsChannelType);
+ dos.writeByte(communicationsChannelType);
sourceEntityID.marshal(dos);
- dos.writeShort( (short)sourceIntercomNumber);
- dos.writeByte( (byte)sourceLineID);
- dos.writeByte( (byte)transmitPriority);
+ dos.writeShort(sourceIntercomNumber);
+ dos.writeByte(sourceLineID);
+ dos.writeByte(transmitPriority);
transmitLineState.marshal(dos);
command.marshal(dos);
masterIntercomReferenceID.marshal(dos);
- dos.writeShort( (short)masterIntercomNumber);
- dos.writeShort( (short)masterChannelID);
- dos.writeInt( (int)intercomParameters.size());
+ dos.writeShort(masterIntercomNumber);
+ dos.writeShort(masterChannelID);
+ dos.writeInt(intercomParameters.size());
for(int idx = 0; idx < intercomParameters.size(); idx++)
{
@@ -281,9 +282,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -324,7 +326,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -355,7 +357,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < intercomParameters.size(); idx++)
{
- IntercomCommunicationsParameters aIntercomCommunicationsParameters = (IntercomCommunicationsParameters)intercomParameters.get(idx);
+ IntercomCommunicationsParameters aIntercomCommunicationsParameters = intercomParameters.get(idx);
aIntercomCommunicationsParameters.marshal(buff);
}
@@ -442,7 +444,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" controlType: ").append(controlType).append("\n");
sb.append(" communicationsChannelType: ").append(communicationsChannelType).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/IntercomIdentifier.java b/src-generated/edu/nps/moves/dis7/IntercomIdentifier.java
index c9f6b997f1c7bc9b1d44dfa2686460fb74a12458..55e3de7ad3fff023d0d22c0388cbc037fec216bc 100644
--- a/src-generated/edu/nps/moves/dis7/IntercomIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/IntercomIdentifier.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -97,17 +97,18 @@ public short getIntercomNumber()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeShort( (short)siteNumber);
- dos.writeShort( (short)applicationNumber);
- dos.writeShort( (short)referenceNumber);
- dos.writeShort( (short)intercomNumber);
+ dos.writeShort(siteNumber);
+ dos.writeShort(applicationNumber);
+ dos.writeShort(referenceNumber);
+ dos.writeShort(intercomNumber);
}
catch(Exception e)
{
@@ -117,9 +118,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -137,7 +139,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -216,7 +218,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" siteNumber: ").append(siteNumber).append("\n");
sb.append(" applicationNumber: ").append(applicationNumber).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/IntercomReferenceID.java b/src-generated/edu/nps/moves/dis7/IntercomReferenceID.java
index 472395e0ae8494b057e02328e9ddf831f9724187..21b7c969207781a14b3cb5b65dbcbc6f4c6fed22 100644
--- a/src-generated/edu/nps/moves/dis7/IntercomReferenceID.java
+++ b/src-generated/edu/nps/moves/dis7/IntercomReferenceID.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -80,16 +80,17 @@ public short getReferenceNumber()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeShort( (short)siteNumber);
- dos.writeShort( (short)applicationNumber);
- dos.writeShort( (short)referenceNumber);
+ dos.writeShort(siteNumber);
+ dos.writeShort(applicationNumber);
+ dos.writeShort(referenceNumber);
}
catch(Exception e)
{
@@ -99,9 +100,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -117,7 +119,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -193,7 +195,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" siteNumber: ").append(siteNumber).append("\n");
sb.append(" applicationNumber: ").append(applicationNumber).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/IntercomSignalPdu.java b/src-generated/edu/nps/moves/dis7/IntercomSignalPdu.java
index 08907300c22d262e02ce47454f6581231b33c070..1e7556c118b10dff85f40b592838d16cd1121aff 100644
--- a/src-generated/edu/nps/moves/dis7/IntercomSignalPdu.java
+++ b/src-generated/edu/nps/moves/dis7/IntercomSignalPdu.java
@@ -1,10 +1,9 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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.*;
@@ -14,7 +13,11 @@ 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
@@ -63,12 +66,12 @@ public class IntercomSignalPdu extends RadioCommunicationsFamilyPdu implements S
/**
* Returns the size of this serialized object in bytes
+ * @return
*/
+ @Override
public int getMarshalledSize()
{
- int marshalSize = 0;
-
- marshalSize = super.getMarshalledSize();
+ int marshalSize = super.getMarshalledSize();
marshalSize += intercomReferenceID.getMarshalledSize();
marshalSize += 2; // intercomNumber
marshalSize += 2; // encodingScheme
@@ -84,6 +87,8 @@ public class IntercomSignalPdu extends RadioCommunicationsFamilyPdu implements S
/**
* Setter for {@link IntercomSignalPdu#intercomReferenceID}
+ * @param pIntercomReferenceID
+ * @return
*/
public IntercomSignalPdu setIntercomReferenceID(IntercomReferenceID pIntercomReferenceID)
{
@@ -93,6 +98,7 @@ public class IntercomSignalPdu extends RadioCommunicationsFamilyPdu implements S
/**
* Getter for {@link IntercomSignalPdu#intercomReferenceID}
+ * @return
*/
public IntercomReferenceID getIntercomReferenceID()
{
@@ -101,6 +107,8 @@ public class IntercomSignalPdu extends RadioCommunicationsFamilyPdu implements S
/**
* Setter for {@link IntercomSignalPdu#intercomNumber}
+ * @param pIntercomNumber
+ * @return
*/
public IntercomSignalPdu setIntercomNumber(short pIntercomNumber)
{
@@ -110,6 +118,7 @@ public class IntercomSignalPdu extends RadioCommunicationsFamilyPdu implements S
/**
* Getter for {@link IntercomSignalPdu#intercomNumber}
+ * @return
*/
public short getIntercomNumber()
{
@@ -118,6 +127,8 @@ public class IntercomSignalPdu extends RadioCommunicationsFamilyPdu implements S
/**
* Setter for {@link IntercomSignalPdu#encodingScheme}
+ * @param pEncodingScheme
+ * @return
*/
public IntercomSignalPdu setEncodingScheme(short pEncodingScheme)
{
@@ -127,6 +138,7 @@ public class IntercomSignalPdu extends RadioCommunicationsFamilyPdu implements S
/**
* Getter for {@link IntercomSignalPdu#encodingScheme}
+ * @return
*/
public short getEncodingScheme()
{
@@ -135,6 +147,8 @@ public class IntercomSignalPdu extends RadioCommunicationsFamilyPdu implements S
/**
* Setter for {@link IntercomSignalPdu#tdlType}
+ * @param pTdlType
+ * @return
*/
public IntercomSignalPdu setTdlType(SignalTDLType pTdlType)
{
@@ -144,6 +158,7 @@ public class IntercomSignalPdu extends RadioCommunicationsFamilyPdu implements S
/**
* Getter for {@link IntercomSignalPdu#tdlType}
+ * @return
*/
public SignalTDLType getTdlType()
{
@@ -152,6 +167,8 @@ public class IntercomSignalPdu extends RadioCommunicationsFamilyPdu implements S
/**
* Setter for {@link IntercomSignalPdu#sampleRate}
+ * @param pSampleRate
+ * @return
*/
public IntercomSignalPdu setSampleRate(int pSampleRate)
{
@@ -161,6 +178,7 @@ public class IntercomSignalPdu extends RadioCommunicationsFamilyPdu implements S
/**
* Getter for {@link IntercomSignalPdu#sampleRate}
+ * @return
*/
public int getSampleRate()
{
@@ -196,6 +214,8 @@ public class IntercomSignalPdu extends RadioCommunicationsFamilyPdu implements S
/**
* Setter for {@link IntercomSignalPdu#samples}
+ * @param pSamples
+ * @return
*/
public IntercomSignalPdu setSamples(short pSamples)
{
@@ -205,6 +225,7 @@ public class IntercomSignalPdu extends RadioCommunicationsFamilyPdu implements S
/**
* Getter for {@link IntercomSignalPdu#samples}
+ * @return
*/
public short getSamples()
{
@@ -213,6 +234,8 @@ public class IntercomSignalPdu extends RadioCommunicationsFamilyPdu implements S
/**
* Setter for {@link IntercomSignalPdu#data}
+ * @param pData
+ * @return
*/
public IntercomSignalPdu setData(byte[] pData)
{
@@ -222,6 +245,7 @@ public class IntercomSignalPdu extends RadioCommunicationsFamilyPdu implements S
/**
* Getter for {@link IntercomSignalPdu#data}
+ * @return
*/
public byte[] getData()
{
@@ -229,30 +253,33 @@ public class IntercomSignalPdu extends RadioCommunicationsFamilyPdu implements S
}
/* *************************** */
- /* Marshal / unmarshal methods */
- /* *************************** */
+ /* Marshal / unmarshal methods */
+ /* *************************** */
+
/**
* Serializes an object to a DataOutputStream.
*
+ * @throws java.lang.Exception
* @see java.io.DataOutputStream
* @param dos The DataOutputStream
*/
+ @Override
public void marshal(DataOutputStream dos) throws Exception
{
super.marshal(dos);
try {
intercomReferenceID.marshal(dos);
- dos.writeShort((short) intercomNumber);
- dos.writeShort((short) encodingScheme);
+ dos.writeShort(intercomNumber);
+ dos.writeShort(encodingScheme);
tdlType.marshal(dos);
- dos.writeInt((int) sampleRate);
+ dos.writeInt(sampleRate);
if (dataLength != null)
- dos.writeShort((short) dataLength);
+ dos.writeShort(dataLength);
else
- dos.writeShort((short) (dataLength = calculateDataLength()));
+ dos.writeShort((dataLength = calculateDataLength()));
- dos.writeShort((short) samples);
+ dos.writeShort(samples);
for (int idx = 0; idx < data.length; idx++) {
dos.writeByte(data[idx]);
@@ -268,10 +295,12 @@ public class IntercomSignalPdu extends RadioCommunicationsFamilyPdu implements S
/**
* Unserializes an object from a DataInputStream.
*
+ * @throws java.lang.Exception
* @see java.io.DataInputStream
* @param dis The DataInputStream
* @return marshalled size
*/
+ @Override
public int unmarshal(DataInputStream dis) throws Exception
{
int uPosition = 0;
@@ -313,24 +342,25 @@ public class IntercomSignalPdu extends RadioCommunicationsFamilyPdu implements S
* @param buff The ByteBuffer at the position to begin writing
* @throws Exception ByteBuffer-generated exception
*/
+ @Override
public void marshal(java.nio.ByteBuffer buff) throws Exception
{
super.marshal(buff);
intercomReferenceID.marshal(buff);
- buff.putShort((short) intercomNumber);
- buff.putShort((short) encodingScheme);
+ buff.putShort(intercomNumber);
+ buff.putShort(encodingScheme);
tdlType.marshal(buff);
- buff.putInt((int) sampleRate);
+ buff.putInt(sampleRate);
if (dataLength != null)
- buff.putShort((short) dataLength);
+ buff.putShort(dataLength);
else
- buff.putShort((short) (dataLength = calculateDataLength()));
+ buff.putShort((dataLength = calculateDataLength()));
- buff.putShort((short) samples);
+ buff.putShort(samples);
for (int idx = 0; idx < data.length; idx++) {
- buff.put((byte) data[idx]);
+ buff.put(data[idx]);
}
padTo32 = new byte[Align.to32bits(buff)];
@@ -345,6 +375,7 @@ public class IntercomSignalPdu extends RadioCommunicationsFamilyPdu implements S
* @return marshalled size
* @throws Exception ByteBuffer-generated exception
*/
+ @Override
public int unmarshal(java.nio.ByteBuffer buff) throws Exception
{
super.unmarshal(buff);
diff --git a/src-generated/edu/nps/moves/dis7/IsGroupOfPdu.java b/src-generated/edu/nps/moves/dis7/IsGroupOfPdu.java
index f5232856bb097c2a7b59c751d560b83fe305a1a3..6c377f764fcf0c654623963a2283408902c056f4 100644
--- a/src-generated/edu/nps/moves/dis7/IsGroupOfPdu.java
+++ b/src-generated/edu/nps/moves/dis7/IsGroupOfPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -145,8 +145,9 @@ public List<VariableDatum> getGroupedEntityDescriptions()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -155,10 +156,10 @@ public void marshal(DataOutputStream dos) throws Exception
{
groupEntityID.marshal(dos);
groupedEntityCategory.marshal(dos);
- dos.writeByte( (byte)groupedEntityDescriptions.size());
- dos.writeInt( (int)pad);
- dos.writeDouble( (double)latitude);
- dos.writeDouble( (double)longitude);
+ dos.writeByte(groupedEntityDescriptions.size());
+ dos.writeInt(pad);
+ dos.writeDouble(latitude);
+ dos.writeDouble(longitude);
for(int idx = 0; idx < groupedEntityDescriptions.size(); idx++)
{
@@ -175,9 +176,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -207,7 +209,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -232,7 +234,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < groupedEntityDescriptions.size(); idx++)
{
- VariableDatum aVariableDatum = (VariableDatum)groupedEntityDescriptions.get(idx);
+ VariableDatum aVariableDatum = groupedEntityDescriptions.get(idx);
aVariableDatum.marshal(buff);
}
@@ -307,7 +309,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" groupEntityID: ").append(groupEntityID).append("\n");
sb.append(" groupedEntityCategory: ").append(groupedEntityCategory).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/IsPartOfPdu.java b/src-generated/edu/nps/moves/dis7/IsPartOfPdu.java
index 433a1646d2ab418797f3a2376d78bce101589b4f..be3a927964cf774d9dd1dcc76d0405706c32bf6c 100644
--- a/src-generated/edu/nps/moves/dis7/IsPartOfPdu.java
+++ b/src-generated/edu/nps/moves/dis7/IsPartOfPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -137,8 +137,9 @@ public EntityType getPartEntityType()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -160,9 +161,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -180,7 +182,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -263,7 +265,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" orginatingEntityID: ").append(orginatingEntityID).append("\n");
sb.append(" receivingEntityID: ").append(receivingEntityID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/JammingTechnique.java b/src-generated/edu/nps/moves/dis7/JammingTechnique.java
index 72f501eb8b75458586c3dcbd44557df8a12c149d..fe9ef1c598ae4b237559580ab0a2da196bed4d99 100644
--- a/src-generated/edu/nps/moves/dis7/JammingTechnique.java
+++ b/src-generated/edu/nps/moves/dis7/JammingTechnique.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -97,17 +97,18 @@ public byte getSpecific()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeByte( (byte)kind);
- dos.writeByte( (byte)category);
- dos.writeByte( (byte)subCategory);
- dos.writeByte( (byte)specific);
+ dos.writeByte(kind);
+ dos.writeByte(category);
+ dos.writeByte(subCategory);
+ dos.writeByte(specific);
}
catch(Exception e)
{
@@ -117,9 +118,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -137,7 +139,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -216,7 +218,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" kind: ").append(kind).append("\n");
sb.append(" category: ").append(category).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/LEDetonationPdu.java b/src-generated/edu/nps/moves/dis7/LEDetonationPdu.java
index de0b6b1e3ae291ef0b963179af8411434014cd9c..f78db40982f7870da0b14fdd4ca9f30608da1bdc 100644
--- a/src-generated/edu/nps/moves/dis7/LEDetonationPdu.java
+++ b/src-generated/edu/nps/moves/dis7/LEDetonationPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -228,8 +228,9 @@ public byte getDetonationResult()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -237,8 +238,8 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
firingLiveEntityId.marshal(dos);
- dos.writeByte( (byte)detonationFlag1);
- dos.writeByte( (byte)detonationFlag2);
+ dos.writeByte(detonationFlag1);
+ dos.writeByte(detonationFlag2);
targetLiveEntityId.marshal(dos);
munitionLiveEntityId.marshal(dos);
eventId.marshal(dos);
@@ -247,7 +248,7 @@ public void marshal(DataOutputStream dos) throws Exception
munitionOrientation.marshal(dos);
munitionDescriptor.marshal(dos);
entityLocation.marshal(dos);
- dos.writeByte( (byte)detonationResult);
+ dos.writeByte(detonationResult);
}
catch(Exception e)
{
@@ -257,9 +258,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -286,7 +288,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -387,7 +389,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" firingLiveEntityId: ").append(firingLiveEntityId).append("\n");
sb.append(" detonationFlag1: ").append(detonationFlag1).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/LEFirePdu.java b/src-generated/edu/nps/moves/dis7/LEFirePdu.java
index 010faa294ecd3374177ac0c7093ff4060e36820b..83ebe2bd15f26e3f7f01c8c59b291650b1517829 100644
--- a/src-generated/edu/nps/moves/dis7/LEFirePdu.java
+++ b/src-generated/edu/nps/moves/dis7/LEFirePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -17,7 +17,7 @@ public class LEFirePdu extends LiveEntityFamilyPdu implements Serializable
{
protected EntityID firingLiveEntityId = new EntityID();
- /** Bits defined in IEE Std. */
+ /** Bits defined in IEEE Standard */
protected byte flags;
protected EntityID targetLiveEntityId = new EntityID();
@@ -180,8 +180,9 @@ public short getRange()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -189,14 +190,14 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
firingLiveEntityId.marshal(dos);
- dos.writeByte( (byte)flags);
+ dos.writeByte(flags);
targetLiveEntityId.marshal(dos);
munitionLiveEntityId.marshal(dos);
eventId.marshal(dos);
location.marshal(dos);
munitionDescriptor.marshal(dos);
velocity.marshal(dos);
- dos.writeShort( (short)range);
+ dos.writeShort(range);
}
catch(Exception e)
{
@@ -206,9 +207,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -231,7 +233,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -323,7 +325,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" firingLiveEntityId: ").append(firingLiveEntityId).append("\n");
sb.append(" flags: ").append(flags).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/LEVector3FixedByte.java b/src-generated/edu/nps/moves/dis7/LEVector3FixedByte.java
index 924f25dd26727823072c5c288d2111b65086e703..a0b17ab73e80d62349e9c0c64a82ab895af3ebbf 100644
--- a/src-generated/edu/nps/moves/dis7/LEVector3FixedByte.java
+++ b/src-generated/edu/nps/moves/dis7/LEVector3FixedByte.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -84,16 +84,17 @@ public byte getZ()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeByte( (byte)x);
- dos.writeByte( (byte)y);
- dos.writeByte( (byte)z);
+ dos.writeByte(x);
+ dos.writeByte(y);
+ dos.writeByte(z);
}
catch(Exception e)
{
@@ -103,9 +104,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -121,7 +123,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -197,7 +199,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" x: ").append(x).append("\n");
sb.append(" y: ").append(y).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/LaunchedMunitionRecord.java b/src-generated/edu/nps/moves/dis7/LaunchedMunitionRecord.java
index 4e31e992314f5de9f8f37644e2e85a438a94334a..56fd58213de600fe39e8545ad301efc3c4cadef1 100644
--- a/src-generated/edu/nps/moves/dis7/LaunchedMunitionRecord.java
+++ b/src-generated/edu/nps/moves/dis7/LaunchedMunitionRecord.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -145,19 +145,20 @@ public Vector3Double getTargetLocation()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
fireEventID.marshal(dos);
- dos.writeShort( (short)padding);
+ dos.writeShort(padding);
firingEntityID.marshal(dos);
- dos.writeShort( (short)padding2);
+ dos.writeShort(padding2);
targetEntityID.marshal(dos);
- dos.writeShort( (short)padding3);
+ dos.writeShort(padding3);
targetLocation.marshal(dos);
}
catch(Exception e)
@@ -168,9 +169,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -190,7 +192,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -278,7 +280,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" fireEventID: ").append(fireEventID).append("\n");
sb.append(" padding: ").append(padding).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/LayerHeader.java b/src-generated/edu/nps/moves/dis7/LayerHeader.java
index 4639a4bfe54c4e47c18e5ce28d1166f8a69d4a21..875dff2dda2e10d37f23d4707b4fca92f8643253 100644
--- a/src-generated/edu/nps/moves/dis7/LayerHeader.java
+++ b/src-generated/edu/nps/moves/dis7/LayerHeader.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -83,16 +83,17 @@ public short getLength()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeByte( (byte)layerNumber);
- dos.writeByte( (byte)layerSpecificInformation);
- dos.writeShort( (short)length);
+ dos.writeByte(layerNumber);
+ dos.writeByte(layerSpecificInformation);
+ dos.writeShort(length);
}
catch(Exception e)
{
@@ -102,9 +103,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -120,7 +122,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -196,7 +198,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" layerNumber: ").append(layerNumber).append("\n");
sb.append(" layerSpecificInformation: ").append(layerSpecificInformation).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/LinearObjectStatePdu.java b/src-generated/edu/nps/moves/dis7/LinearObjectStatePdu.java
index 40666e02016daaa65fb7e7d0f53e32865c26e6e9..d3ce4125aa2919da4ed3af4998d8c221b15269c3 100644
--- a/src-generated/edu/nps/moves/dis7/LinearObjectStatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/LinearObjectStatePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -179,8 +179,9 @@ public List<LinearSegmentParameter> getLinearSegmentParameters()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -189,9 +190,9 @@ public void marshal(DataOutputStream dos) throws Exception
{
objectID.marshal(dos);
referencedObjectID.marshal(dos);
- dos.writeShort( (short)updateNumber);
+ dos.writeShort(updateNumber);
forceID.marshal(dos);
- dos.writeByte( (byte)linearSegmentParameters.size());
+ dos.writeByte(linearSegmentParameters.size());
requesterID.marshal(dos);
receivingID.marshal(dos);
objectType.marshal(dos);
@@ -211,9 +212,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -243,7 +245,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -270,7 +272,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < linearSegmentParameters.size(); idx++)
{
- LinearSegmentParameter aLinearSegmentParameter = (LinearSegmentParameter)linearSegmentParameters.get(idx);
+ LinearSegmentParameter aLinearSegmentParameter = linearSegmentParameters.get(idx);
aLinearSegmentParameter.marshal(buff);
}
@@ -349,7 +351,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" objectID: ").append(objectID).append("\n");
sb.append(" referencedObjectID: ").append(referencedObjectID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/LinearSegmentParameter.java b/src-generated/edu/nps/moves/dis7/LinearSegmentParameter.java
index 97c275c14dbc22bc52649ff0509474dfbb8c725c..936381a091a3ad4e4ee0db4e31cef8669a640ae5 100644
--- a/src-generated/edu/nps/moves/dis7/LinearSegmentParameter.java
+++ b/src-generated/edu/nps/moves/dis7/LinearSegmentParameter.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -220,24 +220,25 @@ public int getPadding()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeByte( (byte)segmentNumber);
+ dos.writeByte(segmentNumber);
segmentModification.marshal(dos);
generalSegmentAppearance.marshal(dos);
- dos.writeInt( (int)specificSegmentAppearance);
+ dos.writeInt(specificSegmentAppearance);
segmentLocation.marshal(dos);
segmentOrientation.marshal(dos);
- dos.writeFloat( (float)segmentLength);
- dos.writeFloat( (float)segmentWidth);
- dos.writeFloat( (float)segmentHeight);
- dos.writeFloat( (float)segmentDepth);
- dos.writeInt( (int)padding);
+ dos.writeFloat(segmentLength);
+ dos.writeFloat(segmentWidth);
+ dos.writeFloat(segmentHeight);
+ dos.writeFloat(segmentDepth);
+ dos.writeInt(padding);
}
catch(Exception e)
{
@@ -247,9 +248,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -277,7 +279,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -377,7 +379,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" segmentNumber: ").append(segmentNumber).append("\n");
sb.append(" segmentModification: ").append(segmentModification).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/LiveDeadReckoningParameters.java b/src-generated/edu/nps/moves/dis7/LiveDeadReckoningParameters.java
index 1b7f6b91bb161f7b7f9aae2bc683de9aad58bb41..a9132621e50677226c3316f22564720128b0fae3 100644
--- a/src-generated/edu/nps/moves/dis7/LiveDeadReckoningParameters.java
+++ b/src-generated/edu/nps/moves/dis7/LiveDeadReckoningParameters.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -82,8 +82,9 @@ public LEVector3FixedByte getEntityAngularVelocity()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -101,9 +102,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -117,7 +119,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -193,7 +195,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" deadReckoningAlgorithm: ").append(deadReckoningAlgorithm).append("\n");
sb.append(" entityLinearAcceleration: ").append(entityLinearAcceleration).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityDetonationPdu.java b/src-generated/edu/nps/moves/dis7/LiveEntityDetonationPdu.java
index 03d1c61da5344e923820bb82d5c1af62ce0e2283..3ad54a609f44f139e3a80473b083c1f95083f57e 100644
--- a/src-generated/edu/nps/moves/dis7/LiveEntityDetonationPdu.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityDetonationPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityFamilyPdu.java b/src-generated/edu/nps/moves/dis7/LiveEntityFamilyPdu.java
index 1a27e8e6466ff159d76939ab7e846bbc498578a9..675d3e8740fdd3ab413217a420b1845cc9929782 100644
--- a/src-generated/edu/nps/moves/dis7/LiveEntityFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityFamilyPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -34,8 +34,9 @@ public int getMarshalledSize()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -51,9 +52,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -65,7 +67,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -130,7 +132,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
return sb.toString();
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityFirePdu.java b/src-generated/edu/nps/moves/dis7/LiveEntityFirePdu.java
index 5a756d56e8a7cf18adca4b8e3787de0b591585af..90f8d8b1c0366b965ae7bfa0bfd2088a96f5d517 100644
--- a/src-generated/edu/nps/moves/dis7/LiveEntityFirePdu.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityFirePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityIdentifier.java b/src-generated/edu/nps/moves/dis7/LiveEntityIdentifier.java
index 1c1907d8c087af5758487ee11b19d41766d9c4d1..e6aac2f40dd8334db6bf14b6c2337d713bf8ffbe 100644
--- a/src-generated/edu/nps/moves/dis7/LiveEntityIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityIdentifier.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -67,15 +67,16 @@ public short getEntityNumber()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
liveSimulationAddress.marshal(dos);
- dos.writeShort( (short)entityNumber);
+ dos.writeShort(entityNumber);
}
catch(Exception e)
{
@@ -85,9 +86,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -100,7 +102,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -173,7 +175,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" liveSimulationAddress: ").append(liveSimulationAddress).append("\n");
sb.append(" entityNumber: ").append(entityNumber).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityLinearVelocity.java b/src-generated/edu/nps/moves/dis7/LiveEntityLinearVelocity.java
index fc03eefa69e528aeedbe03eec9962ec62ef70c77..ec5c7ccb736d5c65162128404d4984b6016f4ac7 100644
--- a/src-generated/edu/nps/moves/dis7/LiveEntityLinearVelocity.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityLinearVelocity.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -81,16 +81,17 @@ public short getZComponent()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeShort( (short)xComponent);
- dos.writeShort( (short)yComponent);
- dos.writeShort( (short)zComponent);
+ dos.writeShort(xComponent);
+ dos.writeShort(yComponent);
+ dos.writeShort(zComponent);
}
catch(Exception e)
{
@@ -100,9 +101,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -118,7 +120,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -194,7 +196,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" xComponent: ").append(xComponent).append("\n");
sb.append(" yComponent: ").append(yComponent).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityOrientation.java b/src-generated/edu/nps/moves/dis7/LiveEntityOrientation.java
index 19fd7261968790c027f01a596fe71f276dd36aba..b928c05663c18388e9d11974c11870c48060c187 100644
--- a/src-generated/edu/nps/moves/dis7/LiveEntityOrientation.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityOrientation.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -81,16 +81,17 @@ public byte getPhi()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeByte( (byte)psi);
- dos.writeByte( (byte)theta);
- dos.writeByte( (byte)phi);
+ dos.writeByte(psi);
+ dos.writeByte(theta);
+ dos.writeByte(phi);
}
catch(Exception e)
{
@@ -100,9 +101,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -118,7 +120,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -194,7 +196,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" psi: ").append(psi).append("\n");
sb.append(" theta: ").append(theta).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityOrientation16.java b/src-generated/edu/nps/moves/dis7/LiveEntityOrientation16.java
index 6459c312a00aab0a8723ad89b7313ff55d43ec07..3f1b69d8b33ccbea5054b4bba4365819afa85e17 100644
--- a/src-generated/edu/nps/moves/dis7/LiveEntityOrientation16.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityOrientation16.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -81,16 +81,17 @@ public short getPhi()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeShort( (short)psi);
- dos.writeShort( (short)theta);
- dos.writeShort( (short)phi);
+ dos.writeShort(psi);
+ dos.writeShort(theta);
+ dos.writeShort(phi);
}
catch(Exception e)
{
@@ -100,9 +101,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -118,7 +120,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -194,7 +196,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" psi: ").append(psi).append("\n");
sb.append(" theta: ").append(theta).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityOrientationError.java b/src-generated/edu/nps/moves/dis7/LiveEntityOrientationError.java
index 2889ab00a0f58b38fc853f64456af35280511201..6d05b2d994f6176786dd4cfcbeffc20683c6e60b 100644
--- a/src-generated/edu/nps/moves/dis7/LiveEntityOrientationError.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityOrientationError.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -81,16 +81,17 @@ public short getRotationError()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeShort( (short)azimuthError);
- dos.writeShort( (short)elevationError);
- dos.writeShort( (short)rotationError);
+ dos.writeShort(azimuthError);
+ dos.writeShort(elevationError);
+ dos.writeShort(rotationError);
}
catch(Exception e)
{
@@ -100,9 +101,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -118,7 +120,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -194,7 +196,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" azimuthError: ").append(azimuthError).append("\n");
sb.append(" elevationError: ").append(elevationError).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityPdu.java b/src-generated/edu/nps/moves/dis7/LiveEntityPdu.java
index 0988af653f77774a2409be7d30f8b647c0653033..e1ca309b4e53d01dab43650ef53b91455257c138 100644
--- a/src-generated/edu/nps/moves/dis7/LiveEntityPdu.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -68,8 +68,9 @@ public byte getPadding()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -77,7 +78,7 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
subprotocolNumber.marshal(dos);
- dos.writeByte( (byte)padding);
+ dos.writeByte(padding);
}
catch(Exception e)
{
@@ -87,9 +88,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -105,7 +107,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -176,7 +178,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" subprotocolNumber: ").append(subprotocolNumber).append("\n");
sb.append(" padding: ").append(padding).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityPositionError.java b/src-generated/edu/nps/moves/dis7/LiveEntityPositionError.java
index 77e7256222ba89d98c0ee42c3f842a862a53d415..5184cf3395bb495abe82f5027cd215f5d0687cec 100644
--- a/src-generated/edu/nps/moves/dis7/LiveEntityPositionError.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityPositionError.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -65,15 +65,16 @@ public short getVerticalError()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeShort( (short)horizontalError);
- dos.writeShort( (short)verticalError);
+ dos.writeShort(horizontalError);
+ dos.writeShort(verticalError);
}
catch(Exception e)
{
@@ -83,9 +84,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -99,7 +101,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -172,7 +174,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" horizontalError: ").append(horizontalError).append("\n");
sb.append(" verticalError: ").append(verticalError).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityRelativeWorldCoordinates.java b/src-generated/edu/nps/moves/dis7/LiveEntityRelativeWorldCoordinates.java
index 47bff9ddb84a7fec4cdb16199274960866dcffff..d1c260598b1ee5f30c6551b368191a01e63eb65e 100644
--- a/src-generated/edu/nps/moves/dis7/LiveEntityRelativeWorldCoordinates.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityRelativeWorldCoordinates.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -97,17 +97,18 @@ public short getDeltaZ()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeShort( (short)referencePoint);
- dos.writeShort( (short)deltaX);
- dos.writeShort( (short)deltaY);
- dos.writeShort( (short)deltaZ);
+ dos.writeShort(referencePoint);
+ dos.writeShort(deltaX);
+ dos.writeShort(deltaY);
+ dos.writeShort(deltaZ);
}
catch(Exception e)
{
@@ -117,9 +118,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -137,7 +139,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -216,7 +218,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" referencePoint: ").append(referencePoint).append("\n");
sb.append(" deltaX: ").append(deltaX).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/LiveSimulationAddress.java b/src-generated/edu/nps/moves/dis7/LiveSimulationAddress.java
index 227f635322ce7571e0aa034b93054217f95e5fe4..87849104c8cf262907f8c19eecb9ed6bda2047ec 100644
--- a/src-generated/edu/nps/moves/dis7/LiveSimulationAddress.java
+++ b/src-generated/edu/nps/moves/dis7/LiveSimulationAddress.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -67,15 +67,16 @@ public byte getLiveApplicationNumber()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeByte( (byte)liveSiteNumber);
- dos.writeByte( (byte)liveApplicationNumber);
+ dos.writeByte(liveSiteNumber);
+ dos.writeByte(liveApplicationNumber);
}
catch(Exception e)
{
@@ -85,9 +86,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -101,7 +103,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -174,7 +176,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" liveSiteNumber: ").append(liveSiteNumber).append("\n");
sb.append(" liveApplicationNumber: ").append(liveApplicationNumber).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/LogisticsFamilyPdu.java b/src-generated/edu/nps/moves/dis7/LogisticsFamilyPdu.java
index 27a5c2fc1de0e89a4b6adff062681986d3a6ce34..a673eb7ecab4d77ac86e619ebe91fe9772e88530 100644
--- a/src-generated/edu/nps/moves/dis7/LogisticsFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/LogisticsFamilyPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -35,8 +35,9 @@ public int getMarshalledSize()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -52,9 +53,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -66,7 +68,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -131,7 +133,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
return sb.toString();
diff --git a/src-generated/edu/nps/moves/dis7/Marshaller.java b/src-generated/edu/nps/moves/dis7/Marshaller.java
index 1bcb48a5613d388da7ef6b4bba14eb0bc2778d4d..16d9c5c7c79e6928fae51b038f2e363baa41fb97 100644
--- a/src-generated/edu/nps/moves/dis7/Marshaller.java
+++ b/src-generated/edu/nps/moves/dis7/Marshaller.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -14,22 +14,41 @@ import java.nio.ByteBuffer;
*/
public interface Marshaller
{
- public int getMarshalledSize();
+ /**
+ *
+ * @return the size in bytes of a value from a stream
+ */
+ int getMarshalledSize();
- public void marshal(DataOutputStream dos) throws Exception;
- public int unmarshal(DataInputStream dis) throws Exception;
+ /**
+ *
+ * @param dos the output stream to marshal to
+ * @throws Exception
+ */
+ void marshal(DataOutputStream dos) throws Exception;
+
+ /**
+ *
+ * @param dis the input stream to unmarshal from
+ * @return the size of the PDU
+ * @throws Exception
+ */
+ int unmarshal(DataInputStream dis) throws Exception;
/**
* Packs a Pdu into the ByteBuffer.
+ * @throws java.lang.Exception
* @see java.nio.ByteBuffer
* @param buff The ByteBuffer at the position to begin writing
*/
- public void marshal(ByteBuffer buff) throws Exception;
+ void marshal(ByteBuffer buff) throws Exception;
/**
* Unpacks a Pdu from the underlying data.
+ * @return the size of the PDU
+ * @throws java.lang.Exception
* @see java.nio.ByteBuffer
* @param buff The ByteBuffer at the position to begin reading
*/
- public int unmarshal(ByteBuffer buff) throws Exception;
+ int unmarshal(ByteBuffer buff) throws Exception;
}
diff --git a/src-generated/edu/nps/moves/dis7/MineEmplacementTime.java b/src-generated/edu/nps/moves/dis7/MineEmplacementTime.java
index 29d6990169eef1e076dd5a400b95dd875ee8b8be..eb18094d0c1eef1fa85b5824163282ae79bbe6d7 100644
--- a/src-generated/edu/nps/moves/dis7/MineEmplacementTime.java
+++ b/src-generated/edu/nps/moves/dis7/MineEmplacementTime.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -64,15 +64,16 @@ public int getTimePastTheHour()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeInt( (int)hour);
- dos.writeInt( (int)timePastTheHour);
+ dos.writeInt(hour);
+ dos.writeInt(timePastTheHour);
}
catch(Exception e)
{
@@ -82,9 +83,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -98,7 +100,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -171,7 +173,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" hour: ").append(hour).append("\n");
sb.append(" timePastTheHour: ").append(timePastTheHour).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/MineEntityIdentifier.java b/src-generated/edu/nps/moves/dis7/MineEntityIdentifier.java
index 4e42a2acde6dc60d7bfc77f6136cf72c9cd09cd1..7d202eac6a97b3d951fd9dffdace484681d07a62 100644
--- a/src-generated/edu/nps/moves/dis7/MineEntityIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/MineEntityIdentifier.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -67,15 +67,16 @@ public short getMineEntityNumber()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
simulationAddress.marshal(dos);
- dos.writeShort( (short)mineEntityNumber);
+ dos.writeShort(mineEntityNumber);
}
catch(Exception e)
{
@@ -85,9 +86,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -100,7 +102,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -173,7 +175,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
sb.append(" mineEntityNumber: ").append(mineEntityNumber).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/MinefieldDataPdu.java b/src-generated/edu/nps/moves/dis7/MinefieldDataPdu.java
index 04b2de334587aa3ec7e9d0c791f554c5c9234daf..d4f757fd1b0375fd4246c7b4a5aaf7a81ca56594 100644
--- a/src-generated/edu/nps/moves/dis7/MinefieldDataPdu.java
+++ b/src-generated/edu/nps/moves/dis7/MinefieldDataPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -473,8 +473,9 @@ public byte[] getNumberOfVertices()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -483,13 +484,13 @@ public void marshal(DataOutputStream dos) throws Exception
{
minefieldID.marshal(dos);
requestingEntityID.marshal(dos);
- dos.writeShort( (short)minefieldSequenceNumbeer);
- dos.writeByte( (byte)requestID);
- dos.writeByte( (byte)pduSequenceNumber);
- dos.writeByte( (byte)numberOfPdus);
- dos.writeByte( (byte)numberOfVertices.length);
- dos.writeByte( (byte)sensorTypes.size());
- dos.writeByte( (byte)padding);
+ 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);
@@ -582,9 +583,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -689,7 +691,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -719,7 +721,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < sensorTypes.size(); idx++)
{
- MinefieldSensorType aMinefieldSensorType = (MinefieldSensorType)sensorTypes.get(idx);
+ MinefieldSensorType aMinefieldSensorType = sensorTypes.get(idx);
aMinefieldSensorType.marshal(buff);
}
@@ -727,7 +729,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < mineLocation.size(); idx++)
{
- Vector3Float aVector3Float = (Vector3Float)mineLocation.get(idx);
+ Vector3Float aVector3Float = mineLocation.get(idx);
aVector3Float.marshal(buff);
}
@@ -746,7 +748,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < mineOrientation.size(); idx++)
{
- EulerAngles aEulerAngles = (EulerAngles)mineOrientation.get(idx);
+ EulerAngles aEulerAngles = mineOrientation.get(idx);
aEulerAngles.marshal(buff);
}
@@ -761,7 +763,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < mineEmplacementTime.size(); idx++)
{
- MineEmplacementTime aMineEmplacementTime = (MineEmplacementTime)mineEmplacementTime.get(idx);
+ MineEmplacementTime aMineEmplacementTime = mineEmplacementTime.get(idx);
aMineEmplacementTime.marshal(buff);
}
@@ -772,7 +774,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < fusing.size(); idx++)
{
- MinefieldDataFusing aMinefieldDataFusing = (MinefieldDataFusing)fusing.get(idx);
+ MinefieldDataFusing aMinefieldDataFusing = fusing.get(idx);
aMinefieldDataFusing.marshal(buff);
}
@@ -783,7 +785,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < paintScheme.size(); idx++)
{
- MinefieldDataPaintScheme aMinefieldDataPaintScheme = (MinefieldDataPaintScheme)paintScheme.get(idx);
+ MinefieldDataPaintScheme aMinefieldDataPaintScheme = paintScheme.get(idx);
aMinefieldDataPaintScheme.marshal(buff);
}
@@ -1007,7 +1009,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" minefieldID: ").append(minefieldID).append("\n");
sb.append(" requestingEntityID: ").append(requestingEntityID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/MinefieldFamilyPdu.java b/src-generated/edu/nps/moves/dis7/MinefieldFamilyPdu.java
index aded770c71f174fb70ec39f01c1a3304cf8e887c..d2e171db1b0792831fbf036cfbf6da20821afc19 100644
--- a/src-generated/edu/nps/moves/dis7/MinefieldFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/MinefieldFamilyPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -35,8 +35,9 @@ public int getMarshalledSize()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -52,9 +53,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -66,7 +68,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -131,7 +133,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
return sb.toString();
diff --git a/src-generated/edu/nps/moves/dis7/MinefieldIdentifier.java b/src-generated/edu/nps/moves/dis7/MinefieldIdentifier.java
index 22a7205bda2c3ee913c5176c574cab5054394b10..3c55bb5794efab06bd169b0e18bc320da721d92a 100644
--- a/src-generated/edu/nps/moves/dis7/MinefieldIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/MinefieldIdentifier.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -67,15 +67,16 @@ public short getMinefieldNumber()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
simulationAddress.marshal(dos);
- dos.writeShort( (short)minefieldNumber);
+ dos.writeShort(minefieldNumber);
}
catch(Exception e)
{
@@ -85,9 +86,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -100,7 +102,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -173,7 +175,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
sb.append(" minefieldNumber: ").append(minefieldNumber).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/MinefieldQueryPdu.java b/src-generated/edu/nps/moves/dis7/MinefieldQueryPdu.java
index 9c6686f2672767cecb1154024880a76b14cd7b47..9140550b80e5b066c1c75753a6f3837f379f9926 100644
--- a/src-generated/edu/nps/moves/dis7/MinefieldQueryPdu.java
+++ b/src-generated/edu/nps/moves/dis7/MinefieldQueryPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -186,8 +186,9 @@ public List<MinefieldSensorType> getSensorTypes()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -196,10 +197,10 @@ public void marshal(DataOutputStream dos) throws Exception
{
minefieldID.marshal(dos);
requestingEntityID.marshal(dos);
- dos.writeByte( (byte)requestID);
- dos.writeByte( (byte)requestedPerimeterPoints.size());
- dos.writeByte( (byte)padding);
- dos.writeByte( (byte)sensorTypes.size());
+ dos.writeByte(requestID);
+ dos.writeByte(requestedPerimeterPoints.size());
+ dos.writeByte(padding);
+ dos.writeByte(sensorTypes.size());
dataFilter.marshal(dos);
requestedMineType.marshal(dos);
@@ -225,9 +226,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -265,7 +267,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -292,14 +294,14 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < requestedPerimeterPoints.size(); idx++)
{
- Vector2Float aVector2Float = (Vector2Float)requestedPerimeterPoints.get(idx);
+ Vector2Float aVector2Float = requestedPerimeterPoints.get(idx);
aVector2Float.marshal(buff);
}
for(int idx = 0; idx < sensorTypes.size(); idx++)
{
- MinefieldSensorType aMinefieldSensorType = (MinefieldSensorType)sensorTypes.get(idx);
+ MinefieldSensorType aMinefieldSensorType = sensorTypes.get(idx);
aMinefieldSensorType.marshal(buff);
}
@@ -388,7 +390,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" minefieldID: ").append(minefieldID).append("\n");
sb.append(" requestingEntityID: ").append(requestingEntityID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/MinefieldResponseNACKPdu.java b/src-generated/edu/nps/moves/dis7/MinefieldResponseNACKPdu.java
index 12b18855a30afcbf1c62ab9101de5c873d3ea123..7507c25132b7e4d08820203cd13ce8fa1d189281 100644
--- a/src-generated/edu/nps/moves/dis7/MinefieldResponseNACKPdu.java
+++ b/src-generated/edu/nps/moves/dis7/MinefieldResponseNACKPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -107,8 +107,9 @@ public byte[] getMissingPduSequenceNumbers()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -117,8 +118,8 @@ public void marshal(DataOutputStream dos) throws Exception
{
minefieldID.marshal(dos);
requestingEntityID.marshal(dos);
- dos.writeByte( (byte)requestID);
- dos.writeByte( (byte)missingPduSequenceNumbers.length);
+ dos.writeByte(requestID);
+ dos.writeByte(missingPduSequenceNumbers.length);
for(int idx = 0; idx < missingPduSequenceNumbers.length; idx++)
dos.writeByte(missingPduSequenceNumbers[idx]);
@@ -132,9 +133,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -155,7 +157,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -243,7 +245,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" minefieldID: ").append(minefieldID).append("\n");
sb.append(" requestingEntityID: ").append(requestingEntityID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/MinefieldSensorType.java b/src-generated/edu/nps/moves/dis7/MinefieldSensorType.java
index 395931762c05c1001e5e9481a67d015bcb8f36af..10dce71cbeb2d376b2f37a01e9a6518a545d3190 100644
--- a/src-generated/edu/nps/moves/dis7/MinefieldSensorType.java
+++ b/src-generated/edu/nps/moves/dis7/MinefieldSensorType.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -50,14 +50,15 @@ public short getSensorType()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeShort( (short)sensorType);
+ dos.writeShort(sensorType);
}
catch(Exception e)
{
@@ -67,9 +68,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -81,7 +83,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -151,7 +153,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" sensorType: ").append(sensorType).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/MinefieldStatePdu.java b/src-generated/edu/nps/moves/dis7/MinefieldStatePdu.java
index baf36efb27a9957622ce9db1090e07b89443f230..1764ea52d468360e3be3f62fb1e658439e454564 100644
--- a/src-generated/edu/nps/moves/dis7/MinefieldStatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/MinefieldStatePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -221,8 +221,9 @@ public List<EntityType> getMineType()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -230,11 +231,11 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
minefieldID.marshal(dos);
- dos.writeShort( (short)minefieldSequence);
+ dos.writeShort(minefieldSequence);
forceID.marshal(dos);
- dos.writeByte( (byte)perimeterPoints.size());
+ dos.writeByte(perimeterPoints.size());
minefieldType.marshal(dos);
- dos.writeShort( (short)mineType.size());
+ dos.writeShort(mineType.size());
minefieldLocation.marshal(dos);
minefieldOrientation.marshal(dos);
appearance.marshal(dos);
@@ -262,9 +263,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -304,7 +306,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -333,14 +335,14 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < perimeterPoints.size(); idx++)
{
- Vector2Float aVector2Float = (Vector2Float)perimeterPoints.get(idx);
+ Vector2Float aVector2Float = perimeterPoints.get(idx);
aVector2Float.marshal(buff);
}
for(int idx = 0; idx < mineType.size(); idx++)
{
- EntityType aEntityType = (EntityType)mineType.get(idx);
+ EntityType aEntityType = mineType.get(idx);
aEntityType.marshal(buff);
}
@@ -433,7 +435,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" minefieldID: ").append(minefieldID).append("\n");
sb.append(" minefieldSequence: ").append(minefieldSequence).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/ModulationParameters.java b/src-generated/edu/nps/moves/dis7/ModulationParameters.java
index ea096f623d502eb2959a3f0b228b4e0bb34cbd6a..0d89118b1585b262878d1c7870775feadd82c605 100644
--- a/src-generated/edu/nps/moves/dis7/ModulationParameters.java
+++ b/src-generated/edu/nps/moves/dis7/ModulationParameters.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -52,8 +52,9 @@ public byte[] getRecordSpecificFields()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -73,9 +74,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -90,7 +92,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -171,7 +173,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" recordSpecificFields: ").append("\n");
sb.append(Arrays.toString(recordSpecificFields)).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/ModulationType.java b/src-generated/edu/nps/moves/dis7/ModulationType.java
index e367dbcb41eedc46856680a8873ea127b295a1c2..bba818a273418fec936060c5dfc378fb81a64962 100644
--- a/src-generated/edu/nps/moves/dis7/ModulationType.java
+++ b/src-generated/edu/nps/moves/dis7/ModulationType.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -101,16 +101,17 @@ public TransmitterModulationTypeSystem getRadioSystem()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeShort( (short)spreadSpectrum);
+ dos.writeShort(spreadSpectrum);
majorModulation.marshal(dos);
- dos.writeShort( (short)detail);
+ dos.writeShort(detail);
radioSystem.marshal(dos);
}
catch(Exception e)
@@ -121,9 +122,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -141,7 +143,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -220,7 +222,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" spreadSpectrum: ").append(spreadSpectrum).append("\n");
sb.append(" majorModulation: ").append(majorModulation).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/Munition.java b/src-generated/edu/nps/moves/dis7/Munition.java
index 0280d519e92948f1f26c934781db082ad1f7eb42..95e855e0ba04377cf5bd816c2ceef49d4a48b9d3 100644
--- a/src-generated/edu/nps/moves/dis7/Munition.java
+++ b/src-generated/edu/nps/moves/dis7/Munition.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -118,18 +118,19 @@ public byte getPadding()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
munitionType.marshal(dos);
- dos.writeInt( (int)station);
- dos.writeShort( (short)quantity);
+ dos.writeInt(station);
+ dos.writeShort(quantity);
munitionStatus.marshal(dos);
- dos.writeByte( (byte)padding);
+ dos.writeByte(padding);
}
catch(Exception e)
{
@@ -139,9 +140,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -160,7 +162,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -242,7 +244,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" munitionType: ").append(munitionType).append("\n");
sb.append(" station: ").append(station).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/MunitionDescriptor.java b/src-generated/edu/nps/moves/dis7/MunitionDescriptor.java
index 58b6a4d375926c711577625a01072dab4af97392..34cb216bd788bc469a627b63dcc634ed2acbfbdd 100644
--- a/src-generated/edu/nps/moves/dis7/MunitionDescriptor.java
+++ b/src-generated/edu/nps/moves/dis7/MunitionDescriptor.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -118,8 +118,9 @@ public short getRate()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -128,8 +129,8 @@ public void marshal(DataOutputStream dos) throws Exception
munitionType.marshal(dos);
warhead.marshal(dos);
fuse.marshal(dos);
- dos.writeShort( (short)quantity);
- dos.writeShort( (short)rate);
+ dos.writeShort(quantity);
+ dos.writeShort(rate);
}
catch(Exception e)
{
@@ -139,9 +140,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -160,7 +162,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -242,7 +244,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" munitionType: ").append(munitionType).append("\n");
sb.append(" warhead: ").append(warhead).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/MunitionReload.java b/src-generated/edu/nps/moves/dis7/MunitionReload.java
index b48d36521ddc1a99c0679abccb6d78d645f0f287..408625f36d140aeed47f6157c2639310380d2a45 100644
--- a/src-generated/edu/nps/moves/dis7/MunitionReload.java
+++ b/src-generated/edu/nps/moves/dis7/MunitionReload.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -135,19 +135,20 @@ public int getMaximumQuantityReloadTime()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
munitionType.marshal(dos);
- dos.writeInt( (int)station);
- dos.writeShort( (short)standardQuantity);
- dos.writeShort( (short)maximumQuantity);
- dos.writeInt( (int)standardQuantityReloadTime);
- dos.writeInt( (int)maximumQuantityReloadTime);
+ dos.writeInt(station);
+ dos.writeShort(standardQuantity);
+ dos.writeShort(maximumQuantity);
+ dos.writeInt(standardQuantityReloadTime);
+ dos.writeInt(maximumQuantityReloadTime);
}
catch(Exception e)
{
@@ -157,9 +158,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -180,7 +182,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -265,7 +267,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" munitionType: ").append(munitionType).append("\n");
sb.append(" station: ").append(station).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/NamedLocationIdentification.java b/src-generated/edu/nps/moves/dis7/NamedLocationIdentification.java
index 126f0dc40b10325e4c7d43d9c254b78592b0ece4..3a15cdd9ee864a8373ede730a93edfe6b98011fc 100644
--- a/src-generated/edu/nps/moves/dis7/NamedLocationIdentification.java
+++ b/src-generated/edu/nps/moves/dis7/NamedLocationIdentification.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -67,15 +67,16 @@ public short getStationNumber()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
stationName.marshal(dos);
- dos.writeShort( (short)stationNumber);
+ dos.writeShort(stationNumber);
}
catch(Exception e)
{
@@ -85,9 +86,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -101,7 +103,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -174,7 +176,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" stationName: ").append(stationName).append("\n");
sb.append(" stationNumber: ").append(stationNumber).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/ObjectIdentifier.java b/src-generated/edu/nps/moves/dis7/ObjectIdentifier.java
index 08597de18a68c69ae252a2d65c20fbadbdc3c5db..3be8c0a74f7ab25eba55328730dc99d8e2daf58f 100644
--- a/src-generated/edu/nps/moves/dis7/ObjectIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/ObjectIdentifier.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -67,15 +67,16 @@ public short getObjectNumber()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
simulationAddress.marshal(dos);
- dos.writeShort( (short)objectNumber);
+ dos.writeShort(objectNumber);
}
catch(Exception e)
{
@@ -85,9 +86,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -100,7 +102,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -173,7 +175,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
sb.append(" objectNumber: ").append(objectNumber).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/ObjectType.java b/src-generated/edu/nps/moves/dis7/ObjectType.java
index 0355d73a23aec17bd155950b4fb537133c782a42..6a19da3fbba947f037a900693729255d27065c55 100644
--- a/src-generated/edu/nps/moves/dis7/ObjectType.java
+++ b/src-generated/edu/nps/moves/dis7/ObjectType.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -101,8 +101,9 @@ public byte getSubCategory()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -110,8 +111,8 @@ public void marshal(DataOutputStream dos) throws Exception
{
domain.marshal(dos);
objectKind.marshal(dos);
- dos.writeByte( (byte)category);
- dos.writeByte( (byte)subCategory);
+ dos.writeByte(category);
+ dos.writeByte(subCategory);
}
catch(Exception e)
{
@@ -121,9 +122,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -141,7 +143,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -220,7 +222,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" domain: ").append(domain).append("\n");
sb.append(" objectKind: ").append(objectKind).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/OwnershipStatusRecord.java b/src-generated/edu/nps/moves/dis7/OwnershipStatusRecord.java
index bc404aee4097e65e862381664154e414b88eade4..87436637146118de23498153742781911eb4cb6d 100644
--- a/src-generated/edu/nps/moves/dis7/OwnershipStatusRecord.java
+++ b/src-generated/edu/nps/moves/dis7/OwnershipStatusRecord.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -84,8 +84,9 @@ public byte getPadding()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -93,7 +94,7 @@ public void marshal(DataOutputStream dos) throws Exception
{
entityId.marshal(dos);
ownershipStatus.marshal(dos);
- dos.writeByte( (byte)padding);
+ dos.writeByte(padding);
}
catch(Exception e)
{
@@ -103,9 +104,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -120,7 +122,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -196,7 +198,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" entityId: ").append(entityId).append("\n");
sb.append(" ownershipStatus: ").append(ownershipStatus).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/Pdu.java b/src-generated/edu/nps/moves/dis7/Pdu.java
index b5f33f382c0f375ca1025c408d7bc2d7b5ea579f..ffe517e637d9851b1860e418ac50de111e9df2b6 100644
--- a/src-generated/edu/nps/moves/dis7/Pdu.java
+++ b/src-generated/edu/nps/moves/dis7/Pdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -135,19 +135,20 @@ public short getLength()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
protocolVersion.marshal(dos);
- dos.writeByte( (byte)exerciseID);
+ dos.writeByte(exerciseID);
pduType.marshal(dos);
protocolFamily.marshal(dos);
- dos.writeInt( (int)timestamp);
- dos.writeShort( (short)length);
+ dos.writeInt(timestamp);
+ dos.writeShort(length);
}
catch(Exception e)
{
@@ -157,9 +158,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -181,7 +183,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -280,7 +282,7 @@ public byte[] marshal() throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" protocolVersion: ").append(protocolVersion).append("\n");
sb.append(" exerciseID: ").append(exerciseID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/PduBase.java b/src-generated/edu/nps/moves/dis7/PduBase.java
index d77d8844e337b1c1a1a8ccfce0ac8a860c049022..fa313efd1c8908d775da0461a78fd083d825054d 100644
--- a/src-generated/edu/nps/moves/dis7/PduBase.java
+++ b/src-generated/edu/nps/moves/dis7/PduBase.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -68,8 +68,9 @@ public byte getPadding()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -77,7 +78,7 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
pduStatus.marshal(dos);
- dos.writeByte( (byte)padding);
+ dos.writeByte(padding);
}
catch(Exception e)
{
@@ -87,9 +88,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -104,7 +106,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -175,7 +177,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" pduStatus: ").append(pduStatus).append("\n");
sb.append(" padding: ").append(padding).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/PduStatus.java b/src-generated/edu/nps/moves/dis7/PduStatus.java
index d1f9bde31a28b410a78a5aacdce4123701329a01..7fdc45ad652e001ecd13666ace4e38eb7b36ceb7 100644
--- a/src-generated/edu/nps/moves/dis7/PduStatus.java
+++ b/src-generated/edu/nps/moves/dis7/PduStatus.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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;
diff --git a/src-generated/edu/nps/moves/dis7/PointObjectStatePdu.java b/src-generated/edu/nps/moves/dis7/PointObjectStatePdu.java
index 1fc431d50f5ce5763783290a2663344e0d14d7e3..08e0e6def251ab9a4d6318e89ad3323e4140c503 100644
--- a/src-generated/edu/nps/moves/dis7/PointObjectStatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/PointObjectStatePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -272,8 +272,9 @@ public int getPad2()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -282,18 +283,18 @@ public void marshal(DataOutputStream dos) throws Exception
{
objectID.marshal(dos);
referencedObjectID.marshal(dos);
- dos.writeInt( (int)updateNumber);
+ dos.writeInt(updateNumber);
forceID.marshal(dos);
modifications.marshal(dos);
objectType.marshal(dos);
objectLocation.marshal(dos);
objectOrientation.marshal(dos);
- dos.writeInt( (int)specificObjectAppearance);
+ dos.writeInt(specificObjectAppearance);
generObjectAppearance.marshal(dos);
- dos.writeShort( (short)padding1);
+ dos.writeShort(padding1);
requesterID.marshal(dos);
receivingID.marshal(dos);
- dos.writeInt( (int)pad2);
+ dos.writeInt(pad2);
}
catch(Exception e)
{
@@ -303,9 +304,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -336,7 +338,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -443,7 +445,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" objectID: ").append(objectID).append("\n");
sb.append(" referencedObjectID: ").append(referencedObjectID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/PropulsionSystemData.java b/src-generated/edu/nps/moves/dis7/PropulsionSystemData.java
index 8f64b597b02343a5c1849eda473b04e6abac31dd..02adc086472e409064d160e042770fe630e10df4 100644
--- a/src-generated/edu/nps/moves/dis7/PropulsionSystemData.java
+++ b/src-generated/edu/nps/moves/dis7/PropulsionSystemData.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -67,15 +67,16 @@ public float getEngineRpm()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeFloat( (float)powerSetting);
- dos.writeFloat( (float)engineRpm);
+ dos.writeFloat(powerSetting);
+ dos.writeFloat(engineRpm);
}
catch(Exception e)
{
@@ -85,9 +86,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -101,7 +103,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -174,7 +176,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" powerSetting: ").append(powerSetting).append("\n");
sb.append(" engineRpm: ").append(engineRpm).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/ProtocolMode.java b/src-generated/edu/nps/moves/dis7/ProtocolMode.java
index 395ad0a9e54fb00e9000af417284370ef5da61a5..7ad2500a105a8f2cac3ebc6e9327c96b3f7df149 100644
--- a/src-generated/edu/nps/moves/dis7/ProtocolMode.java
+++ b/src-generated/edu/nps/moves/dis7/ProtocolMode.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -50,14 +50,15 @@ public short getProtocolMode()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeShort( (short)protocolMode);
+ dos.writeShort(protocolMode);
}
catch(Exception e)
{
@@ -67,9 +68,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -81,7 +83,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -151,7 +153,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" protocolMode: ").append(protocolMode).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/RadioCommsHeader.java b/src-generated/edu/nps/moves/dis7/RadioCommsHeader.java
index f0c1df7a05e6864500b8a8a20c0bd6fbbd54a3b8..8cd2f1b6de801a03ea89400fe094ec6abb0ac662 100644
--- a/src-generated/edu/nps/moves/dis7/RadioCommsHeader.java
+++ b/src-generated/edu/nps/moves/dis7/RadioCommsHeader.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -66,15 +66,16 @@ public short getRadioNumber()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
radioReferenceID.marshal(dos);
- dos.writeShort( (short)radioNumber);
+ dos.writeShort(radioNumber);
}
catch(Exception e)
{
@@ -84,9 +85,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -99,7 +101,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -172,7 +174,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" radioReferenceID: ").append(radioReferenceID).append("\n");
sb.append(" radioNumber: ").append(radioNumber).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/RadioCommunicationsFamilyPdu.java b/src-generated/edu/nps/moves/dis7/RadioCommunicationsFamilyPdu.java
index 7696836fd7627f5983709d124d944044e971454a..f617ac6b6ac212efe42c91287fd266869e7ac72d 100644
--- a/src-generated/edu/nps/moves/dis7/RadioCommunicationsFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/RadioCommunicationsFamilyPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -35,8 +35,9 @@ public int getMarshalledSize()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -52,9 +53,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -66,7 +68,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -131,7 +133,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
return sb.toString();
diff --git a/src-generated/edu/nps/moves/dis7/RadioIdentifier.java b/src-generated/edu/nps/moves/dis7/RadioIdentifier.java
index cc29ada69b0bf9966efe7ee3ac7d46a9f1f25aff..12be44ee7cb2377309c34cd18adec177e1ccdea9 100644
--- a/src-generated/edu/nps/moves/dis7/RadioIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/RadioIdentifier.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -101,17 +101,18 @@ public short getRadioNumber()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeShort( (short)siteNumber);
- dos.writeShort( (short)applicationNumber);
- dos.writeShort( (short)referenceNumber);
- dos.writeShort( (short)radioNumber);
+ dos.writeShort(siteNumber);
+ dos.writeShort(applicationNumber);
+ dos.writeShort(referenceNumber);
+ dos.writeShort(radioNumber);
}
catch(Exception e)
{
@@ -121,9 +122,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -141,7 +143,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -220,7 +222,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" siteNumber: ").append(siteNumber).append("\n");
sb.append(" applicationNumber: ").append(applicationNumber).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/RadioType.java b/src-generated/edu/nps/moves/dis7/RadioType.java
index 014d69bdc13dc0a40ab57daaea40492e2264fa92..4208621d231173a5ffa6af2e7b07ec883f5be570 100644
--- a/src-generated/edu/nps/moves/dis7/RadioType.java
+++ b/src-generated/edu/nps/moves/dis7/RadioType.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -150,20 +150,21 @@ public byte getExtra()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
entityKind.marshal(dos);
- dos.writeByte( (byte)domain);
+ dos.writeByte(domain);
country.marshal(dos);
category.marshal(dos);
subcategory.marshal(dos);
- dos.writeByte( (byte)specific);
- dos.writeByte( (byte)extra);
+ dos.writeByte(specific);
+ dos.writeByte(extra);
}
catch(Exception e)
{
@@ -173,9 +174,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -199,7 +201,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -287,7 +289,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" entityKind: ").append(entityKind).append("\n");
sb.append(" domain: ").append(domain).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/ReceiverPdu.java b/src-generated/edu/nps/moves/dis7/ReceiverPdu.java
index 3ce7d45e8c4f8181b87e503bf397fdeb7e20e350..85e3d097532c28a06cd2cc4b5e78ce6a43cfe39c 100644
--- a/src-generated/edu/nps/moves/dis7/ReceiverPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ReceiverPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -135,8 +135,9 @@ public short getTransmitterRadioId()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -145,10 +146,10 @@ public void marshal(DataOutputStream dos) throws Exception
{
header.marshal(dos);
receiverState.marshal(dos);
- dos.writeShort( (short)padding1);
- dos.writeFloat( (float)receivedPower);
+ dos.writeShort(padding1);
+ dos.writeFloat(receivedPower);
transmitterEntityId.marshal(dos);
- dos.writeShort( (short)transmitterRadioId);
+ dos.writeShort(transmitterRadioId);
}
catch(Exception e)
{
@@ -158,9 +159,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -182,7 +184,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -265,7 +267,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" header: ").append(header).append("\n");
sb.append(" receiverState: ").append(receiverState).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/RecordQueryRPdu.java b/src-generated/edu/nps/moves/dis7/RecordQueryRPdu.java
index 356025ff759ca3db2719f1ef83072ee8cca6755a..71f8d3855c27b31934992c69105dce1a698bde1c 100644
--- a/src-generated/edu/nps/moves/dis7/RecordQueryRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/RecordQueryRPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -145,20 +145,21 @@ public List<RecordQuerySpecification> getRecordIDs()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
super.marshal(dos);
try
{
- dos.writeInt( (int)requestID);
+ dos.writeInt(requestID);
requiredReliabilityService.marshal(dos);
- dos.writeByte( (byte)pad1);
+ dos.writeByte(pad1);
eventType.marshal(dos);
- dos.writeInt( (int)time);
- dos.writeInt( (int)recordIDs.size());
+ dos.writeInt(time);
+ dos.writeInt(recordIDs.size());
for(int idx = 0; idx < recordIDs.size(); idx++)
{
@@ -175,9 +176,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -208,7 +210,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -233,7 +235,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < recordIDs.size(); idx++)
{
- RecordQuerySpecification aRecordQuerySpecification = (RecordQuerySpecification)recordIDs.get(idx);
+ RecordQuerySpecification aRecordQuerySpecification = recordIDs.get(idx);
aRecordQuerySpecification.marshal(buff);
}
@@ -308,7 +310,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" requestID: ").append(requestID).append("\n");
sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/RecordQueryReliablePdu.java b/src-generated/edu/nps/moves/dis7/RecordQueryReliablePdu.java
index ea5c67319a308a58e5491afcb99bfe231bf5bc35..e2b412b727702262459a8653341fcdc7cd8e7aba 100644
--- a/src-generated/edu/nps/moves/dis7/RecordQueryReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/RecordQueryReliablePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
diff --git a/src-generated/edu/nps/moves/dis7/RecordQuerySpecification.java b/src-generated/edu/nps/moves/dis7/RecordQuerySpecification.java
index f956a55bed60d7fce1b0941c1593d5fa07b0d80a..07d57f6ec6d26304c85dbd5bd6ed4fb82270472e 100644
--- a/src-generated/edu/nps/moves/dis7/RecordQuerySpecification.java
+++ b/src-generated/edu/nps/moves/dis7/RecordQuerySpecification.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -57,14 +57,15 @@ public List<VariableRecordType> getRecordIDs()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeInt( (int)recordIDs.size());
+ dos.writeInt(recordIDs.size());
for(int idx = 0; idx < recordIDs.size(); idx++)
{
@@ -81,9 +82,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -102,7 +104,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -121,7 +123,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < recordIDs.size(); idx++)
{
- VariableRecordType aVariableRecordType = (VariableRecordType)recordIDs.get(idx);
+ VariableRecordType aVariableRecordType = recordIDs.get(idx);
aVariableRecordType.marshal(buff);
}
@@ -188,7 +190,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" recordIDs: ").append("\n");
recordIDs.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
diff --git a/src-generated/edu/nps/moves/dis7/RecordRPdu.java b/src-generated/edu/nps/moves/dis7/RecordRPdu.java
index fc34ca02f1911a850da89232b01b74309a76d810..8d086a075274d7b238ce7df45cc6775418c8f0c6 100644
--- a/src-generated/edu/nps/moves/dis7/RecordRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/RecordRPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -127,19 +127,20 @@ public List<RecordSpecification> getRecordSets()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
super.marshal(dos);
try
{
- dos.writeInt( (int)requestID);
+ dos.writeInt(requestID);
requiredReliabilityService.marshal(dos);
- dos.writeByte( (byte)pad1);
+ dos.writeByte(pad1);
eventType.marshal(dos);
- dos.writeInt( (int)recordSets.size());
+ dos.writeInt(recordSets.size());
for(int idx = 0; idx < recordSets.size(); idx++)
{
@@ -156,9 +157,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -187,7 +189,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -211,7 +213,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < recordSets.size(); idx++)
{
- RecordSpecification aRecordSpecification = (RecordSpecification)recordSets.get(idx);
+ RecordSpecification aRecordSpecification = recordSets.get(idx);
aRecordSpecification.marshal(buff);
}
@@ -284,7 +286,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" requestID: ").append(requestID).append("\n");
sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/RecordReliablePdu.java b/src-generated/edu/nps/moves/dis7/RecordReliablePdu.java
index dd2bef6729d473d6eb6fe5a6475f9d3c4894e4ba..3381444dbb6287e600af6cc9bb5cbcd0d184dd6a 100644
--- a/src-generated/edu/nps/moves/dis7/RecordReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/RecordReliablePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
diff --git a/src-generated/edu/nps/moves/dis7/RecordSpecification.java b/src-generated/edu/nps/moves/dis7/RecordSpecification.java
index a96854fa0774b0dc6ada0511dae0a1f6efa4c2ab..2547cfb3d7b0b9370498b8ce44372e5f80c6e616 100644
--- a/src-generated/edu/nps/moves/dis7/RecordSpecification.java
+++ b/src-generated/edu/nps/moves/dis7/RecordSpecification.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -58,14 +58,15 @@ public List<RecordSpecificationElement> getRecordSets()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeInt( (int)recordSets.size());
+ dos.writeInt(recordSets.size());
for(int idx = 0; idx < recordSets.size(); idx++)
{
@@ -82,9 +83,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -103,7 +105,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -122,7 +124,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < recordSets.size(); idx++)
{
- RecordSpecificationElement aRecordSpecificationElement = (RecordSpecificationElement)recordSets.get(idx);
+ RecordSpecificationElement aRecordSpecificationElement = recordSets.get(idx);
aRecordSpecificationElement.marshal(buff);
}
@@ -190,7 +192,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" recordSets: ").append("\n");
recordSets.forEach(r->{ sb.append(r.getClass().getSimpleName()).append(": ").append(r).append("\n");});
diff --git a/src-generated/edu/nps/moves/dis7/RecordSpecificationElement.java b/src-generated/edu/nps/moves/dis7/RecordSpecificationElement.java
index d8ce257c74ed9b5f895057e885842dbd4a43ad99..88bafba7828a94d12b77dbac4702c91106ab4809 100644
--- a/src-generated/edu/nps/moves/dis7/RecordSpecificationElement.java
+++ b/src-generated/edu/nps/moves/dis7/RecordSpecificationElement.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -151,18 +151,19 @@ public byte[] getPadTo64()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
recordID.marshal(dos);
- dos.writeInt( (int)recordSetSerialNumber);
- dos.writeInt( (int)padding);
- dos.writeShort( (short)recordLength);
- dos.writeShort( (short)recordCount);
+ dos.writeInt(recordSetSerialNumber);
+ dos.writeInt(padding);
+ dos.writeShort(recordLength);
+ dos.writeShort(recordCount);
for(int idx = 0; idx < recordValues.length; idx++)
dos.writeByte(recordValues[idx]);
@@ -180,9 +181,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -208,7 +210,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -314,7 +316,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" recordID: ").append(recordID).append("\n");
sb.append(" recordSetSerialNumber: ").append(recordSetSerialNumber).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/Relationship.java b/src-generated/edu/nps/moves/dis7/Relationship.java
index a2ba6ac1def887eb177b0032688997ec5f89685c..10c7c36024a5be55e623cd65968dee17053a8708 100644
--- a/src-generated/edu/nps/moves/dis7/Relationship.java
+++ b/src-generated/edu/nps/moves/dis7/Relationship.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -67,8 +67,9 @@ public IsPartOfPosition getPosition()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -85,9 +86,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -101,7 +103,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -174,7 +176,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" nature: ").append(nature).append("\n");
sb.append(" position: ").append(position).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/RemoveEntityPdu.java b/src-generated/edu/nps/moves/dis7/RemoveEntityPdu.java
index e8bbbebfb4f9734afc8d5673c80787caa308f2a4..16e80e05f39fd600f37d6591b02f9a76e15a34b0 100644
--- a/src-generated/edu/nps/moves/dis7/RemoveEntityPdu.java
+++ b/src-generated/edu/nps/moves/dis7/RemoveEntityPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -52,15 +52,16 @@ public int getRequestID()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
super.marshal(dos);
try
{
- dos.writeInt( (int)requestID);
+ dos.writeInt(requestID);
}
catch(Exception e)
{
@@ -70,9 +71,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -86,7 +88,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -154,7 +156,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" requestID: ").append(requestID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/RemoveEntityRPdu.java b/src-generated/edu/nps/moves/dis7/RemoveEntityRPdu.java
index 5fbbef632d09c25b85830db756ecd6451c604618..ffb721ee7c5a57b03eb1871f6bb15c5a04948f8c 100644
--- a/src-generated/edu/nps/moves/dis7/RemoveEntityRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/RemoveEntityRPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -101,8 +101,9 @@ public int getRequestID()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -110,9 +111,9 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
requiredReliabilityService.marshal(dos);
- dos.writeByte( (byte)pad1);
- dos.writeShort( (short)pad2);
- dos.writeInt( (int)requestID);
+ dos.writeByte(pad1);
+ dos.writeShort(pad2);
+ dos.writeInt(requestID);
}
catch(Exception e)
{
@@ -122,9 +123,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -144,7 +146,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -221,7 +223,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
sb.append(" pad1: ").append(pad1).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/RemoveEntityReliablePdu.java b/src-generated/edu/nps/moves/dis7/RemoveEntityReliablePdu.java
index e42c0fb7ddd377f120e4d792e2bb3d10ccda9112..30a79ffd44d8b90964c90a92c540bbbe8cf7c673 100644
--- a/src-generated/edu/nps/moves/dis7/RemoveEntityReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/RemoveEntityReliablePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
diff --git a/src-generated/edu/nps/moves/dis7/RepairCompletePdu.java b/src-generated/edu/nps/moves/dis7/RepairCompletePdu.java
index c8258f341975aa2a1969ff95d341d6399a83d3d4..780f6546b3a35ea4f2b2be87c0602bf8def74fa6 100644
--- a/src-generated/edu/nps/moves/dis7/RepairCompletePdu.java
+++ b/src-generated/edu/nps/moves/dis7/RepairCompletePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -103,8 +103,9 @@ public short getPadding4()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -114,7 +115,7 @@ public void marshal(DataOutputStream dos) throws Exception
receivingEntityID.marshal(dos);
repairingEntityID.marshal(dos);
repair.marshal(dos);
- dos.writeShort( (short)padding4);
+ dos.writeShort(padding4);
}
catch(Exception e)
{
@@ -124,9 +125,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -144,7 +146,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -221,7 +223,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" receivingEntityID: ").append(receivingEntityID).append("\n");
sb.append(" repairingEntityID: ").append(repairingEntityID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/RepairResponsePdu.java b/src-generated/edu/nps/moves/dis7/RepairResponsePdu.java
index ee78848d8d2eb284dd690343926b8307fc4d9d8a..f09356a1ef826c88f8873bf9a4350e75974ec2e1 100644
--- a/src-generated/edu/nps/moves/dis7/RepairResponsePdu.java
+++ b/src-generated/edu/nps/moves/dis7/RepairResponsePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -120,8 +120,9 @@ public short getPadding2()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -131,8 +132,8 @@ public void marshal(DataOutputStream dos) throws Exception
receivingEntityID.marshal(dos);
repairingEntityID.marshal(dos);
repairResult.marshal(dos);
- dos.writeByte( (byte)padding1);
- dos.writeShort( (short)padding2);
+ dos.writeByte(padding1);
+ dos.writeShort(padding2);
}
catch(Exception e)
{
@@ -142,9 +143,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -164,7 +166,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -244,7 +246,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" receivingEntityID: ").append(receivingEntityID).append("\n");
sb.append(" repairingEntityID: ").append(repairingEntityID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/RequestID.java b/src-generated/edu/nps/moves/dis7/RequestID.java
index 626a40c86befb99c68a77cd18c1545f88893448f..ccbe82cb109a0fd752623da8579eeb758d696eb8 100644
--- a/src-generated/edu/nps/moves/dis7/RequestID.java
+++ b/src-generated/edu/nps/moves/dis7/RequestID.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -50,14 +50,15 @@ public int getRequestID()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeInt( (int)requestID);
+ dos.writeInt(requestID);
}
catch(Exception e)
{
@@ -67,9 +68,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -81,7 +83,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -151,7 +153,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" requestID: ").append(requestID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/ResupplyCancelPdu.java b/src-generated/edu/nps/moves/dis7/ResupplyCancelPdu.java
index 06da4102d6d72f4cdd6bba091f5473a495711257..6035e828a88ac8c42f6c1623e1e9dd974ed62b27 100644
--- a/src-generated/edu/nps/moves/dis7/ResupplyCancelPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ResupplyCancelPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -69,8 +69,9 @@ public EntityID getSupplyingEntityID()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -88,9 +89,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -104,7 +106,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -175,7 +177,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" receivingEntityID: ").append(receivingEntityID).append("\n");
sb.append(" supplyingEntityID: ").append(supplyingEntityID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/ResupplyOfferPdu.java b/src-generated/edu/nps/moves/dis7/ResupplyOfferPdu.java
index d2fd9ea736b96cd0df2fbe69af90a0c62138587e..42f00f23652866c6f2ec19f7e6a78a3f68a242d3 100644
--- a/src-generated/edu/nps/moves/dis7/ResupplyOfferPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ResupplyOfferPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -128,8 +128,9 @@ public List<SupplyQuantity> getSupplies()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -138,9 +139,9 @@ public void marshal(DataOutputStream dos) throws Exception
{
receivingEntityID.marshal(dos);
supplyingEntityID.marshal(dos);
- dos.writeByte( (byte)supplies.size());
- dos.writeByte( (byte)padding1);
- dos.writeShort( (short)padding2);
+ dos.writeByte(supplies.size());
+ dos.writeByte(padding1);
+ dos.writeShort(padding2);
for(int idx = 0; idx < supplies.size(); idx++)
{
@@ -157,9 +158,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -186,7 +188,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -210,7 +212,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < supplies.size(); idx++)
{
- SupplyQuantity aSupplyQuantity = (SupplyQuantity)supplies.get(idx);
+ SupplyQuantity aSupplyQuantity = supplies.get(idx);
aSupplyQuantity.marshal(buff);
}
@@ -283,7 +285,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" receivingEntityID: ").append(receivingEntityID).append("\n");
sb.append(" supplyingEntityID: ").append(supplyingEntityID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/ResupplyReceivedPdu.java b/src-generated/edu/nps/moves/dis7/ResupplyReceivedPdu.java
index 4df57d4bb38a2935edeb4a973dfc39b19b0c98cc..8dfe14e84654d1ac1f5a1e50b188919b52abe3f3 100644
--- a/src-generated/edu/nps/moves/dis7/ResupplyReceivedPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ResupplyReceivedPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -128,8 +128,9 @@ public List<SupplyQuantity> getSupplies()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -138,9 +139,9 @@ public void marshal(DataOutputStream dos) throws Exception
{
receivingEntityID.marshal(dos);
supplyingEntityID.marshal(dos);
- dos.writeByte( (byte)supplies.size());
- dos.writeByte( (byte)padding1);
- dos.writeShort( (short)padding2);
+ dos.writeByte(supplies.size());
+ dos.writeByte(padding1);
+ dos.writeShort(padding2);
for(int idx = 0; idx < supplies.size(); idx++)
{
@@ -157,9 +158,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -186,7 +188,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -210,7 +212,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < supplies.size(); idx++)
{
- SupplyQuantity aSupplyQuantity = (SupplyQuantity)supplies.get(idx);
+ SupplyQuantity aSupplyQuantity = supplies.get(idx);
aSupplyQuantity.marshal(buff);
}
@@ -283,7 +285,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" receivingEntityID: ").append(receivingEntityID).append("\n");
sb.append(" supplyingEntityID: ").append(supplyingEntityID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/SEESPdu.java b/src-generated/edu/nps/moves/dis7/SEESPdu.java
index 512f42f6b5082ebc989bea1e9ece5612f7cbfde6..1988f95d9c92ec23a3ade62a975c501af5eb4cc1 100644
--- a/src-generated/edu/nps/moves/dis7/SEESPdu.java
+++ b/src-generated/edu/nps/moves/dis7/SEESPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -153,8 +153,9 @@ public List<VectoringNozzleSystem> getVectoringSystemData()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -162,11 +163,11 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
orginatingEntityID.marshal(dos);
- dos.writeShort( (short)infraredSignatureRepresentationIndex);
- dos.writeShort( (short)acousticSignatureRepresentationIndex);
- dos.writeShort( (short)radarCrossSectionSignatureRepresentationIndex);
- dos.writeShort( (short)propulsionSystemData.size());
- dos.writeShort( (short)vectoringSystemData.size());
+ 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++)
{
@@ -190,9 +191,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -229,7 +231,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -254,14 +256,14 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < propulsionSystemData.size(); idx++)
{
- PropulsionSystemData aPropulsionSystemData = (PropulsionSystemData)propulsionSystemData.get(idx);
+ PropulsionSystemData aPropulsionSystemData = propulsionSystemData.get(idx);
aPropulsionSystemData.marshal(buff);
}
for(int idx = 0; idx < vectoringSystemData.size(); idx++)
{
- VectoringNozzleSystem aVectoringNozzleSystem = (VectoringNozzleSystem)vectoringSystemData.get(idx);
+ VectoringNozzleSystem aVectoringNozzleSystem = vectoringSystemData.get(idx);
aVectoringNozzleSystem.marshal(buff);
}
@@ -346,7 +348,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" orginatingEntityID: ").append(orginatingEntityID).append("\n");
sb.append(" infraredSignatureRepresentationIndex: ").append(infraredSignatureRepresentationIndex).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/SecondaryOperationalData.java b/src-generated/edu/nps/moves/dis7/SecondaryOperationalData.java
index b45271dbbdb6f3fd04ac0da3a697e80441b8769d..7795185ef72f8dc20201da4e85373f67f541d333 100644
--- a/src-generated/edu/nps/moves/dis7/SecondaryOperationalData.java
+++ b/src-generated/edu/nps/moves/dis7/SecondaryOperationalData.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -84,16 +84,17 @@ public short getNumberOfIFFFundamentalParameterRecords()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeByte( (byte)operationalData1);
- dos.writeByte( (byte)operationalData2);
- dos.writeShort( (short)numberOfIFFFundamentalParameterRecords);
+ dos.writeByte(operationalData1);
+ dos.writeByte(operationalData2);
+ dos.writeShort(numberOfIFFFundamentalParameterRecords);
}
catch(Exception e)
{
@@ -103,9 +104,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -121,7 +123,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -197,7 +199,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" operationalData1: ").append(operationalData1).append("\n");
sb.append(" operationalData2: ").append(operationalData2).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/Sensor.java b/src-generated/edu/nps/moves/dis7/Sensor.java
index c85c5fb61369d90ad052be9d7c805643aa7f8e60..8c66b42e6500572a8627fb32f09468119f7e1cd7 100644
--- a/src-generated/edu/nps/moves/dis7/Sensor.java
+++ b/src-generated/edu/nps/moves/dis7/Sensor.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -135,8 +135,9 @@ public short getPadding()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -144,10 +145,10 @@ public void marshal(DataOutputStream dos) throws Exception
{
sensorTypeSource.marshal(dos);
sensorOnOffStatus.marshal(dos);
- dos.writeShort( (short)sensorType);
- dos.writeInt( (int)station);
- dos.writeShort( (short)quantity);
- dos.writeShort( (short)padding);
+ dos.writeShort(sensorType);
+ dos.writeInt(station);
+ dos.writeShort(quantity);
+ dos.writeShort(padding);
}
catch(Exception e)
{
@@ -157,9 +158,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -181,7 +183,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -266,7 +268,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" sensorTypeSource: ").append(sensorTypeSource).append("\n");
sb.append(" sensorOnOffStatus: ").append(sensorOnOffStatus).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/SeparationVP.java b/src-generated/edu/nps/moves/dis7/SeparationVP.java
index dde4a8314ce379f3b2934ae37ee15c17253e83fd..1c810e2be06c179bf2072683a082306e6ff05fae 100644
--- a/src-generated/edu/nps/moves/dis7/SeparationVP.java
+++ b/src-generated/edu/nps/moves/dis7/SeparationVP.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -152,8 +152,9 @@ public NamedLocationIdentification getStationLocation()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -162,9 +163,9 @@ public void marshal(DataOutputStream dos) throws Exception
recordType.marshal(dos);
reasonForSeparation.marshal(dos);
preEntityIndicator.marshal(dos);
- dos.writeByte( (byte)padding1);
+ dos.writeByte(padding1);
parentEntityID.marshal(dos);
- dos.writeShort( (short)padding2);
+ dos.writeShort(padding2);
stationLocation.marshal(dos);
}
catch(Exception e)
@@ -175,9 +176,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -199,7 +201,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -287,7 +289,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" recordType: ").append(recordType).append("\n");
sb.append(" reasonForSeparation: ").append(reasonForSeparation).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/ServiceRequestPdu.java b/src-generated/edu/nps/moves/dis7/ServiceRequestPdu.java
index 75e7cc566c592aa713ea50b30429ddf6bb9b2612..87c37e4cd2721aee1ac523b804a29c1c32d33ecc 100644
--- a/src-generated/edu/nps/moves/dis7/ServiceRequestPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ServiceRequestPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -126,8 +126,9 @@ public List<SupplyQuantity> getSupplies()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -137,8 +138,8 @@ public void marshal(DataOutputStream dos) throws Exception
requestingEntityID.marshal(dos);
servicingEntityID.marshal(dos);
serviceTypeRequested.marshal(dos);
- dos.writeByte( (byte)supplies.size());
- dos.writeShort( (short)padding1);
+ dos.writeByte(supplies.size());
+ dos.writeShort(padding1);
for(int idx = 0; idx < supplies.size(); idx++)
{
@@ -155,9 +156,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -184,7 +186,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -208,7 +210,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < supplies.size(); idx++)
{
- SupplyQuantity aSupplyQuantity = (SupplyQuantity)supplies.get(idx);
+ SupplyQuantity aSupplyQuantity = supplies.get(idx);
aSupplyQuantity.marshal(buff);
}
@@ -281,7 +283,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" requestingEntityID: ").append(requestingEntityID).append("\n");
sb.append(" servicingEntityID: ").append(servicingEntityID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/SetDataPdu.java b/src-generated/edu/nps/moves/dis7/SetDataPdu.java
index 63b44c97995a3b4526c4f327e5e7c3721d59528c..923cad6f853c190d235f96a69cf8fc2e00a9b73f 100644
--- a/src-generated/edu/nps/moves/dis7/SetDataPdu.java
+++ b/src-generated/edu/nps/moves/dis7/SetDataPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -119,18 +119,19 @@ public List<VariableDatum> getVariableDatums()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
super.marshal(dos);
try
{
- dos.writeInt( (int)requestID);
- dos.writeInt( (int)padding1);
- dos.writeInt( (int)fixedDatums.size());
- dos.writeInt( (int)variableDatums.size());
+ dos.writeInt(requestID);
+ dos.writeInt(padding1);
+ dos.writeInt(fixedDatums.size());
+ dos.writeInt(variableDatums.size());
for(int idx = 0; idx < fixedDatums.size(); idx++)
{
@@ -154,9 +155,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -190,7 +192,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -213,14 +215,14 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < fixedDatums.size(); idx++)
{
- FixedDatum aFixedDatum = (FixedDatum)fixedDatums.get(idx);
+ FixedDatum aFixedDatum = fixedDatums.get(idx);
aFixedDatum.marshal(buff);
}
for(int idx = 0; idx < variableDatums.size(); idx++)
{
- VariableDatum aVariableDatum = (VariableDatum)variableDatums.get(idx);
+ VariableDatum aVariableDatum = variableDatums.get(idx);
aVariableDatum.marshal(buff);
}
@@ -301,7 +303,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" requestID: ").append(requestID).append("\n");
sb.append(" padding1: ").append(padding1).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/SetDataRPdu.java b/src-generated/edu/nps/moves/dis7/SetDataRPdu.java
index 59897ac591dad06551edab09630e296f6e968d2c..62d251b2d8dacd714aa4df31688c478a5fcee650 100644
--- a/src-generated/edu/nps/moves/dis7/SetDataRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/SetDataRPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -153,8 +153,9 @@ public List<VariableDatum> getVariableDatumRecords()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -162,11 +163,11 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
requiredReliabilityService.marshal(dos);
- dos.writeByte( (byte)pad1);
- dos.writeShort( (short)pad2);
- dos.writeInt( (int)requestID);
- dos.writeInt( (int)fixedDatumRecords.size());
- dos.writeInt( (int)variableDatumRecords.size());
+ 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++)
{
@@ -190,9 +191,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -230,7 +232,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -255,14 +257,14 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < fixedDatumRecords.size(); idx++)
{
- FixedDatum aFixedDatum = (FixedDatum)fixedDatumRecords.get(idx);
+ FixedDatum aFixedDatum = fixedDatumRecords.get(idx);
aFixedDatum.marshal(buff);
}
for(int idx = 0; idx < variableDatumRecords.size(); idx++)
{
- VariableDatum aVariableDatum = (VariableDatum)variableDatumRecords.get(idx);
+ VariableDatum aVariableDatum = variableDatumRecords.get(idx);
aVariableDatum.marshal(buff);
}
@@ -347,7 +349,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
sb.append(" pad1: ").append(pad1).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/SetDataReliablePdu.java b/src-generated/edu/nps/moves/dis7/SetDataReliablePdu.java
index d4266df4b1b04f1f354137a5ce0e9a48c4be5d7c..c5030fe69c99ef385f3d15b103badc083f6c8109 100644
--- a/src-generated/edu/nps/moves/dis7/SetDataReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/SetDataReliablePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
diff --git a/src-generated/edu/nps/moves/dis7/SetRecordRPdu.java b/src-generated/edu/nps/moves/dis7/SetRecordRPdu.java
index 23d052368ce09c4ed9adeb466bd77fd3fbaff1e0..fa869f63672776e72427730c860ee5fc57517b99 100644
--- a/src-generated/edu/nps/moves/dis7/SetRecordRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/SetRecordRPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -142,20 +142,21 @@ public List<RecordSpecification> getRecordSets()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
super.marshal(dos);
try
{
- dos.writeInt( (int)requestID);
+ dos.writeInt(requestID);
requiredReliabilityService.marshal(dos);
- dos.writeByte( (byte)pad1);
- dos.writeShort( (short)pad2);
- dos.writeInt( (int)pad3);
- dos.writeInt( (int)recordSets.size());
+ dos.writeByte(pad1);
+ dos.writeShort(pad2);
+ dos.writeInt(pad3);
+ dos.writeInt(recordSets.size());
for(int idx = 0; idx < recordSets.size(); idx++)
{
@@ -172,9 +173,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -205,7 +207,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -230,7 +232,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < recordSets.size(); idx++)
{
- RecordSpecification aRecordSpecification = (RecordSpecification)recordSets.get(idx);
+ RecordSpecification aRecordSpecification = recordSets.get(idx);
aRecordSpecification.marshal(buff);
}
@@ -305,7 +307,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" requestID: ").append(requestID).append("\n");
sb.append(" requiredReliabilityService: ").append(requiredReliabilityService).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/SetRecordReliablePdu.java b/src-generated/edu/nps/moves/dis7/SetRecordReliablePdu.java
index 0d17852628937ecbfa7cfab2c4f87440f1ff4add..1370d05f5663d064dfddc83c04a1f276ca6fe11d 100644
--- a/src-generated/edu/nps/moves/dis7/SetRecordReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/SetRecordReliablePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
diff --git a/src-generated/edu/nps/moves/dis7/ShaftRPM.java b/src-generated/edu/nps/moves/dis7/ShaftRPM.java
index 40c5d38d754fca1a09aba07e10a4f5f661f18691..c652cb7f4d421698aef6e7040b94b48f0a1d069b 100644
--- a/src-generated/edu/nps/moves/dis7/ShaftRPM.java
+++ b/src-generated/edu/nps/moves/dis7/ShaftRPM.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -80,16 +80,17 @@ public int getRPMrateOfChange()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeShort( (short)currentRPM);
- dos.writeShort( (short)orderedRPM);
- dos.writeInt( (int)RPMrateOfChange);
+ dos.writeShort(currentRPM);
+ dos.writeShort(orderedRPM);
+ dos.writeInt(RPMrateOfChange);
}
catch(Exception e)
{
@@ -99,9 +100,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -117,7 +119,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -193,7 +195,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" currentRPM: ").append(currentRPM).append("\n");
sb.append(" orderedRPM: ").append(orderedRPM).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/SignalPdu.java b/src-generated/edu/nps/moves/dis7/SignalPdu.java
index 5066a653515543d68a8230a3c9962dce8c498928..b8ec0afd32650b02fe7c23ecceca54c6b2f9b31a 100644
--- a/src-generated/edu/nps/moves/dis7/SignalPdu.java
+++ b/src-generated/edu/nps/moves/dis7/SignalPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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;
@@ -13,7 +13,11 @@ import edu.nps.moves.dis7.enumerations.*;
*/
public class SignalPdu extends RadioCommunicationsFamilyPdu implements Serializable
{
- protected RadioCommsHeader header = new RadioCommsHeader();
+
+ /**
+ *
+ */
+ protected RadioCommsHeader header = new RadioCommsHeader();
/**
* encoding scheme used, and enumeration
@@ -58,6 +62,7 @@ public class SignalPdu extends RadioCommunicationsFamilyPdu implements Serializa
/**
* Returns the size of this serialized object in bytes
*/
+ @Override
public int getMarshalledSize()
{
int marshalSize = 0;
@@ -206,7 +211,6 @@ public class SignalPdu extends RadioCommunicationsFamilyPdu implements Serializa
*
* @return this object
* @param pData data
- * @return this object;
*/
public SignalPdu setData(byte[] pData)
{
@@ -234,21 +238,22 @@ public class SignalPdu extends RadioCommunicationsFamilyPdu implements Serializa
* @see java.io.DataOutputStream
* @param dos The DataOutputStream
*/
+ @Override
public void marshal(DataOutputStream dos) throws Exception
{
super.marshal(dos);
header.marshal(dos);
- dos.writeShort((short) encodingScheme);
+ dos.writeShort(encodingScheme);
tdlType.marshal(dos);
- dos.writeInt((int) sampleRate);
+ dos.writeInt(sampleRate);
if (dataLength != null)
- dos.writeShort((short) dataLength);
+ dos.writeShort(dataLength);
else
- dos.writeShort((short) (dataLength = calculateDataLength()));
+ dos.writeShort((dataLength = calculateDataLength()));
- dos.writeShort((short) samples);
+ dos.writeShort(samples);
for (int idx = 0; idx < data.length; idx++) {
dos.writeByte(data[idx]);
}
@@ -263,6 +268,7 @@ public class SignalPdu extends RadioCommunicationsFamilyPdu implements Serializa
* @param dis The DataInputStream
* @return marshaled size
*/
+ @Override
public int unmarshal(DataInputStream dis) throws Exception
{
int uPosition = 0;
@@ -301,23 +307,24 @@ public class SignalPdu extends RadioCommunicationsFamilyPdu implements Serializa
* @param buff The ByteBuffer at the position to begin writing
* @throws Exception ByteBuffer-generated exception
*/
+ @Override
public void marshal(java.nio.ByteBuffer buff) throws Exception
{
super.marshal(buff);
header.marshal(buff);
- buff.putShort((short) encodingScheme);
+ buff.putShort(encodingScheme);
tdlType.marshal(buff);
- buff.putInt((int) sampleRate);
+ buff.putInt(sampleRate);
if(dataLength != null)
- buff.putShort((short) dataLength);
+ buff.putShort(dataLength);
else
- buff.putShort((short) (dataLength = calculateDataLength()));
+ buff.putShort((dataLength = calculateDataLength()));
- buff.putShort((short) samples);
+ buff.putShort(samples);
for (int idx = 0; idx < data.length; idx++) {
- buff.put((byte) data[idx]);
+ buff.put(data[idx]);
}
padTo32 = new byte[Align.to32bits(buff)];
@@ -332,6 +339,7 @@ public class SignalPdu extends RadioCommunicationsFamilyPdu implements Serializa
* @return marshalled size
* @throws Exception ByteBuffer-generated exception
*/
+ @Override
public int unmarshal(java.nio.ByteBuffer buff) throws Exception
{
super.unmarshal(buff);
diff --git a/src-generated/edu/nps/moves/dis7/SilentEntitySystem.java b/src-generated/edu/nps/moves/dis7/SilentEntitySystem.java
index 9f85b660afd27441db59acca1ebed21c4e48ad8b..b2c1eeefef43559dfc237960a34007500732adf6 100644
--- a/src-generated/edu/nps/moves/dis7/SilentEntitySystem.java
+++ b/src-generated/edu/nps/moves/dis7/SilentEntitySystem.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -88,15 +88,16 @@ public int[] getAppearanceRecordList()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeShort( (short)numberOfEntities);
- dos.writeShort( (short)appearanceRecordList.length);
+ dos.writeShort(numberOfEntities);
+ dos.writeShort(appearanceRecordList.length);
entityType.marshal(dos);
for(int idx = 0; idx < appearanceRecordList.length; idx++)
@@ -111,9 +112,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -131,7 +133,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -218,7 +220,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" numberOfEntities: ").append(numberOfEntities).append("\n");
sb.append(" entityType: ").append(entityType).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/SimulationAddress.java b/src-generated/edu/nps/moves/dis7/SimulationAddress.java
index be7849ed73646499ef2d782f15816d85ced8df86..ea094da512cbfc85bb0b086e4eedbebaaf5abca9 100644
--- a/src-generated/edu/nps/moves/dis7/SimulationAddress.java
+++ b/src-generated/edu/nps/moves/dis7/SimulationAddress.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -67,15 +67,16 @@ public short getApplication()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeShort( (short)site);
- dos.writeShort( (short)application);
+ dos.writeShort(site);
+ dos.writeShort(application);
}
catch(Exception e)
{
@@ -85,9 +86,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -101,7 +103,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -174,7 +176,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" site: ").append(site).append("\n");
sb.append(" application: ").append(application).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/SimulationIdentifier.java b/src-generated/edu/nps/moves/dis7/SimulationIdentifier.java
index 68867cd6efed9f5e017d30dad8b43243025f12d9..11126ff270c2af86977e8c33d92bdf464dff7dbd 100644
--- a/src-generated/edu/nps/moves/dis7/SimulationIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/SimulationIdentifier.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -67,15 +67,16 @@ public short getReferenceNumber()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
simulationAddress.marshal(dos);
- dos.writeShort( (short)referenceNumber);
+ dos.writeShort(referenceNumber);
}
catch(Exception e)
{
@@ -85,9 +86,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -100,7 +102,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -173,7 +175,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
sb.append(" referenceNumber: ").append(referenceNumber).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/SimulationManagementFamilyPdu.java b/src-generated/edu/nps/moves/dis7/SimulationManagementFamilyPdu.java
index 8d8760d9329040f837417d7929811cbbda114263..d771726df043b593a5ecef5bd1cf2c9c5cedd5e4 100644
--- a/src-generated/edu/nps/moves/dis7/SimulationManagementFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/SimulationManagementFamilyPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -69,8 +69,9 @@ public SimulationIdentifier getReceivingID()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -88,9 +89,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -104,7 +106,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -175,7 +177,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" originatingID: ").append(originatingID).append("\n");
sb.append(" receivingID: ").append(receivingID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/SimulationManagementWithReliabilityFamilyPdu.java b/src-generated/edu/nps/moves/dis7/SimulationManagementWithReliabilityFamilyPdu.java
index 2ccc548263fdca38b464261c931aa23ea9b1b899..a25ab49bf55c4e2244f4abdac69e958127a3e3d0 100644
--- a/src-generated/edu/nps/moves/dis7/SimulationManagementWithReliabilityFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/SimulationManagementWithReliabilityFamilyPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -68,8 +68,9 @@ public SimulationIdentifier getReceivingID()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -87,9 +88,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -103,7 +105,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -174,7 +176,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" originatingID: ").append(originatingID).append("\n");
sb.append(" receivingID: ").append(receivingID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/StandardVariableRecord.java b/src-generated/edu/nps/moves/dis7/StandardVariableRecord.java
index 4627f09d737847cfcb520488d7b8671a62633e95..4b6859b969deddac639e4b790cef17e99777b0b6 100644
--- a/src-generated/edu/nps/moves/dis7/StandardVariableRecord.java
+++ b/src-generated/edu/nps/moves/dis7/StandardVariableRecord.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -72,15 +72,16 @@ public byte[] getRecordSpecificFields()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
recordType.marshal(dos);
- dos.writeShort( (short)recordSpecificFields.length);
+ dos.writeShort(recordSpecificFields.length);
for(int idx = 0; idx < recordSpecificFields.length; idx++)
dos.writeByte(recordSpecificFields[idx]);
@@ -95,9 +96,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -116,7 +118,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -202,7 +204,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" recordType: ").append(recordType).append("\n");
sb.append(" recordSpecificFields: ").append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/StandardVariableSpecification.java b/src-generated/edu/nps/moves/dis7/StandardVariableSpecification.java
index 999e41cc6bdc0e6cbd9963bf9753ef91afa65eb6..764305b4ccff650aac23ea83be2168a63a6eea86 100644
--- a/src-generated/edu/nps/moves/dis7/StandardVariableSpecification.java
+++ b/src-generated/edu/nps/moves/dis7/StandardVariableSpecification.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -73,14 +73,15 @@ public List<StandardVariableRecord> getStandardVariables()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeShort( (short)standardVariables.size());
+ dos.writeShort(standardVariables.size());
for(int idx = 0; idx < standardVariables.size(); idx++)
{
@@ -97,9 +98,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -118,7 +120,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -137,7 +139,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < standardVariables.size(); idx++)
{
- StandardVariableRecord aStandardVariableRecord = (StandardVariableRecord)standardVariables.get(idx);
+ StandardVariableRecord aStandardVariableRecord = standardVariables.get(idx);
aStandardVariableRecord.marshal(buff);
}
@@ -206,7 +208,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" numberOfStandardVariableRecords: ").append(numberOfStandardVariableRecords).append("\n");
sb.append(" standardVariables: ").append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/StartResumePdu.java b/src-generated/edu/nps/moves/dis7/StartResumePdu.java
index 8f60c1697f9a4ecb7ce289656629a67d95518475..972bbddd44ba52e16f4e321ec5af8bfb1168edc8 100644
--- a/src-generated/edu/nps/moves/dis7/StartResumePdu.java
+++ b/src-generated/edu/nps/moves/dis7/StartResumePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -86,8 +86,9 @@ public int getRequestID()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -96,7 +97,7 @@ public void marshal(DataOutputStream dos) throws Exception
{
realWorldTime.marshal(dos);
simulationTime.marshal(dos);
- dos.writeInt( (int)requestID);
+ dos.writeInt(requestID);
}
catch(Exception e)
{
@@ -106,9 +107,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -124,7 +126,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -198,7 +200,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" realWorldTime: ").append(realWorldTime).append("\n");
sb.append(" simulationTime: ").append(simulationTime).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/StartResumeRPdu.java b/src-generated/edu/nps/moves/dis7/StartResumeRPdu.java
index f6985c45dfe0669ec15fde4a393b514fc99b2b1b..faea428b8780ac2c797ef6b46b8a4cf887f19d31 100644
--- a/src-generated/edu/nps/moves/dis7/StartResumeRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/StartResumeRPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -135,8 +135,9 @@ public int getRequestID()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -146,9 +147,9 @@ public void marshal(DataOutputStream dos) throws Exception
realWorldTime.marshal(dos);
simulationTime.marshal(dos);
requiredReliabilityService.marshal(dos);
- dos.writeByte( (byte)pad1);
- dos.writeShort( (short)pad2);
- dos.writeInt( (int)requestID);
+ dos.writeByte(pad1);
+ dos.writeShort(pad2);
+ dos.writeInt(requestID);
}
catch(Exception e)
{
@@ -158,9 +159,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -182,7 +184,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -265,7 +267,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" realWorldTime: ").append(realWorldTime).append("\n");
sb.append(" simulationTime: ").append(simulationTime).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/StartResumeReliablePdu.java b/src-generated/edu/nps/moves/dis7/StartResumeReliablePdu.java
index 11ea80adf1fcdd6d4ee84514aa0ff9fa33664ccd..383cdd36fb3ed78b29f7cfb4dcc12bd6e8deaff0 100644
--- a/src-generated/edu/nps/moves/dis7/StartResumeReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/StartResumeReliablePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
diff --git a/src-generated/edu/nps/moves/dis7/StopFreezePdu.java b/src-generated/edu/nps/moves/dis7/StopFreezePdu.java
index 21a28b2f6fe1a4203b2eb73d4261a44517743c75..ce3fd9353f1cff8e3f110ce43a7226d249875718 100644
--- a/src-generated/edu/nps/moves/dis7/StopFreezePdu.java
+++ b/src-generated/edu/nps/moves/dis7/StopFreezePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -120,8 +120,9 @@ public int getRequestID()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -131,8 +132,8 @@ public void marshal(DataOutputStream dos) throws Exception
realWorldTime.marshal(dos);
reason.marshal(dos);
frozenBehavior.marshal(dos);
- dos.writeShort( (short)padding1);
- dos.writeInt( (int)requestID);
+ dos.writeShort(padding1);
+ dos.writeInt(requestID);
}
catch(Exception e)
{
@@ -142,9 +143,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -164,7 +166,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -244,7 +246,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" realWorldTime: ").append(realWorldTime).append("\n");
sb.append(" reason: ").append(reason).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/StopFreezeRPdu.java b/src-generated/edu/nps/moves/dis7/StopFreezeRPdu.java
index a0e56c8eacf3172281a1c2dc592fd9ace1ec93f9..63bddfba19465db1f2c45e3bb6474f5d8497e11c 100644
--- a/src-generated/edu/nps/moves/dis7/StopFreezeRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/StopFreezeRPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -137,8 +137,9 @@ public int getRequestID()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -149,8 +150,8 @@ public void marshal(DataOutputStream dos) throws Exception
reason.marshal(dos);
frozenBehavior.marshal(dos);
requiredReliablityService.marshal(dos);
- dos.writeByte( (byte)pad1);
- dos.writeInt( (int)requestID);
+ dos.writeByte(pad1);
+ dos.writeInt(requestID);
}
catch(Exception e)
{
@@ -160,9 +161,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -184,7 +186,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -267,7 +269,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" realWorldTime: ").append(realWorldTime).append("\n");
sb.append(" reason: ").append(reason).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/StopFreezeReliablePdu.java b/src-generated/edu/nps/moves/dis7/StopFreezeReliablePdu.java
index f0b3f8162bd1a13baa4048354bd55858af55a20f..5b7a5a11db5eb026fde621e1c4527f0aa69b8489 100644
--- a/src-generated/edu/nps/moves/dis7/StopFreezeReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/StopFreezeReliablePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
diff --git a/src-generated/edu/nps/moves/dis7/StorageFuel.java b/src-generated/edu/nps/moves/dis7/StorageFuel.java
index 16376da4df77935b66356d37acad917e65e07737..fb76d2ffd198a0e05dd4b102feed45274163c3a5 100644
--- a/src-generated/edu/nps/moves/dis7/StorageFuel.java
+++ b/src-generated/edu/nps/moves/dis7/StorageFuel.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -118,18 +118,19 @@ public byte getPadding()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeInt( (int)fuelQuantity);
+ dos.writeInt(fuelQuantity);
fuelMeasurementUnits.marshal(dos);
fuelType.marshal(dos);
fuelLocation.marshal(dos);
- dos.writeByte( (byte)padding);
+ dos.writeByte(padding);
}
catch(Exception e)
{
@@ -139,9 +140,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -161,7 +163,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -243,7 +245,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" fuelQuantity: ").append(fuelQuantity).append("\n");
sb.append(" fuelMeasurementUnits: ").append(fuelMeasurementUnits).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/StorageFuelReload.java b/src-generated/edu/nps/moves/dis7/StorageFuelReload.java
index 93e9b6d12de657d90fb4f6aaca76019866f3113c..d32ed18a57d117e3524003bc6b6ffa8f91440d32 100644
--- a/src-generated/edu/nps/moves/dis7/StorageFuelReload.java
+++ b/src-generated/edu/nps/moves/dis7/StorageFuelReload.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -169,21 +169,22 @@ public byte getPadding()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeInt( (int)standardQuantity);
- dos.writeInt( (int)maximumQuantity);
- dos.writeInt( (int)standardQuantityReloadTime);
- dos.writeInt( (int)maximumQuantityReloadTime);
+ dos.writeInt(standardQuantity);
+ dos.writeInt(maximumQuantity);
+ dos.writeInt(standardQuantityReloadTime);
+ dos.writeInt(maximumQuantityReloadTime);
fuelMeasurementUnits.marshal(dos);
fuelType.marshal(dos);
fuelLocation.marshal(dos);
- dos.writeByte( (byte)padding);
+ dos.writeByte(padding);
}
catch(Exception e)
{
@@ -193,9 +194,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -221,7 +223,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -312,7 +314,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" standardQuantity: ").append(standardQuantity).append("\n");
sb.append(" maximumQuantity: ").append(maximumQuantity).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/SubCategory.java b/src-generated/edu/nps/moves/dis7/SubCategory.java
index 8f27b071bea1b1694b43301925403a3217ea71ef..92532844984c2c99d17820255c34ea552cd01616 100644
--- a/src-generated/edu/nps/moves/dis7/SubCategory.java
+++ b/src-generated/edu/nps/moves/dis7/SubCategory.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -7,6 +7,15 @@ package edu.nps.moves.dis7;
public interface SubCategory
{
+ /**
+ *
+ * @return the value of this SubCategory
+ */
int getValue();
+
+ /**
+ *
+ * @return the description of this SubCategory
+ */
String getDescription();
}
diff --git a/src-generated/edu/nps/moves/dis7/SupplementalEmissionEntityStatePdu.java b/src-generated/edu/nps/moves/dis7/SupplementalEmissionEntityStatePdu.java
index 03b27ccbb1be8d96e547f78e348dc3d157c28d3c..d848c54a0d39a4b507091b4ccdf3f3a88c8e6f31 100644
--- a/src-generated/edu/nps/moves/dis7/SupplementalEmissionEntityStatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/SupplementalEmissionEntityStatePdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
diff --git a/src-generated/edu/nps/moves/dis7/SupplyQuantity.java b/src-generated/edu/nps/moves/dis7/SupplyQuantity.java
index e5ec0685a38988e41adb27e9d982016cfb8dbc12..550204350947066ddbca70e7b361a97dc672ced8 100644
--- a/src-generated/edu/nps/moves/dis7/SupplyQuantity.java
+++ b/src-generated/edu/nps/moves/dis7/SupplyQuantity.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -67,15 +67,16 @@ public float getQuantity()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
supplyType.marshal(dos);
- dos.writeFloat( (float)quantity);
+ dos.writeFloat(quantity);
}
catch(Exception e)
{
@@ -85,9 +86,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -100,7 +102,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -173,7 +175,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" supplyType: ").append(supplyType).append("\n");
sb.append(" quantity: ").append(quantity).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/SyntheticEnvironmentFamilyPdu.java b/src-generated/edu/nps/moves/dis7/SyntheticEnvironmentFamilyPdu.java
index e496120a07486dd077303fbf7bbbddea2d2f04f6..01bd4705efb6b6975ef8cdfb95d07469cb15ea19 100644
--- a/src-generated/edu/nps/moves/dis7/SyntheticEnvironmentFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/SyntheticEnvironmentFamilyPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -35,8 +35,9 @@ public int getMarshalledSize()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -52,9 +53,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -66,7 +68,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -131,7 +133,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
return sb.toString();
diff --git a/src-generated/edu/nps/moves/dis7/SystemIdentifier.java b/src-generated/edu/nps/moves/dis7/SystemIdentifier.java
index 5d2518c4823b57d0e9a20a8278d4573f2a69bae3..2b4f8cd40acef015cb5ccb71e887c7d7ed2e8569 100644
--- a/src-generated/edu/nps/moves/dis7/SystemIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/SystemIdentifier.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -101,8 +101,9 @@ public ChangeOptions getChangeOptions()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -121,9 +122,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -140,7 +142,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -219,7 +221,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" systemType: ").append(systemType).append("\n");
sb.append(" systemName: ").append(systemName).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/TSPIPdu.java b/src-generated/edu/nps/moves/dis7/TSPIPdu.java
index 111b78caa00a8698807b30fd2eaee06bbc52b340..8636c902db48252adee4733d3bc6edba854a6a53 100644
--- a/src-generated/edu/nps/moves/dis7/TSPIPdu.java
+++ b/src-generated/edu/nps/moves/dis7/TSPIPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -199,8 +199,9 @@ public byte[] getSystemSpecificData()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -208,15 +209,15 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
liveEntityId.marshal(dos);
- dos.writeByte( (byte)TSPIFlag);
+ dos.writeByte(TSPIFlag);
entityLocation.marshal(dos);
entityLinearVelocity.marshal(dos);
entityOrientation.marshal(dos);
positionError.marshal(dos);
orientationError.marshal(dos);
deadReckoningParameters.marshal(dos);
- dos.writeShort( (short)measuredSpeed);
- dos.writeByte( (byte)systemSpecificData.length);
+ dos.writeShort(measuredSpeed);
+ dos.writeByte(systemSpecificData.length);
for(int idx = 0; idx < systemSpecificData.length; idx++)
dos.writeByte(systemSpecificData[idx]);
@@ -230,9 +231,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -260,7 +262,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -366,7 +368,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" liveEntityId: ").append(liveEntityId).append("\n");
sb.append(" TSPIFlag: ").append(TSPIFlag).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/TimeSpacePositionInformationPdu.java b/src-generated/edu/nps/moves/dis7/TimeSpacePositionInformationPdu.java
index 8b61bdca4fb9a6cb5b4f8335bf9f54b21889f5f9..533d48f0dcced1693927ad25043e873ada484c62 100644
--- a/src-generated/edu/nps/moves/dis7/TimeSpacePositionInformationPdu.java
+++ b/src-generated/edu/nps/moves/dis7/TimeSpacePositionInformationPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
diff --git a/src-generated/edu/nps/moves/dis7/TotalRecordSets.java b/src-generated/edu/nps/moves/dis7/TotalRecordSets.java
index b5aa11216668e1abff69ad72018a5ea925479714..5e6e1caeee8829ce16e107a6b3c68ca60a65cde1 100644
--- a/src-generated/edu/nps/moves/dis7/TotalRecordSets.java
+++ b/src-generated/edu/nps/moves/dis7/TotalRecordSets.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -67,15 +67,16 @@ public short getPadding()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeShort( (short)totalRecordSets);
- dos.writeShort( (short)padding);
+ dos.writeShort(totalRecordSets);
+ dos.writeShort(padding);
}
catch(Exception e)
{
@@ -85,9 +86,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -101,7 +103,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -174,7 +176,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" totalRecordSets: ").append(totalRecordSets).append("\n");
sb.append(" padding: ").append(padding).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/TrackJamData.java b/src-generated/edu/nps/moves/dis7/TrackJamData.java
index 16b451c9c7baeaea8295d05e97253f1dade0eb7c..bd9ab2d1ae06e7add13da2eee0409a07f5a9fe47 100644
--- a/src-generated/edu/nps/moves/dis7/TrackJamData.java
+++ b/src-generated/edu/nps/moves/dis7/TrackJamData.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -84,16 +84,17 @@ public byte getBeamNumber()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
entityID.marshal(dos);
- dos.writeByte( (byte)emitterNumber);
- dos.writeByte( (byte)beamNumber);
+ dos.writeByte(emitterNumber);
+ dos.writeByte(beamNumber);
}
catch(Exception e)
{
@@ -103,9 +104,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -120,7 +122,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -196,7 +198,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" entityID: ").append(entityID).append("\n");
sb.append(" emitterNumber: ").append(emitterNumber).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/TransferOwnershipPdu.java b/src-generated/edu/nps/moves/dis7/TransferOwnershipPdu.java
index 3ebdc61e715ab0ed914e7813de61abcb52470d6a..7bdbf34e681ca6439049dae6ef694234d047f316 100644
--- a/src-generated/edu/nps/moves/dis7/TransferOwnershipPdu.java
+++ b/src-generated/edu/nps/moves/dis7/TransferOwnershipPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -153,8 +153,9 @@ public RecordSpecification getRecordSets()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -163,7 +164,7 @@ public void marshal(DataOutputStream dos) throws Exception
{
originatingEntityID.marshal(dos);
receivingEntityID.marshal(dos);
- dos.writeInt( (int)requestID);
+ dos.writeInt(requestID);
requiredReliabilityService.marshal(dos);
transferType.marshal(dos);
transferEntityID.marshal(dos);
@@ -177,9 +178,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -201,7 +203,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -287,7 +289,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" originatingEntityID: ").append(originatingEntityID).append("\n");
sb.append(" receivingEntityID: ").append(receivingEntityID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/TransmitterPdu.java b/src-generated/edu/nps/moves/dis7/TransmitterPdu.java
index 877b3ef6d01b48b0a6bbf46755cdc886266021bf..dfd2ad0b43a7b276e6eb46c51d5fec639a1cfd23 100644
--- a/src-generated/edu/nps/moves/dis7/TransmitterPdu.java
+++ b/src-generated/edu/nps/moves/dis7/TransmitterPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -371,8 +371,9 @@ public List<VariableTransmitterParameters> getAntennaPatternList()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -380,24 +381,24 @@ public void marshal(DataOutputStream dos) throws Exception
try
{
header.marshal(dos);
- dos.writeShort( (short)radioNumber);
+ dos.writeShort(radioNumber);
radioEntityType.marshal(dos);
transmitState.marshal(dos);
inputSource.marshal(dos);
- dos.writeShort( (short)variableTransmitterParameterCount);
+ dos.writeShort(variableTransmitterParameterCount);
antennaLocation.marshal(dos);
relativeAntennaLocation.marshal(dos);
antennaPatternType.marshal(dos);
- dos.writeShort( (short)antennaPatternList.size());
- dos.writeLong( (long)frequency);
- dos.writeFloat( (float)transmitFrequencyBandwidth);
- dos.writeFloat( (float)power);
+ dos.writeShort(antennaPatternList.size());
+ dos.writeLong(frequency);
+ dos.writeFloat(transmitFrequencyBandwidth);
+ dos.writeFloat(power);
modulationType.marshal(dos);
cryptoSystem.marshal(dos);
- dos.writeShort( (short)cryptoKeyId);
- dos.writeByte( (byte)modulationParametersList.size());
- dos.writeByte( (byte)padding1);
- dos.writeShort( (short)padding2);
+ dos.writeShort(cryptoKeyId);
+ dos.writeByte(modulationParametersList.size());
+ dos.writeByte(padding1);
+ dos.writeShort(padding2);
for(int idx = 0; idx < modulationParametersList.size(); idx++)
{
@@ -421,9 +422,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -482,7 +484,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -520,14 +522,14 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < modulationParametersList.size(); idx++)
{
- ModulationParameters aModulationParameters = (ModulationParameters)modulationParametersList.get(idx);
+ ModulationParameters aModulationParameters = modulationParametersList.get(idx);
aModulationParameters.marshal(buff);
}
for(int idx = 0; idx < antennaPatternList.size(); idx++)
{
- VariableTransmitterParameters aVariableTransmitterParameters = (VariableTransmitterParameters)antennaPatternList.get(idx);
+ VariableTransmitterParameters aVariableTransmitterParameters = antennaPatternList.get(idx);
aVariableTransmitterParameters.marshal(buff);
}
@@ -638,7 +640,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" header: ").append(header).append("\n");
sb.append(" radioNumber: ").append(radioNumber).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/UABeam.java b/src-generated/edu/nps/moves/dis7/UABeam.java
index 789814ab8d547ef4e92dce283b30f3872c8f2717..7119a368d9a3fc1c2bfcb57eb0b6143f842a36e8 100644
--- a/src-generated/edu/nps/moves/dis7/UABeam.java
+++ b/src-generated/edu/nps/moves/dis7/UABeam.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -96,16 +96,17 @@ public UAFundamentalParameter getFundamentalParameterData()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeByte( (byte)beamDataLength);
- dos.writeByte( (byte)beamNumber);
- dos.writeShort( (short)padding);
+ dos.writeByte(beamDataLength);
+ dos.writeByte(beamNumber);
+ dos.writeShort(padding);
fundamentalParameterData.marshal(dos);
}
catch(Exception e)
@@ -116,9 +117,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -135,7 +137,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -214,7 +216,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" beamDataLength: ").append(beamDataLength).append("\n");
sb.append(" beamNumber: ").append(beamNumber).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/UAEmitter.java b/src-generated/edu/nps/moves/dis7/UAEmitter.java
index a700013e722785283a027d5d345c486a4a0abfcd..145720de9688fcc3f953cee55ddc00b60ac55790 100644
--- a/src-generated/edu/nps/moves/dis7/UAEmitter.java
+++ b/src-generated/edu/nps/moves/dis7/UAEmitter.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -124,16 +124,17 @@ public List<UABeam> getBeams()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeByte( (byte)systemDataLength);
- dos.writeByte( (byte)beams.size());
- dos.writeShort( (short)padding);
+ dos.writeByte(systemDataLength);
+ dos.writeByte(beams.size());
+ dos.writeShort(padding);
acousticEmitter.marshal(dos);
location.marshal(dos);
@@ -152,9 +153,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -179,7 +181,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -202,7 +204,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < beams.size(); idx++)
{
- UABeam aUABeam = (UABeam)beams.get(idx);
+ UABeam aUABeam = beams.get(idx);
aUABeam.marshal(buff);
}
@@ -278,7 +280,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" systemDataLength: ").append(systemDataLength).append("\n");
sb.append(" padding: ").append(padding).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/UAFundamentalParameter.java b/src-generated/edu/nps/moves/dis7/UAFundamentalParameter.java
index cdde654e1822b77da1d64afc7575aa742e711a6f..57e31d3c1b14392b0e2c9c4d10542405c35f4dee 100644
--- a/src-generated/edu/nps/moves/dis7/UAFundamentalParameter.java
+++ b/src-generated/edu/nps/moves/dis7/UAFundamentalParameter.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -135,8 +135,9 @@ public float getDepressionElevationBeamWidth()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -144,10 +145,10 @@ public void marshal(DataOutputStream dos) throws Exception
{
activeEmissionParameterIndex.marshal(dos);
scanPattern.marshal(dos);
- dos.writeFloat( (float)beamCenterAzimuthHorizontal);
- dos.writeFloat( (float)azimuthalBeamwidthHorizontal);
- dos.writeFloat( (float)beamCenterDepressionElevation);
- dos.writeFloat( (float)depressionElevationBeamWidth);
+ dos.writeFloat(beamCenterAzimuthHorizontal);
+ dos.writeFloat(azimuthalBeamwidthHorizontal);
+ dos.writeFloat(beamCenterDepressionElevation);
+ dos.writeFloat(depressionElevationBeamWidth);
}
catch(Exception e)
{
@@ -157,9 +158,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -181,7 +183,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -266,7 +268,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" activeEmissionParameterIndex: ").append(activeEmissionParameterIndex).append("\n");
sb.append(" scanPattern: ").append(scanPattern).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/UnattachedIdentifier.java b/src-generated/edu/nps/moves/dis7/UnattachedIdentifier.java
index c2ccbc3260020437738abceed34374bc9d18033d..b1c8138579ec9a894a4a0e033cf41ce42d6c8287 100644
--- a/src-generated/edu/nps/moves/dis7/UnattachedIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/UnattachedIdentifier.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -67,15 +67,16 @@ public short getReferenceNumber()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
simulationAddress.marshal(dos);
- dos.writeShort( (short)referenceNumber);
+ dos.writeShort(referenceNumber);
}
catch(Exception e)
{
@@ -85,9 +86,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -100,7 +102,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -173,7 +175,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" simulationAddress: ").append(simulationAddress).append("\n");
sb.append(" referenceNumber: ").append(referenceNumber).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/UnderwaterAcousticPdu.java b/src-generated/edu/nps/moves/dis7/UnderwaterAcousticPdu.java
index 5a6354cb751ad991092ce017e37a35c1766f98e0..a9cdd92e8f2eb80c17e6dd7aaa3d822fe9daa5c6 100644
--- a/src-generated/edu/nps/moves/dis7/UnderwaterAcousticPdu.java
+++ b/src-generated/edu/nps/moves/dis7/UnderwaterAcousticPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -211,8 +211,9 @@ public List<UAEmitter> getEmitterSystems()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -222,12 +223,12 @@ public void marshal(DataOutputStream dos) throws Exception
emittingEntityID.marshal(dos);
eventID.marshal(dos);
stateChangeIndicator.marshal(dos);
- dos.writeByte( (byte)pad);
+ dos.writeByte(pad);
passiveParameterIndex.marshal(dos);
- dos.writeByte( (byte)propulsionPlantConfiguration);
- dos.writeByte( (byte)shaftRPMs.size());
- dos.writeByte( (byte)apaData.size());
- dos.writeByte( (byte)emitterSystems.size());
+ dos.writeByte(propulsionPlantConfiguration);
+ dos.writeByte(shaftRPMs.size());
+ dos.writeByte(apaData.size());
+ dos.writeByte(emitterSystems.size());
for(int idx = 0; idx < shaftRPMs.size(); idx++)
{
@@ -258,9 +259,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -309,7 +311,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -337,21 +339,21 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
for(int idx = 0; idx < shaftRPMs.size(); idx++)
{
- ShaftRPM aShaftRPM = (ShaftRPM)shaftRPMs.get(idx);
+ ShaftRPM aShaftRPM = shaftRPMs.get(idx);
aShaftRPM.marshal(buff);
}
for(int idx = 0; idx < apaData.size(); idx++)
{
- APA aAPA = (APA)apaData.get(idx);
+ APA aAPA = apaData.get(idx);
aAPA.marshal(buff);
}
for(int idx = 0; idx < emitterSystems.size(); idx++)
{
- UAEmitter aUAEmitter = (UAEmitter)emitterSystems.get(idx);
+ UAEmitter aUAEmitter = emitterSystems.get(idx);
aUAEmitter.marshal(buff);
}
@@ -452,7 +454,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" emittingEntityID: ").append(emittingEntityID).append("\n");
sb.append(" eventID: ").append(eventID).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/UnsignedDISInteger.java b/src-generated/edu/nps/moves/dis7/UnsignedDISInteger.java
index b8c96f408ddc03c6632adf04b166ddcfd96e4617..9bb314cc471d8b419999fa78a818de3faef0290a 100644
--- a/src-generated/edu/nps/moves/dis7/UnsignedDISInteger.java
+++ b/src-generated/edu/nps/moves/dis7/UnsignedDISInteger.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -50,14 +50,15 @@ public int getVal()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeInt( (int)val);
+ dos.writeInt(val);
}
catch(Exception e)
{
@@ -67,9 +68,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -81,7 +83,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -151,7 +153,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" val: ").append(val).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/VariableDatum.java b/src-generated/edu/nps/moves/dis7/VariableDatum.java
index 1864710ded435834a68b5b0dc4719c9019515913..934ea9cfd62e39875286a914e72355cd72040e69 100644
--- a/src-generated/edu/nps/moves/dis7/VariableDatum.java
+++ b/src-generated/edu/nps/moves/dis7/VariableDatum.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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;
@@ -33,7 +33,7 @@ public class VariableDatum extends Object implements Serializable
private byte[] padding = new byte[0]; // pad to 64-bit boundary
/**
- * Returns the size of this serialized object in bytes
+ * @return the size of this serialized object in bytes
*/
public int getMarshalledSize()
{
@@ -50,6 +50,7 @@ public class VariableDatum extends Object implements Serializable
/**
* Setter for {@link VariableDatum#variableDatumID}
*
+ * @param pVariableDatumID
* @return this object
*/
public VariableDatum setVariableDatumID(VariableRecordType pVariableDatumID)
@@ -76,6 +77,8 @@ public class VariableDatum extends Object implements Serializable
* {@link VariableDatum#variableDatumValue} is NOT
* set and this pdu is issued (marshaled), the value used when marshaling this field will be
* the size of the byte array times 8.
+ * @param bitLength
+ * @return
*/
public VariableDatum setVariableDatumLengthInBits(int bitLength)
{
@@ -91,6 +94,8 @@ public class VariableDatum extends Object implements Serializable
* {@link VariableDatum#variableDatumValue} is NOT
* set and this pdu is issued (marshaled), the value used when marshaling this field will be
* the size of the byte array times 8.
+ * @param byteLength
+ * @return
*/
public VariableDatum setVariableDatumLengthInBytes(int byteLength)
{
@@ -100,6 +105,7 @@ public class VariableDatum extends Object implements Serializable
/**
* Getter for {@link VariableDatum#variableDatumLength}
+ * @return
*/
public int getVariableDatumLength()
{
@@ -113,6 +119,7 @@ public class VariableDatum extends Object implements Serializable
* The size of the byte array reflects the value of {@link VariableDatum#variableDatumLength} rounded to the next
* highest byte boundary. If {@link VariableDatum#variableDatumLength} is not set when the Pdu is sent, the
* receiver will read a bit length equal to the size of the byte array times 8.
+ * @param pVariableDatumValue
* @return this object
*/
public VariableDatum setVariableDatumValue(byte[] pVariableDatumValue)
@@ -123,6 +130,7 @@ public class VariableDatum extends Object implements Serializable
/**
* Getter for {@link VariableDatum#variableDatumValue}
+ * @return
*/
public byte[] getVariableDatumValue()
{
@@ -136,6 +144,7 @@ public class VariableDatum extends Object implements Serializable
/**
* Serializes an object to a DataOutputStream.
*
+ * @throws java.lang.Exception
* @see java.io.DataOutputStream
* @param dos The DataOutputStream
*/
@@ -144,7 +153,7 @@ public class VariableDatum extends Object implements Serializable
try {
variableDatumID.marshal(dos);
if (variableDatumLength != null)
- dos.writeInt((int) variableDatumLength);
+ dos.writeInt(variableDatumLength);
else
dos.writeInt(variableDatumLength = calculateDatumLength());
@@ -154,7 +163,7 @@ public class VariableDatum extends Object implements Serializable
padding = new byte[Align.to64bits(dos)];
}
- catch (Exception e) {
+ catch (IOException e) {
System.err.println(e);
}
}
@@ -162,6 +171,7 @@ public class VariableDatum extends Object implements Serializable
/**
* Unserializes an object from a DataInputStream.
*
+ * @throws java.lang.Exception
* @see java.io.DataInputStream
* @param dis The DataInputStream
* @return marshalled size
@@ -208,7 +218,7 @@ public class VariableDatum extends Object implements Serializable
buff.putInt(variableDatumLength = calculateDatumLength());
for (int idx = 0; idx < variableDatumLength; idx++) //for(int idx = 0; idx < variableDatumValue.length; idx++)
{
- buff.put((byte) variableDatumValue[idx]);
+ buff.put(variableDatumValue[idx]);
}
padding = new byte[Align.to64bits(buff)];
}
diff --git a/src-generated/edu/nps/moves/dis7/VariableParameter.java b/src-generated/edu/nps/moves/dis7/VariableParameter.java
index 67635cc214ee599f49ad6a0e7a28c946bc6817ee..adfb3737aa83bdfdb88c2ea15eae10a9e0b329dc 100644
--- a/src-generated/edu/nps/moves/dis7/VariableParameter.java
+++ b/src-generated/edu/nps/moves/dis7/VariableParameter.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -67,8 +67,9 @@ public byte[] getRecordSpecificFields()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -88,9 +89,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -105,7 +107,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -187,7 +189,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" recordType: ").append(recordType).append("\n");
sb.append(" recordSpecificFields: ").append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/VariableTransmitterParameters.java b/src-generated/edu/nps/moves/dis7/VariableTransmitterParameters.java
index 9120b7da5071db9ca52856b8a672c51aaa007faa..967eadf02119140e6846a3b0b634158f99096382 100644
--- a/src-generated/edu/nps/moves/dis7/VariableTransmitterParameters.java
+++ b/src-generated/edu/nps/moves/dis7/VariableTransmitterParameters.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -86,15 +86,16 @@ public byte[] getRecordSpecificFields()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
recordType.marshal(dos);
- dos.writeShort( (short)recordLength);
+ dos.writeShort(recordLength);
for(int idx = 0; idx < recordSpecificFields.length; idx++)
dos.writeByte(recordSpecificFields[idx]);
@@ -109,9 +110,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -130,7 +132,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -217,7 +219,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" recordType: ").append(recordType).append("\n");
sb.append(" recordLength: ").append(recordLength).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/Vector2Float.java b/src-generated/edu/nps/moves/dis7/Vector2Float.java
index d0a8494d635f059752d364c2c2addc22bfda35f4..9d0ae58fe860ed5c542cb550b400db092ecdc89b 100644
--- a/src-generated/edu/nps/moves/dis7/Vector2Float.java
+++ b/src-generated/edu/nps/moves/dis7/Vector2Float.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -67,15 +67,16 @@ public float getY()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeFloat( (float)x);
- dos.writeFloat( (float)y);
+ dos.writeFloat(x);
+ dos.writeFloat(y);
}
catch(Exception e)
{
@@ -85,9 +86,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -101,7 +103,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -174,7 +176,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" x: ").append(x).append("\n");
sb.append(" y: ").append(y).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/Vector3Double.java b/src-generated/edu/nps/moves/dis7/Vector3Double.java
index f0a7b314c950d41028783c469084a2694217bc6c..4df208322fcb16a79fc2532c5e1dcfe68ca3e0fe 100644
--- a/src-generated/edu/nps/moves/dis7/Vector3Double.java
+++ b/src-generated/edu/nps/moves/dis7/Vector3Double.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -84,16 +84,17 @@ public double getZ()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeDouble( (double)x);
- dos.writeDouble( (double)y);
- dos.writeDouble( (double)z);
+ dos.writeDouble(x);
+ dos.writeDouble(y);
+ dos.writeDouble(z);
}
catch(Exception e)
{
@@ -103,9 +104,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -121,7 +123,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -197,7 +199,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" x: ").append(x).append("\n");
sb.append(" y: ").append(y).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/Vector3Float.java b/src-generated/edu/nps/moves/dis7/Vector3Float.java
index dd9c6975fe4ccbc38f2e9eb0aeda36a3a91019db..7d18aa1f2e1f5081754f28f778299836ebae351e 100644
--- a/src-generated/edu/nps/moves/dis7/Vector3Float.java
+++ b/src-generated/edu/nps/moves/dis7/Vector3Float.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -84,16 +84,17 @@ public float getZ()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeFloat( (float)x);
- dos.writeFloat( (float)y);
- dos.writeFloat( (float)z);
+ dos.writeFloat(x);
+ dos.writeFloat(y);
+ dos.writeFloat(z);
}
catch(Exception e)
{
@@ -103,9 +104,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -121,7 +123,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -197,7 +199,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" x: ").append(x).append("\n");
sb.append(" y: ").append(y).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/VectoringNozzleSystem.java b/src-generated/edu/nps/moves/dis7/VectoringNozzleSystem.java
index ccdf2ba2696be4b6effb2dcfe3e5d929d50ba3ed..a6ceef0b636cfe595d95da9e10384c101da72496 100644
--- a/src-generated/edu/nps/moves/dis7/VectoringNozzleSystem.java
+++ b/src-generated/edu/nps/moves/dis7/VectoringNozzleSystem.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -67,15 +67,16 @@ public float getVerticalDeflectionAngle()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
try
{
- dos.writeFloat( (float)horizontalDeflectionAngle);
- dos.writeFloat( (float)verticalDeflectionAngle);
+ dos.writeFloat(horizontalDeflectionAngle);
+ dos.writeFloat(verticalDeflectionAngle);
}
catch(Exception e)
{
@@ -85,9 +86,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -101,7 +103,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -174,7 +176,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
sb.append(" horizontalDeflectionAngle: ").append(horizontalDeflectionAngle).append("\n");
sb.append(" verticalDeflectionAngle: ").append(verticalDeflectionAngle).append("\n");
diff --git a/src-generated/edu/nps/moves/dis7/WarfareFamilyPdu.java b/src-generated/edu/nps/moves/dis7/WarfareFamilyPdu.java
index 8c70ae6a919e7a33e32dde32078f494e418dbc2d..21bbb67a427c4df201ba20a3db5cd23ccf010973 100644
--- a/src-generated/edu/nps/moves/dis7/WarfareFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/WarfareFamilyPdu.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * 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
*/
@@ -35,8 +35,9 @@ public int getMarshalledSize()
/**
* Serializes an object to a DataOutputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataOutputStream
- * @param dos The DataOutputStream
+ * @param dos the OutputStream
*/
public void marshal(DataOutputStream dos) throws Exception
{
@@ -52,9 +53,10 @@ public void marshal(DataOutputStream dos) throws Exception
/**
* Unserializes an object from a DataInputStream.
+ * @throws java.lang.Exception if something goes wrong
* @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
+ * @param dis the InputStream
+ * @return unmarshalled size
*/
public int unmarshal(DataInputStream dis) throws Exception
{
@@ -66,7 +68,7 @@ public int unmarshal(DataInputStream dis) throws Exception
}
catch(Exception e)
{
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
@@ -131,7 +133,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName()+":\n");
+ sb.append(getClass().getSimpleName()).append(":\n");
return sb.toString();
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/APAParameterIndexAPAStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/APAParameterIndexAPAStatus.java
index 9f1029c0b52415b80c2a860ea50d3dc006672384..e0b5b07d219dad2002c836d9a09be0d345387037 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/APAParameterIndexAPAStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/APAParameterIndexAPAStatus.java
@@ -77,7 +77,7 @@ public enum APAParameterIndexAPAStatus
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static APAParameterIndexAPAStatus unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum APAParameterIndexAPAStatus
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AcknowledgeAcknowledgeFlag.java b/src-generated/edu/nps/moves/dis7/enumerations/AcknowledgeAcknowledgeFlag.java
index f22bb303ad1ebba4d5be82e5f4bdeef0794d7434..17d8caebfb3eb7b8543267eed0ad494de54092a3 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AcknowledgeAcknowledgeFlag.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AcknowledgeAcknowledgeFlag.java
@@ -72,12 +72,12 @@ public enum AcknowledgeAcknowledgeFlag
public static AcknowledgeAcknowledgeFlag unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static AcknowledgeAcknowledgeFlag unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AcknowledgeResponseFlag.java b/src-generated/edu/nps/moves/dis7/enumerations/AcknowledgeResponseFlag.java
index 770184e9b34ba65870feb1d71db161af5e292d43..58f905a3704607722184721f674e2b1a028d52e1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AcknowledgeResponseFlag.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AcknowledgeResponseFlag.java
@@ -70,12 +70,12 @@ public enum AcknowledgeResponseFlag
public static AcknowledgeResponseFlag unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static AcknowledgeResponseFlag unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AddSpecificDimensionEnumerationsforSubsurfaceAreaSize.java b/src-generated/edu/nps/moves/dis7/enumerations/AddSpecificDimensionEnumerationsforSubsurfaceAreaSize.java
index df5242d1afd53cdf6827aa616a3a2e04c0e7194d..f395a4cd04f32817df9e912673a7438ab797d2f1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AddSpecificDimensionEnumerationsforSubsurfaceAreaSize.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AddSpecificDimensionEnumerationsforSubsurfaceAreaSize.java
@@ -83,7 +83,7 @@ public enum AddSpecificDimensionEnumerationsforSubsurfaceAreaSize
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AddSpecificDimensionEnumerationsforSubsurfaceAreaSize unmarshalEnum(ByteBuffer buff) throws Exception
@@ -96,7 +96,7 @@ public enum AddSpecificDimensionEnumerationsforSubsurfaceAreaSize
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforAirCategory201Insect.java b/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforAirCategory201Insect.java
index 2609ca3d2f653a731f9d1ab6d94a6db0d73b0047..c03c8e6d7c3014fbcc14bd49a52dd6f697b85b4a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforAirCategory201Insect.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforAirCategory201Insect.java
@@ -75,7 +75,7 @@ public enum AddVariantsforAirCategory201Insect
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AddVariantsforAirCategory201Insect unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum AddVariantsforAirCategory201Insect
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforLandCategory200Mammal.java b/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforLandCategory200Mammal.java
index 3fdf1791062d979608152c4fc8bdaffa1d31d864..5962b1d195f9d68d10b7887835c1f2f39cec9f17 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforLandCategory200Mammal.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforLandCategory200Mammal.java
@@ -81,7 +81,7 @@ public enum AddVariantsforLandCategory200Mammal
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AddVariantsforLandCategory200Mammal unmarshalEnum(ByteBuffer buff) throws Exception
@@ -94,7 +94,7 @@ public enum AddVariantsforLandCategory200Mammal
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforSubsurfaceCategoriesFishMolluskCrustaceanandInsect.java b/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforSubsurfaceCategoriesFishMolluskCrustaceanandInsect.java
index c7fe41cbe78af807b43161f30f0fae0fbe7df2e4..7ff285356cf7b6a6de05641b944332e65e471faf 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforSubsurfaceCategoriesFishMolluskCrustaceanandInsect.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforSubsurfaceCategoriesFishMolluskCrustaceanandInsect.java
@@ -85,7 +85,7 @@ public enum AddVariantsforSubsurfaceCategoriesFishMolluskCrustaceanandInsect
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AddVariantsforSubsurfaceCategoriesFishMolluskCrustaceanandInsect unmarshalEnum(ByteBuffer buff) throws Exception
@@ -98,7 +98,7 @@ public enum AddVariantsforSubsurfaceCategoriesFishMolluskCrustaceanandInsect
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateAggregateKind.java b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateAggregateKind.java
index 732b9e1f16259faf4a8cea25f6e9edf64572bb88..6fee569af0092f70ff4e03e0361288d1ffb8fa82 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateAggregateKind.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateAggregateKind.java
@@ -81,7 +81,7 @@ public enum AggregateStateAggregateKind
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AggregateStateAggregateKind unmarshalEnum(ByteBuffer buff) throws Exception
@@ -94,7 +94,7 @@ public enum AggregateStateAggregateKind
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateAggregateState.java b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateAggregateState.java
index 95aec001fd130a247768eb9d4b467cdd730dcc7f..ca60ef2fdfa3b0f64f290ceaa324dab65e5fb07f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateAggregateState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateAggregateState.java
@@ -81,7 +81,7 @@ public enum AggregateStateAggregateState
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AggregateStateAggregateState unmarshalEnum(ByteBuffer buff) throws Exception
@@ -94,7 +94,7 @@ public enum AggregateStateAggregateState
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateSpecific.java b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateSpecific.java
index 0a8f49e1128abdf687d5bcd70505a857dd5bdf07..1959eca19917be48896d024ce473a8169ab2b6d3 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateSpecific.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateSpecific.java
@@ -73,7 +73,7 @@ public enum AggregateStateSpecific
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AggregateStateSpecific unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum AggregateStateSpecific
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateSubcategory.java b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateSubcategory.java
index 83f9e794b624af57166dce4b327f65a0fc23be08..0d4a8fb6cce826d64e49f2914e2fa9a88d9c416e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateSubcategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateSubcategory.java
@@ -115,7 +115,7 @@ public enum AggregateStateSubcategory implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AggregateStateSubcategory unmarshalEnum(ByteBuffer buff) throws Exception
@@ -128,7 +128,7 @@ public enum AggregateStateSubcategory implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AircraftAddressSource.java b/src-generated/edu/nps/moves/dis7/enumerations/AircraftAddressSource.java
index f1a5f76a989d0919ee3964cd6e6fa467d49d6980..6c565790b50782f82d93efedd1aa499239f24e37 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AircraftAddressSource.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AircraftAddressSource.java
@@ -73,7 +73,7 @@ public enum AircraftAddressSource
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AircraftAddressSource unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum AircraftAddressSource
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AircraftIdentificationType.java b/src-generated/edu/nps/moves/dis7/enumerations/AircraftIdentificationType.java
index a6536b9d158829bf69d19cdd99b033b0ede1604c..c1f150a3eb8866655d80a3efa53bc01d654c5e50 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AircraftIdentificationType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AircraftIdentificationType.java
@@ -75,7 +75,7 @@ public enum AircraftIdentificationType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AircraftIdentificationType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum AircraftIdentificationType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AircraftPresentDomain.java b/src-generated/edu/nps/moves/dis7/enumerations/AircraftPresentDomain.java
index 3379372a694a60743e422c3614d0971ce0197aef..0cf328e7dabe765f8634e95cdfcec76287346343 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AircraftPresentDomain.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AircraftPresentDomain.java
@@ -75,7 +75,7 @@ public enum AircraftPresentDomain
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AircraftPresentDomain unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum AircraftPresentDomain
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AircraftTypeWake.java b/src-generated/edu/nps/moves/dis7/enumerations/AircraftTypeWake.java
index e0cadf4d9b3bad03c7a143c027b3ae0e567853ed..da52feee3beb762a45634a45b4117f5e3126c2d7 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AircraftTypeWake.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AircraftTypeWake.java
@@ -71,7 +71,7 @@ public enum AircraftTypeWake
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AircraftTypeWake unmarshalEnum(ByteBuffer buff) throws Exception
@@ -84,7 +84,7 @@ public enum AircraftTypeWake
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AnimalLifeformGroupSizeRangeEnumerationforallDomains.java b/src-generated/edu/nps/moves/dis7/enumerations/AnimalLifeformGroupSizeRangeEnumerationforallDomains.java
index 9f46f23b3e7cd0f928eaf577cfc0a18483a8b1f6..1bdf3e401940427d47fa54d18b1f310f0be8146e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AnimalLifeformGroupSizeRangeEnumerationforallDomains.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AnimalLifeformGroupSizeRangeEnumerationforallDomains.java
@@ -99,7 +99,7 @@ public enum AnimalLifeformGroupSizeRangeEnumerationforallDomains
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AnimalLifeformGroupSizeRangeEnumerationforallDomains unmarshalEnum(ByteBuffer buff) throws Exception
@@ -112,7 +112,7 @@ public enum AnimalLifeformGroupSizeRangeEnumerationforallDomains
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AntennaSelection.java b/src-generated/edu/nps/moves/dis7/enumerations/AntennaSelection.java
index a2f58b7799d09c58b06ba36b584f7933a488e76a..92ad6125e62c80566b82d561361f2349bb1bff63 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AntennaSelection.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AntennaSelection.java
@@ -77,7 +77,7 @@ public enum AntennaSelection
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AntennaSelection unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum AntennaSelection
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AntennaStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/AntennaStatus.java
index 0d74542c8b34ce0401bab91a3a26d9b46ce95965..a1eb19789cdc9a33237e1874749b7a8dcf4dcbb5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AntennaStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AntennaStatus.java
@@ -75,7 +75,7 @@ public enum AntennaStatus
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AntennaStatus unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum AntennaStatus
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceAntiCollisionDayNight.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceAntiCollisionDayNight.java
index 833be083441984dc7d0f998de75c0f5a44e1c3cf..a7ed07595cc78eb5fe92ac3f5bc4a335ae9171a3 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceAntiCollisionDayNight.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceAntiCollisionDayNight.java
@@ -73,7 +73,7 @@ public enum AppearanceAntiCollisionDayNight
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceAntiCollisionDayNight unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum AppearanceAntiCollisionDayNight
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceCamouflageType.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceCamouflageType.java
index 25187334df314312c488edd7044c9efe708a56d3..012155c857a1d7944d90c22576e6e2e6ce91ced7 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceCamouflageType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceCamouflageType.java
@@ -77,7 +77,7 @@ public enum AppearanceCamouflageType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceCamouflageType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum AppearanceCamouflageType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceCanopy.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceCanopy.java
index 00102d0926ea0c3b9d540c21e609e41c28dbf357..0d0d5c9d5a179e762b9f4630b14e889a6fa94c51 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceCanopy.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceCanopy.java
@@ -83,7 +83,7 @@ public enum AppearanceCanopy
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceCanopy unmarshalEnum(ByteBuffer buff) throws Exception
@@ -96,7 +96,7 @@ public enum AppearanceCanopy
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceConcealedMovement.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceConcealedMovement.java
index d04878ef6069332700d4094fede1f39ac5f1e9fe..1e07e1d7e901ce7655c1347830bc770f12641192 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceConcealedMovement.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceConcealedMovement.java
@@ -73,7 +73,7 @@ public enum AppearanceConcealedMovement
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceConcealedMovement unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum AppearanceConcealedMovement
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceConcealedPosition.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceConcealedPosition.java
index b761a8ce63f21726e943e2c72b86a0b1afd86f6a..3c9bb5ba646daacea17a4aac60eafc4da116aec1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceConcealedPosition.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceConcealedPosition.java
@@ -73,7 +73,7 @@ public enum AppearanceConcealedPosition
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceConcealedPosition unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum AppearanceConcealedPosition
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceDamage.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceDamage.java
index aa380e21eb0ccbba77a1e787aabed2898efb20cf..f992931251dc7defe3aa1241f4879aca2ac13751 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceDamage.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceDamage.java
@@ -77,7 +77,7 @@ public enum AppearanceDamage
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceDamage unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum AppearanceDamage
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceEntityorObjectState.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceEntityorObjectState.java
index 90e977dff94824b23b30c909dd75b80f070116f7..724f5b924092521a9b4d6cdf41628cc7dde9a1b8 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceEntityorObjectState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceEntityorObjectState.java
@@ -73,7 +73,7 @@ public enum AppearanceEntityorObjectState
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceEntityorObjectState unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum AppearanceEntityorObjectState
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceEnvironmentalDensity.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceEnvironmentalDensity.java
index 828f6287c9bc0e1070554a8a13eb8f28cbf6a53b..81edf5a6a88f0a2123f7f52f9024d10164bb81ff 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceEnvironmentalDensity.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceEnvironmentalDensity.java
@@ -79,7 +79,7 @@ public enum AppearanceEnvironmentalDensity
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceEnvironmentalDensity unmarshalEnum(ByteBuffer buff) throws Exception
@@ -92,7 +92,7 @@ public enum AppearanceEnvironmentalDensity
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceHatch.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceHatch.java
index e135afc7ed53b9a7fd0c1d4108cac33e6467eb8d..c6e16c16b75aacd6f4bdaf1c84ae8ed914cfdf0d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceHatch.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceHatch.java
@@ -81,7 +81,7 @@ public enum AppearanceHatch
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceHatch unmarshalEnum(ByteBuffer buff) throws Exception
@@ -94,7 +94,7 @@ public enum AppearanceHatch
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLauncherOperational.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLauncherOperational.java
index 6eb501cf459def7e08bbeee668f329dd4e2d2162..3ca63e7fa8a9d139fb228e22f8859fa6969a073d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLauncherOperational.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLauncherOperational.java
@@ -73,7 +73,7 @@ public enum AppearanceLauncherOperational
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceLauncherOperational unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum AppearanceLauncherOperational
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormComplianceStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormComplianceStatus.java
index 1a42ce9677d160aca617e7fb40d5cfa8832be770..b013c3231e50cd2d67361d9829a9dc84c1e2d4c9 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormComplianceStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormComplianceStatus.java
@@ -101,7 +101,7 @@ public enum AppearanceLifeFormComplianceStatus
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceLifeFormComplianceStatus unmarshalEnum(ByteBuffer buff) throws Exception
@@ -114,7 +114,7 @@ public enum AppearanceLifeFormComplianceStatus
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormPosture.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormPosture.java
index 9ba12bb0d1652dea6421577381f46ceff403579e..4ea339bc2f25ec79548352c1e22892e2bf4330dc 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormPosture.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormPosture.java
@@ -101,7 +101,7 @@ public enum AppearanceLifeFormPosture
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceLifeFormPosture unmarshalEnum(ByteBuffer buff) throws Exception
@@ -114,7 +114,7 @@ public enum AppearanceLifeFormPosture
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormWeaponImplement.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormWeaponImplement.java
index 714f206c02eb85f798fbb96ffc03f30de0cc5d91..1109010c5606f5d75f8b68e719ffa12988086ebb 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormWeaponImplement.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormWeaponImplement.java
@@ -77,7 +77,7 @@ public enum AppearanceLifeFormWeaponImplement
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceLifeFormWeaponImplement unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum AppearanceLifeFormWeaponImplement
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeformHealth.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeformHealth.java
index 9cc357ff71b04e3402fed35b26a85dd5e83f829b..4bc27033305f25eb866bc27c4ec6c2581b9d2099 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeformHealth.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeformHealth.java
@@ -77,7 +77,7 @@ public enum AppearanceLifeformHealth
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceLifeformHealth unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum AppearanceLifeformHealth
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLinearObjectLaneMarkerVisible.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLinearObjectLaneMarkerVisible.java
index d103095f37c728ea173933b859b42e9f8d7917a9..a2d03b42c98e768e7b1edc6fff4aafa06dbf7ae6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLinearObjectLaneMarkerVisible.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLinearObjectLaneMarkerVisible.java
@@ -75,7 +75,7 @@ public enum AppearanceLinearObjectLaneMarkerVisible
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceLinearObjectLaneMarkerVisible unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum AppearanceLinearObjectLaneMarkerVisible
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLinearObjectTankDitchBreach.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLinearObjectTankDitchBreach.java
index 709977cb70e84d664969e13ea4c2225951fb37cb..cb06ee1bda5635ced36f7eb02f4df673da5505e6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLinearObjectTankDitchBreach.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLinearObjectTankDitchBreach.java
@@ -77,7 +77,7 @@ public enum AppearanceLinearObjectTankDitchBreach
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceLinearObjectTankDitchBreach unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum AppearanceLinearObjectTankDitchBreach
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceNVGMode.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceNVGMode.java
index e2928c28e14d98100010532a872062f29ac1ad9b..6e3401c02519cc5d7fb88e2c6412a8e5469f8897 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceNVGMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceNVGMode.java
@@ -73,7 +73,7 @@ public enum AppearanceNVGMode
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceNVGMode unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum AppearanceNVGMode
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceNavigationPositionBrightness.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceNavigationPositionBrightness.java
index 54831a99d604efe009f622869767337b2a8345b3..aa3e396c76a98788354d56d98c7ca0f73654dd2c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceNavigationPositionBrightness.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceNavigationPositionBrightness.java
@@ -73,7 +73,7 @@ public enum AppearanceNavigationPositionBrightness
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceNavigationPositionBrightness unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum AppearanceNavigationPositionBrightness
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralDamage.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralDamage.java
index 202369ff6acc122ddbcf881a970d9737b4eb5e06..870e78b9260a027977f79cc0ed388b44b8105cc7 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralDamage.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralDamage.java
@@ -75,7 +75,7 @@ public enum AppearanceObjectGeneralDamage
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceObjectGeneralDamage unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum AppearanceObjectGeneralDamage
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralIEDPresent.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralIEDPresent.java
index ac59c3686a92a6e2b1cacdda9092fe4396bcd8e8..1349d68b6c0c0cd815fef5ce78b3ae30a9411bdb 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralIEDPresent.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralIEDPresent.java
@@ -77,7 +77,7 @@ public enum AppearanceObjectGeneralIEDPresent
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceObjectGeneralIEDPresent unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum AppearanceObjectGeneralIEDPresent
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralPredistributed.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralPredistributed.java
index e17002224708266f898ef8ec40bbeac7b09056e3..f8ef6c3b51e9c1542c73118c0fcfd9bcdf7c4529 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralPredistributed.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralPredistributed.java
@@ -73,7 +73,7 @@ public enum AppearanceObjectGeneralPredistributed
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceObjectGeneralPredistributed unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum AppearanceObjectGeneralPredistributed
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectSpecificBreachState.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectSpecificBreachState.java
index 41f10dd9aca85b77a78431ae5174f2dc20bd38ab..c7a852b0c6fb0c228118c26c7f9edc2d9a59b7a2 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectSpecificBreachState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectSpecificBreachState.java
@@ -75,7 +75,7 @@ public enum AppearanceObjectSpecificBreachState
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceObjectSpecificBreachState unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum AppearanceObjectSpecificBreachState
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectSpecificChemicalType.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectSpecificChemicalType.java
index e1ba1b03b157dc4037ea36e41c0f35344f878d02..9e37042a7f9aa082711dbb4d257fb0ca95b0a67c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectSpecificChemicalType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectSpecificChemicalType.java
@@ -77,7 +77,7 @@ public enum AppearanceObjectSpecificChemicalType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceObjectSpecificChemicalType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum AppearanceObjectSpecificChemicalType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearancePaintScheme.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearancePaintScheme.java
index 7847b3786c4cc67d59c4b79540ad4b3e5e870402..c6fd8fea0d7c7900a36f4f2b6ebcbe53476fe72f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearancePaintScheme.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearancePaintScheme.java
@@ -73,7 +73,7 @@ public enum AppearancePaintScheme
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearancePaintScheme unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum AppearancePaintScheme
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceSubsurfaceHatch.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceSubsurfaceHatch.java
index 27c3c866d030ae0ee9d69c0da36279d4eafe89ff..4d2277f3a9bd11b585f04a4c39bc24e3a948b76e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceSubsurfaceHatch.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceSubsurfaceHatch.java
@@ -75,7 +75,7 @@ public enum AppearanceSubsurfaceHatch
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceSubsurfaceHatch unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum AppearanceSubsurfaceHatch
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceSupplyDeployed.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceSupplyDeployed.java
index 34ba698763cc65033d3ed1ebb95b8729ba57157a..1274cefb8fb4d6d2ccf5052e4f6fe0e26abf944d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceSupplyDeployed.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceSupplyDeployed.java
@@ -77,7 +77,7 @@ public enum AppearanceSupplyDeployed
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceSupplyDeployed unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum AppearanceSupplyDeployed
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceTrailingEffects.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceTrailingEffects.java
index 073e7425f5a1bb91bea76caf359e9b37bf8f0915..4d13f8bf566d59d2fe16eccb77718ed1fa9f658c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AppearanceTrailingEffects.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceTrailingEffects.java
@@ -77,7 +77,7 @@ public enum AppearanceTrailingEffects
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AppearanceTrailingEffects unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum AppearanceTrailingEffects
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ArticulatedPartsTypeMetric.java b/src-generated/edu/nps/moves/dis7/enumerations/ArticulatedPartsTypeMetric.java
index 7b1e38a399fe0c5ef48d7aa933f859b46bba1453..37573a26725c0134a0bc77b341ba07660724d4cf 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ArticulatedPartsTypeMetric.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ArticulatedPartsTypeMetric.java
@@ -103,7 +103,7 @@ public enum ArticulatedPartsTypeMetric
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static ArticulatedPartsTypeMetric unmarshalEnum(ByteBuffer buff) throws Exception
@@ -116,7 +116,7 @@ public enum ArticulatedPartsTypeMetric
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AttachedPartDetachedIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/AttachedPartDetachedIndicator.java
index b1af4dc8b9c65b765f2d296c115f56602929d33d..17cbc4fe8d668fc76d3eddc8a7751929ef4b4006 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AttachedPartDetachedIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AttachedPartDetachedIndicator.java
@@ -73,7 +73,7 @@ public enum AttachedPartDetachedIndicator
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AttachedPartDetachedIndicator unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum AttachedPartDetachedIndicator
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/AustralianCategoryOverlay.java b/src-generated/edu/nps/moves/dis7/enumerations/AustralianCategoryOverlay.java
index a3dfa3f50d4bbfaa8bd13773b813be494b937bed..dd1d3d977ab698b974bc0adcfb82bc278398dc33 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/AustralianCategoryOverlay.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AustralianCategoryOverlay.java
@@ -81,7 +81,7 @@ public enum AustralianCategoryOverlay
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static AustralianCategoryOverlay unmarshalEnum(ByteBuffer buff) throws Exception
@@ -94,7 +94,7 @@ public enum AustralianCategoryOverlay
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/BeamStatusBeamState.java b/src-generated/edu/nps/moves/dis7/enumerations/BeamStatusBeamState.java
index d8a64ac577ebf053d57c18c663794382d3698a34..9353d5a479b6b521f233cd07d933bdd3ae78ed51 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/BeamStatusBeamState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/BeamStatusBeamState.java
@@ -73,7 +73,7 @@ public enum BeamStatusBeamState
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static BeamStatusBeamState unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum BeamStatusBeamState
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/BuildingPaintScheme.java b/src-generated/edu/nps/moves/dis7/enumerations/BuildingPaintScheme.java
index 8a18bffd9a01425357f80a5774ea68225d22a730..96b24dbcfad324ade5a13f902752a14b0541397e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/BuildingPaintScheme.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/BuildingPaintScheme.java
@@ -71,7 +71,7 @@ public enum BuildingPaintScheme
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static BuildingPaintScheme unmarshalEnum(ByteBuffer buff) throws Exception
@@ -84,7 +84,7 @@ public enum BuildingPaintScheme
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/CCTTSINCGARSClearChannel.java b/src-generated/edu/nps/moves/dis7/enumerations/CCTTSINCGARSClearChannel.java
index a9bbd25d0f861cb92759e0ea81c4300e0a5f5e8d..ab5e76e4ba48e36cb3088a757b3b2d9601b28229 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/CCTTSINCGARSClearChannel.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/CCTTSINCGARSClearChannel.java
@@ -73,7 +73,7 @@ public enum CCTTSINCGARSClearChannel
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static CCTTSINCGARSClearChannel unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum CCTTSINCGARSClearChannel
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/CCTTSINCGARSStartofMessage.java b/src-generated/edu/nps/moves/dis7/enumerations/CCTTSINCGARSStartofMessage.java
index b10996168b72f76860b5849bea61662bcf985a01..22fc434641fb8a5920ea1aa4f90d41637cf2f82c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/CCTTSINCGARSStartofMessage.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/CCTTSINCGARSStartofMessage.java
@@ -73,7 +73,7 @@ public enum CCTTSINCGARSStartofMessage
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static CCTTSINCGARSStartofMessage unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum CCTTSINCGARSStartofMessage
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/CIGIExtensionPacketID.java b/src-generated/edu/nps/moves/dis7/enumerations/CIGIExtensionPacketID.java
index 94bed43960a0f1e3a8f48226160a7f270f99bea9..846384b39b87cf1b5a723a7c9f99a664d4e0eb95 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/CIGIExtensionPacketID.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/CIGIExtensionPacketID.java
@@ -68,12 +68,12 @@ public enum CIGIExtensionPacketID
public static CIGIExtensionPacketID unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static CIGIExtensionPacketID unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/CapabilityReport.java b/src-generated/edu/nps/moves/dis7/enumerations/CapabilityReport.java
index 9a952d1c45fb3c95a7be36e4d8622ba2bc3dfc46..e4ba79051cee7b0f48cb85a4f24c20b1557f6508 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/CapabilityReport.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/CapabilityReport.java
@@ -87,7 +87,7 @@ public enum CapabilityReport
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static CapabilityReport unmarshalEnum(ByteBuffer buff) throws Exception
@@ -100,7 +100,7 @@ public enum CapabilityReport
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class10SupplyCategoryMaterialtoSupportNonMilitaryPrograms.java b/src-generated/edu/nps/moves/dis7/enumerations/Class10SupplyCategoryMaterialtoSupportNonMilitaryPrograms.java
index 0747e1a1a32c83c1e6bfb10d9d386810900a57a5..6943bb1733beb668716ecf9c1c5f4e9bb191a681 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class10SupplyCategoryMaterialtoSupportNonMilitaryPrograms.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class10SupplyCategoryMaterialtoSupportNonMilitaryPrograms.java
@@ -71,7 +71,7 @@ public enum Class10SupplyCategoryMaterialtoSupportNonMilitaryPrograms implements
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Class10SupplyCategoryMaterialtoSupportNonMilitaryPrograms unmarshalEnum(ByteBuffer buff) throws Exception
@@ -84,7 +84,7 @@ public enum Class10SupplyCategoryMaterialtoSupportNonMilitaryPrograms implements
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class11SupplyCategorySuppliesNonDoctrinal.java b/src-generated/edu/nps/moves/dis7/enumerations/Class11SupplyCategorySuppliesNonDoctrinal.java
index 24c06fcb37402d0a5af6e6a8331c6e1020e69cd8..c728d9453c17b735b3a4361586c36ea5a63704b2 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class11SupplyCategorySuppliesNonDoctrinal.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class11SupplyCategorySuppliesNonDoctrinal.java
@@ -79,7 +79,7 @@ public enum Class11SupplyCategorySuppliesNonDoctrinal implements Category
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Class11SupplyCategorySuppliesNonDoctrinal unmarshalEnum(ByteBuffer buff) throws Exception
@@ -92,7 +92,7 @@ public enum Class11SupplyCategorySuppliesNonDoctrinal implements Category
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class12SupplyCategorySlingLoadsNonDoctrinal.java b/src-generated/edu/nps/moves/dis7/enumerations/Class12SupplyCategorySlingLoadsNonDoctrinal.java
index 871beace03ee863bda778c39307cd2263b607256..b7acdd99f22087b46e2afbcf6efef04f8b46f0dc 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class12SupplyCategorySlingLoadsNonDoctrinal.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class12SupplyCategorySlingLoadsNonDoctrinal.java
@@ -91,7 +91,7 @@ public enum Class12SupplyCategorySlingLoadsNonDoctrinal implements Category
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Class12SupplyCategorySlingLoadsNonDoctrinal unmarshalEnum(ByteBuffer buff) throws Exception
@@ -104,7 +104,7 @@ public enum Class12SupplyCategorySlingLoadsNonDoctrinal implements Category
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class1SupplyCategorySubsistence.java b/src-generated/edu/nps/moves/dis7/enumerations/Class1SupplyCategorySubsistence.java
index c9a58b60eb383ec33083ed8206a5e82b3d9b85e0..e8913a1fb6bb704bc6f88285c3c8d3f72dce0205 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class1SupplyCategorySubsistence.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class1SupplyCategorySubsistence.java
@@ -81,7 +81,7 @@ public enum Class1SupplyCategorySubsistence implements Category
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Class1SupplyCategorySubsistence unmarshalEnum(ByteBuffer buff) throws Exception
@@ -94,7 +94,7 @@ public enum Class1SupplyCategorySubsistence implements Category
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class2SupplyCategoryClothingIndividualEquipmentToolsAdminSupplies.java b/src-generated/edu/nps/moves/dis7/enumerations/Class2SupplyCategoryClothingIndividualEquipmentToolsAdminSupplies.java
index 7f6331d8589f7915b0d9401a62abc9c3ce0f7cae..2db6abfd49bcefdbc2df18b3bb1a6fee3ae133d4 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class2SupplyCategoryClothingIndividualEquipmentToolsAdminSupplies.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class2SupplyCategoryClothingIndividualEquipmentToolsAdminSupplies.java
@@ -85,7 +85,7 @@ public enum Class2SupplyCategoryClothingIndividualEquipmentToolsAdminSupplies im
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Class2SupplyCategoryClothingIndividualEquipmentToolsAdminSupplies unmarshalEnum(ByteBuffer buff) throws Exception
@@ -98,7 +98,7 @@ public enum Class2SupplyCategoryClothingIndividualEquipmentToolsAdminSupplies im
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class3SupplyCategoryPetroleumOilsLubricants.java b/src-generated/edu/nps/moves/dis7/enumerations/Class3SupplyCategoryPetroleumOilsLubricants.java
index 5c2ac08035222907a67abeb6f8476614b6114906..1f377900c1ff6ac6701ca4d4d5a3ddb720581cb5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class3SupplyCategoryPetroleumOilsLubricants.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class3SupplyCategoryPetroleumOilsLubricants.java
@@ -77,7 +77,7 @@ public enum Class3SupplyCategoryPetroleumOilsLubricants implements Category
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Class3SupplyCategoryPetroleumOilsLubricants unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum Class3SupplyCategoryPetroleumOilsLubricants implements Category
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class4SupplyCategoryConstructionMaterials.java b/src-generated/edu/nps/moves/dis7/enumerations/Class4SupplyCategoryConstructionMaterials.java
index 4241a1b221e9dd1c3445519260718cc2bb1b9089..403252788053b14e82361e4427ae72a41d0d0b30 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class4SupplyCategoryConstructionMaterials.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class4SupplyCategoryConstructionMaterials.java
@@ -75,7 +75,7 @@ public enum Class4SupplyCategoryConstructionMaterials implements Category
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Class4SupplyCategoryConstructionMaterials unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum Class4SupplyCategoryConstructionMaterials implements Category
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class6SupplyCategoryPersonnelDemandItems.java b/src-generated/edu/nps/moves/dis7/enumerations/Class6SupplyCategoryPersonnelDemandItems.java
index 03786e3608e39c2653dff7560212d22349e40643..8dcc6166a534aac4191b3f6e0a7b22a79e0182cd 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class6SupplyCategoryPersonnelDemandItems.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class6SupplyCategoryPersonnelDemandItems.java
@@ -71,7 +71,7 @@ public enum Class6SupplyCategoryPersonnelDemandItems implements Category
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Class6SupplyCategoryPersonnelDemandItems unmarshalEnum(ByteBuffer buff) throws Exception
@@ -84,7 +84,7 @@ public enum Class6SupplyCategoryPersonnelDemandItems implements Category
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class7SupplyCategoryMajorItems.java b/src-generated/edu/nps/moves/dis7/enumerations/Class7SupplyCategoryMajorItems.java
index 8bba754562a8af8edad5edf2ba1c855e0725e98d..bd62ee2b8ff3b447181b26a6d77b30dd2c931787 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class7SupplyCategoryMajorItems.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class7SupplyCategoryMajorItems.java
@@ -115,7 +115,7 @@ public enum Class7SupplyCategoryMajorItems implements Category
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Class7SupplyCategoryMajorItems unmarshalEnum(ByteBuffer buff) throws Exception
@@ -128,7 +128,7 @@ public enum Class7SupplyCategoryMajorItems implements Category
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class8SupplyCategoryMedicalMaterial.java b/src-generated/edu/nps/moves/dis7/enumerations/Class8SupplyCategoryMedicalMaterial.java
index 8c2a1c8eaacf8707ef264ac26673bd11565eccc3..42a6374efde82e2ad217736a0b9f8c42006c24f9 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class8SupplyCategoryMedicalMaterial.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class8SupplyCategoryMedicalMaterial.java
@@ -75,7 +75,7 @@ public enum Class8SupplyCategoryMedicalMaterial implements Category
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Class8SupplyCategoryMedicalMaterial unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum Class8SupplyCategoryMedicalMaterial implements Category
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Class9SupplyCategoryRepairPartsandComponents.java b/src-generated/edu/nps/moves/dis7/enumerations/Class9SupplyCategoryRepairPartsandComponents.java
index 39047ed5695bc48d7f3a7830a039674f28f715b1..7091586a6ec262a22966cbdef093f37a07a01ac5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Class9SupplyCategoryRepairPartsandComponents.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class9SupplyCategoryRepairPartsandComponents.java
@@ -89,7 +89,7 @@ public enum Class9SupplyCategoryRepairPartsandComponents implements Category
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Class9SupplyCategoryRepairPartsandComponents unmarshalEnum(ByteBuffer buff) throws Exception
@@ -102,7 +102,7 @@ public enum Class9SupplyCategoryRepairPartsandComponents implements Category
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/CollisionType.java b/src-generated/edu/nps/moves/dis7/enumerations/CollisionType.java
index e7da3af1b4da6dec6616643f2d012e67fcad66e8..b5af0e90d6f6b76175e9b5686697b79be2fdeca3 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/CollisionType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/CollisionType.java
@@ -75,7 +75,7 @@ public enum CollisionType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static CollisionType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum CollisionType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Color.java b/src-generated/edu/nps/moves/dis7/enumerations/Color.java
index 407da6142a292429eb338fe505c3bcf840d03ed9..9810baaf0a76b160ee6419d534ce153d1197bc49 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Color.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Color.java
@@ -391,7 +391,7 @@ public enum Color
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Color unmarshalEnum(ByteBuffer buff) throws Exception
@@ -404,7 +404,7 @@ public enum Color
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ComponentVisualDamageStatusSmoke.java b/src-generated/edu/nps/moves/dis7/enumerations/ComponentVisualDamageStatusSmoke.java
index b93ab4db90755af2726d5a8074d815e4d41653e7..2eb5c586c35d3c393a163a387fb4c8ddc5e564eb 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ComponentVisualDamageStatusSmoke.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ComponentVisualDamageStatusSmoke.java
@@ -77,7 +77,7 @@ public enum ComponentVisualDamageStatusSmoke
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static ComponentVisualDamageStatusSmoke unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum ComponentVisualDamageStatusSmoke
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ComponentVisualDamageStatusSurfaceDamage.java b/src-generated/edu/nps/moves/dis7/enumerations/ComponentVisualDamageStatusSurfaceDamage.java
index eee1f8363360426c0789ef46e34e957b745fe7d7..437bca1cb99d034ca9be16dfd2cf2c599bfef2aa 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ComponentVisualDamageStatusSurfaceDamage.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ComponentVisualDamageStatusSurfaceDamage.java
@@ -77,7 +77,7 @@ public enum ComponentVisualDamageStatusSurfaceDamage
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static ComponentVisualDamageStatusSurfaceDamage unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum ComponentVisualDamageStatusSurfaceDamage
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Country.java b/src-generated/edu/nps/moves/dis7/enumerations/Country.java
index 61e8a017a5ab32ce59a6079905726e6f52d79624..7af401335627d15707d4399f8accdfc6b7ed76d9 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Country.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Country.java
@@ -620,12 +620,12 @@ public enum Country
public static Country unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static Country unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/CoverShroudStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/CoverShroudStatus.java
index 05b47428b6a9c24d26a40d9aaeda1b1f627f6bf3..3c8ec8e03549e51069361f32e4d6baca0e6d2471 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/CoverShroudStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/CoverShroudStatus.java
@@ -77,7 +77,7 @@ public enum CoverShroudStatus
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static CoverShroudStatus unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum CoverShroudStatus
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/CryptoKeyIDCryptoMode.java b/src-generated/edu/nps/moves/dis7/enumerations/CryptoKeyIDCryptoMode.java
index 804b60a8948037f248f4e8d80bfc64527912a931..eecc7d95c3aff7e7b2b4d90b4d0a76e5e9cb85ea 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/CryptoKeyIDCryptoMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/CryptoKeyIDCryptoMode.java
@@ -73,7 +73,7 @@ public enum CryptoKeyIDCryptoMode
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static CryptoKeyIDCryptoMode unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum CryptoKeyIDCryptoMode
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentDamageStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentDamageStatus.java
index 2e99b5fcf10914bb55df565f458e86bab1e8138d..26383dcba4c781cad86b375b149a30b028a742e6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentDamageStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentDamageStatus.java
@@ -79,7 +79,7 @@ public enum DEDamageDescriptionComponentDamageStatus
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static DEDamageDescriptionComponentDamageStatus unmarshalEnum(ByteBuffer buff) throws Exception
@@ -92,7 +92,7 @@ public enum DEDamageDescriptionComponentDamageStatus
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentVisualSmokeColor.java b/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentVisualSmokeColor.java
index d020bd6dcf7002bbfba8c3ad45f865921a12b4f1..cedb1ee51954e968c6661f294f7469075af9c8cc 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentVisualSmokeColor.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentVisualSmokeColor.java
@@ -77,7 +77,7 @@ public enum DEDamageDescriptionComponentVisualSmokeColor
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static DEDamageDescriptionComponentVisualSmokeColor unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum DEDamageDescriptionComponentVisualSmokeColor
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DEFireFlagsStateUpdateFlag.java b/src-generated/edu/nps/moves/dis7/enumerations/DEFireFlagsStateUpdateFlag.java
index 224c27c329ed1c0e62c7a479f0699718861ed77c..be061863daa681e7586c5577acce04699258bfe3 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DEFireFlagsStateUpdateFlag.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DEFireFlagsStateUpdateFlag.java
@@ -73,7 +73,7 @@ public enum DEFireFlagsStateUpdateFlag
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static DEFireFlagsStateUpdateFlag unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum DEFireFlagsStateUpdateFlag
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DEFirePulseShape.java b/src-generated/edu/nps/moves/dis7/enumerations/DEFirePulseShape.java
index 045e18d0cfae96815d6cb646cc1617f66b08f1bd..397627b4a73aef249c10e4712c0084149883aee6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DEFirePulseShape.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DEFirePulseShape.java
@@ -77,7 +77,7 @@ public enum DEFirePulseShape
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static DEFirePulseShape unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum DEFirePulseShape
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DEPrecisionAimpointBeamSpotType.java b/src-generated/edu/nps/moves/dis7/enumerations/DEPrecisionAimpointBeamSpotType.java
index beabd009be55677c09de68968ba07f8a4bf7f931..da9c7b681fe71e506766cbab698074dfbc2d2011 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DEPrecisionAimpointBeamSpotType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DEPrecisionAimpointBeamSpotType.java
@@ -75,7 +75,7 @@ public enum DEPrecisionAimpointBeamSpotType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static DEPrecisionAimpointBeamSpotType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum DEPrecisionAimpointBeamSpotType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISAttributeActionCode.java b/src-generated/edu/nps/moves/dis7/enumerations/DISAttributeActionCode.java
index 051ed2b918837b7cac13d649fc0d4186c95d2a5d..fd157a20ca6920e8458d40560a24e202f89c082f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISAttributeActionCode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISAttributeActionCode.java
@@ -71,7 +71,7 @@ public enum DISAttributeActionCode
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static DISAttributeActionCode unmarshalEnum(ByteBuffer buff) throws Exception
@@ -84,7 +84,7 @@ public enum DISAttributeActionCode
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISLiveEntitySubprotocolNumber.java b/src-generated/edu/nps/moves/dis7/enumerations/DISLiveEntitySubprotocolNumber.java
index 3a9a02fe93db1aba122878620d9574011e084237..73f4e886a58f45cbecd70952d0828906d0e0ee0d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISLiveEntitySubprotocolNumber.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISLiveEntitySubprotocolNumber.java
@@ -71,7 +71,7 @@ public enum DISLiveEntitySubprotocolNumber
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static DISLiveEntitySubprotocolNumber unmarshalEnum(ByteBuffer buff) throws Exception
@@ -84,7 +84,7 @@ public enum DISLiveEntitySubprotocolNumber
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusActiveInterrogationIndicatorAII.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusActiveInterrogationIndicatorAII.java
index ab6462e6a570760c7935a41d406147bba7df3f83..6beef58e6cbf3c0299cb995a1242bdb9fd456b90 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusActiveInterrogationIndicatorAII.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusActiveInterrogationIndicatorAII.java
@@ -73,7 +73,7 @@ public enum DISPDUStatusActiveInterrogationIndicatorAII
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static DISPDUStatusActiveInterrogationIndicatorAII unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum DISPDUStatusActiveInterrogationIndicatorAII
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusCoupledExtensionIndicatorCEI.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusCoupledExtensionIndicatorCEI.java
index c1bb9ee647c5ebe62ce832b63783aedb43976ac4..aa4087ef09bdf8732bf8ebc510f83bf6b8a19b4f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusCoupledExtensionIndicatorCEI.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusCoupledExtensionIndicatorCEI.java
@@ -73,7 +73,7 @@ public enum DISPDUStatusCoupledExtensionIndicatorCEI
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static DISPDUStatusCoupledExtensionIndicatorCEI unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum DISPDUStatusCoupledExtensionIndicatorCEI
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusDetonationTypeIndicatorDTI.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusDetonationTypeIndicatorDTI.java
index 72bba58ebe0bbde423e79d4f317e0a2c2cb3f3b5..42ea3d3e801f5556b183c5b787174dd7a299a93e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusDetonationTypeIndicatorDTI.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusDetonationTypeIndicatorDTI.java
@@ -75,7 +75,7 @@ public enum DISPDUStatusDetonationTypeIndicatorDTI
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static DISPDUStatusDetonationTypeIndicatorDTI unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum DISPDUStatusDetonationTypeIndicatorDTI
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusFireTypeIndicatorFTI.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusFireTypeIndicatorFTI.java
index 3e302f4463ef6fb4eba31da49f20201eda3b6488..1ae4989e9c66396d38633d1793be287602fe5920 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusFireTypeIndicatorFTI.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusFireTypeIndicatorFTI.java
@@ -73,7 +73,7 @@ public enum DISPDUStatusFireTypeIndicatorFTI
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static DISPDUStatusFireTypeIndicatorFTI unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum DISPDUStatusFireTypeIndicatorFTI
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusIFFSimulationModeISM.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusIFFSimulationModeISM.java
index 3c266e689bdce77aa02755971d9c6e7713ddb387..016cdb6f9db6d2f171752ee4ad7d72521084337a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusIFFSimulationModeISM.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusIFFSimulationModeISM.java
@@ -73,7 +73,7 @@ public enum DISPDUStatusIFFSimulationModeISM
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static DISPDUStatusIFFSimulationModeISM unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum DISPDUStatusIFFSimulationModeISM
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusIntercomAttachedIndicatorIAI.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusIntercomAttachedIndicatorIAI.java
index c32afa26b276af705964874a97a0702f7e35ab11..6e6c121fae9de7caaed95f3decafa027b2288f9c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusIntercomAttachedIndicatorIAI.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusIntercomAttachedIndicatorIAI.java
@@ -75,7 +75,7 @@ public enum DISPDUStatusIntercomAttachedIndicatorIAI
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static DISPDUStatusIntercomAttachedIndicatorIAI unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum DISPDUStatusIntercomAttachedIndicatorIAI
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusLVCIndicatorLVC.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusLVCIndicatorLVC.java
index 302edb3618385e651258b5834b82c57db8538eda..e943de5010f91270f6e2367d4359cc5c171358de 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusLVCIndicatorLVC.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusLVCIndicatorLVC.java
@@ -77,7 +77,7 @@ public enum DISPDUStatusLVCIndicatorLVC
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static DISPDUStatusLVCIndicatorLVC unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum DISPDUStatusLVCIndicatorLVC
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusRadioAttachedIndicatorRAI.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusRadioAttachedIndicatorRAI.java
index 0d9c7f5ffe661a26f3b9fc14db8178554605d665..cc1a6f7b70570c2c4f5ccaebe998f2827b2ae3f7 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusRadioAttachedIndicatorRAI.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusRadioAttachedIndicatorRAI.java
@@ -75,7 +75,7 @@ public enum DISPDUStatusRadioAttachedIndicatorRAI
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static DISPDUStatusRadioAttachedIndicatorRAI unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum DISPDUStatusRadioAttachedIndicatorRAI
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusTransferredEntityIndicatorTEI.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusTransferredEntityIndicatorTEI.java
index 83cc8e42508c9cbc41216d5092051019ff577f65..be2eb518c4112bfb6b134937cfc4d2d377f09330 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusTransferredEntityIndicatorTEI.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusTransferredEntityIndicatorTEI.java
@@ -73,7 +73,7 @@ public enum DISPDUStatusTransferredEntityIndicatorTEI
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static DISPDUStatusTransferredEntityIndicatorTEI unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum DISPDUStatusTransferredEntityIndicatorTEI
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUType.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUType.java
index 20c44ac332010e476cf93fcea55ed912143a5e10..2ec7ac173d7dd00ff8e9829e1c29ba6ce37885d0 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUType.java
@@ -215,7 +215,7 @@ public enum DISPDUType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static DISPDUType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -228,7 +228,7 @@ public enum DISPDUType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISProtocolFamily.java b/src-generated/edu/nps/moves/dis7/enumerations/DISProtocolFamily.java
index f6e6fbd629b75fbb955e8042e2c471d1499e8e1f..54e44e205f1ae8bc7e848d13d4819a9fcf54c003 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISProtocolFamily.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISProtocolFamily.java
@@ -97,7 +97,7 @@ public enum DISProtocolFamily
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static DISProtocolFamily unmarshalEnum(ByteBuffer buff) throws Exception
@@ -110,7 +110,7 @@ public enum DISProtocolFamily
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISProtocolVersion.java b/src-generated/edu/nps/moves/dis7/enumerations/DISProtocolVersion.java
index ed1b6b3c9b69cc596cfee0ec725ab51742afafab..39b61ce7cca80b5525bf09d5e9a84faeb4d561b7 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISProtocolVersion.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISProtocolVersion.java
@@ -85,7 +85,7 @@ public enum DISProtocolVersion
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static DISProtocolVersion unmarshalEnum(ByteBuffer buff) throws Exception
@@ -98,7 +98,7 @@ public enum DISProtocolVersion
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DRParametersType.java b/src-generated/edu/nps/moves/dis7/enumerations/DRParametersType.java
index d7c7e1e48d4e6f6dfae2136518658ab19d710f6e..a3eaf537df35416e90182bc2746c30386940c8a9 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DRParametersType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DRParametersType.java
@@ -75,7 +75,7 @@ public enum DRParametersType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static DRParametersType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum DRParametersType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DataCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/DataCategory.java
index be2e92190226f1fa339729c0fcc01e337862e024..145018a4072de43c90315d920804209818e2a34b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DataCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DataCategory.java
@@ -75,7 +75,7 @@ public enum DataCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static DataCategory unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum DataCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DeadReckoningAlgorithm.java b/src-generated/edu/nps/moves/dis7/enumerations/DeadReckoningAlgorithm.java
index 761f6379bfdc0fec1239b7cd239c29fe963542c2..c461d0b51b904f2df406b8690af23cabae7774d9 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DeadReckoningAlgorithm.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DeadReckoningAlgorithm.java
@@ -89,7 +89,7 @@ public enum DeadReckoningAlgorithm
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static DeadReckoningAlgorithm unmarshalEnum(ByteBuffer buff) throws Exception
@@ -102,7 +102,7 @@ public enum DeadReckoningAlgorithm
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DeltaMode5SAltitudePositiveNegativeIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/DeltaMode5SAltitudePositiveNegativeIndicator.java
index 3b3f7b23fc5f79560206beb172e08544f1d6160b..e262dea0ee6eebb6c4fdfad23b630f058ab4e948 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DeltaMode5SAltitudePositiveNegativeIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DeltaMode5SAltitudePositiveNegativeIndicator.java
@@ -73,7 +73,7 @@ public enum DeltaMode5SAltitudePositiveNegativeIndicator
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static DeltaMode5SAltitudePositiveNegativeIndicator unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum DeltaMode5SAltitudePositiveNegativeIndicator
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DesignatorDesignatorCode.java b/src-generated/edu/nps/moves/dis7/enumerations/DesignatorDesignatorCode.java
index 313a3986b189a22c6ed82d5cc985a27187bb5e78..7065bdfd2e2454f6b87f54e79cf7c1b16ddbc454 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DesignatorDesignatorCode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DesignatorDesignatorCode.java
@@ -66,12 +66,12 @@ public enum DesignatorDesignatorCode
public static DesignatorDesignatorCode unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static DesignatorDesignatorCode unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DesignatorSystemName.java b/src-generated/edu/nps/moves/dis7/enumerations/DesignatorSystemName.java
index d43e89409f41681a2ad9980c558b8bddb9a99168..92bedccd4981f2120c6bccb4a499fc946f0174da 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DesignatorSystemName.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DesignatorSystemName.java
@@ -238,12 +238,12 @@ public enum DesignatorSystemName
public static DesignatorSystemName unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static DesignatorSystemName unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DetonationResult.java b/src-generated/edu/nps/moves/dis7/enumerations/DetonationResult.java
index 6dae2f84e56e590572bbf7b4f969ac26c4a5b3a0..198856978ae7eea355b820e0fa871ee66e434f4d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DetonationResult.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DetonationResult.java
@@ -137,7 +137,7 @@ public enum DetonationResult
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static DetonationResult unmarshalEnum(ByteBuffer buff) throws Exception
@@ -150,7 +150,7 @@ public enum DetonationResult
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EEAttributeStateIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/EEAttributeStateIndicator.java
index 4a55c4e0d3e0914dbdd8c61b40baf019f988fc17..6a21ed90746f7c7d6ee421293830e31b27c97525 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EEAttributeStateIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EEAttributeStateIndicator.java
@@ -75,7 +75,7 @@ public enum EEAttributeStateIndicator
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static EEAttributeStateIndicator unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum EEAttributeStateIndicator
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ElectromagneticEmissionBeamFunction.java b/src-generated/edu/nps/moves/dis7/enumerations/ElectromagneticEmissionBeamFunction.java
index d407ca993da7edec76a13ec0490ef764c433d796..a48ccf5279d5c15960f804798dd27b41394a70dd 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ElectromagneticEmissionBeamFunction.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ElectromagneticEmissionBeamFunction.java
@@ -117,7 +117,7 @@ public enum ElectromagneticEmissionBeamFunction
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static ElectromagneticEmissionBeamFunction unmarshalEnum(ByteBuffer buff) throws Exception
@@ -130,7 +130,7 @@ public enum ElectromagneticEmissionBeamFunction
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ElectromagneticEmissionStateUpdateIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/ElectromagneticEmissionStateUpdateIndicator.java
index 6b1540aa53f397f0da3dfbb77fa5fc24c95340b7..db77038ccd308d3f80c5a7b833e45bbc6f6099ad 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ElectromagneticEmissionStateUpdateIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ElectromagneticEmissionStateUpdateIndicator.java
@@ -73,7 +73,7 @@ public enum ElectromagneticEmissionStateUpdateIndicator
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static ElectromagneticEmissionStateUpdateIndicator unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum ElectromagneticEmissionStateUpdateIndicator
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EmitterName.java b/src-generated/edu/nps/moves/dis7/enumerations/EmitterName.java
index 98ede1e0c581181b80f09ef8e98f48d08fece3fe..bdae5e553ef967975654b357c7d1ca2418a22677 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EmitterName.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EmitterName.java
@@ -4066,12 +4066,12 @@ public enum EmitterName
public static EmitterName unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static EmitterName unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EmitterSystemFunction.java b/src-generated/edu/nps/moves/dis7/enumerations/EmitterSystemFunction.java
index df77ed8292c72b8ad136f34f9c61556789386181..2b7c29fe06b6aee5e037b0ec1db4f7f32338720c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EmitterSystemFunction.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EmitterSystemFunction.java
@@ -231,7 +231,7 @@ public enum EmitterSystemFunction
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static EmitterSystemFunction unmarshalEnum(ByteBuffer buff) throws Exception
@@ -244,7 +244,7 @@ public enum EmitterSystemFunction
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationAssociationStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationAssociationStatus.java
index e2700032b2104aac029ae0c8bc5a1ea00e743cb9..ae82c75ce342f45b301aceaf3fbdb22c535cfd87 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationAssociationStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationAssociationStatus.java
@@ -83,7 +83,7 @@ public enum EntityAssociationAssociationStatus
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static EntityAssociationAssociationStatus unmarshalEnum(ByteBuffer buff) throws Exception
@@ -96,7 +96,7 @@ public enum EntityAssociationAssociationStatus
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationAssociationType.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationAssociationType.java
index ee0ae4a3456b40b9aa4721104f8ccb6b2b41edd2..28621e125ac088ef32819997fcc5082c02620268 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationAssociationType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationAssociationType.java
@@ -99,7 +99,7 @@ public enum EntityAssociationAssociationType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static EntityAssociationAssociationType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -112,7 +112,7 @@ public enum EntityAssociationAssociationType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationGroupMemberType.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationGroupMemberType.java
index 4d43b8e61fcea2e5a4b71bf91b8f227d171b1720..61d41204044858715b6a601d1da93ebd3e5447eb 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationGroupMemberType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationGroupMemberType.java
@@ -83,7 +83,7 @@ public enum EntityAssociationGroupMemberType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static EntityAssociationGroupMemberType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -96,7 +96,7 @@ public enum EntityAssociationGroupMemberType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationPhysicalAssociationType.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationPhysicalAssociationType.java
index f7071b7de4fe4c3d459e931998167474d5ac36e3..de62fa2958913df90ea78da6bc10eb8f8b933e04 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationPhysicalAssociationType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationPhysicalAssociationType.java
@@ -125,7 +125,7 @@ public enum EntityAssociationPhysicalAssociationType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static EntityAssociationPhysicalAssociationType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -138,7 +138,7 @@ public enum EntityAssociationPhysicalAssociationType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationPhysicalConnectionType.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationPhysicalConnectionType.java
index 66c194c8e5d6b92d6413dec101ebe211f101c12a..303a977ebed24a2d84a48e5229f70a57f3e7b497 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationPhysicalConnectionType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationPhysicalConnectionType.java
@@ -95,7 +95,7 @@ public enum EntityAssociationPhysicalConnectionType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static EntityAssociationPhysicalConnectionType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -108,7 +108,7 @@ public enum EntityAssociationPhysicalConnectionType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EntityDamageStatusComponentIdentification.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityDamageStatusComponentIdentification.java
index 95ac1d8ee4ef8081920dee67631bfae9264d5473..d3ae9aa27e87acb5cb3104fe9a32ba9809f91902 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EntityDamageStatusComponentIdentification.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityDamageStatusComponentIdentification.java
@@ -89,7 +89,7 @@ public enum EntityDamageStatusComponentIdentification
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static EntityDamageStatusComponentIdentification unmarshalEnum(ByteBuffer buff) throws Exception
@@ -102,7 +102,7 @@ public enum EntityDamageStatusComponentIdentification
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EntityKind.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityKind.java
index c570834305ecb5d3406d51a4ecf6010d8b42636f..cdf00cde3aeb9f9815a8ae9d4cbba0522c6024d0 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EntityKind.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityKind.java
@@ -89,7 +89,7 @@ public enum EntityKind
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static EntityKind unmarshalEnum(ByteBuffer buff) throws Exception
@@ -102,7 +102,7 @@ public enum EntityKind
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EntityMarkingCharacterSet.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityMarkingCharacterSet.java
index 654eb08c92d23244b59efcdcef3dc46c0a32a459..4817de4064c6c59ffdcc239fd05c3f5a51b4b92f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EntityMarkingCharacterSet.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityMarkingCharacterSet.java
@@ -77,7 +77,7 @@ public enum EntityMarkingCharacterSet
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static EntityMarkingCharacterSet unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum EntityMarkingCharacterSet
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EntityVPRecordChangeIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityVPRecordChangeIndicator.java
index be48bb685ac3c239b9454e98f9af3d79ccfd410f..509df1c9c5a817afc82da83e4bbe7ba2a72761ce 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EntityVPRecordChangeIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityVPRecordChangeIndicator.java
@@ -73,7 +73,7 @@ public enum EntityVPRecordChangeIndicator
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static EntityVPRecordChangeIndicator unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum EntityVPRecordChangeIndicator
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentRecordTypeGroups.java b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentRecordTypeGroups.java
index 3bc792ba61164b5f7835e91203a893cf7711a7ab..6ccd94e6de19ee90528dd233047c524a238c2e26 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentRecordTypeGroups.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentRecordTypeGroups.java
@@ -73,7 +73,7 @@ public enum EnvironmentRecordTypeGroups
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static EnvironmentRecordTypeGroups unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum EnvironmentRecordTypeGroups
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalProcessModelType.java b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalProcessModelType.java
index 8ce57d6775804318fb664ccd56a9268874001850..4d93ab7e81128f31748d3f4f66a1ecffc25e387a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalProcessModelType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalProcessModelType.java
@@ -71,7 +71,7 @@ public enum EnvironmentalProcessModelType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static EnvironmentalProcessModelType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -84,7 +84,7 @@ public enum EnvironmentalProcessModelType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalSubcategory.java b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalSubcategory.java
index 8864d8b47c8d871b8f0894be7a9ac1cce3cd166f..ec5f77146264e4eb206d21096d64682528cba66a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalSubcategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalSubcategory.java
@@ -81,7 +81,7 @@ public enum EnvironmentalSubcategory implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static EnvironmentalSubcategory unmarshalEnum(ByteBuffer buff) throws Exception
@@ -94,7 +94,7 @@ public enum EnvironmentalSubcategory implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ExpendableAirCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/ExpendableAirCategory.java
index 6a8603f6260c1d5f790f439c7ddb2cea17e1c55e..84f0a837a71165fd56716bbd182e49e97a744e36 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ExpendableAirCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ExpendableAirCategory.java
@@ -87,7 +87,7 @@ public enum ExpendableAirCategory implements Category
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static ExpendableAirCategory unmarshalEnum(ByteBuffer buff) throws Exception
@@ -100,7 +100,7 @@ public enum ExpendableAirCategory implements Category
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ExpendableSubsurfaceCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/ExpendableSubsurfaceCategory.java
index 807656e66e11f7bfa6cf7179e248a77a2794404a..506286e205be003af5ea5540785603be742ca5ac 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ExpendableSubsurfaceCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ExpendableSubsurfaceCategory.java
@@ -83,7 +83,7 @@ public enum ExpendableSubsurfaceCategory implements Category
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static ExpendableSubsurfaceCategory unmarshalEnum(ByteBuffer buff) throws Exception
@@ -96,7 +96,7 @@ public enum ExpendableSubsurfaceCategory implements Category
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ExpendableSurfaceCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/ExpendableSurfaceCategory.java
index 1c4b44c345261cb512bdca0c7debdb1b8e8d5715..e4c82685dd119e85de41e71d2b6614191cf4194a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ExpendableSurfaceCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ExpendableSurfaceCategory.java
@@ -79,7 +79,7 @@ public enum ExpendableSurfaceCategory implements Category
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static ExpendableSurfaceCategory unmarshalEnum(ByteBuffer buff) throws Exception
@@ -92,7 +92,7 @@ public enum ExpendableSurfaceCategory implements Category
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ExplosiveMaterialCategories.java b/src-generated/edu/nps/moves/dis7/enumerations/ExplosiveMaterialCategories.java
index 503c835461705edfe8c4b0cd4cb941b19e84d642..68be83a1e026879c0a6509e2c9f23ebc85c29b79 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ExplosiveMaterialCategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ExplosiveMaterialCategories.java
@@ -152,12 +152,12 @@ public enum ExplosiveMaterialCategories
public static ExplosiveMaterialCategories unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static ExplosiveMaterialCategories unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ExplosiveMaterialGroups.java b/src-generated/edu/nps/moves/dis7/enumerations/ExplosiveMaterialGroups.java
index 936d7d26f4aa5946114ec8918b6b6fb6bcd367fa..24067c029b65753ed5822328af66ac574e24b5f1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ExplosiveMaterialGroups.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ExplosiveMaterialGroups.java
@@ -83,7 +83,7 @@ public enum ExplosiveMaterialGroups
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static ExplosiveMaterialGroups unmarshalEnum(ByteBuffer buff) throws Exception
@@ -96,7 +96,7 @@ public enum ExplosiveMaterialGroups
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/FlareSmokeColor.java b/src-generated/edu/nps/moves/dis7/enumerations/FlareSmokeColor.java
index cc7b1524bfd317aa59f3269afa77bfde248d36d0..da205606f785db2f0cf6bbfa3425a9da0b5d98b9 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/FlareSmokeColor.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/FlareSmokeColor.java
@@ -77,7 +77,7 @@ public enum FlareSmokeColor
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static FlareSmokeColor unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum FlareSmokeColor
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/FlareSmokeStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/FlareSmokeStatus.java
index 5dab4f2aecc9aafdafa14ec8419ace267a8ae177..abb0a23fb4df5ba50d77672da67224bd8e2154e9 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/FlareSmokeStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/FlareSmokeStatus.java
@@ -75,7 +75,7 @@ public enum FlareSmokeStatus
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static FlareSmokeStatus unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum FlareSmokeStatus
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ForceID.java b/src-generated/edu/nps/moves/dis7/enumerations/ForceID.java
index 41b09c38757872792e08188291611cf35562ae7a..5031588540338c841aeaafdd552d09fb59ae7c6a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ForceID.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ForceID.java
@@ -131,7 +131,7 @@ public enum ForceID
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static ForceID unmarshalEnum(ByteBuffer buff) throws Exception
@@ -144,7 +144,7 @@ public enum ForceID
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/FormatType.java b/src-generated/edu/nps/moves/dis7/enumerations/FormatType.java
index 1a43f05bba81d5dd6ed3adbfba3d5d36a5275b59..4a9136441643a69099f90942f5b91efd9d62ecb1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/FormatType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/FormatType.java
@@ -97,7 +97,7 @@ public enum FormatType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static FormatType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -110,7 +110,7 @@ public enum FormatType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/FuelLocation.java b/src-generated/edu/nps/moves/dis7/enumerations/FuelLocation.java
index 788347fb799049994373e2a4ce898c01730541f6..2ae1da3c388d34c9ef8f387d0aa38380261d9269 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/FuelLocation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/FuelLocation.java
@@ -71,7 +71,7 @@ public enum FuelLocation
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static FuelLocation unmarshalEnum(ByteBuffer buff) throws Exception
@@ -84,7 +84,7 @@ public enum FuelLocation
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/FuelMeasurementUnits.java b/src-generated/edu/nps/moves/dis7/enumerations/FuelMeasurementUnits.java
index 968d56bb6361a730481c9841387a84295d4d6c3d..8c661336765ed2e776f31596e3c3743aa16d9cff 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/FuelMeasurementUnits.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/FuelMeasurementUnits.java
@@ -75,7 +75,7 @@ public enum FuelMeasurementUnits
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static FuelMeasurementUnits unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum FuelMeasurementUnits
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/GridAxisDescriptorAxisType.java b/src-generated/edu/nps/moves/dis7/enumerations/GridAxisDescriptorAxisType.java
index ac9f0117549a229d880087d3a5ab191c6cf2e2c8..9c28ce058cec15a85578cb9bb05a063baebf35aa 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/GridAxisDescriptorAxisType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/GridAxisDescriptorAxisType.java
@@ -73,7 +73,7 @@ public enum GridAxisDescriptorAxisType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static GridAxisDescriptorAxisType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum GridAxisDescriptorAxisType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataConstantGrid.java b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataConstantGrid.java
index ffcc2f44b2cb644959de520d4432d5886edbb133..24f83c810c8b67874d40b55f168076db34539280 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataConstantGrid.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataConstantGrid.java
@@ -73,7 +73,7 @@ public enum GriddedDataConstantGrid
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static GriddedDataConstantGrid unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum GriddedDataConstantGrid
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataCoordinateSystem.java b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataCoordinateSystem.java
index 7bc9729b068ebd921a8e5534e7577ac369f21ed1..506f8f600647c0fa38ff80e4f8a08663181e0ea2 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataCoordinateSystem.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataCoordinateSystem.java
@@ -70,12 +70,12 @@ public enum GriddedDataCoordinateSystem
public static GriddedDataCoordinateSystem unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static GriddedDataCoordinateSystem unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataDataRepresentation.java b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataDataRepresentation.java
index 2a462c7bc9d7937c7b8e77ec818b20d00218a353..643bd49d4da7bbbeca90abc79cf978a5ac61cd38 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataDataRepresentation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataDataRepresentation.java
@@ -68,12 +68,12 @@ public enum GriddedDataDataRepresentation
public static GriddedDataDataRepresentation unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static GriddedDataDataRepresentation unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataFieldNumber.java b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataFieldNumber.java
index c7945d6e238263d02df4601c8d627e5a6d7d9619..d02909810525a8c930983e3442628bcaa3020c62 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataFieldNumber.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataFieldNumber.java
@@ -64,12 +64,12 @@ public enum GriddedDataFieldNumber
public static GriddedDataFieldNumber unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static GriddedDataFieldNumber unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataSampleType.java b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataSampleType.java
index 1e35fe2d003bf2b798ceccecdc7fa5e71e15da71..fb9a394dfdd9590a242d79103d512339c14c7073 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataSampleType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataSampleType.java
@@ -64,12 +64,12 @@ public enum GriddedDataSampleType
public static GriddedDataSampleType unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static GriddedDataSampleType unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/HighDensityTrackJam.java b/src-generated/edu/nps/moves/dis7/enumerations/HighDensityTrackJam.java
index 743c744ca41171c30ab5ece66fa8b51880c22446..0599aac82eddf514c252d456be436f41fa4c55b3 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/HighDensityTrackJam.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/HighDensityTrackJam.java
@@ -73,7 +73,7 @@ public enum HighDensityTrackJam
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static HighDensityTrackJam unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum HighDensityTrackJam
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/HighFidelityHAVEQUICKTODTransmitIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/HighFidelityHAVEQUICKTODTransmitIndicator.java
index c5f8fd18404ce844b159c44da514100cfe772f4d..190723a309782df6f72bad530258a8bf4535bbc4 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/HighFidelityHAVEQUICKTODTransmitIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/HighFidelityHAVEQUICKTODTransmitIndicator.java
@@ -73,7 +73,7 @@ public enum HighFidelityHAVEQUICKTODTransmitIndicator
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static HighFidelityHAVEQUICKTODTransmitIndicator unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum HighFidelityHAVEQUICKTODTransmitIndicator
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IFFAlternateMode4ChallengeReply.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFAlternateMode4ChallengeReply.java
index 30f1b8a88c3f33bba9f9c97a11ec66467f9ab35d..cb0cfaec82621ce3df741b1580fc9e3a71948f77 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IFFAlternateMode4ChallengeReply.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFAlternateMode4ChallengeReply.java
@@ -79,7 +79,7 @@ public enum IFFAlternateMode4ChallengeReply
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static IFFAlternateMode4ChallengeReply unmarshalEnum(ByteBuffer buff) throws Exception
@@ -92,7 +92,7 @@ public enum IFFAlternateMode4ChallengeReply
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IFFApplicableModes.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFApplicableModes.java
index 6cf00924ddada3f5caa07a0bab347454749fbde2..550401abd833c90f2883c133a1e563db20050e37 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IFFApplicableModes.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFApplicableModes.java
@@ -73,7 +73,7 @@ public enum IFFApplicableModes
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static IFFApplicableModes unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum IFFApplicableModes
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IFFDataRecordAvailable.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFDataRecordAvailable.java
index 24ccbdc2e881177f34db9ac662395b0651a65ed4..145fd380f928c2ce8ce76dfd97597a325651cdfc 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IFFDataRecordAvailable.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFDataRecordAvailable.java
@@ -73,7 +73,7 @@ public enum IFFDataRecordAvailable
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static IFFDataRecordAvailable unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum IFFDataRecordAvailable
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IFFLayerSpecificInformation.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFLayerSpecificInformation.java
index 9b13753b392c8d94d7bc33143d9a3da7e4ae8d92..e234e75a05f62a8fd4e7a96c8a6d00f1792c5a41 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IFFLayerSpecificInformation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFLayerSpecificInformation.java
@@ -71,7 +71,7 @@ public enum IFFLayerSpecificInformation
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static IFFLayerSpecificInformation unmarshalEnum(ByteBuffer buff) throws Exception
@@ -84,7 +84,7 @@ public enum IFFLayerSpecificInformation
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IFFSimulationMode.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFSimulationMode.java
index f769bba4bb7e2f0e6ec23917a8af7380330464d1..6ae96775a67fd057128806dba34f0b906d55f8a6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IFFSimulationMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFSimulationMode.java
@@ -73,7 +73,7 @@ public enum IFFSimulationMode
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static IFFSimulationMode unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum IFFSimulationMode
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemMode.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemMode.java
index 0463260fcffe593a4255b9a1c9204b0bf8366191..f11ae13fdea57490a5f7ff4db9bd36a46b1e3457 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemMode.java
@@ -81,7 +81,7 @@ public enum IFFSystemMode
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static IFFSystemMode unmarshalEnum(ByteBuffer buff) throws Exception
@@ -94,7 +94,7 @@ public enum IFFSystemMode
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemName.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemName.java
index 430ac6e52b81bbe01932bb3ecedcdd9d18e411ef..ec10fe0a9472263098e2b81bc66bd77d81bb9d39 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemName.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemName.java
@@ -100,12 +100,12 @@ public enum IFFSystemName
public static IFFSystemName unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static IFFSystemName unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType.java
index 4ee079df1493dd70019414561842105a6b2e93d4..2a0c15baea06beded5d2cb9a4d747baaa99af4f9 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType.java
@@ -92,12 +92,12 @@ public enum IFFSystemType
public static IFFSystemType unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static IFFSystemType unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType1OperationalParameter1.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType1OperationalParameter1.java
index 6094c6b182423969f73c317d75265f967f27a78b..2f4bc93cc67b7fb4ec4d4591f83e12c5552744d2 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType1OperationalParameter1.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType1OperationalParameter1.java
@@ -71,7 +71,7 @@ public enum IFFSystemType1OperationalParameter1
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static IFFSystemType1OperationalParameter1 unmarshalEnum(ByteBuffer buff) throws Exception
@@ -84,7 +84,7 @@ public enum IFFSystemType1OperationalParameter1
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType1OperationalParameter2.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType1OperationalParameter2.java
index 1a94ee7cf15a0634488a7fbe13a6d4c3681ef5d4..a650ea3430937ed6ffb1f84fd68cc767765d73d6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType1OperationalParameter2.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType1OperationalParameter2.java
@@ -71,7 +71,7 @@ public enum IFFSystemType1OperationalParameter2
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static IFFSystemType1OperationalParameter2 unmarshalEnum(ByteBuffer buff) throws Exception
@@ -84,7 +84,7 @@ public enum IFFSystemType1OperationalParameter2
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOActionPhase.java b/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOActionPhase.java
index 67c758445ab528959d7499f6f832fef60f65d7fc..fdcc9e99a2ed2f8935df8bd31a2d2a151d85ea46 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOActionPhase.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOActionPhase.java
@@ -76,12 +76,12 @@ public enum IOActionIOActionPhase
public static IOActionIOActionPhase unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static IOActionIOActionPhase unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOActionType.java b/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOActionType.java
index b5c6bb7bb41a82007525c9095fb1d785dc40d23d..ee654ef4d2bbb26fc950257609c35cd188567a79 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOActionType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOActionType.java
@@ -68,12 +68,12 @@ public enum IOActionIOActionType
public static IOActionIOActionType unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static IOActionIOActionType unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOSimulationSource.java b/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOSimulationSource.java
index b53b9bd59496d99b8956c931f62203a6d2e40e81..84d1b618c0997641ac2420cc213ae0905c2aa5c6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOSimulationSource.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOSimulationSource.java
@@ -66,12 +66,12 @@ public enum IOActionIOSimulationSource
public static IOActionIOSimulationSource unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static IOActionIOSimulationSource unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOWarfareType.java b/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOWarfareType.java
index 9f06fab9a7107ee8eb54bdef36156320507eb4c7..5d3c8595d759bbcfdc06ea831f21578e0e24efe2 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOWarfareType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOWarfareType.java
@@ -76,12 +76,12 @@ public enum IOActionIOWarfareType
public static IOActionIOWarfareType unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static IOActionIOWarfareType unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IOCommsNodeRecordCommsNodeType.java b/src-generated/edu/nps/moves/dis7/enumerations/IOCommsNodeRecordCommsNodeType.java
index ad51170340bba503e5ed7e2b0edcf28dc67336d9..6b6c918fe5afed8e0938f452217fbc1e10300b94 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IOCommsNodeRecordCommsNodeType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOCommsNodeRecordCommsNodeType.java
@@ -77,7 +77,7 @@ public enum IOCommsNodeRecordCommsNodeType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static IOCommsNodeRecordCommsNodeType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum IOCommsNodeRecordCommsNodeType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOEffect.java b/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOEffect.java
index 60c24f1e0ef9475d3ae2c41faf0ae5442d564853..9e1d4d4ea8a56bc42e5cf41cca084a608889936e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOEffect.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOEffect.java
@@ -79,7 +79,7 @@ public enum IOEffectsRecordIOEffect
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static IOEffectsRecordIOEffect unmarshalEnum(ByteBuffer buff) throws Exception
@@ -92,7 +92,7 @@ public enum IOEffectsRecordIOEffect
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOLinkType.java b/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOLinkType.java
index 0b5b99cb963ca86ca30fabc1f9c1085c5b814652..f74df1aa7f36241b70f1e43cc4781d4c35a6c750 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOLinkType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOLinkType.java
@@ -77,7 +77,7 @@ public enum IOEffectsRecordIOLinkType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static IOEffectsRecordIOLinkType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum IOEffectsRecordIOLinkType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOProcess.java b/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOProcess.java
index 4f3f640ad59e1b6dec18bee90baf0c2e51620737..5fb62c88b191ca062354148ba847250c248182b5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOProcess.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOProcess.java
@@ -64,12 +64,12 @@ public enum IOEffectsRecordIOProcess
public static IOEffectsRecordIOProcess unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static IOEffectsRecordIOProcess unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOStatus.java
index 9f4ff9c5d5e9d96c78524a77445ef750e7c9a61b..5b0e88fdb5500b7616208c89c9ff07233f8413d3 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOStatus.java
@@ -85,7 +85,7 @@ public enum IOEffectsRecordIOStatus
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static IOEffectsRecordIOStatus unmarshalEnum(ByteBuffer buff) throws Exception
@@ -98,7 +98,7 @@ public enum IOEffectsRecordIOStatus
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IOReportIOReportType.java b/src-generated/edu/nps/moves/dis7/enumerations/IOReportIOReportType.java
index 62d52c5b54bcae3554e193b7a0e34baa4ca5547c..7073c1f6dcdabb75a391a593af11ba33135301ef 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IOReportIOReportType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOReportIOReportType.java
@@ -77,7 +77,7 @@ public enum IOReportIOReportType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static IOReportIOReportType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum IOReportIOReportType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ISLSAntennaType.java b/src-generated/edu/nps/moves/dis7/enumerations/ISLSAntennaType.java
index 808caef0d47884890102c1e0a618067d6edca4c9..8c45a5384de084222b233e246926f4d82f2468a3 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ISLSAntennaType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ISLSAntennaType.java
@@ -73,7 +73,7 @@ public enum ISLSAntennaType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static ISLSAntennaType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum ISLSAntennaType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommand.java b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommand.java
index 4e08238d5e14ce5a39cc8659822379734a9d4c84..7ee02dcb3a815cfa58a4ad239d1d182406d8a2ce 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommand.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommand.java
@@ -83,7 +83,7 @@ public enum IntercomControlCommand
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static IntercomControlCommand unmarshalEnum(ByteBuffer buff) throws Exception
@@ -96,7 +96,7 @@ public enum IntercomControlCommand
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommunicationsClass.java b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommunicationsClass.java
index 4078bf48742d40c037a9565b2e1e47c7f292e9af..e8ccff40c170efb9d912b0ba795565f4533bb74c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommunicationsClass.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommunicationsClass.java
@@ -73,7 +73,7 @@ public enum IntercomControlCommunicationsClass
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static IntercomControlCommunicationsClass unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum IntercomControlCommunicationsClass
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommunicationsType.java b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommunicationsType.java
index ccf366e0dd0029e884b057e0a11bfe6a50563687..f7e4da28a48a1c2ca4b720d109ef837a05078b04 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommunicationsType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommunicationsType.java
@@ -79,7 +79,7 @@ public enum IntercomControlCommunicationsType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static IntercomControlCommunicationsType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -92,7 +92,7 @@ public enum IntercomControlCommunicationsType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlControlType.java b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlControlType.java
index bda567b9ac142e60ce07a1804e49434ae56d6783..d5229f7dcf9c5026f09f8b178e65873577577fc5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlControlType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlControlType.java
@@ -81,7 +81,7 @@ public enum IntercomControlControlType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static IntercomControlControlType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -94,7 +94,7 @@ public enum IntercomControlControlType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlDestinationLineStateCommand.java b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlDestinationLineStateCommand.java
index ceb4a07249d17c30f0b538e86f7f024b9c26e159..3b0aa853f008bf9e54ee5fd2ec54fa42c9ac7ad3 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlDestinationLineStateCommand.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlDestinationLineStateCommand.java
@@ -77,7 +77,7 @@ public enum IntercomControlDestinationLineStateCommand
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static IntercomControlDestinationLineStateCommand unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum IntercomControlDestinationLineStateCommand
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlRecordType.java b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlRecordType.java
index eeb77fce6794c4c3d8555afa7a3383d2bcbb6e1a..d271fde1d63a61640782dde760255b87dd37c697 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlRecordType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlRecordType.java
@@ -68,12 +68,12 @@ public enum IntercomControlRecordType
public static IntercomControlRecordType unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static IntercomControlRecordType unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlTransmitLineState.java b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlTransmitLineState.java
index ac05451c471f77621ef1f3877f29cf3da45b747b..6ae97c7ffdbce6fdc9d38aa5524646593d1d5944 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlTransmitLineState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlTransmitLineState.java
@@ -75,7 +75,7 @@ public enum IntercomControlTransmitLineState
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static IntercomControlTransmitLineState unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum IntercomControlTransmitLineState
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IsGroupOfGroupedEntityCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/IsGroupOfGroupedEntityCategory.java
index 914f24760e66044fb2b87ca15dc777f38a4346e4..ef7253c8cc0fef432582f588af1c81511eefc4ca 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IsGroupOfGroupedEntityCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IsGroupOfGroupedEntityCategory.java
@@ -89,7 +89,7 @@ public enum IsGroupOfGroupedEntityCategory implements Category
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static IsGroupOfGroupedEntityCategory unmarshalEnum(ByteBuffer buff) throws Exception
@@ -102,7 +102,7 @@ public enum IsGroupOfGroupedEntityCategory implements Category
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IsGroupOfRestStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/IsGroupOfRestStatus.java
index 3776052193b10d784a413680365430a99d20f04c..af9d6a0cdce56725831777aae6661fafcde85125 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IsGroupOfRestStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IsGroupOfRestStatus.java
@@ -87,7 +87,7 @@ public enum IsGroupOfRestStatus
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static IsGroupOfRestStatus unmarshalEnum(ByteBuffer buff) throws Exception
@@ -100,7 +100,7 @@ public enum IsGroupOfRestStatus
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfNature.java b/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfNature.java
index 63eb5dbe6d29aaed450c9d2f401d0dace8068bc2..a2fd7ef122a8c8b93ad91806618b43508b5b1f60 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfNature.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfNature.java
@@ -84,12 +84,12 @@ public enum IsPartOfNature
public static IsPartOfNature unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static IsPartOfNature unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfPosition.java b/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfPosition.java
index 87bd4c6af7aba3705836258dfcc91a4bbd8a3f7c..cd4055ae3c24b70ac39b167789eb6bddb7578d01 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfPosition.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfPosition.java
@@ -68,12 +68,12 @@ public enum IsPartOfPosition
public static IsPartOfPosition unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static IsPartOfPosition unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfStationName.java b/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfStationName.java
index e395f81fe503e865e93cc8735edb7bfd196cceaf..9ca8928d9b1eb9bf7cbe27a63309a6a626428633 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfStationName.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfStationName.java
@@ -100,12 +100,12 @@ public enum IsPartOfStationName
public static IsPartOfStationName unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static IsPartOfStationName unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/IslandSubcategory.java b/src-generated/edu/nps/moves/dis7/enumerations/IslandSubcategory.java
index 099612a29f3c7259675f672077e08f9b205bc071..0cdbc5fc4974e0f96c82e00f24d8b2cc52959cd8 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/IslandSubcategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IslandSubcategory.java
@@ -76,12 +76,12 @@ public enum IslandSubcategory implements SubCategory
public static IslandSubcategory unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static IslandSubcategory unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersSynchronizationState.java b/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersSynchronizationState.java
index 2518ffd05fd07a22f352c71413d84bea816ee140..0c68678d6f14acfa7f1fc33fa947e2075ada69b2 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersSynchronizationState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersSynchronizationState.java
@@ -77,7 +77,7 @@ public enum JTIDSMIDSModulationParametersSynchronizationState
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static JTIDSMIDSModulationParametersSynchronizationState unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum JTIDSMIDSModulationParametersSynchronizationState
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalPrimaryMode.java b/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalPrimaryMode.java
index 6342c34d3a750ec00d3e0ef7baffd18ad6534f42..b39cb3f0c87fa110460c94ace7963e07ad1c3cd7 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalPrimaryMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalPrimaryMode.java
@@ -73,7 +73,7 @@ public enum JTIDSMIDSModulationParametersTransmittingTerminalPrimaryMode
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static JTIDSMIDSModulationParametersTransmittingTerminalPrimaryMode unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum JTIDSMIDSModulationParametersTransmittingTerminalPrimaryMode
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalSecondaryMode.java b/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalSecondaryMode.java
index e290ecde334fe527205f491bf38ad20af5daca97..cb2b925a7f2890d3c3052351370e6d332b5a9e5c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalSecondaryMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalSecondaryMode.java
@@ -77,7 +77,7 @@ public enum JTIDSMIDSModulationParametersTransmittingTerminalSecondaryMode
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static JTIDSMIDSModulationParametersTransmittingTerminalSecondaryMode unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum JTIDSMIDSModulationParametersTransmittingTerminalSecondaryMode
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LeafCoverage.java b/src-generated/edu/nps/moves/dis7/enumerations/LeafCoverage.java
index d35e1fe2b44da26488577544c205b8669e5a00b7..cf5fac872dc61aa465c680115434998aee04f907 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LeafCoverage.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LeafCoverage.java
@@ -73,7 +73,7 @@ public enum LeafCoverage
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LeafCoverage unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum LeafCoverage
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Level2SquitterStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/Level2SquitterStatus.java
index 98c1cd84651ff603a13e846c5a9331626f10818e..27e92b5ce430f81529bc3d17233fd3a7a187e847 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Level2SquitterStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Level2SquitterStatus.java
@@ -73,7 +73,7 @@ public enum Level2SquitterStatus
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Level2SquitterStatus unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum Level2SquitterStatus
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormAirCategories.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormAirCategories.java
index b4d82ddaf95a8297bfb515154e4e16d436752d8a..6c5e2e90d2ea758d384ec0cee7a20da7ac608c8a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormAirCategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormAirCategories.java
@@ -72,7 +72,7 @@ public enum LifeFormAirCategories
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormAirCategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -85,7 +85,7 @@ public enum LifeFormAirCategories
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormCategoriesUS.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormCategoriesUS.java
index c27bb4fff08522176481e63e5179a85d7ba678ca..6bf07c3e2886e127d9705c5090603ab1d466fe2f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormCategoriesUS.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormCategoriesUS.java
@@ -111,7 +111,7 @@ public enum LifeFormCategoriesUS
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormCategoriesUS unmarshalEnum(ByteBuffer buff) throws Exception
@@ -124,7 +124,7 @@ public enum LifeFormCategoriesUS
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormExtraPersonalData.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormExtraPersonalData.java
index 2597efe1f4be62c76ff9bbe0d9a6abe10d54eaa9..0392d8329fd918512697a5187f84f08061203eda 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormExtraPersonalData.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormExtraPersonalData.java
@@ -147,7 +147,7 @@ public enum LifeFormExtraPersonalData
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormExtraPersonalData unmarshalEnum(ByteBuffer buff) throws Exception
@@ -160,7 +160,7 @@ public enum LifeFormExtraPersonalData
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiMaterielRifles.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiMaterielRifles.java
index 990aa7351182248cfdce0da6c7677077148c0be8..b0d171ef2773eb621c99f07d30acfba37a3c04e9 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiMaterielRifles.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiMaterielRifles.java
@@ -75,7 +75,7 @@ public enum LifeFormHumanSpecificAntiMaterielRifles
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormHumanSpecificAntiMaterielRifles unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum LifeFormHumanSpecificAntiMaterielRifles
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiTankMissiles.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiTankMissiles.java
index 04ed40a03ae382b8eeb9fb15923c3f72c6d41559..44c7b9395bbaf2f9d31a5970e35ff19196609928 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiTankMissiles.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiTankMissiles.java
@@ -217,7 +217,7 @@ public enum LifeFormHumanSpecificAntiTankMissiles
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormHumanSpecificAntiTankMissiles unmarshalEnum(ByteBuffer buff) throws Exception
@@ -230,7 +230,7 @@ public enum LifeFormHumanSpecificAntiTankMissiles
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiTankRockets.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiTankRockets.java
index dd5698944c83d77e48dd08f0840328249d70e4c7..a504e574a07fa78c13609ad6d4d98bc0b21c078b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiTankRockets.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiTankRockets.java
@@ -207,7 +207,7 @@ public enum LifeFormHumanSpecificAntiTankRockets
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormHumanSpecificAntiTankRockets unmarshalEnum(ByteBuffer buff) throws Exception
@@ -220,7 +220,7 @@ public enum LifeFormHumanSpecificAntiTankRockets
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAssaultRifles.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAssaultRifles.java
index b822514cd5469d5398f6157e7aa5af7cefe8059d..0e8c393eaf53d9b2bddacdeb605dad0bdc306faa 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAssaultRifles.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAssaultRifles.java
@@ -189,7 +189,7 @@ public enum LifeFormHumanSpecificAssaultRifles
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormHumanSpecificAssaultRifles unmarshalEnum(ByteBuffer buff) throws Exception
@@ -202,7 +202,7 @@ public enum LifeFormHumanSpecificAssaultRifles
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificDroneGuns.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificDroneGuns.java
index 53f33f18c83e1ddb216cd3b12bd246df5d9cbe7f..4e1bf2190b7d2871ff5f7c4501b8aad28381db92 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificDroneGuns.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificDroneGuns.java
@@ -75,7 +75,7 @@ public enum LifeFormHumanSpecificDroneGuns
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormHumanSpecificDroneGuns unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum LifeFormHumanSpecificDroneGuns
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificEquipmentClass.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificEquipmentClass.java
index a78660ffab015537cdfda32de430187ff45dcf45..10d931258f0989a473064eb5521a21c65cef7768 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificEquipmentClass.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificEquipmentClass.java
@@ -79,7 +79,7 @@ public enum LifeFormHumanSpecificEquipmentClass
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormHumanSpecificEquipmentClass unmarshalEnum(ByteBuffer buff) throws Exception
@@ -92,7 +92,7 @@ public enum LifeFormHumanSpecificEquipmentClass
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificFlameRockets.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificFlameRockets.java
index 0561dc7c3c7d5e76bd5ce996d8d803e417101388..af01b3cd7367721131bacc6b98489d2ca0985706 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificFlameRockets.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificFlameRockets.java
@@ -83,7 +83,7 @@ public enum LifeFormHumanSpecificFlameRockets
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormHumanSpecificFlameRockets unmarshalEnum(ByteBuffer buff) throws Exception
@@ -96,7 +96,7 @@ public enum LifeFormHumanSpecificFlameRockets
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificFlameThrowers.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificFlameThrowers.java
index dad2de2554fdd8789ce71667ce8e67b927d3ca46..195fd3ffc4782fbf9f1c017a8052b226e07b73e1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificFlameThrowers.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificFlameThrowers.java
@@ -99,7 +99,7 @@ public enum LifeFormHumanSpecificFlameThrowers
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormHumanSpecificFlameThrowers unmarshalEnum(ByteBuffer buff) throws Exception
@@ -112,7 +112,7 @@ public enum LifeFormHumanSpecificFlameThrowers
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificGrenadeLaunchers.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificGrenadeLaunchers.java
index b1441217f62e159723f9fea09c17ab4ccc91dd68..4c2eec2dac3460b609baa9f89c9999cc98c5d266 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificGrenadeLaunchers.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificGrenadeLaunchers.java
@@ -151,7 +151,7 @@ public enum LifeFormHumanSpecificGrenadeLaunchers
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormHumanSpecificGrenadeLaunchers unmarshalEnum(ByteBuffer buff) throws Exception
@@ -164,7 +164,7 @@ public enum LifeFormHumanSpecificGrenadeLaunchers
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificGrenadeLaunchingMachineGun.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificGrenadeLaunchingMachineGun.java
index db575d6784935b3a21d49975164c03149ba5a08f..00cd5e31f621fe175dd4a012fd6a6548e6ec2aa3 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificGrenadeLaunchingMachineGun.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificGrenadeLaunchingMachineGun.java
@@ -109,7 +109,7 @@ public enum LifeFormHumanSpecificGrenadeLaunchingMachineGun
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormHumanSpecificGrenadeLaunchingMachineGun unmarshalEnum(ByteBuffer buff) throws Exception
@@ -122,7 +122,7 @@ public enum LifeFormHumanSpecificGrenadeLaunchingMachineGun
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificHandGuns.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificHandGuns.java
index ff5fb14cb73183908b472414c4b8c1b887aa095d..16506c150ce71c43c4b111189d993fdb5d5e589b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificHandGuns.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificHandGuns.java
@@ -79,7 +79,7 @@ public enum LifeFormHumanSpecificHandGuns
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormHumanSpecificHandGuns unmarshalEnum(ByteBuffer buff) throws Exception
@@ -92,7 +92,7 @@ public enum LifeFormHumanSpecificHandGuns
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificHighPowerRifles.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificHighPowerRifles.java
index 7e3a161990920f2eb242701273d5088ff9edd992..7cedbee5eee020d50dfde7485f5795ae8a8af54c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificHighPowerRifles.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificHighPowerRifles.java
@@ -89,7 +89,7 @@ public enum LifeFormHumanSpecificHighPowerRifles
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormHumanSpecificHighPowerRifles unmarshalEnum(ByteBuffer buff) throws Exception
@@ -102,7 +102,7 @@ public enum LifeFormHumanSpecificHighPowerRifles
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificMachineGuns.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificMachineGuns.java
index 19173f106670ae42eda1a8b0e9d5ef9e3ccf0891..a5042cbdff89fc07b0b02f374a40c5bac15c0ee1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificMachineGuns.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificMachineGuns.java
@@ -243,7 +243,7 @@ public enum LifeFormHumanSpecificMachineGuns
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormHumanSpecificMachineGuns unmarshalEnum(ByteBuffer buff) throws Exception
@@ -256,7 +256,7 @@ public enum LifeFormHumanSpecificMachineGuns
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificManPortableAirDefenseSystem.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificManPortableAirDefenseSystem.java
index d3e7f50c2dd4562e845c82d660116e30e70f1340..08f88d8c396379cb6a4707da5cbde2a0225a6f78 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificManPortableAirDefenseSystem.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificManPortableAirDefenseSystem.java
@@ -113,7 +113,7 @@ public enum LifeFormHumanSpecificManPortableAirDefenseSystem
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormHumanSpecificManPortableAirDefenseSystem unmarshalEnum(ByteBuffer buff) throws Exception
@@ -126,7 +126,7 @@ public enum LifeFormHumanSpecificManPortableAirDefenseSystem
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificMortars.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificMortars.java
index 4c623824458cdb6c59d0cb7d0f3d7c5beb5a622a..475f0cc896e4f3901d698c172e6e1fab2ef30f9e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificMortars.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificMortars.java
@@ -79,7 +79,7 @@ public enum LifeFormHumanSpecificMortars
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormHumanSpecificMortars unmarshalEnum(ByteBuffer buff) throws Exception
@@ -92,7 +92,7 @@ public enum LifeFormHumanSpecificMortars
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificRecoillessRifles.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificRecoillessRifles.java
index caa7cef07a2168569d1883deb9da0c55299bebd2..904ee074503b760f779918bcbdd94bd7f11c82ac 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificRecoillessRifles.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificRecoillessRifles.java
@@ -127,7 +127,7 @@ public enum LifeFormHumanSpecificRecoillessRifles
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormHumanSpecificRecoillessRifles unmarshalEnum(ByteBuffer buff) throws Exception
@@ -140,7 +140,7 @@ public enum LifeFormHumanSpecificRecoillessRifles
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificShotGuns.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificShotGuns.java
index a65cda255b69e89d410c8ac56308b2a5e62131d2..4ea1033f7e45282e24fc2524a2491b40b990a013 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificShotGuns.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificShotGuns.java
@@ -347,7 +347,7 @@ public enum LifeFormHumanSpecificShotGuns
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormHumanSpecificShotGuns unmarshalEnum(ByteBuffer buff) throws Exception
@@ -360,7 +360,7 @@ public enum LifeFormHumanSpecificShotGuns
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificSniper.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificSniper.java
index b3a2fa9a9abb8e151c4405b2782290dfb3479737..2ab75b6bb2b28a30d81f5f12291488394a099e95 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificSniper.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificSniper.java
@@ -123,7 +123,7 @@ public enum LifeFormHumanSpecificSniper
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormHumanSpecificSniper unmarshalEnum(ByteBuffer buff) throws Exception
@@ -136,7 +136,7 @@ public enum LifeFormHumanSpecificSniper
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificSubMachineGun.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificSubMachineGun.java
index 8d21abb0e67bd13585fb55d193f3c6329485a970..365e1d89f754980f28755bbf512aede3a42a1926 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificSubMachineGun.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificSubMachineGun.java
@@ -95,7 +95,7 @@ public enum LifeFormHumanSpecificSubMachineGun
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormHumanSpecificSubMachineGun unmarshalEnum(ByteBuffer buff) throws Exception
@@ -108,7 +108,7 @@ public enum LifeFormHumanSpecificSubMachineGun
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificWeaponNonspecific.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificWeaponNonspecific.java
index 8fcf19eb808f53de6ff299de4540c91720009583..ead806ff8b87954841aa21da00eaefbfa7c6ea8c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificWeaponNonspecific.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificWeaponNonspecific.java
@@ -75,7 +75,7 @@ public enum LifeFormHumanSpecificWeaponNonspecific
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormHumanSpecificWeaponNonspecific unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum LifeFormHumanSpecificWeaponNonspecific
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSubcategoryEquipmentClass.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSubcategoryEquipmentClass.java
index b8fbc8b3b7a196e0502b7d441e2256ea492f6fcb..43fd48fa95785388b6b5354451f04c74612a3c93 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSubcategoryEquipmentClass.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSubcategoryEquipmentClass.java
@@ -101,7 +101,7 @@ public enum LifeFormHumanSubcategoryEquipmentClass
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormHumanSubcategoryEquipmentClass unmarshalEnum(ByteBuffer buff) throws Exception
@@ -114,7 +114,7 @@ public enum LifeFormHumanSubcategoryEquipmentClass
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormLandCategories.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormLandCategories.java
index 0bd2c9041f98ebcfea05e0d184ed26d0de9cf3ad..ef8448674a215a4454e441b161098681680e1b24 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormLandCategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormLandCategories.java
@@ -114,7 +114,7 @@ public enum LifeFormLandCategories implements Category
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormLandCategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -127,7 +127,7 @@ public enum LifeFormLandCategories implements Category
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormSubsurfaceCategories.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormSubsurfaceCategories.java
index 8b29f57afeb3342109c2df7f13963226330f8c47..5cb291be956be45420c46a46e7ff353aa3177941 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormSubsurfaceCategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormSubsurfaceCategories.java
@@ -74,7 +74,7 @@ public enum LifeFormSubsurfaceCategories
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormSubsurfaceCategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -87,7 +87,7 @@ public enum LifeFormSubsurfaceCategories
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryCISWeapons.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryCISWeapons.java
index 7747c3e9494304b2861067237851eedc11564c7a..94c58ef8f2265e25ba0736f0f1d6524ad682e2d6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryCISWeapons.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryCISWeapons.java
@@ -173,7 +173,7 @@ public enum LifeFormsSubcategoryCISWeapons implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormsSubcategoryCISWeapons unmarshalEnum(ByteBuffer buff) throws Exception
@@ -186,7 +186,7 @@ public enum LifeFormsSubcategoryCISWeapons implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryFrenchWeapons.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryFrenchWeapons.java
index 31ff96d0d542bbc4530483ad1892f678757a9d32..b447043498fcaa1effffe9d9e0131fd7f0ba4ecf 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryFrenchWeapons.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryFrenchWeapons.java
@@ -85,7 +85,7 @@ public enum LifeFormsSubcategoryFrenchWeapons implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormsSubcategoryFrenchWeapons unmarshalEnum(ByteBuffer buff) throws Exception
@@ -98,7 +98,7 @@ public enum LifeFormsSubcategoryFrenchWeapons implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryGermanWeapons.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryGermanWeapons.java
index 948abfd5d0180df7ffd8dffc99c12a916e2e7528..f0f3ca675f2450f642324faebf03a9e80ddd9c45 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryGermanWeapons.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryGermanWeapons.java
@@ -87,7 +87,7 @@ public enum LifeFormsSubcategoryGermanWeapons implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormsSubcategoryGermanWeapons unmarshalEnum(ByteBuffer buff) throws Exception
@@ -100,7 +100,7 @@ public enum LifeFormsSubcategoryGermanWeapons implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryIranianWeapons.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryIranianWeapons.java
index 28162bedf9175546e3f41195bdf932239a140d9a..87d034705a625610dbefd6e51d39b0ca7139bedb 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryIranianWeapons.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryIranianWeapons.java
@@ -73,7 +73,7 @@ public enum LifeFormsSubcategoryIranianWeapons implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormsSubcategoryIranianWeapons unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum LifeFormsSubcategoryIranianWeapons implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryUKWeapons.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryUKWeapons.java
index 55c9d44afdc07a92cebc992b7cb644d6f4b50392..2cb9be2acdb5cd8fe8f8460205282cbccf863124 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryUKWeapons.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryUKWeapons.java
@@ -93,7 +93,7 @@ public enum LifeFormsSubcategoryUKWeapons implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormsSubcategoryUKWeapons unmarshalEnum(ByteBuffer buff) throws Exception
@@ -106,7 +106,7 @@ public enum LifeFormsSubcategoryUKWeapons implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryUSWeapons.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryUSWeapons.java
index 6000ce8fb70517fc5162dd36f8c3b71823237b8d..d3a3b49045f0ab0a9d562485c9e3a9d7adaa1a99 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryUSWeapons.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryUSWeapons.java
@@ -313,7 +313,7 @@ public enum LifeFormsSubcategoryUSWeapons implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeFormsSubcategoryUSWeapons unmarshalEnum(ByteBuffer buff) throws Exception
@@ -326,7 +326,7 @@ public enum LifeFormsSubcategoryUSWeapons implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/LifeSavingEquipment.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeSavingEquipment.java
index 20b46e8b631c64e4ffff2ad45308359eeb2b851a..3f91a469f1dd19d82ffa73633e3d58d650f6ad70 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/LifeSavingEquipment.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeSavingEquipment.java
@@ -79,7 +79,7 @@ public enum LifeSavingEquipment implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static LifeSavingEquipment unmarshalEnum(ByteBuffer buff) throws Exception
@@ -92,7 +92,7 @@ public enum LifeSavingEquipment implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Link1111BDataTerminalSetIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/Link1111BDataTerminalSetIndicator.java
index 4219d3c742695a0e87141284635ce21c63340f65..7b4188f6b29e9c56b9f16c53da1e820f7cc30dc4 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Link1111BDataTerminalSetIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Link1111BDataTerminalSetIndicator.java
@@ -85,7 +85,7 @@ public enum Link1111BDataTerminalSetIndicator
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Link1111BDataTerminalSetIndicator unmarshalEnum(ByteBuffer buff) throws Exception
@@ -98,7 +98,7 @@ public enum Link1111BDataTerminalSetIndicator
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Link1111BFidelityLevel.java b/src-generated/edu/nps/moves/dis7/enumerations/Link1111BFidelityLevel.java
index 234d93050793634b97c6ed03a888a1ae8e05c4df..1a204f0e3e63d00513d972a08458038bbe941035 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Link1111BFidelityLevel.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Link1111BFidelityLevel.java
@@ -75,7 +75,7 @@ public enum Link1111BFidelityLevel
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Link1111BFidelityLevel unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum Link1111BFidelityLevel
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Link1111BModeofOperation.java b/src-generated/edu/nps/moves/dis7/enumerations/Link1111BModeofOperation.java
index 81fc8bc225b40e788a37921b8f209cfb0cc7bd0f..6a8e73953f45c656ce96a70d85b8e2598319335c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Link1111BModeofOperation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Link1111BModeofOperation.java
@@ -74,12 +74,12 @@ public enum Link1111BModeofOperation
public static Link1111BModeofOperation unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static Link1111BModeofOperation unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Link1111BTerminalMode.java b/src-generated/edu/nps/moves/dis7/enumerations/Link1111BTerminalMode.java
index c3c36030c1dbeee0c93f053e05ec07771c488f05..14e8c895a3d0c424e5b70fca096e2a25649cabde 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Link1111BTerminalMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Link1111BTerminalMode.java
@@ -75,7 +75,7 @@ public enum Link1111BTerminalMode
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Link1111BTerminalMode unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum Link1111BTerminalMode
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Material.java b/src-generated/edu/nps/moves/dis7/enumerations/Material.java
index 76b25f8b7b9094c26ec61a4a1c0d3c6448dd801d..cf832680083c3b594adf8cb2384fbe1156b11e0e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Material.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Material.java
@@ -77,7 +77,7 @@ public enum Material
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Material unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum Material
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceActiveStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceActiveStatus.java
index a960f29ab2d3cfe876f0c9af7dc19c7194697a7e..314b41da337874d66d05abf13d65db308abac6f3 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceActiveStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceActiveStatus.java
@@ -73,7 +73,7 @@ public enum MinefieldAppearanceActiveStatus
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static MinefieldAppearanceActiveStatus unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum MinefieldAppearanceActiveStatus
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceLane.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceLane.java
index 05eee45724b7eb739e2045618477d01b2fbebbed..c6fbfbcfd6730363d9304ca7e23a4530a407b65c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceLane.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceLane.java
@@ -73,7 +73,7 @@ public enum MinefieldAppearanceLane
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static MinefieldAppearanceLane unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum MinefieldAppearanceLane
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceMinefieldType.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceMinefieldType.java
index 3c4fd0bf170b583f320b70b9e9ed3cc96c7366f1..3288b6b88c64a438840c2fdca36df6ebd62b73e9 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceMinefieldType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceMinefieldType.java
@@ -75,7 +75,7 @@ public enum MinefieldAppearanceMinefieldType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static MinefieldAppearanceMinefieldType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum MinefieldAppearanceMinefieldType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceState.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceState.java
index 238d86d86d076aa130c99ca8f45c910c396dec17..127ff014ed924f00234ba62eddeeb625f75da4c7 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceState.java
@@ -73,7 +73,7 @@ public enum MinefieldAppearanceState
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static MinefieldAppearanceState unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum MinefieldAppearanceState
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldFusingFuseType.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldFusingFuseType.java
index 0692d843efb47cc25daba3698879d26cd3857f18..c326a97a1bc7f135ef147bb0994ca966251d41b9 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldFusingFuseType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldFusingFuseType.java
@@ -83,7 +83,7 @@ public enum MinefieldFusingFuseType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static MinefieldFusingFuseType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -96,7 +96,7 @@ public enum MinefieldFusingFuseType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldPaintSchemeAlgae.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldPaintSchemeAlgae.java
index 26c3486999f5343b3a441c9c41e6244273f70ff6..7ee7119cc5df3cc9078ec0613884c076e3833395 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldPaintSchemeAlgae.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldPaintSchemeAlgae.java
@@ -77,7 +77,7 @@ public enum MinefieldPaintSchemeAlgae
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static MinefieldPaintSchemeAlgae unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum MinefieldPaintSchemeAlgae
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldPaintSchemePaintScheme.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldPaintSchemePaintScheme.java
index 8213ff5d706ce01f43880990ef681962c3f1f9bf..412b7cd007cc75c3aa3e5e3ffb00a6280a187ab0 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldPaintSchemePaintScheme.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldPaintSchemePaintScheme.java
@@ -107,7 +107,7 @@ public enum MinefieldPaintSchemePaintScheme
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static MinefieldPaintSchemePaintScheme unmarshalEnum(ByteBuffer buff) throws Exception
@@ -120,7 +120,7 @@ public enum MinefieldPaintSchemePaintScheme
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypes.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypes.java
index 1795f0b11d863db3ed6bcdbbd8049de16c327eee..a5dd8638a8f23d1e46cda90ea972e3b25455f369 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypes.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypes.java
@@ -79,7 +79,7 @@ public enum MinefieldSensorTypes
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static MinefieldSensorTypes unmarshalEnum(ByteBuffer buff) throws Exception
@@ -92,7 +92,7 @@ public enum MinefieldSensorTypes
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesFLIR.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesFLIR.java
index 778f086ccc924cda41e3c874ef73a60f5bfe051b..fb75cb73f6461fd5929a88381930a1c9b3aa452e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesFLIR.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesFLIR.java
@@ -82,12 +82,12 @@ public enum MinefieldSensorTypesFLIR
public static MinefieldSensorTypesFLIR unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static MinefieldSensorTypesFLIR unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesLaser.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesLaser.java
index 76b1da2fa5bc1d4be0091b048bbb9194165f672c..aa6d0abf6802495248dcf82bd9c3414178de7b3e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesLaser.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesLaser.java
@@ -66,12 +66,12 @@ public enum MinefieldSensorTypesLaser
public static MinefieldSensorTypesLaser unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static MinefieldSensorTypesLaser unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesMagnetic.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesMagnetic.java
index 85eb33f462f34dc4ad9a6603af7210e6ab85ff14..9b740b38c686480d4a371c47afe7d8c29dc80897 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesMagnetic.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesMagnetic.java
@@ -70,12 +70,12 @@ public enum MinefieldSensorTypesMagnetic
public static MinefieldSensorTypesMagnetic unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static MinefieldSensorTypesMagnetic unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesMultispectral.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesMultispectral.java
index f60eae8359a05fddc80af0e0747233a584d742c5..e4a617034940c43216681327610280009385e896 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesMultispectral.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesMultispectral.java
@@ -64,12 +64,12 @@ public enum MinefieldSensorTypesMultispectral
public static MinefieldSensorTypesMultispectral unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static MinefieldSensorTypesMultispectral unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesOptical.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesOptical.java
index caca72633dbdebf2afe98c3aa01ebfaa786136bc..c4afbacd65b7e817a62a98403603bb2874e70576 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesOptical.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesOptical.java
@@ -86,12 +86,12 @@ public enum MinefieldSensorTypesOptical
public static MinefieldSensorTypesOptical unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static MinefieldSensorTypesOptical unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesPhysical.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesPhysical.java
index bc4e0de31f557a90b53a383fad3bd2c8b70de06b..c85930b8a00ef18ef857b65bf8cc1f36b3d21fb6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesPhysical.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesPhysical.java
@@ -68,12 +68,12 @@ public enum MinefieldSensorTypesPhysical
public static MinefieldSensorTypesPhysical unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static MinefieldSensorTypesPhysical unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesRADAR.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesRADAR.java
index 92260e89604541c6d30577992a47c90a8c7dc1e7..6bb4281fac07ccc8477b1104141bc34690f5dd24 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesRADAR.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesRADAR.java
@@ -74,12 +74,12 @@ public enum MinefieldSensorTypesRADAR
public static MinefieldSensorTypesRADAR unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static MinefieldSensorTypesRADAR unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesSONAR.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesSONAR.java
index ccc99f73bf9761034cfe74b579fcd8471aa3e9e1..3ff2c7dd651e181a7d4dc94902e0d7c049e0c6f9 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesSONAR.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesSONAR.java
@@ -64,12 +64,12 @@ public enum MinefieldSensorTypesSONAR
public static MinefieldSensorTypesSONAR unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static MinefieldSensorTypesSONAR unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldStateProtocolMode.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldStateProtocolMode.java
index e3990794d0494636861822ddd109185aeea4662d..f8615d77a7e8dbfade788678b9af9bff89f16217 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MinefieldStateProtocolMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldStateProtocolMode.java
@@ -73,7 +73,7 @@ public enum MinefieldStateProtocolMode
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static MinefieldStateProtocolMode unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum MinefieldStateProtocolMode
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Mode5IFFMission.java b/src-generated/edu/nps/moves/dis7/enumerations/Mode5IFFMission.java
index 18c9001b8205995d5033e81ae00e0073f50a2b30..ccafa0d8d5369967ee3e415862c12d518d7c3513 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Mode5IFFMission.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Mode5IFFMission.java
@@ -83,7 +83,7 @@ public enum Mode5IFFMission
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Mode5IFFMission unmarshalEnum(ByteBuffer buff) throws Exception
@@ -96,7 +96,7 @@ public enum Mode5IFFMission
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Mode5LevelSelection.java b/src-generated/edu/nps/moves/dis7/enumerations/Mode5LevelSelection.java
index 645c928d5e0d213aff713df70295e634b9cc66d9..dd8f5ba2d753151376e2726c3af05875140d8c64 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Mode5LevelSelection.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Mode5LevelSelection.java
@@ -73,7 +73,7 @@ public enum Mode5LevelSelection
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Mode5LevelSelection unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum Mode5LevelSelection
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Mode5LocationErrors.java b/src-generated/edu/nps/moves/dis7/enumerations/Mode5LocationErrors.java
index 25fecbbd5aa04491984a64dec3c1944c32e2c234..3efb7c532cd6f8c90bdd52a72871a90a08e914a3 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Mode5LocationErrors.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Mode5LocationErrors.java
@@ -73,7 +73,7 @@ public enum Mode5LocationErrors
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Mode5LocationErrors unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum Mode5LocationErrors
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Mode5MessageFormatsStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/Mode5MessageFormatsStatus.java
index 7abec83c3d5d18f1c4ef63cf97bdf899ca00439b..94cd4be007309803cca5d574ad70c03444a79dbf 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Mode5MessageFormatsStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Mode5MessageFormatsStatus.java
@@ -73,7 +73,7 @@ public enum Mode5MessageFormatsStatus
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Mode5MessageFormatsStatus unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum Mode5MessageFormatsStatus
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Mode5PlatformType.java b/src-generated/edu/nps/moves/dis7/enumerations/Mode5PlatformType.java
index 72de434e0fb905099c63d98846b4b768957b3204..df72c926c9fdf701b8e8d5afe49bb44074e4e484 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Mode5PlatformType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Mode5PlatformType.java
@@ -73,7 +73,7 @@ public enum Mode5PlatformType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Mode5PlatformType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum Mode5PlatformType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Mode5Reply.java b/src-generated/edu/nps/moves/dis7/enumerations/Mode5Reply.java
index 63a54ae2e135617a665561c53ef27c31ebf190ad..27bdcf0dc5d3a216b4a04de8ba196c724848266c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Mode5Reply.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Mode5Reply.java
@@ -77,7 +77,7 @@ public enum Mode5Reply
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Mode5Reply unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum Mode5Reply
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Mode5SAltitudeResolution.java b/src-generated/edu/nps/moves/dis7/enumerations/Mode5SAltitudeResolution.java
index 577eb52c70eb8c4f6a32cc42c524ae0570c96a6e..ecd7b62f74b41b738797e42bbf562bd1a459bcb8 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Mode5SAltitudeResolution.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Mode5SAltitudeResolution.java
@@ -73,7 +73,7 @@ public enum Mode5SAltitudeResolution
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Mode5SAltitudeResolution unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum Mode5SAltitudeResolution
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Mode5SquitterType.java b/src-generated/edu/nps/moves/dis7/enumerations/Mode5SquitterType.java
index 4e56a63f8c6ec035d3e18d901dab0e5b145b18b5..2065e1dbc2192a7459d49aaf53062711f464748e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Mode5SquitterType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Mode5SquitterType.java
@@ -75,7 +75,7 @@ public enum Mode5SquitterType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Mode5SquitterType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum Mode5SquitterType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ModeCAltitudeIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/ModeCAltitudeIndicator.java
index 3f2aa4e6daf7a5171049d80321ebe37b29e2efdd..b1309985645b85687f97882734ad6d08f0b08938 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ModeCAltitudeIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ModeCAltitudeIndicator.java
@@ -73,7 +73,7 @@ public enum ModeCAltitudeIndicator
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static ModeCAltitudeIndicator unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum ModeCAltitudeIndicator
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ModeSInterrogatorIdentifierICType.java b/src-generated/edu/nps/moves/dis7/enumerations/ModeSInterrogatorIdentifierICType.java
index fe0a01cf66bc2c530c36e3f46f527ddff39efc3e..bb98733dfad3a4054d86c2fd1f69ece69db0a890 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ModeSInterrogatorIdentifierICType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ModeSInterrogatorIdentifierICType.java
@@ -73,7 +73,7 @@ public enum ModeSInterrogatorIdentifierICType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static ModeSInterrogatorIdentifierICType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum ModeSInterrogatorIdentifierICType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ModeSInterrogatorStatusTransmitState.java b/src-generated/edu/nps/moves/dis7/enumerations/ModeSInterrogatorStatusTransmitState.java
index 6e6dccb7210a1d1a5938051f89d89069c4282da5..f3c55040fb50694f23b755f193d4918da8fe3771 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ModeSInterrogatorStatusTransmitState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ModeSInterrogatorStatusTransmitState.java
@@ -81,7 +81,7 @@ public enum ModeSInterrogatorStatusTransmitState
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static ModeSInterrogatorStatusTransmitState unmarshalEnum(ByteBuffer buff) throws Exception
@@ -94,7 +94,7 @@ public enum ModeSInterrogatorStatusTransmitState
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ModeSSquitterRecordSource.java b/src-generated/edu/nps/moves/dis7/enumerations/ModeSSquitterRecordSource.java
index d4252aacb95e14e3bff2dcd6de19e9bfbc880bcf..d1fcfb9fe1762b3e5e3e60be57b93a2e439c6be7 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ModeSSquitterRecordSource.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ModeSSquitterRecordSource.java
@@ -73,7 +73,7 @@ public enum ModeSSquitterRecordSource
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static ModeSSquitterRecordSource unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum ModeSSquitterRecordSource
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ModeSSquitterType.java b/src-generated/edu/nps/moves/dis7/enumerations/ModeSSquitterType.java
index f9b70362a747f7f439cbfded48518b90745789e7..cfd32d4f90875d796d46e8a4ba1dfc07c33b95f7 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ModeSSquitterType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ModeSSquitterType.java
@@ -77,7 +77,7 @@ public enum ModeSSquitterType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static ModeSSquitterType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum ModeSSquitterType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MunitionCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/MunitionCategory.java
index 9908e57a417bdbf2ba7d908bad442f30b9700525..f37658f61b3a606003ed6526d29ea2ead28aef22 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MunitionCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MunitionCategory.java
@@ -77,7 +77,7 @@ public enum MunitionCategory implements Category
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static MunitionCategory unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum MunitionCategory implements Category
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MunitionDescriptorFuse.java b/src-generated/edu/nps/moves/dis7/enumerations/MunitionDescriptorFuse.java
index 8a224e9cbc9d6423718304f077efe1982274b617..bfd68a3ae89f1d084bb6d0d88cd36ccd38135d71 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MunitionDescriptorFuse.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MunitionDescriptorFuse.java
@@ -276,12 +276,12 @@ public enum MunitionDescriptorFuse
public static MunitionDescriptorFuse unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static MunitionDescriptorFuse unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MunitionDescriptorWarhead.java b/src-generated/edu/nps/moves/dis7/enumerations/MunitionDescriptorWarhead.java
index 6999aa9058c390076ff1ec7b265fff80517b9619..d5c0193edb2dbf4fbf58f63089cffda7af229acf 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MunitionDescriptorWarhead.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MunitionDescriptorWarhead.java
@@ -254,12 +254,12 @@ public enum MunitionDescriptorWarhead
public static MunitionDescriptorWarhead unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static MunitionDescriptorWarhead unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MunitionDomain.java b/src-generated/edu/nps/moves/dis7/enumerations/MunitionDomain.java
index 749b134b9f372f44033f1af70ffc656e1ac8f739..705cbc23038273ba4b51dcd844a1b4f62d3e5da4 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MunitionDomain.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MunitionDomain.java
@@ -95,7 +95,7 @@ public enum MunitionDomain
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static MunitionDomain unmarshalEnum(ByteBuffer buff) throws Exception
@@ -108,7 +108,7 @@ public enum MunitionDomain
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/MunitionExpendableStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/MunitionExpendableStatus.java
index 920500120e010d5f7e358cfd081f85167ebff28b..be0cace5450926f2ae389de7cba4ebcb14b95135 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/MunitionExpendableStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MunitionExpendableStatus.java
@@ -75,7 +75,7 @@ public enum MunitionExpendableStatus
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static MunitionExpendableStatus unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum MunitionExpendableStatus
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/NETIDRecordFrequencyTable.java b/src-generated/edu/nps/moves/dis7/enumerations/NETIDRecordFrequencyTable.java
index 8023fedb86401f34cfe6b9ebfb9426d24a647124..7f82b15d5850223877e1cbb4aff6d2f68342ad0e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/NETIDRecordFrequencyTable.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/NETIDRecordFrequencyTable.java
@@ -77,7 +77,7 @@ public enum NETIDRecordFrequencyTable
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static NETIDRecordFrequencyTable unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum NETIDRecordFrequencyTable
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/NETIDRecordMode.java b/src-generated/edu/nps/moves/dis7/enumerations/NETIDRecordMode.java
index b96eaec08a604232f69a9d398e3ceecb5c57f184..06e2684ed8d5b24338abff8be28152bd95e66fd6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/NETIDRecordMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/NETIDRecordMode.java
@@ -75,7 +75,7 @@ public enum NETIDRecordMode
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static NETIDRecordMode unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum NETIDRecordMode
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/NavigationSource.java b/src-generated/edu/nps/moves/dis7/enumerations/NavigationSource.java
index c10f9c971c02268f2e26569e3eb937e2e82a7727..debeb8243a6ea155cd1e72d751f25d0f4e19021d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/NavigationSource.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/NavigationSource.java
@@ -77,7 +77,7 @@ public enum NavigationSource
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static NavigationSource unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum NavigationSource
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ObjectKind.java b/src-generated/edu/nps/moves/dis7/enumerations/ObjectKind.java
index 1015f20cdf32bbc9f9091d3187931ea6d78a115e..7a836ea2a5647fa3aef221abce84c6ef452825fd 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ObjectKind.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ObjectKind.java
@@ -87,7 +87,7 @@ public enum ObjectKind
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static ObjectKind unmarshalEnum(ByteBuffer buff) throws Exception
@@ -100,7 +100,7 @@ public enum ObjectKind
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/OwnershipStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/OwnershipStatus.java
index 09515585d588437e172b2af9a493d487d1ffc460..5016bcc34ba50f42a6b903bc6db2ba2a5d0a5a79 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/OwnershipStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/OwnershipStatus.java
@@ -83,7 +83,7 @@ public enum OwnershipStatus
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static OwnershipStatus unmarshalEnum(ByteBuffer buff) throws Exception
@@ -96,7 +96,7 @@ public enum OwnershipStatus
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Parachute.java b/src-generated/edu/nps/moves/dis7/enumerations/Parachute.java
index 3c2dfce80c33c32035d70c7209b37a8bca4f3c6a..a1d08f19083f3d4ffa90ab4b67a0ed85eb8ad694 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Parachute.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Parachute.java
@@ -77,7 +77,7 @@ public enum Parachute
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Parachute unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum Parachute
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PhysicalAssociationTypeGroups.java b/src-generated/edu/nps/moves/dis7/enumerations/PhysicalAssociationTypeGroups.java
index 9786922879123205f09d9e6aa1ca0104b87c45b5..f84ec2adfb72e406e5a1b3b27385c2d69693943c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PhysicalAssociationTypeGroups.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PhysicalAssociationTypeGroups.java
@@ -79,7 +79,7 @@ public enum PhysicalAssociationTypeGroups
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PhysicalAssociationTypeGroups unmarshalEnum(ByteBuffer buff) throws Exception
@@ -92,7 +92,7 @@ public enum PhysicalAssociationTypeGroups
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCategory.java
index 6c5812d66cc895409dce772f2744b57ac24e72f0..062d7fc1e82b727cece3bd692d88cb1b976ff0af 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCategory.java
@@ -122,7 +122,7 @@ public enum PlatformAirCategory implements Category
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformAirCategory unmarshalEnum(ByteBuffer buff) throws Exception
@@ -135,7 +135,7 @@ public enum PlatformAirCategory implements Category
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianFixedWingAircraftSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianFixedWingAircraftSubcategories.java
index 6d858aaa70cb93c240a36b749dd90f4ac1219a8c..ff40bd8e1f4d01e71cd6d061b81cad5c4db5af1d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianFixedWingAircraftSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianFixedWingAircraftSubcategories.java
@@ -87,7 +87,7 @@ public enum PlatformAirCivilianFixedWingAircraftSubcategories implements SubCate
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformAirCivilianFixedWingAircraftSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -100,7 +100,7 @@ public enum PlatformAirCivilianFixedWingAircraftSubcategories implements SubCate
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianGliderSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianGliderSubcategories.java
index f2003b53ad860d008afa06e06b02725b970a9036..9d5f77af0c474ac4426abe237a121f0e335a115c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianGliderSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianGliderSubcategories.java
@@ -75,7 +75,7 @@ public enum PlatformAirCivilianGliderSubcategories implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformAirCivilianGliderSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum PlatformAirCivilianGliderSubcategories implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianHelicopterSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianHelicopterSubcategories.java
index 62a599ce7b27b1c0c1a1c57e1c857f5483d1ce52..76d79dd8a73a5c1e31ffa0f5353be3299f5f1a29 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianHelicopterSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianHelicopterSubcategories.java
@@ -85,7 +85,7 @@ public enum PlatformAirCivilianHelicopterSubcategories implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformAirCivilianHelicopterSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -98,7 +98,7 @@ public enum PlatformAirCivilianHelicopterSubcategories implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianLighterthanAirAirshipSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianLighterthanAirAirshipSubcategories.java
index 4b36bd7a9214360ab9cc7d9649d747b73b6cb34a..cceba41745127044c1f1758f85bd05f823088deb 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianLighterthanAirAirshipSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianLighterthanAirAirshipSubcategories.java
@@ -79,7 +79,7 @@ public enum PlatformAirCivilianLighterthanAirAirshipSubcategories implements Sub
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformAirCivilianLighterthanAirAirshipSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -92,7 +92,7 @@ public enum PlatformAirCivilianLighterthanAirAirshipSubcategories implements Sub
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianLighterthanAirBalloonSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianLighterthanAirBalloonSubcategories.java
index 9ee020180ea4934692109c4b7b8796e6c6bf86ac..b63375d2174c395182aa086fc62233180dad5aa5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianLighterthanAirBalloonSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianLighterthanAirBalloonSubcategories.java
@@ -81,7 +81,7 @@ public enum PlatformAirCivilianLighterthanAirBalloonSubcategories implements Sub
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformAirCivilianLighterthanAirBalloonSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -94,7 +94,7 @@ public enum PlatformAirCivilianLighterthanAirBalloonSubcategories implements Sub
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianUltralightNonrigidWingAircraftSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianUltralightNonrigidWingAircraftSubcategories.java
index 69683e30cb57fb465de7b507664c64d78d26ff7b..35b7b5374f5893afa5970bf9e932fe3ed7465346 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianUltralightNonrigidWingAircraftSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianUltralightNonrigidWingAircraftSubcategories.java
@@ -81,7 +81,7 @@ public enum PlatformAirCivilianUltralightNonrigidWingAircraftSubcategories imple
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformAirCivilianUltralightNonrigidWingAircraftSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -94,7 +94,7 @@ public enum PlatformAirCivilianUltralightNonrigidWingAircraftSubcategories imple
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianUltralightRigidWingAircraftSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianUltralightRigidWingAircraftSubcategories.java
index 277c0b1e9c6f96877eb10e51080f34bd6c90e039..e994255decdac4b731e5e5df24264d73fcb87ec1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianUltralightRigidWingAircraftSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianUltralightRigidWingAircraftSubcategories.java
@@ -75,7 +75,7 @@ public enum PlatformAirCivilianUltralightRigidWingAircraftSubcategories implemen
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformAirCivilianUltralightRigidWingAircraftSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum PlatformAirCivilianUltralightRigidWingAircraftSubcategories implemen
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformDomain.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformDomain.java
index d8757a833fccbd180c36c51e6cdc5157ea8f78a3..09e5ae069ef245524e2e6674b5627aca5819af0d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformDomain.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformDomain.java
@@ -81,7 +81,7 @@ public enum PlatformDomain
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformDomain unmarshalEnum(ByteBuffer buff) throws Exception
@@ -94,7 +94,7 @@ public enum PlatformDomain
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandBusSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandBusSubcategories.java
index 2a5f5079731d4c8524970882b16d7984b5cffbf1..f4ef2262e61df3344a035e23788760a9d2fb1148 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandBusSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandBusSubcategories.java
@@ -109,7 +109,7 @@ public enum PlatformLandBusSubcategories
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformLandBusSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -122,7 +122,7 @@ public enum PlatformLandBusSubcategories
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandCarSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandCarSubcategories.java
index 0dd251de5e142fdd1b6c07dfee3b3510c5d8ca6a..4ce3d0f4b60f6406b1a8dadb37b15c26028b2b3f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandCarSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandCarSubcategories.java
@@ -159,7 +159,7 @@ public enum PlatformLandCarSubcategories implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformLandCarSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -172,7 +172,7 @@ public enum PlatformLandCarSubcategories implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandCategory.java
index 9ef84e1d492fdf5503d8f168094173120f2fecfc..b1ae949ccf7c8c1858bf5ddb8b8bd295d46e8f75 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandCategory.java
@@ -167,7 +167,7 @@ public enum PlatformLandCategory implements Category
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformLandCategory unmarshalEnum(ByteBuffer buff) throws Exception
@@ -180,7 +180,7 @@ public enum PlatformLandCategory implements Category
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandConstructionSpecialtyVehicleSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandConstructionSpecialtyVehicleSubcategories.java
index b35770f98c2b331ba2b9e024a1aa595b7c07477f..8ed401c5f87a567d69175c745b7919b246503ea4 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandConstructionSpecialtyVehicleSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandConstructionSpecialtyVehicleSubcategories.java
@@ -183,7 +183,7 @@ public enum PlatformLandConstructionSpecialtyVehicleSubcategories implements Sub
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformLandConstructionSpecialtyVehicleSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -196,7 +196,7 @@ public enum PlatformLandConstructionSpecialtyVehicleSubcategories implements Sub
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandFarmSpecialtyVehicleSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandFarmSpecialtyVehicleSubcategories.java
index f720ce3a81d7005adb95f09f4c0ddf8bfd35ef7d..d84ebf47906c8975fb8d627843f292e4c8bff200 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandFarmSpecialtyVehicleSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandFarmSpecialtyVehicleSubcategories.java
@@ -89,7 +89,7 @@ public enum PlatformLandFarmSpecialtyVehicleSubcategories implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformLandFarmSpecialtyVehicleSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -102,7 +102,7 @@ public enum PlatformLandFarmSpecialtyVehicleSubcategories implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMotorcycleSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMotorcycleSubcategories.java
index 2662019c06ce0ac526d116646b3aa3a10101ed67..8c3971a0154c9f2a6869a6edf73f3cc4ee75422f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMotorcycleSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMotorcycleSubcategories.java
@@ -81,7 +81,7 @@ public enum PlatformLandMotorcycleSubcategories implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformLandMotorcycleSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -94,7 +94,7 @@ public enum PlatformLandMotorcycleSubcategories implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMultipleUnitCargoTruckSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMultipleUnitCargoTruckSubcategories.java
index 4f145232528c1ac97e090606def8613b2eeba012..79666b5b85d3a6a0398c471b675158bf1d29b762 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMultipleUnitCargoTruckSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMultipleUnitCargoTruckSubcategories.java
@@ -77,7 +77,7 @@ public enum PlatformLandMultipleUnitCargoTruckSubcategories implements SubCatego
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformLandMultipleUnitCargoTruckSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum PlatformLandMultipleUnitCargoTruckSubcategories implements SubCatego
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMultipleUnitUtilityEmergencyTruckSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMultipleUnitUtilityEmergencyTruckSubcategories.java
index ff2e214d34619dd2347b18a8ea120d5bca334008..246c6d6624f84f8daec4c7458817e28928c7a2a4 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMultipleUnitUtilityEmergencyTruckSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMultipleUnitUtilityEmergencyTruckSubcategories.java
@@ -75,7 +75,7 @@ public enum PlatformLandMultipleUnitUtilityEmergencyTruckSubcategories implement
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformLandMultipleUnitUtilityEmergencyTruckSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum PlatformLandMultipleUnitUtilityEmergencyTruckSubcategories implement
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandNonmotorizedSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandNonmotorizedSubcategories.java
index 387c5402ea3681c57d84b57af12ec16abdf73e63..7b25b676614cc3ffc003cd1f4321ea33b7cec218 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandNonmotorizedSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandNonmotorizedSubcategories.java
@@ -121,7 +121,7 @@ public enum PlatformLandNonmotorizedSubcategories
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformLandNonmotorizedSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -134,7 +134,7 @@ public enum PlatformLandNonmotorizedSubcategories
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandRecreationalSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandRecreationalSubcategories.java
index 02e8b9201da10b2748be9e4000c47f04edb197b3..2e3325b62ac9c59d1efdcb0a8366bceae930f0b9 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandRecreationalSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandRecreationalSubcategories.java
@@ -101,7 +101,7 @@ public enum PlatformLandRecreationalSubcategories implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformLandRecreationalSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -114,7 +114,7 @@ public enum PlatformLandRecreationalSubcategories implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandSingleUnitCargoTruckSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandSingleUnitCargoTruckSubcategories.java
index 780fad7530f19bbfffe46e654f5a109fdcc663fc..a52003f095698cb4b876d92a6509745affe6f727 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandSingleUnitCargoTruckSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandSingleUnitCargoTruckSubcategories.java
@@ -135,7 +135,7 @@ public enum PlatformLandSingleUnitCargoTruckSubcategories implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformLandSingleUnitCargoTruckSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -148,7 +148,7 @@ public enum PlatformLandSingleUnitCargoTruckSubcategories implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandSingleUnitUtilityEmergencyTruckSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandSingleUnitUtilityEmergencyTruckSubcategories.java
index 97caad8369d22cbc3c65093c7ec4571988ee432e..07841871ddb06c5b3961f92ca6a69c5e0e62d6d7 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandSingleUnitUtilityEmergencyTruckSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandSingleUnitUtilityEmergencyTruckSubcategories.java
@@ -159,7 +159,7 @@ public enum PlatformLandSingleUnitUtilityEmergencyTruckSubcategories implements
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformLandSingleUnitUtilityEmergencyTruckSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -172,7 +172,7 @@ public enum PlatformLandSingleUnitUtilityEmergencyTruckSubcategories implements
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandTrailerSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandTrailerSubcategories.java
index 4ae26f207ce4aa008848e7887fbd2ee572363a4d..c4f089682b17f70b53f582dcdc53332ba95c283b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandTrailerSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandTrailerSubcategories.java
@@ -125,7 +125,7 @@ public enum PlatformLandTrailerSubcategories implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformLandTrailerSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -138,7 +138,7 @@ public enum PlatformLandTrailerSubcategories implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandTrainsSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandTrainsSubcategories.java
index be2bcb4dec464541eeb5c0c21ccf7208d50a7719..4e7d3cd95b8c3d7624565f9d6795bb664a1d456b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandTrainsSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandTrainsSubcategories.java
@@ -87,7 +87,7 @@ public enum PlatformLandTrainsSubcategories implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformLandTrainsSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -100,7 +100,7 @@ public enum PlatformLandTrainsSubcategories implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandUtilityEmergencyCarSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandUtilityEmergencyCarSubcategories.java
index 9a2f1c5f7c5b831b63254ae93cccea6d2a91e5d3..572aa44ad5f532f80c9939cb649bd1aadad0c583 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandUtilityEmergencyCarSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandUtilityEmergencyCarSubcategories.java
@@ -83,7 +83,7 @@ public enum PlatformLandUtilityEmergencyCarSubcategories implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformLandUtilityEmergencyCarSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -96,7 +96,7 @@ public enum PlatformLandUtilityEmergencyCarSubcategories implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSpaceCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSpaceCategory.java
index bdceea1a3310e2c5b8836eb3a95c70a2a99ebc22..766046e3b4fa7f3a9d69aac747e1c05256305ec3 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSpaceCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSpaceCategory.java
@@ -77,7 +77,7 @@ public enum PlatformSpaceCategory implements Category
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformSpaceCategory unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum PlatformSpaceCategory implements Category
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCategory.java
index 1c4665020dfe70b63eebabbee5501ca6b9dbb9c7..a727b6f4f3f192c3f8cf6fc02db9eb9f14553706 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCategory.java
@@ -109,7 +109,7 @@ public enum PlatformSubsurfaceCategory implements Category
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformSubsurfaceCategory unmarshalEnum(ByteBuffer buff) throws Exception
@@ -122,7 +122,7 @@ public enum PlatformSubsurfaceCategory implements Category
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSemiSubmersiblesSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSemiSubmersiblesSubcategories.java
index 6a2583f2e55bc27d6187a79914da4821b2e8e79b..6d42dd3c7acb58e55a2deb0967021b3577bc3bc1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSemiSubmersiblesSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSemiSubmersiblesSubcategories.java
@@ -73,7 +73,7 @@ public enum PlatformSubsurfaceCivilianSemiSubmersiblesSubcategories implements S
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformSubsurfaceCivilianSemiSubmersiblesSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum PlatformSubsurfaceCivilianSemiSubmersiblesSubcategories implements S
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSubmarineSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSubmarineSubcategories.java
index 7d588cb2733bef414715d43c02555367b155577b..03f518b98e4252a9b05e85e804d7b145d48aca8c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSubmarineSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSubmarineSubcategories.java
@@ -73,7 +73,7 @@ public enum PlatformSubsurfaceCivilianSubmarineSubcategories implements SubCateg
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformSubsurfaceCivilianSubmarineSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum PlatformSubsurfaceCivilianSubmarineSubcategories implements SubCateg
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSubmersibleSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSubmersibleSubcategories.java
index 4dc64688d851e833eef9518aa65d0cad544a68ee..2f1081ea9759ba2f024bbd3cb60d3c4c6224575b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSubmersibleSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSubmersibleSubcategories.java
@@ -73,7 +73,7 @@ public enum PlatformSubsurfaceCivilianSubmersibleSubcategories implements SubCat
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformSubsurfaceCivilianSubmersibleSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum PlatformSubsurfaceCivilianSubmersibleSubcategories implements SubCat
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceCategory.java
index ae68fca12ae1d823584aa573cc3e248c50446295..ae9ff314d9a353920353794687e4bb5cbed2ea9a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceCategory.java
@@ -154,7 +154,7 @@ public enum PlatformSurfaceCategory implements Category
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformSurfaceCategory unmarshalEnum(ByteBuffer buff) throws Exception
@@ -167,7 +167,7 @@ public enum PlatformSurfaceCategory implements Category
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceDryCargoShipSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceDryCargoShipSubcategories.java
index f9cb5975640ae792eac19d28aeae995cdb1f5edd..38c1b20981bffbd0df92f0ceb2ba6fe4f5f33ce8 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceDryCargoShipSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceDryCargoShipSubcategories.java
@@ -85,7 +85,7 @@ public enum PlatformSurfaceDryCargoShipSubcategories implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformSurfaceDryCargoShipSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -98,7 +98,7 @@ public enum PlatformSurfaceDryCargoShipSubcategories implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceFishingVesselSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceFishingVesselSubcategories.java
index 59d4492d4029be93f3eb4111e637528eae3930b5..53b51406f420b41c63b3fd43e5704d2bdbacf12d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceFishingVesselSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceFishingVesselSubcategories.java
@@ -81,7 +81,7 @@ public enum PlatformSurfaceFishingVesselSubcategories implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformSurfaceFishingVesselSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -94,7 +94,7 @@ public enum PlatformSurfaceFishingVesselSubcategories implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceOtherVesselsSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceOtherVesselsSubcategories.java
index 4d865ef06292097dc89316b187509624aa6dc58b..2b4fe660b916228c1a0deeccd427835686dfabec 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceOtherVesselsSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceOtherVesselsSubcategories.java
@@ -91,7 +91,7 @@ public enum PlatformSurfaceOtherVesselsSubcategories implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformSurfaceOtherVesselsSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -104,7 +104,7 @@ public enum PlatformSurfaceOtherVesselsSubcategories implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePassengerVesselSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePassengerVesselSubcategories.java
index 932d210a5f24c01fa7154a2e2c08c67995001e0f..5aefbe58c195cba1cb78ea82eb09c9f1d701ac9a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePassengerVesselSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePassengerVesselSubcategories.java
@@ -81,7 +81,7 @@ public enum PlatformSurfacePassengerVesselSubcategories implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformSurfacePassengerVesselSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -94,7 +94,7 @@ public enum PlatformSurfacePassengerVesselSubcategories implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePrivateMotorboatSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePrivateMotorboatSubcategories.java
index a27645ebef516be6eee1cbd701f879914af4ecf5..bea7e0c1bae3f2cedd0ae0cc68eb2d7f6deb6bec 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePrivateMotorboatSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePrivateMotorboatSubcategories.java
@@ -79,7 +79,7 @@ public enum PlatformSurfacePrivateMotorboatSubcategories implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformSurfacePrivateMotorboatSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -92,7 +92,7 @@ public enum PlatformSurfacePrivateMotorboatSubcategories implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePrivateSailboatSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePrivateSailboatSubcategories.java
index cae5bc24d319656a3a0b61b99530486c97149c7f..114322483df139bc9398f1aab37d865b5c121719 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePrivateSailboatSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePrivateSailboatSubcategories.java
@@ -79,7 +79,7 @@ public enum PlatformSurfacePrivateSailboatSubcategories implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformSurfacePrivateSailboatSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -92,7 +92,7 @@ public enum PlatformSurfacePrivateSailboatSubcategories implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceSupportVesselSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceSupportVesselSubcategories.java
index c89c05788e10e9202e802da6af98ba4cc515f052..82cd8b3121dbf11a9bea2460336d97bd8223c9f7 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceSupportVesselSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceSupportVesselSubcategories.java
@@ -81,7 +81,7 @@ public enum PlatformSurfaceSupportVesselSubcategories implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformSurfaceSupportVesselSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -94,7 +94,7 @@ public enum PlatformSurfaceSupportVesselSubcategories implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceTankerSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceTankerSubcategories.java
index ced6b9cbf0d7d121c9bcd6660b42753d666b26f5..afc48efa514c3b1b629b987b820dba81193df079 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceTankerSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceTankerSubcategories.java
@@ -89,7 +89,7 @@ public enum PlatformSurfaceTankerSubcategories implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static PlatformSurfaceTankerSubcategories unmarshalEnum(ByteBuffer buff) throws Exception
@@ -102,7 +102,7 @@ public enum PlatformSurfaceTankerSubcategories implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/RadioCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/RadioCategory.java
index c91388ba96611056f5ac758656e3b1ea5fdb6f57..e91a8cd7a412ef6b0305c64447768c989d082fd6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/RadioCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RadioCategory.java
@@ -153,7 +153,7 @@ public enum RadioCategory implements Category
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static RadioCategory unmarshalEnum(ByteBuffer buff) throws Exception
@@ -166,7 +166,7 @@ public enum RadioCategory implements Category
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/RadioSubcategory.java b/src-generated/edu/nps/moves/dis7/enumerations/RadioSubcategory.java
index ab4bc4e4420bb12d7e0dc5147b2d2ec64cbaa51f..96f401618cb5c212002337c648b6896315298608 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/RadioSubcategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RadioSubcategory.java
@@ -184,12 +184,12 @@ public enum RadioSubcategory implements SubCategory
public static RadioSubcategory unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static RadioSubcategory unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ReceiverReceiverState.java b/src-generated/edu/nps/moves/dis7/enumerations/ReceiverReceiverState.java
index 72cf4a189698a7a0a69b400f9fe4d202ba58841d..f732a92b8c1b211c2d7c78b2c6da272e7f2a8c10 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ReceiverReceiverState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ReceiverReceiverState.java
@@ -68,12 +68,12 @@ public enum ReceiverReceiverState
public static ReceiverReceiverState unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static ReceiverReceiverState unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/RecordQueryREventType.java b/src-generated/edu/nps/moves/dis7/enumerations/RecordQueryREventType.java
index 34799b8b0c2142081fe7e779926f9bbdea323364..0049256b054aaaf47bc934a89dd5aa3d1bbdfcb4 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/RecordQueryREventType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RecordQueryREventType.java
@@ -66,12 +66,12 @@ public enum RecordQueryREventType
public static RecordQueryREventType unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static RecordQueryREventType unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/RecordREventType.java b/src-generated/edu/nps/moves/dis7/enumerations/RecordREventType.java
index 44d2915a214b21b88534aff17218c7dc44bbd6c3..cfc7fab7240a8d07d287a53b7443eca852f4c7e4 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/RecordREventType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RecordREventType.java
@@ -64,12 +64,12 @@ public enum RecordREventType
public static RecordREventType unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static RecordREventType unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/RepairCompleteRepair.java b/src-generated/edu/nps/moves/dis7/enumerations/RepairCompleteRepair.java
index 3711ac93cb0a1f62e5c6a704816b76909144a988..d49d2473931af8f5cf00c557fa6ab54f5a3e8ada 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/RepairCompleteRepair.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RepairCompleteRepair.java
@@ -230,12 +230,12 @@ public enum RepairCompleteRepair
public static RepairCompleteRepair unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static RepairCompleteRepair unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/RepairGroups.java b/src-generated/edu/nps/moves/dis7/enumerations/RepairGroups.java
index 40e93bdbd7f3c08aaa4fd64784a3920213171bfd..c15b3800548288e3aa4b61e36092b3a5f43adceb 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/RepairGroups.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RepairGroups.java
@@ -89,7 +89,7 @@ public enum RepairGroups
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static RepairGroups unmarshalEnum(ByteBuffer buff) throws Exception
@@ -102,7 +102,7 @@ public enum RepairGroups
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/RepairResponseRepairResult.java b/src-generated/edu/nps/moves/dis7/enumerations/RepairResponseRepairResult.java
index 83b31c175fc02cb7621dbb3614bf0a91f11530fa..35f7c494e750576d5d300e6d18c4110e5227be5f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/RepairResponseRepairResult.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RepairResponseRepairResult.java
@@ -79,7 +79,7 @@ public enum RepairResponseRepairResult
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static RepairResponseRepairResult unmarshalEnum(ByteBuffer buff) throws Exception
@@ -92,7 +92,7 @@ public enum RepairResponseRepairResult
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ReplyAmplification.java b/src-generated/edu/nps/moves/dis7/enumerations/ReplyAmplification.java
index d7a515f3efbb442009d84ad0334579fc55a0951c..801fab68fd9b328143574712d469df3b4b49dce8 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ReplyAmplification.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ReplyAmplification.java
@@ -77,7 +77,7 @@ public enum ReplyAmplification
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static ReplyAmplification unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum ReplyAmplification
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/RequiredReliabilityService.java b/src-generated/edu/nps/moves/dis7/enumerations/RequiredReliabilityService.java
index e786debb47fa06b0ee73062604aff9fa170c69ff..daf5d52cdabaecd5ed430cca0e70f4aff3cfe816 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/RequiredReliabilityService.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RequiredReliabilityService.java
@@ -73,7 +73,7 @@ public enum RequiredReliabilityService
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static RequiredReliabilityService unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum RequiredReliabilityService
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/Season.java b/src-generated/edu/nps/moves/dis7/enumerations/Season.java
index e9e991d745c02584ca5fa47d5c1ea2106ac305f9..05972736bee18b9165dc3a11fc1c7f26a0186e3e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/Season.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Season.java
@@ -77,7 +77,7 @@ public enum Season
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static Season unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum Season
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SensorEmitterCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/SensorEmitterCategory.java
index 65c221f8d5b0b195662a5ab63ddec27b706c6ed3..c953a7f21addd0a31d76e8fdfadd3c159977a1d5 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SensorEmitterCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SensorEmitterCategory.java
@@ -103,7 +103,7 @@ public enum SensorEmitterCategory implements Category
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SensorEmitterCategory unmarshalEnum(ByteBuffer buff) throws Exception
@@ -116,7 +116,7 @@ public enum SensorEmitterCategory implements Category
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SensorOnOffStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/SensorOnOffStatus.java
index b2ffeaff4663c7a1d5cdaff340f2e3fcea696cef..452aded8df30210fa57b8d5f42a4112934828086 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SensorOnOffStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SensorOnOffStatus.java
@@ -73,7 +73,7 @@ public enum SensorOnOffStatus
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SensorOnOffStatus unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum SensorOnOffStatus
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SensorRecordSensorTypeOtherActiveSensors.java b/src-generated/edu/nps/moves/dis7/enumerations/SensorRecordSensorTypeOtherActiveSensors.java
index 76cf4b7da0903c0ad884270cf8f60972169141db..b301fc9a5cfa8262c4470f236e4ff70b90c2d5a8 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SensorRecordSensorTypeOtherActiveSensors.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SensorRecordSensorTypeOtherActiveSensors.java
@@ -64,12 +64,12 @@ public enum SensorRecordSensorTypeOtherActiveSensors
public static SensorRecordSensorTypeOtherActiveSensors unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static SensorRecordSensorTypeOtherActiveSensors unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SensorRecordSensorTypePassiveSensors.java b/src-generated/edu/nps/moves/dis7/enumerations/SensorRecordSensorTypePassiveSensors.java
index 5c556bf3cfd7182aa26faa980df45df7d603dbe8..2ab66aaf794816f06ad905d09d53d525de58263e 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SensorRecordSensorTypePassiveSensors.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SensorRecordSensorTypePassiveSensors.java
@@ -152,12 +152,12 @@ public enum SensorRecordSensorTypePassiveSensors
public static SensorRecordSensorTypePassiveSensors unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static SensorRecordSensorTypePassiveSensors unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SensorTypeSource.java b/src-generated/edu/nps/moves/dis7/enumerations/SensorTypeSource.java
index 01a8508aae716fd76a92f776167174adf5edc2b0..66edb6810663f31f0547ffc9788d39e210616e9b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SensorTypeSource.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SensorTypeSource.java
@@ -81,7 +81,7 @@ public enum SensorTypeSource
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SensorTypeSource unmarshalEnum(ByteBuffer buff) throws Exception
@@ -94,7 +94,7 @@ public enum SensorTypeSource
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SeparationVPPreEntityIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/SeparationVPPreEntityIndicator.java
index c2297fc456fe955e67d05f124efb77d19bf9830b..06ac0dedda69da4eaa25e1b94aae0a89d0ed87b6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SeparationVPPreEntityIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SeparationVPPreEntityIndicator.java
@@ -77,7 +77,7 @@ public enum SeparationVPPreEntityIndicator
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SeparationVPPreEntityIndicator unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum SeparationVPPreEntityIndicator
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SeparationVPReasonforSeparation.java b/src-generated/edu/nps/moves/dis7/enumerations/SeparationVPReasonforSeparation.java
index f135efa2b9d7c997e1a8dbee5ced369211b14416..984e3f5d9d8bde9e2e6081246c9502c5da1c1ecf 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SeparationVPReasonforSeparation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SeparationVPReasonforSeparation.java
@@ -75,7 +75,7 @@ public enum SeparationVPReasonforSeparation
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SeparationVPReasonforSeparation unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum SeparationVPReasonforSeparation
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/ServiceRequestServiceTypeRequested.java b/src-generated/edu/nps/moves/dis7/enumerations/ServiceRequestServiceTypeRequested.java
index 81376306325d1380eb6860a61b29cc73d98d319d..efeef6b0fde787e17a8a321999a4255956a73f9c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/ServiceRequestServiceTypeRequested.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ServiceRequestServiceTypeRequested.java
@@ -79,7 +79,7 @@ public enum ServiceRequestServiceTypeRequested
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static ServiceRequestServiceTypeRequested unmarshalEnum(ByteBuffer buff) throws Exception
@@ -92,7 +92,7 @@ public enum ServiceRequestServiceTypeRequested
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SignalEncodingClass.java b/src-generated/edu/nps/moves/dis7/enumerations/SignalEncodingClass.java
index ee85251df27194c7717a7258835e37feba059a72..0ae8f79dd528604efcdc5476a7c44e01a2f98f67 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SignalEncodingClass.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SignalEncodingClass.java
@@ -77,7 +77,7 @@ public enum SignalEncodingClass
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SignalEncodingClass unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum SignalEncodingClass
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SignalEncodingType.java b/src-generated/edu/nps/moves/dis7/enumerations/SignalEncodingType.java
index 1b5bff6ef96f70cce837e7e8f551b2bc5903aade..66f4dc41360aa921831b286d5a657ad3601ee21d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SignalEncodingType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SignalEncodingType.java
@@ -86,12 +86,12 @@ public enum SignalEncodingType
public static SignalEncodingType unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static SignalEncodingType unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SignalTDLType.java b/src-generated/edu/nps/moves/dis7/enumerations/SignalTDLType.java
index b8e49f5486464d3270af1050e9dfa521e4a23a5d..5b712a46fcb985fc0497986807cf743dde7f6892 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SignalTDLType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SignalTDLType.java
@@ -252,12 +252,12 @@ public enum SignalTDLType
public static SignalTDLType unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static SignalTDLType unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SignalUserProtocolIdentificationNumber.java b/src-generated/edu/nps/moves/dis7/enumerations/SignalUserProtocolIdentificationNumber.java
index 8d16786c56e64cf1f24484ec2ed1f391c7b27e67..7b42ccf7efa643820c110ad6c32fcf5062cf98d3 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SignalUserProtocolIdentificationNumber.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SignalUserProtocolIdentificationNumber.java
@@ -130,12 +130,12 @@ public enum SignalUserProtocolIdentificationNumber
public static SignalUserProtocolIdentificationNumber unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static SignalUserProtocolIdentificationNumber unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SpecificDimensionEnumerationsforAirAreaSize.java b/src-generated/edu/nps/moves/dis7/enumerations/SpecificDimensionEnumerationsforAirAreaSize.java
index d2d511835f8f1a1f118e7745df3ee7ee7afbedac..022dc34e07fabfe068be2db0777e006b1f0bbb1a 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SpecificDimensionEnumerationsforAirAreaSize.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SpecificDimensionEnumerationsforAirAreaSize.java
@@ -83,7 +83,7 @@ public enum SpecificDimensionEnumerationsforAirAreaSize
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SpecificDimensionEnumerationsforAirAreaSize unmarshalEnum(ByteBuffer buff) throws Exception
@@ -96,7 +96,7 @@ public enum SpecificDimensionEnumerationsforAirAreaSize
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SpecificDimensionEnumerationsforLandAreaSize.java b/src-generated/edu/nps/moves/dis7/enumerations/SpecificDimensionEnumerationsforLandAreaSize.java
index 9cc598768e889041fc144082717a66836b5543b6..f0aac18eda2cff54f78af3f4165ee585326f5093 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SpecificDimensionEnumerationsforLandAreaSize.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SpecificDimensionEnumerationsforLandAreaSize.java
@@ -83,7 +83,7 @@ public enum SpecificDimensionEnumerationsforLandAreaSize
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SpecificDimensionEnumerationsforLandAreaSize unmarshalEnum(ByteBuffer buff) throws Exception
@@ -96,7 +96,7 @@ public enum SpecificDimensionEnumerationsforLandAreaSize
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SpotChaffStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/SpotChaffStatus.java
index ef76e9110a7eee56c9983930053f7070f52e1e44..004812857d9c6e3786c25229e25e86e1b2b35ea4 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SpotChaffStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SpotChaffStatus.java
@@ -75,7 +75,7 @@ public enum SpotChaffStatus
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SpotChaffStatus unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum SpotChaffStatus
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/StopFreezeReason.java b/src-generated/edu/nps/moves/dis7/enumerations/StopFreezeReason.java
index 4aff54ca5f6144dc1224c2cffe83449c38a8a9cf..8457e30f389a28bf9a60566ea717b59edc1c7613 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/StopFreezeReason.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/StopFreezeReason.java
@@ -87,7 +87,7 @@ public enum StopFreezeReason
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static StopFreezeReason unmarshalEnum(ByteBuffer buff) throws Exception
@@ -100,7 +100,7 @@ public enum StopFreezeReason
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory200Bird.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory200Bird.java
index d2b4f64a796526a4f18a9952d3575ab48c8f3f81..9acdf02c4a6eeb22087cf070a4ff99612e99d1af 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory200Bird.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory200Bird.java
@@ -123,7 +123,7 @@ public enum SubcategoriesforAirCategory200Bird implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SubcategoriesforAirCategory200Bird unmarshalEnum(ByteBuffer buff) throws Exception
@@ -136,7 +136,7 @@ public enum SubcategoriesforAirCategory200Bird implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory201Insect.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory201Insect.java
index ea0e264d9a3184f7e0275a9a349bcf79c8f1a50c..f23151dbf0ff47f268c53b1882dedf2f22190d51 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory201Insect.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory201Insect.java
@@ -87,7 +87,7 @@ public enum SubcategoriesforAirCategory201Insect implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SubcategoriesforAirCategory201Insect unmarshalEnum(ByteBuffer buff) throws Exception
@@ -100,7 +100,7 @@ public enum SubcategoriesforAirCategory201Insect implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory202Mammal.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory202Mammal.java
index c33f1860a85fbaa3cc3e2161e41f3e5af5564bcb..b340f350dc113388a53096020124d0cb63ee102b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory202Mammal.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory202Mammal.java
@@ -75,7 +75,7 @@ public enum SubcategoriesforAirCategory202Mammal implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SubcategoriesforAirCategory202Mammal unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum SubcategoriesforAirCategory202Mammal implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory200Mammal.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory200Mammal.java
index 8d5eda9697be7b0631438fae1e39c569cab7eddf..d0248076f1e31243034a4fdc277ca09f46833067 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory200Mammal.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory200Mammal.java
@@ -129,7 +129,7 @@ public enum SubcategoriesforLandCategory200Mammal implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SubcategoriesforLandCategory200Mammal unmarshalEnum(ByteBuffer buff) throws Exception
@@ -142,7 +142,7 @@ public enum SubcategoriesforLandCategory200Mammal implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory201Reptile.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory201Reptile.java
index 961b0db26fd132330cf7f5f3bb8e7996582287df..959a2eaeba5bccf57fa76ab6f431493ec476b988 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory201Reptile.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory201Reptile.java
@@ -115,7 +115,7 @@ public enum SubcategoriesforLandCategory201Reptile implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SubcategoriesforLandCategory201Reptile unmarshalEnum(ByteBuffer buff) throws Exception
@@ -128,7 +128,7 @@ public enum SubcategoriesforLandCategory201Reptile implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory202Amphibian.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory202Amphibian.java
index 2c2b95cf355adf639e70c2574a88684b093c4d44..0c919fce594d9102d4319ab4d5c2d9b175552468 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory202Amphibian.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory202Amphibian.java
@@ -77,7 +77,7 @@ public enum SubcategoriesforLandCategory202Amphibian implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SubcategoriesforLandCategory202Amphibian unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum SubcategoriesforLandCategory202Amphibian implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory203Insect.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory203Insect.java
index 7492b6f9b4e5f7e37d4c764cd4a23fb14c8f5ff7..2faa3cb7f51fc88a5e442f4bd85aa18357e4af5b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory203Insect.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory203Insect.java
@@ -83,7 +83,7 @@ public enum SubcategoriesforLandCategory203Insect implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SubcategoriesforLandCategory203Insect unmarshalEnum(ByteBuffer buff) throws Exception
@@ -96,7 +96,7 @@ public enum SubcategoriesforLandCategory203Insect implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory204Arachnid.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory204Arachnid.java
index 0b3520090fce86f70e5f57868b22ba8aafc24550..c1131895dcf41a5603f3c973e178c7ca05fc1184 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory204Arachnid.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory204Arachnid.java
@@ -79,7 +79,7 @@ public enum SubcategoriesforLandCategory204Arachnid implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SubcategoriesforLandCategory204Arachnid unmarshalEnum(ByteBuffer buff) throws Exception
@@ -92,7 +92,7 @@ public enum SubcategoriesforLandCategory204Arachnid implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory205Mollusk.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory205Mollusk.java
index dc2c311d6d7903215a758f5c7997b98aba9150a0..9676f7fd54b2546fbffd34a78b50272ade4793e1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory205Mollusk.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory205Mollusk.java
@@ -73,7 +73,7 @@ public enum SubcategoriesforLandCategory205Mollusk implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SubcategoriesforLandCategory205Mollusk unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum SubcategoriesforLandCategory205Mollusk implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory206Marsupial.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory206Marsupial.java
index ad086933cc4b48b9d708b95105383114225a3d2c..f1fd780c108ff85e990c0888c40923c75d74da10 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory206Marsupial.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory206Marsupial.java
@@ -95,7 +95,7 @@ public enum SubcategoriesforLandCategory206Marsupial
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SubcategoriesforLandCategory206Marsupial unmarshalEnum(ByteBuffer buff) throws Exception
@@ -108,7 +108,7 @@ public enum SubcategoriesforLandCategory206Marsupial
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory200Fish.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory200Fish.java
index 0f8c98c6514211d65929d58d99465595e608756a..771df4a0cbd3ff7d8bc26a614f6aab0cadfeda88 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory200Fish.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory200Fish.java
@@ -123,7 +123,7 @@ public enum SubcategoriesforSubsurfaceCategory200Fish implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SubcategoriesforSubsurfaceCategory200Fish unmarshalEnum(ByteBuffer buff) throws Exception
@@ -136,7 +136,7 @@ public enum SubcategoriesforSubsurfaceCategory200Fish implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory201Mammal.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory201Mammal.java
index 0ad746b9905e72071032ff0eb4add7caad4124b8..04b38fcb9b802c343e3f476d8e186693923cbf73 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory201Mammal.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory201Mammal.java
@@ -187,7 +187,7 @@ public enum SubcategoriesforSubsurfaceCategory201Mammal implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SubcategoriesforSubsurfaceCategory201Mammal unmarshalEnum(ByteBuffer buff) throws Exception
@@ -200,7 +200,7 @@ public enum SubcategoriesforSubsurfaceCategory201Mammal implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory202Mollusk.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory202Mollusk.java
index 7d406d14fb143f31bbaae15061b3b421b76cbc33..c080a87c2dbde40daad1803df80b79007e6e5161 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory202Mollusk.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory202Mollusk.java
@@ -87,7 +87,7 @@ public enum SubcategoriesforSubsurfaceCategory202Mollusk implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SubcategoriesforSubsurfaceCategory202Mollusk unmarshalEnum(ByteBuffer buff) throws Exception
@@ -100,7 +100,7 @@ public enum SubcategoriesforSubsurfaceCategory202Mollusk implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory203Crustacean.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory203Crustacean.java
index 5f9d7c1a120c746870e5ee2515bf5e793921ac0b..9bdb672f33dbcd483afad822bbcf95f17ed3c4d8 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory203Crustacean.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory203Crustacean.java
@@ -79,7 +79,7 @@ public enum SubcategoriesforSubsurfaceCategory203Crustacean implements SubCatego
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SubcategoriesforSubsurfaceCategory203Crustacean unmarshalEnum(ByteBuffer buff) throws Exception
@@ -92,7 +92,7 @@ public enum SubcategoriesforSubsurfaceCategory203Crustacean implements SubCatego
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory204Insect.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory204Insect.java
index 82b38a9871ebaffc950dde063824f10da9134bee..85d740aff2c6915b1d583ca3067b5e72c0f1d7bf 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory204Insect.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory204Insect.java
@@ -73,7 +73,7 @@ public enum SubcategoriesforSubsurfaceCategory204Insect implements SubCategory
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SubcategoriesforSubsurfaceCategory204Insect unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum SubcategoriesforSubsurfaceCategory204Insect implements SubCategory
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SupplyDomain.java b/src-generated/edu/nps/moves/dis7/enumerations/SupplyDomain.java
index 2652519a13c0ad68057def8749f5e6cebd797151..817b4ba301f7c77eea3420b11444a2d7be6613f6 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SupplyDomain.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SupplyDomain.java
@@ -95,7 +95,7 @@ public enum SupplyDomain
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SupplyDomain unmarshalEnum(ByteBuffer buff) throws Exception
@@ -108,7 +108,7 @@ public enum SupplyDomain
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SupplyFuelType.java b/src-generated/edu/nps/moves/dis7/enumerations/SupplyFuelType.java
index efc637f75475970405bf0bd545dad4294c2a2f0a..03eead2d4335b787b2bce75cbed627207e976f28 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SupplyFuelType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SupplyFuelType.java
@@ -93,7 +93,7 @@ public enum SupplyFuelType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SupplyFuelType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -106,7 +106,7 @@ public enum SupplyFuelType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/SurveillanceStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/SurveillanceStatus.java
index 03b0b718c160141c8571db8aacd5fd88c43e06c9..8ce4c313ecbab3da7f61f98634aa54c2942f76b1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/SurveillanceStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SurveillanceStatus.java
@@ -77,7 +77,7 @@ public enum SurveillanceStatus
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static SurveillanceStatus unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum SurveillanceStatus
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TCASACASBasicAdvancedIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/TCASACASBasicAdvancedIndicator.java
index 0d3c2b3fd04bd72473488499573d0b9f590aebd9..35e9e3277ba27c13e49eb286293cf504e7ba19bd 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TCASACASBasicAdvancedIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TCASACASBasicAdvancedIndicator.java
@@ -73,7 +73,7 @@ public enum TCASACASBasicAdvancedIndicator
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static TCASACASBasicAdvancedIndicator unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum TCASACASBasicAdvancedIndicator
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TCASACASIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/TCASACASIndicator.java
index c72c7cf5be0cb2b7e3334615c8e5ec53e594697d..d5fecbd3dc301f0fc4468549750b60168582b8b1 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TCASACASIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TCASACASIndicator.java
@@ -73,7 +73,7 @@ public enum TCASACASIndicator
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static TCASACASIndicator unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum TCASACASIndicator
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TCASACASSoftwareVersion.java b/src-generated/edu/nps/moves/dis7/enumerations/TCASACASSoftwareVersion.java
index 84c95d5b6328f24619d1edd6ef90c6ad1659cf15..83c80137b33eafa8c3c12d3492b2fbce369fd981 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TCASACASSoftwareVersion.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TCASACASSoftwareVersion.java
@@ -75,7 +75,7 @@ public enum TCASACASSoftwareVersion
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static TCASACASSoftwareVersion unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum TCASACASSoftwareVersion
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TCASACASType.java b/src-generated/edu/nps/moves/dis7/enumerations/TCASACASType.java
index dc55209c78eefb2d632b9172621fcb53711cfb45..90a7fd54c94ac7ae5c490632d22376258a855b37 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TCASACASType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TCASACASType.java
@@ -75,7 +75,7 @@ public enum TCASACASType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static TCASACASType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum TCASACASType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TCASIIIType.java b/src-generated/edu/nps/moves/dis7/enumerations/TCASIIIType.java
index add821ba908c829e297ab73dc7608555e49441a6..42bc973948f39045fe9d3607783152924e145b24 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TCASIIIType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TCASIIIType.java
@@ -73,7 +73,7 @@ public enum TCASIIIType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static TCASIIIType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum TCASIIIType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TILinkType.java b/src-generated/edu/nps/moves/dis7/enumerations/TILinkType.java
index 949ac105ad759294b952566a6a1f5bd3a04e880e..f33c907395d3204523988627d6cd78f1fd43f1bb 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TILinkType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TILinkType.java
@@ -88,12 +88,12 @@ public enum TILinkType
public static TILinkType unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static TILinkType unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TimeTypeSource.java b/src-generated/edu/nps/moves/dis7/enumerations/TimeTypeSource.java
index 02228952c1c49ca101a6094a56e3a0bcf46b4e9c..e388e5ca4cc898d7331986de1e71f771624b4b89 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TimeTypeSource.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TimeTypeSource.java
@@ -75,7 +75,7 @@ public enum TimeTypeSource
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static TimeTypeSource unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum TimeTypeSource
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransferControlTransferType.java b/src-generated/edu/nps/moves/dis7/enumerations/TransferControlTransferType.java
index 7adae8673196be89ce22879f9a29f16ce28420ab..311b1bc2f1fcde0b8fb4a2eb93b4220dec320331 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransferControlTransferType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransferControlTransferType.java
@@ -91,7 +91,7 @@ public enum TransferControlTransferType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static TransferControlTransferType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -104,7 +104,7 @@ public enum TransferControlTransferType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmissionIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmissionIndicator.java
index 8e4d68e193769daa4ef836aec35db17e891bf19a..ac7aebdc7a26199566eb64c53366719794ad1033 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmissionIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmissionIndicator.java
@@ -77,7 +77,7 @@ public enum TransmissionIndicator
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static TransmissionIndicator unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum TransmissionIndicator
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterAntennaPatternReferenceSystem.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterAntennaPatternReferenceSystem.java
index e7ea12b9d52450777ef6e0a43f1ae2b360aa2436..7aaa98065f7d50a0d20e0f5ca9130d3da5397d09 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterAntennaPatternReferenceSystem.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterAntennaPatternReferenceSystem.java
@@ -73,7 +73,7 @@ public enum TransmitterAntennaPatternReferenceSystem
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static TransmitterAntennaPatternReferenceSystem unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum TransmitterAntennaPatternReferenceSystem
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterAntennaPatternType.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterAntennaPatternType.java
index 6a053f70c6010e26d47e8b978aa71bbdf307b37d..e265bef3d6b67abb3aa293d661d277ba497dfb93 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterAntennaPatternType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterAntennaPatternType.java
@@ -72,12 +72,12 @@ public enum TransmitterAntennaPatternType
public static TransmitterAntennaPatternType unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static TransmitterAntennaPatternType unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterCryptoSystem.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterCryptoSystem.java
index 00e9c204bef2ef9c5e35eda93c8ac34e6d3ac58c..c8923ce9ad2d0b14cb5948639579cef2a997b43c 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterCryptoSystem.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterCryptoSystem.java
@@ -90,12 +90,12 @@ public enum TransmitterCryptoSystem
public static TransmitterCryptoSystem unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static TransmitterCryptoSystem unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAmplitudeModulation.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAmplitudeModulation.java
index 02de21f04050e589648851f156b61f8b65dc32e2..196d6be84dba589587c1e9afe1bc6470dd215a93 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAmplitudeModulation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAmplitudeModulation.java
@@ -84,12 +84,12 @@ public enum TransmitterDetailAmplitudeModulation
public static TransmitterDetailAmplitudeModulation unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static TransmitterDetailAmplitudeModulation unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAmplitudeandAngleModulation.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAmplitudeandAngleModulation.java
index 16d8167a0d245a8c0834e837b12daf7caedccc7e..3776b0c67288603e7bac746b65c90fa0efc4d00f 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAmplitudeandAngleModulation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAmplitudeandAngleModulation.java
@@ -66,12 +66,12 @@ public enum TransmitterDetailAmplitudeandAngleModulation
public static TransmitterDetailAmplitudeandAngleModulation unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static TransmitterDetailAmplitudeandAngleModulation unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAnglemodulation.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAnglemodulation.java
index 54c90edd46b460f6a8c2bde30fc9f0caf9a850bd..c3a64e20a1afb46b5edd29fa4f0eeb97013d73bc 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAnglemodulation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAnglemodulation.java
@@ -70,12 +70,12 @@ public enum TransmitterDetailAnglemodulation
public static TransmitterDetailAnglemodulation unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static TransmitterDetailAnglemodulation unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailCarrierPhaseShiftModulation.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailCarrierPhaseShiftModulation.java
index c1b2bc7810cbc3e14f8b4b82dd05b2cbdf215682..16e5275d782f9292a9919ba4067e06cf4fc0c192 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailCarrierPhaseShiftModulation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailCarrierPhaseShiftModulation.java
@@ -64,12 +64,12 @@ public enum TransmitterDetailCarrierPhaseShiftModulation
public static TransmitterDetailCarrierPhaseShiftModulation unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static TransmitterDetailCarrierPhaseShiftModulation unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailCombinationModulation.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailCombinationModulation.java
index fc16c786a2ff7e466c473896578c0b00aad4fb77..bb84c193d9ded4bea57aeb92b63bb4bdf8ec5a5d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailCombinationModulation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailCombinationModulation.java
@@ -66,12 +66,12 @@ public enum TransmitterDetailCombinationModulation
public static TransmitterDetailCombinationModulation unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static TransmitterDetailCombinationModulation unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailPulseModulation.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailPulseModulation.java
index 5f4b074379ea937b9ca1176c9eea0ba91cd38d14..6e46dcb8acbaac90f681277447a30477efec794b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailPulseModulation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailPulseModulation.java
@@ -70,12 +70,12 @@ public enum TransmitterDetailPulseModulation
public static TransmitterDetailPulseModulation unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static TransmitterDetailPulseModulation unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailSATCOMModulation.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailSATCOMModulation.java
index 9d4c5e73e8d9b32242f157d392544d110f15cfd3..baba458bcaf9f2c779b6144ea044d342ecb84e53 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailSATCOMModulation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailSATCOMModulation.java
@@ -66,12 +66,12 @@ public enum TransmitterDetailSATCOMModulation
public static TransmitterDetailSATCOMModulation unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static TransmitterDetailSATCOMModulation unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailUnmodulatedModulation.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailUnmodulatedModulation.java
index 824fbe1a2083a8164776f78ab427110f1a772256..86a2ce7dcbe2328d43213801e0772939aef7360d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailUnmodulatedModulation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailUnmodulatedModulation.java
@@ -66,12 +66,12 @@ public enum TransmitterDetailUnmodulatedModulation
public static TransmitterDetailUnmodulatedModulation unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static TransmitterDetailUnmodulatedModulation unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterInputSource.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterInputSource.java
index b9d67d5bd33a23cfaf66f3042b46390fd5bb4ea0..dbf8511e1be220ae1c8fbd63518dfadf3527d7ad 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterInputSource.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterInputSource.java
@@ -99,7 +99,7 @@ public enum TransmitterInputSource
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static TransmitterInputSource unmarshalEnum(ByteBuffer buff) throws Exception
@@ -112,7 +112,7 @@ public enum TransmitterInputSource
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterMajorModulation.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterMajorModulation.java
index cd3f22616d25dee68cbdd12d549bbc4e52dd98aa..efa97cb10a6d8ae96f6f2b274def0af3a7daac0d 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterMajorModulation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterMajorModulation.java
@@ -72,12 +72,12 @@ public enum TransmitterMajorModulation
public static TransmitterMajorModulation unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static TransmitterMajorModulation unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterModulationTypeSystem.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterModulationTypeSystem.java
index c81ef5ffda2ad54a61f51ad8de9ba18d49ec9106..8b5c7197f5a922e447b2956766c1c711bb5011f4 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterModulationTypeSystem.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterModulationTypeSystem.java
@@ -90,12 +90,12 @@ public enum TransmitterModulationTypeSystem
public static TransmitterModulationTypeSystem unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static TransmitterModulationTypeSystem unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterTransmitState.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterTransmitState.java
index 45e1d60797d6d0e0d3c88b0a8ca8b2ea4e8a7223..6e446344544186908db277873d6ca9b372be9814 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransmitterTransmitState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterTransmitState.java
@@ -75,7 +75,7 @@ public enum TransmitterTransmitState
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static TransmitterTransmitState unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum TransmitterTransmitState
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TransponderInterrogatorIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/TransponderInterrogatorIndicator.java
index 493dd169209125f052f01ff96a29539528155d4d..6f5573cee50d453ca14e84a9f716ad73835f5b70 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TransponderInterrogatorIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransponderInterrogatorIndicator.java
@@ -73,7 +73,7 @@ public enum TransponderInterrogatorIndicator
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static TransponderInterrogatorIndicator unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum TransponderInterrogatorIndicator
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/TurnRateSource.java b/src-generated/edu/nps/moves/dis7/enumerations/TurnRateSource.java
index 79303f5c791ebc7cc7423621c8c32996a34c0f67..c20f96cba5d535b6bb387f96df47da919d7f5efd 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/TurnRateSource.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TurnRateSource.java
@@ -75,7 +75,7 @@ public enum TurnRateSource
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static TurnRateSource unmarshalEnum(ByteBuffer buff) throws Exception
@@ -88,7 +88,7 @@ public enum TurnRateSource
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/UAAcousticEmitterSystemFunction.java b/src-generated/edu/nps/moves/dis7/enumerations/UAAcousticEmitterSystemFunction.java
index 7b37001460990f3353950704306f259a9a88400d..f69ee881763154df9de984322bedfc90b2fa0d33 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/UAAcousticEmitterSystemFunction.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/UAAcousticEmitterSystemFunction.java
@@ -79,7 +79,7 @@ public enum UAAcousticEmitterSystemFunction
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static UAAcousticEmitterSystemFunction unmarshalEnum(ByteBuffer buff) throws Exception
@@ -92,7 +92,7 @@ public enum UAAcousticEmitterSystemFunction
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/UAAcousticSystemName.java b/src-generated/edu/nps/moves/dis7/enumerations/UAAcousticSystemName.java
index b06ae652e6160f53eef4305372f0d073ffa5973a..b3be375778576fb8d3172550499ff0acff9a2f85 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/UAAcousticSystemName.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/UAAcousticSystemName.java
@@ -82,12 +82,12 @@ public enum UAAcousticSystemName
public static UAAcousticSystemName unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static UAAcousticSystemName unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/UAActiveEmissionParameterIndex.java b/src-generated/edu/nps/moves/dis7/enumerations/UAActiveEmissionParameterIndex.java
index eafe90f6e070f985703cbaa18ab7ecd6f655d8e4..9205a1f13ce9680e5c6796358cd1cd90a8197cab 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/UAActiveEmissionParameterIndex.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/UAActiveEmissionParameterIndex.java
@@ -64,12 +64,12 @@ public enum UAActiveEmissionParameterIndex
public static UAActiveEmissionParameterIndex unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static UAActiveEmissionParameterIndex unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/UAAdditionalPassiveActivityParameterIndex.java b/src-generated/edu/nps/moves/dis7/enumerations/UAAdditionalPassiveActivityParameterIndex.java
index 599a03654cfbeffd2bd4c42a2ef174187760dfc4..56270e3167faef6900e4cd68af22a0873406e0e0 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/UAAdditionalPassiveActivityParameterIndex.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/UAAdditionalPassiveActivityParameterIndex.java
@@ -64,12 +64,12 @@ public enum UAAdditionalPassiveActivityParameterIndex
public static UAAdditionalPassiveActivityParameterIndex unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static UAAdditionalPassiveActivityParameterIndex unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/UAPassiveParameterIndex.java b/src-generated/edu/nps/moves/dis7/enumerations/UAPassiveParameterIndex.java
index 633e5752af7ee12396776d9757394539ba605b39..2f5160628ed2f78be2dc3d97d1884885f3af5246 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/UAPassiveParameterIndex.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/UAPassiveParameterIndex.java
@@ -64,12 +64,12 @@ public enum UAPassiveParameterIndex
public static UAPassiveParameterIndex unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static UAPassiveParameterIndex unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/UAPropulsionPlantConfigurationConfiguration.java b/src-generated/edu/nps/moves/dis7/enumerations/UAPropulsionPlantConfigurationConfiguration.java
index 881986d7e1cb81743db7e51866e81da62d47e595..9bc958cbf677b8845e48c29d348e0559dd1134b0 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/UAPropulsionPlantConfigurationConfiguration.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/UAPropulsionPlantConfigurationConfiguration.java
@@ -83,7 +83,7 @@ public enum UAPropulsionPlantConfigurationConfiguration
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static UAPropulsionPlantConfigurationConfiguration unmarshalEnum(ByteBuffer buff) throws Exception
@@ -96,7 +96,7 @@ public enum UAPropulsionPlantConfigurationConfiguration
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/UAScanPattern.java b/src-generated/edu/nps/moves/dis7/enumerations/UAScanPattern.java
index b20e96dfc8bb24566e254be3eea6baac7370c2e3..9ae66b4d5da6f79ef903063c9611f2a06701be0b 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/UAScanPattern.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/UAScanPattern.java
@@ -74,12 +74,12 @@ public enum UAScanPattern
public static UAScanPattern unmarshalEnum (DataInputStream dis) throws Exception
{
- return getEnumForValue((int)dis.readUnsignedShort());
+ return getEnumForValue(dis.readUnsignedShort());
}
public static UAScanPattern unmarshalEnum (ByteBuffer buff) throws Exception
{
- return getEnumForValue((int)buff.getShort());
+ return getEnumForValue(buff.getShort());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/UAStateChangeUpdateIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/UAStateChangeUpdateIndicator.java
index db1c0965c1c9aec5e7f05c28c125462e48641a25..102e9fb88a56de86dd84c6bcfb3ca8672f61e370 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/UAStateChangeUpdateIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/UAStateChangeUpdateIndicator.java
@@ -73,7 +73,7 @@ public enum UAStateChangeUpdateIndicator
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static UAStateChangeUpdateIndicator unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum UAStateChangeUpdateIndicator
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/VariableParameterRecordType.java b/src-generated/edu/nps/moves/dis7/enumerations/VariableParameterRecordType.java
index 8c9245d6eeb66daab5c524f3434efe8befd01eee..225a03231e5e24b720318f076f5df30768c87c61 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/VariableParameterRecordType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/VariableParameterRecordType.java
@@ -79,7 +79,7 @@ public enum VariableParameterRecordType
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static VariableParameterRecordType unmarshalEnum(ByteBuffer buff) throws Exception
@@ -92,7 +92,7 @@ public enum VariableParameterRecordType
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/VariantsforAirCategory200Bird.java b/src-generated/edu/nps/moves/dis7/enumerations/VariantsforAirCategory200Bird.java
index 78a5a688bbe3b36e55e4a1ecf2aa450c846211bb..9f606e541d839143b985a734f45bd6a50cfcac87 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/VariantsforAirCategory200Bird.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/VariantsforAirCategory200Bird.java
@@ -77,7 +77,7 @@ public enum VariantsforAirCategory200Bird
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static VariantsforAirCategory200Bird unmarshalEnum(ByteBuffer buff) throws Exception
@@ -90,7 +90,7 @@ public enum VariantsforAirCategory200Bird
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/VariantsforLandCategoriesReptilesAmphibiansInsectsandArachnids.java b/src-generated/edu/nps/moves/dis7/enumerations/VariantsforLandCategoriesReptilesAmphibiansInsectsandArachnids.java
index 84804620e8873577a73812d37e95d08553185cd4..45dcd28fda03c4efa5aea85c878a9bb16018d549 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/VariantsforLandCategoriesReptilesAmphibiansInsectsandArachnids.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/VariantsforLandCategoriesReptilesAmphibiansInsectsandArachnids.java
@@ -79,7 +79,7 @@ public enum VariantsforLandCategoriesReptilesAmphibiansInsectsandArachnids
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static VariantsforLandCategoriesReptilesAmphibiansInsectsandArachnids unmarshalEnum(ByteBuffer buff) throws Exception
@@ -92,7 +92,7 @@ public enum VariantsforLandCategoriesReptilesAmphibiansInsectsandArachnids
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/VariantsforSubsurfaceCategory201Mammal.java b/src-generated/edu/nps/moves/dis7/enumerations/VariantsforSubsurfaceCategory201Mammal.java
index 6e2b51c91ba151f4ad9894779df7e7662893769f..1712304c6cff63393b83bea849aa2fd9da726886 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/VariantsforSubsurfaceCategory201Mammal.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/VariantsforSubsurfaceCategory201Mammal.java
@@ -73,7 +73,7 @@ public enum VariantsforSubsurfaceCategory201Mammal
showError(ex);
} */
- return getEnumForValue((int)dis.readByte());
+ return getEnumForValue(dis.readByte());
}
public static VariantsforSubsurfaceCategory201Mammal unmarshalEnum(ByteBuffer buff) throws Exception
@@ -86,7 +86,7 @@ public enum VariantsforSubsurfaceCategory201Mammal
showError(ex);
}
*/
- return getEnumForValue((int)buff.get());
+ return getEnumForValue(buff.get());
}
public int getMarshalledSize()