diff --git a/build.xml b/build.xml
index 1d1763cc5fe10330f832c8321f42fe703fa8b764..35c6b420c81efbf8623678a935ca158be0e95229 100644
--- a/build.xml
+++ b/build.xml
@@ -70,4 +70,34 @@
nbproject/build-impl.xml file.
-->
+ <target name="jar-javadoc">
+ <jar destfile="${basedir}/dist/open-dis7-javadoc.jar" basedir="${basedir}/dist/javadoc">
+ <manifest>
+ <attribute name="Built-By" value="open-dis-7-java"/>
+ <attribute name="Specification-Title" value="DIS 7 Javadoc"/>
+ <attribute name="Specification-Version" value="7.0"/>
+ <attribute name="Specification-Vendor" value="Naval Postgraduate School"/>
+ <attribute name="Implementation-Title" value="edu.nps.moves.dis7"/>
+ <attribute name="Implementation-Version" value="build01"/>
+ <attribute name="Implementation-Vendor" value="Naval Postgraduate School"/>
+ </manifest>
+ </jar>
+ <delete dir="${basedir}/dist/javadoc"/>
+ </target>
+
+ <target name="jar-source">
+ <jar destfile="${basedir}/dist/open-dis7-source.jar">
+ <fileset dir="${basedir}/src" includes="**/*.java"/>
+ <fileset dir="${basedir}/src-generated" includes="**/*.java"/>
+ <manifest>
+ <attribute name="Built-By" value="open-dis-7-java"/>
+ <attribute name="Specification-Title" value="DIS 7 Source"/>
+ <attribute name="Specification-Version" value="7.0"/>
+ <attribute name="Specification-Vendor" value="Naval Postgraduate School"/>
+ <attribute name="Implementation-Title" value="edu.nps.moves.dis7"/>
+ <attribute name="Implementation-Version" value="build01"/>
+ <attribute name="Implementation-Vendor" value="Naval Postgraduate School"/>
+ </manifest>
+ </jar>
+ </target>
</project>
diff --git a/releasejars/open-dis7-entities-all.jar b/entityjars/open-dis7-entities-all.jar
similarity index 63%
rename from releasejars/open-dis7-entities-all.jar
rename to entityjars/open-dis7-entities-all.jar
index 14688821875525c998a41190afd4c43044ff454a..e22634a6962465a1b821d21bd0e5bca390b7e2a0 100644
Binary files a/releasejars/open-dis7-entities-all.jar and b/entityjars/open-dis7-entities-all.jar differ
diff --git a/entityjars/open-dis7-entities-chn.jar b/entityjars/open-dis7-entities-chn.jar
new file mode 100644
index 0000000000000000000000000000000000000000..c009309b0a3a2f623816b0c6b3ddbfd3080edc90
Binary files /dev/null and b/entityjars/open-dis7-entities-chn.jar differ
diff --git a/entityjars/open-dis7-entities-deu.jar b/entityjars/open-dis7-entities-deu.jar
new file mode 100644
index 0000000000000000000000000000000000000000..125ee9341cf22f189fe5aaacebb0627b5def762f
Binary files /dev/null and b/entityjars/open-dis7-entities-deu.jar differ
diff --git a/entityjars/open-dis7-entities-javadoc.jar b/entityjars/open-dis7-entities-javadoc.jar
new file mode 100644
index 0000000000000000000000000000000000000000..96720f08b0d9186a3580e4de8832ad3222797c5c
Binary files /dev/null and b/entityjars/open-dis7-entities-javadoc.jar differ
diff --git a/entityjars/open-dis7-entities-nato.jar b/entityjars/open-dis7-entities-nato.jar
new file mode 100644
index 0000000000000000000000000000000000000000..e3ed2094ee34a82dd1849661ae456982c2bbd96d
Binary files /dev/null and b/entityjars/open-dis7-entities-nato.jar differ
diff --git a/entityjars/open-dis7-entities-rus.jar b/entityjars/open-dis7-entities-rus.jar
new file mode 100644
index 0000000000000000000000000000000000000000..fb475780c2e767508bb4cd216f234e717d57401e
Binary files /dev/null and b/entityjars/open-dis7-entities-rus.jar differ
diff --git a/entityjars/open-dis7-entities-usa-air.jar b/entityjars/open-dis7-entities-usa-air.jar
new file mode 100644
index 0000000000000000000000000000000000000000..a2149fb22cb3517763f7588499d929837605ea2b
Binary files /dev/null and b/entityjars/open-dis7-entities-usa-air.jar differ
diff --git a/entityjars/open-dis7-entities-usa-all.jar b/entityjars/open-dis7-entities-usa-all.jar
new file mode 100644
index 0000000000000000000000000000000000000000..cd3208cfec16364cd59cc9c6d54f52551a241af1
Binary files /dev/null and b/entityjars/open-dis7-entities-usa-all.jar differ
diff --git a/entityjars/open-dis7-entities-usa-land.jar b/entityjars/open-dis7-entities-usa-land.jar
new file mode 100644
index 0000000000000000000000000000000000000000..c93887fa5c81684257c4d99e3ba5033a3d7d2d59
Binary files /dev/null and b/entityjars/open-dis7-entities-usa-land.jar differ
diff --git a/entityjars/open-dis7-entities-usa-munitions.jar b/entityjars/open-dis7-entities-usa-munitions.jar
new file mode 100644
index 0000000000000000000000000000000000000000..9f0b904a4827aa1410fa628ffa3567362a0747a3
Binary files /dev/null and b/entityjars/open-dis7-entities-usa-munitions.jar differ
diff --git a/entityjars/open-dis7-entities-usa-surface.jar b/entityjars/open-dis7-entities-usa-surface.jar
new file mode 100644
index 0000000000000000000000000000000000000000..c717bca95f5a4eeb2e41189136bfda14bd8d2b4c
Binary files /dev/null and b/entityjars/open-dis7-entities-usa-surface.jar differ
diff --git a/entityjars/open-dis7.jar b/entityjars/open-dis7.jar
new file mode 100644
index 0000000000000000000000000000000000000000..da15cd8ae761b7215b4353e4f883910ec01cad5a
Binary files /dev/null and b/entityjars/open-dis7.jar differ
diff --git a/nbproject/project.properties b/nbproject/project.properties
index 3e87f34fe24b059faa222e07fe09c5569241a51b..6f646697f0dd344bee4e6731936bbd034a9aed6c 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -37,7 +37,7 @@ endorsed.classpath=
excludes=
file.reference.commons-io-2.6.jar=optionallibs/commons-io-2.6.jar
file.reference.guava-28.0-jre.jar=optionallibs/guava-28.0-jre.jar
-file.reference.open-dis7-entities-usa-surface.jar=releasejars/open-dis7-entities-usa-surface.jar
+file.reference.open-dis7-entities-usa-surface.jar=entityjars/open-dis7-entities-usa-surface.jar
includes=**
jar.compress=false
javac.classpath=\
@@ -69,6 +69,7 @@ javadoc.noindex=false
javadoc.nonavbar=false
javadoc.notree=false
javadoc.private=false
+javadoc.reference.open-dis7-entities-usa-surface.jar=entityjars/open-dis7-entities-javadoc.jar
javadoc.splitindex=true
javadoc.use=true
javadoc.version=false
@@ -79,7 +80,7 @@ jlink.additionalmodules=
jlink.additionalparam=
jlink.launcher=true
jlink.launcher.name=open-dis7-java
-main.class=edu.nps.moves.dis.util.playerrecorder.Player
+main.class=edu.nps.moves.dis7.util.playerrecorder.Player
meta.inf.dir=${src.dir}/META-INF
mkdist.disabled=true
platform.active=JDK_1.8
diff --git a/open-dis7-javadoc.zip b/open-dis7-javadoc.zip
deleted file mode 100644
index 867264e2928796eb4afb36f0047782884d9ac59f..0000000000000000000000000000000000000000
Binary files a/open-dis7-javadoc.zip and /dev/null differ
diff --git a/releasejars/open-dis7-entities-chn.jar b/releasejars/open-dis7-entities-chn.jar
deleted file mode 100644
index 704935cb08c7a87a5fc14db0116ae7a0ccf06d8a..0000000000000000000000000000000000000000
Binary files a/releasejars/open-dis7-entities-chn.jar and /dev/null differ
diff --git a/releasejars/open-dis7-entities-deu.jar b/releasejars/open-dis7-entities-deu.jar
deleted file mode 100644
index f4f79c8ae3d04eaec8705da2ded9f48df87ceb77..0000000000000000000000000000000000000000
Binary files a/releasejars/open-dis7-entities-deu.jar and /dev/null differ
diff --git a/releasejars/open-dis7-entities-nato.jar b/releasejars/open-dis7-entities-nato.jar
deleted file mode 100644
index ddb3cdece4f47a139bd0c0ee7671450473221066..0000000000000000000000000000000000000000
Binary files a/releasejars/open-dis7-entities-nato.jar and /dev/null differ
diff --git a/releasejars/open-dis7-entities-rus.jar b/releasejars/open-dis7-entities-rus.jar
deleted file mode 100644
index d1b0648638b0edf280fb32d571e2f641ec7f7186..0000000000000000000000000000000000000000
Binary files a/releasejars/open-dis7-entities-rus.jar and /dev/null differ
diff --git a/releasejars/open-dis7-entities-usa-air.jar b/releasejars/open-dis7-entities-usa-air.jar
deleted file mode 100644
index a3a15e86984924838e394f8b281ea83c5c7e4e1c..0000000000000000000000000000000000000000
Binary files a/releasejars/open-dis7-entities-usa-air.jar and /dev/null differ
diff --git a/releasejars/open-dis7-entities-usa-all.jar b/releasejars/open-dis7-entities-usa-all.jar
deleted file mode 100644
index cbaa9009a161cc1d5c2ce0dac0864a5874643e13..0000000000000000000000000000000000000000
Binary files a/releasejars/open-dis7-entities-usa-all.jar and /dev/null differ
diff --git a/releasejars/open-dis7-entities-usa-land.jar b/releasejars/open-dis7-entities-usa-land.jar
deleted file mode 100644
index 2f1a02aea03adf6249a16c38d0f016cb03f3667e..0000000000000000000000000000000000000000
Binary files a/releasejars/open-dis7-entities-usa-land.jar and /dev/null differ
diff --git a/releasejars/open-dis7-entities-usa-munitions.jar b/releasejars/open-dis7-entities-usa-munitions.jar
deleted file mode 100644
index c3f4996f35f008e500490b104814c0a9cb60c3ff..0000000000000000000000000000000000000000
Binary files a/releasejars/open-dis7-entities-usa-munitions.jar and /dev/null differ
diff --git a/releasejars/open-dis7-entities-usa-surface.jar b/releasejars/open-dis7-entities-usa-surface.jar
deleted file mode 100644
index 946f4f3f4bf6c5d1f805c5d5a5384dfa8d8bbf62..0000000000000000000000000000000000000000
Binary files a/releasejars/open-dis7-entities-usa-surface.jar and /dev/null differ
diff --git a/releasejars/open-dis7.jar b/releasejars/open-dis7.jar
deleted file mode 100644
index d1437a8995bbfa91afcc59259b3778c69488f35a..0000000000000000000000000000000000000000
Binary files a/releasejars/open-dis7.jar and /dev/null differ
diff --git a/src-generated/edu/nps/moves/dis/APA.java b/src-generated/edu/nps/moves/dis7/APA.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/APA.java
rename to src-generated/edu/nps/moves/dis7/APA.java
index d1b4e3d0f87eb1eb4d5011add6008e0ca3a2a134..1c1e6a2382812cd5a62840347398e6a80e9934aa 100644
--- a/src-generated/edu/nps/moves/dis/APA.java
+++ b/src-generated/edu/nps/moves/dis7/APA.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* additional passive activity
diff --git a/src-generated/edu/nps/moves/dis/AcknowledgePdu.java b/src-generated/edu/nps/moves/dis7/AcknowledgePdu.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/AcknowledgePdu.java
rename to src-generated/edu/nps/moves/dis7/AcknowledgePdu.java
index 6fd6eb9e6c8fcbb9cce0415d9feaf1ab4f2e7bdb..1e51c10b43bafca63941d3b4b7a0a696c1653695 100644
--- a/src-generated/edu/nps/moves/dis/AcknowledgePdu.java
+++ b/src-generated/edu/nps/moves/dis7/AcknowledgePdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 7.5.6 Acknowledges the receipt of a Start/Resume PDU, Stop/Freeze PDU, Create Entity PDU, or Remove Entity PDU. See 5.6.5.6.
diff --git a/src-generated/edu/nps/moves/dis/AcknowledgeReliablePdu.java b/src-generated/edu/nps/moves/dis7/AcknowledgeRPdu.java
similarity index 88%
rename from src-generated/edu/nps/moves/dis/AcknowledgeReliablePdu.java
rename to src-generated/edu/nps/moves/dis7/AcknowledgeRPdu.java
index 7c377c81cd8d8a590736e71ce813eb94060ad333..8734775add900078a95d12b0f701d7b54754ebce 100644
--- a/src-generated/edu/nps/moves/dis/AcknowledgeReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/AcknowledgeRPdu.java
@@ -3,17 +3,17 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 5.12.4.6 Serves the same function as the Acknowledge PDU but is used to acknowledge the receipt of a Create Entity-R PDU, a Remove Entity-R PDU, a Start/Resume-R PDU, or a Stop/Freeze-R PDU.
* IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
*/
-public class AcknowledgeReliablePdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
+public class AcknowledgeRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
{
/** ack flags uid 69 */
protected AcknowledgeAcknowledgeFlag acknowledgeFlag = AcknowledgeAcknowledgeFlag.values()[0];
@@ -26,7 +26,7 @@ public class AcknowledgeReliablePdu extends SimulationManagementWithReliabilityF
/** Constructor */
- public AcknowledgeReliablePdu()
+ public AcknowledgeRPdu()
{
setPduType( DISPDUType.ACKNOWLEDGE_R );
}
@@ -44,7 +44,7 @@ public int getMarshalledSize()
}
-public AcknowledgeReliablePdu setAcknowledgeFlag(AcknowledgeAcknowledgeFlag pAcknowledgeFlag)
+public AcknowledgeRPdu setAcknowledgeFlag(AcknowledgeAcknowledgeFlag pAcknowledgeFlag)
{
acknowledgeFlag = pAcknowledgeFlag;
return this;
@@ -55,7 +55,7 @@ public AcknowledgeAcknowledgeFlag getAcknowledgeFlag()
return acknowledgeFlag;
}
-public AcknowledgeReliablePdu setResponseFlag(AcknowledgeResponseFlag pResponseFlag)
+public AcknowledgeRPdu setResponseFlag(AcknowledgeResponseFlag pResponseFlag)
{
responseFlag = pResponseFlag;
return this;
@@ -66,7 +66,7 @@ public AcknowledgeResponseFlag getResponseFlag()
return responseFlag;
}
-public AcknowledgeReliablePdu setRequestID(int pRequestID)
+public AcknowledgeRPdu setRequestID(int pRequestID)
{
requestID = pRequestID;
return this;
@@ -181,10 +181,10 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
{
boolean ivarsEqual = true;
- if(!(obj instanceof AcknowledgeReliablePdu))
+ if(!(obj instanceof AcknowledgeRPdu))
return false;
- final AcknowledgeReliablePdu rhs = (AcknowledgeReliablePdu)obj;
+ final AcknowledgeRPdu rhs = (AcknowledgeRPdu)obj;
if( ! (acknowledgeFlag == rhs.acknowledgeFlag)) ivarsEqual = false;
if( ! (responseFlag == rhs.responseFlag)) ivarsEqual = false;
diff --git a/src-generated/edu/nps/moves/dis7/AcknowledgeReliablePdu.java b/src-generated/edu/nps/moves/dis7/AcknowledgeReliablePdu.java
new file mode 100644
index 0000000000000000000000000000000000000000..e51467500ae2b344b28d37992a99a04918c877fc
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis7/AcknowledgeReliablePdu.java
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * more descriptive name for a AcknowledgeRPdu
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
+ */
+public class AcknowledgeReliablePdu extends AcknowledgeRPdu
+{}
diff --git a/src-generated/edu/nps/moves/dis/AcousticEmitter.java b/src-generated/edu/nps/moves/dis7/AcousticEmitter.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/AcousticEmitter.java
rename to src-generated/edu/nps/moves/dis7/AcousticEmitter.java
index d60faa2c2a647ae79e4b31b84242a7306c5492f6..6bdccaa548ff659cc263b7e0d7861a209117c969 100644
--- a/src-generated/edu/nps/moves/dis/AcousticEmitter.java
+++ b/src-generated/edu/nps/moves/dis7/AcousticEmitter.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* information about a specific UA emitter. Section 6.2.2.
diff --git a/src-generated/edu/nps/moves/dis/ActionRequestPdu.java b/src-generated/edu/nps/moves/dis7/ActionRequestPdu.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/ActionRequestPdu.java
rename to src-generated/edu/nps/moves/dis7/ActionRequestPdu.java
index 047b9b987073683d30a780545f27da2043a00053..532c6b205bd84b4c0b30485c5aa487e7a076d90e 100644
--- a/src-generated/edu/nps/moves/dis/ActionRequestPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ActionRequestPdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 7.5.7 A request from an SM to a managed entity to perform a specified action. See 5.6.5.7
diff --git a/src-generated/edu/nps/moves/dis/ActionRequestReliablePdu.java b/src-generated/edu/nps/moves/dis7/ActionRequestRPdu.java
similarity index 91%
rename from src-generated/edu/nps/moves/dis/ActionRequestReliablePdu.java
rename to src-generated/edu/nps/moves/dis7/ActionRequestRPdu.java
index 87c92eaef3febba3e3250bb1ba3748a499669c60..a2e746de252306c371fd67887e8473c47f801d2d 100644
--- a/src-generated/edu/nps/moves/dis/ActionRequestReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/ActionRequestRPdu.java
@@ -3,17 +3,17 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 5.12.4.7 Serves the same function as the Action Request PDU but with the addition of reliability service levels.
* IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
*/
-public class ActionRequestReliablePdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
+public class ActionRequestRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
{
/** level of reliability service used for this transaction uid 74 */
protected RequiredReliabilityService requiredReliabilityService = RequiredReliabilityService.values()[0];
@@ -44,7 +44,7 @@ public class ActionRequestReliablePdu extends SimulationManagementWithReliabilit
/** Constructor */
- public ActionRequestReliablePdu()
+ public ActionRequestRPdu()
{
setPduType( DISPDUType.ACTION_REQUEST_R );
}
@@ -76,7 +76,7 @@ public int getMarshalledSize()
}
-public ActionRequestReliablePdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
+public ActionRequestRPdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
{
requiredReliabilityService = pRequiredReliabilityService;
return this;
@@ -87,7 +87,7 @@ public RequiredReliabilityService getRequiredReliabilityService()
return requiredReliabilityService;
}
-public ActionRequestReliablePdu setPad1(byte pPad1)
+public ActionRequestRPdu setPad1(byte pPad1)
{
pad1 = pPad1;
return this;
@@ -98,7 +98,7 @@ public byte getPad1()
return pad1;
}
-public ActionRequestReliablePdu setPad2(short pPad2)
+public ActionRequestRPdu setPad2(short pPad2)
{
pad2 = pPad2;
return this;
@@ -109,7 +109,7 @@ public short getPad2()
return pad2;
}
-public ActionRequestReliablePdu setRequestID(int pRequestID)
+public ActionRequestRPdu setRequestID(int pRequestID)
{
requestID = pRequestID;
return this;
@@ -120,7 +120,7 @@ public int getRequestID()
return requestID;
}
-public ActionRequestReliablePdu setActionID(ActionRequestActionID pActionID)
+public ActionRequestRPdu setActionID(ActionRequestActionID pActionID)
{
actionID = pActionID;
return this;
@@ -131,7 +131,7 @@ public ActionRequestActionID getActionID()
return actionID;
}
-public ActionRequestReliablePdu setFixedDatumRecords(List<FixedDatum> pFixedDatumRecords)
+public ActionRequestRPdu setFixedDatumRecords(List<FixedDatum> pFixedDatumRecords)
{
fixedDatumRecords = pFixedDatumRecords;
return this;
@@ -142,7 +142,7 @@ public List<FixedDatum> getFixedDatumRecords()
return fixedDatumRecords;
}
-public ActionRequestReliablePdu setVariableDatumRecords(List<VariableDatum> pVariableDatumRecords)
+public ActionRequestRPdu setVariableDatumRecords(List<VariableDatum> pVariableDatumRecords)
{
variableDatumRecords = pVariableDatumRecords;
return this;
@@ -333,10 +333,10 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
{
boolean ivarsEqual = true;
- if(!(obj instanceof ActionRequestReliablePdu))
+ if(!(obj instanceof ActionRequestRPdu))
return false;
- final ActionRequestReliablePdu rhs = (ActionRequestReliablePdu)obj;
+ final ActionRequestRPdu rhs = (ActionRequestRPdu)obj;
if( ! (requiredReliabilityService == rhs.requiredReliabilityService)) ivarsEqual = false;
if( ! (pad1 == rhs.pad1)) ivarsEqual = false;
diff --git a/src-generated/edu/nps/moves/dis7/ActionRequestReliablePdu.java b/src-generated/edu/nps/moves/dis7/ActionRequestReliablePdu.java
new file mode 100644
index 0000000000000000000000000000000000000000..fff84c88ffaba1525ffdc77f745def91aacb4984
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis7/ActionRequestReliablePdu.java
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * more descriptive name for a ActionRequestRPdu
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
+ */
+public class ActionRequestReliablePdu extends ActionRequestRPdu
+{}
diff --git a/src-generated/edu/nps/moves/dis/ActionResponsePdu.java b/src-generated/edu/nps/moves/dis7/ActionResponsePdu.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/ActionResponsePdu.java
rename to src-generated/edu/nps/moves/dis7/ActionResponsePdu.java
index fe523cd45ef8c624591b524a09809ff6f6a53dce..25870538dac8881ebe9ad042b71c8ec828b3e3da 100644
--- a/src-generated/edu/nps/moves/dis/ActionResponsePdu.java
+++ b/src-generated/edu/nps/moves/dis7/ActionResponsePdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Section 7.5.8. When an entity receives an Action Request PDU, that entity shall acknowledge the receipt of the Action Request PDU with an Action Response PDU. See 5.6.5.8.
diff --git a/src-generated/edu/nps/moves/dis/ActionResponseReliablePdu.java b/src-generated/edu/nps/moves/dis7/ActionResponseRPdu.java
similarity index 91%
rename from src-generated/edu/nps/moves/dis/ActionResponseReliablePdu.java
rename to src-generated/edu/nps/moves/dis7/ActionResponseRPdu.java
index 952ea23b1f82781929ae847379156e35a008e0f5..bf187f8398ae1fc441a6debaedc9473a5f02e6ec 100644
--- a/src-generated/edu/nps/moves/dis/ActionResponseReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/ActionResponseRPdu.java
@@ -3,17 +3,17 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 5.12.4.8 Serves the same function as the Action Response PDU (see 5.6.5.8.1) but is used to acknowledge the receipt of an Action Request-R PDU.
* IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
*/
-public class ActionResponseReliablePdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
+public class ActionResponseRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
{
/** request ID */
protected int requestID;
@@ -35,7 +35,7 @@ public class ActionResponseReliablePdu extends SimulationManagementWithReliabili
/** Constructor */
- public ActionResponseReliablePdu()
+ public ActionResponseRPdu()
{
setPduType( DISPDUType.ACTION_RESPONSE_R );
}
@@ -64,7 +64,7 @@ public int getMarshalledSize()
}
-public ActionResponseReliablePdu setRequestID(int pRequestID)
+public ActionResponseRPdu setRequestID(int pRequestID)
{
requestID = pRequestID;
return this;
@@ -75,7 +75,7 @@ public int getRequestID()
return requestID;
}
-public ActionResponseReliablePdu setResponseStatus(ActionResponseRequestStatus pResponseStatus)
+public ActionResponseRPdu setResponseStatus(ActionResponseRequestStatus pResponseStatus)
{
responseStatus = pResponseStatus;
return this;
@@ -86,7 +86,7 @@ public ActionResponseRequestStatus getResponseStatus()
return responseStatus;
}
-public ActionResponseReliablePdu setFixedDatumRecords(List<FixedDatum> pFixedDatumRecords)
+public ActionResponseRPdu setFixedDatumRecords(List<FixedDatum> pFixedDatumRecords)
{
fixedDatumRecords = pFixedDatumRecords;
return this;
@@ -97,7 +97,7 @@ public List<FixedDatum> getFixedDatumRecords()
return fixedDatumRecords;
}
-public ActionResponseReliablePdu setVariableDatumRecords(List<VariableDatum> pVariableDatumRecords)
+public ActionResponseRPdu setVariableDatumRecords(List<VariableDatum> pVariableDatumRecords)
{
variableDatumRecords = pVariableDatumRecords;
return this;
@@ -273,10 +273,10 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
{
boolean ivarsEqual = true;
- if(!(obj instanceof ActionResponseReliablePdu))
+ if(!(obj instanceof ActionResponseRPdu))
return false;
- final ActionResponseReliablePdu rhs = (ActionResponseReliablePdu)obj;
+ final ActionResponseRPdu rhs = (ActionResponseRPdu)obj;
if( ! (requestID == rhs.requestID)) ivarsEqual = false;
if( ! (responseStatus == rhs.responseStatus)) ivarsEqual = false;
diff --git a/src-generated/edu/nps/moves/dis7/ActionResponseReliablePdu.java b/src-generated/edu/nps/moves/dis7/ActionResponseReliablePdu.java
new file mode 100644
index 0000000000000000000000000000000000000000..25210ddb2561873be0dae59a75a16d09e56833ed
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis7/ActionResponseReliablePdu.java
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * more descriptive name for a ActionResponseRPdu
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
+ */
+public class ActionResponseReliablePdu extends ActionResponseRPdu
+{}
diff --git a/src-generated/edu/nps/moves/dis/AggregateIdentifier.java b/src-generated/edu/nps/moves/dis7/AggregateIdentifier.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/AggregateIdentifier.java
rename to src-generated/edu/nps/moves/dis7/AggregateIdentifier.java
index cb4fd1d6ecdb5f42af77854196b73d70ad87756f..030120639284a85ad21c336dd1c85366a386c586 100644
--- a/src-generated/edu/nps/moves/dis/AggregateIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/AggregateIdentifier.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* The unique designation of each aggregate in an exercise is specified by an aggregate identifier record. The aggregate ID is not an entity and shall not be treated as such. Section 6.2.3.
diff --git a/src-generated/edu/nps/moves/dis/AggregateMarking.java b/src-generated/edu/nps/moves/dis7/AggregateMarking.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/AggregateMarking.java
rename to src-generated/edu/nps/moves/dis7/AggregateMarking.java
index 3f21f9d0fe90cf55eb7a65d99be7d8b9c8542885..ac1f3dda66be4ae86f928b2dd1734fc7bc2af8ca 100644
--- a/src-generated/edu/nps/moves/dis/AggregateMarking.java
+++ b/src-generated/edu/nps/moves/dis7/AggregateMarking.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Specifies the character set used in the first byte, followed by up to 31 characters of text data. Section 6.2.4.
diff --git a/src-generated/edu/nps/moves/dis/AggregateStatePdu.java b/src-generated/edu/nps/moves/dis7/AggregateStatePdu.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/AggregateStatePdu.java
rename to src-generated/edu/nps/moves/dis7/AggregateStatePdu.java
index cb0c1b76b59259939272647a7143c679905fca1d..8507c804787c3aeedd642bbadb534315bfd8baa0 100644
--- a/src-generated/edu/nps/moves/dis/AggregateStatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/AggregateStatePdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 5.9.2.2 The Aggregate State PDU shall be used to communicate the state and other pertinent information about an aggregated unit.
diff --git a/src-generated/edu/nps/moves/dis/AggregateType.java b/src-generated/edu/nps/moves/dis7/AggregateType.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/AggregateType.java
rename to src-generated/edu/nps/moves/dis7/AggregateType.java
index efc5bd3d1788d8e7d3f1feca6f75b3e29194b169..72325a713caa23ecd9f7002b742b4e24e7c6019b 100644
--- a/src-generated/edu/nps/moves/dis/AggregateType.java
+++ b/src-generated/edu/nps/moves/dis7/AggregateType.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Identifies the type and organization of an aggregate. Section 6.2.5
diff --git a/src-generated/edu/nps/moves/dis/AngleDeception.java b/src-generated/edu/nps/moves/dis7/AngleDeception.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/AngleDeception.java
rename to src-generated/edu/nps/moves/dis7/AngleDeception.java
index 2010097d189c416cdff7152fc33141e2f28bc21e..d27269a3bf1c73759cbc052be44dddb65e53e480 100644
--- a/src-generated/edu/nps/moves/dis/AngleDeception.java
+++ b/src-generated/edu/nps/moves/dis7/AngleDeception.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* The Angle Deception attribute record may be used to communicate discrete values that are associated with angle deception jamming that cannot be referenced to an emitter mode. The values provided in the record records (provided in the associated Electromagnetic Emission PDU). (The victim radar beams are those that are targeted by the jammer.) Section 6.2.21.2.2
diff --git a/src-generated/edu/nps/moves/dis/AngularVelocityVector.java b/src-generated/edu/nps/moves/dis7/AngularVelocityVector.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/AngularVelocityVector.java
rename to src-generated/edu/nps/moves/dis7/AngularVelocityVector.java
index d78d3aeebb882c091715dc38eb2bc62329fa87f7..a99263324883d0c77e62bec7074edb75ba1fd4e2 100644
--- a/src-generated/edu/nps/moves/dis/AngularVelocityVector.java
+++ b/src-generated/edu/nps/moves/dis7/AngularVelocityVector.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Angular velocity measured in radians per second out each of the entity's own coordinate axes. Order of measurement is angular velocity around the x, y, and z axis of the entity. The positive direction is determined by the right hand rule. Section 6.2.7
diff --git a/src-generated/edu/nps/moves/dis/AntennaLocation.java b/src-generated/edu/nps/moves/dis7/AntennaLocation.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/AntennaLocation.java
rename to src-generated/edu/nps/moves/dis7/AntennaLocation.java
index 36e398f9ab7a532367e1a10efcbd178fa741652d..4da7aa03f964bcb7f826edc552a53471d4ed41a0 100644
--- a/src-generated/edu/nps/moves/dis/AntennaLocation.java
+++ b/src-generated/edu/nps/moves/dis7/AntennaLocation.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Location of the radiating portion of the antenna, specified in world coordinates and entity coordinates. Section 6.2.8
diff --git a/src-generated/edu/nps/moves/dis/Appearance.java b/src-generated/edu/nps/moves/dis7/Appearance.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/Appearance.java
rename to src-generated/edu/nps/moves/dis7/Appearance.java
index 0968fcc76a15b9137dbf245de1a54c597ebc41c9..a4c73eb63d36ad5b3053b8ddcbfa777b75187a2b 100644
--- a/src-generated/edu/nps/moves/dis/Appearance.java
+++ b/src-generated/edu/nps/moves/dis7/Appearance.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* used in AppearancePdu
diff --git a/src-generated/edu/nps/moves/dis/AppearancePdu.java b/src-generated/edu/nps/moves/dis7/AppearancePdu.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/AppearancePdu.java
rename to src-generated/edu/nps/moves/dis7/AppearancePdu.java
index 6354351fd7c1519b6984dcef4c840467235592e6..afe53b03bc7115776f0413d96d875bb3aa5cb9ab 100644
--- a/src-generated/edu/nps/moves/dis/AppearancePdu.java
+++ b/src-generated/edu/nps/moves/dis7/AppearancePdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 9.4.3 Communicate information about the appearance of a live entity.
diff --git a/src-generated/edu/nps/moves/dis/ArealObjectStatePdu.java b/src-generated/edu/nps/moves/dis7/ArealObjectStatePdu.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/ArealObjectStatePdu.java
rename to src-generated/edu/nps/moves/dis7/ArealObjectStatePdu.java
index 186872e7fc41812afd6d904fc26d5925da2019e9..7f7af49b9a18452d03be6e5b499de19312b43d53 100644
--- a/src-generated/edu/nps/moves/dis/ArealObjectStatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/ArealObjectStatePdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 7.10.6 Used to communicate detailed information about the addition/modification of a synthetic environment object that is geometrically anchored to the terrain with a set of three or more points that come to a closure.
diff --git a/src-generated/edu/nps/moves/dis/ArticulatedPartVP.java b/src-generated/edu/nps/moves/dis7/ArticulatedPartVP.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/ArticulatedPartVP.java
rename to src-generated/edu/nps/moves/dis7/ArticulatedPartVP.java
index 8025193e0116f27a3b46564faf132d0c6ca91449..03d5e25efbf08fd0c64a1349baac3f6724f0a713 100644
--- a/src-generated/edu/nps/moves/dis/ArticulatedPartVP.java
+++ b/src-generated/edu/nps/moves/dis7/ArticulatedPartVP.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* articulated parts for movable parts and a combination of moveable/attached parts of an entity. Section 6.2.94.2
diff --git a/src-generated/edu/nps/moves/dis/ArticulatedPartsPdu.java b/src-generated/edu/nps/moves/dis7/ArticulatedPartsPdu.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/ArticulatedPartsPdu.java
rename to src-generated/edu/nps/moves/dis7/ArticulatedPartsPdu.java
index ce77e3a08b77924c6182eb35d67c27f94f64e250..53e0b0ba2dff3d4c852a885f770e9c1d60bce0de 100644
--- a/src-generated/edu/nps/moves/dis/ArticulatedPartsPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ArticulatedPartsPdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 9.4.4 Communicate information about an entity’s articulated and attached parts.
diff --git a/src-generated/edu/nps/moves/dis/Association.java b/src-generated/edu/nps/moves/dis7/Association.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/Association.java
rename to src-generated/edu/nps/moves/dis7/Association.java
index 2fbe011dd07b77f06987c61646bf12ea773ac8a5..b651d1c5af3eeff5ff9aab7dee30ac451d403d3e 100644
--- a/src-generated/edu/nps/moves/dis/Association.java
+++ b/src-generated/edu/nps/moves/dis7/Association.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* An entity's associations with other entities and/or locations. For each association, this record shall specify the type of the association, the associated entity's EntityID and/or the associated location's world coordinates. This record may be used (optionally) in a transfer transaction to send internal state data from the divesting simulation to the acquiring simulation (see 5.9.4). This record may also be used for other purposes. Section 6.2.9
diff --git a/src-generated/edu/nps/moves/dis/AttachedPartVP.java b/src-generated/edu/nps/moves/dis7/AttachedPartVP.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/AttachedPartVP.java
rename to src-generated/edu/nps/moves/dis7/AttachedPartVP.java
index a743b8f5d81f87d3593a02acfc8af13ddd841350..4addf533f23e4d4be39656e854795b1f03a5dad4 100644
--- a/src-generated/edu/nps/moves/dis/AttachedPartVP.java
+++ b/src-generated/edu/nps/moves/dis7/AttachedPartVP.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Removable parts that may be attached to an entity. Section 6.2.93.3
diff --git a/src-generated/edu/nps/moves/dis/Attribute.java b/src-generated/edu/nps/moves/dis7/Attribute.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/Attribute.java
rename to src-generated/edu/nps/moves/dis7/Attribute.java
index de88d23c0f1d46d0b0ada16c4e697de34de942c9..3bd656df08ad3c1b4de34bd14f2168a42d83e918 100644
--- a/src-generated/edu/nps/moves/dis/Attribute.java
+++ b/src-generated/edu/nps/moves/dis7/Attribute.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Used to convey information for one or more attributes. Attributes conform to the standard variable record format of 6.2.82. Section 6.2.10.
diff --git a/src-generated/edu/nps/moves/dis/AttributePdu.java b/src-generated/edu/nps/moves/dis7/AttributePdu.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/AttributePdu.java
rename to src-generated/edu/nps/moves/dis7/AttributePdu.java
index c165a37fc67a08870c4a51e52a8c635025ea576a..44278c6bdb17cb31c033ea3d03e308c5ea28f8a5 100644
--- a/src-generated/edu/nps/moves/dis/AttributePdu.java
+++ b/src-generated/edu/nps/moves/dis7/AttributePdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 7.2.6. Information about individual attributes for a particular entity, other object, or event may be communicated using an Attribute PDU. The Attribute PDU shall not be used to exchange data available in any other PDU except where explicitly mentioned in the PDU issuance instructions within this standard.. See 5.3.6.
diff --git a/src-generated/edu/nps/moves/dis/AttributeRecordSet.java b/src-generated/edu/nps/moves/dis7/AttributeRecordSet.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/AttributeRecordSet.java
rename to src-generated/edu/nps/moves/dis7/AttributeRecordSet.java
index 78b4e6cf52d642a25fcae5761defb9476f771f8e..522066cefd77120dbf8e8dd4a81647470468eb46 100644
--- a/src-generated/edu/nps/moves/dis/AttributeRecordSet.java
+++ b/src-generated/edu/nps/moves/dis7/AttributeRecordSet.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
diff --git a/src-generated/edu/nps/moves/dis/BeamAntennaPattern.java b/src-generated/edu/nps/moves/dis7/BeamAntennaPattern.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/BeamAntennaPattern.java
rename to src-generated/edu/nps/moves/dis7/BeamAntennaPattern.java
index 192952fb3fa14e6939ec0158021d55d9a1a73eb9..f6897bc0f1e13bc30bac4ff9f03c5057bb310e89 100644
--- a/src-generated/edu/nps/moves/dis/BeamAntennaPattern.java
+++ b/src-generated/edu/nps/moves/dis7/BeamAntennaPattern.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Used when the antenna pattern type field has a value of 1. Specifies the direction, pattern, and polarization of radiation from an antenna. Section 6.2.9.2
diff --git a/src-generated/edu/nps/moves/dis/BeamData.java b/src-generated/edu/nps/moves/dis7/BeamData.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/BeamData.java
rename to src-generated/edu/nps/moves/dis7/BeamData.java
index e4dd588d202c818f2a12e14465281839a3c53520..e36e893cd8d88fa8e9973771c867bbf6428cc86d 100644
--- a/src-generated/edu/nps/moves/dis/BeamData.java
+++ b/src-generated/edu/nps/moves/dis7/BeamData.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Describes the scan volue of an emitter beam. Section 6.2.11.
diff --git a/src-generated/edu/nps/moves/dis/BeamStatus.java b/src-generated/edu/nps/moves/dis7/BeamStatus.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/BeamStatus.java
rename to src-generated/edu/nps/moves/dis7/BeamStatus.java
index 75594a89815abdbf5e226518bf88387102e17e2f..57d645f7e293920ac046bc6c9d634affc25c3efa 100644
--- a/src-generated/edu/nps/moves/dis/BeamStatus.java
+++ b/src-generated/edu/nps/moves/dis7/BeamStatus.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Information related to the status of a beam. This is contained in the beam status field of the electromagnitec emission PDU. The first bit determines whether the beam is active (0) or deactivated (1). Section 6.2.12.
diff --git a/src-generated/edu/nps/moves/dis/BlankingSector.java b/src-generated/edu/nps/moves/dis7/BlankingSector.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/BlankingSector.java
rename to src-generated/edu/nps/moves/dis7/BlankingSector.java
index 6f7a655a3922d19cdc70e842529d6f05f6869846..87aadedcbe9308327756915b33bc32c317d5a5a9 100644
--- a/src-generated/edu/nps/moves/dis/BlankingSector.java
+++ b/src-generated/edu/nps/moves/dis7/BlankingSector.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* The Blanking Sector attribute record may be used to convey persistent areas within a scan volume where emitter power for a specific active emitter beam is reduced to an insignificant value. Section 6.2.21.2
diff --git a/src-generated/edu/nps/moves/dis/ChangeOptions.java b/src-generated/edu/nps/moves/dis7/ChangeOptions.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/ChangeOptions.java
rename to src-generated/edu/nps/moves/dis7/ChangeOptions.java
index 5cd8cbcf5808af843c77743f0c0e8a2228a88c8d..8e2b23e335617e82f5b2297a60ccbf8e99ff88cd 100644
--- a/src-generated/edu/nps/moves/dis/ChangeOptions.java
+++ b/src-generated/edu/nps/moves/dis7/ChangeOptions.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* This is a bitfield . See section 6.2.13 aka B.2.41
diff --git a/src-generated/edu/nps/moves/dis/ClockTime.java b/src-generated/edu/nps/moves/dis7/ClockTime.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/ClockTime.java
rename to src-generated/edu/nps/moves/dis7/ClockTime.java
index 1f71b01930f9ab93ee5df7247f0a9df409098137..225ac947797cec6ccbf88ee237f601c678fae8d8 100644
--- a/src-generated/edu/nps/moves/dis/ClockTime.java
+++ b/src-generated/edu/nps/moves/dis7/ClockTime.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Time measurements that exceed one hour are represented by this record. The first field is the hours since the unix epoch (Jan 1 1970, used by most Unix systems and java) and the second field the timestamp units since the top of the hour. Section 6.2.14
diff --git a/src-generated/edu/nps/moves/dis/CollisionElasticPdu.java b/src-generated/edu/nps/moves/dis7/CollisionElasticPdu.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/CollisionElasticPdu.java
rename to src-generated/edu/nps/moves/dis7/CollisionElasticPdu.java
index 2cf2e35dbc360f2599026c99cc87a5b5ff0d5338..fc03ed4faedcc364397848ac11fbf127c13478bc 100644
--- a/src-generated/edu/nps/moves/dis/CollisionElasticPdu.java
+++ b/src-generated/edu/nps/moves/dis7/CollisionElasticPdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 7.2.4 Information about elastic collisions in a DIS exercise shall be communicated using a Collision-Elastic PDU. See 5.3.4.
diff --git a/src-generated/edu/nps/moves/dis/CollisionPdu.java b/src-generated/edu/nps/moves/dis7/CollisionPdu.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/CollisionPdu.java
rename to src-generated/edu/nps/moves/dis7/CollisionPdu.java
index d808f7a87286979508f0225dc7990de3ae168a6b..fc7b8438e49744ac7c23510014cbf069aa5c2e86 100644
--- a/src-generated/edu/nps/moves/dis/CollisionPdu.java
+++ b/src-generated/edu/nps/moves/dis7/CollisionPdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 7.2.3 Collisions between entities shall be communicated by issuing a Collision PDU. See 5.3.3.
diff --git a/src-generated/edu/nps/moves/dis/CommentPdu.java b/src-generated/edu/nps/moves/dis7/CommentPdu.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/CommentPdu.java
rename to src-generated/edu/nps/moves/dis7/CommentPdu.java
index 7b68a62cec72e84377725070d7e97b92f753b43b..1242ce47bfbee3cdfcf70d34dcf0ad064dbf4522 100644
--- a/src-generated/edu/nps/moves/dis/CommentPdu.java
+++ b/src-generated/edu/nps/moves/dis7/CommentPdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 7.5.13 Used to enter arbitrary messages (character strings, for example). See 5.6.5.13
diff --git a/src-generated/edu/nps/moves/dis/CommentReliablePdu.java b/src-generated/edu/nps/moves/dis7/CommentRPdu.java
similarity index 92%
rename from src-generated/edu/nps/moves/dis/CommentReliablePdu.java
rename to src-generated/edu/nps/moves/dis7/CommentRPdu.java
index 84ae23e4f57ce46dbc46997ea8c86958f041e30c..0f7da02b6ef4ee50aab931cb478e859fb4a717b8 100644
--- a/src-generated/edu/nps/moves/dis/CommentReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/CommentRPdu.java
@@ -3,17 +3,17 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 5.12.4.13 Serves the same function as the Comment PDU.
* IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
*/
-public class CommentReliablePdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
+public class CommentRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
{
/** Fixed datum record count */
protected int numberOfFixedDatumRecords;
@@ -29,7 +29,7 @@ public class CommentReliablePdu extends SimulationManagementWithReliabilityFamil
/** Constructor */
- public CommentReliablePdu()
+ public CommentRPdu()
{
setPduType( DISPDUType.COMMENT_R );
}
@@ -56,7 +56,7 @@ public int getMarshalledSize()
}
-public CommentReliablePdu setFixedDatumRecords(List<FixedDatum> pFixedDatumRecords)
+public CommentRPdu setFixedDatumRecords(List<FixedDatum> pFixedDatumRecords)
{
fixedDatumRecords = pFixedDatumRecords;
return this;
@@ -67,7 +67,7 @@ public List<FixedDatum> getFixedDatumRecords()
return fixedDatumRecords;
}
-public CommentReliablePdu setVariableDatumRecords(List<VariableDatum> pVariableDatumRecords)
+public CommentRPdu setVariableDatumRecords(List<VariableDatum> pVariableDatumRecords)
{
variableDatumRecords = pVariableDatumRecords;
return this;
@@ -233,10 +233,10 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
{
boolean ivarsEqual = true;
- if(!(obj instanceof CommentReliablePdu))
+ if(!(obj instanceof CommentRPdu))
return false;
- final CommentReliablePdu rhs = (CommentReliablePdu)obj;
+ final CommentRPdu rhs = (CommentRPdu)obj;
if( ! (numberOfFixedDatumRecords == rhs.numberOfFixedDatumRecords)) ivarsEqual = false;
if( ! (numberOfVariableDatumRecords == rhs.numberOfVariableDatumRecords)) ivarsEqual = false;
diff --git a/src-generated/edu/nps/moves/dis7/CommentReliablePdu.java b/src-generated/edu/nps/moves/dis7/CommentReliablePdu.java
new file mode 100644
index 0000000000000000000000000000000000000000..1ed77f6fa83e7f892cbe7dc5a76bac9218ac1a68
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis7/CommentReliablePdu.java
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * more descriptive name for a CommentRPdu
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
+ */
+public class CommentReliablePdu extends CommentRPdu
+{}
diff --git a/src-generated/edu/nps/moves/dis/CommunicationsNodeID.java b/src-generated/edu/nps/moves/dis7/CommunicationsNodeID.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/CommunicationsNodeID.java
rename to src-generated/edu/nps/moves/dis7/CommunicationsNodeID.java
index 23e47fc51c3c0fb63e088d6b2a4f40856994755f..bb88984ee7680c00dd6f24e7a8323ed5e0682644 100644
--- a/src-generated/edu/nps/moves/dis/CommunicationsNodeID.java
+++ b/src-generated/edu/nps/moves/dis7/CommunicationsNodeID.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Identity of a communications node. Section 6.2.48.4
diff --git a/src-generated/edu/nps/moves/dis/CreateEntityPdu.java b/src-generated/edu/nps/moves/dis7/CreateEntityPdu.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/CreateEntityPdu.java
rename to src-generated/edu/nps/moves/dis7/CreateEntityPdu.java
index 2a3429a8b4fadf51830312ff3996fe4e7ce2e89f..7223ad717fc8da971f6ac724b9952b7ef39e0ad7 100644
--- a/src-generated/edu/nps/moves/dis/CreateEntityPdu.java
+++ b/src-generated/edu/nps/moves/dis7/CreateEntityPdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Section 7.5.2. Create a new entity. See 5.6.5.2.
diff --git a/src-generated/edu/nps/moves/dis/CreateEntityReliablePdu.java b/src-generated/edu/nps/moves/dis7/CreateEntityRPdu.java
similarity index 88%
rename from src-generated/edu/nps/moves/dis/CreateEntityReliablePdu.java
rename to src-generated/edu/nps/moves/dis7/CreateEntityRPdu.java
index 089d213de26ff3c780bd4b0171642c7d477df68d..ed6a5c8b39b87b89c60a4613ab1d63512d7e4537 100644
--- a/src-generated/edu/nps/moves/dis/CreateEntityReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/CreateEntityRPdu.java
@@ -3,17 +3,17 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 5.12.4.2 Serves the same function as the Create Entity PDU but with the addition of reliability service levels.
* IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
*/
-public class CreateEntityReliablePdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
+public class CreateEntityRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
{
/** level of reliability service used for this transaction uid 74 */
protected RequiredReliabilityService requiredReliabilityService = RequiredReliabilityService.values()[0];
@@ -27,7 +27,7 @@ public class CreateEntityReliablePdu extends SimulationManagementWithReliability
/** Constructor */
- public CreateEntityReliablePdu()
+ public CreateEntityRPdu()
{
setPduType( DISPDUType.CREATE_ENTITY_R );
}
@@ -46,7 +46,7 @@ public int getMarshalledSize()
}
-public CreateEntityReliablePdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
+public CreateEntityRPdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
{
requiredReliabilityService = pRequiredReliabilityService;
return this;
@@ -57,7 +57,7 @@ public RequiredReliabilityService getRequiredReliabilityService()
return requiredReliabilityService;
}
-public CreateEntityReliablePdu setPad1(byte pPad1)
+public CreateEntityRPdu setPad1(byte pPad1)
{
pad1 = pPad1;
return this;
@@ -68,7 +68,7 @@ public byte getPad1()
return pad1;
}
-public CreateEntityReliablePdu setPad2(short pPad2)
+public CreateEntityRPdu setPad2(short pPad2)
{
pad2 = pPad2;
return this;
@@ -79,7 +79,7 @@ public short getPad2()
return pad2;
}
-public CreateEntityReliablePdu setRequestID(int pRequestID)
+public CreateEntityRPdu setRequestID(int pRequestID)
{
requestID = pRequestID;
return this;
@@ -199,10 +199,10 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
{
boolean ivarsEqual = true;
- if(!(obj instanceof CreateEntityReliablePdu))
+ if(!(obj instanceof CreateEntityRPdu))
return false;
- final CreateEntityReliablePdu rhs = (CreateEntityReliablePdu)obj;
+ final CreateEntityRPdu rhs = (CreateEntityRPdu)obj;
if( ! (requiredReliabilityService == rhs.requiredReliabilityService)) ivarsEqual = false;
if( ! (pad1 == rhs.pad1)) ivarsEqual = false;
diff --git a/src-generated/edu/nps/moves/dis7/CreateEntityReliablePdu.java b/src-generated/edu/nps/moves/dis7/CreateEntityReliablePdu.java
new file mode 100644
index 0000000000000000000000000000000000000000..3d53e1adb5d5660f23a6b634765866b8958b42dd
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis7/CreateEntityReliablePdu.java
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * more descriptive name for a CreateEntityRPdu
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
+ */
+public class CreateEntityReliablePdu extends CreateEntityRPdu
+{}
diff --git a/src-generated/edu/nps/moves/dis/DataFilterRecord.java b/src-generated/edu/nps/moves/dis7/DataFilterRecord.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/DataFilterRecord.java
rename to src-generated/edu/nps/moves/dis7/DataFilterRecord.java
index b149c22f944424f7abea0676a0116e3a235a4cd9..830cc5a0bb3e1e2995ede1750cf29c54841185ac 100644
--- a/src-generated/edu/nps/moves/dis/DataFilterRecord.java
+++ b/src-generated/edu/nps/moves/dis7/DataFilterRecord.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* identify which of the optional data fields are contained in the Minefield Data PDU or requested in the Minefield Query PDU. This is a 32-bit record. For each field, true denotes that the data is requested or present and false denotes that the data is neither requested nor present. Section 6.2.16
diff --git a/src-generated/edu/nps/moves/dis/DataPdu.java b/src-generated/edu/nps/moves/dis7/DataPdu.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/DataPdu.java
rename to src-generated/edu/nps/moves/dis7/DataPdu.java
index aeae087e15295a18dc1adb4cf5f0ecab109f6115..d1a5d12536bace03b55d15ed789fa434d98da829 100644
--- a/src-generated/edu/nps/moves/dis/DataPdu.java
+++ b/src-generated/edu/nps/moves/dis7/DataPdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 7.5.11 Information issued in response to a Data Query PDU or Set Data PDU. Section 5.6.5.11
diff --git a/src-generated/edu/nps/moves/dis/DataQueryDatumSpecification.java b/src-generated/edu/nps/moves/dis7/DataQueryDatumSpecification.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/DataQueryDatumSpecification.java
rename to src-generated/edu/nps/moves/dis7/DataQueryDatumSpecification.java
index c0e912211a0cc8b51c85b62ab8eafa1bdc512a60..09ec08a5b2b2d72a56ca485303caa0fd77b888cb 100644
--- a/src-generated/edu/nps/moves/dis/DataQueryDatumSpecification.java
+++ b/src-generated/edu/nps/moves/dis7/DataQueryDatumSpecification.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* List of fixed and variable datum records. Section 6.2.17
diff --git a/src-generated/edu/nps/moves/dis/DataQueryPdu.java b/src-generated/edu/nps/moves/dis7/DataQueryPdu.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/DataQueryPdu.java
rename to src-generated/edu/nps/moves/dis7/DataQueryPdu.java
index 28c534668e77eb33a33e0b4eaa1d545a00a27381..7673de04ef56f325cfe62ae24d1c088cf9b9c33e 100644
--- a/src-generated/edu/nps/moves/dis/DataQueryPdu.java
+++ b/src-generated/edu/nps/moves/dis7/DataQueryPdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Section 7.5.9. Request for data from an entity. See 5.6.5.9
diff --git a/src-generated/edu/nps/moves/dis/DataQueryReliablePdu.java b/src-generated/edu/nps/moves/dis7/DataQueryRPdu.java
similarity index 91%
rename from src-generated/edu/nps/moves/dis/DataQueryReliablePdu.java
rename to src-generated/edu/nps/moves/dis7/DataQueryRPdu.java
index 16b2eb84d915528ebb7eadfc8cfb04dbdc0061c5..fb98d2788f5422d02d2b9bd63c4227605e385a19 100644
--- a/src-generated/edu/nps/moves/dis/DataQueryReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/DataQueryRPdu.java
@@ -3,17 +3,17 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 5.12.4.9 Serves the same function as the Data Query PDU but with the addition of reliability service levels
* IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
*/
-public class DataQueryReliablePdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
+public class DataQueryRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
{
/** level of reliability service used for this transaction uid 74 */
protected RequiredReliabilityService requiredReliabilityService = RequiredReliabilityService.values()[0];
@@ -44,7 +44,7 @@ public class DataQueryReliablePdu extends SimulationManagementWithReliabilityFam
/** Constructor */
- public DataQueryReliablePdu()
+ public DataQueryRPdu()
{
setPduType( DISPDUType.DATA_QUERY_R );
}
@@ -76,7 +76,7 @@ public int getMarshalledSize()
}
-public DataQueryReliablePdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
+public DataQueryRPdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
{
requiredReliabilityService = pRequiredReliabilityService;
return this;
@@ -87,7 +87,7 @@ public RequiredReliabilityService getRequiredReliabilityService()
return requiredReliabilityService;
}
-public DataQueryReliablePdu setPad1(byte pPad1)
+public DataQueryRPdu setPad1(byte pPad1)
{
pad1 = pPad1;
return this;
@@ -98,7 +98,7 @@ public byte getPad1()
return pad1;
}
-public DataQueryReliablePdu setPad2(short pPad2)
+public DataQueryRPdu setPad2(short pPad2)
{
pad2 = pPad2;
return this;
@@ -109,7 +109,7 @@ public short getPad2()
return pad2;
}
-public DataQueryReliablePdu setRequestID(int pRequestID)
+public DataQueryRPdu setRequestID(int pRequestID)
{
requestID = pRequestID;
return this;
@@ -120,7 +120,7 @@ public int getRequestID()
return requestID;
}
-public DataQueryReliablePdu setTimeInterval(int pTimeInterval)
+public DataQueryRPdu setTimeInterval(int pTimeInterval)
{
timeInterval = pTimeInterval;
return this;
@@ -131,7 +131,7 @@ public int getTimeInterval()
return timeInterval;
}
-public DataQueryReliablePdu setFixedDatumRecords(List<FixedDatum> pFixedDatumRecords)
+public DataQueryRPdu setFixedDatumRecords(List<FixedDatum> pFixedDatumRecords)
{
fixedDatumRecords = pFixedDatumRecords;
return this;
@@ -142,7 +142,7 @@ public List<FixedDatum> getFixedDatumRecords()
return fixedDatumRecords;
}
-public DataQueryReliablePdu setVariableDatumRecords(List<VariableDatum> pVariableDatumRecords)
+public DataQueryRPdu setVariableDatumRecords(List<VariableDatum> pVariableDatumRecords)
{
variableDatumRecords = pVariableDatumRecords;
return this;
@@ -333,10 +333,10 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
{
boolean ivarsEqual = true;
- if(!(obj instanceof DataQueryReliablePdu))
+ if(!(obj instanceof DataQueryRPdu))
return false;
- final DataQueryReliablePdu rhs = (DataQueryReliablePdu)obj;
+ final DataQueryRPdu rhs = (DataQueryRPdu)obj;
if( ! (requiredReliabilityService == rhs.requiredReliabilityService)) ivarsEqual = false;
if( ! (pad1 == rhs.pad1)) ivarsEqual = false;
diff --git a/src-generated/edu/nps/moves/dis7/DataQueryReliablePdu.java b/src-generated/edu/nps/moves/dis7/DataQueryReliablePdu.java
new file mode 100644
index 0000000000000000000000000000000000000000..deb101fde83e66de6174a6a080de5f2d923a28d0
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis7/DataQueryReliablePdu.java
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * more descriptive name for a DataQueryRPdu
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
+ */
+public class DataQueryReliablePdu extends DataQueryRPdu
+{}
diff --git a/src-generated/edu/nps/moves/dis/DataReliablePdu.java b/src-generated/edu/nps/moves/dis7/DataRPdu.java
similarity index 92%
rename from src-generated/edu/nps/moves/dis/DataReliablePdu.java
rename to src-generated/edu/nps/moves/dis7/DataRPdu.java
index e5d94a8ba1acfe9c6bcd1eab54402c48b4b07922..40d8f2ceae18b163a1f70d8a26cba0bb44e7b9d9 100644
--- a/src-generated/edu/nps/moves/dis/DataReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/DataRPdu.java
@@ -3,17 +3,17 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 5.12.4.11 Serves the same function as the Data PDU but with the addition of reliability service levels and is used in response to a Data Query-R PDU, a Data-R PDU, or a Set Data-R PDU.
* IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
*/
-public class DataReliablePdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
+public class DataRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
{
/** Request ID */
protected int requestID;
@@ -41,7 +41,7 @@ public class DataReliablePdu extends SimulationManagementWithReliabilityFamilyPd
/** Constructor */
- public DataReliablePdu()
+ public DataRPdu()
{
setPduType( DISPDUType.DATA_R );
}
@@ -72,7 +72,7 @@ public int getMarshalledSize()
}
-public DataReliablePdu setRequestID(int pRequestID)
+public DataRPdu setRequestID(int pRequestID)
{
requestID = pRequestID;
return this;
@@ -83,7 +83,7 @@ public int getRequestID()
return requestID;
}
-public DataReliablePdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
+public DataRPdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
{
requiredReliabilityService = pRequiredReliabilityService;
return this;
@@ -94,7 +94,7 @@ public RequiredReliabilityService getRequiredReliabilityService()
return requiredReliabilityService;
}
-public DataReliablePdu setPad1(byte pPad1)
+public DataRPdu setPad1(byte pPad1)
{
pad1 = pPad1;
return this;
@@ -105,7 +105,7 @@ public byte getPad1()
return pad1;
}
-public DataReliablePdu setPad2(short pPad2)
+public DataRPdu setPad2(short pPad2)
{
pad2 = pPad2;
return this;
@@ -116,7 +116,7 @@ public short getPad2()
return pad2;
}
-public DataReliablePdu setFixedDatumRecords(List<FixedDatum> pFixedDatumRecords)
+public DataRPdu setFixedDatumRecords(List<FixedDatum> pFixedDatumRecords)
{
fixedDatumRecords = pFixedDatumRecords;
return this;
@@ -127,7 +127,7 @@ public List<FixedDatum> getFixedDatumRecords()
return fixedDatumRecords;
}
-public DataReliablePdu setVariableDatumRecords(List<VariableDatum> pVariableDatumRecords)
+public DataRPdu setVariableDatumRecords(List<VariableDatum> pVariableDatumRecords)
{
variableDatumRecords = pVariableDatumRecords;
return this;
@@ -313,10 +313,10 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
{
boolean ivarsEqual = true;
- if(!(obj instanceof DataReliablePdu))
+ if(!(obj instanceof DataRPdu))
return false;
- final DataReliablePdu rhs = (DataReliablePdu)obj;
+ final DataRPdu rhs = (DataRPdu)obj;
if( ! (requestID == rhs.requestID)) ivarsEqual = false;
if( ! (requiredReliabilityService == rhs.requiredReliabilityService)) ivarsEqual = false;
diff --git a/src-generated/edu/nps/moves/dis7/DataReliablePdu.java b/src-generated/edu/nps/moves/dis7/DataReliablePdu.java
new file mode 100644
index 0000000000000000000000000000000000000000..b474733664844606b1d172c3cc4c6d79bddfec25
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis7/DataReliablePdu.java
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * more descriptive name for a DataRPdu
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
+ */
+public class DataReliablePdu extends DataRPdu
+{}
diff --git a/src-generated/edu/nps/moves/dis/DatumSpecification.java b/src-generated/edu/nps/moves/dis7/DatumSpecification.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/DatumSpecification.java
rename to src-generated/edu/nps/moves/dis7/DatumSpecification.java
index 7726ad1b5332f3550ca8c65d3868b3297bfc05a6..ea65e234ed232e82cebb17bba7baa668e746e5c2 100644
--- a/src-generated/edu/nps/moves/dis/DatumSpecification.java
+++ b/src-generated/edu/nps/moves/dis7/DatumSpecification.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* List of fixed and variable datum records. Section 6.2.18
diff --git a/src-generated/edu/nps/moves/dis/DeadReckoningParameters.java b/src-generated/edu/nps/moves/dis7/DeadReckoningParameters.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/DeadReckoningParameters.java
rename to src-generated/edu/nps/moves/dis7/DeadReckoningParameters.java
index 708328cd935b2e27d26b526da2bcb4c69e215fde..5af6defeb9d77100629156018ac85c5413ced0aa 100644
--- a/src-generated/edu/nps/moves/dis/DeadReckoningParameters.java
+++ b/src-generated/edu/nps/moves/dis7/DeadReckoningParameters.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Not specified in the standard. This is used by the ESPDU
diff --git a/src-generated/edu/nps/moves/dis/DesignatorPdu.java b/src-generated/edu/nps/moves/dis7/DesignatorPdu.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/DesignatorPdu.java
rename to src-generated/edu/nps/moves/dis7/DesignatorPdu.java
index 37817bc6d81da43a2e73e44e7893ce44618d3301..1206ccd340151b06be4d8a0d17ae4d539cf9946a 100644
--- a/src-generated/edu/nps/moves/dis/DesignatorPdu.java
+++ b/src-generated/edu/nps/moves/dis7/DesignatorPdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 7.6.3 Handles designating operations. See 5.3.7.2.
diff --git a/src-generated/edu/nps/moves/dis/DetonationPdu.java b/src-generated/edu/nps/moves/dis7/DetonationPdu.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/DetonationPdu.java
rename to src-generated/edu/nps/moves/dis7/DetonationPdu.java
index adea7c113f58771ad74e02ea34f07cc67f590359..9e1eee67efe342e146524320d931e73a80dbf227 100644
--- a/src-generated/edu/nps/moves/dis/DetonationPdu.java
+++ b/src-generated/edu/nps/moves/dis7/DetonationPdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 7.3.3 Used to communicate the detonation or impact of munitions, as well as non-munition explosions, the burst or initial bloom of chaff, and the ignition of a flare.
diff --git a/src-generated/edu/nps/moves/dis/DirectedEnergyAreaAimpoint.java b/src-generated/edu/nps/moves/dis7/DirectedEnergyAreaAimpoint.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/DirectedEnergyAreaAimpoint.java
rename to src-generated/edu/nps/moves/dis7/DirectedEnergyAreaAimpoint.java
index 8cc07616358ff11f5443366f4faef963a1784776..f72ffec07a1cd4a007115c144d0f12007eb197c4 100644
--- a/src-generated/edu/nps/moves/dis/DirectedEnergyAreaAimpoint.java
+++ b/src-generated/edu/nps/moves/dis7/DirectedEnergyAreaAimpoint.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* DE Precision Aimpoint Record. Section 6.2.20.2
diff --git a/src-generated/edu/nps/moves/dis/DirectedEnergyDamage.java b/src-generated/edu/nps/moves/dis7/DirectedEnergyDamage.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/DirectedEnergyDamage.java
rename to src-generated/edu/nps/moves/dis7/DirectedEnergyDamage.java
index f3a6e9e3a2608657ff09fa03b96772aa51b18d8d..2bc8046900dccc990794a4057a82327eaf8781c2 100644
--- a/src-generated/edu/nps/moves/dis/DirectedEnergyDamage.java
+++ b/src-generated/edu/nps/moves/dis7/DirectedEnergyDamage.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Damage sustained by an entity due to directed energy. Location of the damage based on a relative x,y,z location from the center of the entity. Section 6.2.15.2
diff --git a/src-generated/edu/nps/moves/dis/DirectedEnergyFirePdu.java b/src-generated/edu/nps/moves/dis7/DirectedEnergyFirePdu.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/DirectedEnergyFirePdu.java
rename to src-generated/edu/nps/moves/dis7/DirectedEnergyFirePdu.java
index 434a4419c5a6d2783e74af4183dad17eaad6a9fb..1e11454beb72cb323c6036296532b55c25889f03 100644
--- a/src-generated/edu/nps/moves/dis/DirectedEnergyFirePdu.java
+++ b/src-generated/edu/nps/moves/dis7/DirectedEnergyFirePdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 7.3.4 Used to communicate the firing of a directed energy weapon.
diff --git a/src-generated/edu/nps/moves/dis/DirectedEnergyPrecisionAimpoint.java b/src-generated/edu/nps/moves/dis7/DirectedEnergyPrecisionAimpoint.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/DirectedEnergyPrecisionAimpoint.java
rename to src-generated/edu/nps/moves/dis7/DirectedEnergyPrecisionAimpoint.java
index a77761a6bd2c6e0d6e020e381e9942dbdcb365b2..617b12be1f58d2260685cf37a11de0d241210c12 100644
--- a/src-generated/edu/nps/moves/dis/DirectedEnergyPrecisionAimpoint.java
+++ b/src-generated/edu/nps/moves/dis7/DirectedEnergyPrecisionAimpoint.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* DE Precision Aimpoint Record. Section 6.2.20.3
diff --git a/src-generated/edu/nps/moves/dis/DirectedEnergyTargetEnergyDeposition.java b/src-generated/edu/nps/moves/dis7/DirectedEnergyTargetEnergyDeposition.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/DirectedEnergyTargetEnergyDeposition.java
rename to src-generated/edu/nps/moves/dis7/DirectedEnergyTargetEnergyDeposition.java
index 5ebb7aff10486ee3b4efbc5f4b8029d31abea28b..c7ffb94e670923c37e47e5e4cf444327445b047c 100644
--- a/src-generated/edu/nps/moves/dis/DirectedEnergyTargetEnergyDeposition.java
+++ b/src-generated/edu/nps/moves/dis7/DirectedEnergyTargetEnergyDeposition.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* DE energy depostion properties for a target entity. Section 6.2.20.4
diff --git a/src-generated/edu/nps/moves/dis/DistributedEmissionsFamilyPdu.java b/src-generated/edu/nps/moves/dis7/DistributedEmissionsFamilyPdu.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/DistributedEmissionsFamilyPdu.java
rename to src-generated/edu/nps/moves/dis7/DistributedEmissionsFamilyPdu.java
index 9110c5417252858bccda9a14f6b095870ce6d59f..149979b48c10ae8158825e1eca56d60370aa960d 100644
--- a/src-generated/edu/nps/moves/dis/DistributedEmissionsFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/DistributedEmissionsFamilyPdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Section 5.3.7. Electronic Emissions. Abstract superclass for distributed emissions PDU
diff --git a/src-generated/edu/nps/moves/dis/Domain.java b/src-generated/edu/nps/moves/dis7/Domain.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/Domain.java
rename to src-generated/edu/nps/moves/dis7/Domain.java
index 59762cb7dd6c0ec6529619ceac164055893fc9ed..f6b959da23e6768fff19985b543eb1382ea6ea65 100644
--- a/src-generated/edu/nps/moves/dis/Domain.java
+++ b/src-generated/edu/nps/moves/dis7/Domain.java
@@ -3,7 +3,7 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.io.DataInputStream;
import java.io.DataOutputStream;
@@ -11,7 +11,7 @@ import java.lang.reflect.Method;
import java.nio.ByteBuffer;
import java.lang.reflect.InvocationTargetException;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* An example approximating a Java enum "superclass". Can't use an interface, because we need the two
@@ -33,6 +33,7 @@ public class Domain
//@formatter:off
+
public static Domain inst(PlatformDomain d) { return _inst(d); } // uid 8
public static Domain inst(MunitionDomain d) { return _inst(d); } // uid 14
diff --git a/src-generated/edu/nps/moves/dis/EEFundamentalParameterData.java b/src-generated/edu/nps/moves/dis7/EEFundamentalParameterData.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/EEFundamentalParameterData.java
rename to src-generated/edu/nps/moves/dis7/EEFundamentalParameterData.java
index b9aae2a48cb4350a18119544f1a398d8a0da324a..c9b922401155abba63475719f95897e19adf43a0 100644
--- a/src-generated/edu/nps/moves/dis/EEFundamentalParameterData.java
+++ b/src-generated/edu/nps/moves/dis7/EEFundamentalParameterData.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Contains electromagnetic emmission regeneration parameters that are variable throught a scenario. Section 6.2.22.
diff --git a/src-generated/edu/nps/moves/dis/ElectronicEmissionsPdu.java b/src-generated/edu/nps/moves/dis7/ElectromagneticEmissionPdu.java
similarity index 90%
rename from src-generated/edu/nps/moves/dis/ElectronicEmissionsPdu.java
rename to src-generated/edu/nps/moves/dis7/ElectromagneticEmissionPdu.java
index 73b2f6854b3c45fb14fba9304fd5957f9df2134f..2913be43a9dbd3f011ddf4f11f0a47a2f1acd7be 100644
--- a/src-generated/edu/nps/moves/dis/ElectronicEmissionsPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ElectromagneticEmissionPdu.java
@@ -3,17 +3,17 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 7.6.2 Communicate active electromagnetic emissions, including radar and radar-related electronic warfare (e.g., jamming). Exceptions include IFF interrogations and replies, navigation aids, voice, beacon and data radio communications, directed energy weapons, and laser ranging and designation systems, which are handled by other PDUs. Section 5.3.7.1.
* IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
*/
-public class ElectronicEmissionsPdu extends DistributedEmissionsFamilyPdu implements Serializable
+public class ElectromagneticEmissionPdu extends DistributedEmissionsFamilyPdu implements Serializable
{
/** ID of the entity emitting */
protected EntityID emittingEntityID = new EntityID();
@@ -35,7 +35,7 @@ public class ElectronicEmissionsPdu extends DistributedEmissionsFamilyPdu implem
/** Constructor */
- public ElectronicEmissionsPdu()
+ public ElectromagneticEmissionPdu()
{
setPduType( DISPDUType.ELECTROMAGNETIC_EMISSION );
setPaddingForEmissionsPdu( (short)0 );
@@ -61,7 +61,7 @@ public int getMarshalledSize()
}
-public ElectronicEmissionsPdu setEmittingEntityID(EntityID pEmittingEntityID)
+public ElectromagneticEmissionPdu setEmittingEntityID(EntityID pEmittingEntityID)
{
emittingEntityID = pEmittingEntityID;
return this;
@@ -72,7 +72,7 @@ public EntityID getEmittingEntityID()
return emittingEntityID;
}
-public ElectronicEmissionsPdu setEventID(EventIdentifier pEventID)
+public ElectromagneticEmissionPdu setEventID(EventIdentifier pEventID)
{
eventID = pEventID;
return this;
@@ -83,7 +83,7 @@ public EventIdentifier getEventID()
return eventID;
}
-public ElectronicEmissionsPdu setStateUpdateIndicator(ElectromagneticEmissionStateUpdateIndicator pStateUpdateIndicator)
+public ElectromagneticEmissionPdu setStateUpdateIndicator(ElectromagneticEmissionStateUpdateIndicator pStateUpdateIndicator)
{
stateUpdateIndicator = pStateUpdateIndicator;
return this;
@@ -94,7 +94,7 @@ public ElectromagneticEmissionStateUpdateIndicator getStateUpdateIndicator()
return stateUpdateIndicator;
}
-public ElectronicEmissionsPdu setPaddingForEmissionsPdu(short pPaddingForEmissionsPdu)
+public ElectromagneticEmissionPdu setPaddingForEmissionsPdu(short pPaddingForEmissionsPdu)
{
paddingForEmissionsPdu = pPaddingForEmissionsPdu;
return this;
@@ -105,7 +105,7 @@ public short getPaddingForEmissionsPdu()
return paddingForEmissionsPdu;
}
-public ElectronicEmissionsPdu setSystems(List<ElectronicEmitter> pSystems)
+public ElectromagneticEmissionPdu setSystems(List<ElectronicEmitter> pSystems)
{
systems = pSystems;
return this;
@@ -256,10 +256,10 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
{
boolean ivarsEqual = true;
- if(!(obj instanceof ElectronicEmissionsPdu))
+ if(!(obj instanceof ElectromagneticEmissionPdu))
return false;
- final ElectronicEmissionsPdu rhs = (ElectronicEmissionsPdu)obj;
+ final ElectromagneticEmissionPdu rhs = (ElectromagneticEmissionPdu)obj;
if( ! (emittingEntityID.equals( rhs.emittingEntityID) )) ivarsEqual = false;
if( ! (eventID.equals( rhs.eventID) )) ivarsEqual = false;
diff --git a/src-generated/edu/nps/moves/dis/ElectronicEmitter.java b/src-generated/edu/nps/moves/dis7/ElectronicEmitter.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/ElectronicEmitter.java
rename to src-generated/edu/nps/moves/dis7/ElectronicEmitter.java
index 0f077c901ae8e75e6e5bc4ddc2370c1dba859d87..15b2d6ea87c9f4b79b61a1de56e4747d61d2d15b 100644
--- a/src-generated/edu/nps/moves/dis/ElectronicEmitter.java
+++ b/src-generated/edu/nps/moves/dis7/ElectronicEmitter.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
diff --git a/src-generated/edu/nps/moves/dis/EmitterBeam.java b/src-generated/edu/nps/moves/dis7/EmitterBeam.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/EmitterBeam.java
rename to src-generated/edu/nps/moves/dis7/EmitterBeam.java
index 4731be25e2a885606a4ccfb6c966775d021d686d..b282e47e76ea08ccb448d40b9c8ea3b57eba4390 100644
--- a/src-generated/edu/nps/moves/dis/EmitterBeam.java
+++ b/src-generated/edu/nps/moves/dis7/EmitterBeam.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
diff --git a/src-generated/edu/nps/moves/dis/EmitterSystem.java b/src-generated/edu/nps/moves/dis7/EmitterSystem.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/EmitterSystem.java
rename to src-generated/edu/nps/moves/dis7/EmitterSystem.java
index b5705eef4d2baef4cdb47133ecbaa90db5b3f2b8..d085a573e8694343c2984ca7a2984f01185df2bb 100644
--- a/src-generated/edu/nps/moves/dis/EmitterSystem.java
+++ b/src-generated/edu/nps/moves/dis7/EmitterSystem.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* This field shall specify information about a particular emitter system. Section 6.2.23.
diff --git a/src-generated/edu/nps/moves/dis/EngineFuel.java b/src-generated/edu/nps/moves/dis7/EngineFuel.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/EngineFuel.java
rename to src-generated/edu/nps/moves/dis7/EngineFuel.java
index 94264d0e65b5052458d4c6a05795687aafcec7b9..175811f1968728c4dd3111bc9dcd7ef84f2b7d0b 100644
--- a/src-generated/edu/nps/moves/dis/EngineFuel.java
+++ b/src-generated/edu/nps/moves/dis7/EngineFuel.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Information about an entity's engine fuel. Section 6.2.24.
diff --git a/src-generated/edu/nps/moves/dis/EngineFuelReload.java b/src-generated/edu/nps/moves/dis7/EngineFuelReload.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/EngineFuelReload.java
rename to src-generated/edu/nps/moves/dis7/EngineFuelReload.java
index 8c1deb9307ceaa93e7938e3461cc724d46bdc1c4..ed3320eadad47eebc1c24fd81d7e32cd9ece6f9d 100644
--- a/src-generated/edu/nps/moves/dis/EngineFuelReload.java
+++ b/src-generated/edu/nps/moves/dis7/EngineFuelReload.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* For each type or location of engine fuell, this record specifies the type, location, fuel measurement units, and reload quantity and maximum quantity. Section 6.2.25.
diff --git a/src-generated/edu/nps/moves/dis/EntityAssociationVP.java b/src-generated/edu/nps/moves/dis7/EntityAssociationVP.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/EntityAssociationVP.java
rename to src-generated/edu/nps/moves/dis7/EntityAssociationVP.java
index b62b9201d6a3549ecbed4015c12fae1f548816c9..073b87a12fbbf5e03dd1b831361d1cbbd8ddb5ae 100644
--- a/src-generated/edu/nps/moves/dis/EntityAssociationVP.java
+++ b/src-generated/edu/nps/moves/dis7/EntityAssociationVP.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Association or disassociation of two entities. Section 6.2.94.4.3
diff --git a/src-generated/edu/nps/moves/dis/EntityDamageStatusPdu.java b/src-generated/edu/nps/moves/dis7/EntityDamageStatusPdu.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/EntityDamageStatusPdu.java
rename to src-generated/edu/nps/moves/dis7/EntityDamageStatusPdu.java
index e11dcdb9354dc4f9dbcbaa88c6bc5f200ebb41cb..62d141251d480b81d0fc577def0c32da97d4704f 100644
--- a/src-generated/edu/nps/moves/dis/EntityDamageStatusPdu.java
+++ b/src-generated/edu/nps/moves/dis7/EntityDamageStatusPdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 7.3.5 Used to communicate detailed damage information sustained by an entity regardless of the source of the damage.
diff --git a/src-generated/edu/nps/moves/dis/EntityID.java b/src-generated/edu/nps/moves/dis7/EntityID.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/EntityID.java
rename to src-generated/edu/nps/moves/dis7/EntityID.java
index 38a0a9c61079a969fafebffa6a078d182fd914b6..07de31685bd1cf41470d80be6d02b039754a752a 100644
--- a/src-generated/edu/nps/moves/dis/EntityID.java
+++ b/src-generated/edu/nps/moves/dis7/EntityID.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* more laconically named EntityIdentifier
diff --git a/src-generated/edu/nps/moves/dis/EntityIdentifier.java b/src-generated/edu/nps/moves/dis7/EntityIdentifier.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/EntityIdentifier.java
rename to src-generated/edu/nps/moves/dis7/EntityIdentifier.java
index 0b00d31c690c7a43df20c55f7a971eca7e21ff26..0d24fc2f0551b879d47f26708ef49bd0af0ba090 100644
--- a/src-generated/edu/nps/moves/dis/EntityIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/EntityIdentifier.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Entity Identifier. Unique ID for entities in the world. Consists of an simulation address and a entity number. Section 6.2.28.
diff --git a/src-generated/edu/nps/moves/dis/EntityInformationFamilyPdu.java b/src-generated/edu/nps/moves/dis7/EntityInformationFamilyPdu.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/EntityInformationFamilyPdu.java
rename to src-generated/edu/nps/moves/dis7/EntityInformationFamilyPdu.java
index a68323ff9a39f9dc53f63c6ee51e01da010d2159..4509a8ee021fe0c1ecbe7c70988f444b98a71a8d 100644
--- a/src-generated/edu/nps/moves/dis/EntityInformationFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/EntityInformationFamilyPdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Section 5.3.3. Common superclass for EntityState, Collision, collision-elastic, and entity state update PDUs.
diff --git a/src-generated/edu/nps/moves/dis/EntityManagementFamilyPdu.java b/src-generated/edu/nps/moves/dis7/EntityManagementFamilyPdu.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/EntityManagementFamilyPdu.java
rename to src-generated/edu/nps/moves/dis7/EntityManagementFamilyPdu.java
index e170c481f6660594071cf29216b9deac9905ea97..5cd3759011279217903f4e32dedaac26672ee26b 100644
--- a/src-generated/edu/nps/moves/dis/EntityManagementFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/EntityManagementFamilyPdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Managment of grouping of PDUs, and more. Section 7.8
diff --git a/src-generated/edu/nps/moves/dis/EntityMarking.java b/src-generated/edu/nps/moves/dis7/EntityMarking.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/EntityMarking.java
rename to src-generated/edu/nps/moves/dis7/EntityMarking.java
index a91922abe5192332efa349e12fa451b1159f3f1e..3e82cca941e7182f8f719e43bb6befc412cb23cd 100644
--- a/src-generated/edu/nps/moves/dis/EntityMarking.java
+++ b/src-generated/edu/nps/moves/dis7/EntityMarking.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Specifies the character set used inthe first byte, followed by 11 characters of text data. Section 6.29
diff --git a/src-generated/edu/nps/moves/dis/EntityStatePdu.java b/src-generated/edu/nps/moves/dis7/EntityStatePdu.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/EntityStatePdu.java
rename to src-generated/edu/nps/moves/dis7/EntityStatePdu.java
index 9ce619220176440212e4ac26fdd3df33e0c5f371..56742e41b56bd241f9ca4094fcdd0ed649500ce5 100644
--- a/src-generated/edu/nps/moves/dis/EntityStatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/EntityStatePdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 7.2.2. Represents the postion and state of one entity in the world. See 5.3.2.
diff --git a/src-generated/edu/nps/moves/dis/EntityStateUpdatePdu.java b/src-generated/edu/nps/moves/dis7/EntityStateUpdatePdu.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/EntityStateUpdatePdu.java
rename to src-generated/edu/nps/moves/dis7/EntityStateUpdatePdu.java
index 636811a1f857cdeb2c7731d533a56efb1ddaf997..30a0f9e1644c8f6933bc704f384ec3cbfef7a1e3 100644
--- a/src-generated/edu/nps/moves/dis/EntityStateUpdatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/EntityStateUpdatePdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 7.2.5. Nonstatic information about a particular entity may be communicated by issuing an Entity State Update PDU. 5.3.5.
diff --git a/src-generated/edu/nps/moves/dis/EntityType.java b/src-generated/edu/nps/moves/dis7/EntityType.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/EntityType.java
rename to src-generated/edu/nps/moves/dis7/EntityType.java
index c5158c062da20df2950158a61abc73828df683e6..8b12ee00ad012ac86fb35e5b0c0c0a2640a469d8 100644
--- a/src-generated/edu/nps/moves/dis/EntityType.java
+++ b/src-generated/edu/nps/moves/dis7/EntityType.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Identifies the type of Entity
diff --git a/src-generated/edu/nps/moves/dis/EntityTypeRaw.java b/src-generated/edu/nps/moves/dis7/EntityTypeRaw.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/EntityTypeRaw.java
rename to src-generated/edu/nps/moves/dis7/EntityTypeRaw.java
index ed1cddcaafc0563c45acc66d8ccff4df7d40a52c..72e77b6418b861bf9d70302569120355e7c2cbe7 100644
--- a/src-generated/edu/nps/moves/dis/EntityTypeRaw.java
+++ b/src-generated/edu/nps/moves/dis7/EntityTypeRaw.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Identifies the type of Entity
diff --git a/src-generated/edu/nps/moves/dis/EntityTypeVP.java b/src-generated/edu/nps/moves/dis7/EntityTypeVP.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/EntityTypeVP.java
rename to src-generated/edu/nps/moves/dis7/EntityTypeVP.java
index 416adfe5ae78a829a201fe5fe5a344e1a1ea9269..dfc06e195ce8330095aa148f247488c74ec301fb 100644
--- a/src-generated/edu/nps/moves/dis/EntityTypeVP.java
+++ b/src-generated/edu/nps/moves/dis7/EntityTypeVP.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Association or disassociation of two entities. Section 6.2.94.5
diff --git a/src-generated/edu/nps/moves/dis/Environment.java b/src-generated/edu/nps/moves/dis7/Environment.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/Environment.java
rename to src-generated/edu/nps/moves/dis7/Environment.java
index 30467f8c9ec77037230ecacbae6a0a498d8a3287..d25eada3ef2fbf0fbb25ce6aaedaa2d9db843d07 100644
--- a/src-generated/edu/nps/moves/dis/Environment.java
+++ b/src-generated/edu/nps/moves/dis7/Environment.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Information about a geometry, a state associated with a geometry, a bounding volume, or an associated entity ID. 6.2.31, not fully defined. 'The current definitions can be found in DIS PCR 240'
diff --git a/src-generated/edu/nps/moves/dis/EnvironmentalProcessPdu.java b/src-generated/edu/nps/moves/dis7/EnvironmentalProcessPdu.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/EnvironmentalProcessPdu.java
rename to src-generated/edu/nps/moves/dis7/EnvironmentalProcessPdu.java
index 8aecf6d3b86cf3817b6276c730f0f353c09e7e24..e9af04f6a2e4f13bc030a61d74252f1d70085f98 100644
--- a/src-generated/edu/nps/moves/dis/EnvironmentalProcessPdu.java
+++ b/src-generated/edu/nps/moves/dis7/EnvironmentalProcessPdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 7.10.2 Used to communicate information about environmental effects and processes.
diff --git a/src-generated/edu/nps/moves/dis/EulerAngles.java b/src-generated/edu/nps/moves/dis7/EulerAngles.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/EulerAngles.java
rename to src-generated/edu/nps/moves/dis7/EulerAngles.java
index 3893d5d7715ee1a8d5c142b831c932e32b5a297f..e18e2602c080141cf4ecaf2382467e26e289bb22 100644
--- a/src-generated/edu/nps/moves/dis/EulerAngles.java
+++ b/src-generated/edu/nps/moves/dis7/EulerAngles.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Three floating point values representing an orientation, psi, theta, and phi, aka the euler angles, in radians. Section 6.2.33
diff --git a/src-generated/edu/nps/moves/dis/EventIdentifier.java b/src-generated/edu/nps/moves/dis7/EventIdentifier.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/EventIdentifier.java
rename to src-generated/edu/nps/moves/dis7/EventIdentifier.java
index 3dcca04d6a679705d3b154189cafb327affecfca..dd65e0cf846e02cf131f973ede4496b588cded59 100644
--- a/src-generated/edu/nps/moves/dis/EventIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/EventIdentifier.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Identifies an event in the world. Use this format for every PDU EXCEPT the LiveEntityPdu. Section 6.2.34.
diff --git a/src-generated/edu/nps/moves/dis/EventIdentifierLiveEntity.java b/src-generated/edu/nps/moves/dis7/EventIdentifierLiveEntity.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/EventIdentifierLiveEntity.java
rename to src-generated/edu/nps/moves/dis7/EventIdentifierLiveEntity.java
index 56ed044273a157eae1affdae6c0f42d8e8509d14..f1cabf73d835c130595fe384e0cdaf7a0edb4d65 100644
--- a/src-generated/edu/nps/moves/dis/EventIdentifierLiveEntity.java
+++ b/src-generated/edu/nps/moves/dis7/EventIdentifierLiveEntity.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Identifies an event in the world. Use this format for ONLY the LiveEntityPdu. Section 6.2.34.
diff --git a/src-generated/edu/nps/moves/dis/EventReportPdu.java b/src-generated/edu/nps/moves/dis7/EventReportPdu.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/EventReportPdu.java
rename to src-generated/edu/nps/moves/dis7/EventReportPdu.java
index 3ae79beb1aff279854b7e989171fe7fc399b7229..256e6bd0ea125c09a705d7cb0375aca37557fc1c 100644
--- a/src-generated/edu/nps/moves/dis/EventReportPdu.java
+++ b/src-generated/edu/nps/moves/dis7/EventReportPdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 7.5.12 Reports occurance of a significant event to the simulation manager. See 5.6.5.12.
diff --git a/src-generated/edu/nps/moves/dis/EventReportReliablePdu.java b/src-generated/edu/nps/moves/dis7/EventReportRPdu.java
similarity index 91%
rename from src-generated/edu/nps/moves/dis/EventReportReliablePdu.java
rename to src-generated/edu/nps/moves/dis7/EventReportRPdu.java
index 407870061e2d6217524e14e0f7e9bf7da6dc6f1c..c7be5bd68fffbbefe1dc3085bfb19c622bd47d7f 100644
--- a/src-generated/edu/nps/moves/dis/EventReportReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/EventReportRPdu.java
@@ -3,17 +3,17 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 5.12.4.12 Contains the same information as found in the Event Report PDU.
* IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
*/
-public class EventReportReliablePdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
+public class EventReportRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
{
/** Event type uid 73 */
protected EventReportEventType eventType = EventReportEventType.values()[0];
@@ -35,7 +35,7 @@ public class EventReportReliablePdu extends SimulationManagementWithReliabilityF
/** Constructor */
- public EventReportReliablePdu()
+ public EventReportRPdu()
{
setPduType( DISPDUType.EVENT_REPORT_R );
}
@@ -64,7 +64,7 @@ public int getMarshalledSize()
}
-public EventReportReliablePdu setEventType(EventReportEventType pEventType)
+public EventReportRPdu setEventType(EventReportEventType pEventType)
{
eventType = pEventType;
return this;
@@ -75,7 +75,7 @@ public EventReportEventType getEventType()
return eventType;
}
-public EventReportReliablePdu setPad1(int pPad1)
+public EventReportRPdu setPad1(int pPad1)
{
pad1 = pPad1;
return this;
@@ -86,7 +86,7 @@ public int getPad1()
return pad1;
}
-public EventReportReliablePdu setFixedDatumRecords(List<FixedDatum> pFixedDatumRecords)
+public EventReportRPdu setFixedDatumRecords(List<FixedDatum> pFixedDatumRecords)
{
fixedDatumRecords = pFixedDatumRecords;
return this;
@@ -97,7 +97,7 @@ public List<FixedDatum> getFixedDatumRecords()
return fixedDatumRecords;
}
-public EventReportReliablePdu setVariableDatumRecords(List<VariableDatum> pVariableDatumRecords)
+public EventReportRPdu setVariableDatumRecords(List<VariableDatum> pVariableDatumRecords)
{
variableDatumRecords = pVariableDatumRecords;
return this;
@@ -273,10 +273,10 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
{
boolean ivarsEqual = true;
- if(!(obj instanceof EventReportReliablePdu))
+ if(!(obj instanceof EventReportRPdu))
return false;
- final EventReportReliablePdu rhs = (EventReportReliablePdu)obj;
+ final EventReportRPdu rhs = (EventReportRPdu)obj;
if( ! (eventType == rhs.eventType)) ivarsEqual = false;
if( ! (pad1 == rhs.pad1)) ivarsEqual = false;
diff --git a/src-generated/edu/nps/moves/dis7/EventReportReliablePdu.java b/src-generated/edu/nps/moves/dis7/EventReportReliablePdu.java
new file mode 100644
index 0000000000000000000000000000000000000000..16006892d2922d032a78069f0be5cf1009dee8dd
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis7/EventReportReliablePdu.java
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * more descriptive name for a EventReportRPdu
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
+ */
+public class EventReportReliablePdu extends EventReportRPdu
+{}
diff --git a/src-generated/edu/nps/moves/dis/Expendable.java b/src-generated/edu/nps/moves/dis7/Expendable.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/Expendable.java
rename to src-generated/edu/nps/moves/dis7/Expendable.java
index f842da525c4b40b12107deb3b8a8e74abb11502e..2e2e4d679d96db06dda0b892e4c4fc2ad3221b0d 100644
--- a/src-generated/edu/nps/moves/dis/Expendable.java
+++ b/src-generated/edu/nps/moves/dis7/Expendable.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* An entity's expendable (chaff, flares, etc) information. Section 6.2.36
diff --git a/src-generated/edu/nps/moves/dis/ExpendableDescriptor.java b/src-generated/edu/nps/moves/dis7/ExpendableDescriptor.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/ExpendableDescriptor.java
rename to src-generated/edu/nps/moves/dis7/ExpendableDescriptor.java
index 68c5c15bac4459ab94b3e9a8eb9c2a0988218fa3..a9e4278da151915d558c0f912aaadb0d712c0a5d 100644
--- a/src-generated/edu/nps/moves/dis/ExpendableDescriptor.java
+++ b/src-generated/edu/nps/moves/dis7/ExpendableDescriptor.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Burst of chaff or expendible device. Section 6.2.19.4
diff --git a/src-generated/edu/nps/moves/dis/ExpendableReload.java b/src-generated/edu/nps/moves/dis7/ExpendableReload.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/ExpendableReload.java
rename to src-generated/edu/nps/moves/dis7/ExpendableReload.java
index d374c0d108ab798dd5579f3d3032db33f0395357..f7825203255974061a31911ea7441041978b1b20 100644
--- a/src-generated/edu/nps/moves/dis/ExpendableReload.java
+++ b/src-generated/edu/nps/moves/dis7/ExpendableReload.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* An entity's expendable (chaff, flares, etc) information. Section 6.2.37
diff --git a/src-generated/edu/nps/moves/dis/ExplosionDescriptor.java b/src-generated/edu/nps/moves/dis7/ExplosionDescriptor.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/ExplosionDescriptor.java
rename to src-generated/edu/nps/moves/dis7/ExplosionDescriptor.java
index b4555bc1d63495d40b568028b46a9197d09d5791..606f982b7f78a09794675d631c8cbb6272c246bc 100644
--- a/src-generated/edu/nps/moves/dis/ExplosionDescriptor.java
+++ b/src-generated/edu/nps/moves/dis7/ExplosionDescriptor.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Explosion of a non-munition. Section 6.2.19.3
diff --git a/src-generated/edu/nps/moves/dis/FalseTargetsAttribute.java b/src-generated/edu/nps/moves/dis7/FalseTargetsAttribute.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/FalseTargetsAttribute.java
rename to src-generated/edu/nps/moves/dis7/FalseTargetsAttribute.java
index 2b866f387dfdf5e914fd27d6d7c7a0d8663aad6d..455ba54688610efb9e8828be4b57bf502a43778f 100644
--- a/src-generated/edu/nps/moves/dis/FalseTargetsAttribute.java
+++ b/src-generated/edu/nps/moves/dis7/FalseTargetsAttribute.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* The False Targets attribute record shall be used to communicate discrete values that are associated with false targets jamming that cannot be referenced to an emitter mode. The values provided in the False Targets attri- bute record shall be considered valid only for the victim radar beams listed in the jamming beam's Track/Jam Data records (provided in the associated Electromagnetic Emission PDU). Section 6.2.21.3
diff --git a/src-generated/edu/nps/moves/dis/FastEntityStatePdu.java b/src-generated/edu/nps/moves/dis7/FastEntityStatePdu.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/FastEntityStatePdu.java
rename to src-generated/edu/nps/moves/dis7/FastEntityStatePdu.java
index 0afbacd97bce4bf400ef1688b406f365e6e15790..036347c2015fa2e764518fd4e44b93c091525d17 100644
--- a/src-generated/edu/nps/moves/dis/FastEntityStatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/FastEntityStatePdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Represents the postion and state of one entity in the world. This is identical in function to entity state pdu, but generates less garbage to collect in the Java world. Section 7.2.2.
diff --git a/src-generated/edu/nps/moves/dis/FirePdu.java b/src-generated/edu/nps/moves/dis7/FirePdu.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/FirePdu.java
rename to src-generated/edu/nps/moves/dis7/FirePdu.java
index 2723bae803397499329ba0c5b8221b48d55ee26e..5de1c2bb4f6261cc44a63fecf69f03e335eb89c9 100644
--- a/src-generated/edu/nps/moves/dis/FirePdu.java
+++ b/src-generated/edu/nps/moves/dis7/FirePdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 7.3.2 Used to communicate the firing of a weapon or expendable.
diff --git a/src-generated/edu/nps/moves/dis/FixedDatum.java b/src-generated/edu/nps/moves/dis7/FixedDatum.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/FixedDatum.java
rename to src-generated/edu/nps/moves/dis7/FixedDatum.java
index a522da19f9d49c408ce2c9c4ac051db23e31accc..788974aa3702ccc3013316325e8d57b146a28b47 100644
--- a/src-generated/edu/nps/moves/dis/FixedDatum.java
+++ b/src-generated/edu/nps/moves/dis7/FixedDatum.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Fixed Datum Record. Section 6.2.38
diff --git a/src-generated/edu/nps/moves/dis/FundamentalOperationalData.java b/src-generated/edu/nps/moves/dis7/FundamentalOperationalData.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/FundamentalOperationalData.java
rename to src-generated/edu/nps/moves/dis7/FundamentalOperationalData.java
index 7e7b899b03631848855deb1fd4a68da84b360170..279b9b1433a8ebce3c800d03108f998dc60bf408 100644
--- a/src-generated/edu/nps/moves/dis/FundamentalOperationalData.java
+++ b/src-generated/edu/nps/moves/dis7/FundamentalOperationalData.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Basic operational data for IFF. Section 6.2.39
diff --git a/src-generated/edu/nps/moves/dis/GridAxisDescriptor.java b/src-generated/edu/nps/moves/dis7/GridAxisDescriptor.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/GridAxisDescriptor.java
rename to src-generated/edu/nps/moves/dis7/GridAxisDescriptor.java
index 97e4c5d64f4a2ff1f27666a969c577ea5cd792ef..73fe6e9c7c4f1241464b29bc6319bb3b553a229a 100644
--- a/src-generated/edu/nps/moves/dis/GridAxisDescriptor.java
+++ b/src-generated/edu/nps/moves/dis7/GridAxisDescriptor.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
diff --git a/src-generated/edu/nps/moves/dis/GridAxisDescriptorFixed.java b/src-generated/edu/nps/moves/dis7/GridAxisDescriptorFixed.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/GridAxisDescriptorFixed.java
rename to src-generated/edu/nps/moves/dis7/GridAxisDescriptorFixed.java
index 42258c9eb091655cd8739341a80f55db22ae2f61..81240c7d89b791d202074744b48112aadeadda57 100644
--- a/src-generated/edu/nps/moves/dis/GridAxisDescriptorFixed.java
+++ b/src-generated/edu/nps/moves/dis7/GridAxisDescriptorFixed.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Grid axis record for fixed data. Section 6.2.41
diff --git a/src-generated/edu/nps/moves/dis/GridAxisDescriptorVariable.java b/src-generated/edu/nps/moves/dis7/GridAxisDescriptorVariable.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/GridAxisDescriptorVariable.java
rename to src-generated/edu/nps/moves/dis7/GridAxisDescriptorVariable.java
index 80cf59d9581a5cfd6a25d5083992c41e390b84a5..e806015b42da0ebc85e71a4c2e29b767f7628638 100644
--- a/src-generated/edu/nps/moves/dis/GridAxisDescriptorVariable.java
+++ b/src-generated/edu/nps/moves/dis7/GridAxisDescriptorVariable.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Grid axis descriptor fo variable spacing axis data.
diff --git a/src-generated/edu/nps/moves/dis/GridData.java b/src-generated/edu/nps/moves/dis7/GridData.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/GridData.java
rename to src-generated/edu/nps/moves/dis7/GridData.java
index 6321922d5fb2c00dc45192afa72297d9774f629f..4258f2e8dbe6703279aec502c12911e02aaccc74 100644
--- a/src-generated/edu/nps/moves/dis/GridData.java
+++ b/src-generated/edu/nps/moves/dis7/GridData.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 6.2.41, table 68
diff --git a/src-generated/edu/nps/moves/dis/GridDataType0.java b/src-generated/edu/nps/moves/dis7/GridDataType0.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/GridDataType0.java
rename to src-generated/edu/nps/moves/dis7/GridDataType0.java
index bd7667c5e2364b9c6c619b1b674b0252205d8f2e..ddc50d448630cc2045d2dd9f36ce501ef9d49df8 100644
--- a/src-generated/edu/nps/moves/dis/GridDataType0.java
+++ b/src-generated/edu/nps/moves/dis7/GridDataType0.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 6.2.41, table 68
diff --git a/src-generated/edu/nps/moves/dis/GridDataType1.java b/src-generated/edu/nps/moves/dis7/GridDataType1.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/GridDataType1.java
rename to src-generated/edu/nps/moves/dis7/GridDataType1.java
index 669ea7a719ec5419f3a40ec2bc4b7ef4317e58ef..c840f804efd8a753c3e75928c2b1a40eb1755730 100644
--- a/src-generated/edu/nps/moves/dis/GridDataType1.java
+++ b/src-generated/edu/nps/moves/dis7/GridDataType1.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 6.2.41, table 69
diff --git a/src-generated/edu/nps/moves/dis/GridDataType2.java b/src-generated/edu/nps/moves/dis7/GridDataType2.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/GridDataType2.java
rename to src-generated/edu/nps/moves/dis7/GridDataType2.java
index c0f05d791884219f91aea5305901acf3d5d15f5e..8955a1600c280350cb96df114b2ad77cf03ef00c 100644
--- a/src-generated/edu/nps/moves/dis/GridDataType2.java
+++ b/src-generated/edu/nps/moves/dis7/GridDataType2.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 6.2.41, table 70
diff --git a/src-generated/edu/nps/moves/dis/GriddedDataPdu.java b/src-generated/edu/nps/moves/dis7/GriddedDataPdu.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/GriddedDataPdu.java
rename to src-generated/edu/nps/moves/dis7/GriddedDataPdu.java
index a439eff8637910a89371a7ae79ac93ea4c656edf..ef770d833a5a61968bc1a50841bb8ce1ae2d98ba 100644
--- a/src-generated/edu/nps/moves/dis/GriddedDataPdu.java
+++ b/src-generated/edu/nps/moves/dis7/GriddedDataPdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 7.10.3 Used to communicate information about global, spatially varying environmental effects.
diff --git a/src-generated/edu/nps/moves/dis/GroupID.java b/src-generated/edu/nps/moves/dis7/GroupID.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/GroupID.java
rename to src-generated/edu/nps/moves/dis7/GroupID.java
index c93f5686ed82eab1879603dc9c31fe6cda3cd187..ce96c55b2321986b08a36d5f31cb9ae3ba1a9788 100644
--- a/src-generated/edu/nps/moves/dis/GroupID.java
+++ b/src-generated/edu/nps/moves/dis7/GroupID.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Unique designation of a group of entities contained in the isGroupOfPdu. Represents a group of entities rather than a single entity. Section 6.2.43
diff --git a/src-generated/edu/nps/moves/dis/IFFData.java b/src-generated/edu/nps/moves/dis7/IFFData.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/IFFData.java
rename to src-generated/edu/nps/moves/dis7/IFFData.java
index c18203347106f9e201fc0dc819014f04522da8de..f827644456c2b8df3e479e1b887bb27216073ec9 100644
--- a/src-generated/edu/nps/moves/dis/IFFData.java
+++ b/src-generated/edu/nps/moves/dis7/IFFData.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* repeating element in IFF Data specification record
diff --git a/src-generated/edu/nps/moves/dis/IFFFundamentalParameterData.java b/src-generated/edu/nps/moves/dis7/IFFFundamentalParameterData.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/IFFFundamentalParameterData.java
rename to src-generated/edu/nps/moves/dis7/IFFFundamentalParameterData.java
index db7b4723d77b8f2b214fad6d27088f12593c3a79..f6bb65cb29d04ae10bb57cc5db73137f1be56fda 100644
--- a/src-generated/edu/nps/moves/dis/IFFFundamentalParameterData.java
+++ b/src-generated/edu/nps/moves/dis7/IFFFundamentalParameterData.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Fundamental IFF atc data. Section 6.2.45
diff --git a/src-generated/edu/nps/moves/dis/IffLayer2Pdu.java b/src-generated/edu/nps/moves/dis7/IFFLayer2Pdu.java
similarity index 79%
rename from src-generated/edu/nps/moves/dis/IffLayer2Pdu.java
rename to src-generated/edu/nps/moves/dis7/IFFLayer2Pdu.java
index 23ab8247b048e94b9215f2d26f76ce0fead5f5f7..71a2ac3badc7d19b00a7e8c70c3a9e7bc5f2fbee 100644
--- a/src-generated/edu/nps/moves/dis/IffLayer2Pdu.java
+++ b/src-generated/edu/nps/moves/dis7/IFFLayer2Pdu.java
@@ -3,17 +3,17 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Section 5.3.7.4.2 When present, layer 2 should follow layer 1 and have the following fields. This requires manual cleanup. the beamData attribute semantics are used in multiple ways. UNFINSISHED
* IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
*/
-public class IffLayer2Pdu extends IffPdu implements Serializable
+public class IFFLayer2Pdu extends IFFPdu implements Serializable
{
/** layer header */
protected LayerHeader layerHeader = new LayerHeader();
@@ -28,11 +28,11 @@ public class IffLayer2Pdu extends IffPdu implements Serializable
protected short numberOfParameters;
/** variable length list of fundamental parameters. */
- protected List< IFFFundamentalParameterData > fundamentalIffParameters = new ArrayList< IFFFundamentalParameterData >();
+ protected List< IFFFundamentalParameterData > fundamentalIFFParameters = new ArrayList< IFFFundamentalParameterData >();
/** Constructor */
- public IffLayer2Pdu()
+ public IFFLayer2Pdu()
{
}
@@ -46,9 +46,9 @@ public int getMarshalledSize()
marshalSize += 1; // secondaryOpParameter1
marshalSize += 1; // secondaryOpParameter2
marshalSize += 2; // numberOfParameters
- for(int idx=0; idx < fundamentalIffParameters.size(); idx++)
+ for(int idx=0; idx < fundamentalIFFParameters.size(); idx++)
{
- IFFFundamentalParameterData listElement = fundamentalIffParameters.get(idx);
+ IFFFundamentalParameterData listElement = fundamentalIFFParameters.get(idx);
marshalSize += listElement.getMarshalledSize();
}
@@ -56,7 +56,7 @@ public int getMarshalledSize()
}
-public IffLayer2Pdu setLayerHeader(LayerHeader pLayerHeader)
+public IFFLayer2Pdu setLayerHeader(LayerHeader pLayerHeader)
{
layerHeader = pLayerHeader;
return this;
@@ -67,7 +67,7 @@ public LayerHeader getLayerHeader()
return layerHeader;
}
-public IffLayer2Pdu setBeamData(BeamData pBeamData)
+public IFFLayer2Pdu setBeamData(BeamData pBeamData)
{
beamData = pBeamData;
return this;
@@ -78,7 +78,7 @@ public BeamData getBeamData()
return beamData;
}
-public IffLayer2Pdu setSecondaryOpParameter1(byte pSecondaryOpParameter1)
+public IFFLayer2Pdu setSecondaryOpParameter1(byte pSecondaryOpParameter1)
{
secondaryOpParameter1 = pSecondaryOpParameter1;
return this;
@@ -89,7 +89,7 @@ public byte getSecondaryOpParameter1()
return secondaryOpParameter1;
}
-public IffLayer2Pdu setSecondaryOpParameter2(byte pSecondaryOpParameter2)
+public IFFLayer2Pdu setSecondaryOpParameter2(byte pSecondaryOpParameter2)
{
secondaryOpParameter2 = pSecondaryOpParameter2;
return this;
@@ -100,15 +100,15 @@ public byte getSecondaryOpParameter2()
return secondaryOpParameter2;
}
-public IffLayer2Pdu setFundamentalIffParameters(List<IFFFundamentalParameterData> pFundamentalIffParameters)
+public IFFLayer2Pdu setFundamentalIFFParameters(List<IFFFundamentalParameterData> pFundamentalIFFParameters)
{
- fundamentalIffParameters = pFundamentalIffParameters;
+ fundamentalIFFParameters = pFundamentalIFFParameters;
return this;
}
-public List<IFFFundamentalParameterData> getFundamentalIffParameters()
+public List<IFFFundamentalParameterData> getFundamentalIFFParameters()
{
- return fundamentalIffParameters;
+ return fundamentalIFFParameters;
}
/**
@@ -125,11 +125,11 @@ public void marshal(DataOutputStream dos)
beamData.marshal(dos);
dos.writeByte( (byte)secondaryOpParameter1);
dos.writeByte( (byte)secondaryOpParameter2);
- dos.writeShort( (short)fundamentalIffParameters.size());
+ dos.writeShort( (short)fundamentalIFFParameters.size());
- for(int idx = 0; idx < fundamentalIffParameters.size(); idx++)
+ for(int idx = 0; idx < fundamentalIFFParameters.size(); idx++)
{
- IFFFundamentalParameterData aIFFFundamentalParameterData = fundamentalIffParameters.get(idx);
+ IFFFundamentalParameterData aIFFFundamentalParameterData = fundamentalIFFParameters.get(idx);
aIFFFundamentalParameterData.marshal(dos);
}
@@ -165,7 +165,7 @@ public int unmarshal(DataInputStream dis)
{
IFFFundamentalParameterData anX = new IFFFundamentalParameterData();
uPosition += anX.unmarshal(dis);
- fundamentalIffParameters.add(anX);
+ fundamentalIFFParameters.add(anX);
}
}
@@ -191,11 +191,11 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
beamData.marshal(buff);
buff.put( (byte)secondaryOpParameter1);
buff.put( (byte)secondaryOpParameter2);
- buff.putShort( (short)fundamentalIffParameters.size());
+ buff.putShort( (short)fundamentalIFFParameters.size());
- for(int idx = 0; idx < fundamentalIffParameters.size(); idx++)
+ for(int idx = 0; idx < fundamentalIFFParameters.size(); idx++)
{
- IFFFundamentalParameterData aIFFFundamentalParameterData = (IFFFundamentalParameterData)fundamentalIffParameters.get(idx);
+ IFFFundamentalParameterData aIFFFundamentalParameterData = (IFFFundamentalParameterData)fundamentalIFFParameters.get(idx);
aIFFFundamentalParameterData.marshal(buff);
}
@@ -222,7 +222,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
{
IFFFundamentalParameterData anX = new IFFFundamentalParameterData();
anX.unmarshal(buff);
- fundamentalIffParameters.add(anX);
+ fundamentalIFFParameters.add(anX);
}
return getMarshalledSize();
@@ -251,10 +251,10 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
{
boolean ivarsEqual = true;
- if(!(obj instanceof IffLayer2Pdu))
+ if(!(obj instanceof IFFLayer2Pdu))
return false;
- final IffLayer2Pdu rhs = (IffLayer2Pdu)obj;
+ final IFFLayer2Pdu rhs = (IFFLayer2Pdu)obj;
if( ! (layerHeader.equals( rhs.layerHeader) )) ivarsEqual = false;
if( ! (beamData.equals( rhs.beamData) )) ivarsEqual = false;
@@ -262,8 +262,8 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
if( ! (secondaryOpParameter2 == rhs.secondaryOpParameter2)) ivarsEqual = false;
if( ! (numberOfParameters == rhs.numberOfParameters)) ivarsEqual = false;
- for(int idx = 0; idx < fundamentalIffParameters.size(); idx++)
- if( ! ( fundamentalIffParameters.get(idx).equals(rhs.fundamentalIffParameters.get(idx)))) ivarsEqual = false;
+ for(int idx = 0; idx < fundamentalIFFParameters.size(); idx++)
+ if( ! ( fundamentalIFFParameters.get(idx).equals(rhs.fundamentalIFFParameters.get(idx)))) ivarsEqual = false;
return ivarsEqual && super.equalsImpl(rhs);
}
diff --git a/src-generated/edu/nps/moves/dis/IffPdu.java b/src-generated/edu/nps/moves/dis7/IFFPdu.java
similarity index 91%
rename from src-generated/edu/nps/moves/dis/IffPdu.java
rename to src-generated/edu/nps/moves/dis7/IFFPdu.java
index 514eeacf8bf26f8e0f5b30374db4893c206daff2..db5beb9e79a5da5f6f0ba797bb04c52967e416eb 100644
--- a/src-generated/edu/nps/moves/dis/IffPdu.java
+++ b/src-generated/edu/nps/moves/dis7/IFFPdu.java
@@ -3,16 +3,16 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
*/
-public class IffPdu extends DistributedEmissionsFamilyPdu implements Serializable
+public class IFFPdu extends DistributedEmissionsFamilyPdu implements Serializable
{
/** ID of the entity that is the source of the emissions */
protected EntityID emittingEntityId = new EntityID();
@@ -35,7 +35,7 @@ public class IffPdu extends DistributedEmissionsFamilyPdu implements Serializabl
/** Constructor */
- public IffPdu()
+ public IFFPdu()
{
setPduType( DISPDUType.IFF );
}
@@ -57,7 +57,7 @@ public int getMarshalledSize()
}
-public IffPdu setEmittingEntityId(EntityID pEmittingEntityId)
+public IFFPdu setEmittingEntityId(EntityID pEmittingEntityId)
{
emittingEntityId = pEmittingEntityId;
return this;
@@ -68,7 +68,7 @@ public EntityID getEmittingEntityId()
return emittingEntityId;
}
-public IffPdu setEventID(EventIdentifier pEventID)
+public IFFPdu setEventID(EventIdentifier pEventID)
{
eventID = pEventID;
return this;
@@ -79,7 +79,7 @@ public EventIdentifier getEventID()
return eventID;
}
-public IffPdu setLocation(Vector3Float pLocation)
+public IFFPdu setLocation(Vector3Float pLocation)
{
location = pLocation;
return this;
@@ -90,7 +90,7 @@ public Vector3Float getLocation()
return location;
}
-public IffPdu setSystemID(SystemIdentifier pSystemID)
+public IFFPdu setSystemID(SystemIdentifier pSystemID)
{
systemID = pSystemID;
return this;
@@ -101,7 +101,7 @@ public SystemIdentifier getSystemID()
return systemID;
}
-public IffPdu setSystemDesignator(byte pSystemDesignator)
+public IFFPdu setSystemDesignator(byte pSystemDesignator)
{
systemDesignator = pSystemDesignator;
return this;
@@ -112,7 +112,7 @@ public byte getSystemDesignator()
return systemDesignator;
}
-public IffPdu setSystemSpecificData(byte pSystemSpecificData)
+public IFFPdu setSystemSpecificData(byte pSystemSpecificData)
{
systemSpecificData = pSystemSpecificData;
return this;
@@ -123,7 +123,7 @@ public byte getSystemSpecificData()
return systemSpecificData;
}
-public IffPdu setFundamentalParameters(FundamentalOperationalData pFundamentalParameters)
+public IFFPdu setFundamentalParameters(FundamentalOperationalData pFundamentalParameters)
{
fundamentalParameters = pFundamentalParameters;
return this;
@@ -253,10 +253,10 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
{
boolean ivarsEqual = true;
- if(!(obj instanceof IffPdu))
+ if(!(obj instanceof IFFPdu))
return false;
- final IffPdu rhs = (IffPdu)obj;
+ final IFFPdu rhs = (IFFPdu)obj;
if( ! (emittingEntityId.equals( rhs.emittingEntityId) )) ivarsEqual = false;
if( ! (eventID.equals( rhs.eventID) )) ivarsEqual = false;
diff --git a/src-generated/edu/nps/moves/dis/IOCommsNodeRecord.java b/src-generated/edu/nps/moves/dis7/IOCommsNodeRecord.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/IOCommsNodeRecord.java
rename to src-generated/edu/nps/moves/dis7/IOCommsNodeRecord.java
index a0b79ee07b3d328aaa09de6041d00257e871c339..0a779b938e967b548020a27330502c386ed26282 100644
--- a/src-generated/edu/nps/moves/dis/IOCommsNodeRecord.java
+++ b/src-generated/edu/nps/moves/dis7/IOCommsNodeRecord.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 6.2.48.2
diff --git a/src-generated/edu/nps/moves/dis/IOEffectRecord.java b/src-generated/edu/nps/moves/dis7/IOEffectRecord.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/IOEffectRecord.java
rename to src-generated/edu/nps/moves/dis7/IOEffectRecord.java
index 606d3b0426916dcb8a74720360660c6ad536ae0a..b04ad9fb4b03cca9d30faf33fcac8dbed6c4dc15 100644
--- a/src-generated/edu/nps/moves/dis/IOEffectRecord.java
+++ b/src-generated/edu/nps/moves/dis7/IOEffectRecord.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 6.2.48.3
diff --git a/src-generated/edu/nps/moves/dis/IORecord.java b/src-generated/edu/nps/moves/dis7/IORecord.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/IORecord.java
rename to src-generated/edu/nps/moves/dis7/IORecord.java
index 9720b9be21cd1ee80396897a337c92c864e68c34..da800477c95803d28a360ee4611e43f0ef71b791 100644
--- a/src-generated/edu/nps/moves/dis/IORecord.java
+++ b/src-generated/edu/nps/moves/dis7/IORecord.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 6.2.48
diff --git a/src-generated/edu/nps/moves/dis7/IdentificationFriendOrFoePdu.java b/src-generated/edu/nps/moves/dis7/IdentificationFriendOrFoePdu.java
new file mode 100644
index 0000000000000000000000000000000000000000..f02fe6b32fea1609cb0b4765a3a2e6b7f121bd18
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis7/IdentificationFriendOrFoePdu.java
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * more descriptive name for an IFFPdu
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
+ */
+public class IdentificationFriendOrFoePdu extends IFFPdu
+{}
diff --git a/src-generated/edu/nps/moves/dis/IffDataSpecification.java b/src-generated/edu/nps/moves/dis7/IffDataSpecification.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/IffDataSpecification.java
rename to src-generated/edu/nps/moves/dis7/IffDataSpecification.java
index cd3a0ab67a3bcc4a6ff418b7857ba8312aa1522f..a6c302f453da2d990ef73ccda981e75a2c970f95 100644
--- a/src-generated/edu/nps/moves/dis/IffDataSpecification.java
+++ b/src-generated/edu/nps/moves/dis7/IffDataSpecification.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Requires hand coding to be useful. Section 6.2.43
diff --git a/src-generated/edu/nps/moves/dis/InformationOperationsActionPdu.java b/src-generated/edu/nps/moves/dis7/InformationOperationsActionPdu.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/InformationOperationsActionPdu.java
rename to src-generated/edu/nps/moves/dis7/InformationOperationsActionPdu.java
index 7db3db08dffb91c672cb870a7a86842fc5c4ad26..8c4b602c6b99362a636b26d756c5ca53e47a4a1b 100644
--- a/src-generated/edu/nps/moves/dis/InformationOperationsActionPdu.java
+++ b/src-generated/edu/nps/moves/dis7/InformationOperationsActionPdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 5.13.3.1 Used to communicate an IO attack or the effects of an IO attack on one or more target entities.
diff --git a/src-generated/edu/nps/moves/dis/InformationOperationsFamilyPdu.java b/src-generated/edu/nps/moves/dis7/InformationOperationsFamilyPdu.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/InformationOperationsFamilyPdu.java
rename to src-generated/edu/nps/moves/dis7/InformationOperationsFamilyPdu.java
index bdf7ff0ecee432a70580a71cd0349147be7619ea..6343bec4291ed217aa62a61cf5c280d5d59f06c9 100644
--- a/src-generated/edu/nps/moves/dis/InformationOperationsFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/InformationOperationsFamilyPdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
diff --git a/src-generated/edu/nps/moves/dis/InformationOperationsReportPdu.java b/src-generated/edu/nps/moves/dis7/InformationOperationsReportPdu.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/InformationOperationsReportPdu.java
rename to src-generated/edu/nps/moves/dis7/InformationOperationsReportPdu.java
index 12eafba6e8de87f375ca65c3fa8c6f450d39d688..0b004dc23ef823eb81c650451a6aca0e21fb7d55 100644
--- a/src-generated/edu/nps/moves/dis/InformationOperationsReportPdu.java
+++ b/src-generated/edu/nps/moves/dis7/InformationOperationsReportPdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 5.13.4.1 Used to communicate the effects of an IO attack on one or more target entities.
diff --git a/src-generated/edu/nps/moves/dis/IntercomCommunicationsParameters.java b/src-generated/edu/nps/moves/dis7/IntercomCommunicationsParameters.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/IntercomCommunicationsParameters.java
rename to src-generated/edu/nps/moves/dis7/IntercomCommunicationsParameters.java
index 11356249c07b61e79786e4bdc362301c1a1cfb0b..bdacc77d785d954f491c2366597e1bc538df3103 100644
--- a/src-generated/edu/nps/moves/dis/IntercomCommunicationsParameters.java
+++ b/src-generated/edu/nps/moves/dis7/IntercomCommunicationsParameters.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Intercom communcations parameters. Section 6.2.46
diff --git a/src-generated/edu/nps/moves/dis/IntercomControlPdu.java b/src-generated/edu/nps/moves/dis7/IntercomControlPdu.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/IntercomControlPdu.java
rename to src-generated/edu/nps/moves/dis7/IntercomControlPdu.java
index d4d2bef35828123c3e1a9985e74a751bc3979ea8..83953edc406c14c9953dcc75e50b9804140d2eb9 100644
--- a/src-generated/edu/nps/moves/dis/IntercomControlPdu.java
+++ b/src-generated/edu/nps/moves/dis7/IntercomControlPdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 5.8.7 Communicates the state of a particular intercom device, request an action of another intercom device, or respond to an action request.
diff --git a/src-generated/edu/nps/moves/dis/IntercomIdentifier.java b/src-generated/edu/nps/moves/dis7/IntercomIdentifier.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/IntercomIdentifier.java
rename to src-generated/edu/nps/moves/dis7/IntercomIdentifier.java
index abc9413a515cd36ea0b6ba6f2bcd75d6b0d8659c..766698cc9806f6a4b97edd3b16aa053fd1453788 100644
--- a/src-generated/edu/nps/moves/dis/IntercomIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/IntercomIdentifier.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Unique designation of an attached or unattached intercom in an event or exercirse. Section 6.2.48
diff --git a/src-generated/edu/nps/moves/dis/IntercomReferenceID.java b/src-generated/edu/nps/moves/dis7/IntercomReferenceID.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/IntercomReferenceID.java
rename to src-generated/edu/nps/moves/dis7/IntercomReferenceID.java
index 5c4638774e729f626274183055d49faa09b97594..b9e7b802668537ab95d6a38f2bccbc1a4c306039 100644
--- a/src-generated/edu/nps/moves/dis/IntercomReferenceID.java
+++ b/src-generated/edu/nps/moves/dis7/IntercomReferenceID.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
diff --git a/src-generated/edu/nps/moves/dis/IntercomSignalPdu.java b/src-generated/edu/nps/moves/dis7/IntercomSignalPdu.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/IntercomSignalPdu.java
rename to src-generated/edu/nps/moves/dis7/IntercomSignalPdu.java
index 532fa1fa863e4f7c180acc509e0fedf076942f07..bf29543ad6d4c42afa40fa4143edc1e78059fa7b 100644
--- a/src-generated/edu/nps/moves/dis/IntercomSignalPdu.java
+++ b/src-generated/edu/nps/moves/dis7/IntercomSignalPdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 5.8.6 Conveys the audio or digital data that is used to communicate between simulated intercom devices
diff --git a/src-generated/edu/nps/moves/dis/IsGroupOfPdu.java b/src-generated/edu/nps/moves/dis7/IsGroupOfPdu.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/IsGroupOfPdu.java
rename to src-generated/edu/nps/moves/dis7/IsGroupOfPdu.java
index 93369f0b6ec9d235541a11405569ad2f446bcc75..99af4aeffb3629bb1254615188116c2a356fda9c 100644
--- a/src-generated/edu/nps/moves/dis/IsGroupOfPdu.java
+++ b/src-generated/edu/nps/moves/dis7/IsGroupOfPdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 5.9.3.1 The IsGroupOf PDU shall communicate information about the individual states of a group of entities, including state information that is necessary for the receiving simulation applications to represent the issuing group of entities in the simulation applications’ own simulation.
diff --git a/src-generated/edu/nps/moves/dis/IsPartOfPdu.java b/src-generated/edu/nps/moves/dis7/IsPartOfPdu.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/IsPartOfPdu.java
rename to src-generated/edu/nps/moves/dis7/IsPartOfPdu.java
index 1152ba43c133dbb584a1860c6aa040bda72fa691..0bd91c2b46a19458124651168ea565ad20c69fe9 100644
--- a/src-generated/edu/nps/moves/dis/IsPartOfPdu.java
+++ b/src-generated/edu/nps/moves/dis7/IsPartOfPdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 5.9.5 Used to request hierarchical linkage of separately hosted simulation entities
diff --git a/src-generated/edu/nps/moves/dis/JammingTechnique.java b/src-generated/edu/nps/moves/dis7/JammingTechnique.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/JammingTechnique.java
rename to src-generated/edu/nps/moves/dis7/JammingTechnique.java
index 495e5104ee12f6c21c54e964bedaa5765316dcf6..1d825cf3f083946f177d08e41f8bf19823a57686 100644
--- a/src-generated/edu/nps/moves/dis/JammingTechnique.java
+++ b/src-generated/edu/nps/moves/dis7/JammingTechnique.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Jamming technique. Section 6.2.49, uid 284
diff --git a/src-generated/edu/nps/moves/dis/LEDetonationPdu.java b/src-generated/edu/nps/moves/dis7/LEDetonationPdu.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/LEDetonationPdu.java
rename to src-generated/edu/nps/moves/dis7/LEDetonationPdu.java
index b477db8a2dc539ea660a71a041c9a589a9067af0..69db424af179b0033b258dea7a2e44b1da11d038 100644
--- a/src-generated/edu/nps/moves/dis/LEDetonationPdu.java
+++ b/src-generated/edu/nps/moves/dis7/LEDetonationPdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 9.4.6 Communicate information associated with the impact or detonation of a munition.
diff --git a/src-generated/edu/nps/moves/dis/LEFirePdu.java b/src-generated/edu/nps/moves/dis7/LEFirePdu.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/LEFirePdu.java
rename to src-generated/edu/nps/moves/dis7/LEFirePdu.java
index 6a805cce96b91cecaf25e2964886b8de47c6c200..a35b04b06f7141a9b99fdb2520b8e732c36f6e0f 100644
--- a/src-generated/edu/nps/moves/dis/LEFirePdu.java
+++ b/src-generated/edu/nps/moves/dis7/LEFirePdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 9.4.5 Representation of weapons fire in a DIS exercise involving LEs.
diff --git a/src-generated/edu/nps/moves/dis/LEVector3FixedByte.java b/src-generated/edu/nps/moves/dis7/LEVector3FixedByte.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/LEVector3FixedByte.java
rename to src-generated/edu/nps/moves/dis7/LEVector3FixedByte.java
index 1550d9cd209f27e50f3f61eace64e3127b2ea934..735be47a10da018d05cee85ce1a9374d20964482 100644
--- a/src-generated/edu/nps/moves/dis/LEVector3FixedByte.java
+++ b/src-generated/edu/nps/moves/dis7/LEVector3FixedByte.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 3 x 8-bit fixed binary
diff --git a/src-generated/edu/nps/moves/dis/LaunchedMunitionRecord.java b/src-generated/edu/nps/moves/dis7/LaunchedMunitionRecord.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/LaunchedMunitionRecord.java
rename to src-generated/edu/nps/moves/dis7/LaunchedMunitionRecord.java
index 1d1e7e781dae9f8f830c88179005d6077e0c39e8..ca0994b4f7dc5033af0736d1fb50f5c4e7ed6baf 100644
--- a/src-generated/edu/nps/moves/dis/LaunchedMunitionRecord.java
+++ b/src-generated/edu/nps/moves/dis7/LaunchedMunitionRecord.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Identity of a communications node. Section 6.2.50
diff --git a/src-generated/edu/nps/moves/dis/LayerHeader.java b/src-generated/edu/nps/moves/dis7/LayerHeader.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/LayerHeader.java
rename to src-generated/edu/nps/moves/dis7/LayerHeader.java
index d4606b852b25e17a17d2953ce75206fee494d559..6f2f5450c97b85f2b871a04ef8e6c94fcfbf0e12 100644
--- a/src-generated/edu/nps/moves/dis/LayerHeader.java
+++ b/src-generated/edu/nps/moves/dis7/LayerHeader.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* The identification of the additional information layer number, layer-specific information, and the length of the layer. Section 6.2.51
diff --git a/src-generated/edu/nps/moves/dis/LinearObjectStatePdu.java b/src-generated/edu/nps/moves/dis7/LinearObjectStatePdu.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/LinearObjectStatePdu.java
rename to src-generated/edu/nps/moves/dis7/LinearObjectStatePdu.java
index 46a4150b6dd92fc0e38069045aab22d029814305..d24ae9fb847c60e87cff10f47616a199d8907f5e 100644
--- a/src-generated/edu/nps/moves/dis/LinearObjectStatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/LinearObjectStatePdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 7.10.5 Used to communicate detailed information about the addition/modification of a synthetic environment object that is geometrically anchored to the terrain with one point and has size and orientation.
diff --git a/src-generated/edu/nps/moves/dis/LinearSegmentParameter.java b/src-generated/edu/nps/moves/dis7/LinearSegmentParameter.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/LinearSegmentParameter.java
rename to src-generated/edu/nps/moves/dis7/LinearSegmentParameter.java
index 400ad7a0e5f5c03363a6e3aff079e70d69dd647e..5130a3b74b225f318b93c08d11c18843670ce72a 100644
--- a/src-generated/edu/nps/moves/dis/LinearSegmentParameter.java
+++ b/src-generated/edu/nps/moves/dis7/LinearSegmentParameter.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* The specification of an individual segment of a linear segment synthetic environment object in a Linear Object State PDU Section 6.2.52
diff --git a/src-generated/edu/nps/moves/dis/LiveDeadReckoningParameters.java b/src-generated/edu/nps/moves/dis7/LiveDeadReckoningParameters.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/LiveDeadReckoningParameters.java
rename to src-generated/edu/nps/moves/dis7/LiveDeadReckoningParameters.java
index 6a43d46cf59e849a1ff10d93ca2ba75c93ceb612..1737f6fe4ddf981c40fdaa5c152d4f6e27fbe7e9 100644
--- a/src-generated/edu/nps/moves/dis/LiveDeadReckoningParameters.java
+++ b/src-generated/edu/nps/moves/dis7/LiveDeadReckoningParameters.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 16 bit fixed binaries
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityDetonationPdu.java b/src-generated/edu/nps/moves/dis7/LiveEntityDetonationPdu.java
new file mode 100644
index 0000000000000000000000000000000000000000..910008de36ec01a33e6ec2f13e91caf3194492be
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityDetonationPdu.java
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * more descriptive name for a LEDetonationPdu
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
+ */
+public class LiveEntityDetonationPdu extends LEDetonationPdu
+{}
diff --git a/src-generated/edu/nps/moves/dis/LiveEntityFamilyPdu.java b/src-generated/edu/nps/moves/dis7/LiveEntityFamilyPdu.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/LiveEntityFamilyPdu.java
rename to src-generated/edu/nps/moves/dis7/LiveEntityFamilyPdu.java
index 1d0e75c7879bc0395e43b92f01fe1110188aac4d..e51ef661aa8904e44a6fca2f6c8a841e7217125a 100644
--- a/src-generated/edu/nps/moves/dis/LiveEntityFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityFamilyPdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
diff --git a/src-generated/edu/nps/moves/dis7/LiveEntityFirePdu.java b/src-generated/edu/nps/moves/dis7/LiveEntityFirePdu.java
new file mode 100644
index 0000000000000000000000000000000000000000..8e724b77664ce69459ac49f024935e01bb58703c
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityFirePdu.java
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * more descriptive name for a LEFirePdu
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
+ */
+public class LiveEntityFirePdu extends LEFirePdu
+{}
diff --git a/src-generated/edu/nps/moves/dis/LiveEntityIdentifier.java b/src-generated/edu/nps/moves/dis7/LiveEntityIdentifier.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/LiveEntityIdentifier.java
rename to src-generated/edu/nps/moves/dis7/LiveEntityIdentifier.java
index 0fb2b023a2fb95d7b6a601aafc822caaae9a1baf..9161e81e6db783fc5a7582ff4d6d772b7322236e 100644
--- a/src-generated/edu/nps/moves/dis/LiveEntityIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityIdentifier.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* The unique designation of each entity in an event or exercise that is contained in a Live Entity PDU. Section 6.2.54
diff --git a/src-generated/edu/nps/moves/dis/LiveEntityLinearVelocity.java b/src-generated/edu/nps/moves/dis7/LiveEntityLinearVelocity.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/LiveEntityLinearVelocity.java
rename to src-generated/edu/nps/moves/dis7/LiveEntityLinearVelocity.java
index a273536cfb7ad236383b08f730d5272ad33986b6..a6199e1436b5ee9b8d20873ee9d7c3e52bf79a2e 100644
--- a/src-generated/edu/nps/moves/dis/LiveEntityLinearVelocity.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityLinearVelocity.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 16 bit fixed binaries
diff --git a/src-generated/edu/nps/moves/dis/LiveEntityOrientation.java b/src-generated/edu/nps/moves/dis7/LiveEntityOrientation.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/LiveEntityOrientation.java
rename to src-generated/edu/nps/moves/dis7/LiveEntityOrientation.java
index 674706c968053c09c2437113443d3cb269d58fd8..ca2db0fe966467c09627e28e046c405d5bfed687 100644
--- a/src-generated/edu/nps/moves/dis/LiveEntityOrientation.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityOrientation.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 8 bit fixed binaries
diff --git a/src-generated/edu/nps/moves/dis/LiveEntityOrientation16.java b/src-generated/edu/nps/moves/dis7/LiveEntityOrientation16.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/LiveEntityOrientation16.java
rename to src-generated/edu/nps/moves/dis7/LiveEntityOrientation16.java
index c1e229187bce303ab53904564b44e09ed97c2da4..72fcf9e9f777d5f07a168417601fe546c49638cb 100644
--- a/src-generated/edu/nps/moves/dis/LiveEntityOrientation16.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityOrientation16.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 16 bit fixed binaries
diff --git a/src-generated/edu/nps/moves/dis/LiveEntityOrientationError.java b/src-generated/edu/nps/moves/dis7/LiveEntityOrientationError.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/LiveEntityOrientationError.java
rename to src-generated/edu/nps/moves/dis7/LiveEntityOrientationError.java
index bb76d92c7dc7457f33f37b71cddcf2534ef32e01..cae5b807b5976578b15ae66844369e12b997af3a 100644
--- a/src-generated/edu/nps/moves/dis/LiveEntityOrientationError.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityOrientationError.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 16 bit fixed binaries
diff --git a/src-generated/edu/nps/moves/dis/LiveEntityPdu.java b/src-generated/edu/nps/moves/dis7/LiveEntityPdu.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/LiveEntityPdu.java
rename to src-generated/edu/nps/moves/dis7/LiveEntityPdu.java
index 01537e856e84478a0e26ebec0d81f76c47bd2f25..7834951d04be85f0d5cd7c6a79158577887202fe 100644
--- a/src-generated/edu/nps/moves/dis/LiveEntityPdu.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityPdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* The live entity PDUs have a slightly different header
diff --git a/src-generated/edu/nps/moves/dis/LiveEntityPositionError.java b/src-generated/edu/nps/moves/dis7/LiveEntityPositionError.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/LiveEntityPositionError.java
rename to src-generated/edu/nps/moves/dis7/LiveEntityPositionError.java
index 239f0497dd471261214d1d6f527f23e061a5df0d..ad16154eb62da32145397d52ab2222833f7e2a6d 100644
--- a/src-generated/edu/nps/moves/dis/LiveEntityPositionError.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityPositionError.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 16 bit fixed binaries
diff --git a/src-generated/edu/nps/moves/dis/LiveEntityRelativeWorldCoordinates.java b/src-generated/edu/nps/moves/dis7/LiveEntityRelativeWorldCoordinates.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/LiveEntityRelativeWorldCoordinates.java
rename to src-generated/edu/nps/moves/dis7/LiveEntityRelativeWorldCoordinates.java
index 68b96c546e45b9addd1085644d553fbe7b9a58ed..7b57392198563bd2818cc9d1d0d8e7114a529a06 100644
--- a/src-generated/edu/nps/moves/dis/LiveEntityRelativeWorldCoordinates.java
+++ b/src-generated/edu/nps/moves/dis7/LiveEntityRelativeWorldCoordinates.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 16 bit fixed binaries
diff --git a/src-generated/edu/nps/moves/dis/LiveSimulationAddress.java b/src-generated/edu/nps/moves/dis7/LiveSimulationAddress.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/LiveSimulationAddress.java
rename to src-generated/edu/nps/moves/dis7/LiveSimulationAddress.java
index acb02417ad1da52fd05c92bd10a937ab351fa8f9..eeda250e384ceea8051ee86deea29e30138e8bb8 100644
--- a/src-generated/edu/nps/moves/dis/LiveSimulationAddress.java
+++ b/src-generated/edu/nps/moves/dis7/LiveSimulationAddress.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* A simulation's designation associated with all Live Entity IDs contained in Live Entity PDUs. Section 6.2.55
diff --git a/src-generated/edu/nps/moves/dis/LogisticsFamilyPdu.java b/src-generated/edu/nps/moves/dis7/LogisticsFamilyPdu.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/LogisticsFamilyPdu.java
rename to src-generated/edu/nps/moves/dis7/LogisticsFamilyPdu.java
index e27c684d642d916c4550a3bd2ff0f752a94ffa21..54845f720eb5149cebccff4747481d9e23063aed 100644
--- a/src-generated/edu/nps/moves/dis/LogisticsFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/LogisticsFamilyPdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Abstract superclass for logistics PDUs. Section 7.4
diff --git a/src-generated/edu/nps/moves/dis/MineEmplacementTime.java b/src-generated/edu/nps/moves/dis7/MineEmplacementTime.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/MineEmplacementTime.java
rename to src-generated/edu/nps/moves/dis7/MineEmplacementTime.java
index de5fe508116cb8dc43f35cde66ba3c5a31cd9801..ef22ce733ff1d574481acb9e026bde3253f9d60d 100644
--- a/src-generated/edu/nps/moves/dis/MineEmplacementTime.java
+++ b/src-generated/edu/nps/moves/dis7/MineEmplacementTime.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
diff --git a/src-generated/edu/nps/moves/dis/MineEntityIdentifier.java b/src-generated/edu/nps/moves/dis7/MineEntityIdentifier.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/MineEntityIdentifier.java
rename to src-generated/edu/nps/moves/dis7/MineEntityIdentifier.java
index 4637b3568c1edd3bb87c2e106699427ee18a4dc8..484315353d9790a453472aa0a88b984cb141ff5e 100644
--- a/src-generated/edu/nps/moves/dis/MineEntityIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/MineEntityIdentifier.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* The unique designation of a mine contained in the Minefield Data PDU. No espdus are issued for mine entities. Section 6.2.55
diff --git a/src-generated/edu/nps/moves/dis/MinefieldDataPdu.java b/src-generated/edu/nps/moves/dis7/MinefieldDataPdu.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/MinefieldDataPdu.java
rename to src-generated/edu/nps/moves/dis7/MinefieldDataPdu.java
index a865c444f5e39f30baa0017c0aefdbd20dac15d8..5c580e4cfa04daaabd022b124607c65da3a81e57 100644
--- a/src-generated/edu/nps/moves/dis/MinefieldDataPdu.java
+++ b/src-generated/edu/nps/moves/dis7/MinefieldDataPdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 5.10.4 Information about the location and status of a collection of mines in a minefield is conveyed through the Minefield Data PDU on an individual mine basis.
diff --git a/src-generated/edu/nps/moves/dis/MinefieldFamilyPdu.java b/src-generated/edu/nps/moves/dis7/MinefieldFamilyPdu.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/MinefieldFamilyPdu.java
rename to src-generated/edu/nps/moves/dis7/MinefieldFamilyPdu.java
index f668c71318e0fd18774855480020fb53e6139c07..cc5aab435730cf9d16012925a40a8a592c795afa 100644
--- a/src-generated/edu/nps/moves/dis/MinefieldFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/MinefieldFamilyPdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Abstract superclass for PDUs relating to minefields. Section 7.9
diff --git a/src-generated/edu/nps/moves/dis/MinefieldIdentifier.java b/src-generated/edu/nps/moves/dis7/MinefieldIdentifier.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/MinefieldIdentifier.java
rename to src-generated/edu/nps/moves/dis7/MinefieldIdentifier.java
index 0b62b6b408b4964077632a72c278995b5d299f18..65a43a40aec02249c6f7eb8f61f1087fd898258c 100644
--- a/src-generated/edu/nps/moves/dis/MinefieldIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/MinefieldIdentifier.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* The unique designation of a minefield Section 6.2.56
diff --git a/src-generated/edu/nps/moves/dis/MinefieldQueryPdu.java b/src-generated/edu/nps/moves/dis7/MinefieldQueryPdu.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/MinefieldQueryPdu.java
rename to src-generated/edu/nps/moves/dis7/MinefieldQueryPdu.java
index bbdbba72444a4f3ae4741796fb81dd6c657af6f3..d70ae056bf77b8a2d236e14dce33d1fee2f613c3 100644
--- a/src-generated/edu/nps/moves/dis/MinefieldQueryPdu.java
+++ b/src-generated/edu/nps/moves/dis7/MinefieldQueryPdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 5.10.3 Contains information about the requesting entity and the region and mine types of interest to the requesting entity.
diff --git a/src-generated/edu/nps/moves/dis/MinefieldResponseNackPdu.java b/src-generated/edu/nps/moves/dis7/MinefieldResponseNACKPdu.java
similarity index 91%
rename from src-generated/edu/nps/moves/dis/MinefieldResponseNackPdu.java
rename to src-generated/edu/nps/moves/dis7/MinefieldResponseNACKPdu.java
index d15b4f9de77f24a2dee572142211f487b674120a..dd29cfb1352a0d4ef246db96f94a39c38755818c 100644
--- a/src-generated/edu/nps/moves/dis/MinefieldResponseNackPdu.java
+++ b/src-generated/edu/nps/moves/dis7/MinefieldResponseNACKPdu.java
@@ -3,17 +3,17 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 5.10.5 Contains information about the requesting entity and the PDU(s) that were not received in response to a query.
* IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
*/
-public class MinefieldResponseNackPdu extends MinefieldFamilyPdu implements Serializable
+public class MinefieldResponseNACKPdu extends MinefieldFamilyPdu implements Serializable
{
/** Minefield ID */
protected MinefieldIdentifier minefieldID = new MinefieldIdentifier();
@@ -32,7 +32,7 @@ public class MinefieldResponseNackPdu extends MinefieldFamilyPdu implements Seri
/** Constructor */
- public MinefieldResponseNackPdu()
+ public MinefieldResponseNACKPdu()
{
setPduType( DISPDUType.MINEFIELD_RESPONSE_NACK );
}
@@ -52,7 +52,7 @@ public int getMarshalledSize()
}
-public MinefieldResponseNackPdu setMinefieldID(MinefieldIdentifier pMinefieldID)
+public MinefieldResponseNACKPdu setMinefieldID(MinefieldIdentifier pMinefieldID)
{
minefieldID = pMinefieldID;
return this;
@@ -63,7 +63,7 @@ public MinefieldIdentifier getMinefieldID()
return minefieldID;
}
-public MinefieldResponseNackPdu setRequestingEntityID(SimulationIdentifier pRequestingEntityID)
+public MinefieldResponseNACKPdu setRequestingEntityID(SimulationIdentifier pRequestingEntityID)
{
requestingEntityID = pRequestingEntityID;
return this;
@@ -74,7 +74,7 @@ public SimulationIdentifier getRequestingEntityID()
return requestingEntityID;
}
-public MinefieldResponseNackPdu setRequestID(byte pRequestID)
+public MinefieldResponseNACKPdu setRequestID(byte pRequestID)
{
requestID = pRequestID;
return this;
@@ -85,7 +85,7 @@ public byte getRequestID()
return requestID;
}
-public MinefieldResponseNackPdu setMissingPduSequenceNumbers(byte[] pMissingPduSequenceNumbers)
+public MinefieldResponseNACKPdu setMissingPduSequenceNumbers(byte[] pMissingPduSequenceNumbers)
{
missingPduSequenceNumbers = pMissingPduSequenceNumbers;
return this;
@@ -216,10 +216,10 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
{
boolean ivarsEqual = true;
- if(!(obj instanceof MinefieldResponseNackPdu))
+ if(!(obj instanceof MinefieldResponseNACKPdu))
return false;
- final MinefieldResponseNackPdu rhs = (MinefieldResponseNackPdu)obj;
+ final MinefieldResponseNACKPdu rhs = (MinefieldResponseNACKPdu)obj;
if( ! (minefieldID.equals( rhs.minefieldID) )) ivarsEqual = false;
if( ! (requestingEntityID.equals( rhs.requestingEntityID) )) ivarsEqual = false;
diff --git a/src-generated/edu/nps/moves/dis/MinefieldSensorType.java b/src-generated/edu/nps/moves/dis7/MinefieldSensorType.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/MinefieldSensorType.java
rename to src-generated/edu/nps/moves/dis7/MinefieldSensorType.java
index 40e5f494dd2a53042df0155d4e2136fc08141aab..5b22e4de86e169cdb774bd46fa2436e0e0a42156 100644
--- a/src-generated/edu/nps/moves/dis/MinefieldSensorType.java
+++ b/src-generated/edu/nps/moves/dis7/MinefieldSensorType.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Information about a minefield sensor. Section 6.2.57
diff --git a/src-generated/edu/nps/moves/dis/MinefieldStatePdu.java b/src-generated/edu/nps/moves/dis7/MinefieldStatePdu.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/MinefieldStatePdu.java
rename to src-generated/edu/nps/moves/dis7/MinefieldStatePdu.java
index 282b31d8d322e093a69e7e7bffe29972b5e27062..5fd6038c38dfccb3df4462de5d25f6f2bd43e61d 100644
--- a/src-generated/edu/nps/moves/dis/MinefieldStatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/MinefieldStatePdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 5.10.2 Communicate information about the minefield, including the location, perimeter, and types of mines contained within it.
diff --git a/src-generated/edu/nps/moves/dis/ModulationParameters.java b/src-generated/edu/nps/moves/dis7/ModulationParameters.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/ModulationParameters.java
rename to src-generated/edu/nps/moves/dis7/ModulationParameters.java
index 45b69cff1a7e52b2ad1dbf3892648b5f63b95289..786181bc0c049730c5b4f1e3bfec970da1df3907 100644
--- a/src-generated/edu/nps/moves/dis/ModulationParameters.java
+++ b/src-generated/edu/nps/moves/dis7/ModulationParameters.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Modulation parameters associated with a specific radio system. 6.2.58
diff --git a/src-generated/edu/nps/moves/dis/ModulationType.java b/src-generated/edu/nps/moves/dis7/ModulationType.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/ModulationType.java
rename to src-generated/edu/nps/moves/dis7/ModulationType.java
index 5cefc990eb468ce9bb52415c933ec5ef3afd895a..ab9499e9e1930eef20aa7878f59f04f0b1a6f30d 100644
--- a/src-generated/edu/nps/moves/dis/ModulationType.java
+++ b/src-generated/edu/nps/moves/dis7/ModulationType.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Information about the type of modulation used for radio transmission. 6.2.59
diff --git a/src-generated/edu/nps/moves/dis/Munition.java b/src-generated/edu/nps/moves/dis7/Munition.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/Munition.java
rename to src-generated/edu/nps/moves/dis7/Munition.java
index b64820b94f3c170eaa2014aa13f3fce22c49a48c..81c1bde2931cc1f66ff566fa53ab6926470e9401 100644
--- a/src-generated/edu/nps/moves/dis/Munition.java
+++ b/src-generated/edu/nps/moves/dis7/Munition.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* An entity's munition (e.g., bomb, missile) information shall be represented by one or more Munition records. For each type or location of munition, this record shall specify the type, location, quantity and status of munitions that an entity contains. Section 6.2.60
diff --git a/src-generated/edu/nps/moves/dis/MunitionDescriptor.java b/src-generated/edu/nps/moves/dis7/MunitionDescriptor.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/MunitionDescriptor.java
rename to src-generated/edu/nps/moves/dis7/MunitionDescriptor.java
index e1b8cbb8c7b4afbb5ac642f384e5a9608cad0856..da8a6142c7efad900b012cf9020090b02597c9e7 100644
--- a/src-generated/edu/nps/moves/dis/MunitionDescriptor.java
+++ b/src-generated/edu/nps/moves/dis7/MunitionDescriptor.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Represents the firing or detonation of a munition. Section 6.2.19.2
diff --git a/src-generated/edu/nps/moves/dis/MunitionReload.java b/src-generated/edu/nps/moves/dis7/MunitionReload.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/MunitionReload.java
rename to src-generated/edu/nps/moves/dis7/MunitionReload.java
index 2fee56763b3f8c01735868048e838f009e94f93d..d2c9869f760c9999a609e5440dca3ade830503f5 100644
--- a/src-generated/edu/nps/moves/dis/MunitionReload.java
+++ b/src-generated/edu/nps/moves/dis7/MunitionReload.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* indicate weapons (munitions) previously communicated via the Munition record. Section 6.2.61
diff --git a/src-generated/edu/nps/moves/dis/NamedLocationIdentification.java b/src-generated/edu/nps/moves/dis7/NamedLocationIdentification.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/NamedLocationIdentification.java
rename to src-generated/edu/nps/moves/dis7/NamedLocationIdentification.java
index bb823d12cd2e739dfe720f606f3e5410d5be37a2..efff480d04f7a4a6c8b7926ea2383cac458143df 100644
--- a/src-generated/edu/nps/moves/dis/NamedLocationIdentification.java
+++ b/src-generated/edu/nps/moves/dis7/NamedLocationIdentification.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Information about the discrete positional relationship of the part entity with respect to the its host entity Section 6.2.62
diff --git a/src-generated/edu/nps/moves/dis/ObjectIdentifier.java b/src-generated/edu/nps/moves/dis7/ObjectIdentifier.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/ObjectIdentifier.java
rename to src-generated/edu/nps/moves/dis7/ObjectIdentifier.java
index 505ba54de736157daeb09b57a9c8b4a3783b0546..2bc65831810eb09880b858f9ab82eafa140a3ed4 100644
--- a/src-generated/edu/nps/moves/dis/ObjectIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/ObjectIdentifier.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* The unique designation of an environmental object. Section 6.2.63
diff --git a/src-generated/edu/nps/moves/dis/ObjectType.java b/src-generated/edu/nps/moves/dis7/ObjectType.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/ObjectType.java
rename to src-generated/edu/nps/moves/dis7/ObjectType.java
index 09a3ed9c1fa4845e084b0fa16603673ace1e10f3..a98d1162301a0bd87a22ecf161cc203c25609fb8 100644
--- a/src-generated/edu/nps/moves/dis/ObjectType.java
+++ b/src-generated/edu/nps/moves/dis7/ObjectType.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* The unique designation of an environmental object. Section 6.2.64
diff --git a/src-generated/edu/nps/moves/dis/OwnershipStatusRecord.java b/src-generated/edu/nps/moves/dis7/OwnershipStatusRecord.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/OwnershipStatusRecord.java
rename to src-generated/edu/nps/moves/dis7/OwnershipStatusRecord.java
index 63b2141833f6f997cccf7f313f01c79e4b33dd3c..9ac5dd50463619682aaec8d74ac5833b361c7349 100644
--- a/src-generated/edu/nps/moves/dis/OwnershipStatusRecord.java
+++ b/src-generated/edu/nps/moves/dis7/OwnershipStatusRecord.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* used to convey entity and conflict status information associated with transferring ownership of an entity. Section 6.2.65
diff --git a/src-generated/edu/nps/moves/dis/Pdu.java b/src-generated/edu/nps/moves/dis7/Pdu.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/Pdu.java
rename to src-generated/edu/nps/moves/dis7/Pdu.java
index dcd086a70a2130b7962978f5a816f2d599ba6f02..34f31806727b74ff370f5e4fd719ac60d4fb52c3 100644
--- a/src-generated/edu/nps/moves/dis/Pdu.java
+++ b/src-generated/edu/nps/moves/dis7/Pdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Base class of PduBase and LiveEntityPdu
diff --git a/src-generated/edu/nps/moves/dis/PduBase.java b/src-generated/edu/nps/moves/dis7/PduBase.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/PduBase.java
rename to src-generated/edu/nps/moves/dis7/PduBase.java
index 836f2d465889cc2733681c0d79870c70b05f277a..f5056ae7ee5d9bee745db78f0a9cceab71f49167 100644
--- a/src-generated/edu/nps/moves/dis/PduBase.java
+++ b/src-generated/edu/nps/moves/dis7/PduBase.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* The superclass for all PDUs except LiveEntitys. This incorporates the PduHeader record, section 7.2.2
diff --git a/src-generated/edu/nps/moves/dis/PointObjectStatePdu.java b/src-generated/edu/nps/moves/dis7/PointObjectStatePdu.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/PointObjectStatePdu.java
rename to src-generated/edu/nps/moves/dis7/PointObjectStatePdu.java
index 4353bc34075f34567d1f8b6303929fd02570f193..69ae281ddb01155d98993bbb05ca94b801cc5775 100644
--- a/src-generated/edu/nps/moves/dis/PointObjectStatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/PointObjectStatePdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 7.10.4 Used to communicate detailed information about the addition/modification of a synthetic environment object that is geometrically anchored to the terrain with a single point.
diff --git a/src-generated/edu/nps/moves/dis/PropulsionSystemData.java b/src-generated/edu/nps/moves/dis7/PropulsionSystemData.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/PropulsionSystemData.java
rename to src-generated/edu/nps/moves/dis7/PropulsionSystemData.java
index 6b80aea42b5f0d6460e016315fe7ec0533958c59..3a3ecb9e49aae5d3001eb1d68113d15b6699595a 100644
--- a/src-generated/edu/nps/moves/dis/PropulsionSystemData.java
+++ b/src-generated/edu/nps/moves/dis7/PropulsionSystemData.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* contains information describing the propulsion systems of the entity. This information shall be provided for each active propulsion system defined. Section 6.2.68
diff --git a/src-generated/edu/nps/moves/dis/ProtocolMode.java b/src-generated/edu/nps/moves/dis7/ProtocolMode.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/ProtocolMode.java
rename to src-generated/edu/nps/moves/dis7/ProtocolMode.java
index d3a3b58f34959e6045a240c851efe705ec767120..ef570e1eb422cc4b560a632a6f597fb504431e8f 100644
--- a/src-generated/edu/nps/moves/dis/ProtocolMode.java
+++ b/src-generated/edu/nps/moves/dis7/ProtocolMode.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Bit field used to identify minefield data. bits 14-15 are a 2-bit enum, other bits unused. Section 6.2.69
diff --git a/src-generated/edu/nps/moves/dis/RadioCommsHeader.java b/src-generated/edu/nps/moves/dis7/RadioCommsHeader.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/RadioCommsHeader.java
rename to src-generated/edu/nps/moves/dis7/RadioCommsHeader.java
index 5c7b1323979a7785f7df8cfaa7216df1b3c7c421..20aedc8b8f94a432ed066c51744f6981d2f43941 100644
--- a/src-generated/edu/nps/moves/dis/RadioCommsHeader.java
+++ b/src-generated/edu/nps/moves/dis7/RadioCommsHeader.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
diff --git a/src-generated/edu/nps/moves/dis/RadioCommunicationsFamilyPdu.java b/src-generated/edu/nps/moves/dis7/RadioCommunicationsFamilyPdu.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/RadioCommunicationsFamilyPdu.java
rename to src-generated/edu/nps/moves/dis7/RadioCommunicationsFamilyPdu.java
index 3b4429ba519913e90b4a429eb8e8a6c11ada5cbd..1cc9a8c21c5a927ce7a45a3de302d31fcc5d59e0 100644
--- a/src-generated/edu/nps/moves/dis/RadioCommunicationsFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/RadioCommunicationsFamilyPdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Abstract superclass for radio communications PDUs. Section 7.7
diff --git a/src-generated/edu/nps/moves/dis/RadioIdentifier.java b/src-generated/edu/nps/moves/dis7/RadioIdentifier.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/RadioIdentifier.java
rename to src-generated/edu/nps/moves/dis7/RadioIdentifier.java
index 335865b52491fd4c01d2430308b8f4148c3bf1ef..34204e0abec659be1b4823ddd68623860fa75e84 100644
--- a/src-generated/edu/nps/moves/dis/RadioIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/RadioIdentifier.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* The unique designation of an attached or unattached radio in an event or exercise Section 6.2.70
diff --git a/src-generated/edu/nps/moves/dis/RadioType.java b/src-generated/edu/nps/moves/dis7/RadioType.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/RadioType.java
rename to src-generated/edu/nps/moves/dis7/RadioType.java
index 2100986f5459d27be633216bd1bcebb9a008cc0b..e9af2528bf3bf0956fd90e6971b9194a13440d7b 100644
--- a/src-generated/edu/nps/moves/dis/RadioType.java
+++ b/src-generated/edu/nps/moves/dis7/RadioType.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Identifies the type of radio. Section 6.2.71
diff --git a/src-generated/edu/nps/moves/dis/ReceiverPdu.java b/src-generated/edu/nps/moves/dis7/ReceiverPdu.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/ReceiverPdu.java
rename to src-generated/edu/nps/moves/dis7/ReceiverPdu.java
index 9b250e3b85d6c19903789a67bad5f2fb0165a12f..486c536e042cf1c0e9e95752371f81514f160284 100644
--- a/src-generated/edu/nps/moves/dis/ReceiverPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ReceiverPdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 5.8.5 Communicates the state of a particular radio receiver. Its primary application is in communicating state information to radio network monitors, data loggers, and similar applications for use in debugging, supervision, and after-action review.
diff --git a/src-generated/edu/nps/moves/dis/RecordQueryReliablePdu.java b/src-generated/edu/nps/moves/dis7/RecordQueryRPdu.java
similarity index 90%
rename from src-generated/edu/nps/moves/dis/RecordQueryReliablePdu.java
rename to src-generated/edu/nps/moves/dis7/RecordQueryRPdu.java
index 9be8eed66018a60b3d181f3ff63fdfac1d9da47b..8b14a152f04f97cad32f40a6f062c5ef93f42c17 100644
--- a/src-generated/edu/nps/moves/dis/RecordQueryReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/RecordQueryRPdu.java
@@ -3,17 +3,17 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 5.12.4.14 Used to communicate a request for data in record format.
* IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
*/
-public class RecordQueryReliablePdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
+public class RecordQueryRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
{
/** request ID */
protected int requestID;
@@ -38,7 +38,7 @@ public class RecordQueryReliablePdu extends SimulationManagementWithReliabilityF
/** Constructor */
- public RecordQueryReliablePdu()
+ public RecordQueryRPdu()
{
setPduType( DISPDUType.RECORD_QUERY_R );
}
@@ -64,7 +64,7 @@ public int getMarshalledSize()
}
-public RecordQueryReliablePdu setRequestID(int pRequestID)
+public RecordQueryRPdu setRequestID(int pRequestID)
{
requestID = pRequestID;
return this;
@@ -75,7 +75,7 @@ public int getRequestID()
return requestID;
}
-public RecordQueryReliablePdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
+public RecordQueryRPdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
{
requiredReliabilityService = pRequiredReliabilityService;
return this;
@@ -86,7 +86,7 @@ public RequiredReliabilityService getRequiredReliabilityService()
return requiredReliabilityService;
}
-public RecordQueryReliablePdu setPad1(byte pPad1)
+public RecordQueryRPdu setPad1(byte pPad1)
{
pad1 = pPad1;
return this;
@@ -97,7 +97,7 @@ public byte getPad1()
return pad1;
}
-public RecordQueryReliablePdu setEventType(RecordQueryREventType pEventType)
+public RecordQueryRPdu setEventType(RecordQueryREventType pEventType)
{
eventType = pEventType;
return this;
@@ -108,7 +108,7 @@ public RecordQueryREventType getEventType()
return eventType;
}
-public RecordQueryReliablePdu setTime(int pTime)
+public RecordQueryRPdu setTime(int pTime)
{
time = pTime;
return this;
@@ -119,7 +119,7 @@ public int getTime()
return time;
}
-public RecordQueryReliablePdu setRecordIDs(List<RecordQuerySpecification> pRecordIDs)
+public RecordQueryRPdu setRecordIDs(List<RecordQuerySpecification> pRecordIDs)
{
recordIDs = pRecordIDs;
return this;
@@ -277,10 +277,10 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
{
boolean ivarsEqual = true;
- if(!(obj instanceof RecordQueryReliablePdu))
+ if(!(obj instanceof RecordQueryRPdu))
return false;
- final RecordQueryReliablePdu rhs = (RecordQueryReliablePdu)obj;
+ final RecordQueryRPdu rhs = (RecordQueryRPdu)obj;
if( ! (requestID == rhs.requestID)) ivarsEqual = false;
if( ! (requiredReliabilityService == rhs.requiredReliabilityService)) ivarsEqual = false;
diff --git a/src-generated/edu/nps/moves/dis7/RecordQueryReliablePdu.java b/src-generated/edu/nps/moves/dis7/RecordQueryReliablePdu.java
new file mode 100644
index 0000000000000000000000000000000000000000..18a27013e7b603cf33fbb75f1d2109568793d32a
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis7/RecordQueryReliablePdu.java
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * more descriptive name for a RecordQueryRPdu
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
+ */
+public class RecordQueryReliablePdu extends RecordQueryRPdu
+{}
diff --git a/src-generated/edu/nps/moves/dis/RecordQuerySpecification.java b/src-generated/edu/nps/moves/dis7/RecordQuerySpecification.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/RecordQuerySpecification.java
rename to src-generated/edu/nps/moves/dis7/RecordQuerySpecification.java
index 155b6d256fc1f9edc7f6f6c69fef288a807d2d3f..c2b0693c2224fe5fc313a9265e70bdcc435a1140 100644
--- a/src-generated/edu/nps/moves/dis/RecordQuerySpecification.java
+++ b/src-generated/edu/nps/moves/dis7/RecordQuerySpecification.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* The identification of the records being queried 6.2.72
diff --git a/src-generated/edu/nps/moves/dis/RecordReliablePdu.java b/src-generated/edu/nps/moves/dis7/RecordRPdu.java
similarity index 91%
rename from src-generated/edu/nps/moves/dis/RecordReliablePdu.java
rename to src-generated/edu/nps/moves/dis7/RecordRPdu.java
index ca639a0554c939547219734773dfb5f25bdc2216..6b63c6aff877f03bb234aae130ab130e477772af 100644
--- a/src-generated/edu/nps/moves/dis/RecordReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/RecordRPdu.java
@@ -3,17 +3,17 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 5.12.4.16 Used to respond to a Record Query-R PDU or a Set Record-R PDU. It is used to provide information requested in a Record Query-R PDU, to confirm the information received in a Set Record-R PDU, and to confirm the receipt of a periodic or unsolicited Record-R PDU when the acknowledged service level is used.
* IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
*/
-public class RecordReliablePdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
+public class RecordRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
{
/** request ID */
protected int requestID;
@@ -34,7 +34,7 @@ public class RecordReliablePdu extends SimulationManagementWithReliabilityFamily
/** Constructor */
- public RecordReliablePdu()
+ public RecordRPdu()
{
setPduType( DISPDUType.RECORD_R );
}
@@ -59,7 +59,7 @@ public int getMarshalledSize()
}
-public RecordReliablePdu setRequestID(int pRequestID)
+public RecordRPdu setRequestID(int pRequestID)
{
requestID = pRequestID;
return this;
@@ -70,7 +70,7 @@ public int getRequestID()
return requestID;
}
-public RecordReliablePdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
+public RecordRPdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
{
requiredReliabilityService = pRequiredReliabilityService;
return this;
@@ -81,7 +81,7 @@ public RequiredReliabilityService getRequiredReliabilityService()
return requiredReliabilityService;
}
-public RecordReliablePdu setPad1(byte pPad1)
+public RecordRPdu setPad1(byte pPad1)
{
pad1 = pPad1;
return this;
@@ -92,7 +92,7 @@ public byte getPad1()
return pad1;
}
-public RecordReliablePdu setEventType(RecordREventType pEventType)
+public RecordRPdu setEventType(RecordREventType pEventType)
{
eventType = pEventType;
return this;
@@ -103,7 +103,7 @@ public RecordREventType getEventType()
return eventType;
}
-public RecordReliablePdu setRecordSets(List<RecordSpecification> pRecordSets)
+public RecordRPdu setRecordSets(List<RecordSpecification> pRecordSets)
{
recordSets = pRecordSets;
return this;
@@ -256,10 +256,10 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
{
boolean ivarsEqual = true;
- if(!(obj instanceof RecordReliablePdu))
+ if(!(obj instanceof RecordRPdu))
return false;
- final RecordReliablePdu rhs = (RecordReliablePdu)obj;
+ final RecordRPdu rhs = (RecordRPdu)obj;
if( ! (requestID == rhs.requestID)) ivarsEqual = false;
if( ! (requiredReliabilityService == rhs.requiredReliabilityService)) ivarsEqual = false;
diff --git a/src-generated/edu/nps/moves/dis7/RecordReliablePdu.java b/src-generated/edu/nps/moves/dis7/RecordReliablePdu.java
new file mode 100644
index 0000000000000000000000000000000000000000..90dd7798741f0a2cf70c1b2004752d2a4a06e0d2
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis7/RecordReliablePdu.java
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * more descriptive name for a RecordRPdu
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
+ */
+public class RecordReliablePdu extends RecordRPdu
+{}
diff --git a/src-generated/edu/nps/moves/dis/RecordSpecification.java b/src-generated/edu/nps/moves/dis7/RecordSpecification.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/RecordSpecification.java
rename to src-generated/edu/nps/moves/dis7/RecordSpecification.java
index 42a83533efac215ce36f19bd7020ba346ee27024..c25a76cbfd28d18f23d8f4228aec1e02cbf45fb5 100644
--- a/src-generated/edu/nps/moves/dis/RecordSpecification.java
+++ b/src-generated/edu/nps/moves/dis7/RecordSpecification.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* This record shall specify the number of record sets contained in the Record Specification record and the record details. Section 6.2.73.
diff --git a/src-generated/edu/nps/moves/dis/RecordSpecificationElement.java b/src-generated/edu/nps/moves/dis7/RecordSpecificationElement.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/RecordSpecificationElement.java
rename to src-generated/edu/nps/moves/dis7/RecordSpecificationElement.java
index 31b98ab6daddfb1f77e7230d20d5409a4fe17a5a..03c7e1edb3aae88f6a50c28afead37de2996c3e7 100644
--- a/src-generated/edu/nps/moves/dis/RecordSpecificationElement.java
+++ b/src-generated/edu/nps/moves/dis7/RecordSpecificationElement.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Synthetic record, made up from section 6.2.72. This is used to acheive a repeating variable list element.
diff --git a/src-generated/edu/nps/moves/dis/Relationship.java b/src-generated/edu/nps/moves/dis7/Relationship.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/Relationship.java
rename to src-generated/edu/nps/moves/dis7/Relationship.java
index 990396566b9f8acf66db217c8b55904f971fad0d..5408adc8896cafa92f9a28327020921c24484e6e 100644
--- a/src-generated/edu/nps/moves/dis/Relationship.java
+++ b/src-generated/edu/nps/moves/dis7/Relationship.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* The relationship of the part entity to its host entity. Section 6.2.74.
diff --git a/src-generated/edu/nps/moves/dis/RemoveEntityPdu.java b/src-generated/edu/nps/moves/dis7/RemoveEntityPdu.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/RemoveEntityPdu.java
rename to src-generated/edu/nps/moves/dis7/RemoveEntityPdu.java
index 4bb357f94d6de175c4cb5e626c58f5bbb82c9ed9..8ca6b0b91131802f177ec875cdd6b5818f619af7 100644
--- a/src-generated/edu/nps/moves/dis/RemoveEntityPdu.java
+++ b/src-generated/edu/nps/moves/dis7/RemoveEntityPdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Section 7.5.3 The removal of an entity from an exercise shall be communicated with a Remove Entity PDU. See 5.6.5.3.
diff --git a/src-generated/edu/nps/moves/dis/RemoveEntityReliablePdu.java b/src-generated/edu/nps/moves/dis7/RemoveEntityRPdu.java
similarity index 88%
rename from src-generated/edu/nps/moves/dis/RemoveEntityReliablePdu.java
rename to src-generated/edu/nps/moves/dis7/RemoveEntityRPdu.java
index 95d5d9bb59a463e8cecac72d3ce39216f531cda7..2b347778be6ec81667a39ce30a094fb4127fcc00 100644
--- a/src-generated/edu/nps/moves/dis/RemoveEntityReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/RemoveEntityRPdu.java
@@ -3,17 +3,17 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 5.12.4.3 Contains the same information as found in the Remove Entity PDU with the addition of the level of reliability service to be used for the removal action being requested.
* IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
*/
-public class RemoveEntityReliablePdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
+public class RemoveEntityRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
{
/** level of reliability service used for this transaction uid 74 */
protected RequiredReliabilityService requiredReliabilityService = RequiredReliabilityService.values()[0];
@@ -27,7 +27,7 @@ public class RemoveEntityReliablePdu extends SimulationManagementWithReliability
/** Constructor */
- public RemoveEntityReliablePdu()
+ public RemoveEntityRPdu()
{
setPduType( DISPDUType.REMOVE_ENTITY_R );
}
@@ -46,7 +46,7 @@ public int getMarshalledSize()
}
-public RemoveEntityReliablePdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
+public RemoveEntityRPdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
{
requiredReliabilityService = pRequiredReliabilityService;
return this;
@@ -57,7 +57,7 @@ public RequiredReliabilityService getRequiredReliabilityService()
return requiredReliabilityService;
}
-public RemoveEntityReliablePdu setPad1(byte pPad1)
+public RemoveEntityRPdu setPad1(byte pPad1)
{
pad1 = pPad1;
return this;
@@ -68,7 +68,7 @@ public byte getPad1()
return pad1;
}
-public RemoveEntityReliablePdu setPad2(short pPad2)
+public RemoveEntityRPdu setPad2(short pPad2)
{
pad2 = pPad2;
return this;
@@ -79,7 +79,7 @@ public short getPad2()
return pad2;
}
-public RemoveEntityReliablePdu setRequestID(int pRequestID)
+public RemoveEntityRPdu setRequestID(int pRequestID)
{
requestID = pRequestID;
return this;
@@ -199,10 +199,10 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
{
boolean ivarsEqual = true;
- if(!(obj instanceof RemoveEntityReliablePdu))
+ if(!(obj instanceof RemoveEntityRPdu))
return false;
- final RemoveEntityReliablePdu rhs = (RemoveEntityReliablePdu)obj;
+ final RemoveEntityRPdu rhs = (RemoveEntityRPdu)obj;
if( ! (requiredReliabilityService == rhs.requiredReliabilityService)) ivarsEqual = false;
if( ! (pad1 == rhs.pad1)) ivarsEqual = false;
diff --git a/src-generated/edu/nps/moves/dis7/RemoveEntityReliablePdu.java b/src-generated/edu/nps/moves/dis7/RemoveEntityReliablePdu.java
new file mode 100644
index 0000000000000000000000000000000000000000..e12962ad9bd59337a16e3599c33ece6c551a7c7f
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis7/RemoveEntityReliablePdu.java
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * more descriptive name for a RemoveEntityRPdu
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
+ */
+public class RemoveEntityReliablePdu extends RemoveEntityRPdu
+{}
diff --git a/src-generated/edu/nps/moves/dis/RepairCompletePdu.java b/src-generated/edu/nps/moves/dis7/RepairCompletePdu.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/RepairCompletePdu.java
rename to src-generated/edu/nps/moves/dis7/RepairCompletePdu.java
index 7cc738c828a5a6ee76b73286cba479dd4ffd54d1..94451d78f5e1ba1cb616a5b198cb4aac51d4e253 100644
--- a/src-generated/edu/nps/moves/dis/RepairCompletePdu.java
+++ b/src-generated/edu/nps/moves/dis7/RepairCompletePdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 5.5.10 Used by the repairing entity to communicate the repair that has been performed for the entity that requested repair service.
diff --git a/src-generated/edu/nps/moves/dis/RepairResponsePdu.java b/src-generated/edu/nps/moves/dis7/RepairResponsePdu.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/RepairResponsePdu.java
rename to src-generated/edu/nps/moves/dis7/RepairResponsePdu.java
index c59756341d12f2bedb117db1ad9209d72dc959e0..76bc5828ea8367893c8357d63508693fb7917134 100644
--- a/src-generated/edu/nps/moves/dis/RepairResponsePdu.java
+++ b/src-generated/edu/nps/moves/dis7/RepairResponsePdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 5.5.11 used by the receiving entity to acknowledge the receipt of a Repair Complete PDU
diff --git a/src-generated/edu/nps/moves/dis/RequestID.java b/src-generated/edu/nps/moves/dis7/RequestID.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/RequestID.java
rename to src-generated/edu/nps/moves/dis7/RequestID.java
index ca854d9a6b83e32a7def146ed375681bbee599df..f17893f70756a50d281e2de71e10af1a06c5d141 100644
--- a/src-generated/edu/nps/moves/dis/RequestID.java
+++ b/src-generated/edu/nps/moves/dis7/RequestID.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* A monotonically increasing number inserted into all simulation managment PDUs. This should be a hand-coded thingie, maybe a singleton. Section 6.2.75
diff --git a/src-generated/edu/nps/moves/dis/ResupplyCancelPdu.java b/src-generated/edu/nps/moves/dis7/ResupplyCancelPdu.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/ResupplyCancelPdu.java
rename to src-generated/edu/nps/moves/dis7/ResupplyCancelPdu.java
index eee75670259de44a213986b063416de66d624fc2..e011560fabb07f54393e3de0c1eed5363ef483da 100644
--- a/src-generated/edu/nps/moves/dis/ResupplyCancelPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ResupplyCancelPdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 5.5.8 Used to communicate the canceling of a resupply service provided through logistics support.
diff --git a/src-generated/edu/nps/moves/dis/ResupplyOfferPdu.java b/src-generated/edu/nps/moves/dis7/ResupplyOfferPdu.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/ResupplyOfferPdu.java
rename to src-generated/edu/nps/moves/dis7/ResupplyOfferPdu.java
index 22d2b004564497cdae6af0b5596a2de54f891ac7..c438231a307194226abb769e6923fc156532ea94 100644
--- a/src-generated/edu/nps/moves/dis/ResupplyOfferPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ResupplyOfferPdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 5.5.6 Communicate the offer of supplies by a supplying entity to a receiving entity.
diff --git a/src-generated/edu/nps/moves/dis/ResupplyReceivedPdu.java b/src-generated/edu/nps/moves/dis7/ResupplyReceivedPdu.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/ResupplyReceivedPdu.java
rename to src-generated/edu/nps/moves/dis7/ResupplyReceivedPdu.java
index fbb9910e2dc10dcb4e1d0a75ab363bb75447596e..fd7fba0cbab4174efab275541043ee6238aa764e 100644
--- a/src-generated/edu/nps/moves/dis/ResupplyReceivedPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ResupplyReceivedPdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 5.5.7 Used to acknowledge the receipt of supplies by the receiving entity.
diff --git a/src-generated/edu/nps/moves/dis/SeesPdu.java b/src-generated/edu/nps/moves/dis7/SEESPdu.java
similarity index 94%
rename from src-generated/edu/nps/moves/dis/SeesPdu.java
rename to src-generated/edu/nps/moves/dis7/SEESPdu.java
index f0bb4b2970ee196706a8822c52482855d007860b..10fb77c6ef4e035f007976add470fa807a620c7e 100644
--- a/src-generated/edu/nps/moves/dis/SeesPdu.java
+++ b/src-generated/edu/nps/moves/dis7/SEESPdu.java
@@ -3,17 +3,17 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 7.6.6 Certain supplemental information on an entity’s physical state and emissions. See 5.7.7
* IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
*/
-public class SeesPdu extends DistributedEmissionsFamilyPdu implements Serializable
+public class SEESPdu extends DistributedEmissionsFamilyPdu implements Serializable
{
/** Originating entity ID */
protected EntityID orginatingEntityID = new EntityID();
@@ -41,7 +41,7 @@ public class SeesPdu extends DistributedEmissionsFamilyPdu implements Serializab
/** Constructor */
- public SeesPdu()
+ public SEESPdu()
{
setPduType( DISPDUType.SUPPLEMENTAL_EMISSION_ENTITY_STATE );
}
@@ -72,7 +72,7 @@ public int getMarshalledSize()
}
-public SeesPdu setOrginatingEntityID(EntityID pOrginatingEntityID)
+public SEESPdu setOrginatingEntityID(EntityID pOrginatingEntityID)
{
orginatingEntityID = pOrginatingEntityID;
return this;
@@ -83,7 +83,7 @@ public EntityID getOrginatingEntityID()
return orginatingEntityID;
}
-public SeesPdu setInfraredSignatureRepresentationIndex(short pInfraredSignatureRepresentationIndex)
+public SEESPdu setInfraredSignatureRepresentationIndex(short pInfraredSignatureRepresentationIndex)
{
infraredSignatureRepresentationIndex = pInfraredSignatureRepresentationIndex;
return this;
@@ -94,7 +94,7 @@ public short getInfraredSignatureRepresentationIndex()
return infraredSignatureRepresentationIndex;
}
-public SeesPdu setAcousticSignatureRepresentationIndex(short pAcousticSignatureRepresentationIndex)
+public SEESPdu setAcousticSignatureRepresentationIndex(short pAcousticSignatureRepresentationIndex)
{
acousticSignatureRepresentationIndex = pAcousticSignatureRepresentationIndex;
return this;
@@ -105,7 +105,7 @@ public short getAcousticSignatureRepresentationIndex()
return acousticSignatureRepresentationIndex;
}
-public SeesPdu setRadarCrossSectionSignatureRepresentationIndex(short pRadarCrossSectionSignatureRepresentationIndex)
+public SEESPdu setRadarCrossSectionSignatureRepresentationIndex(short pRadarCrossSectionSignatureRepresentationIndex)
{
radarCrossSectionSignatureRepresentationIndex = pRadarCrossSectionSignatureRepresentationIndex;
return this;
@@ -116,7 +116,7 @@ public short getRadarCrossSectionSignatureRepresentationIndex()
return radarCrossSectionSignatureRepresentationIndex;
}
-public SeesPdu setPropulsionSystemData(List<PropulsionSystemData> pPropulsionSystemData)
+public SEESPdu setPropulsionSystemData(List<PropulsionSystemData> pPropulsionSystemData)
{
propulsionSystemData = pPropulsionSystemData;
return this;
@@ -127,7 +127,7 @@ public List<PropulsionSystemData> getPropulsionSystemData()
return propulsionSystemData;
}
-public SeesPdu setVectoringSystemData(List<VectoringNozzleSystem> pVectoringSystemData)
+public SEESPdu setVectoringSystemData(List<VectoringNozzleSystem> pVectoringSystemData)
{
vectoringSystemData = pVectoringSystemData;
return this;
@@ -312,10 +312,10 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
{
boolean ivarsEqual = true;
- if(!(obj instanceof SeesPdu))
+ if(!(obj instanceof SEESPdu))
return false;
- final SeesPdu rhs = (SeesPdu)obj;
+ final SEESPdu rhs = (SEESPdu)obj;
if( ! (orginatingEntityID.equals( rhs.orginatingEntityID) )) ivarsEqual = false;
if( ! (infraredSignatureRepresentationIndex == rhs.infraredSignatureRepresentationIndex)) ivarsEqual = false;
diff --git a/src-generated/edu/nps/moves/dis/SecondaryOperationalData.java b/src-generated/edu/nps/moves/dis7/SecondaryOperationalData.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/SecondaryOperationalData.java
rename to src-generated/edu/nps/moves/dis7/SecondaryOperationalData.java
index 4f611b65e0711eea2500c2e805ae854ffce8c7a3..a57e0c552e5b2b5dc22b24a8ec0389f5c4cbde2d 100644
--- a/src-generated/edu/nps/moves/dis/SecondaryOperationalData.java
+++ b/src-generated/edu/nps/moves/dis7/SecondaryOperationalData.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Additional operational data for an IFF emitting system and the number of IFF Fundamental Parameter Data records Section 6.2.76.
diff --git a/src-generated/edu/nps/moves/dis/Sensor.java b/src-generated/edu/nps/moves/dis7/Sensor.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/Sensor.java
rename to src-generated/edu/nps/moves/dis7/Sensor.java
index c1d625ced3a28c5168b3a5e92f4b24cfd9d11b21..a7f3e17b72141d80f748ce61f42305d706bb2b91 100644
--- a/src-generated/edu/nps/moves/dis/Sensor.java
+++ b/src-generated/edu/nps/moves/dis7/Sensor.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* An entity's sensor information. Section 6.2.77.
diff --git a/src-generated/edu/nps/moves/dis/SeparationVP.java b/src-generated/edu/nps/moves/dis7/SeparationVP.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/SeparationVP.java
rename to src-generated/edu/nps/moves/dis7/SeparationVP.java
index ba30ab45f468258014ae4fda3f8e7458d8bd4c90..978fefeba2fbf95a3ccf5d7be8ffd2ecbd1e6180 100644
--- a/src-generated/edu/nps/moves/dis/SeparationVP.java
+++ b/src-generated/edu/nps/moves/dis7/SeparationVP.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Physical separation of an entity from another entity. Section 6.2.94.6
diff --git a/src-generated/edu/nps/moves/dis/ServiceRequestPdu.java b/src-generated/edu/nps/moves/dis7/ServiceRequestPdu.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/ServiceRequestPdu.java
rename to src-generated/edu/nps/moves/dis7/ServiceRequestPdu.java
index 74812b5f3385a4ad82a74c7c4e219a6997ab2d2d..3b8cb822a05a063be60fb1c7f7bde9833d12b11b 100644
--- a/src-generated/edu/nps/moves/dis/ServiceRequestPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ServiceRequestPdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 5.5.5 Communicate information associated with one entity requesting a service from another.
diff --git a/src-generated/edu/nps/moves/dis/SetDataPdu.java b/src-generated/edu/nps/moves/dis7/SetDataPdu.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/SetDataPdu.java
rename to src-generated/edu/nps/moves/dis7/SetDataPdu.java
index 5d7bb190dc0e67e63064f183596e24add8d2e947..fbf56c0b8b05702c3ca238639d7b544f2fb9a320 100644
--- a/src-generated/edu/nps/moves/dis/SetDataPdu.java
+++ b/src-generated/edu/nps/moves/dis7/SetDataPdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Section 7.5.10. Initializing or changing internal state information shall be communicated using a Set Data PDU. See 5.6.5.10
diff --git a/src-generated/edu/nps/moves/dis/SetDataReliablePdu.java b/src-generated/edu/nps/moves/dis7/SetDataRPdu.java
similarity index 91%
rename from src-generated/edu/nps/moves/dis/SetDataReliablePdu.java
rename to src-generated/edu/nps/moves/dis7/SetDataRPdu.java
index 3fff99a1859b9a14b17ee9ed6e96ba895ce031f6..4338e6b742b9fb026e00b02ec5672af0816f1d4e 100644
--- a/src-generated/edu/nps/moves/dis/SetDataReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/SetDataRPdu.java
@@ -3,17 +3,17 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 5.12.4.10 Serves the same function as the Set Data PDU but with the addition of reliability service levels.
* IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
*/
-public class SetDataReliablePdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
+public class SetDataRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
{
/** level of reliability service used for this transaction uid 74 */
protected RequiredReliabilityService requiredReliabilityService = RequiredReliabilityService.values()[0];
@@ -41,7 +41,7 @@ public class SetDataReliablePdu extends SimulationManagementWithReliabilityFamil
/** Constructor */
- public SetDataReliablePdu()
+ public SetDataRPdu()
{
setPduType( DISPDUType.SET_DATA_R );
}
@@ -72,7 +72,7 @@ public int getMarshalledSize()
}
-public SetDataReliablePdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
+public SetDataRPdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
{
requiredReliabilityService = pRequiredReliabilityService;
return this;
@@ -83,7 +83,7 @@ public RequiredReliabilityService getRequiredReliabilityService()
return requiredReliabilityService;
}
-public SetDataReliablePdu setPad1(byte pPad1)
+public SetDataRPdu setPad1(byte pPad1)
{
pad1 = pPad1;
return this;
@@ -94,7 +94,7 @@ public byte getPad1()
return pad1;
}
-public SetDataReliablePdu setPad2(short pPad2)
+public SetDataRPdu setPad2(short pPad2)
{
pad2 = pPad2;
return this;
@@ -105,7 +105,7 @@ public short getPad2()
return pad2;
}
-public SetDataReliablePdu setRequestID(int pRequestID)
+public SetDataRPdu setRequestID(int pRequestID)
{
requestID = pRequestID;
return this;
@@ -116,7 +116,7 @@ public int getRequestID()
return requestID;
}
-public SetDataReliablePdu setFixedDatumRecords(List<FixedDatum> pFixedDatumRecords)
+public SetDataRPdu setFixedDatumRecords(List<FixedDatum> pFixedDatumRecords)
{
fixedDatumRecords = pFixedDatumRecords;
return this;
@@ -127,7 +127,7 @@ public List<FixedDatum> getFixedDatumRecords()
return fixedDatumRecords;
}
-public SetDataReliablePdu setVariableDatumRecords(List<VariableDatum> pVariableDatumRecords)
+public SetDataRPdu setVariableDatumRecords(List<VariableDatum> pVariableDatumRecords)
{
variableDatumRecords = pVariableDatumRecords;
return this;
@@ -313,10 +313,10 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
{
boolean ivarsEqual = true;
- if(!(obj instanceof SetDataReliablePdu))
+ if(!(obj instanceof SetDataRPdu))
return false;
- final SetDataReliablePdu rhs = (SetDataReliablePdu)obj;
+ final SetDataRPdu rhs = (SetDataRPdu)obj;
if( ! (requiredReliabilityService == rhs.requiredReliabilityService)) ivarsEqual = false;
if( ! (pad1 == rhs.pad1)) ivarsEqual = false;
diff --git a/src-generated/edu/nps/moves/dis7/SetDataReliablePdu.java b/src-generated/edu/nps/moves/dis7/SetDataReliablePdu.java
new file mode 100644
index 0000000000000000000000000000000000000000..c618b6dca5e7d689d58f4dd1ae3de8b00286cf37
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis7/SetDataReliablePdu.java
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * more descriptive name for a SetDataRPdu
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
+ */
+public class SetDataReliablePdu extends SetDataRPdu
+{}
diff --git a/src-generated/edu/nps/moves/dis/SetRecordReliablePdu.java b/src-generated/edu/nps/moves/dis7/SetRecordRPdu.java
similarity index 90%
rename from src-generated/edu/nps/moves/dis/SetRecordReliablePdu.java
rename to src-generated/edu/nps/moves/dis7/SetRecordRPdu.java
index f77a9ffa04ae1dfde31593b4ee4f44f7b5c2ff4b..226875be2e55f1f74f6f20afd995c05c6bf26f85 100644
--- a/src-generated/edu/nps/moves/dis/SetRecordReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/SetRecordRPdu.java
@@ -3,17 +3,17 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 5.12.4.15 Used to set or change certain parameter values. These parameter values are contained within a record format as compared to the datum format used in the Set Data-R PDU.
* IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
*/
-public class SetRecordReliablePdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
+public class SetRecordRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
{
/** request ID */
protected int requestID;
@@ -35,7 +35,7 @@ public class SetRecordReliablePdu extends SimulationManagementWithReliabilityFam
/** Constructor */
- public SetRecordReliablePdu()
+ public SetRecordRPdu()
{
setPduType( DISPDUType.SET_RECORD_R );
}
@@ -61,7 +61,7 @@ public int getMarshalledSize()
}
-public SetRecordReliablePdu setRequestID(int pRequestID)
+public SetRecordRPdu setRequestID(int pRequestID)
{
requestID = pRequestID;
return this;
@@ -72,7 +72,7 @@ public int getRequestID()
return requestID;
}
-public SetRecordReliablePdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
+public SetRecordRPdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
{
requiredReliabilityService = pRequiredReliabilityService;
return this;
@@ -83,7 +83,7 @@ public RequiredReliabilityService getRequiredReliabilityService()
return requiredReliabilityService;
}
-public SetRecordReliablePdu setPad1(byte pPad1)
+public SetRecordRPdu setPad1(byte pPad1)
{
pad1 = pPad1;
return this;
@@ -94,7 +94,7 @@ public byte getPad1()
return pad1;
}
-public SetRecordReliablePdu setPad2(short pPad2)
+public SetRecordRPdu setPad2(short pPad2)
{
pad2 = pPad2;
return this;
@@ -105,7 +105,7 @@ public short getPad2()
return pad2;
}
-public SetRecordReliablePdu setPad3(int pPad3)
+public SetRecordRPdu setPad3(int pPad3)
{
pad3 = pPad3;
return this;
@@ -116,7 +116,7 @@ public int getPad3()
return pad3;
}
-public SetRecordReliablePdu setRecordSets(List<RecordSpecification> pRecordSets)
+public SetRecordRPdu setRecordSets(List<RecordSpecification> pRecordSets)
{
recordSets = pRecordSets;
return this;
@@ -274,10 +274,10 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
{
boolean ivarsEqual = true;
- if(!(obj instanceof SetRecordReliablePdu))
+ if(!(obj instanceof SetRecordRPdu))
return false;
- final SetRecordReliablePdu rhs = (SetRecordReliablePdu)obj;
+ final SetRecordRPdu rhs = (SetRecordRPdu)obj;
if( ! (requestID == rhs.requestID)) ivarsEqual = false;
if( ! (requiredReliabilityService == rhs.requiredReliabilityService)) ivarsEqual = false;
diff --git a/src-generated/edu/nps/moves/dis7/SetRecordReliablePdu.java b/src-generated/edu/nps/moves/dis7/SetRecordReliablePdu.java
new file mode 100644
index 0000000000000000000000000000000000000000..4733db03a2330fa5136f8137c159ec49822167e0
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis7/SetRecordReliablePdu.java
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * more descriptive name for a SetRecordRPdu
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
+ */
+public class SetRecordReliablePdu extends SetRecordRPdu
+{}
diff --git a/src-generated/edu/nps/moves/dis/ShaftRPM.java b/src-generated/edu/nps/moves/dis7/ShaftRPM.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/ShaftRPM.java
rename to src-generated/edu/nps/moves/dis7/ShaftRPM.java
index e7b341d2e6bac3819f5e120663c772dd2018758c..16a8ecefeb6451eca79b269e07648ef984fdd258 100644
--- a/src-generated/edu/nps/moves/dis/ShaftRPM.java
+++ b/src-generated/edu/nps/moves/dis7/ShaftRPM.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
diff --git a/src-generated/edu/nps/moves/dis/SignalPdu.java b/src-generated/edu/nps/moves/dis7/SignalPdu.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/SignalPdu.java
rename to src-generated/edu/nps/moves/dis7/SignalPdu.java
index af6fa06a70d1b0c1ff0c82265655749eb450c100..c753ee534c0caeb32ee3d5e123624ce128b72900 100644
--- a/src-generated/edu/nps/moves/dis/SignalPdu.java
+++ b/src-generated/edu/nps/moves/dis7/SignalPdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 5.8.4 Conveys the audio or digital data carried by the simulated radio or intercom transmission.
diff --git a/src-generated/edu/nps/moves/dis/SilentEntitySystem.java b/src-generated/edu/nps/moves/dis7/SilentEntitySystem.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/SilentEntitySystem.java
rename to src-generated/edu/nps/moves/dis7/SilentEntitySystem.java
index 3cf02f7fc73e77f32dabda4822eee41478d9d1f6..d5d850d50847c300bcff71088ba8c9974ccce3d1 100644
--- a/src-generated/edu/nps/moves/dis/SilentEntitySystem.java
+++ b/src-generated/edu/nps/moves/dis7/SilentEntitySystem.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* information abou an enitity not producing espdus. Section 6.2.79
diff --git a/src-generated/edu/nps/moves/dis/SimulationAddress.java b/src-generated/edu/nps/moves/dis7/SimulationAddress.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/SimulationAddress.java
rename to src-generated/edu/nps/moves/dis7/SimulationAddress.java
index 57e1a92041cc3fff5db9614f0dddea5056382424..379132c65196094f7b60dd9e6e32f52c25618f4d 100644
--- a/src-generated/edu/nps/moves/dis/SimulationAddress.java
+++ b/src-generated/edu/nps/moves/dis7/SimulationAddress.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* A Simulation Address record shall consist of the Site Identification number and the Application Identification number. Section 6.2.79
diff --git a/src-generated/edu/nps/moves/dis/SimulationIdentifier.java b/src-generated/edu/nps/moves/dis7/SimulationIdentifier.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/SimulationIdentifier.java
rename to src-generated/edu/nps/moves/dis7/SimulationIdentifier.java
index f0baa8aab68965fdbaab5fbadd79be47ede926ff..14017cea820ab340a956a002230b030afe0731cb 100644
--- a/src-generated/edu/nps/moves/dis/SimulationIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/SimulationIdentifier.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* The unique designation of a simulation when using the 48-bit identifier format shall be specified by the Sim- ulation Identifier record. The reason that the 48-bit format is required in addition to the 32-bit simulation address format that actually identifies a specific simulation is because some 48-bit identifier fields in PDUs may contain either an Object Identifier, such as an Entity ID, or a Simulation Identifier. Section 6.2.80
diff --git a/src-generated/edu/nps/moves/dis/SimulationManagementFamilyPdu.java b/src-generated/edu/nps/moves/dis7/SimulationManagementFamilyPdu.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/SimulationManagementFamilyPdu.java
rename to src-generated/edu/nps/moves/dis7/SimulationManagementFamilyPdu.java
index 710f6d3dcccc6629205f64b3901a3d5713eb7b7f..5146389d7c3d459a925853964b74911ff8324d44 100644
--- a/src-generated/edu/nps/moves/dis/SimulationManagementFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/SimulationManagementFamilyPdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* First part of a simulation management (SIMAN) PDU and SIMAN-Reliability (SIMAN-R) PDU. Sectionn 6.2.81
diff --git a/src-generated/edu/nps/moves/dis/SimulationManagementWithReliabilityFamilyPdu.java b/src-generated/edu/nps/moves/dis7/SimulationManagementWithReliabilityFamilyPdu.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/SimulationManagementWithReliabilityFamilyPdu.java
rename to src-generated/edu/nps/moves/dis7/SimulationManagementWithReliabilityFamilyPdu.java
index 2d138523a9b50746b2217a6da18067e5bd83d858..b2e10bd58933b4658182a0bf7b882f0739b6699c 100644
--- a/src-generated/edu/nps/moves/dis/SimulationManagementWithReliabilityFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/SimulationManagementWithReliabilityFamilyPdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
diff --git a/src-generated/edu/nps/moves/dis/StandardVariableRecord.java b/src-generated/edu/nps/moves/dis7/StandardVariableRecord.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/StandardVariableRecord.java
rename to src-generated/edu/nps/moves/dis7/StandardVariableRecord.java
index 12de9e5f71fea8d58308099fe073238ec9b2fad4..5166f77e88c903a5bc4f59e72ee5c134ff93c982 100644
--- a/src-generated/edu/nps/moves/dis/StandardVariableRecord.java
+++ b/src-generated/edu/nps/moves/dis7/StandardVariableRecord.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Section 6.2.83
diff --git a/src-generated/edu/nps/moves/dis/StandardVariableSpecification.java b/src-generated/edu/nps/moves/dis7/StandardVariableSpecification.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/StandardVariableSpecification.java
rename to src-generated/edu/nps/moves/dis7/StandardVariableSpecification.java
index 13873f821d13616bd2216d69178e0111def67149..32fde6b3060e6e79c45d45cab77557af7bb07a44 100644
--- a/src-generated/edu/nps/moves/dis/StandardVariableSpecification.java
+++ b/src-generated/edu/nps/moves/dis7/StandardVariableSpecification.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Does not work, and causes failure in anything it is embedded in. Section 6.2.83
diff --git a/src-generated/edu/nps/moves/dis/StartResumePdu.java b/src-generated/edu/nps/moves/dis7/StartResumePdu.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/StartResumePdu.java
rename to src-generated/edu/nps/moves/dis7/StartResumePdu.java
index e71032297e62d932035c6e4180cadf162a599956..ac8ba6908536ad215371d9976509c1b2a6c572a2 100644
--- a/src-generated/edu/nps/moves/dis/StartResumePdu.java
+++ b/src-generated/edu/nps/moves/dis7/StartResumePdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Section 7.5.4. Start or resume an entity or exercise. See 5.6.5.4.
diff --git a/src-generated/edu/nps/moves/dis/StartResumeReliablePdu.java b/src-generated/edu/nps/moves/dis7/StartResumeRPdu.java
similarity index 88%
rename from src-generated/edu/nps/moves/dis/StartResumeReliablePdu.java
rename to src-generated/edu/nps/moves/dis7/StartResumeRPdu.java
index dc72949778630463901cc3b3484285c49b6bd54d..68849b3f7163983798d3801f0323acef9e9f36e8 100644
--- a/src-generated/edu/nps/moves/dis/StartResumeReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/StartResumeRPdu.java
@@ -3,17 +3,17 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 5.12.4.4 Serves the same function as the Start/Resume PDU but with the addition of reliability service levels
* IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
*/
-public class StartResumeReliablePdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
+public class StartResumeRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
{
/** time in real world for this operation to happen */
protected ClockTime realWorldTime = new ClockTime();
@@ -33,7 +33,7 @@ public class StartResumeReliablePdu extends SimulationManagementWithReliabilityF
/** Constructor */
- public StartResumeReliablePdu()
+ public StartResumeRPdu()
{
setPduType( DISPDUType.START_RESUME_R );
}
@@ -54,7 +54,7 @@ public int getMarshalledSize()
}
-public StartResumeReliablePdu setRealWorldTime(ClockTime pRealWorldTime)
+public StartResumeRPdu setRealWorldTime(ClockTime pRealWorldTime)
{
realWorldTime = pRealWorldTime;
return this;
@@ -65,7 +65,7 @@ public ClockTime getRealWorldTime()
return realWorldTime;
}
-public StartResumeReliablePdu setSimulationTime(ClockTime pSimulationTime)
+public StartResumeRPdu setSimulationTime(ClockTime pSimulationTime)
{
simulationTime = pSimulationTime;
return this;
@@ -76,7 +76,7 @@ public ClockTime getSimulationTime()
return simulationTime;
}
-public StartResumeReliablePdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
+public StartResumeRPdu setRequiredReliabilityService(RequiredReliabilityService pRequiredReliabilityService)
{
requiredReliabilityService = pRequiredReliabilityService;
return this;
@@ -87,7 +87,7 @@ public RequiredReliabilityService getRequiredReliabilityService()
return requiredReliabilityService;
}
-public StartResumeReliablePdu setPad1(byte pPad1)
+public StartResumeRPdu setPad1(byte pPad1)
{
pad1 = pPad1;
return this;
@@ -98,7 +98,7 @@ public byte getPad1()
return pad1;
}
-public StartResumeReliablePdu setPad2(short pPad2)
+public StartResumeRPdu setPad2(short pPad2)
{
pad2 = pPad2;
return this;
@@ -109,7 +109,7 @@ public short getPad2()
return pad2;
}
-public StartResumeReliablePdu setRequestID(int pRequestID)
+public StartResumeRPdu setRequestID(int pRequestID)
{
requestID = pRequestID;
return this;
@@ -237,10 +237,10 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
{
boolean ivarsEqual = true;
- if(!(obj instanceof StartResumeReliablePdu))
+ if(!(obj instanceof StartResumeRPdu))
return false;
- final StartResumeReliablePdu rhs = (StartResumeReliablePdu)obj;
+ final StartResumeRPdu rhs = (StartResumeRPdu)obj;
if( ! (realWorldTime.equals( rhs.realWorldTime) )) ivarsEqual = false;
if( ! (simulationTime.equals( rhs.simulationTime) )) ivarsEqual = false;
diff --git a/src-generated/edu/nps/moves/dis7/StartResumeReliablePdu.java b/src-generated/edu/nps/moves/dis7/StartResumeReliablePdu.java
new file mode 100644
index 0000000000000000000000000000000000000000..e402c7177d8de829a98d01795508b58a5910bfec
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis7/StartResumeReliablePdu.java
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * more descriptive name for a StartResumeRPdu
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
+ */
+public class StartResumeReliablePdu extends StartResumeRPdu
+{}
diff --git a/src-generated/edu/nps/moves/dis/StopFreezePdu.java b/src-generated/edu/nps/moves/dis7/StopFreezePdu.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/StopFreezePdu.java
rename to src-generated/edu/nps/moves/dis7/StopFreezePdu.java
index ecda4e61ae7045889461ccf5283e2e8f0616b48f..75784c85d704d4d2c503a1ce0927147dbed86026 100644
--- a/src-generated/edu/nps/moves/dis/StopFreezePdu.java
+++ b/src-generated/edu/nps/moves/dis7/StopFreezePdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Section 7.5.5. Stop or freeze an enity or exercise. See 5.6.5.5
diff --git a/src-generated/edu/nps/moves/dis/StopFreezeReliablePdu.java b/src-generated/edu/nps/moves/dis7/StopFreezeRPdu.java
similarity index 88%
rename from src-generated/edu/nps/moves/dis/StopFreezeReliablePdu.java
rename to src-generated/edu/nps/moves/dis7/StopFreezeRPdu.java
index de1fcc26937b459ff0a0811c5592255b7562dc8b..c784a0c975d9d579c855fc45782ef99139e7f125 100644
--- a/src-generated/edu/nps/moves/dis/StopFreezeReliablePdu.java
+++ b/src-generated/edu/nps/moves/dis7/StopFreezeRPdu.java
@@ -3,17 +3,17 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 5.12.4.5 Serves the same function as the Stop/Freeze PDU (see 5.6.5.5.1) but with the addition of reliability service levels.
* IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
*/
-public class StopFreezeReliablePdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
+public class StopFreezeRPdu extends SimulationManagementWithReliabilityFamilyPdu implements Serializable
{
/** time in real world for this operation to happen */
protected ClockTime realWorldTime = new ClockTime();
@@ -35,7 +35,7 @@ public class StopFreezeReliablePdu extends SimulationManagementWithReliabilityFa
/** Constructor */
- public StopFreezeReliablePdu()
+ public StopFreezeRPdu()
{
setPduType( DISPDUType.STOP_FREEZE_R );
}
@@ -55,7 +55,7 @@ public int getMarshalledSize()
}
-public StopFreezeReliablePdu setRealWorldTime(ClockTime pRealWorldTime)
+public StopFreezeRPdu setRealWorldTime(ClockTime pRealWorldTime)
{
realWorldTime = pRealWorldTime;
return this;
@@ -66,7 +66,7 @@ public ClockTime getRealWorldTime()
return realWorldTime;
}
-public StopFreezeReliablePdu setReason(StopFreezeReason pReason)
+public StopFreezeRPdu setReason(StopFreezeReason pReason)
{
reason = pReason;
return this;
@@ -77,7 +77,7 @@ public StopFreezeReason getReason()
return reason;
}
-public StopFreezeReliablePdu setFrozenBehavior(StopFreezeFrozenBehavior pFrozenBehavior)
+public StopFreezeRPdu setFrozenBehavior(StopFreezeFrozenBehavior pFrozenBehavior)
{
frozenBehavior = pFrozenBehavior;
return this;
@@ -88,7 +88,7 @@ public StopFreezeFrozenBehavior getFrozenBehavior()
return frozenBehavior;
}
-public StopFreezeReliablePdu setRequiredReliablityService(RequiredReliabilityService pRequiredReliablityService)
+public StopFreezeRPdu setRequiredReliablityService(RequiredReliabilityService pRequiredReliablityService)
{
requiredReliablityService = pRequiredReliablityService;
return this;
@@ -99,7 +99,7 @@ public RequiredReliabilityService getRequiredReliablityService()
return requiredReliablityService;
}
-public StopFreezeReliablePdu setPad1(byte pPad1)
+public StopFreezeRPdu setPad1(byte pPad1)
{
pad1 = pPad1;
return this;
@@ -110,7 +110,7 @@ public byte getPad1()
return pad1;
}
-public StopFreezeReliablePdu setRequestID(int pRequestID)
+public StopFreezeRPdu setRequestID(int pRequestID)
{
requestID = pRequestID;
return this;
@@ -238,10 +238,10 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
{
boolean ivarsEqual = true;
- if(!(obj instanceof StopFreezeReliablePdu))
+ if(!(obj instanceof StopFreezeRPdu))
return false;
- final StopFreezeReliablePdu rhs = (StopFreezeReliablePdu)obj;
+ final StopFreezeRPdu rhs = (StopFreezeRPdu)obj;
if( ! (realWorldTime.equals( rhs.realWorldTime) )) ivarsEqual = false;
if( ! (reason == rhs.reason)) ivarsEqual = false;
diff --git a/src-generated/edu/nps/moves/dis7/StopFreezeReliablePdu.java b/src-generated/edu/nps/moves/dis7/StopFreezeReliablePdu.java
new file mode 100644
index 0000000000000000000000000000000000000000..af7e1e8925f4ef2707613eb9e26398ce203db8ee
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis7/StopFreezeReliablePdu.java
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * more descriptive name for a StopFreezeRPdu
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
+ */
+public class StopFreezeReliablePdu extends StopFreezeRPdu
+{}
diff --git a/src-generated/edu/nps/moves/dis/StorageFuel.java b/src-generated/edu/nps/moves/dis7/StorageFuel.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/StorageFuel.java
rename to src-generated/edu/nps/moves/dis7/StorageFuel.java
index 15dc9ce5f2f98adb65e96a358386e203f4bd9079..9e0162d5e8170feca6247816e162d2b62f247065 100644
--- a/src-generated/edu/nps/moves/dis/StorageFuel.java
+++ b/src-generated/edu/nps/moves/dis7/StorageFuel.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Information about an entity's engine fuel. Section 6.2.84.
diff --git a/src-generated/edu/nps/moves/dis/StorageFuelReload.java b/src-generated/edu/nps/moves/dis7/StorageFuelReload.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/StorageFuelReload.java
rename to src-generated/edu/nps/moves/dis7/StorageFuelReload.java
index 472ea8b69536eef4aa48c33b5850583f425a8c9c..45a2ef63e368db594e2fd45e32b553f2ab67f8a4 100644
--- a/src-generated/edu/nps/moves/dis/StorageFuelReload.java
+++ b/src-generated/edu/nps/moves/dis7/StorageFuelReload.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* For each type or location of Storage Fuel, this record shall specify the type, location, fuel measure- ment units, reload quantity and maximum quantity for storage fuel either for the whole entity or a specific storage fuel location (tank). Section 6.2.85.
diff --git a/src-generated/edu/nps/moves/dis7/SupplementalEmissionEntityStatePdu.java b/src-generated/edu/nps/moves/dis7/SupplementalEmissionEntityStatePdu.java
new file mode 100644
index 0000000000000000000000000000000000000000..62f771389f1602d8ef38f5e040074dc85b974a2e
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis7/SupplementalEmissionEntityStatePdu.java
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * more descriptive name for a SEESPdu
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
+ */
+public class SupplementalEmissionEntityStatePdu extends SEESPdu
+{}
diff --git a/src-generated/edu/nps/moves/dis/SupplyQuantity.java b/src-generated/edu/nps/moves/dis7/SupplyQuantity.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/SupplyQuantity.java
rename to src-generated/edu/nps/moves/dis7/SupplyQuantity.java
index bb132cc11a968af33e6266009e251e2f48076791..e0430466e364197bbd088a584fb32034ebca12c3 100644
--- a/src-generated/edu/nps/moves/dis/SupplyQuantity.java
+++ b/src-generated/edu/nps/moves/dis7/SupplyQuantity.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* A supply, and the amount of that supply. Section 6.2.86
diff --git a/src-generated/edu/nps/moves/dis/SyntheticEnvironmentFamilyPdu.java b/src-generated/edu/nps/moves/dis7/SyntheticEnvironmentFamilyPdu.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/SyntheticEnvironmentFamilyPdu.java
rename to src-generated/edu/nps/moves/dis7/SyntheticEnvironmentFamilyPdu.java
index 4796a18256efced6b78b902cb55fb58b3d51561c..169123c7fd5e80ba5e3dc7b3726e9c3895957de0 100644
--- a/src-generated/edu/nps/moves/dis/SyntheticEnvironmentFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/SyntheticEnvironmentFamilyPdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Section 5.3.11: Abstract superclass for synthetic environment PDUs
diff --git a/src-generated/edu/nps/moves/dis/SystemIdentifier.java b/src-generated/edu/nps/moves/dis7/SystemIdentifier.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/SystemIdentifier.java
rename to src-generated/edu/nps/moves/dis7/SystemIdentifier.java
index 9627f2fa5bed38e42decdb5b20c0c1e947f7d5d3..add5ae867059c9e51a2d9780d4a524b37b7be65d 100644
--- a/src-generated/edu/nps/moves/dis/SystemIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/SystemIdentifier.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* The ID of the IFF emitting system. Section 6.2.87
diff --git a/src-generated/edu/nps/moves/dis/TspiPdu.java b/src-generated/edu/nps/moves/dis7/TSPIPdu.java
similarity index 91%
rename from src-generated/edu/nps/moves/dis/TspiPdu.java
rename to src-generated/edu/nps/moves/dis7/TSPIPdu.java
index 58b17935a6a542b2440f1972e621a92f9856d68b..4505aeac0f0b1b4282b647b3432db8a80e63aa87 100644
--- a/src-generated/edu/nps/moves/dis/TspiPdu.java
+++ b/src-generated/edu/nps/moves/dis7/TSPIPdu.java
@@ -3,17 +3,17 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 9.4.2 The Time Space Position Information (TSPI) PDU shall communicate information about the LE’s state vector.
* IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
*/
-public class TspiPdu extends LiveEntityFamilyPdu implements Serializable
+public class TSPIPdu extends LiveEntityFamilyPdu implements Serializable
{
protected EntityID liveEntityId = new EntityID();
@@ -40,7 +40,7 @@ public class TspiPdu extends LiveEntityFamilyPdu implements Serializable
/** Constructor */
- public TspiPdu()
+ public TSPIPdu()
{
setPduType( DISPDUType.TSPI );
}
@@ -66,7 +66,7 @@ public int getMarshalledSize()
}
-public TspiPdu setLiveEntityId(EntityID pLiveEntityId)
+public TSPIPdu setLiveEntityId(EntityID pLiveEntityId)
{
liveEntityId = pLiveEntityId;
return this;
@@ -77,7 +77,7 @@ public EntityID getLiveEntityId()
return liveEntityId;
}
-public TspiPdu setTSPIFlag(byte pTSPIFlag)
+public TSPIPdu setTSPIFlag(byte pTSPIFlag)
{
TSPIFlag = pTSPIFlag;
return this;
@@ -88,7 +88,7 @@ public byte getTSPIFlag()
return TSPIFlag;
}
-public TspiPdu setEntityLocation(LiveEntityRelativeWorldCoordinates pEntityLocation)
+public TSPIPdu setEntityLocation(LiveEntityRelativeWorldCoordinates pEntityLocation)
{
entityLocation = pEntityLocation;
return this;
@@ -99,7 +99,7 @@ public LiveEntityRelativeWorldCoordinates getEntityLocation()
return entityLocation;
}
-public TspiPdu setEntityLinearVelocity(LiveEntityLinearVelocity pEntityLinearVelocity)
+public TSPIPdu setEntityLinearVelocity(LiveEntityLinearVelocity pEntityLinearVelocity)
{
entityLinearVelocity = pEntityLinearVelocity;
return this;
@@ -110,7 +110,7 @@ public LiveEntityLinearVelocity getEntityLinearVelocity()
return entityLinearVelocity;
}
-public TspiPdu setEntityOrientation(LiveEntityOrientation pEntityOrientation)
+public TSPIPdu setEntityOrientation(LiveEntityOrientation pEntityOrientation)
{
entityOrientation = pEntityOrientation;
return this;
@@ -121,7 +121,7 @@ public LiveEntityOrientation getEntityOrientation()
return entityOrientation;
}
-public TspiPdu setPositionError(LiveEntityPositionError pPositionError)
+public TSPIPdu setPositionError(LiveEntityPositionError pPositionError)
{
positionError = pPositionError;
return this;
@@ -132,7 +132,7 @@ public LiveEntityPositionError getPositionError()
return positionError;
}
-public TspiPdu setOrientationError(LiveEntityOrientationError pOrientationError)
+public TSPIPdu setOrientationError(LiveEntityOrientationError pOrientationError)
{
orientationError = pOrientationError;
return this;
@@ -143,7 +143,7 @@ public LiveEntityOrientationError getOrientationError()
return orientationError;
}
-public TspiPdu setDeadReckoningParameters(LiveDeadReckoningParameters pDeadReckoningParameters)
+public TSPIPdu setDeadReckoningParameters(LiveDeadReckoningParameters pDeadReckoningParameters)
{
deadReckoningParameters = pDeadReckoningParameters;
return this;
@@ -154,7 +154,7 @@ public LiveDeadReckoningParameters getDeadReckoningParameters()
return deadReckoningParameters;
}
-public TspiPdu setMeasuredSpeed(short pMeasuredSpeed)
+public TSPIPdu setMeasuredSpeed(short pMeasuredSpeed)
{
measuredSpeed = pMeasuredSpeed;
return this;
@@ -165,7 +165,7 @@ public short getMeasuredSpeed()
return measuredSpeed;
}
-public TspiPdu setSystemSpecificData(byte[] pSystemSpecificData)
+public TSPIPdu setSystemSpecificData(byte[] pSystemSpecificData)
{
systemSpecificData = pSystemSpecificData;
return this;
@@ -321,10 +321,10 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
{
boolean ivarsEqual = true;
- if(!(obj instanceof TspiPdu))
+ if(!(obj instanceof TSPIPdu))
return false;
- final TspiPdu rhs = (TspiPdu)obj;
+ final TSPIPdu rhs = (TSPIPdu)obj;
if( ! (liveEntityId.equals( rhs.liveEntityId) )) ivarsEqual = false;
if( ! (TSPIFlag == rhs.TSPIFlag)) ivarsEqual = false;
diff --git a/src-generated/edu/nps/moves/dis7/TimeSpacePositionInformationPdu.java b/src-generated/edu/nps/moves/dis7/TimeSpacePositionInformationPdu.java
new file mode 100644
index 0000000000000000000000000000000000000000..e87d51d5619ba7afba98767c318cea64a20ec36e
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis7/TimeSpacePositionInformationPdu.java
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) 2008-2019, MOVES Institute, Naval Postgraduate School. All rights reserved.
+ * This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
+ */
+
+package edu.nps.moves.dis7;
+
+import java.util.*;
+import java.io.*;
+import edu.nps.moves.dis7.enumerations.*;
+
+/**
+ * more descriptive name for a TSPIPdu
+ * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
+ */
+public class TimeSpacePositionInformationPdu extends TSPIPdu
+{}
diff --git a/src-generated/edu/nps/moves/dis/TotalRecordSets.java b/src-generated/edu/nps/moves/dis7/TotalRecordSets.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/TotalRecordSets.java
rename to src-generated/edu/nps/moves/dis7/TotalRecordSets.java
index afa7c99b2dc47b257da22cbe6aea01bb38ca69ac..a50d6f98acbddfd07db1ed977bf364f24d411292 100644
--- a/src-generated/edu/nps/moves/dis/TotalRecordSets.java
+++ b/src-generated/edu/nps/moves/dis7/TotalRecordSets.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Total number of record sets contained in a logical set of one or more PDUs. Used to transfer ownership, etc Section 6.2.88
diff --git a/src-generated/edu/nps/moves/dis/TrackJamData.java b/src-generated/edu/nps/moves/dis7/TrackJamData.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/TrackJamData.java
rename to src-generated/edu/nps/moves/dis7/TrackJamData.java
index 9b60077e2fedb8b52f421780b5c7382e9291b3eb..d1ba64d04263dee5f50ba4d247da10c98dd82191 100644
--- a/src-generated/edu/nps/moves/dis/TrackJamData.java
+++ b/src-generated/edu/nps/moves/dis7/TrackJamData.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Track-Jam data Section 6.2.89
diff --git a/src-generated/edu/nps/moves/dis/TransferOwnershipPdu.java b/src-generated/edu/nps/moves/dis7/TransferOwnershipPdu.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/TransferOwnershipPdu.java
rename to src-generated/edu/nps/moves/dis7/TransferOwnershipPdu.java
index fb2c8cbaeb0016066511e03a66a9e16ee25fc0fc..b928e3bd6a1fe29545c39d0f53d2ec1d0176e066 100644
--- a/src-generated/edu/nps/moves/dis/TransferOwnershipPdu.java
+++ b/src-generated/edu/nps/moves/dis7/TransferOwnershipPdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Information initiating the dyanic allocation and control of simulation entities between two simulation applications.
diff --git a/src-generated/edu/nps/moves/dis/TransmitterPdu.java b/src-generated/edu/nps/moves/dis7/TransmitterPdu.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/TransmitterPdu.java
rename to src-generated/edu/nps/moves/dis7/TransmitterPdu.java
index c722b9ce7c2f0d66c10f6acab88dee4a05dc7a26..bf1c46e054059f5cbb68aeb541ae4c99b8960021 100644
--- a/src-generated/edu/nps/moves/dis/TransmitterPdu.java
+++ b/src-generated/edu/nps/moves/dis7/TransmitterPdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 5.8.3 Communicates the state of a particular radio transmitter or simple intercom.
diff --git a/src-generated/edu/nps/moves/dis/UABeam.java b/src-generated/edu/nps/moves/dis7/UABeam.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/UABeam.java
rename to src-generated/edu/nps/moves/dis7/UABeam.java
index 8d4f84ca04f1917c5e1a55ba9e4742ea18cc7cf6..567373741e4bc87efc3e1de52ed512674b837fb7 100644
--- a/src-generated/edu/nps/moves/dis/UABeam.java
+++ b/src-generated/edu/nps/moves/dis7/UABeam.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
diff --git a/src-generated/edu/nps/moves/dis/UAEmitter.java b/src-generated/edu/nps/moves/dis7/UAEmitter.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/UAEmitter.java
rename to src-generated/edu/nps/moves/dis7/UAEmitter.java
index 03983741b25a4d83fdd41779021ffe85d568fdeb..1686a653520ed5dad023aeef09eae5c6ff22b907 100644
--- a/src-generated/edu/nps/moves/dis/UAEmitter.java
+++ b/src-generated/edu/nps/moves/dis7/UAEmitter.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
diff --git a/src-generated/edu/nps/moves/dis/UAFundamentalParameter.java b/src-generated/edu/nps/moves/dis7/UAFundamentalParameter.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/UAFundamentalParameter.java
rename to src-generated/edu/nps/moves/dis7/UAFundamentalParameter.java
index 11f8ad88bcbbe883888cfb197fde24a2e707f5c2..31312ff332287ed2bd09883f93f93a40a28e819d 100644
--- a/src-generated/edu/nps/moves/dis/UAFundamentalParameter.java
+++ b/src-generated/edu/nps/moves/dis7/UAFundamentalParameter.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Regeneration parameters for active emission systems that are variable throughout a scenario. Section 6.2.91
diff --git a/src-generated/edu/nps/moves/dis/UnattachedIdentifier.java b/src-generated/edu/nps/moves/dis7/UnattachedIdentifier.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/UnattachedIdentifier.java
rename to src-generated/edu/nps/moves/dis7/UnattachedIdentifier.java
index e9e13a62199fd6d72b9341031aa144cba6c431b4..041b2badd0347676320bf369805e86dd9d5640f7 100644
--- a/src-generated/edu/nps/moves/dis/UnattachedIdentifier.java
+++ b/src-generated/edu/nps/moves/dis7/UnattachedIdentifier.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* The unique designation of one or more unattached radios in an event or exercise Section 6.2.91
diff --git a/src-generated/edu/nps/moves/dis/UnderwaterAcousticPdu.java b/src-generated/edu/nps/moves/dis7/UnderwaterAcousticPdu.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/UnderwaterAcousticPdu.java
rename to src-generated/edu/nps/moves/dis7/UnderwaterAcousticPdu.java
index 545499fc3dfef16179a31e27217fde2eb0978631..c8f916458f0c3326b9a429a5e58d07f512f8a58d 100644
--- a/src-generated/edu/nps/moves/dis/UnderwaterAcousticPdu.java
+++ b/src-generated/edu/nps/moves/dis7/UnderwaterAcousticPdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* 7.6.4 Information about underwater acoustic emmissions. See 5.7.5.
diff --git a/src-generated/edu/nps/moves/dis/UnsignedDISInteger.java b/src-generated/edu/nps/moves/dis7/UnsignedDISInteger.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/UnsignedDISInteger.java
rename to src-generated/edu/nps/moves/dis7/UnsignedDISInteger.java
index 2ddea997fcb1f3c46f7d056ada4730a639cc3bef..19e48d55af4b4c5c366e68d33bd331df1eb48d8c 100644
--- a/src-generated/edu/nps/moves/dis/UnsignedDISInteger.java
+++ b/src-generated/edu/nps/moves/dis7/UnsignedDISInteger.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* container class not in specification
diff --git a/src-generated/edu/nps/moves/dis/VariableDatum.java b/src-generated/edu/nps/moves/dis7/VariableDatum.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/VariableDatum.java
rename to src-generated/edu/nps/moves/dis7/VariableDatum.java
index ba494fb457dc8b7b94cabdafe046e1dd9991ae4d..7139985d2378d313f9cdfb9a1e607e4e51d558c9 100644
--- a/src-generated/edu/nps/moves/dis/VariableDatum.java
+++ b/src-generated/edu/nps/moves/dis7/VariableDatum.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* the variable datum type, the datum length, and the value for that variable datum type. Section 6.2.93
diff --git a/src-generated/edu/nps/moves/dis/VariableParameter.java b/src-generated/edu/nps/moves/dis7/VariableParameter.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/VariableParameter.java
rename to src-generated/edu/nps/moves/dis7/VariableParameter.java
index d9a8bd05d006e05c0012f7c8c087cfc001518d68..d5886bc19ee56eb0942926c42729f97014f5d1d1 100644
--- a/src-generated/edu/nps/moves/dis/VariableParameter.java
+++ b/src-generated/edu/nps/moves/dis7/VariableParameter.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* used in DetonationPdu, ArticulatedPartsPdu among others
diff --git a/src-generated/edu/nps/moves/dis/VariableTransmitterParameters.java b/src-generated/edu/nps/moves/dis7/VariableTransmitterParameters.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/VariableTransmitterParameters.java
rename to src-generated/edu/nps/moves/dis7/VariableTransmitterParameters.java
index aff07363041e0e7c9740597fa699f2785206acc5..17e4baafcef8d2dec5a0b30f59cebf1c6e369f13 100644
--- a/src-generated/edu/nps/moves/dis/VariableTransmitterParameters.java
+++ b/src-generated/edu/nps/moves/dis7/VariableTransmitterParameters.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Relates to radios. Section 6.2.95
diff --git a/src-generated/edu/nps/moves/dis/Vector2Float.java b/src-generated/edu/nps/moves/dis7/Vector2Float.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/Vector2Float.java
rename to src-generated/edu/nps/moves/dis7/Vector2Float.java
index 36429c27ae605b16f94a00e6161e64e4269ee66b..ec88a19bc4090f6527f43f8fdb4917fc5af0ee4c 100644
--- a/src-generated/edu/nps/moves/dis/Vector2Float.java
+++ b/src-generated/edu/nps/moves/dis7/Vector2Float.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Two floating point values, x, y
diff --git a/src-generated/edu/nps/moves/dis/Vector3Double.java b/src-generated/edu/nps/moves/dis7/Vector3Double.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/Vector3Double.java
rename to src-generated/edu/nps/moves/dis7/Vector3Double.java
index 80d4ef47e7a70c41be5f90ff1191893f06e91614..1b305599639f557295b7866126f0d37b15d472af 100644
--- a/src-generated/edu/nps/moves/dis/Vector3Double.java
+++ b/src-generated/edu/nps/moves/dis7/Vector3Double.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Three double precision floating point values, x, y, and z. Used for world coordinates Section 6.2.97.
diff --git a/src-generated/edu/nps/moves/dis/Vector3Float.java b/src-generated/edu/nps/moves/dis7/Vector3Float.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/Vector3Float.java
rename to src-generated/edu/nps/moves/dis7/Vector3Float.java
index 7589bf2193a340204ada0980be8b439c794ccc8a..46c05f8fae2fd1ffd049b2e0a1309cd98e8c623b 100644
--- a/src-generated/edu/nps/moves/dis/Vector3Float.java
+++ b/src-generated/edu/nps/moves/dis7/Vector3Float.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Three floating point values, x, y, and z. Section 6.2.95
diff --git a/src-generated/edu/nps/moves/dis/VectoringNozzleSystem.java b/src-generated/edu/nps/moves/dis7/VectoringNozzleSystem.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/VectoringNozzleSystem.java
rename to src-generated/edu/nps/moves/dis7/VectoringNozzleSystem.java
index 4c3139e05980d4dbbc08989b88557ce603bc1dc8..4e790ae027bbd0d1aa0c76a958a7b9bfd11167ea 100644
--- a/src-generated/edu/nps/moves/dis/VectoringNozzleSystem.java
+++ b/src-generated/edu/nps/moves/dis7/VectoringNozzleSystem.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Operational data for describing the vectoring nozzle systems Section 6.2.96
diff --git a/src-generated/edu/nps/moves/dis/WarfareFamilyPdu.java b/src-generated/edu/nps/moves/dis7/WarfareFamilyPdu.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/WarfareFamilyPdu.java
rename to src-generated/edu/nps/moves/dis7/WarfareFamilyPdu.java
index 5e74db6291da2e731f87202cef6c87e77dfd2673..819b8f9b6cee1a7a9038c3acac73489255f917fe 100644
--- a/src-generated/edu/nps/moves/dis/WarfareFamilyPdu.java
+++ b/src-generated/edu/nps/moves/dis7/WarfareFamilyPdu.java
@@ -3,11 +3,11 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* Abstract superclass for fire and detonation pdus that have shared information. Section 7.3
diff --git a/src-generated/edu/nps/moves/dis/enumerations/APAParameterIndexAPAStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/APAParameterIndexAPAStatus.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/APAParameterIndexAPAStatus.java
rename to src-generated/edu/nps/moves/dis7/enumerations/APAParameterIndexAPAStatus.java
index c21c6ac29b325a2b46d42707102d98f7ea919f65..d25a4d8dd089de0e520db1ad891b20fb4d876a31 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/APAParameterIndexAPAStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/APAParameterIndexAPAStatus.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AcknowledgeAcknowledgeFlag.java b/src-generated/edu/nps/moves/dis7/enumerations/AcknowledgeAcknowledgeFlag.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/AcknowledgeAcknowledgeFlag.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AcknowledgeAcknowledgeFlag.java
index 73c7a43ee9aa708a6c326ec84aadd4cd75b268a2..b148f7f8276f8e59e5966275c36273b2dfb033a6 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AcknowledgeAcknowledgeFlag.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AcknowledgeAcknowledgeFlag.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AcknowledgeResponseFlag.java b/src-generated/edu/nps/moves/dis7/enumerations/AcknowledgeResponseFlag.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/AcknowledgeResponseFlag.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AcknowledgeResponseFlag.java
index d0291f63f39dbcab7fb17c85f482abf72f870aa6..6417687ec2fa48c77cbb16f5650354b5a1531cf7 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AcknowledgeResponseFlag.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AcknowledgeResponseFlag.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/Acronyms.java b/src-generated/edu/nps/moves/dis7/enumerations/Acronyms.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/enumerations/Acronyms.java
rename to src-generated/edu/nps/moves/dis7/enumerations/Acronyms.java
index d31b2adfd33cf5994f611e92470eb58467d8a65b..d0245c64c1b3d14b579f339b4de318e8ec039a6b 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/Acronyms.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Acronyms.java
@@ -1,5 +1,5 @@
/* Generated from the XML, SISO-REF-010-v25, 2018-08-29 */
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
/* UID 2 */
public enum Acronyms
diff --git a/src-generated/edu/nps/moves/dis/enumerations/ActionRequestActionID.java b/src-generated/edu/nps/moves/dis7/enumerations/ActionRequestActionID.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/ActionRequestActionID.java
rename to src-generated/edu/nps/moves/dis7/enumerations/ActionRequestActionID.java
index 3f7a90f859641e64cb2f1b5f33cf5f3d9cfc48a7..fac66d56ae3c6df897914696db0627bd012fb891 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/ActionRequestActionID.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ActionRequestActionID.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/ActionResponseRequestStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/ActionResponseRequestStatus.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/ActionResponseRequestStatus.java
rename to src-generated/edu/nps/moves/dis7/enumerations/ActionResponseRequestStatus.java
index 6ab5bce38acbd70a73e63846ad9cf90ebe81062a..7bb52df589bc2e2f9123293935904f45c6095d24 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/ActionResponseRequestStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ActionResponseRequestStatus.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AddSpecificDimensionEnumerationsforSubsurfaceAreaSize.java b/src-generated/edu/nps/moves/dis7/enumerations/AddSpecificDimensionEnumerationsforSubsurfaceAreaSize.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/AddSpecificDimensionEnumerationsforSubsurfaceAreaSize.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AddSpecificDimensionEnumerationsforSubsurfaceAreaSize.java
index 7bd122ba21952fd8573c67e79b501e0194009119..703a1c4a5bfc6ea2f67928d004e3181c9d7b2f9a 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AddSpecificDimensionEnumerationsforSubsurfaceAreaSize.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AddSpecificDimensionEnumerationsforSubsurfaceAreaSize.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AddVariantsforAirCategory201Insect.java b/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforAirCategory201Insect.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/AddVariantsforAirCategory201Insect.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforAirCategory201Insect.java
index 8c64cfed3d8042524ef6410f32f4272f7e8a0fbd..cf9d6dffee2db52077d5cd0194ee4d1b0dc615cb 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AddVariantsforAirCategory201Insect.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforAirCategory201Insect.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AddVariantsforLandCategory200Mammal.java b/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforLandCategory200Mammal.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/AddVariantsforLandCategory200Mammal.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforLandCategory200Mammal.java
index 3a1424ba7bf02eda6b465cb29c2de65835424b4d..3fa78d68ed7996509b6454c31e30fa18530a5054 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AddVariantsforLandCategory200Mammal.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforLandCategory200Mammal.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AddVariantsforSubsurfaceCategoriesFishMolluskCrustaceanandInsect.java b/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforSubsurfaceCategoriesFishMolluskCrustaceanandInsect.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/AddVariantsforSubsurfaceCategoriesFishMolluskCrustaceanandInsect.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforSubsurfaceCategoriesFishMolluskCrustaceanandInsect.java
index a2343dcc3c79a7db7df1cb5b1c1db7080dc2eedd..014e5c348a5b8f79827b190f4de2b666ad8c1bfd 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AddVariantsforSubsurfaceCategoriesFishMolluskCrustaceanandInsect.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AddVariantsforSubsurfaceCategoriesFishMolluskCrustaceanandInsect.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AggregateStateAggregateKind.java b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateAggregateKind.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/AggregateStateAggregateKind.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AggregateStateAggregateKind.java
index eeac9bd85afef9c0856f7081c3cb4198f60cfb05..443d4028806316a74025edc1626f715f991c3f11 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AggregateStateAggregateKind.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateAggregateKind.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AggregateStateAggregateState.java b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateAggregateState.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/AggregateStateAggregateState.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AggregateStateAggregateState.java
index e65f51763c22f1933c2c1cea5c0e0892f5389866..7ca3b9fcab04009cfdebb42ce2a54ba28ef2e8c5 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AggregateStateAggregateState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateAggregateState.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AggregateStateFormation.java b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateFormation.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/AggregateStateFormation.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AggregateStateFormation.java
index 62270abad98c65b8e9b4f3d2589c935f59a12b3e..58585e4367523419578e6dafb91f4d476d5713a5 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AggregateStateFormation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateFormation.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AggregateStateSpecific.java b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateSpecific.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/AggregateStateSpecific.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AggregateStateSpecific.java
index 577310d6515fb403686637f6650384101a1928eb..1fe6f72dac5a00690aafd6e9bfba800fa56cfc0e 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AggregateStateSpecific.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateSpecific.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AggregateStateSubcategory.java b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateSubcategory.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/AggregateStateSubcategory.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AggregateStateSubcategory.java
index 099b3e0307ab6be4330895b96d6932a141394352..121512516fcb8833ab2682b09698f33a61768970 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AggregateStateSubcategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AggregateStateSubcategory.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AirPlatformAppearance.java b/src-generated/edu/nps/moves/dis7/enumerations/AirPlatformAppearance.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/AirPlatformAppearance.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AirPlatformAppearance.java
index 4510f261b1721dc5a0a7d6f0a39115aba2613c37..0ba9c73f47f7bf62bda14af9fd9520c0684ad05c 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AirPlatformAppearance.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AirPlatformAppearance.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AirPlatformCapabilities.java b/src-generated/edu/nps/moves/dis7/enumerations/AirPlatformCapabilities.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/AirPlatformCapabilities.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AirPlatformCapabilities.java
index f175b453527ee1bf6e2d102f6a7b7c011f51ec0f..91707262c0f411791b76126f6b1af808248e2e09 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AirPlatformCapabilities.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AirPlatformCapabilities.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AircraftAddressSource.java b/src-generated/edu/nps/moves/dis7/enumerations/AircraftAddressSource.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/AircraftAddressSource.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AircraftAddressSource.java
index d8d795f4658358979ab5e6af21f07ca870b1e5a0..e21c456e97023073d6e9162c7aaf3aa794e1b204 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AircraftAddressSource.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AircraftAddressSource.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AircraftIdentificationType.java b/src-generated/edu/nps/moves/dis7/enumerations/AircraftIdentificationType.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/AircraftIdentificationType.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AircraftIdentificationType.java
index 1ec26878cd3c1129e6483559a625ca19d9494e55..add60dc139fe72b4afc28d0ef543982d40ab44f2 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AircraftIdentificationType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AircraftIdentificationType.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AircraftPresentDomain.java b/src-generated/edu/nps/moves/dis7/enumerations/AircraftPresentDomain.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/AircraftPresentDomain.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AircraftPresentDomain.java
index eef6ec67a134676c67d71406c6733fe20cad812b..e6e3bcb13e5cbc0a37c9846ded003933eb0895d1 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AircraftPresentDomain.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AircraftPresentDomain.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AircraftTypeWake.java b/src-generated/edu/nps/moves/dis7/enumerations/AircraftTypeWake.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/AircraftTypeWake.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AircraftTypeWake.java
index a392f268627e77a2e02a25b8b24b6fa004085e15..476407d37dd3c94f789a112d8b416463f0f60a6e 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AircraftTypeWake.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AircraftTypeWake.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AnimalLifeformGroupSizeRangeEnumerationforallDomains.java b/src-generated/edu/nps/moves/dis7/enumerations/AnimalLifeformGroupSizeRangeEnumerationforallDomains.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/AnimalLifeformGroupSizeRangeEnumerationforallDomains.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AnimalLifeformGroupSizeRangeEnumerationforallDomains.java
index dfb631ba1593f455c079f0703f86d100deabedce..e6c21d875359691f7648d7cd37a8e3a8080f2224 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AnimalLifeformGroupSizeRangeEnumerationforallDomains.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AnimalLifeformGroupSizeRangeEnumerationforallDomains.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AntennaSelection.java b/src-generated/edu/nps/moves/dis7/enumerations/AntennaSelection.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/AntennaSelection.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AntennaSelection.java
index 615bfbb0fa2827f20bd3ab10fa49a6ee9aaaa6c1..bafea7ba5265561929c3b6c54661f2f5283d2d08 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AntennaSelection.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AntennaSelection.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AntennaStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/AntennaStatus.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/AntennaStatus.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AntennaStatus.java
index 96cd670d1245843f0722135c4a8c7e4767a44189..089a00b379952761f47ee87d217bd52db575f832 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AntennaStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AntennaStatus.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AppearanceAntiCollisionDayNight.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceAntiCollisionDayNight.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/AppearanceAntiCollisionDayNight.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AppearanceAntiCollisionDayNight.java
index 15afe7c7880315deea193f4502746840b0b41be8..d849c3e4e462269f2413cd1645bc0495b26189ee 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AppearanceAntiCollisionDayNight.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceAntiCollisionDayNight.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AppearanceCamouflageType.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceCamouflageType.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/AppearanceCamouflageType.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AppearanceCamouflageType.java
index 543a46ab122762ee0f90a7b84226078db027972a..5135b7a922c1bc6b34ff70f74b00350b1cf206a5 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AppearanceCamouflageType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceCamouflageType.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AppearanceCanopy.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceCanopy.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/AppearanceCanopy.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AppearanceCanopy.java
index 5051981b810d2b35b3c2ae8e66cb074fdd574b8a..4c45a5553e3162b115ac7e246d7fd2653ee1ca23 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AppearanceCanopy.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceCanopy.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AppearanceConcealedMovement.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceConcealedMovement.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/AppearanceConcealedMovement.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AppearanceConcealedMovement.java
index a4b5badc802c73b1c3e86a98d07c5a742e9d5be0..dee87ff38a448ba950e8cdc39bae174c726df95a 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AppearanceConcealedMovement.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceConcealedMovement.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AppearanceConcealedPosition.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceConcealedPosition.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/AppearanceConcealedPosition.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AppearanceConcealedPosition.java
index 42a471545ec6d94615406aaef940fffef247503f..65d1773e4368637066063986282cdce6f4b800d9 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AppearanceConcealedPosition.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceConcealedPosition.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AppearanceDamage.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceDamage.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/AppearanceDamage.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AppearanceDamage.java
index 8bd78636d177df8b99e09350ba49857e2bbdaca3..33780aa03517ecd8a80083301585bd0c4869bfc0 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AppearanceDamage.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceDamage.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AppearanceEntityorObjectState.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceEntityorObjectState.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/AppearanceEntityorObjectState.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AppearanceEntityorObjectState.java
index c3257f19c57ce7f2b2bb0f5552f918326b83a1b9..c913629a80949675f8a3499451208e1019b8bcbb 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AppearanceEntityorObjectState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceEntityorObjectState.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AppearanceEnvironmentalDensity.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceEnvironmentalDensity.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/AppearanceEnvironmentalDensity.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AppearanceEnvironmentalDensity.java
index 9a92ed8ddc8a105c17815f86e08104219a14d951..249e00ed01f819b892c318d86b4fbbd399e0f263 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AppearanceEnvironmentalDensity.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceEnvironmentalDensity.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AppearanceHatch.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceHatch.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/AppearanceHatch.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AppearanceHatch.java
index 33aaea6f177c71128986d19e5dd49d91e6e2899f..55cde9d862cdaa59b617c72d1c9cbb7e8408fba2 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AppearanceHatch.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceHatch.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AppearanceLauncherOperational.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLauncherOperational.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/AppearanceLauncherOperational.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AppearanceLauncherOperational.java
index ec83869f7ca17594646c1b8ed0a4c2b882765a64..f9483ab201f963c6c0d29a553e8e3ee2f3dd7349 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AppearanceLauncherOperational.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLauncherOperational.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AppearanceLifeFormComplianceStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormComplianceStatus.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/AppearanceLifeFormComplianceStatus.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormComplianceStatus.java
index 882211d0f33d85310c11f8645e3cdff599ea4a89..6ea78ea78a9ae17eb6d06f6f6c075cab6f40c4ef 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AppearanceLifeFormComplianceStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormComplianceStatus.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AppearanceLifeFormPosture.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormPosture.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/AppearanceLifeFormPosture.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormPosture.java
index d3709c375e0c93d7ec2b39d8efb4f180cf9a5c03..8e0415387832bde7f3c6a20ddcfa62adbffcf921 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AppearanceLifeFormPosture.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormPosture.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AppearanceLifeFormWeaponImplement.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormWeaponImplement.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/AppearanceLifeFormWeaponImplement.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormWeaponImplement.java
index 5a40324abfa08e6501b697993818fc33ef25302a..da6408abe3b1e7758984ad9b0988bf14b1c86a64 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AppearanceLifeFormWeaponImplement.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeFormWeaponImplement.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AppearanceLifeformHealth.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeformHealth.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/AppearanceLifeformHealth.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeformHealth.java
index 84be64c218f936b73be17c96126a0f27d9021e22..c5aa7f2d895c9c36353976fea9043f3c968df731 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AppearanceLifeformHealth.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLifeformHealth.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AppearanceLinearObjectLaneMarkerVisible.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLinearObjectLaneMarkerVisible.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/AppearanceLinearObjectLaneMarkerVisible.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AppearanceLinearObjectLaneMarkerVisible.java
index 264d03448aff9cb8f31354da01b3114af68edd38..cc12587842192bdd854e6547dd69e64d77face48 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AppearanceLinearObjectLaneMarkerVisible.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLinearObjectLaneMarkerVisible.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AppearanceLinearObjectTankDitchBreach.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLinearObjectTankDitchBreach.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/AppearanceLinearObjectTankDitchBreach.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AppearanceLinearObjectTankDitchBreach.java
index fada1ee174202c66275601abe78ba67b6292cb88..7ebb8f742854b75673ebc5c835c87951fb772920 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AppearanceLinearObjectTankDitchBreach.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceLinearObjectTankDitchBreach.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AppearanceNVGMode.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceNVGMode.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/AppearanceNVGMode.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AppearanceNVGMode.java
index 1a3c5946f80957878d872e1ef7283369640f2913..d7a9250ed88203cc74b5e75dc0a4a77ec808dbb9 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AppearanceNVGMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceNVGMode.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AppearanceNavigationPositionBrightness.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceNavigationPositionBrightness.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/AppearanceNavigationPositionBrightness.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AppearanceNavigationPositionBrightness.java
index ba5731ec9ae7d79bfa9dbf7931a54cda95474690..e73ad853f63ac99b98b0c9004a6f0b5ff8ccbd82 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AppearanceNavigationPositionBrightness.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceNavigationPositionBrightness.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AppearanceObjectGeneralDamage.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralDamage.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/AppearanceObjectGeneralDamage.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralDamage.java
index 61164aa3d99deca1f961fdde0ea9dcb07076cdb5..701128c887e52a60135d897c795f0defb5c6e91d 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AppearanceObjectGeneralDamage.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralDamage.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AppearanceObjectGeneralIEDPresent.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralIEDPresent.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/AppearanceObjectGeneralIEDPresent.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralIEDPresent.java
index 46f5acc361277cd2e5988ef0c71874f5a00fc219..c26973a1ae80bf2e5bcae97beb621e07503a41aa 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AppearanceObjectGeneralIEDPresent.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralIEDPresent.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AppearanceObjectGeneralPredistributed.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralPredistributed.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/AppearanceObjectGeneralPredistributed.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralPredistributed.java
index 4648c911da2c1c3096ced98498ebd942e352e0b5..71e62cdc49fa4513aadc5e3355dd6259dd3133db 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AppearanceObjectGeneralPredistributed.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectGeneralPredistributed.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AppearanceObjectSpecificBreachState.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectSpecificBreachState.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/AppearanceObjectSpecificBreachState.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectSpecificBreachState.java
index 087a73d517c40f9334a88d212569ddcff1682825..5274ea8c8bd1ee64456e393b17863d0e708c6976 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AppearanceObjectSpecificBreachState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectSpecificBreachState.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AppearanceObjectSpecificChemicalType.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectSpecificChemicalType.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/AppearanceObjectSpecificChemicalType.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectSpecificChemicalType.java
index 0a297f4505acec869c1dc2dcf381bec6f1d7631b..4d0f5ca7c28f836bf78ec06e040d441189bfd53b 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AppearanceObjectSpecificChemicalType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceObjectSpecificChemicalType.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AppearancePaintScheme.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearancePaintScheme.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/AppearancePaintScheme.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AppearancePaintScheme.java
index 9abceed84997d50f634c42a00b781c1e36907c7d..25677627dcdc1dff809c51d7f9b86cbb2ba772d5 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AppearancePaintScheme.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearancePaintScheme.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AppearanceSubsurfaceHatch.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceSubsurfaceHatch.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/AppearanceSubsurfaceHatch.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AppearanceSubsurfaceHatch.java
index 4716f0b81365016bcd4c6441ef4e87b407cbb540..d56df5e01486a22f0dc74aa5ea04c9f49cbf2f3c 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AppearanceSubsurfaceHatch.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceSubsurfaceHatch.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AppearanceSupplyDeployed.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceSupplyDeployed.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/AppearanceSupplyDeployed.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AppearanceSupplyDeployed.java
index fea4de3868c6a7b3a8e10c142f16e358eb51b843..51f61a18a47d5d5d78ac63bd634d8bea890c3368 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AppearanceSupplyDeployed.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceSupplyDeployed.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AppearanceTrailingEffects.java b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceTrailingEffects.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/AppearanceTrailingEffects.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AppearanceTrailingEffects.java
index 8eeb9653e07e87289f66f1ae813825a99ff16ed8..fe4a063adb836da5fa837f960ae382462271675e 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AppearanceTrailingEffects.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AppearanceTrailingEffects.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/ArealObjectAppearanceMinefield.java b/src-generated/edu/nps/moves/dis7/enumerations/ArealObjectAppearanceMinefield.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/ArealObjectAppearanceMinefield.java
rename to src-generated/edu/nps/moves/dis7/enumerations/ArealObjectAppearanceMinefield.java
index 1c9b1fb9399cf785da58c14175ee31107a00c398..3dce38272549effda51dce60fc326783c3f467e3 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/ArealObjectAppearanceMinefield.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ArealObjectAppearanceMinefield.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/ArticulatedPartsTypeClass.java b/src-generated/edu/nps/moves/dis7/enumerations/ArticulatedPartsTypeClass.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/enumerations/ArticulatedPartsTypeClass.java
rename to src-generated/edu/nps/moves/dis7/enumerations/ArticulatedPartsTypeClass.java
index c798b705f6137432fd453139e21cd83b919fdeeb..fbcfc016a1b64e43de4ec8455e75f9018506b006 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/ArticulatedPartsTypeClass.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ArticulatedPartsTypeClass.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/ArticulatedPartsTypeMetric.java b/src-generated/edu/nps/moves/dis7/enumerations/ArticulatedPartsTypeMetric.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/ArticulatedPartsTypeMetric.java
rename to src-generated/edu/nps/moves/dis7/enumerations/ArticulatedPartsTypeMetric.java
index 4127f91b160946fa0c5a4ee9b82a68d47a695dc7..9b8d1cfd46c04739b6b55b254ba04337448ede04 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/ArticulatedPartsTypeMetric.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ArticulatedPartsTypeMetric.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AttachedPartDetachedIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/AttachedPartDetachedIndicator.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/AttachedPartDetachedIndicator.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AttachedPartDetachedIndicator.java
index 6459bc10893e7e16396e8bed06cfae0036f72b5a..03efe5a25f00376e7a0c690e32782262a1cb60ea 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AttachedPartDetachedIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AttachedPartDetachedIndicator.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AttachedParts.java b/src-generated/edu/nps/moves/dis7/enumerations/AttachedParts.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/AttachedParts.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AttachedParts.java
index 911c85a30c8229af26f1c3da576a64d239b9d9d9..433e613608a498567b5679f07568decb2e96e8cb 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AttachedParts.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AttachedParts.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/AustralianCategoryOverlay.java b/src-generated/edu/nps/moves/dis7/enumerations/AustralianCategoryOverlay.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/AustralianCategoryOverlay.java
rename to src-generated/edu/nps/moves/dis7/enumerations/AustralianCategoryOverlay.java
index 05fd273adcc82b688a44084e0e49884002939fb2..e070640379580f89986b4e92a5e5bc9b79be994d 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/AustralianCategoryOverlay.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/AustralianCategoryOverlay.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/BeamStatusBeamState.java b/src-generated/edu/nps/moves/dis7/enumerations/BeamStatusBeamState.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/BeamStatusBeamState.java
rename to src-generated/edu/nps/moves/dis7/enumerations/BeamStatusBeamState.java
index cf367b063d42770b2c7443ebdfe93148d6c0e36c..c318f092c6455e8b38374f2f04895fef4231e977 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/BeamStatusBeamState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/BeamStatusBeamState.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/BuildingPaintScheme.java b/src-generated/edu/nps/moves/dis7/enumerations/BuildingPaintScheme.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/BuildingPaintScheme.java
rename to src-generated/edu/nps/moves/dis7/enumerations/BuildingPaintScheme.java
index 4484b361b3b59acc6920ee433dcb0e54df0fc88f..50f9ba6959a122b78ffbcbbd72eddb75a7326d8f 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/BuildingPaintScheme.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/BuildingPaintScheme.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/CCTTSINCGARSClearChannel.java b/src-generated/edu/nps/moves/dis7/enumerations/CCTTSINCGARSClearChannel.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/CCTTSINCGARSClearChannel.java
rename to src-generated/edu/nps/moves/dis7/enumerations/CCTTSINCGARSClearChannel.java
index 0e5ec21b805738dd4b19ed0eef9530c223f52546..8eb661ca7272d0827098efd668c8bdce22726382 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/CCTTSINCGARSClearChannel.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/CCTTSINCGARSClearChannel.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/CCTTSINCGARSStartofMessage.java b/src-generated/edu/nps/moves/dis7/enumerations/CCTTSINCGARSStartofMessage.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/CCTTSINCGARSStartofMessage.java
rename to src-generated/edu/nps/moves/dis7/enumerations/CCTTSINCGARSStartofMessage.java
index 7e0a3a2130f469dd58ada808163223141a50401b..5221a933ae200c9b00f040baae1149f869218e34 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/CCTTSINCGARSStartofMessage.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/CCTTSINCGARSStartofMessage.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/CIGIExtensionPacketID.java b/src-generated/edu/nps/moves/dis7/enumerations/CIGIExtensionPacketID.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/CIGIExtensionPacketID.java
rename to src-generated/edu/nps/moves/dis7/enumerations/CIGIExtensionPacketID.java
index c3e995a145c45be0c43308f2ca26f1c7db7e02aa..e21ca5d998e4abe9b2aebf21fc095067cbab409c 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/CIGIExtensionPacketID.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/CIGIExtensionPacketID.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/CapabilityReport.java b/src-generated/edu/nps/moves/dis7/enumerations/CapabilityReport.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/CapabilityReport.java
rename to src-generated/edu/nps/moves/dis7/enumerations/CapabilityReport.java
index 05e5067b4186ed4bd878cb1990411a827dc70e48..c3070684a7c8473c85d3e30bdc59f12f6037f29a 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/CapabilityReport.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/CapabilityReport.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/Class10SupplyCategoryMaterialtoSupportNonMilitaryPrograms.java b/src-generated/edu/nps/moves/dis7/enumerations/Class10SupplyCategoryMaterialtoSupportNonMilitaryPrograms.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/Class10SupplyCategoryMaterialtoSupportNonMilitaryPrograms.java
rename to src-generated/edu/nps/moves/dis7/enumerations/Class10SupplyCategoryMaterialtoSupportNonMilitaryPrograms.java
index 3354061a43e5e5a07be5f25baeec9d7bb0d0755a..6505c1eb508c792fa6fb7fba1c9850abcfb0b3ed 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/Class10SupplyCategoryMaterialtoSupportNonMilitaryPrograms.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class10SupplyCategoryMaterialtoSupportNonMilitaryPrograms.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/Class11SupplyCategorySuppliesNonDoctrinal.java b/src-generated/edu/nps/moves/dis7/enumerations/Class11SupplyCategorySuppliesNonDoctrinal.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/Class11SupplyCategorySuppliesNonDoctrinal.java
rename to src-generated/edu/nps/moves/dis7/enumerations/Class11SupplyCategorySuppliesNonDoctrinal.java
index 3f0e518641f290937a708f11508e05b80ef3d19d..5de57e02e0d79bb47c5573553751e692eed7e295 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/Class11SupplyCategorySuppliesNonDoctrinal.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class11SupplyCategorySuppliesNonDoctrinal.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/Class12SupplyCategorySlingLoadsNonDoctrinal.java b/src-generated/edu/nps/moves/dis7/enumerations/Class12SupplyCategorySlingLoadsNonDoctrinal.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/Class12SupplyCategorySlingLoadsNonDoctrinal.java
rename to src-generated/edu/nps/moves/dis7/enumerations/Class12SupplyCategorySlingLoadsNonDoctrinal.java
index 09149f2564b77d12bca3c385ff46da850acd3f3c..86fb0292a6dd48b6d9b9d54e38da02152c7ceb14 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/Class12SupplyCategorySlingLoadsNonDoctrinal.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class12SupplyCategorySlingLoadsNonDoctrinal.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/Class1SupplyCategorySubsistence.java b/src-generated/edu/nps/moves/dis7/enumerations/Class1SupplyCategorySubsistence.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/Class1SupplyCategorySubsistence.java
rename to src-generated/edu/nps/moves/dis7/enumerations/Class1SupplyCategorySubsistence.java
index b6d7524a317bbf3165df87426f80c4c5e1b6db05..aef0dd71eadc4d1fa0920ff778f053018e7f47a9 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/Class1SupplyCategorySubsistence.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class1SupplyCategorySubsistence.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/Class2SupplyCategoryClothingIndividualEquipmentToolsAdminSupplies.java b/src-generated/edu/nps/moves/dis7/enumerations/Class2SupplyCategoryClothingIndividualEquipmentToolsAdminSupplies.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/Class2SupplyCategoryClothingIndividualEquipmentToolsAdminSupplies.java
rename to src-generated/edu/nps/moves/dis7/enumerations/Class2SupplyCategoryClothingIndividualEquipmentToolsAdminSupplies.java
index df0c0b213871950fd6090dbf236a65bf78b966bf..cd69ddaa142c4534ab78bfee960eebca73f36b82 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/Class2SupplyCategoryClothingIndividualEquipmentToolsAdminSupplies.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class2SupplyCategoryClothingIndividualEquipmentToolsAdminSupplies.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/Class3SupplyCategoryPetroleumOilsLubricants.java b/src-generated/edu/nps/moves/dis7/enumerations/Class3SupplyCategoryPetroleumOilsLubricants.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/Class3SupplyCategoryPetroleumOilsLubricants.java
rename to src-generated/edu/nps/moves/dis7/enumerations/Class3SupplyCategoryPetroleumOilsLubricants.java
index 02644469cf953527c6348e23b91d579d7f51a01e..dbbf622e7abbb3d763b559a803df6063f2765a72 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/Class3SupplyCategoryPetroleumOilsLubricants.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class3SupplyCategoryPetroleumOilsLubricants.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/Class4SupplyCategoryConstructionMaterials.java b/src-generated/edu/nps/moves/dis7/enumerations/Class4SupplyCategoryConstructionMaterials.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/Class4SupplyCategoryConstructionMaterials.java
rename to src-generated/edu/nps/moves/dis7/enumerations/Class4SupplyCategoryConstructionMaterials.java
index 06380aa4a4a97e31b832cda96f86a19105ed862e..0dfeca49d20f3a72f7539b330029940990b598ec 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/Class4SupplyCategoryConstructionMaterials.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class4SupplyCategoryConstructionMaterials.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/Class6SupplyCategoryPersonnelDemandItems.java b/src-generated/edu/nps/moves/dis7/enumerations/Class6SupplyCategoryPersonnelDemandItems.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/Class6SupplyCategoryPersonnelDemandItems.java
rename to src-generated/edu/nps/moves/dis7/enumerations/Class6SupplyCategoryPersonnelDemandItems.java
index 34598f680f0166009a9c82ee99a43234ac7fb540..4bbe46f6309cb1e030f75a6bc4be93959fe61632 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/Class6SupplyCategoryPersonnelDemandItems.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class6SupplyCategoryPersonnelDemandItems.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/Class7SupplyCategoryMajorItems.java b/src-generated/edu/nps/moves/dis7/enumerations/Class7SupplyCategoryMajorItems.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/Class7SupplyCategoryMajorItems.java
rename to src-generated/edu/nps/moves/dis7/enumerations/Class7SupplyCategoryMajorItems.java
index bb1138544b1ceab86d193f1c5034f27b047823a6..08a246ece2b6f7619dc829cdb3e5c816123b0f5a 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/Class7SupplyCategoryMajorItems.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class7SupplyCategoryMajorItems.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/Class8SupplyCategoryMedicalMaterial.java b/src-generated/edu/nps/moves/dis7/enumerations/Class8SupplyCategoryMedicalMaterial.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/Class8SupplyCategoryMedicalMaterial.java
rename to src-generated/edu/nps/moves/dis7/enumerations/Class8SupplyCategoryMedicalMaterial.java
index c826995f48529fa90536618f3460edfa8da2dcda..8d277576caa217fb738bb6f0bf3d91acc7a3fff3 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/Class8SupplyCategoryMedicalMaterial.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class8SupplyCategoryMedicalMaterial.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/Class9SupplyCategoryRepairPartsandComponents.java b/src-generated/edu/nps/moves/dis7/enumerations/Class9SupplyCategoryRepairPartsandComponents.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/Class9SupplyCategoryRepairPartsandComponents.java
rename to src-generated/edu/nps/moves/dis7/enumerations/Class9SupplyCategoryRepairPartsandComponents.java
index 0e62a4d197107643ea6b3d6b60bf7979c76df2d2..91c3b87158083a36c0fb4e21136686e146da16a8 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/Class9SupplyCategoryRepairPartsandComponents.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Class9SupplyCategoryRepairPartsandComponents.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/CollisionType.java b/src-generated/edu/nps/moves/dis7/enumerations/CollisionType.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/CollisionType.java
rename to src-generated/edu/nps/moves/dis7/enumerations/CollisionType.java
index 14507e2547f514fb82e48f669a40bfbb851dbad4..70ba60ed053193fb21185c0d8951184d4d686ebe 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/CollisionType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/CollisionType.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/Color.java b/src-generated/edu/nps/moves/dis7/enumerations/Color.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/enumerations/Color.java
rename to src-generated/edu/nps/moves/dis7/enumerations/Color.java
index c1a8402b50236acdbc337e8060e3e4da39ad2a22..261601d0aabd4fa6aeb9f85d76b03664cf52e102 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/Color.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Color.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/ComponentVisualDamageStatusSmoke.java b/src-generated/edu/nps/moves/dis7/enumerations/ComponentVisualDamageStatusSmoke.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/ComponentVisualDamageStatusSmoke.java
rename to src-generated/edu/nps/moves/dis7/enumerations/ComponentVisualDamageStatusSmoke.java
index a67fd39b75a2c4e88bc4658ecc7d670433f3b60c..dae8ff1337c95fbf5364b44dc728f0145125ae9d 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/ComponentVisualDamageStatusSmoke.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ComponentVisualDamageStatusSmoke.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/ComponentVisualDamageStatusSurfaceDamage.java b/src-generated/edu/nps/moves/dis7/enumerations/ComponentVisualDamageStatusSurfaceDamage.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/ComponentVisualDamageStatusSurfaceDamage.java
rename to src-generated/edu/nps/moves/dis7/enumerations/ComponentVisualDamageStatusSurfaceDamage.java
index ada36d18774b6b55abd95c7de82eba3ebdba40c3..bfa9ba994726e940cc48e7c63073ec13160bc862 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/ComponentVisualDamageStatusSurfaceDamage.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ComponentVisualDamageStatusSurfaceDamage.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/Country.java b/src-generated/edu/nps/moves/dis7/enumerations/Country.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/enumerations/Country.java
rename to src-generated/edu/nps/moves/dis7/enumerations/Country.java
index fee5de14d3c5f79c8be48ad7d152981be91d3f74..2b88addc0397f8f0d981a3880e363b3955e5106f 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/Country.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Country.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/CoverShroudStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/CoverShroudStatus.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/CoverShroudStatus.java
rename to src-generated/edu/nps/moves/dis7/enumerations/CoverShroudStatus.java
index 0ff39112c1cb4fc27044406446de515f7f87a1a1..bf059443952f09d59767e0feedf28454b88bfc02 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/CoverShroudStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/CoverShroudStatus.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/CryptoKeyIDCryptoMode.java b/src-generated/edu/nps/moves/dis7/enumerations/CryptoKeyIDCryptoMode.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/CryptoKeyIDCryptoMode.java
rename to src-generated/edu/nps/moves/dis7/enumerations/CryptoKeyIDCryptoMode.java
index e18e45da80c9f8b72470c92bbd158afeff8b311e..628a63899b5092f86b735014f9c6da7c4a4a0c13 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/CryptoKeyIDCryptoMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/CryptoKeyIDCryptoMode.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/CulturalFeatureAppearance.java b/src-generated/edu/nps/moves/dis7/enumerations/CulturalFeatureAppearance.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/CulturalFeatureAppearance.java
rename to src-generated/edu/nps/moves/dis7/enumerations/CulturalFeatureAppearance.java
index b3d182682ac7de76930cbfd24a05d5925380b285..ab607b8261042d831a7093a0e790dd1ea9edc647 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/CulturalFeatureAppearance.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/CulturalFeatureAppearance.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/CulturalFeatureCapabilities.java b/src-generated/edu/nps/moves/dis7/enumerations/CulturalFeatureCapabilities.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/CulturalFeatureCapabilities.java
rename to src-generated/edu/nps/moves/dis7/enumerations/CulturalFeatureCapabilities.java
index 64318d68daa4cc0be599304aca0dc8e768536416..d20808a26792019fa72148a17a3dd78fe866f6b5 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/CulturalFeatureCapabilities.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/CulturalFeatureCapabilities.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/DEDamageDescriptionComponentDamageStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentDamageStatus.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/DEDamageDescriptionComponentDamageStatus.java
rename to src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentDamageStatus.java
index 61f1b04991cf834f2d43ac1f394ab1f3f1fd2ee8..3730bf3c1fd9f97666fce6adf2577b3189d5da5c 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/DEDamageDescriptionComponentDamageStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentDamageStatus.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/DEDamageDescriptionComponentVisualDamageStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentVisualDamageStatus.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/DEDamageDescriptionComponentVisualDamageStatus.java
rename to src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentVisualDamageStatus.java
index 33c6aa82398c9fe07fe67594a969624ab55042e4..744081513499d86409c95182eb4b7ebd194bb553 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/DEDamageDescriptionComponentVisualDamageStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentVisualDamageStatus.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/DEDamageDescriptionComponentVisualSmokeColor.java b/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentVisualSmokeColor.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/DEDamageDescriptionComponentVisualSmokeColor.java
rename to src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentVisualSmokeColor.java
index 22bf0517a4d34455c3651d23e93679f215c73c5d..39a048cc16c74a058400b48841179ec5c636a0a7 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/DEDamageDescriptionComponentVisualSmokeColor.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DEDamageDescriptionComponentVisualSmokeColor.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/DEFireFlags.java b/src-generated/edu/nps/moves/dis7/enumerations/DEFireFlags.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/DEFireFlags.java
rename to src-generated/edu/nps/moves/dis7/enumerations/DEFireFlags.java
index af166c2928439024cc2607e058dae66a4098fa8f..ab9b9f46ecd388f7133153fd2c07ee7c31e6caae 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/DEFireFlags.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DEFireFlags.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/DEFireFlagsStateUpdateFlag.java b/src-generated/edu/nps/moves/dis7/enumerations/DEFireFlagsStateUpdateFlag.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/DEFireFlagsStateUpdateFlag.java
rename to src-generated/edu/nps/moves/dis7/enumerations/DEFireFlagsStateUpdateFlag.java
index 01cb6053246833842c2684bbc1570857523a4502..3aea3114314e5747ed2f835bc339469b5482672e 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/DEFireFlagsStateUpdateFlag.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DEFireFlagsStateUpdateFlag.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/DEFirePulseShape.java b/src-generated/edu/nps/moves/dis7/enumerations/DEFirePulseShape.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/DEFirePulseShape.java
rename to src-generated/edu/nps/moves/dis7/enumerations/DEFirePulseShape.java
index 70dbc18ba69629f68ea894bc627a5591d1347501..54fd6cbca1ccda670c499b8c7fd622cc03277be5 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/DEFirePulseShape.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DEFirePulseShape.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/DEPrecisionAimpointBeamSpotType.java b/src-generated/edu/nps/moves/dis7/enumerations/DEPrecisionAimpointBeamSpotType.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/DEPrecisionAimpointBeamSpotType.java
rename to src-generated/edu/nps/moves/dis7/enumerations/DEPrecisionAimpointBeamSpotType.java
index 9dda7ccbc2b3ae9bb7bd5d8bb0977bde254871b8..daba9054805e92b99708335e0d1079c1822ff85f 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/DEPrecisionAimpointBeamSpotType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DEPrecisionAimpointBeamSpotType.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/DISAttributeActionCode.java b/src-generated/edu/nps/moves/dis7/enumerations/DISAttributeActionCode.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/DISAttributeActionCode.java
rename to src-generated/edu/nps/moves/dis7/enumerations/DISAttributeActionCode.java
index 06aa9c5a8c4e6dae8f6a11ebecf0237be311f5ec..f6091b39522d926bff722857f3f9fd0655860086 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/DISAttributeActionCode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISAttributeActionCode.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/DISLiveEntitySubprotocolNumber.java b/src-generated/edu/nps/moves/dis7/enumerations/DISLiveEntitySubprotocolNumber.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/DISLiveEntitySubprotocolNumber.java
rename to src-generated/edu/nps/moves/dis7/enumerations/DISLiveEntitySubprotocolNumber.java
index 3d1473cbc959e110023aa979801ada5672d116c1..419f1a89fca4970a78b44ef2485205cbdc255e6b 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/DISLiveEntitySubprotocolNumber.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISLiveEntitySubprotocolNumber.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/DISPDUStatusActiveInterrogationIndicatorAII.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusActiveInterrogationIndicatorAII.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/DISPDUStatusActiveInterrogationIndicatorAII.java
rename to src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusActiveInterrogationIndicatorAII.java
index 2cb4a67d3680d0ba506ee05710203090a2cd62ce..de532eacc35d04ff0e8b135a58f28510bd076ed9 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/DISPDUStatusActiveInterrogationIndicatorAII.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusActiveInterrogationIndicatorAII.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/DISPDUStatusCoupledExtensionIndicatorCEI.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusCoupledExtensionIndicatorCEI.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/DISPDUStatusCoupledExtensionIndicatorCEI.java
rename to src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusCoupledExtensionIndicatorCEI.java
index be7d4a7ffe273477b7403f7add77ad701a7862f1..a96572f26efa3885e3b988e7006291334cc14fa9 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/DISPDUStatusCoupledExtensionIndicatorCEI.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusCoupledExtensionIndicatorCEI.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/DISPDUStatusDetonationTypeIndicatorDTI.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusDetonationTypeIndicatorDTI.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/DISPDUStatusDetonationTypeIndicatorDTI.java
rename to src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusDetonationTypeIndicatorDTI.java
index 1502b2ed3b589e520d57e184b36fa6b53d41334d..2908fe978dcd8525f8db3c39e2fd0e0590c2c1ec 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/DISPDUStatusDetonationTypeIndicatorDTI.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusDetonationTypeIndicatorDTI.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/DISPDUStatusFireTypeIndicatorFTI.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusFireTypeIndicatorFTI.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/DISPDUStatusFireTypeIndicatorFTI.java
rename to src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusFireTypeIndicatorFTI.java
index 695c2fce49ae1351011b99e8fbc87354c8c0c39c..28fe35a89353980a6da57c01c3e6577c596e230d 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/DISPDUStatusFireTypeIndicatorFTI.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusFireTypeIndicatorFTI.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/DISPDUStatusIFFSimulationModeISM.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusIFFSimulationModeISM.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/DISPDUStatusIFFSimulationModeISM.java
rename to src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusIFFSimulationModeISM.java
index 206757094a4f299af717dd88d6fd01806719658b..203a9f4924893120372ac2e8ab189489b3c92210 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/DISPDUStatusIFFSimulationModeISM.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusIFFSimulationModeISM.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/DISPDUStatusIntercomAttachedIndicatorIAI.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusIntercomAttachedIndicatorIAI.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/DISPDUStatusIntercomAttachedIndicatorIAI.java
rename to src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusIntercomAttachedIndicatorIAI.java
index 674263e4fdb43ddebbf286abf29e584e3792f466..5fea08af203e92ebca087b21f53845eb438792be 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/DISPDUStatusIntercomAttachedIndicatorIAI.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusIntercomAttachedIndicatorIAI.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/DISPDUStatusLVCIndicatorLVC.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusLVCIndicatorLVC.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/DISPDUStatusLVCIndicatorLVC.java
rename to src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusLVCIndicatorLVC.java
index 9ec45296022c4eadb9282028f3b3e4ca035c5282..45acb3ce6119d225c89dae15c4403ea36438bd3a 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/DISPDUStatusLVCIndicatorLVC.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusLVCIndicatorLVC.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/DISPDUStatusRadioAttachedIndicatorRAI.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusRadioAttachedIndicatorRAI.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/DISPDUStatusRadioAttachedIndicatorRAI.java
rename to src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusRadioAttachedIndicatorRAI.java
index e734108f8876347cc1cbcbd59617471b30e3e640..f2e75f484dcaeb06cc2ec6fb0c426f0e665f7238 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/DISPDUStatusRadioAttachedIndicatorRAI.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusRadioAttachedIndicatorRAI.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/DISPDUStatusTransferredEntityIndicatorTEI.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusTransferredEntityIndicatorTEI.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/DISPDUStatusTransferredEntityIndicatorTEI.java
rename to src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusTransferredEntityIndicatorTEI.java
index ba86e8abac1fe625ac0c33faf9ad7bcec52c53ab..a414baacad1eab202d11cbb4c5ae588e20085543 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/DISPDUStatusTransferredEntityIndicatorTEI.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUStatusTransferredEntityIndicatorTEI.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/DISPDUType.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUType.java
similarity index 81%
rename from src-generated/edu/nps/moves/dis/enumerations/DISPDUType.java
rename to src-generated/edu/nps/moves/dis7/enumerations/DISPDUType.java
index 502b4284e0a46e2c4096fb33de50d7e3d4dab00f..a1fbdb4cb8c5156e20080d138f347770565283db 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/DISPDUType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUType.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
@@ -72,10 +72,14 @@ public enum DISPDUType
RECEIVER (27, "Receiver"),
/** IFF */
IFF (28, "IFF"),
+ /** IFF */
+ IDENTIFICATION_FRIEND_OR_FOE (28, "IFF"),
/** Underwater Acoustic */
UNDERWATER_ACOUSTIC (29, "Underwater Acoustic"),
/** Supplemental Emission / Entity State */
SUPPLEMENTAL_EMISSION_ENTITY_STATE (30, "Supplemental Emission / Entity State"),
+ /** Supplemental Emission / Entity State */
+ SEES (30, "Supplemental Emission / Entity State"),
/** Intercom Signal */
INTERCOM_SIGNAL (31, "Intercom Signal"),
/** Intercom Control */
@@ -108,44 +112,80 @@ public enum DISPDUType
AREAL_OBJECT_STATE (45, "Areal Object State"),
/** TSPI */
TSPI (46, "TSPI"),
+ /** TSPI */
+ TIME_SPACE_POSITION_INFORMATION (46, "TSPI"),
/** Appearance */
APPEARANCE (47, "Appearance"),
/** Articulated Parts */
ARTICULATED_PARTS (48, "Articulated Parts"),
/** LE Fire */
LE_FIRE (49, "LE Fire"),
+ /** LE Fire */
+ LIVE_ENTITY_FIRE (49, "LE Fire"),
/** LE Detonation */
LE_DETONATION (50, "LE Detonation"),
+ /** LE Detonation */
+ LIVE_ENTITY_DETONATION (50, "LE Detonation"),
/** Create Entity-R */
CREATE_ENTITY_R (51, "Create Entity-R"),
+ /** Create Entity-R */
+ CREATE_ENTITY_RELIABLE (51, "Create Entity-R"),
/** Remove Entity-R */
REMOVE_ENTITY_R (52, "Remove Entity-R"),
+ /** Remove Entity-R */
+ REMOVE_ENTITY_RELIABLE (52, "Remove Entity-R"),
/** Start/Resume-R */
START_RESUME_R (53, "Start/Resume-R"),
+ /** Start/Resume-R */
+ START_RESUME_RELIABLE (53, "Start/Resume-R"),
/** Stop/Freeze-R */
STOP_FREEZE_R (54, "Stop/Freeze-R"),
+ /** Stop/Freeze-R */
+ STOP_FREEZE_RELIABLE (54, "Stop/Freeze-R"),
/** Acknowledge-R */
ACKNOWLEDGE_R (55, "Acknowledge-R"),
+ /** Acknowledge-R */
+ ACKNOWLEDGE_RELIABLE (55, "Acknowledge-R"),
/** Action Request-R */
ACTION_REQUEST_R (56, "Action Request-R"),
+ /** Action Request-R */
+ ACTION_REQUEST_RELIABLE (56, "Action Request-R"),
/** Action Response-R */
ACTION_RESPONSE_R (57, "Action Response-R"),
+ /** Action Response-R */
+ ACTION_RESPONSE_RELIABLE (57, "Action Response-R"),
/** Data Query-R */
DATA_QUERY_R (58, "Data Query-R"),
+ /** Data Query-R */
+ DATA_QUERY_RELIABLE (58, "Data Query-R"),
/** Set Data-R */
SET_DATA_R (59, "Set Data-R"),
+ /** Set Data-R */
+ SET_DATA_RELIABLE (59, "Set Data-R"),
/** Data-R */
DATA_R (60, "Data-R"),
+ /** Data-R */
+ DATA_RELIABLE (60, "Data-R"),
/** Event Report-R */
EVENT_REPORT_R (61, "Event Report-R"),
+ /** Event Report-R */
+ EVENT_REPORT_RELIABLE (61, "Event Report-R"),
/** Comment-R */
COMMENT_R (62, "Comment-R"),
+ /** Comment-R */
+ COMMENT_RELIABLE (62, "Comment-R"),
/** Record-R */
RECORD_R (63, "Record-R"),
+ /** Record-R */
+ RECORD_RELIABLE (63, "Record-R"),
/** Set Record-R */
SET_RECORD_R (64, "Set Record-R"),
+ /** Set Record-R */
+ SET_RECORD_RELIABLE (64, "Set Record-R"),
/** Record Query-R */
RECORD_QUERY_R (65, "Record Query-R"),
+ /** Record Query-R */
+ RECORD_QUERY_RELIABLE (65, "Record Query-R"),
/** Collision-Elastic */
COLLISION_ELASTIC (66, "Collision-Elastic"),
/** Entity State Update */
diff --git a/src-generated/edu/nps/moves/dis/enumerations/DISProtocolFamily.java b/src-generated/edu/nps/moves/dis7/enumerations/DISProtocolFamily.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/DISProtocolFamily.java
rename to src-generated/edu/nps/moves/dis7/enumerations/DISProtocolFamily.java
index 0ffc111cf6cc2e13d04a22426c8de3399db68cf4..5eb24d459da9a095bdbcf2adf219817a70da3b64 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/DISProtocolFamily.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISProtocolFamily.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/DISProtocolVersion.java b/src-generated/edu/nps/moves/dis7/enumerations/DISProtocolVersion.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/DISProtocolVersion.java
rename to src-generated/edu/nps/moves/dis7/enumerations/DISProtocolVersion.java
index 5c09443becfe1d249576cd4cf4628336fbd9a446..c39a6dd2580107aa193df9278d2b0819660f5006 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/DISProtocolVersion.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISProtocolVersion.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/DRParametersType.java b/src-generated/edu/nps/moves/dis7/enumerations/DRParametersType.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/DRParametersType.java
rename to src-generated/edu/nps/moves/dis7/enumerations/DRParametersType.java
index f148411475db97fc10ca879473648d266e993b93..6f75d72348268745787f53b5bc8a103403c8d817 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/DRParametersType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DRParametersType.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/DataCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/DataCategory.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/DataCategory.java
rename to src-generated/edu/nps/moves/dis7/enumerations/DataCategory.java
index dfe8c62d4dc9edd399e04f921ab5e43e76c89677..9609b7067393a7ebee2763187a217f3b253bddb9 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/DataCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DataCategory.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/DeadReckoningAlgorithm.java b/src-generated/edu/nps/moves/dis7/enumerations/DeadReckoningAlgorithm.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/DeadReckoningAlgorithm.java
rename to src-generated/edu/nps/moves/dis7/enumerations/DeadReckoningAlgorithm.java
index 2c5a5d2502a7152b725493ef56cd7ec048c7cc1a..ed67b559fe1481f9ab644c8763cdd94d63ae79e3 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/DeadReckoningAlgorithm.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DeadReckoningAlgorithm.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/DeltaMode5SAltitudePositiveNegativeIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/DeltaMode5SAltitudePositiveNegativeIndicator.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/DeltaMode5SAltitudePositiveNegativeIndicator.java
rename to src-generated/edu/nps/moves/dis7/enumerations/DeltaMode5SAltitudePositiveNegativeIndicator.java
index aeb1a0f902ffe1fdcc34fd432348eec96d8d66c4..57dbc56567f68f350fa9cab97a7dde2d16fd8ce0 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/DeltaMode5SAltitudePositiveNegativeIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DeltaMode5SAltitudePositiveNegativeIndicator.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/DesignatorDesignatorCode.java b/src-generated/edu/nps/moves/dis7/enumerations/DesignatorDesignatorCode.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/DesignatorDesignatorCode.java
rename to src-generated/edu/nps/moves/dis7/enumerations/DesignatorDesignatorCode.java
index 508680baa866fea0a3cf44c306fa6d82e60558e5..1f4d629650acb2650170c5e0ffe72fd28489fbac 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/DesignatorDesignatorCode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DesignatorDesignatorCode.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/DesignatorSystemName.java b/src-generated/edu/nps/moves/dis7/enumerations/DesignatorSystemName.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/enumerations/DesignatorSystemName.java
rename to src-generated/edu/nps/moves/dis7/enumerations/DesignatorSystemName.java
index f944ec3c7c6dac86cba8db48c2253a324fc50df3..12ab32ab1f7b501fb739e580025fddcff3ab4d28 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/DesignatorSystemName.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DesignatorSystemName.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/DetonationResult.java b/src-generated/edu/nps/moves/dis7/enumerations/DetonationResult.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/DetonationResult.java
rename to src-generated/edu/nps/moves/dis7/enumerations/DetonationResult.java
index 4cf3381117c5459428dd122f04498a9a5ba39997..c2b891b785732d6c6b7c59099fccbdb2571043ef 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/DetonationResult.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DetonationResult.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/EEAttributeStateIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/EEAttributeStateIndicator.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/EEAttributeStateIndicator.java
rename to src-generated/edu/nps/moves/dis7/enumerations/EEAttributeStateIndicator.java
index 120aa1fade1a8839b95f45f38100e511bcfc8aba..897df4ddc8168db0271721b97887856a90e8b005 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/EEAttributeStateIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EEAttributeStateIndicator.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/ElectromagneticEmissionBeamFunction.java b/src-generated/edu/nps/moves/dis7/enumerations/ElectromagneticEmissionBeamFunction.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/ElectromagneticEmissionBeamFunction.java
rename to src-generated/edu/nps/moves/dis7/enumerations/ElectromagneticEmissionBeamFunction.java
index 5c324fd2347d3495b8b92bdb9dbca0019c120e6b..d6892daf95cf9544aae4f24a4d78a7b0800e0698 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/ElectromagneticEmissionBeamFunction.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ElectromagneticEmissionBeamFunction.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/ElectromagneticEmissionStateUpdateIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/ElectromagneticEmissionStateUpdateIndicator.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/ElectromagneticEmissionStateUpdateIndicator.java
rename to src-generated/edu/nps/moves/dis7/enumerations/ElectromagneticEmissionStateUpdateIndicator.java
index 877abc8496382c29de776263924b6552a8b0d9b5..45aa9ee4ff67d98d7e3d2de33e6a1ac11347be36 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/ElectromagneticEmissionStateUpdateIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ElectromagneticEmissionStateUpdateIndicator.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/EmitterName.java b/src-generated/edu/nps/moves/dis7/enumerations/EmitterName.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/enumerations/EmitterName.java
rename to src-generated/edu/nps/moves/dis7/enumerations/EmitterName.java
index 67ccd0b291c412dccdac80bc65f0f711e8a58e32..d72cec466844cbce0a8f8db1b2894f28f8745fd8 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/EmitterName.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EmitterName.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/EmitterSystemFunction.java b/src-generated/edu/nps/moves/dis7/enumerations/EmitterSystemFunction.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/enumerations/EmitterSystemFunction.java
rename to src-generated/edu/nps/moves/dis7/enumerations/EmitterSystemFunction.java
index f19044519b791673f7a01f8758044d07d292e733..1cb953aab0482302b21dc60ca8bb3dacfa40dcf3 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/EmitterSystemFunction.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EmitterSystemFunction.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/EntityAssociationAssociationStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationAssociationStatus.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/EntityAssociationAssociationStatus.java
rename to src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationAssociationStatus.java
index 70ec6e51211b783dfe52e5014f2565530b39cc00..963b6f64a41fad1370ec344885acfb90f7c22a16 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/EntityAssociationAssociationStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationAssociationStatus.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/EntityAssociationAssociationType.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationAssociationType.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/EntityAssociationAssociationType.java
rename to src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationAssociationType.java
index 6b0897af920716cf0deaefd6f78faa635eeb65ef..081e3626a9cda7520391c714841bd370a6db2fad 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/EntityAssociationAssociationType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationAssociationType.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/EntityAssociationGroupMemberType.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationGroupMemberType.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/EntityAssociationGroupMemberType.java
rename to src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationGroupMemberType.java
index 4f131923103654ba9cb15ae5b1d990bab3f45942..18e27c2ee2336239639d017b94ddc3e5011df593 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/EntityAssociationGroupMemberType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationGroupMemberType.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/EntityAssociationPhysicalAssociationType.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationPhysicalAssociationType.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/EntityAssociationPhysicalAssociationType.java
rename to src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationPhysicalAssociationType.java
index 46c8bf042c1619c31b172055016390d4920ff51c..6ec86bcb508c3b56db0aafb696741014874bd024 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/EntityAssociationPhysicalAssociationType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationPhysicalAssociationType.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/EntityAssociationPhysicalConnectionType.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationPhysicalConnectionType.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/EntityAssociationPhysicalConnectionType.java
rename to src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationPhysicalConnectionType.java
index 4410e3ef42588449541293dfaf991db099f0eb57..4f2d32efb99038c6650a126e38313d05ee2dbd25 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/EntityAssociationPhysicalConnectionType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityAssociationPhysicalConnectionType.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/EntityCapabilityTypes.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityCapabilityTypes.java
similarity index 70%
rename from src-generated/edu/nps/moves/dis/enumerations/EntityCapabilityTypes.java
rename to src-generated/edu/nps/moves/dis7/enumerations/EntityCapabilityTypes.java
index 2ae44ff44f27308a66dcf75e379d84e37a9212d0..d185d39bcc02c6e4646889659d84901912ce1a05 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/EntityCapabilityTypes.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityCapabilityTypes.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
@@ -14,19 +14,19 @@ import edu.nps.moves.dis.*;
*/
public enum EntityCapabilityTypes
{
- /** LandPlatformCapabilities */ LAND_PLATFORM_ENTITY_CAPABILITIES (0, "Land Platform Entity Capabilities"),
- /** AirPlatformCapabilities */ AIR_PLATFORM_ENTITY_CAPABILITIES (1, "Air Platform Entity Capabilities"),
- /** SurfacePlatformCapabilities */ SURFACE_PLATFORM_ENTITY_CAPABILITIES (2, "Surface Platform Entity Capabilities"),
- /** SubsurfacePlatformCapabilities */ SUBSURFACE_PLATFORM_ENTITY_CAPABILITIES (3, "Subsurface Platform Entity Capabilities"),
- /** SpacePlatformCapabilities */ SPACE_PLATFORM_ENTITY_CAPABILITIES (4, "Space Platform Entity Capabilities"),
- /** MunitionCapabilities */ MUNITION_ENTITY_CAPABILITIES (5, "Munition Entity Capabilities"),
- /** LifeFormsCapabilities */ LIFE_FORMS_ENTITY_CAPABILITIES (6, "Life Forms Entity Capabilities"),
- /** EnvironmentalCapabilities */ ENVIRONMENTAL_ENTITY_CAPABILITIES (7, "Environmental Entity Capabilities"),
- /** CulturalFeatureCapabilities */ CULTURAL_FEATURE_ENTITY_CAPABILITIES (8, "Cultural Feature Entity Capabilities"),
- /** SupplyCapabilities */ SUPPLY_ENTITY_CAPABILITIES (9, "Supply Entity Capabilities"),
- /** RadioCapabilities */ RADIO_ENTITY_CAPABILITIES (10, "Radio Entity Capabilities"),
- /** ExpendableCapabilities */ EXPENDABLE_ENTITY_CAPABILITIES (11, "Expendable Entity Capabilities"),
- /** SensorEmitterCapabilities */ SENSOR_EMITTER_ENTITY_CAPABILITIES (12, "Sensor/Emitter Entity Capabilities");
+ /** LandPlatformCapabilities */ LAND_PLATFORM_ENTITY_CAPABILITIES_2 (0, "Land Platform Entity Capabilities"),
+ /** AirPlatformCapabilities */ AIR_PLATFORM_ENTITY_CAPABILITIES_2 (1, "Air Platform Entity Capabilities"),
+ /** SurfacePlatformCapabilities */ SURFACE_PLATFORM_ENTITY_CAPABILITIES_2 (2, "Surface Platform Entity Capabilities"),
+ /** SubsurfacePlatformCapabilities */ SUBSURFACE_PLATFORM_ENTITY_CAPABILITIES_2 (3, "Subsurface Platform Entity Capabilities"),
+ /** SpacePlatformCapabilities */ SPACE_PLATFORM_ENTITY_CAPABILITIES_2 (4, "Space Platform Entity Capabilities"),
+ /** MunitionCapabilities */ MUNITION_ENTITY_CAPABILITIES_2 (5, "Munition Entity Capabilities"),
+ /** LifeFormsCapabilities */ LIFE_FORMS_ENTITY_CAPABILITIES_2 (6, "Life Forms Entity Capabilities"),
+ /** EnvironmentalCapabilities */ ENVIRONMENTAL_ENTITY_CAPABILITIES_2 (7, "Environmental Entity Capabilities"),
+ /** CulturalFeatureCapabilities */ CULTURAL_FEATURE_ENTITY_CAPABILITIES_2 (8, "Cultural Feature Entity Capabilities"),
+ /** SupplyCapabilities */ SUPPLY_ENTITY_CAPABILITIES_2 (9, "Supply Entity Capabilities"),
+ /** RadioCapabilities */ RADIO_ENTITY_CAPABILITIES_2 (10, "Radio Entity Capabilities"),
+ /** ExpendableCapabilities */ EXPENDABLE_ENTITY_CAPABILITIES_2 (11, "Expendable Entity Capabilities"),
+ /** SensorEmitterCapabilities */ SENSOR_EMITTER_ENTITY_CAPABILITIES_2 (12, "Sensor/Emitter Entity Capabilities");
private int value;
private final String description;
diff --git a/src-generated/edu/nps/moves/dis/enumerations/EntityDamageStatusComponentIdentification.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityDamageStatusComponentIdentification.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/EntityDamageStatusComponentIdentification.java
rename to src-generated/edu/nps/moves/dis7/enumerations/EntityDamageStatusComponentIdentification.java
index c1d0fc6c6a4bb010779a68764b14a1689b2c0e53..273ac8bd813b61c82723f89850a1ce71bb1c75d7 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/EntityDamageStatusComponentIdentification.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityDamageStatusComponentIdentification.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/EntityKind.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityKind.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/EntityKind.java
rename to src-generated/edu/nps/moves/dis7/enumerations/EntityKind.java
index 7bdfe8c9c020e625ebcb2d98930938126ee0bce2..beb3fd28435a428a5e8f9aa85f26d31f7f180672 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/EntityKind.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityKind.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/EntityMarkingCharacterSet.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityMarkingCharacterSet.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/EntityMarkingCharacterSet.java
rename to src-generated/edu/nps/moves/dis7/enumerations/EntityMarkingCharacterSet.java
index 520b1491ca46b4f6f6fc70bd0f82f87641920847..89ce65d402c74ec98cf0beb74c8caa56d0d32d64 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/EntityMarkingCharacterSet.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityMarkingCharacterSet.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/EntityVPRecordChangeIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/EntityVPRecordChangeIndicator.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/EntityVPRecordChangeIndicator.java
rename to src-generated/edu/nps/moves/dis7/enumerations/EntityVPRecordChangeIndicator.java
index 2bd968298653f8da90e7f4344e068b7288432f03..d7d08bbad228fdb9a6109ef66940795a2d0987bd 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/EntityVPRecordChangeIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EntityVPRecordChangeIndicator.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/EnvironmentRecordTypeGroups.java b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentRecordTypeGroups.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/EnvironmentRecordTypeGroups.java
rename to src-generated/edu/nps/moves/dis7/enumerations/EnvironmentRecordTypeGroups.java
index 07329eae4b7bdf0252eeefa0e487b15314ec4a2f..07f775ce8ac2e5ba0dadea02d1d28968ce3e3bcb 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/EnvironmentRecordTypeGroups.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentRecordTypeGroups.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/EnvironmentalAppearance.java b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalAppearance.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/EnvironmentalAppearance.java
rename to src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalAppearance.java
index 1df2481cd3312ba2eaabf19727bb3dcf7a08b44a..dd57b572d5cf36da08686615f0602702e7b0b43e 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/EnvironmentalAppearance.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalAppearance.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/EnvironmentalCapabilities.java b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalCapabilities.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/EnvironmentalCapabilities.java
rename to src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalCapabilities.java
index f474e517de4c46ee3796fdd911cbb8a73dbb6ccd..dd1462f7045dbdfc2091691ab52036751493c386 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/EnvironmentalCapabilities.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalCapabilities.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/EnvironmentalProcessEnvironmentStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalProcessEnvironmentStatus.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/EnvironmentalProcessEnvironmentStatus.java
rename to src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalProcessEnvironmentStatus.java
index 92ea4fb7f9087e4a5b3c7bcf576307954bdaedab..8de381c2b8194193af5db09eaea2abbcf7ae7c1a 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/EnvironmentalProcessEnvironmentStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalProcessEnvironmentStatus.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/EnvironmentalProcessModelType.java b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalProcessModelType.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/EnvironmentalProcessModelType.java
rename to src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalProcessModelType.java
index e53664d7692d8c21dcbd825bfe00479011c60968..cb1f4bcb3d15a786e7784db555bea3aea7661477 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/EnvironmentalProcessModelType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalProcessModelType.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/EnvironmentalProcessRecordType.java b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalProcessRecordType.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/EnvironmentalProcessRecordType.java
rename to src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalProcessRecordType.java
index 53f1943c1059594f28adc96bc1db1bb62a7247db..2cbe1cd631a159af94cf0d7ab0780276548289c5 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/EnvironmentalProcessRecordType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalProcessRecordType.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/EnvironmentalSubcategory.java b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalSubcategory.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/EnvironmentalSubcategory.java
rename to src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalSubcategory.java
index a82a58577d64a9e7fdefedca0ddeaa1051be4d75..084a8c25e38af33183d899583694d17592d224ce 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/EnvironmentalSubcategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EnvironmentalSubcategory.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/EventReportEventType.java b/src-generated/edu/nps/moves/dis7/enumerations/EventReportEventType.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/EventReportEventType.java
rename to src-generated/edu/nps/moves/dis7/enumerations/EventReportEventType.java
index 960484b8e1627b19be6fa421df3e6197d02bd648..5f6b602bfe12ec11d92da220198873cd50f84cda 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/EventReportEventType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/EventReportEventType.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/ExpendableAirCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/ExpendableAirCategory.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/ExpendableAirCategory.java
rename to src-generated/edu/nps/moves/dis7/enumerations/ExpendableAirCategory.java
index b71f5d2eb543c33f2feb9c52340887d682b0ffda..bd5a2c940eac525439eecdf6402a819b6f8884e0 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/ExpendableAirCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ExpendableAirCategory.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/ExpendableAppearance.java b/src-generated/edu/nps/moves/dis7/enumerations/ExpendableAppearance.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/ExpendableAppearance.java
rename to src-generated/edu/nps/moves/dis7/enumerations/ExpendableAppearance.java
index e51bd3313c27fb4de6ae9c258e91b867e3cb63c5..451c69618d422c649fe949b9aaf7efa337152277 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/ExpendableAppearance.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ExpendableAppearance.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/ExpendableCapabilities.java b/src-generated/edu/nps/moves/dis7/enumerations/ExpendableCapabilities.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/ExpendableCapabilities.java
rename to src-generated/edu/nps/moves/dis7/enumerations/ExpendableCapabilities.java
index 606d50f4ae3233938f5d4940582a6c0d1ae934f7..084d0b912273a565803a8fdb252c84ca2b5845dd 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/ExpendableCapabilities.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ExpendableCapabilities.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/ExpendableSubsurfaceCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/ExpendableSubsurfaceCategory.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/ExpendableSubsurfaceCategory.java
rename to src-generated/edu/nps/moves/dis7/enumerations/ExpendableSubsurfaceCategory.java
index 1b63ae5fb7dafd025c0bed14e94ec1c61f8507ba..57cc64790f79a1ad60de99630a122383c9d8ff15 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/ExpendableSubsurfaceCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ExpendableSubsurfaceCategory.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/ExpendableSurfaceCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/ExpendableSurfaceCategory.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/ExpendableSurfaceCategory.java
rename to src-generated/edu/nps/moves/dis7/enumerations/ExpendableSurfaceCategory.java
index d104d4718c7893f22c50a73e6b1802244587b73b..121bfca24ca220c52dc0c057fa4eadd9b995aadb 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/ExpendableSurfaceCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ExpendableSurfaceCategory.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/ExplosiveMaterialCategories.java b/src-generated/edu/nps/moves/dis7/enumerations/ExplosiveMaterialCategories.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/ExplosiveMaterialCategories.java
rename to src-generated/edu/nps/moves/dis7/enumerations/ExplosiveMaterialCategories.java
index 31af22e8d9654961d538b03bb69213740337943d..e6ca22da17a31f9d88a32f6700a1088cfb8a8ee9 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/ExplosiveMaterialCategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ExplosiveMaterialCategories.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/ExplosiveMaterialGroups.java b/src-generated/edu/nps/moves/dis7/enumerations/ExplosiveMaterialGroups.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/ExplosiveMaterialGroups.java
rename to src-generated/edu/nps/moves/dis7/enumerations/ExplosiveMaterialGroups.java
index 333a983ec515894acc71fa3620b6175fb5d4220e..583b259b608f99dd587c1ae5c2e459db49af9928 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/ExplosiveMaterialGroups.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ExplosiveMaterialGroups.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/FlareSmokeColor.java b/src-generated/edu/nps/moves/dis7/enumerations/FlareSmokeColor.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/FlareSmokeColor.java
rename to src-generated/edu/nps/moves/dis7/enumerations/FlareSmokeColor.java
index 42e5002dd4fac5a7d744dca00b84e4c279f07463..205fe5860862b15f10707adc0720b92ba66e1f72 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/FlareSmokeColor.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/FlareSmokeColor.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/FlareSmokeStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/FlareSmokeStatus.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/FlareSmokeStatus.java
rename to src-generated/edu/nps/moves/dis7/enumerations/FlareSmokeStatus.java
index 6c015d90f924dd6bab73dd080f2e4f8f5f46c1d4..b0e42eea301075b7b87807e71b7164dd65b25dc9 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/FlareSmokeStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/FlareSmokeStatus.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/ForceID.java b/src-generated/edu/nps/moves/dis7/enumerations/ForceID.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/ForceID.java
rename to src-generated/edu/nps/moves/dis7/enumerations/ForceID.java
index 52dbaa37cd7c14f33162ad02af78fa4ec2d83fdf..c5b1c9e31cb843de14c96f5cdd8d89822c6545bf 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/ForceID.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ForceID.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/FormatType.java b/src-generated/edu/nps/moves/dis7/enumerations/FormatType.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/FormatType.java
rename to src-generated/edu/nps/moves/dis7/enumerations/FormatType.java
index a4b08fb90f18a4df3ffb6fb90a04749de66f01f8..5ba98fd2973c074b47fe5f3fabb5103494e42845 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/FormatType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/FormatType.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/FuelLocation.java b/src-generated/edu/nps/moves/dis7/enumerations/FuelLocation.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/FuelLocation.java
rename to src-generated/edu/nps/moves/dis7/enumerations/FuelLocation.java
index c4cd685184aba9bbc55f1054c65e677684eb10ab..aacb0ab795f30927f3f49c610da7ada1aff688a0 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/FuelLocation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/FuelLocation.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/FuelMeasurementUnits.java b/src-generated/edu/nps/moves/dis7/enumerations/FuelMeasurementUnits.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/FuelMeasurementUnits.java
rename to src-generated/edu/nps/moves/dis7/enumerations/FuelMeasurementUnits.java
index ae8807d1e6f6950ef98d3f78d52a8d7225314620..cbeed536d30b7e3e5c4f8bada11c0f5a0c450ced 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/FuelMeasurementUnits.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/FuelMeasurementUnits.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/GridAxisDescriptorAxisType.java b/src-generated/edu/nps/moves/dis7/enumerations/GridAxisDescriptorAxisType.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/GridAxisDescriptorAxisType.java
rename to src-generated/edu/nps/moves/dis7/enumerations/GridAxisDescriptorAxisType.java
index 2975f9e451dedd72c0c85c6d3a0f45f330aabe30..b16e449b8143cc99ff809ad7630357d8645cdc69 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/GridAxisDescriptorAxisType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/GridAxisDescriptorAxisType.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/GriddedDataConstantGrid.java b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataConstantGrid.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/GriddedDataConstantGrid.java
rename to src-generated/edu/nps/moves/dis7/enumerations/GriddedDataConstantGrid.java
index b6123bb3b71253e8fa1c77d73820016006f96213..95648e365b0ed4bbd6ebe9763727411a2c285796 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/GriddedDataConstantGrid.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataConstantGrid.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/GriddedDataCoordinateSystem.java b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataCoordinateSystem.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/GriddedDataCoordinateSystem.java
rename to src-generated/edu/nps/moves/dis7/enumerations/GriddedDataCoordinateSystem.java
index 382ea8f9499f05e55692b307d3b1f02e5b000541..b3510298dcbb6dca84b0a91f5e026d0e7cdd1a99 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/GriddedDataCoordinateSystem.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataCoordinateSystem.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/GriddedDataDataRepresentation.java b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataDataRepresentation.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/GriddedDataDataRepresentation.java
rename to src-generated/edu/nps/moves/dis7/enumerations/GriddedDataDataRepresentation.java
index 03008d88fa9f49f4cfd6d416c4c7afb6e1bf4d18..3be651ca162a82d371981037896552614a984c9d 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/GriddedDataDataRepresentation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataDataRepresentation.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/GriddedDataFieldNumber.java b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataFieldNumber.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/GriddedDataFieldNumber.java
rename to src-generated/edu/nps/moves/dis7/enumerations/GriddedDataFieldNumber.java
index fe7630e72491610424d358bec455b2e381b76663..f60bb52227d40ab2f2e623fdd2595fdb30234a50 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/GriddedDataFieldNumber.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataFieldNumber.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/GriddedDataSampleType.java b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataSampleType.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/GriddedDataSampleType.java
rename to src-generated/edu/nps/moves/dis7/enumerations/GriddedDataSampleType.java
index 90b9323f007439f7363f61b10376017858d301b9..caac6c907a63e6c6e7780908c0d736d9d0b51ce8 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/GriddedDataSampleType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/GriddedDataSampleType.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/HighDensityTrackJam.java b/src-generated/edu/nps/moves/dis7/enumerations/HighDensityTrackJam.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/HighDensityTrackJam.java
rename to src-generated/edu/nps/moves/dis7/enumerations/HighDensityTrackJam.java
index a485bd9195841ddf53d76a67e43b8257844b77a9..28e0231e8217009a5ba9f9c43ca1194eff40469e 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/HighDensityTrackJam.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/HighDensityTrackJam.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/HighFidelityHAVEQUICKTODTransmitIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/HighFidelityHAVEQUICKTODTransmitIndicator.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/HighFidelityHAVEQUICKTODTransmitIndicator.java
rename to src-generated/edu/nps/moves/dis7/enumerations/HighFidelityHAVEQUICKTODTransmitIndicator.java
index d26a697c234b9b77ddbc2779295e40de018bbd08..ce44be6b7dcb8323e933a526af22406e359236a8 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/HighFidelityHAVEQUICKTODTransmitIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/HighFidelityHAVEQUICKTODTransmitIndicator.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/IFFAlternateMode4ChallengeReply.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFAlternateMode4ChallengeReply.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/IFFAlternateMode4ChallengeReply.java
rename to src-generated/edu/nps/moves/dis7/enumerations/IFFAlternateMode4ChallengeReply.java
index b0874104e3b15457a0d00da8a5ef8f28055e299d..75e2d3e50f8b7f3f377e84cfa242db0ecc166683 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/IFFAlternateMode4ChallengeReply.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFAlternateMode4ChallengeReply.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/IFFApplicableModes.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFApplicableModes.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/IFFApplicableModes.java
rename to src-generated/edu/nps/moves/dis7/enumerations/IFFApplicableModes.java
index accf3171eb1969b743c03d7a7753f41fe2e52caf..273d65233a460ac5ca284b0d1d65ee4f165f3f9c 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/IFFApplicableModes.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFApplicableModes.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/IFFDataRecordAvailable.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFDataRecordAvailable.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/IFFDataRecordAvailable.java
rename to src-generated/edu/nps/moves/dis7/enumerations/IFFDataRecordAvailable.java
index 4c2b85ab1e6d2993d9631a6b6ae8a3a1477252b6..993f283195c224578457971d0da8e3722d0b2b9f 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/IFFDataRecordAvailable.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFDataRecordAvailable.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/IFFLayerSpecificInformation.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFLayerSpecificInformation.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/IFFLayerSpecificInformation.java
rename to src-generated/edu/nps/moves/dis7/enumerations/IFFLayerSpecificInformation.java
index f399a77cd33077740aa867e38d179fb5cc8f393d..5b9f578b0afb1067769e2617f4c841c98cb7a584 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/IFFLayerSpecificInformation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFLayerSpecificInformation.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/IFFSimulationMode.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFSimulationMode.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/IFFSimulationMode.java
rename to src-generated/edu/nps/moves/dis7/enumerations/IFFSimulationMode.java
index d8ba9b41966802cf65be4ac05f65e2212f50711d..445cbd9058f233e4f7e975644061cf293f7744aa 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/IFFSimulationMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFSimulationMode.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/IFFSystemMode.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemMode.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/IFFSystemMode.java
rename to src-generated/edu/nps/moves/dis7/enumerations/IFFSystemMode.java
index 06c1b2bee5515b06ba3bf843f25b1fffd6d14c03..820461ee9153364094efe09eab557eb8b006b6d2 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/IFFSystemMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemMode.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/IFFSystemName.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemName.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/IFFSystemName.java
rename to src-generated/edu/nps/moves/dis7/enumerations/IFFSystemName.java
index 7622289d4c8dbc85e76c84ecc9f2d903d8d94210..5cf76bc00072f2c82e92265a8ef78b19e23e500f 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/IFFSystemName.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemName.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/IFFSystemType.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/IFFSystemType.java
rename to src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType.java
index 4b0f11310feecc626f8f3c96d2b5ca991602fc72..38a7a451b7dd9e9a72a1c3be1b23addb8b1334b6 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/IFFSystemType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/IFFSystemType1OperationalParameter1.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType1OperationalParameter1.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/IFFSystemType1OperationalParameter1.java
rename to src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType1OperationalParameter1.java
index 909d15bd5e36dba74b2ecea39530b848389579b7..3dba6693354a0834b28b5d9df068f6311398d049 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/IFFSystemType1OperationalParameter1.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType1OperationalParameter1.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/IFFSystemType1OperationalParameter2.java b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType1OperationalParameter2.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/IFFSystemType1OperationalParameter2.java
rename to src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType1OperationalParameter2.java
index 9fe7ebdc67e0b7a85ddcc6c47851dc514a6b041c..b22ae06216271291d89d1bf32ca8531c6c4636e2 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/IFFSystemType1OperationalParameter2.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IFFSystemType1OperationalParameter2.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/IOActionIOActionPhase.java b/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOActionPhase.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/IOActionIOActionPhase.java
rename to src-generated/edu/nps/moves/dis7/enumerations/IOActionIOActionPhase.java
index c913a871f730fd53db44def4883af71d97b236da..fbffafcd4dad213a9e7b8f7106b9694821c5437d 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/IOActionIOActionPhase.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOActionPhase.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/IOActionIOActionType.java b/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOActionType.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/IOActionIOActionType.java
rename to src-generated/edu/nps/moves/dis7/enumerations/IOActionIOActionType.java
index 83c1d1035fee8c90cc0c9c53e540541e63bd807d..d0b41aca48e34cf97af86ffb1061c9f0161bc9e5 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/IOActionIOActionType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOActionType.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/IOActionIOSimulationSource.java b/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOSimulationSource.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/IOActionIOSimulationSource.java
rename to src-generated/edu/nps/moves/dis7/enumerations/IOActionIOSimulationSource.java
index 8c91957bc45edbe904fb5c641b73c3321d42d4b3..aad7c711d24fb2967fc19bd18c734c0d7b542d20 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/IOActionIOSimulationSource.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOSimulationSource.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/IOActionIOWarfareType.java b/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOWarfareType.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/IOActionIOWarfareType.java
rename to src-generated/edu/nps/moves/dis7/enumerations/IOActionIOWarfareType.java
index 05443763f46141198fc153bacc25d2aafbea027d..8a055bf7d11c90b383389b969da7f7805f452801 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/IOActionIOWarfareType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOActionIOWarfareType.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/IOCommsNodeRecordCommsNodeType.java b/src-generated/edu/nps/moves/dis7/enumerations/IOCommsNodeRecordCommsNodeType.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/IOCommsNodeRecordCommsNodeType.java
rename to src-generated/edu/nps/moves/dis7/enumerations/IOCommsNodeRecordCommsNodeType.java
index 6e7c4431a7d257267babd34cedb107f1cd59c2d0..4d7a89c74faf5bae4ff64475eccaade4b45a44e3 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/IOCommsNodeRecordCommsNodeType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOCommsNodeRecordCommsNodeType.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/IOEffectsRecordIOEffect.java b/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOEffect.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/IOEffectsRecordIOEffect.java
rename to src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOEffect.java
index 5193eb15bff66f14d5d8445a36616ae74bd0d38d..44533a37d9289f4a86f14873e6bf82f349712c65 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/IOEffectsRecordIOEffect.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOEffect.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/IOEffectsRecordIOLinkType.java b/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOLinkType.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/IOEffectsRecordIOLinkType.java
rename to src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOLinkType.java
index b0588d5d231c94ccd55d42cbd971fc0989b5a07a..fc1dd9d46cd21bbd4d7248bf17487679c32835b3 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/IOEffectsRecordIOLinkType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOLinkType.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/IOEffectsRecordIOProcess.java b/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOProcess.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/IOEffectsRecordIOProcess.java
rename to src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOProcess.java
index b13662ab9178ff44ed58e7c9aa638c47079b6764..9f78d8257e9a634b2bf0b23a69c56dd972979b59 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/IOEffectsRecordIOProcess.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOProcess.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/IOEffectsRecordIOStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOStatus.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/IOEffectsRecordIOStatus.java
rename to src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOStatus.java
index b205ac5d6b4d6e99c02a864a7554c490263a0bcb..894222cd385d1d7f688a05ce9396b8db4f91a976 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/IOEffectsRecordIOStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOEffectsRecordIOStatus.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/IOReportIOReportType.java b/src-generated/edu/nps/moves/dis7/enumerations/IOReportIOReportType.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/IOReportIOReportType.java
rename to src-generated/edu/nps/moves/dis7/enumerations/IOReportIOReportType.java
index 98559ea6e3aa9bb8ca02a1ff36fdaadcc3f98f94..c5aec11a6811e373f3459966e05b8aa01eb89264 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/IOReportIOReportType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IOReportIOReportType.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/ISLSAntennaType.java b/src-generated/edu/nps/moves/dis7/enumerations/ISLSAntennaType.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/ISLSAntennaType.java
rename to src-generated/edu/nps/moves/dis7/enumerations/ISLSAntennaType.java
index 09abcc96775b6c9eb6c2c8d745e8f2679724a0ba..1e33615b66a90c2d004019c7be787d90cee0b197 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/ISLSAntennaType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ISLSAntennaType.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/IntercomControlCommand.java b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommand.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/IntercomControlCommand.java
rename to src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommand.java
index 5b5610f33ea48d2f00d26a8cf6557a1b05de7017..1e418f32288288e37a2216aa7f69f4228d45cc0e 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/IntercomControlCommand.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommand.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/IntercomControlCommunicationsClass.java b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommunicationsClass.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/IntercomControlCommunicationsClass.java
rename to src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommunicationsClass.java
index a1fcad14f4251eaee7212d12c2492611aacf8aba..c726888f81ef8684af493df95ab3bd03e9eba81e 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/IntercomControlCommunicationsClass.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommunicationsClass.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/IntercomControlCommunicationsType.java b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommunicationsType.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/IntercomControlCommunicationsType.java
rename to src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommunicationsType.java
index e43ad1d7c83f82b52f49c3e68368cc5c639aa878..354e3efa317df52cff0fc8c19112f53155cc4052 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/IntercomControlCommunicationsType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlCommunicationsType.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/IntercomControlControlType.java b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlControlType.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/IntercomControlControlType.java
rename to src-generated/edu/nps/moves/dis7/enumerations/IntercomControlControlType.java
index 43b78ded7c00aeb15e6406b58940c4f28da952c8..d23c23a536e1eb6306cd799b1e0dcbbd09374dfb 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/IntercomControlControlType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlControlType.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/IntercomControlDestinationLineStateCommand.java b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlDestinationLineStateCommand.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/IntercomControlDestinationLineStateCommand.java
rename to src-generated/edu/nps/moves/dis7/enumerations/IntercomControlDestinationLineStateCommand.java
index 5278e8da38c3faa0e3f1f0a6c43c2f1bc854f755..3b38d4ce42e25c9fb31f1b25e8f1e16fc953dee3 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/IntercomControlDestinationLineStateCommand.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlDestinationLineStateCommand.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/IntercomControlRecordType.java b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlRecordType.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/IntercomControlRecordType.java
rename to src-generated/edu/nps/moves/dis7/enumerations/IntercomControlRecordType.java
index 5e2a4aec46313e8c32db8c60cea5441b514a60ff..06d54596c1def8936ae175dce2394eea476dcfb0 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/IntercomControlRecordType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlRecordType.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/IntercomControlTransmitLineState.java b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlTransmitLineState.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/IntercomControlTransmitLineState.java
rename to src-generated/edu/nps/moves/dis7/enumerations/IntercomControlTransmitLineState.java
index 8e99012e07038a25f83fb14cd15c05f0fdce29f3..2e23e76b9e0f221feff5216a08869611d40b2e60 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/IntercomControlTransmitLineState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IntercomControlTransmitLineState.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/IsGroupOfGroupedEntityCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/IsGroupOfGroupedEntityCategory.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/IsGroupOfGroupedEntityCategory.java
rename to src-generated/edu/nps/moves/dis7/enumerations/IsGroupOfGroupedEntityCategory.java
index f674ef6655a0c0df86df145d3a226f92e7696f87..b416ae8cf2fa7d99b5052a025af62254029e963d 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/IsGroupOfGroupedEntityCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IsGroupOfGroupedEntityCategory.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/IsGroupOfRestStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/IsGroupOfRestStatus.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/IsGroupOfRestStatus.java
rename to src-generated/edu/nps/moves/dis7/enumerations/IsGroupOfRestStatus.java
index 5addb52ccf00ca395fc37434b43395375508c5b8..ef5ee7897aecf2d6d5211b820f3bf3ee33dc902d 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/IsGroupOfRestStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IsGroupOfRestStatus.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/IsPartOfNature.java b/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfNature.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/IsPartOfNature.java
rename to src-generated/edu/nps/moves/dis7/enumerations/IsPartOfNature.java
index 6208b6cba9d67d2c33313b62d907a4c074090e9b..1d1e9b2c41fee3c16a51e3e0fbda56c93a75365d 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/IsPartOfNature.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfNature.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/IsPartOfPosition.java b/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfPosition.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/IsPartOfPosition.java
rename to src-generated/edu/nps/moves/dis7/enumerations/IsPartOfPosition.java
index b4521cec7b371dd562729c7128c0b0c169b15795..4802bd4ea2c9387b98e1ea67d30c3eb7c35fa6de 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/IsPartOfPosition.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfPosition.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/IsPartOfStationName.java b/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfStationName.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/IsPartOfStationName.java
rename to src-generated/edu/nps/moves/dis7/enumerations/IsPartOfStationName.java
index eac5b136875b81b70f695b9746124cafcc5e25c2..a5d9cc078628c61b9e7de4549755482d4b8bbad1 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/IsPartOfStationName.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IsPartOfStationName.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/IslandSubcategory.java b/src-generated/edu/nps/moves/dis7/enumerations/IslandSubcategory.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/IslandSubcategory.java
rename to src-generated/edu/nps/moves/dis7/enumerations/IslandSubcategory.java
index 8dd7cbe4d4cf73debdb50af6790127630966688f..2eda855c9b32ac3a316aaa1da85318263b047f4f 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/IslandSubcategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/IslandSubcategory.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/JTIDSMIDSModulationParametersSynchronizationState.java b/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersSynchronizationState.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/JTIDSMIDSModulationParametersSynchronizationState.java
rename to src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersSynchronizationState.java
index 039de212cca3ed0cd32154264034929589124006..fcb7bce42241fa003e898684881f4c4cd67d52b0 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/JTIDSMIDSModulationParametersSynchronizationState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersSynchronizationState.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalPrimaryMode.java b/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalPrimaryMode.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalPrimaryMode.java
rename to src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalPrimaryMode.java
index 5135c64b59bd493ee307f8597782d5ff5b8ffa5d..f9c0b02a1e0af00ca536f4b144ccc77487d87d4c 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalPrimaryMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalPrimaryMode.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalSecondaryMode.java b/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalSecondaryMode.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalSecondaryMode.java
rename to src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalSecondaryMode.java
index 6b0d87faf4556251e410615ce702bb8c508714c5..c2673e4dc2f9af439347f73a0bbc6852ee721f64 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalSecondaryMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/JTIDSMIDSModulationParametersTransmittingTerminalSecondaryMode.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/LandPlatformAppearance.java b/src-generated/edu/nps/moves/dis7/enumerations/LandPlatformAppearance.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/LandPlatformAppearance.java
rename to src-generated/edu/nps/moves/dis7/enumerations/LandPlatformAppearance.java
index cc91cd45e1f1b42f2f4a523d8aea05488b2bc544..b7610ae89154c0f8ff0075d3c49f4e1343d5083a 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/LandPlatformAppearance.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LandPlatformAppearance.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/LandPlatformCapabilities.java b/src-generated/edu/nps/moves/dis7/enumerations/LandPlatformCapabilities.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/LandPlatformCapabilities.java
rename to src-generated/edu/nps/moves/dis7/enumerations/LandPlatformCapabilities.java
index de9ac41edf44cb9719e2a9678d877f19aa3a8403..d794e4db8437320e3791bf4d6f97f3161bee0382 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/LandPlatformCapabilities.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LandPlatformCapabilities.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/LeafCoverage.java b/src-generated/edu/nps/moves/dis7/enumerations/LeafCoverage.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/LeafCoverage.java
rename to src-generated/edu/nps/moves/dis7/enumerations/LeafCoverage.java
index 00b46c97c9feafb7a687273943aa56b3484ec3ca..69e7cdf971121489e770f70d91ead1e1aee1a75c 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/LeafCoverage.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LeafCoverage.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/Level2SquitterStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/Level2SquitterStatus.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/Level2SquitterStatus.java
rename to src-generated/edu/nps/moves/dis7/enumerations/Level2SquitterStatus.java
index 8486d26bcd67521bafaa7f21fff3837af93ccf9a..60a2aa4f687e482450fb67a5a867c10bae4f6fa4 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/Level2SquitterStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Level2SquitterStatus.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/LifeFormAirCategories.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormAirCategories.java
similarity index 86%
rename from src-generated/edu/nps/moves/dis/enumerations/LifeFormAirCategories.java
rename to src-generated/edu/nps/moves/dis7/enumerations/LifeFormAirCategories.java
index 583fa23e2175ea62e84c458b4606fbea61724b2a..db95eec344f8e301a863e27ae0370623506cf281 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/LifeFormAirCategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormAirCategories.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
@@ -14,9 +14,9 @@ import edu.nps.moves.dis.*;
*/
public enum LifeFormAirCategories
{
- /** SubcategoriesforAirCategory200Bird */ BIRD (200, "Bird"),
- /** SubcategoriesforAirCategory201Insect */ INSECT (201, "Insect"),
- /** SubcategoriesforAirCategory202Mammal */ MAMMAL (202, "Mammal");
+ /** SubcategoriesforAirCategory200Bird */ BIRD_2 (200, "Bird"),
+ /** SubcategoriesforAirCategory201Insect */ INSECT_2 (201, "Insect"),
+ /** SubcategoriesforAirCategory202Mammal */ MAMMAL_2 (202, "Mammal");
private int value;
private final String description;
diff --git a/src-generated/edu/nps/moves/dis/enumerations/LifeFormCategoriesUS.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormCategoriesUS.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/LifeFormCategoriesUS.java
rename to src-generated/edu/nps/moves/dis7/enumerations/LifeFormCategoriesUS.java
index ba039f0f81e17500d64c1fee8c79739113b0905e..6bc3d209f7bfd0dd2310b05511de38ce637b1481 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/LifeFormCategoriesUS.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormCategoriesUS.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/LifeFormExtraPersonalData.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormExtraPersonalData.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/LifeFormExtraPersonalData.java
rename to src-generated/edu/nps/moves/dis7/enumerations/LifeFormExtraPersonalData.java
index fd7d8c8c5673831fa16ca6bc24dc748cfc7aa1c5..81f0166d419831bbcea4662debe71c74bf9f771c 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/LifeFormExtraPersonalData.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormExtraPersonalData.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificAntiMaterielRifles.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiMaterielRifles.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificAntiMaterielRifles.java
rename to src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiMaterielRifles.java
index 56db8e03ae60196094cd65a9aa6548aefd926b93..1822509e4de7cb6c3801d10eb8b1ce743c120080 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificAntiMaterielRifles.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiMaterielRifles.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificAntiTankMissiles.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiTankMissiles.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificAntiTankMissiles.java
rename to src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiTankMissiles.java
index 0db74a06bc74e885f6030bf29d0dccc3a6d9607b..e91bce65fe5fd7b22fdc0f46f81699a5d8f2baad 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificAntiTankMissiles.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiTankMissiles.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificAntiTankRockets.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiTankRockets.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificAntiTankRockets.java
rename to src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiTankRockets.java
index 35b6e1e416fc8f56eaebfba825668734447b0daa..ff3b16a0f957e46142fffd7d64d716bf4f8cfeb5 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificAntiTankRockets.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAntiTankRockets.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificAssaultRifles.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAssaultRifles.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificAssaultRifles.java
rename to src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAssaultRifles.java
index bde0c66c8ab9a5cacae1ec96da66e36848b737ea..74e92a546dd772d5dfc88f265c88746ffa52a7b5 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificAssaultRifles.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificAssaultRifles.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificDroneGuns.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificDroneGuns.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificDroneGuns.java
rename to src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificDroneGuns.java
index 0dd106265f366d6b46d70f001bf91e3079d8df6a..d1b3e584d207dca1fe8afe8122099b20c5e91e3f 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificDroneGuns.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificDroneGuns.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificEquipmentClass.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificEquipmentClass.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificEquipmentClass.java
rename to src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificEquipmentClass.java
index da66cd1a029d91744fee2e345c68c869c2a3dece..3eee71b9786bbe4aa91be25da8ca66a104fa192b 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificEquipmentClass.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificEquipmentClass.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificFlameRockets.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificFlameRockets.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificFlameRockets.java
rename to src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificFlameRockets.java
index cd3097b18d2830103a8a753417dd2747561be97c..8d4804494faf814b4c7a03db3b8626a08047b377 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificFlameRockets.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificFlameRockets.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificFlameThrowers.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificFlameThrowers.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificFlameThrowers.java
rename to src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificFlameThrowers.java
index 3e2b6e1df5b9eaf44a2b85db156aa56748acd67b..138cd7405780e70d491f2a86209f9ae962611263 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificFlameThrowers.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificFlameThrowers.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificGrenadeLaunchers.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificGrenadeLaunchers.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificGrenadeLaunchers.java
rename to src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificGrenadeLaunchers.java
index b7b212e1e1056a8686fcfc68f05dbe22f048f8a9..c030f32fd07cf35143fc759469899c223c15d20a 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificGrenadeLaunchers.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificGrenadeLaunchers.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificGrenadeLaunchingMachineGun.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificGrenadeLaunchingMachineGun.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificGrenadeLaunchingMachineGun.java
rename to src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificGrenadeLaunchingMachineGun.java
index 7804654e7a898df8caaf46cceb92010d2bbadc82..63d2301cc7ac56a31d0386788178d70997a5e5a7 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificGrenadeLaunchingMachineGun.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificGrenadeLaunchingMachineGun.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificHandGuns.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificHandGuns.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificHandGuns.java
rename to src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificHandGuns.java
index e9aba06b70cfb1bbd839306ae4af32a96473ef8e..2a7d33ac4b863f60fdc20610f5d20c9072319a52 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificHandGuns.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificHandGuns.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificHighPowerRifles.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificHighPowerRifles.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificHighPowerRifles.java
rename to src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificHighPowerRifles.java
index b84ec2498a84143379f2ffb580c7621cf6809066..3a6f8d85e223016050f4b4c79349629e209337a4 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificHighPowerRifles.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificHighPowerRifles.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificMachineGuns.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificMachineGuns.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificMachineGuns.java
rename to src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificMachineGuns.java
index b82473c4a0f00257cbc45bc1b3821dc112bd5291..65df00ae16687f8c767b88f7b8d0e486b404a4f1 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificMachineGuns.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificMachineGuns.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificManPortableAirDefenseSystem.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificManPortableAirDefenseSystem.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificManPortableAirDefenseSystem.java
rename to src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificManPortableAirDefenseSystem.java
index 7def30973c48f24f69a74447d7aca042dcb800f0..cf4b714c2af79c2e2b8425e5ab26d6dd356f97a3 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificManPortableAirDefenseSystem.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificManPortableAirDefenseSystem.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificMortars.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificMortars.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificMortars.java
rename to src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificMortars.java
index d9b7d81a8a5dafac37738ef640fd751bf0e5285c..e8d3e8884d6e48f2e2054a9a6f100097b49cea21 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificMortars.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificMortars.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificRecoillessRifles.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificRecoillessRifles.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificRecoillessRifles.java
rename to src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificRecoillessRifles.java
index 0b170cd9981338412d9678418eab43c7fec945a0..38b6b250b04c395b849992614489a9e528982587 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificRecoillessRifles.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificRecoillessRifles.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificShotGuns.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificShotGuns.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificShotGuns.java
rename to src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificShotGuns.java
index 3c5d0ab98772888b1cdbe8c5ff4de9efdbe03b35..687a57c2e6617cff667aec6404445f211f4ef5eb 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificShotGuns.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificShotGuns.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificSniper.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificSniper.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificSniper.java
rename to src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificSniper.java
index 688f591f7153a63a642c78c93fb388c953b577c2..f7fdd384ba46ab3f3bd91ff6d6d95d1614a5883f 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificSniper.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificSniper.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificSubMachineGun.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificSubMachineGun.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificSubMachineGun.java
rename to src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificSubMachineGun.java
index 9713ebc3041099645d63cf42945559330f83065e..52911d57711fdc04006be688b1ea81ec65f83b54 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificSubMachineGun.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificSubMachineGun.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificWeaponNonspecific.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificWeaponNonspecific.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificWeaponNonspecific.java
rename to src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificWeaponNonspecific.java
index 866f1bfcbaca6da379074f55fc29d95f120ca334..d6bf4d5f8f92a4eaaebd34c4dcd2f32d399196f9 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSpecificWeaponNonspecific.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSpecificWeaponNonspecific.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSubcategoryEquipmentClass.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSubcategoryEquipmentClass.java
similarity index 71%
rename from src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSubcategoryEquipmentClass.java
rename to src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSubcategoryEquipmentClass.java
index 230f7598d6d14cc78030d7c4cccc311cfdcd1e32..da33ddd364f16d63124f2074bcd0452dd9dc753e 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/LifeFormHumanSubcategoryEquipmentClass.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormHumanSubcategoryEquipmentClass.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
@@ -16,34 +16,34 @@ public enum LifeFormHumanSubcategoryEquipmentClass
{
/** None */
NONE (0, "None"),
- /** LifeFormHumanSpecificWeaponNonspecific */ WEAPON_NON_SPECIFIC (1, "Weapon, Non-specific"),
- /** LifeFormHumanSpecificAssaultRifles */ ASSAULT_RIFLES (5, "Assault Rifles"),
- /** LifeFormHumanSpecificHighPowerRifles */ HIGH_POWER_RIFLES (10, "High Power Rifles"),
- /** LifeFormHumanSpecificSniper */ SNIPER_RIFLES (15, "Sniper Rifles"),
- /** LifeFormHumanSpecificAntiMaterielRifles */ ANTI_MATERIEL_RIFLE_AMR (17, "Anti-Materiel Rifle (AMR)"),
- /** LifeFormHumanSpecificSubMachineGun */ SUB_MACHINE_GUNS (20, "Sub Machine Guns"),
- /** LifeFormHumanSpecificShotGuns */ SHOT_GUNS (25, "Shot Guns"),
- /** LifeFormHumanSpecificGrenadeLaunchers */ GRENADE_LAUNCHERS (30, "Grenade Launchers"),
- /** LifeFormHumanSpecificMachineGuns */ MACHINE_GUNS (35, "Machine Guns"),
- /** LifeFormHumanSpecificGrenadeLaunchingMachineGun */ GRENADE_LAUNCHING_MACHINE_GUN (40, "Grenade Launching Machine Gun"),
- /** LifeFormHumanSpecificAntiTankRockets */ ANTI_TANK_ROCKETS (45, "Anti-Tank Rockets"),
- /** LifeFormHumanSpecificAntiTankMissiles */ ANTI_TANK_MISSILES (50, "Anti-Tank Missiles"),
+ /** LifeFormHumanSpecificWeaponNonspecific */ WEAPON_NON_SPECIFIC_2 (1, "Weapon, Non-specific"),
+ /** LifeFormHumanSpecificAssaultRifles */ ASSAULT_RIFLES_2 (5, "Assault Rifles"),
+ /** LifeFormHumanSpecificHighPowerRifles */ HIGH_POWER_RIFLES_2 (10, "High Power Rifles"),
+ /** LifeFormHumanSpecificSniper */ SNIPER_RIFLES_2 (15, "Sniper Rifles"),
+ /** LifeFormHumanSpecificAntiMaterielRifles */ ANTI_MATERIEL_RIFLE_AMR_2 (17, "Anti-Materiel Rifle (AMR)"),
+ /** LifeFormHumanSpecificSubMachineGun */ SUB_MACHINE_GUNS_2 (20, "Sub Machine Guns"),
+ /** LifeFormHumanSpecificShotGuns */ SHOT_GUNS_2 (25, "Shot Guns"),
+ /** LifeFormHumanSpecificGrenadeLaunchers */ GRENADE_LAUNCHERS_2 (30, "Grenade Launchers"),
+ /** LifeFormHumanSpecificMachineGuns */ MACHINE_GUNS_2 (35, "Machine Guns"),
+ /** LifeFormHumanSpecificGrenadeLaunchingMachineGun */ GRENADE_LAUNCHING_MACHINE_GUN_2 (40, "Grenade Launching Machine Gun"),
+ /** LifeFormHumanSpecificAntiTankRockets */ ANTI_TANK_ROCKETS_2 (45, "Anti-Tank Rockets"),
+ /** LifeFormHumanSpecificAntiTankMissiles */ ANTI_TANK_MISSILES_2 (50, "Anti-Tank Missiles"),
/** Anti-Tank Guns */
ANTI_TANK_GUNS (55, "Anti-Tank Guns"),
- /** LifeFormHumanSpecificFlameRockets */ FLAME_ROCKETS (60, "Flame Rockets"),
- /** LifeFormHumanSpecificFlameThrowers */ FLAME_THROWERS (65, "Flame Throwers"),
+ /** LifeFormHumanSpecificFlameRockets */ FLAME_ROCKETS_2 (60, "Flame Rockets"),
+ /** LifeFormHumanSpecificFlameThrowers */ FLAME_THROWERS_2 (65, "Flame Throwers"),
/** Rocket Launchers */
ROCKET_LAUNCHERS (70, "Rocket Launchers"),
- /** LifeFormHumanSpecificMortars */ MORTARS (75, "Mortars"),
- /** LifeFormHumanSpecificHandGuns */ HAND_GUNS (80, "Hand Guns"),
- /** LifeFormHumanSpecificManPortableAirDefenseSystem */ MAN_PORTABLE_AIR_DEFENSE_SYSTEM_MANPADS (85, "Man-Portable Air Defense System (MANPADS)"),
- /** LifeFormHumanSpecificRecoillessRifles */ RECOILLESS_RIFLES (90, "Recoilless Rifles"),
- /** LifeFormHumanSpecificDroneGuns */ DRONE_GUNS (95, "Drone Guns"),
+ /** LifeFormHumanSpecificMortars */ MORTARS_2 (75, "Mortars"),
+ /** LifeFormHumanSpecificHandGuns */ HAND_GUNS_2 (80, "Hand Guns"),
+ /** LifeFormHumanSpecificManPortableAirDefenseSystem */ MAN_PORTABLE_AIR_DEFENSE_SYSTEM_MANPADS_2 (85, "Man-Portable Air Defense System (MANPADS)"),
+ /** LifeFormHumanSpecificRecoillessRifles */ RECOILLESS_RIFLES_2 (90, "Recoilless Rifles"),
+ /** LifeFormHumanSpecificDroneGuns */ DRONE_GUNS_2 (95, "Drone Guns"),
/** Equipment, Non-specific, Subcategories 150-199 are restricted to non-weapon equipment classes. */
EQUIPMENT_NON_SPECIFIC (150, "Equipment, Non-specific"),
/** Sensors, Subcategories 151-159 are restricted to sensor equipment classes. */
SENSORS (151, "Sensors"),
- /** LifeFormHumanSpecificEquipmentClass */ SIGNAL_SENSOR (152, "Signal Sensor"),
+ /** LifeFormHumanSpecificEquipmentClass */ SIGNAL_SENSOR_2 (152, "Signal Sensor"),
/** Animal Companion, Subcategories 160-169 are restricted to animal companion classes. */
ANIMAL_COMPANION (160, "Animal Companion");
diff --git a/src-generated/edu/nps/moves/dis/enumerations/LifeFormLandCategories.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormLandCategories.java
similarity index 90%
rename from src-generated/edu/nps/moves/dis/enumerations/LifeFormLandCategories.java
rename to src-generated/edu/nps/moves/dis7/enumerations/LifeFormLandCategories.java
index bf2f13e51eb0b3bb422638d759197a0a1b83a331..aa01fb14a49073a04b6b0a691b7a9e2e7e581e13 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/LifeFormLandCategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormLandCategories.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
@@ -52,13 +52,13 @@ public enum LifeFormLandCategories implements Category
EMERGENCY_MEDICAL_TECHNICIAN_EMT (131, "Emergency Medical Technician (EMT)"),
/** Firefighter */
FIREFIGHTER (132, "Firefighter"),
- /** SubcategoriesforLandCategory200Mammal */ MAMMAL (200, "Mammal"),
- /** SubcategoriesforLandCategory201Reptile */ REPTILE (201, "Reptile"),
- /** SubcategoriesforLandCategory202Amphibian */ AMPHIBIAN (202, "Amphibian"),
- /** SubcategoriesforLandCategory203Insect */ INSECT (203, "Insect"),
- /** SubcategoriesforLandCategory204Arachnid */ ARACHNID (204, "Arachnid"),
- /** SubcategoriesforLandCategory205Mollusk */ MOLLUSK (205, "Mollusk"),
- /** SubcategoriesforLandCategory206Marsupial */ MARSUPIAL (206, "Marsupial");
+ /** SubcategoriesforLandCategory200Mammal */ MAMMAL_2 (200, "Mammal"),
+ /** SubcategoriesforLandCategory201Reptile */ REPTILE_2 (201, "Reptile"),
+ /** SubcategoriesforLandCategory202Amphibian */ AMPHIBIAN_2 (202, "Amphibian"),
+ /** SubcategoriesforLandCategory203Insect */ INSECT_2 (203, "Insect"),
+ /** SubcategoriesforLandCategory204Arachnid */ ARACHNID_2 (204, "Arachnid"),
+ /** SubcategoriesforLandCategory205Mollusk */ MOLLUSK_2 (205, "Mollusk"),
+ /** SubcategoriesforLandCategory206Marsupial */ MARSUPIAL_2 (206, "Marsupial");
private int value;
private final String description;
diff --git a/src-generated/edu/nps/moves/dis/enumerations/LifeFormSubsurfaceCategories.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormSubsurfaceCategories.java
similarity index 90%
rename from src-generated/edu/nps/moves/dis/enumerations/LifeFormSubsurfaceCategories.java
rename to src-generated/edu/nps/moves/dis7/enumerations/LifeFormSubsurfaceCategories.java
index 770ae5c1871c3e9f6b4dc623e4f14b2a466ea699..33cefd6468d7aaaee272220dc2533b3f51b97f34 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/LifeFormSubsurfaceCategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormSubsurfaceCategories.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
@@ -14,11 +14,11 @@ import edu.nps.moves.dis.*;
*/
public enum LifeFormSubsurfaceCategories
{
- /** SubcategoriesforSubsurfaceCategory200Fish */ FISH (200, "Fish"),
- /** SubcategoriesforSubsurfaceCategory201Mammal */ MAMMAL (201, "Mammal"),
- /** SubcategoriesforSubsurfaceCategory202Mollusk */ MOLLUSK (202, "Mollusk"),
- /** SubcategoriesforSubsurfaceCategory203Crustacean */ CRUSTACEAN (203, "Crustacean"),
- /** SubcategoriesforSubsurfaceCategory204Insect */ INSECT (204, "Insect");
+ /** SubcategoriesforSubsurfaceCategory200Fish */ FISH_2 (200, "Fish"),
+ /** SubcategoriesforSubsurfaceCategory201Mammal */ MAMMAL_2 (201, "Mammal"),
+ /** SubcategoriesforSubsurfaceCategory202Mollusk */ MOLLUSK_2 (202, "Mollusk"),
+ /** SubcategoriesforSubsurfaceCategory203Crustacean */ CRUSTACEAN_2 (203, "Crustacean"),
+ /** SubcategoriesforSubsurfaceCategory204Insect */ INSECT_2 (204, "Insect");
private int value;
private final String description;
diff --git a/src-generated/edu/nps/moves/dis/enumerations/LifeFormsAppearance.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsAppearance.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/LifeFormsAppearance.java
rename to src-generated/edu/nps/moves/dis7/enumerations/LifeFormsAppearance.java
index cd153319c4847e5e5df2853ab79d0e0f0445a120..80f3fc85b10fdb0dd9cc653bbf4359228a70ba7a 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/LifeFormsAppearance.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsAppearance.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/LifeFormsCapabilities.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsCapabilities.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/LifeFormsCapabilities.java
rename to src-generated/edu/nps/moves/dis7/enumerations/LifeFormsCapabilities.java
index d38d33760ff0045d3126eadac97f50bf48bea0a5..7c648f8f2af3622d008c02166f69b35e94bf99fb 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/LifeFormsCapabilities.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsCapabilities.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/LifeFormsSubcategoryCISWeapons.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryCISWeapons.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/enumerations/LifeFormsSubcategoryCISWeapons.java
rename to src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryCISWeapons.java
index 1b6fa1e899c161eeca8a8617c41f127d8ea6e1fd..d429b8d2175ea46807fcf7a178c3324d41bd7b3d 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/LifeFormsSubcategoryCISWeapons.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryCISWeapons.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/LifeFormsSubcategoryFrenchWeapons.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryFrenchWeapons.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/LifeFormsSubcategoryFrenchWeapons.java
rename to src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryFrenchWeapons.java
index 580b6400ac9f682509d5eb320197d8eb50c29e62..cde38ca5c998efd2480668417bacc91e07c86a04 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/LifeFormsSubcategoryFrenchWeapons.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryFrenchWeapons.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/LifeFormsSubcategoryGermanWeapons.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryGermanWeapons.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/LifeFormsSubcategoryGermanWeapons.java
rename to src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryGermanWeapons.java
index ca398e8ca813d321d526abdf2047bda3a3f0d833..9b6cb6ce0604e9920a320042e8513700c1b65a20 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/LifeFormsSubcategoryGermanWeapons.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryGermanWeapons.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/LifeFormsSubcategoryIranianWeapons.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryIranianWeapons.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/LifeFormsSubcategoryIranianWeapons.java
rename to src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryIranianWeapons.java
index f037f147c5c30940ba2545b863829297378039a2..c66de65e41bfe092bec0e9e72c0bbb4f8112a8b2 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/LifeFormsSubcategoryIranianWeapons.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryIranianWeapons.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/LifeFormsSubcategoryUKWeapons.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryUKWeapons.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/LifeFormsSubcategoryUKWeapons.java
rename to src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryUKWeapons.java
index fd02a9b2e6279272b9f5e5bfc36dd6e622fa6b52..5fc97def6ca84de910d8286ce197eb7bb075af58 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/LifeFormsSubcategoryUKWeapons.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryUKWeapons.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/LifeFormsSubcategoryUSWeapons.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryUSWeapons.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/enumerations/LifeFormsSubcategoryUSWeapons.java
rename to src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryUSWeapons.java
index cb434cbae69e0b570bc37575ed481d32343a5241..c182d79cce05081eff5f30b7c95f033f052d36c5 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/LifeFormsSubcategoryUSWeapons.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeFormsSubcategoryUSWeapons.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/LifeSavingEquipment.java b/src-generated/edu/nps/moves/dis7/enumerations/LifeSavingEquipment.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/LifeSavingEquipment.java
rename to src-generated/edu/nps/moves/dis7/enumerations/LifeSavingEquipment.java
index c1be9c876983d0514a50076c13a3ca49e6349c1c..dfd8296cf77b4d53ca0c0a033bfa9f4301155b2e 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/LifeSavingEquipment.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LifeSavingEquipment.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/LinearObjectAppearanceBreach.java b/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceBreach.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/LinearObjectAppearanceBreach.java
rename to src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceBreach.java
index ed2c21a64c1aeba6395a22b0d4f9141ffb741358..664eae9a927ce85d5c3a395275d882c905b5e07b 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/LinearObjectAppearanceBreach.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceBreach.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/LinearObjectAppearanceExhaustSmoke.java b/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceExhaustSmoke.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/LinearObjectAppearanceExhaustSmoke.java
rename to src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceExhaustSmoke.java
index 1652b123ad672c464464894cea3c9e2fc24c7143..df86a024347ce7dc4837664a55f84ff731a11114 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/LinearObjectAppearanceExhaustSmoke.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceExhaustSmoke.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/LinearObjectAppearanceMinefieldLaneMarker.java b/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceMinefieldLaneMarker.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/LinearObjectAppearanceMinefieldLaneMarker.java
rename to src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceMinefieldLaneMarker.java
index 6068a62a9000b691e931f8f2ce97f83c11ac74e7..1b632e4eb01669fbf39a64f0f26e97b581a1a18a 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/LinearObjectAppearanceMinefieldLaneMarker.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceMinefieldLaneMarker.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/LinearObjectAppearanceSpeedBump.java b/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceSpeedBump.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/LinearObjectAppearanceSpeedBump.java
rename to src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceSpeedBump.java
index 20378a6fc471319a8b0bb4160817ebd861880174..a55883c1595bbba962dae2008e215b6b8d67c189 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/LinearObjectAppearanceSpeedBump.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceSpeedBump.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/LinearObjectAppearanceTankDitchAndConcertinaWire.java b/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceTankDitchAndConcertinaWire.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/LinearObjectAppearanceTankDitchAndConcertinaWire.java
rename to src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceTankDitchAndConcertinaWire.java
index daf3ed36452a358333f2247bc72bf42fc9b45be8..1568b660019b08b0e83bbe22cadbff8a586e6039 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/LinearObjectAppearanceTankDitchAndConcertinaWire.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceTankDitchAndConcertinaWire.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/LinearObjectAppearanceWire.java b/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceWire.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/LinearObjectAppearanceWire.java
rename to src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceWire.java
index 5946579629eb0799ab4f487e29084649b5f1f8b7..490159e43065fa5cda696e60c730ba4590c2a8f5 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/LinearObjectAppearanceWire.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/LinearObjectAppearanceWire.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/Link1111BDataTerminalSetIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/Link1111BDataTerminalSetIndicator.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/Link1111BDataTerminalSetIndicator.java
rename to src-generated/edu/nps/moves/dis7/enumerations/Link1111BDataTerminalSetIndicator.java
index 8fc3ccef0ff693c0abb9635aa8dc58df2e7e7796..8762c0c0a0e4173c80c482f25e3316afe8770882 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/Link1111BDataTerminalSetIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Link1111BDataTerminalSetIndicator.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/Link1111BFidelityLevel.java b/src-generated/edu/nps/moves/dis7/enumerations/Link1111BFidelityLevel.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/Link1111BFidelityLevel.java
rename to src-generated/edu/nps/moves/dis7/enumerations/Link1111BFidelityLevel.java
index 12192a72f864f5a59c6a23d1096e1dbe5912b584..5e8b5b2d54d7c3ce3d321514cff143cfe79da068 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/Link1111BFidelityLevel.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Link1111BFidelityLevel.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/Link1111BModeofOperation.java b/src-generated/edu/nps/moves/dis7/enumerations/Link1111BModeofOperation.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/Link1111BModeofOperation.java
rename to src-generated/edu/nps/moves/dis7/enumerations/Link1111BModeofOperation.java
index c51835e9c66c047dce8ef9d296704a728435c593..a35348969ececa522b67a57409ebc846ad55743b 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/Link1111BModeofOperation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Link1111BModeofOperation.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/Link1111BTerminalMode.java b/src-generated/edu/nps/moves/dis7/enumerations/Link1111BTerminalMode.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/Link1111BTerminalMode.java
rename to src-generated/edu/nps/moves/dis7/enumerations/Link1111BTerminalMode.java
index 8d4398a97fd1b1489df6ae997a6f8936d305e238..0a84dd6a14dd8c365980785642c04aeedb050a6d 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/Link1111BTerminalMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Link1111BTerminalMode.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/Material.java b/src-generated/edu/nps/moves/dis7/enumerations/Material.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/Material.java
rename to src-generated/edu/nps/moves/dis7/enumerations/Material.java
index 6e7e9e14d770be0c648443153c564be0ddcf77e8..955a2905195b5366eac49f2a20d6296ff559f41b 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/Material.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Material.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/MinefieldAppearanceActiveStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceActiveStatus.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/MinefieldAppearanceActiveStatus.java
rename to src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceActiveStatus.java
index 5f98dee89f72d2dbb2297eb31de6e529888a9a4c..062a1e87dd5e044ab995ee53e14090c31c353caf 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/MinefieldAppearanceActiveStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceActiveStatus.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/MinefieldAppearanceLane.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceLane.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/MinefieldAppearanceLane.java
rename to src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceLane.java
index 701d149f9a50f7a5ed024869e6c4a04813c4beee..0ef78ff3f332b186022b3d24ce10840c7e14504e 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/MinefieldAppearanceLane.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceLane.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/MinefieldAppearanceMinefieldType.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceMinefieldType.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/MinefieldAppearanceMinefieldType.java
rename to src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceMinefieldType.java
index caf2e7173d57648cb3f58a88b27b64158dfab894..ed47bec12fddb9040fb89f8a91e8aea25208c255 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/MinefieldAppearanceMinefieldType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceMinefieldType.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/MinefieldAppearanceState.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceState.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/MinefieldAppearanceState.java
rename to src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceState.java
index 858510de150b41066cc237acd2882c7e98faa55c..8267301d701f7ed8c66ef07494a3d97a4781bdde 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/MinefieldAppearanceState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldAppearanceState.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/MinefieldDataFusing.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldDataFusing.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/MinefieldDataFusing.java
rename to src-generated/edu/nps/moves/dis7/enumerations/MinefieldDataFusing.java
index f7920ab480e7c1c638aa533d9a88ff30dd09d61c..0ee72224c74da2cfee0c8aa24dfca67bceb2d471 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/MinefieldDataFusing.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldDataFusing.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/MinefieldDataPaintScheme.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldDataPaintScheme.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/MinefieldDataPaintScheme.java
rename to src-generated/edu/nps/moves/dis7/enumerations/MinefieldDataPaintScheme.java
index 58579b4ffbf233ebe91c4ba6c9318b30ddde4f92..dbee3f4574c30f486edf7ed551cff040f11fe84d 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/MinefieldDataPaintScheme.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldDataPaintScheme.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/MinefieldFusingFuseType.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldFusingFuseType.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/MinefieldFusingFuseType.java
rename to src-generated/edu/nps/moves/dis7/enumerations/MinefieldFusingFuseType.java
index 7101980fb210d66772684a510aaafcf65f933624..3a3d37f48310b1b8dbe978c7b355e33afc46ad61 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/MinefieldFusingFuseType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldFusingFuseType.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/MinefieldPaintSchemeAlgae.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldPaintSchemeAlgae.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/MinefieldPaintSchemeAlgae.java
rename to src-generated/edu/nps/moves/dis7/enumerations/MinefieldPaintSchemeAlgae.java
index 4c15e66ff3c7213b2953b17ed630dfdfa3ec1ae4..5d57e04c501a99adbe5266b687971bf6cd5227bb 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/MinefieldPaintSchemeAlgae.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldPaintSchemeAlgae.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/MinefieldPaintSchemePaintScheme.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldPaintSchemePaintScheme.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/MinefieldPaintSchemePaintScheme.java
rename to src-generated/edu/nps/moves/dis7/enumerations/MinefieldPaintSchemePaintScheme.java
index c5406c3be7ceee61c1180da7d7551df2671c562c..4fcdaa15d43fb62c981ac7d7a326411518396850 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/MinefieldPaintSchemePaintScheme.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldPaintSchemePaintScheme.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/MinefieldSensorTypes.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypes.java
similarity index 76%
rename from src-generated/edu/nps/moves/dis/enumerations/MinefieldSensorTypes.java
rename to src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypes.java
index 96dacd7e7db964d02efc3c4fc10ee004848a2e0d..c65661d0ab04acdb180dfb387461806517cf13d5 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/MinefieldSensorTypes.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypes.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
@@ -16,14 +16,14 @@ public enum MinefieldSensorTypes
{
/** Other */
OTHER (0, "Other"),
- /** MinefieldSensorTypesOptical */ OPTICAL (1, "Optical"),
- /** MinefieldSensorTypesFLIR */ FLIR (2, "FLIR"),
- /** MinefieldSensorTypesRADAR */ RADAR (3, "RADAR"),
- /** MinefieldSensorTypesMagnetic */ MAGNETIC (4, "Magnetic"),
- /** MinefieldSensorTypesLaser */ LASER (5, "Laser"),
- /** MinefieldSensorTypesSONAR */ SONAR (6, "SONAR"),
- /** MinefieldSensorTypesPhysical */ PHYSICAL (7, "Physical"),
- /** MinefieldSensorTypesMultispectral */ MULTISPECTRAL (8, "Multispectral");
+ /** MinefieldSensorTypesOptical */ OPTICAL_2 (1, "Optical"),
+ /** MinefieldSensorTypesFLIR */ FLIR_2 (2, "FLIR"),
+ /** MinefieldSensorTypesRADAR */ RADAR_2 (3, "RADAR"),
+ /** MinefieldSensorTypesMagnetic */ MAGNETIC_2 (4, "Magnetic"),
+ /** MinefieldSensorTypesLaser */ LASER_2 (5, "Laser"),
+ /** MinefieldSensorTypesSONAR */ SONAR_2 (6, "SONAR"),
+ /** MinefieldSensorTypesPhysical */ PHYSICAL_2 (7, "Physical"),
+ /** MinefieldSensorTypesMultispectral */ MULTISPECTRAL_2 (8, "Multispectral");
private int value;
private final String description;
diff --git a/src-generated/edu/nps/moves/dis/enumerations/MinefieldSensorTypesFLIR.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesFLIR.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/MinefieldSensorTypesFLIR.java
rename to src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesFLIR.java
index 086f5d6c7a04644d1c091945eb14563d170e3250..cd535e5c6d4e614fffe6ce6871861a014eb77723 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/MinefieldSensorTypesFLIR.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesFLIR.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/MinefieldSensorTypesLaser.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesLaser.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/MinefieldSensorTypesLaser.java
rename to src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesLaser.java
index 53bfce8397302cf4e962f2226c939d258e5e80f1..7f0862672327f1f842f43b3679eda13a00509fb9 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/MinefieldSensorTypesLaser.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesLaser.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/MinefieldSensorTypesMagnetic.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesMagnetic.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/MinefieldSensorTypesMagnetic.java
rename to src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesMagnetic.java
index 95d8a7d709f4e3cf5905c763c301d8621f274b46..d93fd815a59cf42841bbf140e80f7fb77581467b 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/MinefieldSensorTypesMagnetic.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesMagnetic.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/MinefieldSensorTypesMultispectral.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesMultispectral.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/MinefieldSensorTypesMultispectral.java
rename to src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesMultispectral.java
index dfeea1b8b3f5801983480961745286b150b897b9..142186eb4ac262b6d867a3d62fd36e1a8f0b4a2f 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/MinefieldSensorTypesMultispectral.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesMultispectral.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/MinefieldSensorTypesOptical.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesOptical.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/MinefieldSensorTypesOptical.java
rename to src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesOptical.java
index a0f7681a64c8a53fe8feafd3daed4d716b8d01b0..00625801d118aec43d040b2816f5bbed24c06bab 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/MinefieldSensorTypesOptical.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesOptical.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/MinefieldSensorTypesPhysical.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesPhysical.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/MinefieldSensorTypesPhysical.java
rename to src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesPhysical.java
index bc11f50a12370dd97ad7165fedfc37c90a8459d3..fd9cd260f78662829e8707dee48087f20c224415 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/MinefieldSensorTypesPhysical.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesPhysical.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/MinefieldSensorTypesRADAR.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesRADAR.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/MinefieldSensorTypesRADAR.java
rename to src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesRADAR.java
index ff0d0059b8a29351bf6b33da8fea8b80fea41d0e..b5b896af88dd8f203d22b42fd8495cb75a50c23e 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/MinefieldSensorTypesRADAR.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesRADAR.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/MinefieldSensorTypesSONAR.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesSONAR.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/MinefieldSensorTypesSONAR.java
rename to src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesSONAR.java
index 03b2da381d32b6076dc137e149e0a788468578d6..2db96fe3a514169a572f45fb7d4e3a61373a0c80 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/MinefieldSensorTypesSONAR.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldSensorTypesSONAR.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/MinefieldStateAppearanceBitMap.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldStateAppearanceBitMap.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/MinefieldStateAppearanceBitMap.java
rename to src-generated/edu/nps/moves/dis7/enumerations/MinefieldStateAppearanceBitMap.java
index fbba1da2106a97f2d75cff1352fabafc790a64c5..61ef091910c6e0912852b18582039fe8973e65aa 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/MinefieldStateAppearanceBitMap.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldStateAppearanceBitMap.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/MinefieldStateProtocolMode.java b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldStateProtocolMode.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/MinefieldStateProtocolMode.java
rename to src-generated/edu/nps/moves/dis7/enumerations/MinefieldStateProtocolMode.java
index 5c4857a73e6cf20c2ad762afbac5a8e78448c50f..f85087080473874c3d24e61141d8f7d7c66a60b3 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/MinefieldStateProtocolMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MinefieldStateProtocolMode.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/Mode5IFFMission.java b/src-generated/edu/nps/moves/dis7/enumerations/Mode5IFFMission.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/Mode5IFFMission.java
rename to src-generated/edu/nps/moves/dis7/enumerations/Mode5IFFMission.java
index b43dd877b8707be53430c189dc2965ee375e3189..59ec6ee8ddb704fdabcfc5e36e12d0c179cb7120 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/Mode5IFFMission.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Mode5IFFMission.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/Mode5LevelSelection.java b/src-generated/edu/nps/moves/dis7/enumerations/Mode5LevelSelection.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/Mode5LevelSelection.java
rename to src-generated/edu/nps/moves/dis7/enumerations/Mode5LevelSelection.java
index f34e47bd2c01d025c585106689d8c4b39d2ca725..f7d954c0ebe7748722dbfc4ae5b0e449b0ed4240 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/Mode5LevelSelection.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Mode5LevelSelection.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/Mode5LocationErrors.java b/src-generated/edu/nps/moves/dis7/enumerations/Mode5LocationErrors.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/Mode5LocationErrors.java
rename to src-generated/edu/nps/moves/dis7/enumerations/Mode5LocationErrors.java
index 5a488843cb8957705d1b05691c48b26faff20723..8223d4fa00136d80565c65b4fc5b2777581c2bc3 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/Mode5LocationErrors.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Mode5LocationErrors.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/Mode5MessageFormatsStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/Mode5MessageFormatsStatus.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/Mode5MessageFormatsStatus.java
rename to src-generated/edu/nps/moves/dis7/enumerations/Mode5MessageFormatsStatus.java
index 1a50304d82dcbdd89d4507f13f1d9da869f0659c..49bb2a088233c64b01f48970331d2a2ff19e9f65 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/Mode5MessageFormatsStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Mode5MessageFormatsStatus.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/Mode5PlatformType.java b/src-generated/edu/nps/moves/dis7/enumerations/Mode5PlatformType.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/Mode5PlatformType.java
rename to src-generated/edu/nps/moves/dis7/enumerations/Mode5PlatformType.java
index cb3f7286f4e2d90ec0429a6781c654e663ba3b3a..789493e19ffca15a7855bbec542f331843feb8be 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/Mode5PlatformType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Mode5PlatformType.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/Mode5Reply.java b/src-generated/edu/nps/moves/dis7/enumerations/Mode5Reply.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/Mode5Reply.java
rename to src-generated/edu/nps/moves/dis7/enumerations/Mode5Reply.java
index 8b905302c8fe3f274531a0bbe96664672d332d6e..6935f3b47285014a3f1243e56a6133c592cd28a2 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/Mode5Reply.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Mode5Reply.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/Mode5SAltitudeResolution.java b/src-generated/edu/nps/moves/dis7/enumerations/Mode5SAltitudeResolution.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/Mode5SAltitudeResolution.java
rename to src-generated/edu/nps/moves/dis7/enumerations/Mode5SAltitudeResolution.java
index 319998aa250576b229379d04ea86903f265ee4d0..1138155d7d525526e4008dff250eb95525f2e576 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/Mode5SAltitudeResolution.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Mode5SAltitudeResolution.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/Mode5SquitterType.java b/src-generated/edu/nps/moves/dis7/enumerations/Mode5SquitterType.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/Mode5SquitterType.java
rename to src-generated/edu/nps/moves/dis7/enumerations/Mode5SquitterType.java
index 5552cf4fd33364e42f027a9ec46ef3721c4aaa5d..e6b288604ae0e6e1616c6dcaf11a90273a9beea6 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/Mode5SquitterType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Mode5SquitterType.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/ModeCAltitudeIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/ModeCAltitudeIndicator.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/ModeCAltitudeIndicator.java
rename to src-generated/edu/nps/moves/dis7/enumerations/ModeCAltitudeIndicator.java
index e37501b9ee98c1bdec69f81e3b7b4a530cf89787..9e6184beceec86dd686400eec81b9cbadcdb0a92 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/ModeCAltitudeIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ModeCAltitudeIndicator.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/ModeSInterrogatorIdentifierICType.java b/src-generated/edu/nps/moves/dis7/enumerations/ModeSInterrogatorIdentifierICType.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/ModeSInterrogatorIdentifierICType.java
rename to src-generated/edu/nps/moves/dis7/enumerations/ModeSInterrogatorIdentifierICType.java
index e2a0466e63dd365ad44c484f72b65afbce3b2c67..fb4040dcc1ecc0b595a981b74062724caaaa1c39 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/ModeSInterrogatorIdentifierICType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ModeSInterrogatorIdentifierICType.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/ModeSInterrogatorStatusTransmitState.java b/src-generated/edu/nps/moves/dis7/enumerations/ModeSInterrogatorStatusTransmitState.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/ModeSInterrogatorStatusTransmitState.java
rename to src-generated/edu/nps/moves/dis7/enumerations/ModeSInterrogatorStatusTransmitState.java
index 375e8f76188ace23882237c2708ec365cf6b2eda..7848c5c50b4a1e816706874780c032eb0f4e39fa 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/ModeSInterrogatorStatusTransmitState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ModeSInterrogatorStatusTransmitState.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/ModeSSquitterRecordSource.java b/src-generated/edu/nps/moves/dis7/enumerations/ModeSSquitterRecordSource.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/ModeSSquitterRecordSource.java
rename to src-generated/edu/nps/moves/dis7/enumerations/ModeSSquitterRecordSource.java
index fe6c235e668d876eed74eae8da2ccd498c0d379f..65e8e0efe01248a84fd53b2df346218ad7e734c4 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/ModeSSquitterRecordSource.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ModeSSquitterRecordSource.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/ModeSSquitterType.java b/src-generated/edu/nps/moves/dis7/enumerations/ModeSSquitterType.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/ModeSSquitterType.java
rename to src-generated/edu/nps/moves/dis7/enumerations/ModeSSquitterType.java
index d8192a6de93fde5bb587df71287b06af660aa9ac..9f8e7c85d5a6dedc289bf7172b397609571808f0 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/ModeSSquitterType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ModeSSquitterType.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/MunitionAppearance.java b/src-generated/edu/nps/moves/dis7/enumerations/MunitionAppearance.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/MunitionAppearance.java
rename to src-generated/edu/nps/moves/dis7/enumerations/MunitionAppearance.java
index 8163e85aa90b57e91cfa8cd055dfa1547fcfcff7..c0bce6a2b7e7856a87802cc32cf297a57c9c19bd 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/MunitionAppearance.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MunitionAppearance.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/MunitionCapabilities.java b/src-generated/edu/nps/moves/dis7/enumerations/MunitionCapabilities.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/MunitionCapabilities.java
rename to src-generated/edu/nps/moves/dis7/enumerations/MunitionCapabilities.java
index f6b6709737e3d4616b8fd135a77f7da3a0eeafc4..f6f1f337485fd23f4d67d45117ec42104d8881a6 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/MunitionCapabilities.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MunitionCapabilities.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/MunitionCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/MunitionCategory.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/MunitionCategory.java
rename to src-generated/edu/nps/moves/dis7/enumerations/MunitionCategory.java
index b4027ddf90e48aef1a7df0d327d759f8045f0d87..db9a1b2e9b181e20720aa4b8d17d5eed57384372 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/MunitionCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MunitionCategory.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/MunitionDescriptorFuse.java b/src-generated/edu/nps/moves/dis7/enumerations/MunitionDescriptorFuse.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/enumerations/MunitionDescriptorFuse.java
rename to src-generated/edu/nps/moves/dis7/enumerations/MunitionDescriptorFuse.java
index c53f681f55768aad2b24f9ceebe945288d32a022..8bd88ce6753fe7cc8ca73713df2a92221c3a99e6 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/MunitionDescriptorFuse.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MunitionDescriptorFuse.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/MunitionDescriptorWarhead.java b/src-generated/edu/nps/moves/dis7/enumerations/MunitionDescriptorWarhead.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/enumerations/MunitionDescriptorWarhead.java
rename to src-generated/edu/nps/moves/dis7/enumerations/MunitionDescriptorWarhead.java
index b4d7e511070b2b3de23056f42f82fc8b7c2c4201..38df07484ac4e9098fdbbe8078180c7190fbf33a 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/MunitionDescriptorWarhead.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MunitionDescriptorWarhead.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/MunitionDomain.java b/src-generated/edu/nps/moves/dis7/enumerations/MunitionDomain.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/MunitionDomain.java
rename to src-generated/edu/nps/moves/dis7/enumerations/MunitionDomain.java
index b3fb8e3a539b8718698fc8778721d0b51389db84..974cc9e42a8a2ad65956832d906b622192e76439 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/MunitionDomain.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MunitionDomain.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/MunitionExpendableStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/MunitionExpendableStatus.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/MunitionExpendableStatus.java
rename to src-generated/edu/nps/moves/dis7/enumerations/MunitionExpendableStatus.java
index da56fdad1e812083aea7d2608d29cc4b77708ba4..e2f05d0f8d6fb3a0af7affe77d1113e9bb49eb93 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/MunitionExpendableStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/MunitionExpendableStatus.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/NETIDRecordFrequencyTable.java b/src-generated/edu/nps/moves/dis7/enumerations/NETIDRecordFrequencyTable.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/NETIDRecordFrequencyTable.java
rename to src-generated/edu/nps/moves/dis7/enumerations/NETIDRecordFrequencyTable.java
index 8b1836fb1261253e02ba5b8e2223773dd252c911..e301e105f011736de4d17b49ea26dcd7d9dee5a6 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/NETIDRecordFrequencyTable.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/NETIDRecordFrequencyTable.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/NETIDRecordMode.java b/src-generated/edu/nps/moves/dis7/enumerations/NETIDRecordMode.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/NETIDRecordMode.java
rename to src-generated/edu/nps/moves/dis7/enumerations/NETIDRecordMode.java
index 2d1c7541629adccdb9d1a4909afc89557eed4823..cc2024d3cb030b70ab0416c916a5cc5bda7ebb4a 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/NETIDRecordMode.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/NETIDRecordMode.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/NavigationSource.java b/src-generated/edu/nps/moves/dis7/enumerations/NavigationSource.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/NavigationSource.java
rename to src-generated/edu/nps/moves/dis7/enumerations/NavigationSource.java
index 35924321019d050e788a908081a1fc53610a5180..1dbad3cedd6f0358629e5f07854e5e864152a14e 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/NavigationSource.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/NavigationSource.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/NonHumanLifeFormsAppearance.java b/src-generated/edu/nps/moves/dis7/enumerations/NonHumanLifeFormsAppearance.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/NonHumanLifeFormsAppearance.java
rename to src-generated/edu/nps/moves/dis7/enumerations/NonHumanLifeFormsAppearance.java
index 59e3958738698b8f4a63ef64c1b100851a7a395d..d55b63e5b661ba2d4bbf10e0c2dfa49ae412f87c 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/NonHumanLifeFormsAppearance.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/NonHumanLifeFormsAppearance.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/ObjectKind.java b/src-generated/edu/nps/moves/dis7/enumerations/ObjectKind.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/ObjectKind.java
rename to src-generated/edu/nps/moves/dis7/enumerations/ObjectKind.java
index 088db787b29ff378eb66c851c0cc86ffdc94959e..ee2906234ae5e1f58259a67a0722f4dc6d36d4be 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/ObjectKind.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ObjectKind.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/ObjectStateAppearanceGeneral.java b/src-generated/edu/nps/moves/dis7/enumerations/ObjectStateAppearanceGeneral.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/ObjectStateAppearanceGeneral.java
rename to src-generated/edu/nps/moves/dis7/enumerations/ObjectStateAppearanceGeneral.java
index 52e6019eca63463f2d111d102ddeacad810910e6..df5bf00b078847409dd4e303630652f82fb2f70e 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/ObjectStateAppearanceGeneral.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ObjectStateAppearanceGeneral.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/ObjectStateModificationArealObject.java b/src-generated/edu/nps/moves/dis7/enumerations/ObjectStateModificationArealObject.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/ObjectStateModificationArealObject.java
rename to src-generated/edu/nps/moves/dis7/enumerations/ObjectStateModificationArealObject.java
index 0a1f1d5cb3ac406e213c256a58fa24cd81bbeeda..21a73000b49c932c3343efc0f4d27aaff1948557 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/ObjectStateModificationArealObject.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ObjectStateModificationArealObject.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/ObjectStateModificationLinearObject.java b/src-generated/edu/nps/moves/dis7/enumerations/ObjectStateModificationLinearObject.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/ObjectStateModificationLinearObject.java
rename to src-generated/edu/nps/moves/dis7/enumerations/ObjectStateModificationLinearObject.java
index a378f15e16aadd3fbf02eae34883ce8b83327c0d..c12f921f4e4cd45bdfb0af247d334b5de1a7fbd7 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/ObjectStateModificationLinearObject.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ObjectStateModificationLinearObject.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/ObjectStateModificationPointObject.java b/src-generated/edu/nps/moves/dis7/enumerations/ObjectStateModificationPointObject.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/ObjectStateModificationPointObject.java
rename to src-generated/edu/nps/moves/dis7/enumerations/ObjectStateModificationPointObject.java
index f2ec4e0ff1dd6822d7db0ab4596cda79dc8eb63f..2ce27a6ed4ad2d499ddd0bd8fd6ab03f842f47b6 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/ObjectStateModificationPointObject.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ObjectStateModificationPointObject.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/OwnershipStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/OwnershipStatus.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/OwnershipStatus.java
rename to src-generated/edu/nps/moves/dis7/enumerations/OwnershipStatus.java
index 8b0794bf4a6b6e103ccb13abe4319171bd01eca8..304ded0165e350ca5750a6067f63fd90556efcde 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/OwnershipStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/OwnershipStatus.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/Parachute.java b/src-generated/edu/nps/moves/dis7/enumerations/Parachute.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/Parachute.java
rename to src-generated/edu/nps/moves/dis7/enumerations/Parachute.java
index 2e9413cef5b7fb17519e83f06d002113bf54bacb..30087ac5b9fcad7295f5eb5abe27f30fbf851e3b 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/Parachute.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Parachute.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/PhysicalAssociationTypeGroups.java b/src-generated/edu/nps/moves/dis7/enumerations/PhysicalAssociationTypeGroups.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/PhysicalAssociationTypeGroups.java
rename to src-generated/edu/nps/moves/dis7/enumerations/PhysicalAssociationTypeGroups.java
index 610b11ece344b9a4eadac171e8b53b2c0ee384f9..2e93043d847238f30f31ce5df1220f5e064675e7 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/PhysicalAssociationTypeGroups.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PhysicalAssociationTypeGroups.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/PlatformAirCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCategory.java
similarity index 73%
rename from src-generated/edu/nps/moves/dis/enumerations/PlatformAirCategory.java
rename to src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCategory.java
index 0173b8e39700b59ac5aa80c759eed2e5475f5ebd..831187b7c73567161b2ed99366486cece2a7e598 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/PlatformAirCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCategory.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
@@ -52,21 +52,21 @@ public enum PlatformAirCategory implements Category
UNMANNED (50, "Unmanned"),
/** Non-Combatant Commercial Aircraft */
NON_COMBATANT_COMMERCIAL_AIRCRAFT (57, "Non-Combatant Commercial Aircraft"),
- /** PlatformAirCivilianUltralightNonrigidWingAircraftSubcategories */ CIVILIAN_ULTRALIGHT_AIRCRAFT_NON_RIGID_WING (80, "Civilian Ultralight Aircraft, Non-rigid Wing"),
- /** PlatformAirCivilianUltralightRigidWingAircraftSubcategories */ CIVILIAN_ULTRALIGHT_AIRCRAFT_RIGID_WING (81, "Civilian Ultralight Aircraft, Rigid Wing"),
- /** PlatformAirCivilianGliderSubcategories */ CIVILIAN_FIXED_WING_AIRCRAFT_GLIDER (83, "Civilian Fixed Wing Aircraft, Glider"),
- /** PlatformAirCivilianFixedWingAircraftSubcategories */ CIVILIAN_FIXED_WING_AIRCRAFT_LIGHT_SPORT_UP_TO_1320_LBS_600_KG (84, "Civilian Fixed Wing Aircraft, Light Sport (up to 1320 lbs / 600 kg)"),
- /** PlatformAirCivilianFixedWingAircraftSubcategories */ CIVILIAN_FIXED_WING_AIRCRAFT_SMALL_UP_TO_12_500_LBS_5_670_KG (85, "Civilian Fixed Wing Aircraft, Small (up to 12,500 lbs / 5,670 kg)"),
- /** PlatformAirCivilianFixedWingAircraftSubcategories */ CIVILIAN_FIXED_WING_AIRCRAFT_MEDIUM_UP_TO_41_000_LBS_18_597_KG (86, "Civilian Fixed Wing Aircraft, Medium (up to 41,000 lbs / 18,597 kg)"),
- /** PlatformAirCivilianFixedWingAircraftSubcategories */ CIVILIAN_FIXED_WING_AIRCRAFT_LARGE_UP_TO_255_000_LBS_115_666_KG (87, "Civilian Fixed Wing Aircraft, Large (up to 255,000 lbs / 115,666 kg)"),
- /** PlatformAirCivilianFixedWingAircraftSubcategories */ CIVILIAN_FIXED_WING_AIRCRAFT_HEAVY_ABOVE_255_000_LBS_115_666_KG (88, "Civilian Fixed Wing Aircraft, Heavy (above 255,000 lbs / 115,666 kg)"),
- /** PlatformAirCivilianHelicopterSubcategories */ CIVILIAN_HELICOPTER_SMALL_UP_TO_7_000_LBS_3_175_KG (90, "Civilian Helicopter, Small (up to 7,000 lbs / 3,175 kg)"),
- /** PlatformAirCivilianHelicopterSubcategories */ CIVILIAN_HELICOPTER_MEDIUM_UP_TO_20_000_LBS_9_072_KG (91, "Civilian Helicopter, Medium (up to 20,000 lbs / 9,072 kg)"),
- /** PlatformAirCivilianHelicopterSubcategories */ CIVILIAN_HELICOPTER_LARGE_ABOVE_20_000_LBS_9_072_KG (92, "Civilian Helicopter, Large (above 20,000 lbs / 9,072 kg)"),
+ /** PlatformAirCivilianUltralightNonrigidWingAircraftSubcategories */ CIVILIAN_ULTRALIGHT_AIRCRAFT_NON_RIGID_WING_2 (80, "Civilian Ultralight Aircraft, Non-rigid Wing"),
+ /** PlatformAirCivilianUltralightRigidWingAircraftSubcategories */ CIVILIAN_ULTRALIGHT_AIRCRAFT_RIGID_WING_2 (81, "Civilian Ultralight Aircraft, Rigid Wing"),
+ /** PlatformAirCivilianGliderSubcategories */ CIVILIAN_FIXED_WING_AIRCRAFT_GLIDER_2 (83, "Civilian Fixed Wing Aircraft, Glider"),
+ /** PlatformAirCivilianFixedWingAircraftSubcategories */ CIVILIAN_FIXED_WING_AIRCRAFT_LIGHT_SPORT_UP_TO_1320_LBS_600_KG_2 (84, "Civilian Fixed Wing Aircraft, Light Sport (up to 1320 lbs / 600 kg)"),
+ /** PlatformAirCivilianFixedWingAircraftSubcategories */ CIVILIAN_FIXED_WING_AIRCRAFT_SMALL_UP_TO_12_500_LBS_5_670_KG_2 (85, "Civilian Fixed Wing Aircraft, Small (up to 12,500 lbs / 5,670 kg)"),
+ /** PlatformAirCivilianFixedWingAircraftSubcategories */ CIVILIAN_FIXED_WING_AIRCRAFT_MEDIUM_UP_TO_41_000_LBS_18_597_KG_2 (86, "Civilian Fixed Wing Aircraft, Medium (up to 41,000 lbs / 18,597 kg)"),
+ /** PlatformAirCivilianFixedWingAircraftSubcategories */ CIVILIAN_FIXED_WING_AIRCRAFT_LARGE_UP_TO_255_000_LBS_115_666_KG_2 (87, "Civilian Fixed Wing Aircraft, Large (up to 255,000 lbs / 115,666 kg)"),
+ /** PlatformAirCivilianFixedWingAircraftSubcategories */ CIVILIAN_FIXED_WING_AIRCRAFT_HEAVY_ABOVE_255_000_LBS_115_666_KG_2 (88, "Civilian Fixed Wing Aircraft, Heavy (above 255,000 lbs / 115,666 kg)"),
+ /** PlatformAirCivilianHelicopterSubcategories */ CIVILIAN_HELICOPTER_SMALL_UP_TO_7_000_LBS_3_175_KG_2 (90, "Civilian Helicopter, Small (up to 7,000 lbs / 3,175 kg)"),
+ /** PlatformAirCivilianHelicopterSubcategories */ CIVILIAN_HELICOPTER_MEDIUM_UP_TO_20_000_LBS_9_072_KG_2 (91, "Civilian Helicopter, Medium (up to 20,000 lbs / 9,072 kg)"),
+ /** PlatformAirCivilianHelicopterSubcategories */ CIVILIAN_HELICOPTER_LARGE_ABOVE_20_000_LBS_9_072_KG_2 (92, "Civilian Helicopter, Large (above 20,000 lbs / 9,072 kg)"),
/** Civilian Autogyro */
CIVILIAN_AUTOGYRO (93, "Civilian Autogyro"),
- /** PlatformAirCivilianLighterthanAirBalloonSubcategories */ CIVILIAN_LIGHTER_THAN_AIR_BALLOON (100, "Civilian Lighter than Air, Balloon"),
- /** PlatformAirCivilianLighterthanAirAirshipSubcategories */ CIVILIAN_LIGHTER_THAN_AIR_AIRSHIP (101, "Civilian Lighter than Air, Airship");
+ /** PlatformAirCivilianLighterthanAirBalloonSubcategories */ CIVILIAN_LIGHTER_THAN_AIR_BALLOON_2 (100, "Civilian Lighter than Air, Balloon"),
+ /** PlatformAirCivilianLighterthanAirAirshipSubcategories */ CIVILIAN_LIGHTER_THAN_AIR_AIRSHIP_2 (101, "Civilian Lighter than Air, Airship");
private int value;
private final String description;
diff --git a/src-generated/edu/nps/moves/dis/enumerations/PlatformAirCivilianFixedWingAircraftSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianFixedWingAircraftSubcategories.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/PlatformAirCivilianFixedWingAircraftSubcategories.java
rename to src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianFixedWingAircraftSubcategories.java
index 7ae0ee17e640354692da78d9b366771e87c735f2..3be486b0c50e5cadfff3cec85f0d980d63615979 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/PlatformAirCivilianFixedWingAircraftSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianFixedWingAircraftSubcategories.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/PlatformAirCivilianGliderSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianGliderSubcategories.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/PlatformAirCivilianGliderSubcategories.java
rename to src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianGliderSubcategories.java
index 91425d9c7e9aeeaed0348ba1f1cd550d427c17f4..a245f3df70b00563423472c90ef9943b6290d8e1 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/PlatformAirCivilianGliderSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianGliderSubcategories.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/PlatformAirCivilianHelicopterSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianHelicopterSubcategories.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/PlatformAirCivilianHelicopterSubcategories.java
rename to src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianHelicopterSubcategories.java
index 0be063ecadfd720afa04dee7ba98a2eabec4e37b..8adcdc71239e1727d625d9be9dad99c3398be612 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/PlatformAirCivilianHelicopterSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianHelicopterSubcategories.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/PlatformAirCivilianLighterthanAirAirshipSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianLighterthanAirAirshipSubcategories.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/PlatformAirCivilianLighterthanAirAirshipSubcategories.java
rename to src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianLighterthanAirAirshipSubcategories.java
index 782af2ca929c6bd77302f83b464c36edb8242a13..ea003eb8c76c3c4e2e72d9b8ca7dc374a87f40d1 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/PlatformAirCivilianLighterthanAirAirshipSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianLighterthanAirAirshipSubcategories.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/PlatformAirCivilianLighterthanAirBalloonSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianLighterthanAirBalloonSubcategories.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/PlatformAirCivilianLighterthanAirBalloonSubcategories.java
rename to src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianLighterthanAirBalloonSubcategories.java
index 4da0587e51c80d9a93c1bac936a268b61162b4fa..c4ce6d784f2554758caed1fdf96999028e3c11fa 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/PlatformAirCivilianLighterthanAirBalloonSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianLighterthanAirBalloonSubcategories.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/PlatformAirCivilianUltralightNonrigidWingAircraftSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianUltralightNonrigidWingAircraftSubcategories.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/PlatformAirCivilianUltralightNonrigidWingAircraftSubcategories.java
rename to src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianUltralightNonrigidWingAircraftSubcategories.java
index 85f190b690e11fae1a5032e86d19b2bd5198783a..33c27db4d7b13b8cf2f3d523529e595881c4da83 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/PlatformAirCivilianUltralightNonrigidWingAircraftSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianUltralightNonrigidWingAircraftSubcategories.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/PlatformAirCivilianUltralightRigidWingAircraftSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianUltralightRigidWingAircraftSubcategories.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/PlatformAirCivilianUltralightRigidWingAircraftSubcategories.java
rename to src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianUltralightRigidWingAircraftSubcategories.java
index 6101ce19b450bfbdac764bb59857d2be3b328f44..b661f42b19865e2efab08fc6c73ff3db1e0f857a 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/PlatformAirCivilianUltralightRigidWingAircraftSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformAirCivilianUltralightRigidWingAircraftSubcategories.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/PlatformDomain.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformDomain.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/PlatformDomain.java
rename to src-generated/edu/nps/moves/dis7/enumerations/PlatformDomain.java
index c8a0999202d1b60b484fb3175116e0adf7fbd728..1dad48134f1ca33b8427341ca10cc97da77a851e 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/PlatformDomain.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformDomain.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/PlatformLandBusSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandBusSubcategories.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/PlatformLandBusSubcategories.java
rename to src-generated/edu/nps/moves/dis7/enumerations/PlatformLandBusSubcategories.java
index 399eff78d69df52f45f33e145e3920260106a73d..c6fb4166dc1b529ca6301ee78a19f9b28a6653b5 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/PlatformLandBusSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandBusSubcategories.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/PlatformLandCarSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandCarSubcategories.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/enumerations/PlatformLandCarSubcategories.java
rename to src-generated/edu/nps/moves/dis7/enumerations/PlatformLandCarSubcategories.java
index 23f484e90252db682832700694dddf2ffde227cb..00f9144e77e2621faec6b8ceaefeb9eda184d87d 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/PlatformLandCarSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandCarSubcategories.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/PlatformLandCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandCategory.java
similarity index 87%
rename from src-generated/edu/nps/moves/dis/enumerations/PlatformLandCategory.java
rename to src-generated/edu/nps/moves/dis7/enumerations/PlatformLandCategory.java
index 0b3f95223b1a66b8757b97b881ea1f0d4380f018..40128ea80e8e59066146ac6659d4bd944649cf10 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/PlatformLandCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandCategory.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
@@ -98,20 +98,20 @@ public enum PlatformLandCategory implements Category
OBSERVATION_POST (40, "Observation Post"),
/** Unmanned */
UNMANNED (50, "Unmanned"),
- /** PlatformLandMotorcycleSubcategories */ MOTORCYCLE (80, "Motorcycle"),
- /** PlatformLandCarSubcategories */ CAR (81, "Car"),
- /** PlatformLandBusSubcategories */ BUS (82, "Bus"),
- /** PlatformLandSingleUnitCargoTruckSubcategories */ SINGLE_UNIT_CARGO_TRUCK (83, "Single Unit Cargo Truck"),
- /** PlatformLandSingleUnitUtilityEmergencyTruckSubcategories */ SINGLE_UNIT_UTILITY_EMERGENCY_TRUCK (84, "Single Unit Utility/Emergency Truck"),
- /** PlatformLandMultipleUnitCargoTruckSubcategories */ MULTIPLE_UNIT_CARGO_TRUCK (85, "Multiple Unit Cargo Truck"),
- /** PlatformLandMultipleUnitUtilityEmergencyTruckSubcategories */ MULTIPLE_UNIT_UTILITY_EMERGENCY_TRUCK (86, "Multiple Unit Utility/Emergency Truck"),
- /** PlatformLandConstructionSpecialtyVehicleSubcategories */ CONSTRUCTION_SPECIALTY_VEHICLE (87, "Construction Specialty Vehicle"),
- /** PlatformLandFarmSpecialtyVehicleSubcategories */ FARM_SPECIALTY_VEHICLE (88, "Farm Specialty Vehicle"),
- /** PlatformLandTrailerSubcategories */ TRAILER (89, "Trailer"),
- /** PlatformLandRecreationalSubcategories */ RECREATIONAL (90, "Recreational"),
- /** PlatformLandNonmotorizedSubcategories */ NON_MOTORIZED (91, "Non-motorized"),
- /** PlatformLandTrainsSubcategories */ TRAINS (92, "Trains"),
- /** PlatformLandUtilityEmergencyCarSubcategories */ UTILITY_EMERGENCY_CAR (93, "Utility/Emergency Car");
+ /** PlatformLandMotorcycleSubcategories */ MOTORCYCLE_2 (80, "Motorcycle"),
+ /** PlatformLandCarSubcategories */ CAR_2 (81, "Car"),
+ /** PlatformLandBusSubcategories */ BUS_2 (82, "Bus"),
+ /** PlatformLandSingleUnitCargoTruckSubcategories */ SINGLE_UNIT_CARGO_TRUCK_2 (83, "Single Unit Cargo Truck"),
+ /** PlatformLandSingleUnitUtilityEmergencyTruckSubcategories */ SINGLE_UNIT_UTILITY_EMERGENCY_TRUCK_2 (84, "Single Unit Utility/Emergency Truck"),
+ /** PlatformLandMultipleUnitCargoTruckSubcategories */ MULTIPLE_UNIT_CARGO_TRUCK_2 (85, "Multiple Unit Cargo Truck"),
+ /** PlatformLandMultipleUnitUtilityEmergencyTruckSubcategories */ MULTIPLE_UNIT_UTILITY_EMERGENCY_TRUCK_2 (86, "Multiple Unit Utility/Emergency Truck"),
+ /** PlatformLandConstructionSpecialtyVehicleSubcategories */ CONSTRUCTION_SPECIALTY_VEHICLE_2 (87, "Construction Specialty Vehicle"),
+ /** PlatformLandFarmSpecialtyVehicleSubcategories */ FARM_SPECIALTY_VEHICLE_2 (88, "Farm Specialty Vehicle"),
+ /** PlatformLandTrailerSubcategories */ TRAILER_2 (89, "Trailer"),
+ /** PlatformLandRecreationalSubcategories */ RECREATIONAL_2 (90, "Recreational"),
+ /** PlatformLandNonmotorizedSubcategories */ NON_MOTORIZED_2 (91, "Non-motorized"),
+ /** PlatformLandTrainsSubcategories */ TRAINS_2 (92, "Trains"),
+ /** PlatformLandUtilityEmergencyCarSubcategories */ UTILITY_EMERGENCY_CAR_2 (93, "Utility/Emergency Car");
private int value;
private final String description;
diff --git a/src-generated/edu/nps/moves/dis/enumerations/PlatformLandConstructionSpecialtyVehicleSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandConstructionSpecialtyVehicleSubcategories.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/PlatformLandConstructionSpecialtyVehicleSubcategories.java
rename to src-generated/edu/nps/moves/dis7/enumerations/PlatformLandConstructionSpecialtyVehicleSubcategories.java
index 651ea5390efc359151068e2c71d7ad02f5fbe7b1..4d319111006a52368b3e735f89fd5712a908cc34 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/PlatformLandConstructionSpecialtyVehicleSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandConstructionSpecialtyVehicleSubcategories.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/PlatformLandFarmSpecialtyVehicleSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandFarmSpecialtyVehicleSubcategories.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/PlatformLandFarmSpecialtyVehicleSubcategories.java
rename to src-generated/edu/nps/moves/dis7/enumerations/PlatformLandFarmSpecialtyVehicleSubcategories.java
index 3bb8f99efb1bf29e7799eb79343ba3514cef0f88..beee0226489bc42e61425c1ae4aa0cee34307f40 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/PlatformLandFarmSpecialtyVehicleSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandFarmSpecialtyVehicleSubcategories.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/PlatformLandMotorcycleSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMotorcycleSubcategories.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/PlatformLandMotorcycleSubcategories.java
rename to src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMotorcycleSubcategories.java
index 0720c5c265556775c245f1f688edd25ff5ec4269..ff0fb397376dec1f5f214351ad3ca1eef607faf6 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/PlatformLandMotorcycleSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMotorcycleSubcategories.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/PlatformLandMultipleUnitCargoTruckSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMultipleUnitCargoTruckSubcategories.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/PlatformLandMultipleUnitCargoTruckSubcategories.java
rename to src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMultipleUnitCargoTruckSubcategories.java
index 0f9070fa680e27c9a70fd7b4427222e5b546508e..bd1f267290eb10df8b1406f0373f0b2c391dc5d5 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/PlatformLandMultipleUnitCargoTruckSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMultipleUnitCargoTruckSubcategories.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/PlatformLandMultipleUnitUtilityEmergencyTruckSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMultipleUnitUtilityEmergencyTruckSubcategories.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/PlatformLandMultipleUnitUtilityEmergencyTruckSubcategories.java
rename to src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMultipleUnitUtilityEmergencyTruckSubcategories.java
index eecdf208fc39a2d10d8f525f06d2c5ef63fca607..cb74483be3691c01347d09df6d8379502262a7d4 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/PlatformLandMultipleUnitUtilityEmergencyTruckSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandMultipleUnitUtilityEmergencyTruckSubcategories.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/PlatformLandNonmotorizedSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandNonmotorizedSubcategories.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/PlatformLandNonmotorizedSubcategories.java
rename to src-generated/edu/nps/moves/dis7/enumerations/PlatformLandNonmotorizedSubcategories.java
index 2bb28de6db45ef6abe43d0946d832d46e049f078..7a2e215e06f6bf7fa540eb48a702bf56d8de7395 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/PlatformLandNonmotorizedSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandNonmotorizedSubcategories.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/PlatformLandRecreationalSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandRecreationalSubcategories.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/PlatformLandRecreationalSubcategories.java
rename to src-generated/edu/nps/moves/dis7/enumerations/PlatformLandRecreationalSubcategories.java
index a31b3685875f748a9885029650b1d3172953cbb9..b84963bd8fc4257fc997056165d8f9f6437aeefa 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/PlatformLandRecreationalSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandRecreationalSubcategories.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/PlatformLandSingleUnitCargoTruckSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandSingleUnitCargoTruckSubcategories.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/PlatformLandSingleUnitCargoTruckSubcategories.java
rename to src-generated/edu/nps/moves/dis7/enumerations/PlatformLandSingleUnitCargoTruckSubcategories.java
index 5113a7ce890d98a196836de0ad42b9cd8b785f53..f8f517ce368b2ebc561bc0d47d1b11cf9ecc388c 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/PlatformLandSingleUnitCargoTruckSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandSingleUnitCargoTruckSubcategories.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/PlatformLandSingleUnitUtilityEmergencyTruckSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandSingleUnitUtilityEmergencyTruckSubcategories.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/PlatformLandSingleUnitUtilityEmergencyTruckSubcategories.java
rename to src-generated/edu/nps/moves/dis7/enumerations/PlatformLandSingleUnitUtilityEmergencyTruckSubcategories.java
index a65c85f77a9f8d46b68928c8a19e993256a9cd98..d1a6f4a0020a9e12ca4f260d1c542f49779784d3 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/PlatformLandSingleUnitUtilityEmergencyTruckSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandSingleUnitUtilityEmergencyTruckSubcategories.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/PlatformLandTrailerSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandTrailerSubcategories.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/PlatformLandTrailerSubcategories.java
rename to src-generated/edu/nps/moves/dis7/enumerations/PlatformLandTrailerSubcategories.java
index 32f4a8d3af928aef19be8286679f5ed3d221eadb..5d99ba96a4f75759a89d622b4ba422cbeadf5184 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/PlatformLandTrailerSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandTrailerSubcategories.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/PlatformLandTrainsSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandTrainsSubcategories.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/PlatformLandTrainsSubcategories.java
rename to src-generated/edu/nps/moves/dis7/enumerations/PlatformLandTrainsSubcategories.java
index c71fa22b18063731214847c8f4537c5cd7c8ead9..5499a65c8cefbe5d344e0ee679f8382f1cb36b0d 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/PlatformLandTrainsSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandTrainsSubcategories.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/PlatformLandUtilityEmergencyCarSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandUtilityEmergencyCarSubcategories.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/PlatformLandUtilityEmergencyCarSubcategories.java
rename to src-generated/edu/nps/moves/dis7/enumerations/PlatformLandUtilityEmergencyCarSubcategories.java
index 2d9b159955795e23ea045934209a26d0402b2b13..990e6169fb204f497160424f037f1882fe745b5d 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/PlatformLandUtilityEmergencyCarSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformLandUtilityEmergencyCarSubcategories.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/PlatformSpaceCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSpaceCategory.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/PlatformSpaceCategory.java
rename to src-generated/edu/nps/moves/dis7/enumerations/PlatformSpaceCategory.java
index ce9798911c411aceb302802d245ccf605a2d2277..5b7dae050d8a255fd5faf119a52fda16a61e8618 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/PlatformSpaceCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSpaceCategory.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/PlatformSubsurfaceCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCategory.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/PlatformSubsurfaceCategory.java
rename to src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCategory.java
index 24777c65e8fed1f326b7f6ad368203e6b8bebd78..fbe28ecbcefb10c4f4e51c8f35ac10e608d548eb 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/PlatformSubsurfaceCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCategory.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/PlatformSubsurfaceCivilianSemiSubmersiblesSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSemiSubmersiblesSubcategories.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/PlatformSubsurfaceCivilianSemiSubmersiblesSubcategories.java
rename to src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSemiSubmersiblesSubcategories.java
index 3eb5a5c8d0b582747e83894af0188592b6b7b668..793875df02555f69b5f7672d42d651688ecfcffc 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/PlatformSubsurfaceCivilianSemiSubmersiblesSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSemiSubmersiblesSubcategories.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/PlatformSubsurfaceCivilianSubmarineSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSubmarineSubcategories.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/PlatformSubsurfaceCivilianSubmarineSubcategories.java
rename to src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSubmarineSubcategories.java
index 8189ad3cc40642d62a6d7b24595cb393598ab209..deceb2f4f28199982f5ee7811c8a882af34fd6b8 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/PlatformSubsurfaceCivilianSubmarineSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSubmarineSubcategories.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/PlatformSubsurfaceCivilianSubmersibleSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSubmersibleSubcategories.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/PlatformSubsurfaceCivilianSubmersibleSubcategories.java
rename to src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSubmersibleSubcategories.java
index 5f6885e46bc3f6d757a82dfc026c0816fd59c7c7..1e03634f342b315a1dd77eeba51cf1061eca29bc 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/PlatformSubsurfaceCivilianSubmersibleSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSubsurfaceCivilianSubmersibleSubcategories.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/PlatformSurfaceCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceCategory.java
similarity index 91%
rename from src-generated/edu/nps/moves/dis/enumerations/PlatformSurfaceCategory.java
rename to src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceCategory.java
index 66218b10a7522b41c5cd4f05af8a2bc42ec10824..8fe47694aabbe849717b7bc2e5e4f5f98acd847e 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/PlatformSurfaceCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceCategory.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
@@ -88,17 +88,17 @@ public enum PlatformSurfaceCategory implements Category
COAST_GUARD_BOATS (63, "Coast Guard Boats"),
/** Fast Attack Craft */
FAST_ATTACK_CRAFT (64, "Fast Attack Craft"),
- /** PlatformSurfacePassengerVesselSubcategories */ PASSENGER_VESSEL_GROUP_1_MERCHANT (80, "Passenger Vessel (Group 1 Merchant)"),
- /** PlatformSurfaceDryCargoShipSubcategories */ DRY_CARGO_SHIP_GROUP_2_MERCHANT (81, "Dry Cargo Ship (Group 2 Merchant)"),
- /** PlatformSurfaceTankerSubcategories */ TANKER_GROUP_3_MERCHANT (82, "Tanker (Group 3 Merchant)"),
- /** PlatformSurfaceSupportVesselSubcategories */ SUPPORT_VESSEL (83, "Support Vessel"),
- /** PlatformSurfacePrivateMotorboatSubcategories */ PRIVATE_MOTORBOAT (84, "Private Motorboat"),
- /** PlatformSurfacePrivateSailboatSubcategories */ PRIVATE_SAILBOAT (85, "Private Sailboat"),
- /** PlatformSurfaceFishingVesselSubcategories */ FISHING_VESSEL (86, "Fishing Vessel"),
- /** PlatformSurfaceOtherVesselsSubcategories */ OTHER_VESSELS (87, "Other Vessels"),
+ /** PlatformSurfacePassengerVesselSubcategories */ PASSENGER_VESSEL_GROUP_1_MERCHANT_2 (80, "Passenger Vessel (Group 1 Merchant)"),
+ /** PlatformSurfaceDryCargoShipSubcategories */ DRY_CARGO_SHIP_GROUP_2_MERCHANT_2 (81, "Dry Cargo Ship (Group 2 Merchant)"),
+ /** PlatformSurfaceTankerSubcategories */ TANKER_GROUP_3_MERCHANT_2 (82, "Tanker (Group 3 Merchant)"),
+ /** PlatformSurfaceSupportVesselSubcategories */ SUPPORT_VESSEL_2 (83, "Support Vessel"),
+ /** PlatformSurfacePrivateMotorboatSubcategories */ PRIVATE_MOTORBOAT_2 (84, "Private Motorboat"),
+ /** PlatformSurfacePrivateSailboatSubcategories */ PRIVATE_SAILBOAT_2 (85, "Private Sailboat"),
+ /** PlatformSurfaceFishingVesselSubcategories */ FISHING_VESSEL_2 (86, "Fishing Vessel"),
+ /** PlatformSurfaceOtherVesselsSubcategories */ OTHER_VESSELS_2 (87, "Other Vessels"),
/** Search and Rescue Vessels */
SEARCH_AND_RESCUE_VESSELS (100, "Search and Rescue Vessels"),
- /** LifeSavingEquipment */ LIFE_SAVING_EQUIPMENT (101, "Life-Saving Equipment");
+ /** LifeSavingEquipment */ LIFE_SAVING_EQUIPMENT_2 (101, "Life-Saving Equipment");
private int value;
private final String description;
diff --git a/src-generated/edu/nps/moves/dis/enumerations/PlatformSurfaceDryCargoShipSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceDryCargoShipSubcategories.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/PlatformSurfaceDryCargoShipSubcategories.java
rename to src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceDryCargoShipSubcategories.java
index ca32378d90268350e35474059789636e14c93299..0387da444829816d34ed966778565a7325e16c4a 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/PlatformSurfaceDryCargoShipSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceDryCargoShipSubcategories.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/PlatformSurfaceFishingVesselSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceFishingVesselSubcategories.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/PlatformSurfaceFishingVesselSubcategories.java
rename to src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceFishingVesselSubcategories.java
index e4cfdc9fe4ce28ef45a7b4eaf7ba4cc055768cf4..ce5907872a5ee3edaa24f4e2b541046f5fa393f0 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/PlatformSurfaceFishingVesselSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceFishingVesselSubcategories.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/PlatformSurfaceOtherVesselsSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceOtherVesselsSubcategories.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/PlatformSurfaceOtherVesselsSubcategories.java
rename to src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceOtherVesselsSubcategories.java
index 0272fa289a52fb506a100ade2c736415b73dd3c1..1bb812ea7842d54239c02444b4eb74f7ad222452 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/PlatformSurfaceOtherVesselsSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceOtherVesselsSubcategories.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/PlatformSurfacePassengerVesselSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePassengerVesselSubcategories.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/PlatformSurfacePassengerVesselSubcategories.java
rename to src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePassengerVesselSubcategories.java
index 17459387fb0949c3cd84f95505422b6186771c98..aeadd313a51f8161344673eecf3b7e346d752472 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/PlatformSurfacePassengerVesselSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePassengerVesselSubcategories.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/PlatformSurfacePrivateMotorboatSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePrivateMotorboatSubcategories.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/PlatformSurfacePrivateMotorboatSubcategories.java
rename to src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePrivateMotorboatSubcategories.java
index 524c6d3c5f637bf214a03fe71b110b902ffd7773..02eff228b28a2a1f039f728edb130450702378ce 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/PlatformSurfacePrivateMotorboatSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePrivateMotorboatSubcategories.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/PlatformSurfacePrivateSailboatSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePrivateSailboatSubcategories.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/PlatformSurfacePrivateSailboatSubcategories.java
rename to src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePrivateSailboatSubcategories.java
index 415f77f28ccce8373bef40915c1b585d23ec0488..c2cc79922a9c2662f6cc7765ac941e61ac83bc9c 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/PlatformSurfacePrivateSailboatSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfacePrivateSailboatSubcategories.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/PlatformSurfaceSupportVesselSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceSupportVesselSubcategories.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/PlatformSurfaceSupportVesselSubcategories.java
rename to src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceSupportVesselSubcategories.java
index 41a1057958891b229585293bebb98b0fa042aee9..63c0f2a592b6b8392ad21fd2c93e5917916d7ad3 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/PlatformSurfaceSupportVesselSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceSupportVesselSubcategories.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/PlatformSurfaceTankerSubcategories.java b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceTankerSubcategories.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/PlatformSurfaceTankerSubcategories.java
rename to src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceTankerSubcategories.java
index 3baae1438eb9ab006562e1c3e1de3691410398e7..764d195fa692df4b8f77ffb91b583eda3c77249e 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/PlatformSurfaceTankerSubcategories.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PlatformSurfaceTankerSubcategories.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/PointObjectAppearanceAirGroundBurst.java b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceAirGroundBurst.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/PointObjectAppearanceAirGroundBurst.java
rename to src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceAirGroundBurst.java
index de5f076b1972bf383de1695d2b1b91a47b80450b..1c94a02eda4f1c0d87801d1d170dcac2ed9b4ac3 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/PointObjectAppearanceAirGroundBurst.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceAirGroundBurst.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/PointObjectAppearanceBuildingRubble.java b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceBuildingRubble.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/PointObjectAppearanceBuildingRubble.java
rename to src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceBuildingRubble.java
index e221889a7432f81155a5c88c3a647dd9b838941c..abec15cc6ae7fffbffc96d686f56920222af8629 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/PointObjectAppearanceBuildingRubble.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceBuildingRubble.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/PointObjectAppearanceBuildingStructure.java b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceBuildingStructure.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/PointObjectAppearanceBuildingStructure.java
rename to src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceBuildingStructure.java
index 8757d1f1d23f04fbdab1dfba6103990a11456956..9daf4657d262069ea8b2eba50bd36177ec143301 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/PointObjectAppearanceBuildingStructure.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceBuildingStructure.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/PointObjectAppearanceCrater.java b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceCrater.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/PointObjectAppearanceCrater.java
rename to src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceCrater.java
index f6d195c15820666626308473501757f6562b5fee..c738af7c6822472c9eab0795798c5542899a153d 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/PointObjectAppearanceCrater.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceCrater.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/PointObjectAppearanceDisturbedEarthRoad.java b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceDisturbedEarthRoad.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/PointObjectAppearanceDisturbedEarthRoad.java
rename to src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceDisturbedEarthRoad.java
index b4ce085cd2153e7fd796c76466b9f1322fffb5d9..f54b32f78848fbf34c401dc858cd7661e7395fb9 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/PointObjectAppearanceDisturbedEarthRoad.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceDisturbedEarthRoad.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/PointObjectAppearanceLogCribAbatisEtAl.java b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceLogCribAbatisEtAl.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/PointObjectAppearanceLogCribAbatisEtAl.java
rename to src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceLogCribAbatisEtAl.java
index 6287f627ee0a2640a8c13953c5c6486d8cb5802a..aa2cf21a0fc64a9595fe8e1de82a508fb734ed78 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/PointObjectAppearanceLogCribAbatisEtAl.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceLogCribAbatisEtAl.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/PointObjectAppearancePothole.java b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearancePothole.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/PointObjectAppearancePothole.java
rename to src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearancePothole.java
index 80e166a971e96d55b162d720c155e79b6fd47396..dc9249b658c672319e3acf402182f11ab667504f 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/PointObjectAppearancePothole.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearancePothole.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/PointObjectAppearanceRibbonBridge.java b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceRibbonBridge.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/PointObjectAppearanceRibbonBridge.java
rename to src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceRibbonBridge.java
index 50e2f98da50045e0bdf66f720efa2c3384922821..9f37a570f0b2aaefa9b752758d43d16bf1cac568 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/PointObjectAppearanceRibbonBridge.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceRibbonBridge.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/PointObjectAppearanceStationaryBridgeAndAVLB.java b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceStationaryBridgeAndAVLB.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/PointObjectAppearanceStationaryBridgeAndAVLB.java
rename to src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceStationaryBridgeAndAVLB.java
index d2820aa46864f803cf835f437d32685b86b1a649..237a45bbea0253601f8ac8b03189ca0d76d970be 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/PointObjectAppearanceStationaryBridgeAndAVLB.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceStationaryBridgeAndAVLB.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/PointObjectAppearanceTree.java b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceTree.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/PointObjectAppearanceTree.java
rename to src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceTree.java
index 39068e828d0cfe02a3eae46abb8121c3bebf0301..820126658a517cda8916b44e43f437a2a3653740 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/PointObjectAppearanceTree.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/PointObjectAppearanceTree.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/RadioAppearance.java b/src-generated/edu/nps/moves/dis7/enumerations/RadioAppearance.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/RadioAppearance.java
rename to src-generated/edu/nps/moves/dis7/enumerations/RadioAppearance.java
index e8ff0af2228a3af947d9ce86a9d21fd3866cfcc7..6bd6df5c8450751451ce601baf1e8795273b4f41 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/RadioAppearance.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RadioAppearance.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/RadioCapabilities.java b/src-generated/edu/nps/moves/dis7/enumerations/RadioCapabilities.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/RadioCapabilities.java
rename to src-generated/edu/nps/moves/dis7/enumerations/RadioCapabilities.java
index c6d26d7c34c47c8a62c8c946354ee96f06c76506..b5a0e2569cb5e4dc332f06516673edb630727b10 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/RadioCapabilities.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RadioCapabilities.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/RadioCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/RadioCategory.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/enumerations/RadioCategory.java
rename to src-generated/edu/nps/moves/dis7/enumerations/RadioCategory.java
index c4a1934e7d589ffff86303e1b485a20b2aae5666..1783d6460572dcb7b6d02727469c3ce741808b08 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/RadioCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RadioCategory.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/RadioSubcategory.java b/src-generated/edu/nps/moves/dis7/enumerations/RadioSubcategory.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/RadioSubcategory.java
rename to src-generated/edu/nps/moves/dis7/enumerations/RadioSubcategory.java
index cb4278a2ecafb5cf943b816da419abd77929330c..476f02645d1972b1729ed329714fd75ea3eefad0 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/RadioSubcategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RadioSubcategory.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/ReceiverReceiverState.java b/src-generated/edu/nps/moves/dis7/enumerations/ReceiverReceiverState.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/ReceiverReceiverState.java
rename to src-generated/edu/nps/moves/dis7/enumerations/ReceiverReceiverState.java
index 7e2289c90118b2d8d6fcacfc176b2fcef972e9ca..e5ee6e6732f75795fe9f6e93b42ebacbb39049a6 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/ReceiverReceiverState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ReceiverReceiverState.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/RecordQueryREventType.java b/src-generated/edu/nps/moves/dis7/enumerations/RecordQueryREventType.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/RecordQueryREventType.java
rename to src-generated/edu/nps/moves/dis7/enumerations/RecordQueryREventType.java
index 0411f217c5303511f0c5c3debe3cdea6a0f17135..421d3ad733071b76ffce67915bcd408079786a58 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/RecordQueryREventType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RecordQueryREventType.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/RecordREventType.java b/src-generated/edu/nps/moves/dis7/enumerations/RecordREventType.java
similarity index 95%
rename from src-generated/edu/nps/moves/dis/enumerations/RecordREventType.java
rename to src-generated/edu/nps/moves/dis7/enumerations/RecordREventType.java
index 3f21ca59410937ffaf150b41edc7c378ba9a154d..e14b55d6997dab9e18bfdb0d87b89948d7bd3bb1 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/RecordREventType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RecordREventType.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/RepairCompleteRepair.java b/src-generated/edu/nps/moves/dis7/enumerations/RepairCompleteRepair.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/enumerations/RepairCompleteRepair.java
rename to src-generated/edu/nps/moves/dis7/enumerations/RepairCompleteRepair.java
index 39af26387753724bb524c4cd59ef3087cbad9680..4d77a08bb9dd299d37b4176848fbe2d01de946dd 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/RepairCompleteRepair.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RepairCompleteRepair.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/RepairGroups.java b/src-generated/edu/nps/moves/dis7/enumerations/RepairGroups.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/RepairGroups.java
rename to src-generated/edu/nps/moves/dis7/enumerations/RepairGroups.java
index 04fa3b91645ec186fcabd14f95f6c2cb435724a5..9e77cdf010c4b3460303614bb0e348d0152dc588 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/RepairGroups.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RepairGroups.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/RepairResponseRepairResult.java b/src-generated/edu/nps/moves/dis7/enumerations/RepairResponseRepairResult.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/RepairResponseRepairResult.java
rename to src-generated/edu/nps/moves/dis7/enumerations/RepairResponseRepairResult.java
index 4185f308ea973a51f83418e9de9b854df2e79c6d..48522bd53b503bd5cd64542b6d8491078c6a43bf 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/RepairResponseRepairResult.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RepairResponseRepairResult.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/ReplyAmplification.java b/src-generated/edu/nps/moves/dis7/enumerations/ReplyAmplification.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/ReplyAmplification.java
rename to src-generated/edu/nps/moves/dis7/enumerations/ReplyAmplification.java
index 699f8da7fbc4a8450e9933d2dae6bf26e1ffd16d..e186519824c74e3ef6d5bae99c5d38a96cd35b09 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/ReplyAmplification.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ReplyAmplification.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/RequiredReliabilityService.java b/src-generated/edu/nps/moves/dis7/enumerations/RequiredReliabilityService.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/RequiredReliabilityService.java
rename to src-generated/edu/nps/moves/dis7/enumerations/RequiredReliabilityService.java
index 280b299e014273580f4bff0ee3c2b2abc7208bb6..d6a8d3a10bf4aa0b8f1b842c638e037fefce409d 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/RequiredReliabilityService.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/RequiredReliabilityService.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/Season.java b/src-generated/edu/nps/moves/dis7/enumerations/Season.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/Season.java
rename to src-generated/edu/nps/moves/dis7/enumerations/Season.java
index c814835b68ad0718e801917ca872c1e53414a67d..6b1340c93e445bc576c5f1032f67ee2fc30d7c62 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/Season.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/Season.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/SensorEmitterAppearance.java b/src-generated/edu/nps/moves/dis7/enumerations/SensorEmitterAppearance.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/SensorEmitterAppearance.java
rename to src-generated/edu/nps/moves/dis7/enumerations/SensorEmitterAppearance.java
index a656252df7067678f83f2f5ffeb04b200211df2b..ad141baa500a054edeadcfa944fbf27034b6edc4 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/SensorEmitterAppearance.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SensorEmitterAppearance.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/SensorEmitterCapabilities.java b/src-generated/edu/nps/moves/dis7/enumerations/SensorEmitterCapabilities.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/SensorEmitterCapabilities.java
rename to src-generated/edu/nps/moves/dis7/enumerations/SensorEmitterCapabilities.java
index f53b7712b29e7ed22825f83e22b063773e2e5f62..4d14209160bc68bf10108f206e59985cc5ce6b17 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/SensorEmitterCapabilities.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SensorEmitterCapabilities.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/SensorEmitterCategory.java b/src-generated/edu/nps/moves/dis7/enumerations/SensorEmitterCategory.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/SensorEmitterCategory.java
rename to src-generated/edu/nps/moves/dis7/enumerations/SensorEmitterCategory.java
index aad5ce2ada109d7eee66cebf1c08dc2bf970bee6..9ad9228a13e45f3fc832de5e7e30390bd52bb2e2 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/SensorEmitterCategory.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SensorEmitterCategory.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/SensorOnOffStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/SensorOnOffStatus.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/SensorOnOffStatus.java
rename to src-generated/edu/nps/moves/dis7/enumerations/SensorOnOffStatus.java
index 1661c5905a31fc67b9bc2bff98beba8f2ba12037..a7de380d8942d0cd74d1a02d0d78e6c3f86f723c 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/SensorOnOffStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SensorOnOffStatus.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/SensorRecordSensorTypeOtherActiveSensors.java b/src-generated/edu/nps/moves/dis7/enumerations/SensorRecordSensorTypeOtherActiveSensors.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/SensorRecordSensorTypeOtherActiveSensors.java
rename to src-generated/edu/nps/moves/dis7/enumerations/SensorRecordSensorTypeOtherActiveSensors.java
index f8d32867df952884dbdd2de876de09d34841ea1d..e00571f770047881a202aa4f7249d3e54c7baf9c 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/SensorRecordSensorTypeOtherActiveSensors.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SensorRecordSensorTypeOtherActiveSensors.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/SensorRecordSensorTypePassiveSensors.java b/src-generated/edu/nps/moves/dis7/enumerations/SensorRecordSensorTypePassiveSensors.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/SensorRecordSensorTypePassiveSensors.java
rename to src-generated/edu/nps/moves/dis7/enumerations/SensorRecordSensorTypePassiveSensors.java
index ff94462bf1536fab6e576b62598350b602a78dec..b66a31f6071846a38747752a25a48cedbff27113 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/SensorRecordSensorTypePassiveSensors.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SensorRecordSensorTypePassiveSensors.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/SensorTypeSource.java b/src-generated/edu/nps/moves/dis7/enumerations/SensorTypeSource.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/SensorTypeSource.java
rename to src-generated/edu/nps/moves/dis7/enumerations/SensorTypeSource.java
index 5dd9dd0f00654611953c521a48207f8fe5a0a7b1..e46f54b00e5acb6a78480d3819ace4c15051654c 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/SensorTypeSource.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SensorTypeSource.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/SeparationVPPreEntityIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/SeparationVPPreEntityIndicator.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/SeparationVPPreEntityIndicator.java
rename to src-generated/edu/nps/moves/dis7/enumerations/SeparationVPPreEntityIndicator.java
index b3b92ef4ba60382f042e18da58750bd95f1f2fff..8131d147bd8c979d5acfbc0d15c2385497f200d6 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/SeparationVPPreEntityIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SeparationVPPreEntityIndicator.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/SeparationVPReasonforSeparation.java b/src-generated/edu/nps/moves/dis7/enumerations/SeparationVPReasonforSeparation.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/SeparationVPReasonforSeparation.java
rename to src-generated/edu/nps/moves/dis7/enumerations/SeparationVPReasonforSeparation.java
index 7d519d14415feeb9598e897936255d5d06771372..aede7a0f9790f43fa230cc26a8111b406195c1a2 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/SeparationVPReasonforSeparation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SeparationVPReasonforSeparation.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/ServiceRequestServiceTypeRequested.java b/src-generated/edu/nps/moves/dis7/enumerations/ServiceRequestServiceTypeRequested.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/ServiceRequestServiceTypeRequested.java
rename to src-generated/edu/nps/moves/dis7/enumerations/ServiceRequestServiceTypeRequested.java
index 2f01e797339122429133b0a74a5390e9b1b4bbb1..66d46052a76ea492bf2c6ceb519d6483fa6bc6e4 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/ServiceRequestServiceTypeRequested.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/ServiceRequestServiceTypeRequested.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/SignalEncodingClass.java b/src-generated/edu/nps/moves/dis7/enumerations/SignalEncodingClass.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/SignalEncodingClass.java
rename to src-generated/edu/nps/moves/dis7/enumerations/SignalEncodingClass.java
index eaa2ef470c5639933043f231028aa5e53af2632f..5745973476666bdce2702f1d894e274cba7ee44b 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/SignalEncodingClass.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SignalEncodingClass.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/SignalEncodingType.java b/src-generated/edu/nps/moves/dis7/enumerations/SignalEncodingType.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/SignalEncodingType.java
rename to src-generated/edu/nps/moves/dis7/enumerations/SignalEncodingType.java
index fbc44cc5489283d47af512398c2317c0047ca449..db220f2682020a6f09f0a6055dbe416ccfb25af6 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/SignalEncodingType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SignalEncodingType.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/SignalTDLType.java b/src-generated/edu/nps/moves/dis7/enumerations/SignalTDLType.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/enumerations/SignalTDLType.java
rename to src-generated/edu/nps/moves/dis7/enumerations/SignalTDLType.java
index 044295f4de1fb1705c3c507e7e2739f583bc6762..9afc9dbd0d97727f3e912920e3e47f433dce88be 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/SignalTDLType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SignalTDLType.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/SignalUserProtocolIdentificationNumber.java b/src-generated/edu/nps/moves/dis7/enumerations/SignalUserProtocolIdentificationNumber.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/SignalUserProtocolIdentificationNumber.java
rename to src-generated/edu/nps/moves/dis7/enumerations/SignalUserProtocolIdentificationNumber.java
index 4fd7c979d2b2ced431b1cc82542c9045c58235da..7d641a797ef24d9023df317590693297098a0f54 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/SignalUserProtocolIdentificationNumber.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SignalUserProtocolIdentificationNumber.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/SpacePlatformAppearance.java b/src-generated/edu/nps/moves/dis7/enumerations/SpacePlatformAppearance.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/SpacePlatformAppearance.java
rename to src-generated/edu/nps/moves/dis7/enumerations/SpacePlatformAppearance.java
index a4ff39908816782727f9219c3e301f0f0f6d3c76..f0cabc91a672578684db939a6612cece028433f1 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/SpacePlatformAppearance.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SpacePlatformAppearance.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/SpacePlatformCapabilities.java b/src-generated/edu/nps/moves/dis7/enumerations/SpacePlatformCapabilities.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/SpacePlatformCapabilities.java
rename to src-generated/edu/nps/moves/dis7/enumerations/SpacePlatformCapabilities.java
index 34173428643b8048d939757f81f806271fde487a..bf122b9c3b580e9755b359b0e6e8f705dc921111 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/SpacePlatformCapabilities.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SpacePlatformCapabilities.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/SpecificDimensionEnumerationsforAirAreaSize.java b/src-generated/edu/nps/moves/dis7/enumerations/SpecificDimensionEnumerationsforAirAreaSize.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/SpecificDimensionEnumerationsforAirAreaSize.java
rename to src-generated/edu/nps/moves/dis7/enumerations/SpecificDimensionEnumerationsforAirAreaSize.java
index 32d3d42fe2ad15ac3ed36c166eaa734966da06a6..8a529822ee1f25e4b2aa2c2b0a7309654cb5d655 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/SpecificDimensionEnumerationsforAirAreaSize.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SpecificDimensionEnumerationsforAirAreaSize.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/SpecificDimensionEnumerationsforLandAreaSize.java b/src-generated/edu/nps/moves/dis7/enumerations/SpecificDimensionEnumerationsforLandAreaSize.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/SpecificDimensionEnumerationsforLandAreaSize.java
rename to src-generated/edu/nps/moves/dis7/enumerations/SpecificDimensionEnumerationsforLandAreaSize.java
index 1c53026f8b566337b9694df99eca1583fd9a0b07..9b8460f46e3cd634149cdcc1e640bfb6ca98ff7f 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/SpecificDimensionEnumerationsforLandAreaSize.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SpecificDimensionEnumerationsforLandAreaSize.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/SpotChaffStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/SpotChaffStatus.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/SpotChaffStatus.java
rename to src-generated/edu/nps/moves/dis7/enumerations/SpotChaffStatus.java
index d834f8b732494dc97950f43692e6bc5130b23b31..6f1f96e391ea795abd31b5ed7372654a273062cb 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/SpotChaffStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SpotChaffStatus.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/StopFreezeFrozenBehavior.java b/src-generated/edu/nps/moves/dis7/enumerations/StopFreezeFrozenBehavior.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/StopFreezeFrozenBehavior.java
rename to src-generated/edu/nps/moves/dis7/enumerations/StopFreezeFrozenBehavior.java
index 048bc38fe20438065013c233d70a19999c53ac9c..84d263a559c3b5eec2d081ba88f61fd4fc3ab5b6 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/StopFreezeFrozenBehavior.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/StopFreezeFrozenBehavior.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/StopFreezeReason.java b/src-generated/edu/nps/moves/dis7/enumerations/StopFreezeReason.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/StopFreezeReason.java
rename to src-generated/edu/nps/moves/dis7/enumerations/StopFreezeReason.java
index 00b8ae96ff3b979545fb85decb050a7cab1c888f..2d7b790335448c4ecee6a4c37e230e2c72e22b75 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/StopFreezeReason.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/StopFreezeReason.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/SubcategoriesforAirCategory200Bird.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory200Bird.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/SubcategoriesforAirCategory200Bird.java
rename to src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory200Bird.java
index 4ded37060e405d93ea35f18f21fc77b3084f09dc..9717aa62d154dd296ca0423bae4c2850053f3432 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/SubcategoriesforAirCategory200Bird.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory200Bird.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/SubcategoriesforAirCategory201Insect.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory201Insect.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/SubcategoriesforAirCategory201Insect.java
rename to src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory201Insect.java
index 171b0aa7ac344b63340d8e10d61a2ab6a4800f19..1dab496bcd718ce9c46e5436a288b23753453718 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/SubcategoriesforAirCategory201Insect.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory201Insect.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/SubcategoriesforAirCategory202Mammal.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory202Mammal.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/SubcategoriesforAirCategory202Mammal.java
rename to src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory202Mammal.java
index 9c3e636edd80cc6f5b6268a32a6166cf4be519c7..dfc69bdc95d91681b465f3f1b369ee2972081206 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/SubcategoriesforAirCategory202Mammal.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforAirCategory202Mammal.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/SubcategoriesforLandCategory200Mammal.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory200Mammal.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/SubcategoriesforLandCategory200Mammal.java
rename to src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory200Mammal.java
index aa0054e2881b1215eb922133b0ab5cb012397afd..08d2ba9042638d0d36a636b93fe758c2f11217e7 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/SubcategoriesforLandCategory200Mammal.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory200Mammal.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/SubcategoriesforLandCategory201Reptile.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory201Reptile.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/SubcategoriesforLandCategory201Reptile.java
rename to src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory201Reptile.java
index 84f18ab2c32d1fef01d986f3314f0261d8b72945..22321619acca7cb6f96ffc3fbd44b4253d70f30f 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/SubcategoriesforLandCategory201Reptile.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory201Reptile.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/SubcategoriesforLandCategory202Amphibian.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory202Amphibian.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/SubcategoriesforLandCategory202Amphibian.java
rename to src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory202Amphibian.java
index 4463de0ac63bada0666755be8c70a23a026942e2..aa1c1477ae51e31acf06b609016f286888d77ebd 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/SubcategoriesforLandCategory202Amphibian.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory202Amphibian.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/SubcategoriesforLandCategory203Insect.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory203Insect.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/SubcategoriesforLandCategory203Insect.java
rename to src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory203Insect.java
index 95307f4d6d47e4d4da44e7331729b8d9d99e7bb2..e19314864b23ff46a8be75b73c79a021ad019fbf 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/SubcategoriesforLandCategory203Insect.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory203Insect.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/SubcategoriesforLandCategory204Arachnid.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory204Arachnid.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/SubcategoriesforLandCategory204Arachnid.java
rename to src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory204Arachnid.java
index 8d92d643fb6cbf9d955ebb712d26d9745bc3b86d..d31180b24fe14ff6abf2e4f1c614348064af1c06 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/SubcategoriesforLandCategory204Arachnid.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory204Arachnid.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/SubcategoriesforLandCategory205Mollusk.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory205Mollusk.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/SubcategoriesforLandCategory205Mollusk.java
rename to src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory205Mollusk.java
index a44744fe5a6546fc67b1a2ca64691cb02511a5ad..7774795c1afcb893188676732a1de3cf4574e673 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/SubcategoriesforLandCategory205Mollusk.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory205Mollusk.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/SubcategoriesforLandCategory206Marsupial.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory206Marsupial.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/SubcategoriesforLandCategory206Marsupial.java
rename to src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory206Marsupial.java
index 780d1870c130aa0bf192aa2dfda41233d117e5d5..ddb360bfc2cd9d6fdc1c7b5291383978c6c92c87 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/SubcategoriesforLandCategory206Marsupial.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforLandCategory206Marsupial.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/SubcategoriesforSubsurfaceCategory200Fish.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory200Fish.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/SubcategoriesforSubsurfaceCategory200Fish.java
rename to src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory200Fish.java
index ceb2caa5e229912d790dc9c2f11e7e2321c03791..53df750d603af382c7d2d9a793e230556b0b33de 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/SubcategoriesforSubsurfaceCategory200Fish.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory200Fish.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/SubcategoriesforSubsurfaceCategory201Mammal.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory201Mammal.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/SubcategoriesforSubsurfaceCategory201Mammal.java
rename to src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory201Mammal.java
index e0ecf4dc4ebf2eb9b9f398a16ddd221293bbb348..b448629757a268c23f23b49f6b67707bfc8d8c49 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/SubcategoriesforSubsurfaceCategory201Mammal.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory201Mammal.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/SubcategoriesforSubsurfaceCategory202Mollusk.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory202Mollusk.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/SubcategoriesforSubsurfaceCategory202Mollusk.java
rename to src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory202Mollusk.java
index 56c7d639de7039e2356ff705a9feed02163c1c7d..5085f8857465479583b05c1787c7fb872c1a9064 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/SubcategoriesforSubsurfaceCategory202Mollusk.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory202Mollusk.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/SubcategoriesforSubsurfaceCategory203Crustacean.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory203Crustacean.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/SubcategoriesforSubsurfaceCategory203Crustacean.java
rename to src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory203Crustacean.java
index a904a093928d5c919e6ca4f7703c67bc0595f5e9..bc98d80dd94eaccbf5f54f3711ade96e394a770a 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/SubcategoriesforSubsurfaceCategory203Crustacean.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory203Crustacean.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/SubcategoriesforSubsurfaceCategory204Insect.java b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory204Insect.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/SubcategoriesforSubsurfaceCategory204Insect.java
rename to src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory204Insect.java
index b541128b58dcf93e247b2393fed470c4c136ef8b..ad21e8b9e0eee7b0d9231a7ad2538d554496f91e 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/SubcategoriesforSubsurfaceCategory204Insect.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubcategoriesforSubsurfaceCategory204Insect.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/SubsurfacePlatformAppearance.java b/src-generated/edu/nps/moves/dis7/enumerations/SubsurfacePlatformAppearance.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/SubsurfacePlatformAppearance.java
rename to src-generated/edu/nps/moves/dis7/enumerations/SubsurfacePlatformAppearance.java
index 86d329d1b5dbbfda5b8157c6f48f99b50fc02a82..8eed636f778ae8d6036b0b9290105b4a8e1ead0f 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/SubsurfacePlatformAppearance.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubsurfacePlatformAppearance.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/SubsurfacePlatformCapabilities.java b/src-generated/edu/nps/moves/dis7/enumerations/SubsurfacePlatformCapabilities.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/SubsurfacePlatformCapabilities.java
rename to src-generated/edu/nps/moves/dis7/enumerations/SubsurfacePlatformCapabilities.java
index 576e287969c169bbf7060dfefff9d2866b725600..d7a855e54d6e3d27a7feb302ca7de85c05769b84 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/SubsurfacePlatformCapabilities.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SubsurfacePlatformCapabilities.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/SupplyAppearance.java b/src-generated/edu/nps/moves/dis7/enumerations/SupplyAppearance.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/SupplyAppearance.java
rename to src-generated/edu/nps/moves/dis7/enumerations/SupplyAppearance.java
index 6687e6e0799fb710a6d5a4a014480ccdf4ef4a1e..d6bc52b157b5023a4af76d8d33f250ee4cd77242 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/SupplyAppearance.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SupplyAppearance.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/SupplyCapabilities.java b/src-generated/edu/nps/moves/dis7/enumerations/SupplyCapabilities.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/SupplyCapabilities.java
rename to src-generated/edu/nps/moves/dis7/enumerations/SupplyCapabilities.java
index 4d07c244ab1ae9cdb24daf2073199e5f41779648..95d01026ce8cc5b2e609fede06e79abe7ac01cc1 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/SupplyCapabilities.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SupplyCapabilities.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/SupplyDomain.java b/src-generated/edu/nps/moves/dis7/enumerations/SupplyDomain.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/SupplyDomain.java
rename to src-generated/edu/nps/moves/dis7/enumerations/SupplyDomain.java
index e6d388cdbe3f2ac6bfd3317ad0b1af8b63b6d60c..cab5d1d094cd660092eb97e5857b515037abf254 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/SupplyDomain.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SupplyDomain.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/SupplyFuelType.java b/src-generated/edu/nps/moves/dis7/enumerations/SupplyFuelType.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/SupplyFuelType.java
rename to src-generated/edu/nps/moves/dis7/enumerations/SupplyFuelType.java
index bb039948bf7f0a8124416a7f14a35197b3524918..13fad9b258af23e9c2c676b7c2e16e96417f176d 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/SupplyFuelType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SupplyFuelType.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/SurfacePlatformAppearance.java b/src-generated/edu/nps/moves/dis7/enumerations/SurfacePlatformAppearance.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/SurfacePlatformAppearance.java
rename to src-generated/edu/nps/moves/dis7/enumerations/SurfacePlatformAppearance.java
index 58709d61a8bd3bb5235fc3ffe0302ac4b0bbbedc..37a8a540f6b966825a6e2b2cf0d370b8dac6adab 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/SurfacePlatformAppearance.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SurfacePlatformAppearance.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/SurfacePlatformCapabilities.java b/src-generated/edu/nps/moves/dis7/enumerations/SurfacePlatformCapabilities.java
similarity index 98%
rename from src-generated/edu/nps/moves/dis/enumerations/SurfacePlatformCapabilities.java
rename to src-generated/edu/nps/moves/dis7/enumerations/SurfacePlatformCapabilities.java
index e0ecd175c0728875b0b99117f323c5e2ea8a4e2f..c8492db4599c4514c198bb95b5c3b12916a47aa6 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/SurfacePlatformCapabilities.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SurfacePlatformCapabilities.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/SurveillanceStatus.java b/src-generated/edu/nps/moves/dis7/enumerations/SurveillanceStatus.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/SurveillanceStatus.java
rename to src-generated/edu/nps/moves/dis7/enumerations/SurveillanceStatus.java
index 7a02ddae68872ce328a16c410a7f497f10f70cb0..b918550dea6a58996d60f4b2e960c4e80c0079a9 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/SurveillanceStatus.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/SurveillanceStatus.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/TCASACASBasicAdvancedIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/TCASACASBasicAdvancedIndicator.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/TCASACASBasicAdvancedIndicator.java
rename to src-generated/edu/nps/moves/dis7/enumerations/TCASACASBasicAdvancedIndicator.java
index 66e02c58723a13b34ca0926b9088165f644273f3..5f053185aa5b66e1fcf90512b9ce2c757f2d9b37 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/TCASACASBasicAdvancedIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TCASACASBasicAdvancedIndicator.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/TCASACASIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/TCASACASIndicator.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/TCASACASIndicator.java
rename to src-generated/edu/nps/moves/dis7/enumerations/TCASACASIndicator.java
index a661f963bbc9e968a39da88f24c6b28bc04b869d..e81bcbde12212a231b214ee5de468a6d1f901079 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/TCASACASIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TCASACASIndicator.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/TCASACASSoftwareVersion.java b/src-generated/edu/nps/moves/dis7/enumerations/TCASACASSoftwareVersion.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/TCASACASSoftwareVersion.java
rename to src-generated/edu/nps/moves/dis7/enumerations/TCASACASSoftwareVersion.java
index 67d59af78219eec800b5ca53545fd3cfac6972f7..73c0640196f08fb904160ab368c854c7d1aa4e8d 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/TCASACASSoftwareVersion.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TCASACASSoftwareVersion.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/TCASACASType.java b/src-generated/edu/nps/moves/dis7/enumerations/TCASACASType.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/TCASACASType.java
rename to src-generated/edu/nps/moves/dis7/enumerations/TCASACASType.java
index fe32e2bb2d761a5c9e91522e52885f2c4b64ae05..d78f446d65b8f9898ce0f714ea85a4a5dab4a251 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/TCASACASType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TCASACASType.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/TCASIIIType.java b/src-generated/edu/nps/moves/dis7/enumerations/TCASIIIType.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/TCASIIIType.java
rename to src-generated/edu/nps/moves/dis7/enumerations/TCASIIIType.java
index e9c338ecfeb44cfaabd5b8e38a659694e24c9026..b34688b0a1196e93030d7023eab8d9031d0cc808 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/TCASIIIType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TCASIIIType.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/TILinkType.java b/src-generated/edu/nps/moves/dis7/enumerations/TILinkType.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/TILinkType.java
rename to src-generated/edu/nps/moves/dis7/enumerations/TILinkType.java
index b296de7816a6a1b610918f32a3668bc3571b6a0f..2834486ffc3a5d9c7a525d13335ce6f03d68a556 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/TILinkType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TILinkType.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/TimeTypeSource.java b/src-generated/edu/nps/moves/dis7/enumerations/TimeTypeSource.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/TimeTypeSource.java
rename to src-generated/edu/nps/moves/dis7/enumerations/TimeTypeSource.java
index 7dc1af1b87afdeb0dcb1a750f378c33f2719b04c..cc90ae90f5ced4da0b6275666b0c6cd0d3b1abde 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/TimeTypeSource.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TimeTypeSource.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/TransferControlTransferType.java b/src-generated/edu/nps/moves/dis7/enumerations/TransferControlTransferType.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/TransferControlTransferType.java
rename to src-generated/edu/nps/moves/dis7/enumerations/TransferControlTransferType.java
index cc205b8e45393ed0a1a9b02cb786916b29023c58..ac813ee560e403e19022048da25df0c5bdeffabc 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/TransferControlTransferType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransferControlTransferType.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/TransmissionIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmissionIndicator.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/TransmissionIndicator.java
rename to src-generated/edu/nps/moves/dis7/enumerations/TransmissionIndicator.java
index 982045bc1ffd2ad40840e12a5eeefbf028da416f..231a54e8808cf7fc161320a465e69295369942a1 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/TransmissionIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmissionIndicator.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/TransmitterAntennaPatternReferenceSystem.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterAntennaPatternReferenceSystem.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/TransmitterAntennaPatternReferenceSystem.java
rename to src-generated/edu/nps/moves/dis7/enumerations/TransmitterAntennaPatternReferenceSystem.java
index 0cd01e1a0abec44f998666f3bbc897d32b9f7d00..b742ba9975f8385a1456104eb9422dcab7d5cdbd 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/TransmitterAntennaPatternReferenceSystem.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterAntennaPatternReferenceSystem.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/TransmitterAntennaPatternType.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterAntennaPatternType.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/TransmitterAntennaPatternType.java
rename to src-generated/edu/nps/moves/dis7/enumerations/TransmitterAntennaPatternType.java
index 5bf115055d0d016c5ddaa3953c7b5d8a5328cab3..1e3ab03be58d88df4d802e69f18214f44d690b5b 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/TransmitterAntennaPatternType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterAntennaPatternType.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/TransmitterCryptoSystem.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterCryptoSystem.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/TransmitterCryptoSystem.java
rename to src-generated/edu/nps/moves/dis7/enumerations/TransmitterCryptoSystem.java
index 18c57eda2222a6e82c560c177a0388a54eef5d3c..72b237c155ea54e553fb35eaa34391c4649e76ee 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/TransmitterCryptoSystem.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterCryptoSystem.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/TransmitterDetailAmplitudeModulation.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAmplitudeModulation.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/TransmitterDetailAmplitudeModulation.java
rename to src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAmplitudeModulation.java
index 2c8e27ceb951be3855cda8189efd81d00ff831be..73683073e4bb4a9f08e83dd19edd0dd95fa981f6 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/TransmitterDetailAmplitudeModulation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAmplitudeModulation.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/TransmitterDetailAmplitudeandAngleModulation.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAmplitudeandAngleModulation.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/TransmitterDetailAmplitudeandAngleModulation.java
rename to src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAmplitudeandAngleModulation.java
index c1f3ef8a9f8cae44f295c1424a9466d288aa994b..f5b3a1e49dc113b757e24d965201964d50e3b057 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/TransmitterDetailAmplitudeandAngleModulation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAmplitudeandAngleModulation.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/TransmitterDetailAnglemodulation.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAnglemodulation.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/TransmitterDetailAnglemodulation.java
rename to src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAnglemodulation.java
index 39dae74ff7cd341a99439ea1dbd8826a429aadf9..5e08fab241c2f6bb4d51b18835693f8af4a38912 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/TransmitterDetailAnglemodulation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailAnglemodulation.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/TransmitterDetailCarrierPhaseShiftModulation.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailCarrierPhaseShiftModulation.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/TransmitterDetailCarrierPhaseShiftModulation.java
rename to src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailCarrierPhaseShiftModulation.java
index ef105e6db8ed2014e4d2d9195f5ce3602161c9aa..23990f77742b9d0424fc9d1e52330f5f68238e8a 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/TransmitterDetailCarrierPhaseShiftModulation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailCarrierPhaseShiftModulation.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/TransmitterDetailCombinationModulation.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailCombinationModulation.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/TransmitterDetailCombinationModulation.java
rename to src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailCombinationModulation.java
index 32d5f0c27402c9cb1cc2ec46b6283d41a6f22fb5..589b46b70c03a91be9c32699b9f490da487afa79 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/TransmitterDetailCombinationModulation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailCombinationModulation.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/TransmitterDetailPulseModulation.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailPulseModulation.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/TransmitterDetailPulseModulation.java
rename to src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailPulseModulation.java
index bd9861b71264a64b3fb8306e0cc3aed1412d109c..5f7e6fd8b68a34050d5e5904bcc79776186f00ef 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/TransmitterDetailPulseModulation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailPulseModulation.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/TransmitterDetailSATCOMModulation.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailSATCOMModulation.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/TransmitterDetailSATCOMModulation.java
rename to src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailSATCOMModulation.java
index 2d5b92eff89560a3f9dbae127803b7c3c976658e..885fca7a640425c8f8a3dfe999f444fc4d0ee7a0 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/TransmitterDetailSATCOMModulation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailSATCOMModulation.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/TransmitterDetailUnmodulatedModulation.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailUnmodulatedModulation.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/TransmitterDetailUnmodulatedModulation.java
rename to src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailUnmodulatedModulation.java
index 84dd8ca33b2041855e0349622a50e13fbdd2d5c4..128133de11fea1d5c72615142aac5b34e5533d60 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/TransmitterDetailUnmodulatedModulation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterDetailUnmodulatedModulation.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/TransmitterInputSource.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterInputSource.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/TransmitterInputSource.java
rename to src-generated/edu/nps/moves/dis7/enumerations/TransmitterInputSource.java
index 60bdb463ec21bd9aff689f11bc12da072ce957de..da7a8df8a9eb97291b15fe260a9afe8fc5e55799 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/TransmitterInputSource.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterInputSource.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/TransmitterMajorModulation.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterMajorModulation.java
similarity index 79%
rename from src-generated/edu/nps/moves/dis/enumerations/TransmitterMajorModulation.java
rename to src-generated/edu/nps/moves/dis7/enumerations/TransmitterMajorModulation.java
index ec8f94c8d4890196d9d7332a48f3b66b7ad7232f..bd90f995ba41672755400cc21d2feb79e471a1da 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/TransmitterMajorModulation.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterMajorModulation.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
@@ -16,14 +16,14 @@ public enum TransmitterMajorModulation
{
/** No Statement */
NO_STATEMENT (0, "No Statement"),
- /** TransmitterDetailAmplitudeModulation */ AMPLITUDE (1, "Amplitude"),
- /** TransmitterDetailAmplitudeandAngleModulation */ AMPLITUDE_AND_ANGLE (2, "Amplitude and Angle"),
- /** TransmitterDetailAnglemodulation */ ANGLE (3, "Angle"),
- /** TransmitterDetailCombinationModulation */ COMBINATION (4, "Combination"),
- /** TransmitterDetailPulseModulation */ PULSE (5, "Pulse"),
- /** TransmitterDetailUnmodulatedModulation */ UNMODULATED (6, "Unmodulated"),
- /** TransmitterDetailCarrierPhaseShiftModulation */ CARRIER_PHASE_SHIFT_MODULATION_CPSM (7, "Carrier Phase Shift Modulation (CPSM)"),
- /** TransmitterDetailSATCOMModulation */ SATCOM (8, "SATCOM");
+ /** TransmitterDetailAmplitudeModulation */ AMPLITUDE_2 (1, "Amplitude"),
+ /** TransmitterDetailAmplitudeandAngleModulation */ AMPLITUDE_AND_ANGLE_2 (2, "Amplitude and Angle"),
+ /** TransmitterDetailAnglemodulation */ ANGLE_2 (3, "Angle"),
+ /** TransmitterDetailCombinationModulation */ COMBINATION_2 (4, "Combination"),
+ /** TransmitterDetailPulseModulation */ PULSE_2 (5, "Pulse"),
+ /** TransmitterDetailUnmodulatedModulation */ UNMODULATED_2 (6, "Unmodulated"),
+ /** TransmitterDetailCarrierPhaseShiftModulation */ CARRIER_PHASE_SHIFT_MODULATION_CPSM_2 (7, "Carrier Phase Shift Modulation (CPSM)"),
+ /** TransmitterDetailSATCOMModulation */ SATCOM_2 (8, "SATCOM");
private int value;
private final String description;
diff --git a/src-generated/edu/nps/moves/dis/enumerations/TransmitterModulationTypeSystem.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterModulationTypeSystem.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/TransmitterModulationTypeSystem.java
rename to src-generated/edu/nps/moves/dis7/enumerations/TransmitterModulationTypeSystem.java
index 9f5c2b57ef71db7f9970af4b9cbc2f2b0720d21d..d2c315df8cba4d2228fd38b60c32348898e11451 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/TransmitterModulationTypeSystem.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterModulationTypeSystem.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/TransmitterTransmitState.java b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterTransmitState.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/TransmitterTransmitState.java
rename to src-generated/edu/nps/moves/dis7/enumerations/TransmitterTransmitState.java
index 9c55dc24d65630253fea91a91ce62a5022da9ed0..b6eb16f28ede1fed9ee996815f5e09d9bb8e695c 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/TransmitterTransmitState.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransmitterTransmitState.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/TransponderInterrogatorIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/TransponderInterrogatorIndicator.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/TransponderInterrogatorIndicator.java
rename to src-generated/edu/nps/moves/dis7/enumerations/TransponderInterrogatorIndicator.java
index a0f1adf90c73088a8b05ab09182415a7c9af8924..07420224ff71b3a6436a0f69eafadaca375d86f1 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/TransponderInterrogatorIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TransponderInterrogatorIndicator.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/TurnRateSource.java b/src-generated/edu/nps/moves/dis7/enumerations/TurnRateSource.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/TurnRateSource.java
rename to src-generated/edu/nps/moves/dis7/enumerations/TurnRateSource.java
index 6658fc1d9208939522310fc3257ab9fd08ecc5f6..4aeea830df6dd0f210c6addd9b6bfacddaf4a55c 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/TurnRateSource.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/TurnRateSource.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/UAAcousticEmitterSystemFunction.java b/src-generated/edu/nps/moves/dis7/enumerations/UAAcousticEmitterSystemFunction.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/UAAcousticEmitterSystemFunction.java
rename to src-generated/edu/nps/moves/dis7/enumerations/UAAcousticEmitterSystemFunction.java
index 7f0bce7b06eca8b955857205ff051b89c12cb41a..d122000f83b19ce6707d386939f555ffa97f3e96 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/UAAcousticEmitterSystemFunction.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/UAAcousticEmitterSystemFunction.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/UAAcousticSystemName.java b/src-generated/edu/nps/moves/dis7/enumerations/UAAcousticSystemName.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/UAAcousticSystemName.java
rename to src-generated/edu/nps/moves/dis7/enumerations/UAAcousticSystemName.java
index 0ff36ceffabc96b3e8f04c655be18a5875e19cf4..ae3f61941d5357cee1c773c7bd7d1b002e0066d4 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/UAAcousticSystemName.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/UAAcousticSystemName.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/UAActiveEmissionParameterIndex.java b/src-generated/edu/nps/moves/dis7/enumerations/UAActiveEmissionParameterIndex.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/UAActiveEmissionParameterIndex.java
rename to src-generated/edu/nps/moves/dis7/enumerations/UAActiveEmissionParameterIndex.java
index 89d9f663c7f1a38167cd7029df9c94473f412ed4..a6505e06d1249dafb57110a061a09889bfb231b4 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/UAActiveEmissionParameterIndex.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/UAActiveEmissionParameterIndex.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/UAAdditionalPassiveActivityParameterIndex.java b/src-generated/edu/nps/moves/dis7/enumerations/UAAdditionalPassiveActivityParameterIndex.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/UAAdditionalPassiveActivityParameterIndex.java
rename to src-generated/edu/nps/moves/dis7/enumerations/UAAdditionalPassiveActivityParameterIndex.java
index 492785741bb909dcc70da3c14417ef4485abb155..1bea632e2e1520eb4fb0c376b92edf46939f4fa5 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/UAAdditionalPassiveActivityParameterIndex.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/UAAdditionalPassiveActivityParameterIndex.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/UAPassiveParameterIndex.java b/src-generated/edu/nps/moves/dis7/enumerations/UAPassiveParameterIndex.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/UAPassiveParameterIndex.java
rename to src-generated/edu/nps/moves/dis7/enumerations/UAPassiveParameterIndex.java
index 428e45fea729888bfc2ec3cd03d8fe4d2f145c71..fb1a262edf2551f27fcb68c7cb184b064e13364b 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/UAPassiveParameterIndex.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/UAPassiveParameterIndex.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/UAPropulsionPlantConfiguration.java b/src-generated/edu/nps/moves/dis7/enumerations/UAPropulsionPlantConfiguration.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/UAPropulsionPlantConfiguration.java
rename to src-generated/edu/nps/moves/dis7/enumerations/UAPropulsionPlantConfiguration.java
index 3bd7b65dd64456f4a9cd3742a0d3d8ea6837f99f..0e162d4d3052a51b083bb2f00b5dd8488f52fd1d 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/UAPropulsionPlantConfiguration.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/UAPropulsionPlantConfiguration.java
@@ -1,6 +1,6 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/UAPropulsionPlantConfigurationConfiguration.java b/src-generated/edu/nps/moves/dis7/enumerations/UAPropulsionPlantConfigurationConfiguration.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/UAPropulsionPlantConfigurationConfiguration.java
rename to src-generated/edu/nps/moves/dis7/enumerations/UAPropulsionPlantConfigurationConfiguration.java
index d1481165a9c103cb70f02da82eba6eb58f0b023b..20f10fbc77e7a9ce2c7279f72c397ba681afaa69 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/UAPropulsionPlantConfigurationConfiguration.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/UAPropulsionPlantConfigurationConfiguration.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/UAScanPattern.java b/src-generated/edu/nps/moves/dis7/enumerations/UAScanPattern.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/UAScanPattern.java
rename to src-generated/edu/nps/moves/dis7/enumerations/UAScanPattern.java
index 2cda9ea4db5323b20f5d5e4f2cee8744018c0e00..32c9aa3c0144ee1beafcf04e4ff71326cfe189f9 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/UAScanPattern.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/UAScanPattern.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/UAStateChangeUpdateIndicator.java b/src-generated/edu/nps/moves/dis7/enumerations/UAStateChangeUpdateIndicator.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/UAStateChangeUpdateIndicator.java
rename to src-generated/edu/nps/moves/dis7/enumerations/UAStateChangeUpdateIndicator.java
index 68e8f0b8d32dbc13b0ae86f23491d1aa1b7ae719..61c5bc2e6fbc8cb7d3d7225bbb163ebfc3f840f5 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/UAStateChangeUpdateIndicator.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/UAStateChangeUpdateIndicator.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/VariableParameterRecordType.java b/src-generated/edu/nps/moves/dis7/enumerations/VariableParameterRecordType.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/VariableParameterRecordType.java
rename to src-generated/edu/nps/moves/dis7/enumerations/VariableParameterRecordType.java
index 9d306e5bc53e80419e67bcadef38c170faf0ba5b..48e90d2b93f9d5a1f7f3e9258150f9912ed9432f 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/VariableParameterRecordType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/VariableParameterRecordType.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/VariableRecordTypes.java b/src-generated/edu/nps/moves/dis7/enumerations/VariableRecordTypes.java
similarity index 99%
rename from src-generated/edu/nps/moves/dis/enumerations/VariableRecordTypes.java
rename to src-generated/edu/nps/moves/dis7/enumerations/VariableRecordTypes.java
index 32d28a9fe98b553173b9a8099da8ed353a096de3..fa8a9562d00a1efec2609b253e065dfa9c450b57 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/VariableRecordTypes.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/VariableRecordTypes.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
@@ -982,7 +982,7 @@ public enum VariableRecordTypes
ARTICULATED_PARTS (90000, "Articulated Parts"),
/** Part ID */
PART_ID (90050, "Part ID"),
- /** EntityCapabilityTypes */ INDEX (90070, "Index"),
+ /** EntityCapabilityTypes */ INDEX_2 (90070, "Index"),
/** Position */
POSITION_4 (90100, "Position"),
/** Position Rate */
diff --git a/src-generated/edu/nps/moves/dis/enumerations/VariantsforAirCategory200Bird.java b/src-generated/edu/nps/moves/dis7/enumerations/VariantsforAirCategory200Bird.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/VariantsforAirCategory200Bird.java
rename to src-generated/edu/nps/moves/dis7/enumerations/VariantsforAirCategory200Bird.java
index 9a17ffe3c3363d231c84e0093240030f8ad55978..86c2848b86a3b6fd6d9365347088224a1b64b513 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/VariantsforAirCategory200Bird.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/VariantsforAirCategory200Bird.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/VariantsforLandCategoriesReptilesAmphibiansInsectsandArachnids.java b/src-generated/edu/nps/moves/dis7/enumerations/VariantsforLandCategoriesReptilesAmphibiansInsectsandArachnids.java
similarity index 97%
rename from src-generated/edu/nps/moves/dis/enumerations/VariantsforLandCategoriesReptilesAmphibiansInsectsandArachnids.java
rename to src-generated/edu/nps/moves/dis7/enumerations/VariantsforLandCategoriesReptilesAmphibiansInsectsandArachnids.java
index 8349a9dc59811c5228afed826b06855fea3aa84e..1105887358302dbd5343c0497971b96404d2661d 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/VariantsforLandCategoriesReptilesAmphibiansInsectsandArachnids.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/VariantsforLandCategoriesReptilesAmphibiansInsectsandArachnids.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/enumerations/VariantsforSubsurfaceCategory201Mammal.java b/src-generated/edu/nps/moves/dis7/enumerations/VariantsforSubsurfaceCategory201Mammal.java
similarity index 96%
rename from src-generated/edu/nps/moves/dis/enumerations/VariantsforSubsurfaceCategory201Mammal.java
rename to src-generated/edu/nps/moves/dis7/enumerations/VariantsforSubsurfaceCategory201Mammal.java
index 4f81dec011ce1295a3a9e01274e70f082ba59a03..1250c43c83b1b3116f704e17e36f5d83d6befbae 100644
--- a/src-generated/edu/nps/moves/dis/enumerations/VariantsforSubsurfaceCategory201Mammal.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/VariantsforSubsurfaceCategory201Mammal.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.enumerations;
+package edu.nps.moves.dis7.enumerations;
import java.nio.ByteBuffer;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import edu.nps.moves.dis.*;
+import edu.nps.moves.dis7.*;
/**
* Generated from XML, SISO-REF-010-v25, 2018-08-29<br>
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AGCandGateStealer/AGCandGateStealer.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AGCandGateStealer/AGCandGateStealer.java
similarity index 66%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/AGCandGateStealer/AGCandGateStealer.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/AGCandGateStealer/AGCandGateStealer.java
index 72d0b9085685b2778c65b870c9696c78cfff2221..b3152c5dd81d83a00f93135513e22b0a822a20f1 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AGCandGateStealer/AGCandGateStealer.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AGCandGateStealer/AGCandGateStealer.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.AGCandGateStealer;
+package edu.nps.moves.dis7.jammers.Deception.AGCandGateStealer;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AGCandGateStealer/AGCandRGPO/AGCandRGPO.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AGCandGateStealer/AGCandRGPO/AGCandRGPO.java
similarity index 67%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/AGCandGateStealer/AGCandRGPO/AGCandRGPO.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/AGCandGateStealer/AGCandRGPO/AGCandRGPO.java
index 849e5bb4f029781f9e6454d31d3d22da38712415..7d708b839824656c317ade7ba6b370ee6f04fcd2 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AGCandGateStealer/AGCandRGPO/AGCandRGPO.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AGCandGateStealer/AGCandRGPO/AGCandRGPO.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.AGCandGateStealer.AGCandRGPO;
+package edu.nps.moves.dis7.jammers.Deception.AGCandGateStealer.AGCandRGPO;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AGCandGateStealer/AGCandRGPOandVGPO/AGCandRGPOandVGPO.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AGCandGateStealer/AGCandRGPOandVGPO/AGCandRGPOandVGPO.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/AGCandGateStealer/AGCandRGPOandVGPO/AGCandRGPOandVGPO.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/AGCandGateStealer/AGCandRGPOandVGPO/AGCandRGPOandVGPO.java
index 73fa0c375656098b0656ef05a1c561abe83929ed..fc130732d01d5f18c1fc12b20c57a0dfb58b0a90 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AGCandGateStealer/AGCandRGPOandVGPO/AGCandRGPOandVGPO.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AGCandGateStealer/AGCandRGPOandVGPO/AGCandRGPOandVGPO.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.AGCandGateStealer.AGCandRGPOandVGPO;
+package edu.nps.moves.dis7.jammers.Deception.AGCandGateStealer.AGCandRGPOandVGPO;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AGCandGateStealer/AGCandVGPO/AGCandVGPO.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AGCandGateStealer/AGCandVGPO/AGCandVGPO.java
similarity index 67%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/AGCandGateStealer/AGCandVGPO/AGCandVGPO.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/AGCandGateStealer/AGCandVGPO/AGCandVGPO.java
index 9fd237062bac6a4c2f8110376b735a3e8d57586d..e6d03b8d4be2531a255e0b01d01bdfe969175fb4 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AGCandGateStealer/AGCandVGPO/AGCandVGPO.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AGCandGateStealer/AGCandVGPO/AGCandVGPO.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.AGCandGateStealer.AGCandVGPO;
+package edu.nps.moves.dis7.jammers.Deception.AGCandGateStealer.AGCandVGPO;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Analyzer/Analyzer.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Analyzer/Analyzer.java
similarity index 65%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/Analyzer/Analyzer.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/Analyzer/Analyzer.java
index a8791a79504f9452a266797a3286150d763a4522..2d363f6805105506f9d5439dbb9080dddc810353 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Analyzer/Analyzer.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Analyzer/Analyzer.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.Analyzer;
+package edu.nps.moves.dis7.jammers.Deception.Analyzer;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/Angle.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/Angle.java
similarity index 65%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/Angle/Angle.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/Angle.java
index 408fc4a56da1b204cb46078ca933bcc1bc351c07..13d1af963a4055f69b2a80b49e6ab3745e49fc79 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/Angle.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/Angle.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.Angle;
+package edu.nps.moves.dis7.jammers.Deception.Angle;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/AngleGateWalk_Off/AngleGateWalk_Off.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/AngleGateWalk_Off/AngleGateWalk_Off.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/Angle/AngleGateWalk_Off/AngleGateWalk_Off.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/AngleGateWalk_Off/AngleGateWalk_Off.java
index 175c82a5ab06f5f19ea2af4ed7325cfd9b1cc04f..e5346e925cd14009bfe98b8e4ab051b5932cc09f 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/AngleGateWalk_Off/AngleGateWalk_Off.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/AngleGateWalk_Off/AngleGateWalk_Off.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.Angle.AngleGateWalk_Off;
+package edu.nps.moves.dis7.jammers.Deception.Angle.AngleGateWalk_Off;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/CooperativeAngleCAJ/CooperativeAngleCAJ.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/CooperativeAngleCAJ/CooperativeAngleCAJ.java
similarity index 69%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/Angle/CooperativeAngleCAJ/CooperativeAngleCAJ.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/CooperativeAngleCAJ/CooperativeAngleCAJ.java
index 78952ddd360f33c8b15f441f8d14efbaa9e63522..1abe5ee6e75a1534e2c21526f1e83b3cf54d8db2 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/CooperativeAngleCAJ/CooperativeAngleCAJ.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/CooperativeAngleCAJ/CooperativeAngleCAJ.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.Angle.CooperativeAngleCAJ;
+package edu.nps.moves.dis7.jammers.Deception.Angle.CooperativeAngleCAJ;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/Cross_Eye/Cross_Eye.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/Cross_Eye/Cross_Eye.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/Angle/Cross_Eye/Cross_Eye.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/Cross_Eye/Cross_Eye.java
index 5ccfb3dc20cf6f751b14a96c820dcd9a7519d1d3..9bbbbaffd42a5de023744510cb03e4a2e70fbec9 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/Cross_Eye/Cross_Eye.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/Cross_Eye/Cross_Eye.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.Angle.Cross_Eye;
+package edu.nps.moves.dis7.jammers.Deception.Angle.Cross_Eye;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/Cross_Polarization/Cross_Polarization.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/Cross_Polarization/Cross_Polarization.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/Angle/Cross_Polarization/Cross_Polarization.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/Cross_Polarization/Cross_Polarization.java
index bcb59cc99e0fc52265fac47ac66df98d34247085..fe58151598e33a0f8fe5ca900a8cb97ae906c616 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/Cross_Polarization/Cross_Polarization.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/Cross_Polarization/Cross_Polarization.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.Angle.Cross_Polarization;
+package edu.nps.moves.dis7.jammers.Deception.Angle.Cross_Polarization;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/Delta/Delta.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/Delta/Delta.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/Angle/Delta/Delta.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/Delta/Delta.java
index fa3d4d3c00af5fcce70a80d096ddf998950cea67..431cfee830ee8769fd4c4b822c8102142668f45c 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/Delta/Delta.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/Delta/Delta.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.Angle.Delta;
+package edu.nps.moves.dis7.jammers.Deception.Angle.Delta;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/InverseGainakaInverseAmplitude/InverseGainakaInverseAmplitude.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/InverseGainakaInverseAmplitude/InverseGainakaInverseAmplitude.java
similarity index 69%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/Angle/InverseGainakaInverseAmplitude/InverseGainakaInverseAmplitude.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/InverseGainakaInverseAmplitude/InverseGainakaInverseAmplitude.java
index 8f40e2cb6eea3bba1b09b41d3c225ac57563a765..3971864df259f1824cb494d239a0fa8b0f9d9245 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/InverseGainakaInverseAmplitude/InverseGainakaInverseAmplitude.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/InverseGainakaInverseAmplitude/InverseGainakaInverseAmplitude.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.Angle.InverseGainakaInverseAmplitude;
+package edu.nps.moves.dis7.jammers.Deception.Angle.InverseGainakaInverseAmplitude;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/Sea_Bounced/Sea_Bounced.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/Sea_Bounced/Sea_Bounced.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/Angle/Sea_Bounced/Sea_Bounced.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/Sea_Bounced/Sea_Bounced.java
index 5e1b0b071dd4eb6cb01c9a9bc38e5d1f1ac7449e..4470ca3390e518360a285ace36855023ee5536fe 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/Sea_Bounced/Sea_Bounced.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/Sea_Bounced/Sea_Bounced.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.Angle.Sea_Bounced;
+package edu.nps.moves.dis7.jammers.Deception.Angle.Sea_Bounced;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/SweptSquareWaveSSW/SweptSquareWaveSSW.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/SweptSquareWaveSSW/SweptSquareWaveSSW.java
similarity index 69%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/Angle/SweptSquareWaveSSW/SweptSquareWaveSSW.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/SweptSquareWaveSSW/SweptSquareWaveSSW.java
index 8bb6dcfe17899c1197e4d70373a7dff22cc91517..df58b20384f06d2230d6e0d419fbe3a55935f701 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/SweptSquareWaveSSW/SweptSquareWaveSSW.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/SweptSquareWaveSSW/SweptSquareWaveSSW.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.Angle.SweptSquareWaveSSW;
+package edu.nps.moves.dis7.jammers.Deception.Angle.SweptSquareWaveSSW;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/TerrainBounce/TerrainBounce.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/TerrainBounce/TerrainBounce.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/Angle/TerrainBounce/TerrainBounce.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/TerrainBounce/TerrainBounce.java
index e4d03f7463c5512f575b331561b6f4dc1410e82d..d6af75d3a70454aad051d267982b7bfe1ab1bf54 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/TerrainBounce/TerrainBounce.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Angle/TerrainBounce/TerrainBounce.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.Angle.TerrainBounce;
+package edu.nps.moves.dis7.jammers.Deception.Angle.TerrainBounce;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/AngleandFalseTarget.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandFalseTarget/AngleandFalseTarget.java
similarity index 66%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/AngleandFalseTarget.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandFalseTarget/AngleandFalseTarget.java
index fac1c133862d21e1c8bf758a527fafec863d0803..69fd702018f4237c534e655befa976e575b8c36c 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/AngleandFalseTarget.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandFalseTarget/AngleandFalseTarget.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.AngleandFalseTarget;
+package edu.nps.moves.dis7.jammers.Deception.AngleandFalseTarget;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/AngleandVelocityFalseTargetsVFT.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/AngleandVelocityFalseTargetsVFT.java
similarity index 69%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/AngleandVelocityFalseTargetsVFT.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/AngleandVelocityFalseTargetsVFT.java
index 6da867cb79dba0a1e31d0a814ccd16241f0f4009..22b14bf33ee7a61d445ea1880136486768cae588 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/AngleandVelocityFalseTargetsVFT.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/AngleandVelocityFalseTargetsVFT.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.AngleandFalseTarget.AngleandVelocityFalseTargetsVFT;
+package edu.nps.moves.dis7.jammers.Deception.AngleandFalseTarget.AngleandVelocityFalseTargetsVFT;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/InverseGainandVFT/InverseGainandVFT.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/InverseGainandVFT/InverseGainandVFT.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/InverseGainandVFT/InverseGainandVFT.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/InverseGainandVFT/InverseGainandVFT.java
index 40f5a271a94686bd1906f42bf0e712440d6dc12a..56fe75c3b7d71bf02e561e3602dab0cbb1af0a25 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/InverseGainandVFT/InverseGainandVFT.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/InverseGainandVFT/InverseGainandVFT.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.AngleandFalseTarget.AngleandVelocityFalseTargetsVFT.InverseGainandVFT;
+package edu.nps.moves.dis7.jammers.Deception.AngleandFalseTarget.AngleandVelocityFalseTargetsVFT.InverseGainandVFT;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/SSWandVFT/SSWandVFT.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/SSWandVFT/SSWandVFT.java
similarity index 67%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/SSWandVFT/SSWandVFT.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/SSWandVFT/SSWandVFT.java
index 7b8e2bda613129c10c2cea27a2e0038614fc2324..3f3f102b2fca5d2d43cbbb74505b157ea2083d02 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/SSWandVFT/SSWandVFT.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/SSWandVFT/SSWandVFT.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.AngleandFalseTarget.AngleandVelocityFalseTargetsVFT.SSWandVFT;
+package edu.nps.moves.dis7.jammers.Deception.AngleandFalseTarget.AngleandVelocityFalseTargetsVFT.SSWandVFT;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/RFTandSSW/RFTandSSW.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandFalseTarget/RFTandSSW/RFTandSSW.java
similarity index 67%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/RFTandSSW/RFTandSSW.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandFalseTarget/RFTandSSW/RFTandSSW.java
index 68a2075a67445ba318feb46f1302f3ad0da49b75..dff4d4826fe585c273de522d6eef73c4ed3eb381 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/RFTandSSW/RFTandSSW.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandFalseTarget/RFTandSSW/RFTandSSW.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.AngleandFalseTarget.RFTandSSW;
+package edu.nps.moves.dis7.jammers.Deception.AngleandFalseTarget.RFTandSSW;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/RangeFalseTargetsRFTandInverseGain/RangeFalseTargetsRFTandInverseGain.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandFalseTarget/RangeFalseTargetsRFTandInverseGain/RangeFalseTargetsRFTandInverseGain.java
similarity index 69%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/RangeFalseTargetsRFTandInverseGain/RangeFalseTargetsRFTandInverseGain.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandFalseTarget/RangeFalseTargetsRFTandInverseGain/RangeFalseTargetsRFTandInverseGain.java
index 479e8495fe784fb6de1d9758a30a4d081f9e066f..5c099d810297a69dd7dbee55e3fd8aea82ad6f92 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/RangeFalseTargetsRFTandInverseGain/RangeFalseTargetsRFTandInverseGain.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandFalseTarget/RangeFalseTargetsRFTandInverseGain/RangeFalseTargetsRFTandInverseGain.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.AngleandFalseTarget.RangeFalseTargetsRFTandInverseGain;
+package edu.nps.moves.dis7.jammers.Deception.AngleandFalseTarget.RangeFalseTargetsRFTandInverseGain;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/AngleandGateStealer.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/AngleandGateStealer.java
similarity index 66%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/AngleandGateStealer.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/AngleandGateStealer.java
index ac1464af1816cffb0f1b3b10d668b7ba08db7491..0625374ba51aa8b19444191a7d6d75144d36a7de 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/AngleandGateStealer.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/AngleandGateStealer.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.AngleandGateStealer;
+package edu.nps.moves.dis7.jammers.Deception.AngleandGateStealer;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/Cross_Polarization_RGPOandVGPO/Cross_Polarization_RGPOandVGPO.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/Cross_Polarization_RGPOandVGPO/Cross_Polarization_RGPOandVGPO.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/Cross_Polarization_RGPOandVGPO/Cross_Polarization_RGPOandVGPO.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/Cross_Polarization_RGPOandVGPO/Cross_Polarization_RGPOandVGPO.java
index 2cf94c5fababbe9cb5a11264419fab27d5f6bf92..7189baa00e07239baa3eb3da2cb875c1273926e4 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/Cross_Polarization_RGPOandVGPO/Cross_Polarization_RGPOandVGPO.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/Cross_Polarization_RGPOandVGPO/Cross_Polarization_RGPOandVGPO.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.AngleandGateStealer.Cross_Polarization_RGPOandVGPO;
+package edu.nps.moves.dis7.jammers.Deception.AngleandGateStealer.Cross_Polarization_RGPOandVGPO;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/Cross_PolarizationandRangeGatePull_OffRGPO/Cross_PolarizationandRangeGatePull_OffRGPO.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/Cross_PolarizationandRangeGatePull_OffRGPO/Cross_PolarizationandRangeGatePull_OffRGPO.java
similarity index 69%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/Cross_PolarizationandRangeGatePull_OffRGPO/Cross_PolarizationandRangeGatePull_OffRGPO.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/Cross_PolarizationandRangeGatePull_OffRGPO/Cross_PolarizationandRangeGatePull_OffRGPO.java
index 2dc55abef9d0435e9585ff4c3d84c67cd88a83f1..2c1af3a521ce0bf358adc6b90f80a8640640e67b 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/Cross_PolarizationandRangeGatePull_OffRGPO/Cross_PolarizationandRangeGatePull_OffRGPO.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/Cross_PolarizationandRangeGatePull_OffRGPO/Cross_PolarizationandRangeGatePull_OffRGPO.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.AngleandGateStealer.Cross_PolarizationandRangeGatePull_OffRGPO;
+package edu.nps.moves.dis7.jammers.Deception.AngleandGateStealer.Cross_PolarizationandRangeGatePull_OffRGPO;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/Cross_PolarizationandVelocityGatePull_OffVGPO/Cross_PolarizationandVelocityGatePull_OffVGPO.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/Cross_PolarizationandVelocityGatePull_OffVGPO/Cross_PolarizationandVelocityGatePull_OffVGPO.java
similarity index 69%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/Cross_PolarizationandVelocityGatePull_OffVGPO/Cross_PolarizationandVelocityGatePull_OffVGPO.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/Cross_PolarizationandVelocityGatePull_OffVGPO/Cross_PolarizationandVelocityGatePull_OffVGPO.java
index 9fea63105c0e0fec7ce1c0826d21e79038f0b5ae..41aa56856b788654dc65047effb3942ec2b1a618 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/Cross_PolarizationandVelocityGatePull_OffVGPO/Cross_PolarizationandVelocityGatePull_OffVGPO.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/Cross_PolarizationandVelocityGatePull_OffVGPO/Cross_PolarizationandVelocityGatePull_OffVGPO.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.AngleandGateStealer.Cross_PolarizationandVelocityGatePull_OffVGPO;
+package edu.nps.moves.dis7.jammers.Deception.AngleandGateStealer.Cross_PolarizationandVelocityGatePull_OffVGPO;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/InverseGainandRGPO/InverseGainandRGPO.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/InverseGainandRGPO/InverseGainandRGPO.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/InverseGainandRGPO/InverseGainandRGPO.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/InverseGainandRGPO/InverseGainandRGPO.java
index 09cd1d2b4abae005bae3e209b4a573b5ceb2fdea..bebf4476c8d310dd66b706f50549561cec4ea0af 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/InverseGainandRGPO/InverseGainandRGPO.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/InverseGainandRGPO/InverseGainandRGPO.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.AngleandGateStealer.InverseGainandRGPO;
+package edu.nps.moves.dis7.jammers.Deception.AngleandGateStealer.InverseGainandRGPO;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/InverseGainandRGPOandVGPO/InverseGainandRGPOandVGPO.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/InverseGainandRGPOandVGPO/InverseGainandRGPOandVGPO.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/InverseGainandRGPOandVGPO/InverseGainandRGPOandVGPO.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/InverseGainandRGPOandVGPO/InverseGainandRGPOandVGPO.java
index 8cc0119deab30f01bfc01172850b2af5bd6dd94b..24e6d8da8fdf65f2d368e5d969e63b8b4e13adf7 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/InverseGainandRGPOandVGPO/InverseGainandRGPOandVGPO.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/InverseGainandRGPOandVGPO/InverseGainandRGPOandVGPO.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.AngleandGateStealer.InverseGainandRGPOandVGPO;
+package edu.nps.moves.dis7.jammers.Deception.AngleandGateStealer.InverseGainandRGPOandVGPO;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/InverseGainandVGPO/InverseGainandVGPO.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/InverseGainandVGPO/InverseGainandVGPO.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/InverseGainandVGPO/InverseGainandVGPO.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/InverseGainandVGPO/InverseGainandVGPO.java
index 963e007edbd0d7f02889cda248e9187696608002..d95befeeaaa17f3c40014835f8b16f016ab918ed 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/InverseGainandVGPO/InverseGainandVGPO.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/InverseGainandVGPO/InverseGainandVGPO.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.AngleandGateStealer.InverseGainandVGPO;
+package edu.nps.moves.dis7.jammers.Deception.AngleandGateStealer.InverseGainandVGPO;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/RGPOandSSW/RGPOandSSW.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/RGPOandSSW/RGPOandSSW.java
similarity index 67%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/RGPOandSSW/RGPOandSSW.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/RGPOandSSW/RGPOandSSW.java
index 06233054cc1647bae3caa3841a9a199c238b3f75..bfa8cbc53b4455a639ae5b9a0aefeb928fe8d4d8 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/RGPOandSSW/RGPOandSSW.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/RGPOandSSW/RGPOandSSW.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.AngleandGateStealer.RGPOandSSW;
+package edu.nps.moves.dis7.jammers.Deception.AngleandGateStealer.RGPOandSSW;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/SSWandVGPO/SSWandVGPO.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/SSWandVGPO/SSWandVGPO.java
similarity index 67%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/SSWandVGPO/SSWandVGPO.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/SSWandVGPO/SSWandVGPO.java
index 3f5f252d877a9d6c3afe3f32da566d2a13dee4f2..d6a71e1da4bd7d85cb21e3cd07d85b3736584147 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/SSWandVGPO/SSWandVGPO.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandGateStealer/SSWandVGPO/SSWandVGPO.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.AngleandGateStealer.SSWandVGPO;
+package edu.nps.moves.dis7.jammers.Deception.AngleandGateStealer.SSWandVGPO;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandRandomRangeProgramsRANRAP/AngleandRandomRangeProgramsRANRAP.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandRandomRangeProgramsRANRAP/AngleandRandomRangeProgramsRANRAP.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/AngleandRandomRangeProgramsRANRAP/AngleandRandomRangeProgramsRANRAP.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandRandomRangeProgramsRANRAP/AngleandRandomRangeProgramsRANRAP.java
index 999e18c539fee6f6a1956ae9396bd143a3e2a202..1448ff0f9b36ce724f0c39542164e4f92ecb0645 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandRandomRangeProgramsRANRAP/AngleandRandomRangeProgramsRANRAP.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandRandomRangeProgramsRANRAP/AngleandRandomRangeProgramsRANRAP.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.AngleandRandomRangeProgramsRANRAP;
+package edu.nps.moves.dis7.jammers.Deception.AngleandRandomRangeProgramsRANRAP;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandRandomRangeProgramsRANRAP/RANRAPandSSW/RANRAPandSSW.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandRandomRangeProgramsRANRAP/RANRAPandSSW/RANRAPandSSW.java
similarity index 67%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/AngleandRandomRangeProgramsRANRAP/RANRAPandSSW/RANRAPandSSW.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandRandomRangeProgramsRANRAP/RANRAPandSSW/RANRAPandSSW.java
index 4a57dc7bf94108e29cede8540446563f9ed6ce37..412b9e3c1651691b0a279e498b94ade9508462ce 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandRandomRangeProgramsRANRAP/RANRAPandSSW/RANRAPandSSW.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandRandomRangeProgramsRANRAP/RANRAPandSSW/RANRAPandSSW.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.AngleandRandomRangeProgramsRANRAP.RANRAPandSSW;
+package edu.nps.moves.dis7.jammers.Deception.AngleandRandomRangeProgramsRANRAP.RANRAPandSSW;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandVelocity/AngleandVelocity.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandVelocity/AngleandVelocity.java
similarity index 66%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/AngleandVelocity/AngleandVelocity.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandVelocity/AngleandVelocity.java
index e1cc0a116d7f262df4aefd0c40361598d6c77025..625b7573dae6ba01b354675f87e1df520af6a2e0 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandVelocity/AngleandVelocity.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandVelocity/AngleandVelocity.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.AngleandVelocity;
+package edu.nps.moves.dis7.jammers.Deception.AngleandVelocity;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandVelocity/InverseGainandVBM/InverseGainandVBM.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandVelocity/InverseGainandVBM/InverseGainandVBM.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/AngleandVelocity/InverseGainandVBM/InverseGainandVBM.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandVelocity/InverseGainandVBM/InverseGainandVBM.java
index a789d3f740e6fcf6a2c219da3a366b31235db62a..2b08b490ace5afe4a75c5a18302414bbfb17f1eb 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandVelocity/InverseGainandVBM/InverseGainandVBM.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandVelocity/InverseGainandVBM/InverseGainandVBM.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.AngleandVelocity.InverseGainandVBM;
+package edu.nps.moves.dis7.jammers.Deception.AngleandVelocity.InverseGainandVBM;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandVelocity/SSWandVBM/SSWandVBM.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandVelocity/SSWandVBM/SSWandVBM.java
similarity index 67%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/AngleandVelocity/SSWandVBM/SSWandVBM.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandVelocity/SSWandVBM/SSWandVBM.java
index a0c9cda55f6aeb5d7928c3508ba80e8db646076d..0f8b350fc556f0452032a5d0f2d873affc427417 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandVelocity/SSWandVBM/SSWandVBM.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AngleandVelocity/SSWandVBM/SSWandVBM.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.AngleandVelocity.SSWandVBM;
+package edu.nps.moves.dis7.jammers.Deception.AngleandVelocity.SSWandVBM;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AutomaticGainControlAGC/AutomaticGainControlAGC.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/AutomaticGainControlAGC/AutomaticGainControlAGC.java
similarity index 67%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/AutomaticGainControlAGC/AutomaticGainControlAGC.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/AutomaticGainControlAGC/AutomaticGainControlAGC.java
index 57554f0a469c71aacaba723177cca35f9520b4dd..750ee9154c54aa0c2dae5b84d9791fdcc757c6f7 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AutomaticGainControlAGC/AutomaticGainControlAGC.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/AutomaticGainControlAGC/AutomaticGainControlAGC.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.AutomaticGainControlAGC;
+package edu.nps.moves.dis7.jammers.Deception.AutomaticGainControlAGC;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Colinear/Colinear.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Colinear/Colinear.java
similarity index 65%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/Colinear/Colinear.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/Colinear/Colinear.java
index 256fb8be7a102cd6ebd3eaa61c408ec47590339a..4934ae6888606fa7c475ded33885962b9a284f1d 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Colinear/Colinear.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Colinear/Colinear.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.Colinear;
+package edu.nps.moves.dis7.jammers.Deception.Colinear;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/ConstantFalseAlarmRate/ConstantFalseAlarmRate.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/ConstantFalseAlarmRate/ConstantFalseAlarmRate.java
similarity index 67%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/ConstantFalseAlarmRate/ConstantFalseAlarmRate.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/ConstantFalseAlarmRate/ConstantFalseAlarmRate.java
index cf8068f029983f1b09a5edcce5fc29e8e7fbc6c4..d27a6259e83b51e3d1e67b1709d3e66aded89a74 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/ConstantFalseAlarmRate/ConstantFalseAlarmRate.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/ConstantFalseAlarmRate/ConstantFalseAlarmRate.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.ConstantFalseAlarmRate;
+package edu.nps.moves.dis7.jammers.Deception.ConstantFalseAlarmRate;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Deception.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Deception.java
similarity index 63%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/Deception.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/Deception.java
index 5b5715be77806c9e584e980d4b15b4b577f9ae02..d9f5409130339159150759d7c33559526d6009b6 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Deception.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Deception.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception;
+package edu.nps.moves.dis7.jammers.Deception;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/DoubleCross/DoubleCross.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/DoubleCross/DoubleCross.java
similarity index 66%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/DoubleCross/DoubleCross.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/DoubleCross/DoubleCross.java
index 97e521fec03550cd30292a3f0ef9a3b8c9ce8aa7..263f265d2914a6069b774705188147f2e1723483 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/DoubleCross/DoubleCross.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/DoubleCross/DoubleCross.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.DoubleCross;
+package edu.nps.moves.dis7.jammers.Deception.DoubleCross;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/DownLink/DownLink.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/DownLink/DownLink.java
similarity index 65%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/DownLink/DownLink.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/DownLink/DownLink.java
index 17f015e591b0401fb29b1ab0c8d93f98d0b439e7..fce111e59abe0097f6c8c96f1aea48c6f943091a 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/DownLink/DownLink.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/DownLink/DownLink.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.DownLink;
+package edu.nps.moves.dis7.jammers.Deception.DownLink;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/CoherentFalseTargets/CoherentFalseTargets.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/FalseTarget/CoherentFalseTargets/CoherentFalseTargets.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/CoherentFalseTargets/CoherentFalseTargets.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/FalseTarget/CoherentFalseTargets/CoherentFalseTargets.java
index f6a01d99f7f48a48ba11b8e6564c6c1b3bd0a34e..d3db69ebe58fd651bf1671aae5a70693562daac1 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/CoherentFalseTargets/CoherentFalseTargets.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/FalseTarget/CoherentFalseTargets/CoherentFalseTargets.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.FalseTarget.CoherentFalseTargets;
+package edu.nps.moves.dis7.jammers.Deception.FalseTarget.CoherentFalseTargets;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/FalseDopplerTargetFDT/FalseDopplerTargetFDT.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/FalseTarget/FalseDopplerTargetFDT/FalseDopplerTargetFDT.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/FalseDopplerTargetFDT/FalseDopplerTargetFDT.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/FalseTarget/FalseDopplerTargetFDT/FalseDopplerTargetFDT.java
index 7c2a1fd489cd99f0f3fefd7cfe4eed48dadd374e..029907866acea6a852b4732440bdcce71e372c8c 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/FalseDopplerTargetFDT/FalseDopplerTargetFDT.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/FalseTarget/FalseDopplerTargetFDT/FalseDopplerTargetFDT.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.FalseTarget.FalseDopplerTargetFDT;
+package edu.nps.moves.dis7.jammers.Deception.FalseTarget.FalseDopplerTargetFDT;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/FalseTarget.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/FalseTarget/FalseTarget.java
similarity index 66%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/FalseTarget.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/FalseTarget/FalseTarget.java
index cc0e6be6c5e68ec0eadb9d64e15599d1f819f929..ca52a94b4ea6dc453fcd272a4e2dd46db382c17d 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/FalseTarget.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/FalseTarget/FalseTarget.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.FalseTarget;
+package edu.nps.moves.dis7.jammers.Deception.FalseTarget;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/MultipleFalseTargets/MultipleFalseTargets.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/FalseTarget/MultipleFalseTargets/MultipleFalseTargets.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/MultipleFalseTargets/MultipleFalseTargets.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/FalseTarget/MultipleFalseTargets/MultipleFalseTargets.java
index 3eb2b69c72a119fa08e9fe0214bdbf8fb60de98d..3c2c8afe457d12d2b3ae22e670f133c60410674f 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/MultipleFalseTargets/MultipleFalseTargets.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/FalseTarget/MultipleFalseTargets/MultipleFalseTargets.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.FalseTarget.MultipleFalseTargets;
+package edu.nps.moves.dis7.jammers.Deception.FalseTarget.MultipleFalseTargets;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/RangeFalseTargetsRFT/RangeFalseTargetsRFT.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/FalseTarget/RangeFalseTargetsRFT/RangeFalseTargetsRFT.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/RangeFalseTargetsRFT/RangeFalseTargetsRFT.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/FalseTarget/RangeFalseTargetsRFT/RangeFalseTargetsRFT.java
index 18b10f81cb3b50a17602f27dacb1721ced7e94b0..d747af5c5e6fb763b5bec61afc269572c7f977e8 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/RangeFalseTargetsRFT/RangeFalseTargetsRFT.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/FalseTarget/RangeFalseTargetsRFT/RangeFalseTargetsRFT.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.FalseTarget.RangeFalseTargetsRFT;
+package edu.nps.moves.dis7.jammers.Deception.FalseTarget.RangeFalseTargetsRFT;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/Transponder/Transponder.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/FalseTarget/Transponder/Transponder.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/Transponder/Transponder.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/FalseTarget/Transponder/Transponder.java
index 85fc64bf3d460d78c7899280ab3ca5c2109d0d56..c3f02d9a78fd8c3c6754b41e0e862e20e35212d0 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/Transponder/Transponder.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/FalseTarget/Transponder/Transponder.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.FalseTarget.Transponder;
+package edu.nps.moves.dis7.jammers.Deception.FalseTarget.Transponder;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/VelocityFalseTargetsVFT/VelocityFalseTargetsVFT.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/FalseTarget/VelocityFalseTargetsVFT/VelocityFalseTargetsVFT.java
similarity index 69%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/VelocityFalseTargetsVFT/VelocityFalseTargetsVFT.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/FalseTarget/VelocityFalseTargetsVFT/VelocityFalseTargetsVFT.java
index bb72844807e72d0b1415d1b110c0404b1fe4ff3d..46c96a14ed6723b5fed3081f7f4e34d5d6f10a42 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/VelocityFalseTargetsVFT/VelocityFalseTargetsVFT.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/FalseTarget/VelocityFalseTargetsVFT/VelocityFalseTargetsVFT.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.FalseTarget.VelocityFalseTargetsVFT;
+package edu.nps.moves.dis7.jammers.Deception.FalseTarget.VelocityFalseTargetsVFT;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/FigureEight/FigureEight.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/FigureEight/FigureEight.java
similarity index 66%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/FigureEight/FigureEight.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/FigureEight/FigureEight.java
index 365c2a49c2cbfd3a8acc7b77fa50d6a9b79c8766..ebab2b0cd621dde7ec8aa7dc0a9d0196ff2e7546 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/FigureEight/FigureEight.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/FigureEight/FigureEight.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.FigureEight;
+package edu.nps.moves.dis7.jammers.Deception.FigureEight;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealer/ChirpGateStealerCGS/ChirpGateStealerCGS.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/GateStealer/ChirpGateStealerCGS/ChirpGateStealerCGS.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/GateStealer/ChirpGateStealerCGS/ChirpGateStealerCGS.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/GateStealer/ChirpGateStealerCGS/ChirpGateStealerCGS.java
index e7ad3e4083e6ed6f6caabc3248373189c776569e..9e4f7a5d3393c846dd4905457d8e7f28389d2917 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealer/ChirpGateStealerCGS/ChirpGateStealerCGS.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/GateStealer/ChirpGateStealerCGS/ChirpGateStealerCGS.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.GateStealer.ChirpGateStealerCGS;
+package edu.nps.moves.dis7.jammers.Deception.GateStealer.ChirpGateStealerCGS;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealer/GateStealer.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/GateStealer/GateStealer.java
similarity index 66%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/GateStealer/GateStealer.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/GateStealer/GateStealer.java
index f7dbf4e4f954c6ef31408a770eea9858074b31e1..edfb48fd3c2091bf665912e8cc561519d4ad5ffc 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealer/GateStealer.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/GateStealer/GateStealer.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.GateStealer;
+package edu.nps.moves.dis7.jammers.Deception.GateStealer;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealer/RGPOandVGPO/RGPOandVGPO.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/GateStealer/RGPOandVGPO/RGPOandVGPO.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/GateStealer/RGPOandVGPO/RGPOandVGPO.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/GateStealer/RGPOandVGPO/RGPOandVGPO.java
index 05f668deab0ac116e15dfac6d6421dea1aa4f24b..2e5ae0b8771c01fc029e12d0f0655de49c98e02b 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealer/RGPOandVGPO/RGPOandVGPO.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/GateStealer/RGPOandVGPO/RGPOandVGPO.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.GateStealer.RGPOandVGPO;
+package edu.nps.moves.dis7.jammers.Deception.GateStealer.RGPOandVGPO;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealer/RangeGatePull_OffRGPO/RangeGatePull_OffRGPO.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/GateStealer/RangeGatePull_OffRGPO/RangeGatePull_OffRGPO.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/GateStealer/RangeGatePull_OffRGPO/RangeGatePull_OffRGPO.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/GateStealer/RangeGatePull_OffRGPO/RangeGatePull_OffRGPO.java
index 369a235df06204314148561ee309f675e98ec160..c86641e344472d4d35046b800b12e768c32d4fef 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealer/RangeGatePull_OffRGPO/RangeGatePull_OffRGPO.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/GateStealer/RangeGatePull_OffRGPO/RangeGatePull_OffRGPO.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.GateStealer.RangeGatePull_OffRGPO;
+package edu.nps.moves.dis7.jammers.Deception.GateStealer.RangeGatePull_OffRGPO;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealer/VGPOakaVelocityGateStealer_VGS/VGPOakaVelocityGateStealer_VGS.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/GateStealer/VGPOakaVelocityGateStealer_VGS/VGPOakaVelocityGateStealer_VGS.java
similarity index 69%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/GateStealer/VGPOakaVelocityGateStealer_VGS/VGPOakaVelocityGateStealer_VGS.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/GateStealer/VGPOakaVelocityGateStealer_VGS/VGPOakaVelocityGateStealer_VGS.java
index 49d512a294557e9ad8984615f456aeba04429af8..d6eb9495cefd82d05086311b725f397bad991aab 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealer/VGPOakaVelocityGateStealer_VGS/VGPOakaVelocityGateStealer_VGS.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/GateStealer/VGPOakaVelocityGateStealer_VGS/VGPOakaVelocityGateStealer_VGS.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.GateStealer.VGPOakaVelocityGateStealer_VGS;
+package edu.nps.moves.dis7.jammers.Deception.GateStealer.VGPOakaVelocityGateStealer_VGS;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealerandRepeater/GateStealerandRepeater.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/GateStealerandRepeater/GateStealerandRepeater.java
similarity index 67%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/GateStealerandRepeater/GateStealerandRepeater.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/GateStealerandRepeater/GateStealerandRepeater.java
index 0b3de0a1cc98b0710c37913dd7af4b63e195f67e..0fd1571043bfc43f823e7edba6992f8670ddef68 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealerandRepeater/GateStealerandRepeater.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/GateStealerandRepeater/GateStealerandRepeater.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.GateStealerandRepeater;
+package edu.nps.moves.dis7.jammers.Deception.GateStealerandRepeater;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealerandRepeater/RepeaterSweptAmplitudeModulationRSAMandVGPO/RepeaterSweptAmplitudeModulationRSAMandVGPO.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/GateStealerandRepeater/RepeaterSweptAmplitudeModulationRSAMandVGPO/RepeaterSweptAmplitudeModulationRSAMandVGPO.java
similarity index 69%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/GateStealerandRepeater/RepeaterSweptAmplitudeModulationRSAMandVGPO/RepeaterSweptAmplitudeModulationRSAMandVGPO.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/GateStealerandRepeater/RepeaterSweptAmplitudeModulationRSAMandVGPO/RepeaterSweptAmplitudeModulationRSAMandVGPO.java
index 227bd7a770891256e80d23fb24b4c1dacbde9ed6..c54b2f07da5e1d8f6d4eac565d247a2894e6acb0 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealerandRepeater/RepeaterSweptAmplitudeModulationRSAMandVGPO/RepeaterSweptAmplitudeModulationRSAMandVGPO.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/GateStealerandRepeater/RepeaterSweptAmplitudeModulationRSAMandVGPO/RepeaterSweptAmplitudeModulationRSAMandVGPO.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.GateStealerandRepeater.RepeaterSweptAmplitudeModulationRSAMandVGPO;
+package edu.nps.moves.dis7.jammers.Deception.GateStealerandRepeater.RepeaterSweptAmplitudeModulationRSAMandVGPO;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/GlintEnhance/GlintEnhance.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/GlintEnhance/GlintEnhance.java
similarity index 66%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/GlintEnhance/GlintEnhance.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/GlintEnhance/GlintEnhance.java
index 93823d4adeac13f938a696f341d5ef6d5cfb0f14..44553b829dba5992bc1c50a6f3b21040807c9240 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/GlintEnhance/GlintEnhance.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/GlintEnhance/GlintEnhance.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.GlintEnhance;
+package edu.nps.moves.dis7.jammers.Deception.GlintEnhance;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/ImageFrequency/ImageFrequency.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/ImageFrequency/ImageFrequency.java
similarity index 66%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/ImageFrequency/ImageFrequency.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/ImageFrequency/ImageFrequency.java
index c6eb2ac1a8a1c4740347384b55d500f65e572293..8ebdae982accf6c5d2e2f6240f377a4a1277fcbf 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/ImageFrequency/ImageFrequency.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/ImageFrequency/ImageFrequency.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.ImageFrequency;
+package edu.nps.moves.dis7.jammers.Deception.ImageFrequency;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/JitteredPulseRepetitionFrequency/JitteredPulseRepetitionFrequency.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/JitteredPulseRepetitionFrequency/JitteredPulseRepetitionFrequency.java
similarity index 67%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/JitteredPulseRepetitionFrequency/JitteredPulseRepetitionFrequency.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/JitteredPulseRepetitionFrequency/JitteredPulseRepetitionFrequency.java
index f4ae1ceadaa9613ea4ccaa332d47c0800922931f..b283bd8fdd1452d08b512ce3544b92756787d144 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/JitteredPulseRepetitionFrequency/JitteredPulseRepetitionFrequency.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/JitteredPulseRepetitionFrequency/JitteredPulseRepetitionFrequency.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.JitteredPulseRepetitionFrequency;
+package edu.nps.moves.dis7.jammers.Deception.JitteredPulseRepetitionFrequency;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/JitteredPulseWidth/JitteredPulseWidth.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/JitteredPulseWidth/JitteredPulseWidth.java
similarity index 66%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/JitteredPulseWidth/JitteredPulseWidth.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/JitteredPulseWidth/JitteredPulseWidth.java
index 82451ff1842c31a9e1ba00c1ca1be4033bf70a1e..d1c024dbb304af132602ef8a443f84edba4d2066 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/JitteredPulseWidth/JitteredPulseWidth.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/JitteredPulseWidth/JitteredPulseWidth.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.JitteredPulseWidth;
+package edu.nps.moves.dis7.jammers.Deception.JitteredPulseWidth;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/PseudorandomNoisePRN/PseudorandomNoisePRN.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/PseudorandomNoisePRN/PseudorandomNoisePRN.java
similarity index 67%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/PseudorandomNoisePRN/PseudorandomNoisePRN.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/PseudorandomNoisePRN/PseudorandomNoisePRN.java
index 350a066680ff956866d557d788d1bd851cc5d2a5..81a17f94eb9a532fd4ea8ab4f4068ad4c84c3782 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/PseudorandomNoisePRN/PseudorandomNoisePRN.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/PseudorandomNoisePRN/PseudorandomNoisePRN.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.PseudorandomNoisePRN;
+package edu.nps.moves.dis7.jammers.Deception.PseudorandomNoisePRN;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Pulse/Pulse.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Pulse/Pulse.java
similarity index 65%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/Pulse/Pulse.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/Pulse/Pulse.java
index 744440eae58ab9edc298882e1fe983758a2b44ee..4d18bcc25c9c6ca5380feda8aa5d09b393121a67 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Pulse/Pulse.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Pulse/Pulse.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.Pulse;
+package edu.nps.moves.dis7.jammers.Deception.Pulse;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/PulseCompressionDeception/PulseCompressionDeception.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/PulseCompressionDeception/PulseCompressionDeception.java
similarity index 67%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/PulseCompressionDeception/PulseCompressionDeception.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/PulseCompressionDeception/PulseCompressionDeception.java
index 9163826299a735b2ec617fdb3deef3f6dd5e51ce..dfad96ad919dc58d7d39b837090824436e05ebb9 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/PulseCompressionDeception/PulseCompressionDeception.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/PulseCompressionDeception/PulseCompressionDeception.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.PulseCompressionDeception;
+package edu.nps.moves.dis7.jammers.Deception.PulseCompressionDeception;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/RandomRangeProgramsRANRAP/RandomRangeProgramsRANRAP.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/RandomRangeProgramsRANRAP/RandomRangeProgramsRANRAP.java
similarity index 67%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/RandomRangeProgramsRANRAP/RandomRangeProgramsRANRAP.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/RandomRangeProgramsRANRAP/RandomRangeProgramsRANRAP.java
index e85580a3a82f42f7b613d364358e8666a0d04ce8..b92029c3729a1cb5d44602da6dac5257fbba88ef 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/RandomRangeProgramsRANRAP/RandomRangeProgramsRANRAP.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/RandomRangeProgramsRANRAP/RandomRangeProgramsRANRAP.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.RandomRangeProgramsRANRAP;
+package edu.nps.moves.dis7.jammers.Deception.RandomRangeProgramsRANRAP;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Refraction/Refraction.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Refraction/Refraction.java
similarity index 66%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/Refraction/Refraction.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/Refraction/Refraction.java
index f0d9d370c57e530dac35a30c41e71d4e5407fb4a..5dddeb3aca2571be4eb2ad8765151b7707404411 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Refraction/Refraction.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Refraction/Refraction.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.Refraction;
+package edu.nps.moves.dis7.jammers.Deception.Refraction;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/ContinuousWaveRepeater/ContinuousWaveRepeater.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/ContinuousWaveRepeater/ContinuousWaveRepeater.java
similarity index 69%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/ContinuousWaveRepeater/ContinuousWaveRepeater.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/ContinuousWaveRepeater/ContinuousWaveRepeater.java
index a3c971bcaa7e5ecc18fc06d3a25bf47101462e67..2816e8d8e72c4d6e9bf2424995553d0cfed0c182 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/ContinuousWaveRepeater/ContinuousWaveRepeater.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/ContinuousWaveRepeater/ContinuousWaveRepeater.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.Repeater.ContinuousWaveRepeater;
+package edu.nps.moves.dis7.jammers.Deception.Repeater.ContinuousWaveRepeater;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/MultipleFrequencyRepeaterMFR/MultipleFrequencyRepeaterMFR.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/MultipleFrequencyRepeaterMFR/MultipleFrequencyRepeaterMFR.java
similarity index 69%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/MultipleFrequencyRepeaterMFR/MultipleFrequencyRepeaterMFR.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/MultipleFrequencyRepeaterMFR/MultipleFrequencyRepeaterMFR.java
index e998fef720654ae2db5cfaaab351409493bcf69f..96e8823691d0f029ff46a24ac686a9e78335e134 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/MultipleFrequencyRepeaterMFR/MultipleFrequencyRepeaterMFR.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/MultipleFrequencyRepeaterMFR/MultipleFrequencyRepeaterMFR.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.Repeater.MultipleFrequencyRepeaterMFR;
+package edu.nps.moves.dis7.jammers.Deception.Repeater.MultipleFrequencyRepeaterMFR;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/NarrowBandRepeaterNoiseNBRN/NarrowBandRepeaterNoiseNBRN.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/NarrowBandRepeaterNoiseNBRN/NarrowBandRepeaterNoiseNBRN.java
similarity index 69%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/NarrowBandRepeaterNoiseNBRN/NarrowBandRepeaterNoiseNBRN.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/NarrowBandRepeaterNoiseNBRN/NarrowBandRepeaterNoiseNBRN.java
index 78eeed1b1212b6f5fb5d983f93ecfdd8555f5847..fbbac1bfdfe408ea1d6512f581bffa03bba3d807 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/NarrowBandRepeaterNoiseNBRN/NarrowBandRepeaterNoiseNBRN.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/NarrowBandRepeaterNoiseNBRN/NarrowBandRepeaterNoiseNBRN.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.Repeater.NarrowBandRepeaterNoiseNBRN;
+package edu.nps.moves.dis7.jammers.Deception.Repeater.NarrowBandRepeaterNoiseNBRN;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RandomDopplerRD/RandomDopplerRD.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RandomDopplerRD/RandomDopplerRD.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RandomDopplerRD/RandomDopplerRD.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RandomDopplerRD/RandomDopplerRD.java
index 887bf7f1f2df7d552524bd48f760d06f202437d2..e8d32ba1da91405c4371fbf0e0ba3cfa5ed49ee5 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RandomDopplerRD/RandomDopplerRD.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RandomDopplerRD/RandomDopplerRD.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.Repeater.RandomDopplerRD;
+package edu.nps.moves.dis7.jammers.Deception.Repeater.RandomDopplerRD;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/Repeater.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/Repeater.java
similarity index 65%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/Repeater.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/Repeater.java
index f28517cb8ec495a07172ad11520026ee47ac4da0..27da364ad0fea426a70d7c86de6409809895caba 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/Repeater.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/Repeater.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.Repeater;
+package edu.nps.moves.dis7.jammers.Deception.Repeater;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelA/DRFMLevelA.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelA/DRFMLevelA.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelA/DRFMLevelA.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelA/DRFMLevelA.java
index 1424d09ec813dfb29441844c963d2417d45c2cd1..9b11b732dd84c7b0f99003b53985d7c7ceb86961 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelA/DRFMLevelA.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelA/DRFMLevelA.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.Repeater.RepeaterDigitalRadioFrequencyMemoryDRFM.DRFMLevelA;
+package edu.nps.moves.dis7.jammers.Deception.Repeater.RepeaterDigitalRadioFrequencyMemoryDRFM.DRFMLevelA;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelB/DRFMLevelB.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelB/DRFMLevelB.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelB/DRFMLevelB.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelB/DRFMLevelB.java
index 6dd9d74c96da93756713abb96a444697a0e60ec4..0bee611f5030c40772fceb0f1c6a0b22caa942d3 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelB/DRFMLevelB.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelB/DRFMLevelB.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.Repeater.RepeaterDigitalRadioFrequencyMemoryDRFM.DRFMLevelB;
+package edu.nps.moves.dis7.jammers.Deception.Repeater.RepeaterDigitalRadioFrequencyMemoryDRFM.DRFMLevelB;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelC/DRFMLevelC.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelC/DRFMLevelC.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelC/DRFMLevelC.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelC/DRFMLevelC.java
index 5b89520f7736264dfabaca68b2e1f1576aa7acc4..2e7445d2e146e91832bdc477af0fbb50ce904ad1 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelC/DRFMLevelC.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelC/DRFMLevelC.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.Repeater.RepeaterDigitalRadioFrequencyMemoryDRFM.DRFMLevelC;
+package edu.nps.moves.dis7.jammers.Deception.Repeater.RepeaterDigitalRadioFrequencyMemoryDRFM.DRFMLevelC;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelD/DRFMLevelD.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelD/DRFMLevelD.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelD/DRFMLevelD.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelD/DRFMLevelD.java
index fa819b6e601b292fe60e80c34bbebcfffd4bfd3f..3136d015d41782aaedee589aed34ebe234491e79 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelD/DRFMLevelD.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelD/DRFMLevelD.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.Repeater.RepeaterDigitalRadioFrequencyMemoryDRFM.DRFMLevelD;
+package edu.nps.moves.dis7.jammers.Deception.Repeater.RepeaterDigitalRadioFrequencyMemoryDRFM.DRFMLevelD;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelE/DRFMLevelE.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelE/DRFMLevelE.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelE/DRFMLevelE.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelE/DRFMLevelE.java
index 584f2c05c599cc840103cc0d30bcabb8852b1d45..935771632d571610cdbb74f1c2a58e8fa80035a7 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelE/DRFMLevelE.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelE/DRFMLevelE.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.Repeater.RepeaterDigitalRadioFrequencyMemoryDRFM.DRFMLevelE;
+package edu.nps.moves.dis7.jammers.Deception.Repeater.RepeaterDigitalRadioFrequencyMemoryDRFM.DRFMLevelE;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/RepeaterDigitalRadioFrequencyMemoryDRFM.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/RepeaterDigitalRadioFrequencyMemoryDRFM.java
similarity index 70%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/RepeaterDigitalRadioFrequencyMemoryDRFM.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/RepeaterDigitalRadioFrequencyMemoryDRFM.java
index 3d753ff9313996cdcb83fe094eb908cba51666d0..7ecdf0cbe0bba2f85d6c875028776c02409037d1 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/RepeaterDigitalRadioFrequencyMemoryDRFM.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/RepeaterDigitalRadioFrequencyMemoryDRFM.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.Repeater.RepeaterDigitalRadioFrequencyMemoryDRFM;
+package edu.nps.moves.dis7.jammers.Deception.Repeater.RepeaterDigitalRadioFrequencyMemoryDRFM;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterNoise/RepeaterNoise.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterNoise/RepeaterNoise.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterNoise/RepeaterNoise.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterNoise/RepeaterNoise.java
index 0eaa8cb36884e04801719a1ef2d7baeeb8c8e3c4..23606fb3c869d210347e546e1d93eeccf0b3389c 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterNoise/RepeaterNoise.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterNoise/RepeaterNoise.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.Repeater.RepeaterNoise;
+package edu.nps.moves.dis7.jammers.Deception.Repeater.RepeaterNoise;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterSweptAmplitudeModulationRSAM/RepeaterSweptAmplitudeModulationRSAM.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterSweptAmplitudeModulationRSAM/RepeaterSweptAmplitudeModulationRSAM.java
similarity index 69%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterSweptAmplitudeModulationRSAM/RepeaterSweptAmplitudeModulationRSAM.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterSweptAmplitudeModulationRSAM/RepeaterSweptAmplitudeModulationRSAM.java
index 8eaa2ab3126bb0a4c32529992779265c523b3fc5..241e344551428b4477483a4df7eb3e627d95489c 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterSweptAmplitudeModulationRSAM/RepeaterSweptAmplitudeModulationRSAM.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Repeater/RepeaterSweptAmplitudeModulationRSAM/RepeaterSweptAmplitudeModulationRSAM.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.Repeater.RepeaterSweptAmplitudeModulationRSAM;
+package edu.nps.moves.dis7.jammers.Deception.Repeater.RepeaterSweptAmplitudeModulationRSAM;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Scintillation/Scintillation.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Scintillation/Scintillation.java
similarity index 66%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/Scintillation/Scintillation.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/Scintillation/Scintillation.java
index 118d883badc73b179c89728d0cc9a4845453a976..15d2591e2965b50e1436b29a920024b67a3c06e8 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Scintillation/Scintillation.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Scintillation/Scintillation.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.Scintillation;
+package edu.nps.moves.dis7.jammers.Deception.Scintillation;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Serrodyne/Serrodyne.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Serrodyne/Serrodyne.java
similarity index 65%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/Serrodyne/Serrodyne.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/Serrodyne/Serrodyne.java
index 77fe9196645f7cbced1df29b5b2b349abb39f9be..c6c6c9d4011fc24f43df427bd17e1653a7340b7c 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Serrodyne/Serrodyne.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Serrodyne/Serrodyne.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.Serrodyne;
+package edu.nps.moves.dis7.jammers.Deception.Serrodyne;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Velocity/Velocity.java b/src-generated/edu/nps/moves/dis7/jammers/Deception/Velocity/Velocity.java
similarity index 65%
rename from src-generated/edu/nps/moves/dis/jammers/Deception/Velocity/Velocity.java
rename to src-generated/edu/nps/moves/dis7/jammers/Deception/Velocity/Velocity.java
index 1b363096e612a42a54c53509c5041f190eab7b3f..0a215fabf397a50b4855f6dea111b53918d48d7b 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Velocity/Velocity.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Deception/Velocity/Velocity.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Deception.Velocity;
+package edu.nps.moves.dis7.jammers.Deception.Velocity;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandFMbyNoise/AngleandFMbyNoise.java b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandFMbyNoise/AngleandFMbyNoise.java
similarity index 66%
rename from src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandFMbyNoise/AngleandFMbyNoise.java
rename to src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandFMbyNoise/AngleandFMbyNoise.java
index 5979b70bc254256771f3b45559f6535cf11b167e..14440c1ac9eb3ab0b49ea029d49845a353521c47 100644
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandFMbyNoise/AngleandFMbyNoise.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandFMbyNoise/AngleandFMbyNoise.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise.AngleandFMbyNoise;
+package edu.nps.moves.dis7.jammers.DeceptionandNoise.AngleandFMbyNoise;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandFMbyNoise/FMbyNoiseandInverseGain/FMbyNoiseandInverseGain.java b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandFMbyNoise/FMbyNoiseandInverseGain/FMbyNoiseandInverseGain.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandFMbyNoise/FMbyNoiseandInverseGain/FMbyNoiseandInverseGain.java
rename to src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandFMbyNoise/FMbyNoiseandInverseGain/FMbyNoiseandInverseGain.java
index 633a787869a73fec71911faa695371e3bc339e5d..7a7446500fd0e26cf934299145470981525ebcd8 100644
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandFMbyNoise/FMbyNoiseandInverseGain/FMbyNoiseandInverseGain.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandFMbyNoise/FMbyNoiseandInverseGain/FMbyNoiseandInverseGain.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise.AngleandFMbyNoise.FMbyNoiseandInverseGain;
+package edu.nps.moves.dis7.jammers.DeceptionandNoise.AngleandFMbyNoise.FMbyNoiseandInverseGain;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandFMbyNoise/FMbyNoiseandSSW/FMbyNoiseandSSW.java b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandFMbyNoise/FMbyNoiseandSSW/FMbyNoiseandSSW.java
similarity index 67%
rename from src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandFMbyNoise/FMbyNoiseandSSW/FMbyNoiseandSSW.java
rename to src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandFMbyNoise/FMbyNoiseandSSW/FMbyNoiseandSSW.java
index 8bbe38a14ffd4e0cf5111e814851e72fcfd29ba5..ce9b7ed972594b7de816bd3c50b8b0d359ad81fe 100644
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandFMbyNoise/FMbyNoiseandSSW/FMbyNoiseandSSW.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandFMbyNoise/FMbyNoiseandSSW/FMbyNoiseandSSW.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise.AngleandFMbyNoise.FMbyNoiseandSSW;
+package edu.nps.moves.dis7.jammers.DeceptionandNoise.AngleandFMbyNoise.FMbyNoiseandSSW;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/AngleandBarrage.java b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/AngleandBarrage.java
similarity index 67%
rename from src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/AngleandBarrage.java
rename to src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/AngleandBarrage.java
index 9a2b6cc65364c618cf3030d56d1a9f554150ea3d..70d2427b35aaec9299e972e04218d2aff12e39c6 100644
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/AngleandBarrage.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/AngleandBarrage.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise.AngleandNoise.AngleandBarrage;
+package edu.nps.moves.dis7.jammers.DeceptionandNoise.AngleandNoise.AngleandBarrage;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/BarrageandInverseGain/BarrageandInverseGain.java b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/BarrageandInverseGain/BarrageandInverseGain.java
similarity index 69%
rename from src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/BarrageandInverseGain/BarrageandInverseGain.java
rename to src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/BarrageandInverseGain/BarrageandInverseGain.java
index 2a823b473fa27b2f13cb3c003970fcd0f36ffc44..335e02088023441ec605d6540b260eee4f7e71ac 100644
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/BarrageandInverseGain/BarrageandInverseGain.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/BarrageandInverseGain/BarrageandInverseGain.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise.AngleandNoise.AngleandBarrage.BarrageandInverseGain;
+package edu.nps.moves.dis7.jammers.DeceptionandNoise.AngleandNoise.AngleandBarrage.BarrageandInverseGain;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/BarrageandSSW/BarrageandSSW.java b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/BarrageandSSW/BarrageandSSW.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/BarrageandSSW/BarrageandSSW.java
rename to src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/BarrageandSSW/BarrageandSSW.java
index 141736ea46c4817954d0ed49a03cd447f977e1cc..96734b731914ab1956ed62a74ca63a0782bb3987 100644
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/BarrageandSSW/BarrageandSSW.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/BarrageandSSW/BarrageandSSW.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise.AngleandNoise.AngleandBarrage.BarrageandSSW;
+package edu.nps.moves.dis7.jammers.DeceptionandNoise.AngleandNoise.AngleandBarrage.BarrageandSSW;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandNoise/AngleandNoise.java b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandNoise/AngleandNoise.java
similarity index 65%
rename from src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandNoise/AngleandNoise.java
rename to src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandNoise/AngleandNoise.java
index f46d690e755d803b628bb2b50a48e55d8a9fa819..8f01200372978b85102b959ef22b9c2f32424cc4 100644
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandNoise/AngleandNoise.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandNoise/AngleandNoise.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise.AngleandNoise;
+package edu.nps.moves.dis7.jammers.DeceptionandNoise.AngleandNoise;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandPseudorandomAM/AngleandPseudorandomAM.java b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandPseudorandomAM/AngleandPseudorandomAM.java
similarity index 66%
rename from src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandPseudorandomAM/AngleandPseudorandomAM.java
rename to src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandPseudorandomAM/AngleandPseudorandomAM.java
index d31df66394cf2a350244fb777c7156e5064aa11f..b92fa7102c4cd0050f4bf705b7b00b65cc6dd423 100644
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandPseudorandomAM/AngleandPseudorandomAM.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandPseudorandomAM/AngleandPseudorandomAM.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise.AngleandPseudorandomAM;
+package edu.nps.moves.dis7.jammers.DeceptionandNoise.AngleandPseudorandomAM;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandPseudorandomAM/InverseGainandPseudorandomAM/InverseGainandPseudorandomAM.java b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandPseudorandomAM/InverseGainandPseudorandomAM/InverseGainandPseudorandomAM.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandPseudorandomAM/InverseGainandPseudorandomAM/InverseGainandPseudorandomAM.java
rename to src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandPseudorandomAM/InverseGainandPseudorandomAM/InverseGainandPseudorandomAM.java
index 80ddc26be873f5b3659ec3b9d8b5af1eb46dd2d3..8f9dee23241843aa0da94096cd57d48929f89934 100644
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandPseudorandomAM/InverseGainandPseudorandomAM/InverseGainandPseudorandomAM.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandPseudorandomAM/InverseGainandPseudorandomAM/InverseGainandPseudorandomAM.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise.AngleandPseudorandomAM.InverseGainandPseudorandomAM;
+package edu.nps.moves.dis7.jammers.DeceptionandNoise.AngleandPseudorandomAM.InverseGainandPseudorandomAM;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandPseudorandomAM/PseudorandomAMandSSW/PseudorandomAMandSSW.java b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandPseudorandomAM/PseudorandomAMandSSW/PseudorandomAMandSSW.java
similarity index 67%
rename from src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandPseudorandomAM/PseudorandomAMandSSW/PseudorandomAMandSSW.java
rename to src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandPseudorandomAM/PseudorandomAMandSSW/PseudorandomAMandSSW.java
index 13134b1ed52c17108b7f51f5a5175dc15487f290..057a0361289120163362f4c19bb9b9c5f1afc5b8 100644
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandPseudorandomAM/PseudorandomAMandSSW/PseudorandomAMandSSW.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandPseudorandomAM/PseudorandomAMandSSW/PseudorandomAMandSSW.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise.AngleandPseudorandomAM.PseudorandomAMandSSW;
+package edu.nps.moves.dis7.jammers.DeceptionandNoise.AngleandPseudorandomAM.PseudorandomAMandSSW;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandSpot/AngleandSpot.java b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandSpot/AngleandSpot.java
similarity index 65%
rename from src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandSpot/AngleandSpot.java
rename to src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandSpot/AngleandSpot.java
index a81f67ea3fc8b7ab1a92b83caa25f7b65cf9bb1a..931aa52c890c6e491e273a8b476cae9686020539 100644
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandSpot/AngleandSpot.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandSpot/AngleandSpot.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise.AngleandSpot;
+package edu.nps.moves.dis7.jammers.DeceptionandNoise.AngleandSpot;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandSpot/InverseGainandLowLevelNoise/InverseGainandLowLevelNoise.java b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandSpot/InverseGainandLowLevelNoise/InverseGainandLowLevelNoise.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandSpot/InverseGainandLowLevelNoise/InverseGainandLowLevelNoise.java
rename to src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandSpot/InverseGainandLowLevelNoise/InverseGainandLowLevelNoise.java
index 9f4a3b45a97e8e01a9287f014c3a7d8f3eb3c310..41910aa880917b9d3c24a760e11ad4d53c3775ce 100644
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandSpot/InverseGainandLowLevelNoise/InverseGainandLowLevelNoise.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandSpot/InverseGainandLowLevelNoise/InverseGainandLowLevelNoise.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise.AngleandSpot.InverseGainandLowLevelNoise;
+package edu.nps.moves.dis7.jammers.DeceptionandNoise.AngleandSpot.InverseGainandLowLevelNoise;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandSpot/InverseGainandSpotNoise/InverseGainandSpotNoise.java b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandSpot/InverseGainandSpotNoise/InverseGainandSpotNoise.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandSpot/InverseGainandSpotNoise/InverseGainandSpotNoise.java
rename to src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandSpot/InverseGainandSpotNoise/InverseGainandSpotNoise.java
index f0809ba35d2bbaabca7e2267380e1653b4e7a06d..7f8d1648b190da04dce806d21bc657b780d18a1e 100644
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandSpot/InverseGainandSpotNoise/InverseGainandSpotNoise.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandSpot/InverseGainandSpotNoise/InverseGainandSpotNoise.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise.AngleandSpot.InverseGainandSpotNoise;
+package edu.nps.moves.dis7.jammers.DeceptionandNoise.AngleandSpot.InverseGainandSpotNoise;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandSpot/SpotandSSW/SpotandSSW.java b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandSpot/SpotandSSW/SpotandSSW.java
similarity index 67%
rename from src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandSpot/SpotandSSW/SpotandSSW.java
rename to src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandSpot/SpotandSSW/SpotandSSW.java
index 72aa8ae1383776eaab184c59996c3be257aaf811..43c91b941db2d2520f9fe3df425b5d6aaededdb7 100644
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandSpot/SpotandSSW/SpotandSSW.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/AngleandSpot/SpotandSSW/SpotandSSW.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise.AngleandSpot.SpotandSSW;
+package edu.nps.moves.dis7.jammers.DeceptionandNoise.AngleandSpot.SpotandSSW;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/DeceptionandNoise.java b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/DeceptionandNoise.java
similarity index 64%
rename from src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/DeceptionandNoise.java
rename to src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/DeceptionandNoise.java
index 98bcd5aedba1b3ee81d7e0ba81b23659ddd52a97..4e4ceea997dc205bde051a666767b0f8702e938b 100644
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/DeceptionandNoise.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/DeceptionandNoise.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise;
+package edu.nps.moves.dis7.jammers.DeceptionandNoise;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/FalseTargetDeceptionandSweptNoise/FalseTargetDeceptionandSweptNoise.java b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/FalseTargetDeceptionandSweptNoise/FalseTargetDeceptionandSweptNoise.java
similarity index 67%
rename from src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/FalseTargetDeceptionandSweptNoise/FalseTargetDeceptionandSweptNoise.java
rename to src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/FalseTargetDeceptionandSweptNoise/FalseTargetDeceptionandSweptNoise.java
index ddd95dbd51dd594f334a6ab8d0be61a3d07e4cf5..1d0178f31b9438fd8cc4719e452def2e5bcc73c9 100644
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/FalseTargetDeceptionandSweptNoise/FalseTargetDeceptionandSweptNoise.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/FalseTargetDeceptionandSweptNoise/FalseTargetDeceptionandSweptNoise.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise.FalseTargetDeceptionandSweptNoise;
+package edu.nps.moves.dis7.jammers.DeceptionandNoise.FalseTargetDeceptionandSweptNoise;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/GateStealerandNoise.java b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/GateStealerandNoise/GateStealerandNoise.java
similarity index 66%
rename from src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/GateStealerandNoise.java
rename to src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/GateStealerandNoise/GateStealerandNoise.java
index 9152cdfd81ba80f0da0c822fe1de8ebe21925d77..c2d21ce2da4caff39928c8e3a9de9fc306999eed 100644
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/GateStealerandNoise.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/GateStealerandNoise/GateStealerandNoise.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise.GateStealerandNoise;
+package edu.nps.moves.dis7.jammers.DeceptionandNoise.GateStealerandNoise;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandRGPO/LowLevelNoiseandRGPO/LowLevelNoiseandRGPO.java b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandRGPO/LowLevelNoiseandRGPO/LowLevelNoiseandRGPO.java
similarity index 69%
rename from src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandRGPO/LowLevelNoiseandRGPO/LowLevelNoiseandRGPO.java
rename to src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandRGPO/LowLevelNoiseandRGPO/LowLevelNoiseandRGPO.java
index 84334e5f747c8f1edf5f7a125e3d9a615c0d889d..42ee6ce35c9c38608719a33808660badc5092bfc 100644
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandRGPO/LowLevelNoiseandRGPO/LowLevelNoiseandRGPO.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandRGPO/LowLevelNoiseandRGPO/LowLevelNoiseandRGPO.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise.GateStealerandNoise.NoiseandRGPO.LowLevelNoiseandRGPO;
+package edu.nps.moves.dis7.jammers.DeceptionandNoise.GateStealerandNoise.NoiseandRGPO.LowLevelNoiseandRGPO;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandRGPO/NoiseandRGPO.java b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandRGPO/NoiseandRGPO.java
similarity index 67%
rename from src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandRGPO/NoiseandRGPO.java
rename to src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandRGPO/NoiseandRGPO.java
index 331d25cad727788fef93a0332bc8bde31057f822..df6b30a9097c2413c83f2b3e18372b3db3b59805 100644
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandRGPO/NoiseandRGPO.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandRGPO/NoiseandRGPO.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise.GateStealerandNoise.NoiseandRGPO;
+package edu.nps.moves.dis7.jammers.DeceptionandNoise.GateStealerandNoise.NoiseandRGPO;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandVGPO/LowLevelNoiseandVGPO/LowLevelNoiseandVGPO.java b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandVGPO/LowLevelNoiseandVGPO/LowLevelNoiseandVGPO.java
similarity index 69%
rename from src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandVGPO/LowLevelNoiseandVGPO/LowLevelNoiseandVGPO.java
rename to src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandVGPO/LowLevelNoiseandVGPO/LowLevelNoiseandVGPO.java
index cdee6dab65bb9e0740e9ba259dcaa2682c6c8d41..68013395e5b9f2a2b9c2800415e768ec05d5fa3c 100644
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandVGPO/LowLevelNoiseandVGPO/LowLevelNoiseandVGPO.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandVGPO/LowLevelNoiseandVGPO/LowLevelNoiseandVGPO.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise.GateStealerandNoise.NoiseandVGPO.LowLevelNoiseandVGPO;
+package edu.nps.moves.dis7.jammers.DeceptionandNoise.GateStealerandNoise.NoiseandVGPO.LowLevelNoiseandVGPO;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandVGPO/NoiseandVGPO.java b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandVGPO/NoiseandVGPO.java
similarity index 67%
rename from src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandVGPO/NoiseandVGPO.java
rename to src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandVGPO/NoiseandVGPO.java
index 547889267951474cd1b1cd3a56d3ffe8d5eab836..085950e031ea707f18aca8a4fcd35e2bf8c1c8a5 100644
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandVGPO/NoiseandVGPO.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandVGPO/NoiseandVGPO.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise.GateStealerandNoise.NoiseandVGPO;
+package edu.nps.moves.dis7.jammers.DeceptionandNoise.GateStealerandNoise.NoiseandVGPO;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/AmplitudeModulationAMNoise/AmplitudeModulationAMNoise.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/AmplitudeModulationAMNoise/AmplitudeModulationAMNoise.java
similarity index 67%
rename from src-generated/edu/nps/moves/dis/jammers/Noise/AmplitudeModulationAMNoise/AmplitudeModulationAMNoise.java
rename to src-generated/edu/nps/moves/dis7/jammers/Noise/AmplitudeModulationAMNoise/AmplitudeModulationAMNoise.java
index 5c1d6177b2d9580e0a5f5f75d6699e66f218036c..2c4a96940473bd52e66d63c1a916c22b66f887a0 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/AmplitudeModulationAMNoise/AmplitudeModulationAMNoise.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/AmplitudeModulationAMNoise/AmplitudeModulationAMNoise.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Noise.AmplitudeModulationAMNoise;
+package edu.nps.moves.dis7.jammers.Noise.AmplitudeModulationAMNoise;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/BarrageNoise/BarrageNoise.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/BarrageNoise/BarrageNoise.java
similarity index 66%
rename from src-generated/edu/nps/moves/dis/jammers/Noise/BarrageNoise/BarrageNoise.java
rename to src-generated/edu/nps/moves/dis7/jammers/Noise/BarrageNoise/BarrageNoise.java
index c525a0ee5682a4f7054b831b65747018b0fecd01..60ae4dd263f42bf91c0ce950db9678cf9e9333a3 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/BarrageNoise/BarrageNoise.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/BarrageNoise/BarrageNoise.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Noise.BarrageNoise;
+package edu.nps.moves.dis7.jammers.Noise.BarrageNoise;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/BarrageNoise/Click/Click.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/BarrageNoise/Click/Click.java
similarity index 67%
rename from src-generated/edu/nps/moves/dis/jammers/Noise/BarrageNoise/Click/Click.java
rename to src-generated/edu/nps/moves/dis7/jammers/Noise/BarrageNoise/Click/Click.java
index 8c5b8fc106a5219fa4fcab61a53d633b3fc02d88..f68e613925396cea7a3ac10b353e3ab90b2a3867 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/BarrageNoise/Click/Click.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/BarrageNoise/Click/Click.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Noise.BarrageNoise.Click;
+package edu.nps.moves.dis7.jammers.Noise.BarrageNoise.Click;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/BarrageNoise/SourceNoise/SourceNoise.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/BarrageNoise/SourceNoise/SourceNoise.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/jammers/Noise/BarrageNoise/SourceNoise/SourceNoise.java
rename to src-generated/edu/nps/moves/dis7/jammers/Noise/BarrageNoise/SourceNoise/SourceNoise.java
index b48faf53829f24a2f383100b37561e5887afe9ff..e8ebf94c05d009b2227263c01963658d0280b543 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/BarrageNoise/SourceNoise/SourceNoise.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/BarrageNoise/SourceNoise/SourceNoise.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Noise.BarrageNoise.SourceNoise;
+package edu.nps.moves.dis7.jammers.Noise.BarrageNoise.SourceNoise;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/BistaticClutter/BistaticClutter.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/BistaticClutter/BistaticClutter.java
similarity index 66%
rename from src-generated/edu/nps/moves/dis/jammers/Noise/BistaticClutter/BistaticClutter.java
rename to src-generated/edu/nps/moves/dis7/jammers/Noise/BistaticClutter/BistaticClutter.java
index 2b81937d20776072531b2c902e5b8f103bbcebfc..d7b38490863ad6cbb90131e89605fa90474d3dc3 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/BistaticClutter/BistaticClutter.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/BistaticClutter/BistaticClutter.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Noise.BistaticClutter;
+package edu.nps.moves.dis7.jammers.Noise.BistaticClutter;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/Comb/Comb.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/Comb/Comb.java
similarity index 65%
rename from src-generated/edu/nps/moves/dis/jammers/Noise/Comb/Comb.java
rename to src-generated/edu/nps/moves/dis7/jammers/Noise/Comb/Comb.java
index 34a3b62ed99c006296ff7ce6d84acd6d0be77f80..f2856ab03c42b7851b66c79fc2125b5fb5cf9842 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/Comb/Comb.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/Comb/Comb.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Noise.Comb;
+package edu.nps.moves.dis7.jammers.Noise.Comb;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/CooperativeBlinkedNoiseCBN/CooperativeBlinkedNoiseCBN.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/CooperativeBlinkedNoiseCBN/CooperativeBlinkedNoiseCBN.java
similarity index 67%
rename from src-generated/edu/nps/moves/dis/jammers/Noise/CooperativeBlinkedNoiseCBN/CooperativeBlinkedNoiseCBN.java
rename to src-generated/edu/nps/moves/dis7/jammers/Noise/CooperativeBlinkedNoiseCBN/CooperativeBlinkedNoiseCBN.java
index 0e9987278b6aa9e60f3534013e8512e895e4443c..27cdd1bc81229c7269bd15b19ce354d7db6fb4d1 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/CooperativeBlinkedNoiseCBN/CooperativeBlinkedNoiseCBN.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/CooperativeBlinkedNoiseCBN/CooperativeBlinkedNoiseCBN.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Noise.CooperativeBlinkedNoiseCBN;
+package edu.nps.moves.dis7.jammers.Noise.CooperativeBlinkedNoiseCBN;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/DopplerNoise/DopplerNoise.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/DopplerNoise/DopplerNoise.java
similarity index 66%
rename from src-generated/edu/nps/moves/dis/jammers/Noise/DopplerNoise/DopplerNoise.java
rename to src-generated/edu/nps/moves/dis7/jammers/Noise/DopplerNoise/DopplerNoise.java
index b794241add1b8911c3783809fff6a5172e2d3e4d..8e512a81d8455d7fb7a0b7e4c63b84e03fe11e7e 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/DopplerNoise/DopplerNoise.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/DopplerNoise/DopplerNoise.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Noise.DopplerNoise;
+package edu.nps.moves.dis7.jammers.Noise.DopplerNoise;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/FrequencyModulationFMbyNoise/FrequencyModulationFMbyNoise.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/FrequencyModulationFMbyNoise/FrequencyModulationFMbyNoise.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/jammers/Noise/FrequencyModulationFMbyNoise/FrequencyModulationFMbyNoise.java
rename to src-generated/edu/nps/moves/dis7/jammers/Noise/FrequencyModulationFMbyNoise/FrequencyModulationFMbyNoise.java
index 52c64d749e6e25e5a9cb66c966236646e2a629fa..f0ded17033e2148b6d99b0d68ab08945089a0fd9 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/FrequencyModulationFMbyNoise/FrequencyModulationFMbyNoise.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/FrequencyModulationFMbyNoise/FrequencyModulationFMbyNoise.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Noise.FrequencyModulationFMbyNoise;
+package edu.nps.moves.dis7.jammers.Noise.FrequencyModulationFMbyNoise;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/ImpulseNoise/ImpulseNoise.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/ImpulseNoise/ImpulseNoise.java
similarity index 66%
rename from src-generated/edu/nps/moves/dis/jammers/Noise/ImpulseNoise/ImpulseNoise.java
rename to src-generated/edu/nps/moves/dis7/jammers/Noise/ImpulseNoise/ImpulseNoise.java
index 2b61cf8256185e9abbdfec0b06a8f84f51b7b56c..f0fd806f3529fc36fee6a08d9e2dfad0c4ca0c01 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/ImpulseNoise/ImpulseNoise.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/ImpulseNoise/ImpulseNoise.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Noise.ImpulseNoise;
+package edu.nps.moves.dis7.jammers.Noise.ImpulseNoise;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/Noise.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/Noise.java
similarity index 62%
rename from src-generated/edu/nps/moves/dis/jammers/Noise/Noise.java
rename to src-generated/edu/nps/moves/dis7/jammers/Noise/Noise.java
index f041225e0fba3f67a4fe5adc2657b6196a6dde1b..75e0d57b894b4e5664f2b12b119891c4dbb01051 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/Noise.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/Noise.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Noise;
+package edu.nps.moves.dis7.jammers.Noise;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/PartialBand/PartialBand.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/PartialBand/PartialBand.java
similarity index 66%
rename from src-generated/edu/nps/moves/dis/jammers/Noise/PartialBand/PartialBand.java
rename to src-generated/edu/nps/moves/dis7/jammers/Noise/PartialBand/PartialBand.java
index e12ff5f60bbf556a93f257dd16d8d33fc45cc575..636841b80876fdec01d58635baf7f10f6236a06c 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/PartialBand/PartialBand.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/PartialBand/PartialBand.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Noise.PartialBand;
+package edu.nps.moves.dis7.jammers.Noise.PartialBand;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/PseudorandomAM/PseudorandomAM.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/PseudorandomAM/PseudorandomAM.java
similarity index 66%
rename from src-generated/edu/nps/moves/dis/jammers/Noise/PseudorandomAM/PseudorandomAM.java
rename to src-generated/edu/nps/moves/dis7/jammers/Noise/PseudorandomAM/PseudorandomAM.java
index 872c31d8a44dce7d2502b760697b8352b3393299..18436eabef236a39789826e1ab3b468e86951343 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/PseudorandomAM/PseudorandomAM.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/PseudorandomAM/PseudorandomAM.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Noise.PseudorandomAM;
+package edu.nps.moves.dis7.jammers.Noise.PseudorandomAM;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/PulseNoise/PulseNoise.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/PulseNoise/PulseNoise.java
similarity index 66%
rename from src-generated/edu/nps/moves/dis/jammers/Noise/PulseNoise/PulseNoise.java
rename to src-generated/edu/nps/moves/dis7/jammers/Noise/PulseNoise/PulseNoise.java
index 2f402f92d4f136858b2aa54c51d3cdb483f84b87..44b4c0a0a6186496057eeaa9cd7bada716e91787 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/PulseNoise/PulseNoise.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/PulseNoise/PulseNoise.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Noise.PulseNoise;
+package edu.nps.moves.dis7.jammers.Noise.PulseNoise;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/Quasi_NoiseakaPseudorandom/Quasi_NoiseakaPseudorandom.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/Quasi_NoiseakaPseudorandom/Quasi_NoiseakaPseudorandom.java
similarity index 67%
rename from src-generated/edu/nps/moves/dis/jammers/Noise/Quasi_NoiseakaPseudorandom/Quasi_NoiseakaPseudorandom.java
rename to src-generated/edu/nps/moves/dis7/jammers/Noise/Quasi_NoiseakaPseudorandom/Quasi_NoiseakaPseudorandom.java
index 30c4418aa206fa2741fe460260bd3c3d19ea7abe..f7e25420481651e8f8e659346dfaec82aea1e532 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/Quasi_NoiseakaPseudorandom/Quasi_NoiseakaPseudorandom.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/Quasi_NoiseakaPseudorandom/Quasi_NoiseakaPseudorandom.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Noise.Quasi_NoiseakaPseudorandom;
+package edu.nps.moves.dis7.jammers.Noise.Quasi_NoiseakaPseudorandom;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/RangeBinMaskingRBMakaCoverPulse/RangeBinMaskingRBMakaCoverPulse.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/RangeBinMaskingRBMakaCoverPulse/RangeBinMaskingRBMakaCoverPulse.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/jammers/Noise/RangeBinMaskingRBMakaCoverPulse/RangeBinMaskingRBMakaCoverPulse.java
rename to src-generated/edu/nps/moves/dis7/jammers/Noise/RangeBinMaskingRBMakaCoverPulse/RangeBinMaskingRBMakaCoverPulse.java
index f1a30ae04ad6c9b58b5dc17cb3f66f86c273f859..b6328848e6970b57534029e4bf18554b332329c7 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/RangeBinMaskingRBMakaCoverPulse/RangeBinMaskingRBMakaCoverPulse.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/RangeBinMaskingRBMakaCoverPulse/RangeBinMaskingRBMakaCoverPulse.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Noise.RangeBinMaskingRBMakaCoverPulse;
+package edu.nps.moves.dis7.jammers.Noise.RangeBinMaskingRBMakaCoverPulse;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/RangeBinMaskingRBMakaCoverPulse/RangeBinMaskingwithVelocityBinMasking/RangeBinMaskingwithVelocityBinMasking.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/RangeBinMaskingRBMakaCoverPulse/RangeBinMaskingwithVelocityBinMasking/RangeBinMaskingwithVelocityBinMasking.java
similarity index 69%
rename from src-generated/edu/nps/moves/dis/jammers/Noise/RangeBinMaskingRBMakaCoverPulse/RangeBinMaskingwithVelocityBinMasking/RangeBinMaskingwithVelocityBinMasking.java
rename to src-generated/edu/nps/moves/dis7/jammers/Noise/RangeBinMaskingRBMakaCoverPulse/RangeBinMaskingwithVelocityBinMasking/RangeBinMaskingwithVelocityBinMasking.java
index 10658139ed34cccd512b125551f5eada428c854c..02ce482471f754fddf07a35378dade32b1b22da3 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/RangeBinMaskingRBMakaCoverPulse/RangeBinMaskingwithVelocityBinMasking/RangeBinMaskingwithVelocityBinMasking.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/RangeBinMaskingRBMakaCoverPulse/RangeBinMaskingwithVelocityBinMasking/RangeBinMaskingwithVelocityBinMasking.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Noise.RangeBinMaskingRBMakaCoverPulse.RangeBinMaskingwithVelocityBinMasking;
+package edu.nps.moves.dis7.jammers.Noise.RangeBinMaskingRBMakaCoverPulse.RangeBinMaskingwithVelocityBinMasking;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/RepeaterNoise/NarrowbandRepeaterNoise/NarrowbandRepeaterNoise.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/RepeaterNoise/NarrowbandRepeaterNoise/NarrowbandRepeaterNoise.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/jammers/Noise/RepeaterNoise/NarrowbandRepeaterNoise/NarrowbandRepeaterNoise.java
rename to src-generated/edu/nps/moves/dis7/jammers/Noise/RepeaterNoise/NarrowbandRepeaterNoise/NarrowbandRepeaterNoise.java
index c01913ca3b89d715e3f44c95269b0f88b6e96df0..8db54e537bbf2816b35588941615a85620855fa4 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/RepeaterNoise/NarrowbandRepeaterNoise/NarrowbandRepeaterNoise.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/RepeaterNoise/NarrowbandRepeaterNoise/NarrowbandRepeaterNoise.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Noise.RepeaterNoise.NarrowbandRepeaterNoise;
+package edu.nps.moves.dis7.jammers.Noise.RepeaterNoise.NarrowbandRepeaterNoise;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/RepeaterNoise/RepeaterNoise.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/RepeaterNoise/RepeaterNoise.java
similarity index 66%
rename from src-generated/edu/nps/moves/dis/jammers/Noise/RepeaterNoise/RepeaterNoise.java
rename to src-generated/edu/nps/moves/dis7/jammers/Noise/RepeaterNoise/RepeaterNoise.java
index 457ad000ea53d270d37aae7b88a6d7059af41c51..7ca54c58507acf7c50a846d0215fae3fa5f4b11f 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/RepeaterNoise/RepeaterNoise.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/RepeaterNoise/RepeaterNoise.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Noise.RepeaterNoise;
+package edu.nps.moves.dis7.jammers.Noise.RepeaterNoise;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/RepeaterNoise/WideBandRepeaterNoise/WideBandRepeaterNoise.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/RepeaterNoise/WideBandRepeaterNoise/WideBandRepeaterNoise.java
similarity index 69%
rename from src-generated/edu/nps/moves/dis/jammers/Noise/RepeaterNoise/WideBandRepeaterNoise/WideBandRepeaterNoise.java
rename to src-generated/edu/nps/moves/dis7/jammers/Noise/RepeaterNoise/WideBandRepeaterNoise/WideBandRepeaterNoise.java
index 18c6560ef7f1ae1a6ab64e118d6a0bf6c9bb6e15..74d29b56a877585a992ed6517415ca1d19c4b8b8 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/RepeaterNoise/WideBandRepeaterNoise/WideBandRepeaterNoise.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/RepeaterNoise/WideBandRepeaterNoise/WideBandRepeaterNoise.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Noise.RepeaterNoise.WideBandRepeaterNoise;
+package edu.nps.moves.dis7.jammers.Noise.RepeaterNoise.WideBandRepeaterNoise;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/AutomaticSpotNoiseASJ/AutomaticSpotNoiseASJ.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/SpotNoise/AutomaticSpotNoiseASJ/AutomaticSpotNoiseASJ.java
similarity index 69%
rename from src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/AutomaticSpotNoiseASJ/AutomaticSpotNoiseASJ.java
rename to src-generated/edu/nps/moves/dis7/jammers/Noise/SpotNoise/AutomaticSpotNoiseASJ/AutomaticSpotNoiseASJ.java
index d1bc69ef6e7629fdedb31b98322234104486bb2e..bf1cbc586062ffdd00ea49ff6ed967c2a10c1311 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/AutomaticSpotNoiseASJ/AutomaticSpotNoiseASJ.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/SpotNoise/AutomaticSpotNoiseASJ/AutomaticSpotNoiseASJ.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Noise.SpotNoise.AutomaticSpotNoiseASJ;
+package edu.nps.moves.dis7.jammers.Noise.SpotNoise.AutomaticSpotNoiseASJ;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/BlinkingSpotNoise/BlinkingSpotNoise.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/SpotNoise/BlinkingSpotNoise/BlinkingSpotNoise.java
similarity index 69%
rename from src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/BlinkingSpotNoise/BlinkingSpotNoise.java
rename to src-generated/edu/nps/moves/dis7/jammers/Noise/SpotNoise/BlinkingSpotNoise/BlinkingSpotNoise.java
index 5edc0bf20fc1aada9f5c2658f4a6243d1c90b81a..d319e2a9623c78311f33cd84f08b86d4aeab8199 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/BlinkingSpotNoise/BlinkingSpotNoise.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/SpotNoise/BlinkingSpotNoise/BlinkingSpotNoise.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Noise.SpotNoise.BlinkingSpotNoise;
+package edu.nps.moves.dis7.jammers.Noise.SpotNoise.BlinkingSpotNoise;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/BurstSpotNoise/BurstSpotNoise.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/SpotNoise/BurstSpotNoise/BurstSpotNoise.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/BurstSpotNoise/BurstSpotNoise.java
rename to src-generated/edu/nps/moves/dis7/jammers/Noise/SpotNoise/BurstSpotNoise/BurstSpotNoise.java
index b6fdaf6264ac9c13ca646e3d98a96b0e1cc40b2e..33b979e47b9f4aeb707b1253deba86e1bc1a4636 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/BurstSpotNoise/BurstSpotNoise.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/SpotNoise/BurstSpotNoise/BurstSpotNoise.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Noise.SpotNoise.BurstSpotNoise;
+package edu.nps.moves.dis7.jammers.Noise.SpotNoise.BurstSpotNoise;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/DopplerSpotNoise/DopplerSpotNoise.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/SpotNoise/DopplerSpotNoise/DopplerSpotNoise.java
similarity index 69%
rename from src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/DopplerSpotNoise/DopplerSpotNoise.java
rename to src-generated/edu/nps/moves/dis7/jammers/Noise/SpotNoise/DopplerSpotNoise/DopplerSpotNoise.java
index 0ba6487c951cffc410176d25fa3a4a139296efe5..f90a9ae83f3e4a4fcd20a0ba77a2e76d25b51187 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/DopplerSpotNoise/DopplerSpotNoise.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/SpotNoise/DopplerSpotNoise/DopplerSpotNoise.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Noise.SpotNoise.DopplerSpotNoise;
+package edu.nps.moves.dis7.jammers.Noise.SpotNoise.DopplerSpotNoise;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/SkirtFrequency/SkirtFrequency.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/SpotNoise/SkirtFrequency/SkirtFrequency.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/SkirtFrequency/SkirtFrequency.java
rename to src-generated/edu/nps/moves/dis7/jammers/Noise/SpotNoise/SkirtFrequency/SkirtFrequency.java
index 77527787850593b963bbd488335ff0eabfee3d15..3aef9d658595e019c07cf58a9c01701b17a1e475 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/SkirtFrequency/SkirtFrequency.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/SpotNoise/SkirtFrequency/SkirtFrequency.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Noise.SpotNoise.SkirtFrequency;
+package edu.nps.moves.dis7.jammers.Noise.SpotNoise.SkirtFrequency;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/SpotNoise.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/SpotNoise/SpotNoise.java
similarity index 66%
rename from src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/SpotNoise.java
rename to src-generated/edu/nps/moves/dis7/jammers/Noise/SpotNoise/SpotNoise.java
index 40fa96639cf48990dde6ad1d44aa394a506ddf76..fd76b3f2395a8fd02936e68d95c74c67460d6066 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/SpotNoise.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/SpotNoise/SpotNoise.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Noise.SpotNoise;
+package edu.nps.moves.dis7.jammers.Noise.SpotNoise;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/FrequencySwept/FrequencySwept.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/FrequencySwept/FrequencySwept.java
similarity index 67%
rename from src-generated/edu/nps/moves/dis/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/FrequencySwept/FrequencySwept.java
rename to src-generated/edu/nps/moves/dis7/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/FrequencySwept/FrequencySwept.java
index ed10fd49a482b5cc7b930afc96ba0b0f04a8cdc4..5685a4fe2857db02705e8318bf7038616a640a55 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/FrequencySwept/FrequencySwept.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/FrequencySwept/FrequencySwept.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Noise.SweptNoiseakaSweptSpotNoise_Sweep.FrequencySwept;
+package edu.nps.moves.dis7.jammers.Noise.SweptNoiseakaSweptSpotNoise_Sweep.FrequencySwept;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/SweptAM/SweptAM.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/SweptAM/SweptAM.java
similarity index 67%
rename from src-generated/edu/nps/moves/dis/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/SweptAM/SweptAM.java
rename to src-generated/edu/nps/moves/dis7/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/SweptAM/SweptAM.java
index 230730473e0ff8a71fcc469dbddf6e31c46367d9..adbf1505fa00b1468b44c7be3a2bbf95f39ac5e0 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/SweptAM/SweptAM.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/SweptAM/SweptAM.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Noise.SweptNoiseakaSweptSpotNoise_Sweep.SweptAM;
+package edu.nps.moves.dis7.jammers.Noise.SweptNoiseakaSweptSpotNoise_Sweep.SweptAM;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/SweptNoiseakaSweptSpotNoise_Sweep.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/SweptNoiseakaSweptSpotNoise_Sweep.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/SweptNoiseakaSweptSpotNoise_Sweep.java
rename to src-generated/edu/nps/moves/dis7/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/SweptNoiseakaSweptSpotNoise_Sweep.java
index 30772759a62da46142bac6544cd9e3623c55a591..096a920736c4e617cb7628743d2e682bb9b66274 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/SweptNoiseakaSweptSpotNoise_Sweep.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/SweptNoiseakaSweptSpotNoise_Sweep.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Noise.SweptNoiseakaSweptSpotNoise_Sweep;
+package edu.nps.moves.dis7.jammers.Noise.SweptNoiseakaSweptSpotNoise_Sweep;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/VelocityBinMaskingVBM/VelocityBinMaskingVBM.java b/src-generated/edu/nps/moves/dis7/jammers/Noise/VelocityBinMaskingVBM/VelocityBinMaskingVBM.java
similarity index 67%
rename from src-generated/edu/nps/moves/dis/jammers/Noise/VelocityBinMaskingVBM/VelocityBinMaskingVBM.java
rename to src-generated/edu/nps/moves/dis7/jammers/Noise/VelocityBinMaskingVBM/VelocityBinMaskingVBM.java
index 8adf4c5e38437145139aa9601aec73e087211bda..3351859cc471a37ac08964dc1aa12098e60c9ff8 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/VelocityBinMaskingVBM/VelocityBinMaskingVBM.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Noise/VelocityBinMaskingVBM/VelocityBinMaskingVBM.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Noise.VelocityBinMaskingVBM;
+package edu.nps.moves.dis7.jammers.Noise.VelocityBinMaskingVBM;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Special/Special.java b/src-generated/edu/nps/moves/dis7/jammers/Special/Special.java
similarity index 62%
rename from src-generated/edu/nps/moves/dis/jammers/Special/Special.java
rename to src-generated/edu/nps/moves/dis7/jammers/Special/Special.java
index 76673b36cb46fa90a2442bc1b910d73c6e9f7ecb..2d679a279c94e5882cf362167c0c2eb5ef9cdf06 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Special/Special.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Special/Special.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Special;
+package edu.nps.moves.dis7.jammers.Special;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/jammers/Special/SuperJam/SuperJam.java b/src-generated/edu/nps/moves/dis7/jammers/Special/SuperJam/SuperJam.java
similarity index 65%
rename from src-generated/edu/nps/moves/dis/jammers/Special/SuperJam/SuperJam.java
rename to src-generated/edu/nps/moves/dis7/jammers/Special/SuperJam/SuperJam.java
index 0dcd043fa024898c1e19da0c1c6cd0692b05a22f..bb4e28631c1d5861c82ad0f3f340bd578b1f7e97 100644
--- a/src-generated/edu/nps/moves/dis/jammers/Special/SuperJam/SuperJam.java
+++ b/src-generated/edu/nps/moves/dis7/jammers/Special/SuperJam/SuperJam.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.jammers.Special.SuperJam;
+package edu.nps.moves.dis7.jammers.Special.SuperJam;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ArealObject/ArealObject.java b/src-generated/edu/nps/moves/dis7/objecttypes/ArealObject/ArealObject.java
similarity index 62%
rename from src-generated/edu/nps/moves/dis/objecttypes/ArealObject/ArealObject.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/ArealObject/ArealObject.java
index 0f1c6132fbed557fa0fc1d5e0d01838ff4e4d909..4bd41bc515ca0dda65cb2a5b73e79251de53b1dc 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/ArealObject/ArealObject.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/ArealObject/ArealObject.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.ArealObject;
+package edu.nps.moves.dis7.objecttypes.ArealObject;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ArealObject/Obstacle/Minefield/Minefield.java b/src-generated/edu/nps/moves/dis7/objecttypes/ArealObject/Obstacle/Minefield/Minefield.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/objecttypes/ArealObject/Obstacle/Minefield/Minefield.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/ArealObject/Obstacle/Minefield/Minefield.java
index c0c42511464eb4a5f245cf5d07529f335d84d9c3..cfee68278c5740f0a0cc698828dcc643f56d6916 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/ArealObject/Obstacle/Minefield/Minefield.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/ArealObject/Obstacle/Minefield/Minefield.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.ArealObject.Obstacle.Minefield;
+package edu.nps.moves.dis7.objecttypes.ArealObject.Obstacle.Minefield;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ArealObject/Obstacle/Obstacle.java b/src-generated/edu/nps/moves/dis7/objecttypes/ArealObject/Obstacle/Obstacle.java
similarity index 66%
rename from src-generated/edu/nps/moves/dis/objecttypes/ArealObject/Obstacle/Obstacle.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/ArealObject/Obstacle/Obstacle.java
index f166d5d1f5f3146b649c492b64c881972fe45931..417f9fe35508ccd74f9cb87d712d5e213c22f9c7 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/ArealObject/Obstacle/Obstacle.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/ArealObject/Obstacle/Obstacle.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.ArealObject.Obstacle;
+package edu.nps.moves.dis7.objecttypes.ArealObject.Obstacle;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ArealObject/Obstacle/Other/Other.java b/src-generated/edu/nps/moves/dis7/objecttypes/ArealObject/Obstacle/Other/Other.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/objecttypes/ArealObject/Obstacle/Other/Other.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/ArealObject/Obstacle/Other/Other.java
index 4fdef58e41758ed999994b31c340916493169dbb..d923aa2a2bbc3f42f1ad57d1d78c7145a29d318e 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/ArealObject/Obstacle/Other/Other.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/ArealObject/Obstacle/Other/Other.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.ArealObject.Obstacle.Other;
+package edu.nps.moves.dis7.objecttypes.ArealObject.Obstacle.Other;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Culturalfeature/Culturalfeature.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Culturalfeature/Culturalfeature.java
similarity index 67%
rename from src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Culturalfeature/Culturalfeature.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Culturalfeature/Culturalfeature.java
index 202355541da68150ff4ce602c2c5dd38f6105416..346d2dc929320e5429613e16ede453dc59322815 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Culturalfeature/Culturalfeature.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Culturalfeature/Culturalfeature.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.LinearObject.Culturalfeature;
+package edu.nps.moves.dis7.objecttypes.LinearObject.Culturalfeature;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Culturalfeature/Tracks_Tire/Tracks_Tire.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Culturalfeature/Tracks_Tire/Tracks_Tire.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Culturalfeature/Tracks_Tire/Tracks_Tire.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Culturalfeature/Tracks_Tire/Tracks_Tire.java
index 6cef00f0bd1fd3e2284e79ff71e65f4990a88329..c425a2fd81e87b33d3e9c65d278f36ca75b800a5 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Culturalfeature/Tracks_Tire/Tracks_Tire.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Culturalfeature/Tracks_Tire/Tracks_Tire.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.LinearObject.Culturalfeature.Tracks_Tire;
+package edu.nps.moves.dis7.objecttypes.LinearObject.Culturalfeature.Tracks_Tire;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Culturalfeature/Wire/Wire.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Culturalfeature/Wire/Wire.java
similarity index 67%
rename from src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Culturalfeature/Wire/Wire.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Culturalfeature/Wire/Wire.java
index bf5693bfdcbaec982e124839cfab2325f8e937c6..68590a8d5a17b3057c58d294577da12f9ba1647d 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Culturalfeature/Wire/Wire.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Culturalfeature/Wire/Wire.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.LinearObject.Culturalfeature.Wire;
+package edu.nps.moves.dis7.objecttypes.LinearObject.Culturalfeature.Wire;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/LinearObject.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/LinearObject.java
similarity index 62%
rename from src-generated/edu/nps/moves/dis/objecttypes/LinearObject/LinearObject.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/LinearObject.java
index bf7b2df0b8e277ec500cfc24780768a374724d34..7e398bf7f2b5bd4cfb55507bc9564beaa4168d4a 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/LinearObject.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/LinearObject.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.LinearObject;
+package edu.nps.moves.dis7.objecttypes.LinearObject;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstacle/ChainLinkFence/ChainLinkFence.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/ChainLinkFence/ChainLinkFence.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstacle/ChainLinkFence/ChainLinkFence.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/ChainLinkFence/ChainLinkFence.java
index 5310cea4b8d5f22b5e23f0d65122117770ab27c9..1fc25a22e78de7a99393807c2f7639b6a1c56583 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstacle/ChainLinkFence/ChainLinkFence.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/ChainLinkFence/ChainLinkFence.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.LinearObject.Obstacle.ChainLinkFence;
+package edu.nps.moves.dis7.objecttypes.LinearObject.Obstacle.ChainLinkFence;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstacle/ConcertinaWire/ConcertinaWire.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/ConcertinaWire/ConcertinaWire.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstacle/ConcertinaWire/ConcertinaWire.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/ConcertinaWire/ConcertinaWire.java
index 5d3d9b86ca8dc3688fe357118da4926fe8eab713..694b802847f59026d86e7139d58837247da95e57 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstacle/ConcertinaWire/ConcertinaWire.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/ConcertinaWire/ConcertinaWire.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.LinearObject.Obstacle.ConcertinaWire;
+package edu.nps.moves.dis7.objecttypes.LinearObject.Obstacle.ConcertinaWire;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstacle/ConcreteBarrier/ConcreteBarrier.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/ConcreteBarrier/ConcreteBarrier.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstacle/ConcreteBarrier/ConcreteBarrier.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/ConcreteBarrier/ConcreteBarrier.java
index 37ce73d73f233e472665cbfffa2a4c2d76482963..73bd97f16e216331b98205ca4cb040e0a0b3353f 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstacle/ConcreteBarrier/ConcreteBarrier.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/ConcreteBarrier/ConcreteBarrier.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.LinearObject.Obstacle.ConcreteBarrier;
+package edu.nps.moves.dis7.objecttypes.LinearObject.Obstacle.ConcreteBarrier;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstacle/Obstacle.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/Obstacle.java
similarity index 66%
rename from src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstacle/Obstacle.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/Obstacle.java
index 4027dde145bb346f0e8a80092146c1b80c4c417d..c6d82f4f84f3f52aa39d55cd89f74ea0d38ffffe 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstacle/Obstacle.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/Obstacle.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.LinearObject.Obstacle;
+package edu.nps.moves.dis7.objecttypes.LinearObject.Obstacle;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstacle/Other/Other.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/Other/Other.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstacle/Other/Other.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/Other/Other.java
index 9a3e0769fab392e6dfaa98ed0c16d93735af9efc..f572533120f035c87acd87f5415770022ed7f244 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstacle/Other/Other.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/Other/Other.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.LinearObject.Obstacle.Other;
+package edu.nps.moves.dis7.objecttypes.LinearObject.Obstacle.Other;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstacle/Rut/Rut.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/Rut/Rut.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstacle/Rut/Rut.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/Rut/Rut.java
index fcebc94e16bd7248b2c08cd55c594b603da9ce2f..2934fb5ab0816e26ff8ee64dc117c8877ee37b64 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstacle/Rut/Rut.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/Rut/Rut.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.LinearObject.Obstacle.Rut;
+package edu.nps.moves.dis7.objecttypes.LinearObject.Obstacle.Rut;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstacle/SpeedBump/SpeedBump.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/SpeedBump/SpeedBump.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstacle/SpeedBump/SpeedBump.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/SpeedBump/SpeedBump.java
index ac1e5f61609c9d44fb3fa2890535bcfe1db12fc2..79a8e79ffacca417e4683b9ba52d98986a59ae6b 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstacle/SpeedBump/SpeedBump.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/SpeedBump/SpeedBump.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.LinearObject.Obstacle.SpeedBump;
+package edu.nps.moves.dis7.objecttypes.LinearObject.Obstacle.SpeedBump;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstacle/TankDitch/TankDitch.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/TankDitch/TankDitch.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstacle/TankDitch/TankDitch.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/TankDitch/TankDitch.java
index 3b8df5b4e265edf8f484aab1ef929ba7a46585a9..b617bb5ae7607275dbb579e06af94154a5282ab7 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstacle/TankDitch/TankDitch.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstacle/TankDitch/TankDitch.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.LinearObject.Obstacle.TankDitch;
+package edu.nps.moves.dis7.objecttypes.LinearObject.Obstacle.TankDitch;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstaclebreach/Breach/Breach.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclebreach/Breach/Breach.java
similarity index 67%
rename from src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstaclebreach/Breach/Breach.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclebreach/Breach/Breach.java
index fb76045c205a0e28e73379505041c5d0f43f2124..8a75b76ef91a3b77c5926e1d7a9f11bec9c5e455 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstaclebreach/Breach/Breach.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclebreach/Breach/Breach.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.LinearObject.Obstaclebreach.Breach;
+package edu.nps.moves.dis7.objecttypes.LinearObject.Obstaclebreach.Breach;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstaclebreach/Obstaclebreach.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclebreach/Obstaclebreach.java
similarity index 67%
rename from src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstaclebreach/Obstaclebreach.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclebreach/Obstaclebreach.java
index 5b2f25cdec43caf772e75a5810cb8c06f1681a6f..1cbe8c1ebc2456f62bec7011a8378fafdfbd4700 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstaclebreach/Obstaclebreach.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclebreach/Obstaclebreach.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.LinearObject.Obstaclebreach;
+package edu.nps.moves.dis7.objecttypes.LinearObject.Obstaclebreach;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstaclebreach/Other/Other.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclebreach/Other/Other.java
similarity index 67%
rename from src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstaclebreach/Other/Other.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclebreach/Other/Other.java
index 53f300d037294d00c977fb48537c48948e4a7475..94ad7a39c5e6e7352b4a74edfbdca53da66654e3 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstaclebreach/Other/Other.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclebreach/Other/Other.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.LinearObject.Obstaclebreach.Other;
+package edu.nps.moves.dis7.objecttypes.LinearObject.Obstaclebreach.Other;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstaclemarker/MinefieldLaneMarker/MinefieldLaneMarker.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclemarker/MinefieldLaneMarker/MinefieldLaneMarker.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstaclemarker/MinefieldLaneMarker/MinefieldLaneMarker.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclemarker/MinefieldLaneMarker/MinefieldLaneMarker.java
index 68a81dbb54579db2e3c5ba3cc2cdaadfccc02163..7f7d52fdc38d37a5fa7c0226ee91affbb1de51c7 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstaclemarker/MinefieldLaneMarker/MinefieldLaneMarker.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclemarker/MinefieldLaneMarker/MinefieldLaneMarker.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.LinearObject.Obstaclemarker.MinefieldLaneMarker;
+package edu.nps.moves.dis7.objecttypes.LinearObject.Obstaclemarker.MinefieldLaneMarker;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstaclemarker/Obstaclemarker.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclemarker/Obstaclemarker.java
similarity index 67%
rename from src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstaclemarker/Obstaclemarker.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclemarker/Obstaclemarker.java
index e186b78489adc81fd83264b7f5653a604f8d1058..1e5c3523c2adb58c9ea8c97e59d9a0cbc3f123ba 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstaclemarker/Obstaclemarker.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclemarker/Obstaclemarker.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.LinearObject.Obstaclemarker;
+package edu.nps.moves.dis7.objecttypes.LinearObject.Obstaclemarker;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstaclemarker/Other/Other.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclemarker/Other/Other.java
similarity index 67%
rename from src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstaclemarker/Other/Other.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclemarker/Other/Other.java
index bbbdcb54420aaa938c9baad9d0b2a448919aa828..773b8e46cbbd85ccd607a1d229ad6eca436f98d5 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstaclemarker/Other/Other.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Obstaclemarker/Other/Other.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.LinearObject.Obstaclemarker.Other;
+package edu.nps.moves.dis7.objecttypes.LinearObject.Obstaclemarker.Other;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Tacticalsmoke/ExhaustSmoke/ExhaustSmoke.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Tacticalsmoke/ExhaustSmoke/ExhaustSmoke.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Tacticalsmoke/ExhaustSmoke/ExhaustSmoke.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Tacticalsmoke/ExhaustSmoke/ExhaustSmoke.java
index 3d0961ef180e2f000e300567cb614a2f3a0ec753..609ae285301ef9bb20ffe3245827632dd8626b57 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Tacticalsmoke/ExhaustSmoke/ExhaustSmoke.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Tacticalsmoke/ExhaustSmoke/ExhaustSmoke.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.LinearObject.Tacticalsmoke.ExhaustSmoke;
+package edu.nps.moves.dis7.objecttypes.LinearObject.Tacticalsmoke.ExhaustSmoke;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Tacticalsmoke/Other/Other.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Tacticalsmoke/Other/Other.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Tacticalsmoke/Other/Other.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Tacticalsmoke/Other/Other.java
index 9d2658c46ebfcaeaf4e43d4499b0b96cfde88acd..80bdb6c5e2d2edf6976b955f512a75a526c3219f 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Tacticalsmoke/Other/Other.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Tacticalsmoke/Other/Other.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.LinearObject.Tacticalsmoke.Other;
+package edu.nps.moves.dis7.objecttypes.LinearObject.Tacticalsmoke.Other;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Tacticalsmoke/Tacticalsmoke.java b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Tacticalsmoke/Tacticalsmoke.java
similarity index 67%
rename from src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Tacticalsmoke/Tacticalsmoke.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Tacticalsmoke/Tacticalsmoke.java
index ac5e3c03e9a62b61d029870964f2a81be75c8219..28b05f9771475b8f014138b369ff4d4755da2f2a 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Tacticalsmoke/Tacticalsmoke.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/LinearObject/Tacticalsmoke/Tacticalsmoke.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.LinearObject.Tacticalsmoke;
+package edu.nps.moves.dis7.objecttypes.LinearObject.Tacticalsmoke;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/BuildingRubble/BuildingRubble.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/BuildingRubble/BuildingRubble.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/BuildingRubble/BuildingRubble.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/BuildingRubble/BuildingRubble.java
index 4ada02c7fba4bad78b17fa5e0bbcc67d748267f3..4f7294fdc99c79a9fdc22d1238fb6d947def757b 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/BuildingRubble/BuildingRubble.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/BuildingRubble/BuildingRubble.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.PointObject.Culturalfeature.BuildingRubble;
+package edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.BuildingRubble;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/Building_Structure/Building_Structure.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/Building_Structure.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/Building_Structure/Building_Structure.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/Building_Structure.java
index baac1d19afd9defc686553709f62df76a0a8c6fe..1b08c0d14b4fba4b5e29fc77501b9c657935304d 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/Building_Structure/Building_Structure.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Building_Structure/Building_Structure.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.PointObject.Culturalfeature.Building_Structure;
+package edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.Building_Structure;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding.java
similarity index 69%
rename from src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding.java
index c9d86d187487fc4806767da06d8c9c26371a6e4e..db632946282394ac0ba3128434494acf34b6c198 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.PointObject.Culturalfeature.Container_BasedBuilding;
+package edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.Container_BasedBuilding;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/Culturalfeature.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Culturalfeature.java
similarity index 67%
rename from src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/Culturalfeature.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Culturalfeature.java
index af9f3cd11dc1aea9d7928a6a6c80ccb1997ac397..e5875ad0b80b7f4f0165cc3358f456ac4b66660d 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/Culturalfeature.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Culturalfeature.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.PointObject.Culturalfeature;
+package edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/DisturbedEarth/DisturbedEarth.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/DisturbedEarth/DisturbedEarth.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/DisturbedEarth/DisturbedEarth.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/DisturbedEarth/DisturbedEarth.java
index b402c56f1d1f6f2ad29d9de85d439ffe585062bd..2efa3f34a13630b371c3487da30d7b80d9ad5d7b 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/DisturbedEarth/DisturbedEarth.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/DisturbedEarth/DisturbedEarth.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.PointObject.Culturalfeature.DisturbedEarth;
+package edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.DisturbedEarth;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/DisturbedRoad/DisturbedRoad.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/DisturbedRoad/DisturbedRoad.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/DisturbedRoad/DisturbedRoad.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/DisturbedRoad/DisturbedRoad.java
index d6d94e9b336a72e2e1185ad1d6815f2ce8118708..e9b071d73f520a785dacdc1550dad6b9ce6e84ce 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/DisturbedRoad/DisturbedRoad.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/DisturbedRoad/DisturbedRoad.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.PointObject.Culturalfeature.DisturbedRoad;
+package edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.DisturbedRoad;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/IndustrialProcessingPlant/IndustrialProcessingPlant.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/IndustrialProcessingPlant/IndustrialProcessingPlant.java
similarity index 69%
rename from src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/IndustrialProcessingPlant/IndustrialProcessingPlant.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/IndustrialProcessingPlant/IndustrialProcessingPlant.java
index c2f939e86f648d869c219ec8ded3925a8787f2de..7f882c33490a51c7a33adbe7dfa1b4e42cf5b0bc 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/IndustrialProcessingPlant/IndustrialProcessingPlant.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/IndustrialProcessingPlant/IndustrialProcessingPlant.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.PointObject.Culturalfeature.IndustrialProcessingPlant;
+package edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.IndustrialProcessingPlant;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding.java
index 026ca293938629093734d7892484fef67de676bb..977070ec120f00d860fe78f778c989175a0ba26d 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.PointObject.Culturalfeature.MOUTBuilding;
+package edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.MOUTBuilding;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/MaintenanceStructure/MaintenanceStructure.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MaintenanceStructure/MaintenanceStructure.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/MaintenanceStructure/MaintenanceStructure.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MaintenanceStructure/MaintenanceStructure.java
index 88b5c5b7847714e956033874f2abd61ec5873a65..d56a92fda977dc27de8ae2b772b5227bce3605d3 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/MaintenanceStructure/MaintenanceStructure.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/MaintenanceStructure/MaintenanceStructure.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.PointObject.Culturalfeature.MaintenanceStructure;
+package edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.MaintenanceStructure;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/Other/Other.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Other/Other.java
similarity index 67%
rename from src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/Other/Other.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Other/Other.java
index c7800929fb48a78dd990166bdd972ad03e52f3cf..1ff89d8720fc263471fb78b9245d3c8f0ea5e5d1 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/Other/Other.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Other/Other.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.PointObject.Culturalfeature.Other;
+package edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.Other;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/Pump/Pump.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Pump/Pump.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/Pump/Pump.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Pump/Pump.java
index ecb995501c105b256b02ba0d9cea22222c6a5473..6dedb1dc7f0a2709e4abe2077e190b436b3908e4 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/Pump/Pump.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Pump/Pump.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.PointObject.Culturalfeature.Pump;
+package edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.Pump;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/Tent/Tent.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent.java
similarity index 67%
rename from src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/Tent/Tent.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent.java
index a8410486470c2c055794ffe49706632fd7f39b9c..21204f0056db88c70cd90d0328a7ac7124b4f913 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/Tent/Tent.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tent/Tent.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.PointObject.Culturalfeature.Tent;
+package edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.Tent;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/Tree_Deciduous/Tree_Deciduous.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tree_Deciduous/Tree_Deciduous.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/Tree_Deciduous/Tree_Deciduous.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tree_Deciduous/Tree_Deciduous.java
index 6a4c3c83b7f560ebb1bab7fdecb58969d9a82e84..511ebd2838953419961b8354aff9b5f726f25afc 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/Tree_Deciduous/Tree_Deciduous.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tree_Deciduous/Tree_Deciduous.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.PointObject.Culturalfeature.Tree_Deciduous;
+package edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.Tree_Deciduous;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/Tree_Evergreen/Tree_Evergreen.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tree_Evergreen/Tree_Evergreen.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/Tree_Evergreen/Tree_Evergreen.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tree_Evergreen/Tree_Evergreen.java
index f3149d9a3e0ac3265b71c88071220bede6aeadff..9e3b18e135cc720a18726f15ff59116d20b7f117 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/Tree_Evergreen/Tree_Evergreen.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/Tree_Evergreen/Tree_Evergreen.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.PointObject.Culturalfeature.Tree_Evergreen;
+package edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.Tree_Evergreen;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/UtilityPole/UtilityPole.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/UtilityPole/UtilityPole.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/UtilityPole/UtilityPole.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/UtilityPole/UtilityPole.java
index acebfeb7cff0ba4787c4c20e11e2f87ccd522a91..f5282165c5fcf25ad225836b2f6816dc0e751369 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/UtilityPole/UtilityPole.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Culturalfeature/UtilityPole/UtilityPole.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.PointObject.Culturalfeature.UtilityPole;
+package edu.nps.moves.dis7.objecttypes.PointObject.Culturalfeature.UtilityPole;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/EnvironmentalObject/EnvironmentalObject.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/EnvironmentalObject/EnvironmentalObject.java
similarity index 67%
rename from src-generated/edu/nps/moves/dis/objecttypes/PointObject/EnvironmentalObject/EnvironmentalObject.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/PointObject/EnvironmentalObject/EnvironmentalObject.java
index 50a66a48fc84284232a9512c4fe976d80d7db5aa..bfd053040e9736dba840613c9f58f84c02074054 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/EnvironmentalObject/EnvironmentalObject.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/EnvironmentalObject/EnvironmentalObject.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.PointObject.EnvironmentalObject;
+package edu.nps.moves.dis7.objecttypes.PointObject.EnvironmentalObject;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/EnvironmentalObject/Flood/Flood.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/EnvironmentalObject/Flood/Flood.java
similarity index 67%
rename from src-generated/edu/nps/moves/dis/objecttypes/PointObject/EnvironmentalObject/Flood/Flood.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/PointObject/EnvironmentalObject/Flood/Flood.java
index 53bbc41e415ecc4a9805c5eeac72272aa3449a03..d976f8b914b10a0af648afeb21a2ff213d71280e 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/EnvironmentalObject/Flood/Flood.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/EnvironmentalObject/Flood/Flood.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.PointObject.EnvironmentalObject.Flood;
+package edu.nps.moves.dis7.objecttypes.PointObject.EnvironmentalObject.Flood;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstacle/Abatis/Abatis.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Abatis/Abatis.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstacle/Abatis/Abatis.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Abatis/Abatis.java
index 2a786b6301fed5df06242e5e9396596dbf33d075..0e6943a6b79ba1be1aedc639d6b63d35d9d4b149 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstacle/Abatis/Abatis.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Abatis/Abatis.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.PointObject.Obstacle.Abatis;
+package edu.nps.moves.dis7.objecttypes.PointObject.Obstacle.Abatis;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstacle/Barrier/Barrier.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Barrier/Barrier.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstacle/Barrier/Barrier.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Barrier/Barrier.java
index 53873e4a50bd50a4089a652fecbe8d066d8379c4..6128ae1bf25b8852fad3f3ad7c04ce4b42521ab8 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstacle/Barrier/Barrier.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Barrier/Barrier.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.PointObject.Obstacle.Barrier;
+package edu.nps.moves.dis7.objecttypes.PointObject.Obstacle.Barrier;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstacle/Crater/Crater.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Crater/Crater.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstacle/Crater/Crater.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Crater/Crater.java
index 168a549eab15c89a32df10b9a9d3b04df08b6104..bae72842f67495978bfd9cbf6df21203740befcc 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstacle/Crater/Crater.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Crater/Crater.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.PointObject.Obstacle.Crater;
+package edu.nps.moves.dis7.objecttypes.PointObject.Obstacle.Crater;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstacle/LogCrib/LogCrib.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/LogCrib/LogCrib.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstacle/LogCrib/LogCrib.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/LogCrib/LogCrib.java
index 139158458ff3300b973ae4c767db1ccb5df8b549..bd564178444b04b58ef8647ae77762df91bb657c 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstacle/LogCrib/LogCrib.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/LogCrib/LogCrib.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.PointObject.Obstacle.LogCrib;
+package edu.nps.moves.dis7.objecttypes.PointObject.Obstacle.LogCrib;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstacle/Obstacle.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Obstacle.java
similarity index 66%
rename from src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstacle/Obstacle.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Obstacle.java
index cea542765e1018f812a7d30889ff008f0d108310..969146ebb911168f7a606e5a3620575fd8d8e1dc 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstacle/Obstacle.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Obstacle.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.PointObject.Obstacle;
+package edu.nps.moves.dis7.objecttypes.PointObject.Obstacle;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstacle/Other/Other.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Other/Other.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstacle/Other/Other.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Other/Other.java
index fe448f73b286083673658bdc295fc36dae958864..8f0dd9d360e33119bcd1f35af8100de0cefd7552 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstacle/Other/Other.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/Other/Other.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.PointObject.Obstacle.Other;
+package edu.nps.moves.dis7.objecttypes.PointObject.Obstacle.Other;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstacle/PotHole/PotHole.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/PotHole/PotHole.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstacle/PotHole/PotHole.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/PotHole/PotHole.java
index 8f8b991b20f4a1c5747705dd32bf149f1c4138ef..31476d225f4b1bff11ef6d26892ee9949181818b 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstacle/PotHole/PotHole.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/PotHole/PotHole.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.PointObject.Obstacle.PotHole;
+package edu.nps.moves.dis7.objecttypes.PointObject.Obstacle.PotHole;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstacle/RockDrop/RockDrop.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/RockDrop/RockDrop.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstacle/RockDrop/RockDrop.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/RockDrop/RockDrop.java
index fed11f4c3fc8d021fc93a970afb919b67ba9a07b..d54ed4ef4a144ecf702f16c340168384794ecd1a 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstacle/RockDrop/RockDrop.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstacle/RockDrop/RockDrop.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.PointObject.Obstacle.RockDrop;
+package edu.nps.moves.dis7.objecttypes.PointObject.Obstacle.RockDrop;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstaclemarker/NBCHazardMarker/NBCHazardMarker.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstaclemarker/NBCHazardMarker/NBCHazardMarker.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstaclemarker/NBCHazardMarker/NBCHazardMarker.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstaclemarker/NBCHazardMarker/NBCHazardMarker.java
index 1b757df721c4fe10c677a7db91dc02d7d279939a..6924c42137576a20b29d0b7561404c2ff833a5e9 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstaclemarker/NBCHazardMarker/NBCHazardMarker.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstaclemarker/NBCHazardMarker/NBCHazardMarker.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.PointObject.Obstaclemarker.NBCHazardMarker;
+package edu.nps.moves.dis7.objecttypes.PointObject.Obstaclemarker.NBCHazardMarker;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstaclemarker/Obstaclemarker.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstaclemarker/Obstaclemarker.java
similarity index 67%
rename from src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstaclemarker/Obstaclemarker.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstaclemarker/Obstaclemarker.java
index bb72d0bb11b3e17c75b5ac53beddf8208c6f7f39..c28173fea6d559fac4717328c4fe64218223a093 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstaclemarker/Obstaclemarker.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Obstaclemarker/Obstaclemarker.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.PointObject.Obstaclemarker;
+package edu.nps.moves.dis7.objecttypes.PointObject.Obstaclemarker;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Passageway/AVLB/AVLB.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/AVLB/AVLB.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/objecttypes/PointObject/Passageway/AVLB/AVLB.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/AVLB/AVLB.java
index 439c0642bbff9843b45e9596b7e4a436b26ea5bc..64ca4f1a02597a8269688f724cd4be4993658972 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Passageway/AVLB/AVLB.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/AVLB/AVLB.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.PointObject.Passageway.AVLB;
+package edu.nps.moves.dis7.objecttypes.PointObject.Passageway.AVLB;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Passageway/Other/Other.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/Other/Other.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/objecttypes/PointObject/Passageway/Other/Other.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/Other/Other.java
index 95321e2cdb7a92b935b5dd0529b7d0297bf5fd03..4f802b3cc0f73552c07f3cd23b11b86cafda0d86 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Passageway/Other/Other.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/Other/Other.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.PointObject.Passageway.Other;
+package edu.nps.moves.dis7.objecttypes.PointObject.Passageway.Other;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Passageway/Passageway.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/Passageway.java
similarity index 67%
rename from src-generated/edu/nps/moves/dis/objecttypes/PointObject/Passageway/Passageway.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/Passageway.java
index 1c12d176510618a822928bae38eef4f43f7b6f84..ad741598a4ab8777f942b20adeb532dfc7aa8ed8 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Passageway/Passageway.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/Passageway.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.PointObject.Passageway;
+package edu.nps.moves.dis7.objecttypes.PointObject.Passageway;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Passageway/Pier/Pier.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/Pier/Pier.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/objecttypes/PointObject/Passageway/Pier/Pier.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/Pier/Pier.java
index bea08412a5a9318fd4fa3cb44113d998d4681607..a958105128557e2bec12eb7769b7144f94f03917 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Passageway/Pier/Pier.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/Pier/Pier.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.PointObject.Passageway.Pier;
+package edu.nps.moves.dis7.objecttypes.PointObject.Passageway.Pier;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Passageway/RibbonBridge/RibbonBridge.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/RibbonBridge/RibbonBridge.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/objecttypes/PointObject/Passageway/RibbonBridge/RibbonBridge.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/RibbonBridge/RibbonBridge.java
index c96678645eb4f9405dd8deb1d9f06afe39cc2757..abf31122de07c97e8907f9309644d21c49b742e3 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Passageway/RibbonBridge/RibbonBridge.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/RibbonBridge/RibbonBridge.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.PointObject.Passageway.RibbonBridge;
+package edu.nps.moves.dis7.objecttypes.PointObject.Passageway.RibbonBridge;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Passageway/StationaryBridge/StationaryBridge.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/StationaryBridge/StationaryBridge.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/objecttypes/PointObject/Passageway/StationaryBridge/StationaryBridge.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/StationaryBridge/StationaryBridge.java
index e0d30bde3cfa438e686b784e1abac759797c5802..49693e940a744b623424991d10d04f2075256853 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Passageway/StationaryBridge/StationaryBridge.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Passageway/StationaryBridge/StationaryBridge.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.PointObject.Passageway.StationaryBridge;
+package edu.nps.moves.dis7.objecttypes.PointObject.Passageway.StationaryBridge;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/PointObject.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/PointObject.java
similarity index 62%
rename from src-generated/edu/nps/moves/dis/objecttypes/PointObject/PointObject.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/PointObject/PointObject.java
index 866316c40457a9c61626851dda1e669b99b42fb7..ef4d1e799149adb4d91c6bf60939545bc0373a1c 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/PointObject.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/PointObject.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.PointObject;
+package edu.nps.moves.dis7.objecttypes.PointObject;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Preparedposition/InfantryFightingPosition/InfantryFightingPosition.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/InfantryFightingPosition/InfantryFightingPosition.java
similarity index 69%
rename from src-generated/edu/nps/moves/dis/objecttypes/PointObject/Preparedposition/InfantryFightingPosition/InfantryFightingPosition.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/InfantryFightingPosition/InfantryFightingPosition.java
index e7a9deec7afc7fd567a7aed4b67fa0249ba53429..bf0e33156e5e1aff908fdfe4a6827866b22b8c51 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Preparedposition/InfantryFightingPosition/InfantryFightingPosition.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/InfantryFightingPosition/InfantryFightingPosition.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.PointObject.Preparedposition.InfantryFightingPosition;
+package edu.nps.moves.dis7.objecttypes.PointObject.Preparedposition.InfantryFightingPosition;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Preparedposition/Other/Other.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/Other/Other.java
similarity index 67%
rename from src-generated/edu/nps/moves/dis/objecttypes/PointObject/Preparedposition/Other/Other.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/Other/Other.java
index 26a38632f949c2bb1378d78f8905ca6d6a6620ab..a5303522cb77810513db4b29f9b3beee5f29c3b0 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Preparedposition/Other/Other.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/Other/Other.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.PointObject.Preparedposition.Other;
+package edu.nps.moves.dis7.objecttypes.PointObject.Preparedposition.Other;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Preparedposition/Preparedposition.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/Preparedposition.java
similarity index 67%
rename from src-generated/edu/nps/moves/dis/objecttypes/PointObject/Preparedposition/Preparedposition.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/Preparedposition.java
index 799071a1367bf673fd21db701a005201ec35fa91..686a40bca9fdc7cf2011fa4ee9e9a40d8da10846 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Preparedposition/Preparedposition.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/Preparedposition.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.PointObject.Preparedposition;
+package edu.nps.moves.dis7.objecttypes.PointObject.Preparedposition;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Preparedposition/VehicleDefilade/VehicleDefilade.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/VehicleDefilade/VehicleDefilade.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/objecttypes/PointObject/Preparedposition/VehicleDefilade/VehicleDefilade.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/VehicleDefilade/VehicleDefilade.java
index b491400c2a5f538a34861e2683260bd1fe1afcd2..fb79b947c7b4cb02bf99e163fbec8981aa670f93 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Preparedposition/VehicleDefilade/VehicleDefilade.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Preparedposition/VehicleDefilade/VehicleDefilade.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.PointObject.Preparedposition.VehicleDefilade;
+package edu.nps.moves.dis7.objecttypes.PointObject.Preparedposition.VehicleDefilade;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Tacticalsmoke/AirBurst/AirBurst.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/AirBurst/AirBurst.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/objecttypes/PointObject/Tacticalsmoke/AirBurst/AirBurst.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/AirBurst/AirBurst.java
index 9877727974ea5e673d98fc2ed8af385399248728..83265af57d645b717d62a3ff9f3430bd13c47e91 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Tacticalsmoke/AirBurst/AirBurst.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/AirBurst/AirBurst.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.PointObject.Tacticalsmoke.AirBurst;
+package edu.nps.moves.dis7.objecttypes.PointObject.Tacticalsmoke.AirBurst;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Tacticalsmoke/GroundBurst/GroundBurst.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/GroundBurst/GroundBurst.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/objecttypes/PointObject/Tacticalsmoke/GroundBurst/GroundBurst.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/GroundBurst/GroundBurst.java
index 7e6cbc1665a9f355599c87a8fca79b03dcca7472..dd1f17a871624a384f4b8069294e07d8c52960ba 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Tacticalsmoke/GroundBurst/GroundBurst.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/GroundBurst/GroundBurst.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.PointObject.Tacticalsmoke.GroundBurst;
+package edu.nps.moves.dis7.objecttypes.PointObject.Tacticalsmoke.GroundBurst;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Tacticalsmoke/Other/Other.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/Other/Other.java
similarity index 68%
rename from src-generated/edu/nps/moves/dis/objecttypes/PointObject/Tacticalsmoke/Other/Other.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/Other/Other.java
index 6899a4bc1db49e79bb9c8bf96a17061b5c35c91a..500cdd6897d8b9b493739801e2087988d1334ab8 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Tacticalsmoke/Other/Other.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/Other/Other.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.PointObject.Tacticalsmoke.Other;
+package edu.nps.moves.dis7.objecttypes.PointObject.Tacticalsmoke.Other;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Tacticalsmoke/TacticalSmoke_Canister/TacticalSmoke_Canister.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/TacticalSmoke_Canister/TacticalSmoke_Canister.java
similarity index 69%
rename from src-generated/edu/nps/moves/dis/objecttypes/PointObject/Tacticalsmoke/TacticalSmoke_Canister/TacticalSmoke_Canister.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/TacticalSmoke_Canister/TacticalSmoke_Canister.java
index 03a3b16d4143a0a8a16dd60e56b95d739260b451..938c7e9db581886e369257437ce85712b0e5b3c2 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Tacticalsmoke/TacticalSmoke_Canister/TacticalSmoke_Canister.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/TacticalSmoke_Canister/TacticalSmoke_Canister.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.PointObject.Tacticalsmoke.TacticalSmoke_Canister;
+package edu.nps.moves.dis7.objecttypes.PointObject.Tacticalsmoke.TacticalSmoke_Canister;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Tacticalsmoke/Tacticalsmoke.java b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/Tacticalsmoke.java
similarity index 67%
rename from src-generated/edu/nps/moves/dis/objecttypes/PointObject/Tacticalsmoke/Tacticalsmoke.java
rename to src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/Tacticalsmoke.java
index 8a0bf83fbe4b278b5765038c79586650a44f5cba..de62198cbb691f64f11736034826a8b556b5c0b6 100644
--- a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Tacticalsmoke/Tacticalsmoke.java
+++ b/src-generated/edu/nps/moves/dis7/objecttypes/PointObject/Tacticalsmoke/Tacticalsmoke.java
@@ -1,7 +1,7 @@
-package edu.nps.moves.dis.objecttypes.PointObject.Tacticalsmoke;
+package edu.nps.moves.dis7.objecttypes.PointObject.Tacticalsmoke;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
/**
* SISO-REF-010-v25, 2018-08-29
diff --git a/src/edu/nps/moves/dis/Align.java b/src/edu/nps/moves/dis7/Align.java
similarity index 99%
rename from src/edu/nps/moves/dis/Align.java
rename to src/edu/nps/moves/dis7/Align.java
index 6641146759aa87f5b4a850efe1feea7c36fc57a4..fb1a4a3a47fe59f15153799f25bdf4b2e6dc9a1b 100644
--- a/src/edu/nps/moves/dis/Align.java
+++ b/src/edu/nps/moves/dis7/Align.java
@@ -3,7 +3,7 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.io.DataInputStream;
import java.io.DataOutputStream;
diff --git a/src/edu/nps/moves/dis/Category.java b/src/edu/nps/moves/dis7/Category.java
similarity index 93%
rename from src/edu/nps/moves/dis/Category.java
rename to src/edu/nps/moves/dis7/Category.java
index 5677a2f859f24a82dcd812916553e44696ea6eca..aeb466f3b234eabbe4d9b9972200546c1df2c75c 100644
--- a/src/edu/nps/moves/dis/Category.java
+++ b/src/edu/nps/moves/dis7/Category.java
@@ -3,7 +3,7 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
/**
* Category.java created on May 7, 2019
diff --git a/src/edu/nps/moves/dis/DisBitSet.java b/src/edu/nps/moves/dis7/DisBitSet.java
similarity index 99%
rename from src/edu/nps/moves/dis/DisBitSet.java
rename to src/edu/nps/moves/dis7/DisBitSet.java
index ad7ea3a925e2500d9ed2b48763ff4742f6ea154f..4efd36f38b97cfd1c00360955a66087bc8c2fe77 100644
--- a/src/edu/nps/moves/dis/DisBitSet.java
+++ b/src/edu/nps/moves/dis7/DisBitSet.java
@@ -3,7 +3,7 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.io.DataInputStream;
import java.io.DataOutputStream;
diff --git a/src/edu/nps/moves/dis/DisTime.java b/src/edu/nps/moves/dis7/DisTime.java
similarity index 99%
rename from src/edu/nps/moves/dis/DisTime.java
rename to src/edu/nps/moves/dis7/DisTime.java
index 5a8a72c4ece25393fe162b6e54711b38b1e601f9..0307a02476ddcf38d4e48c4e9f6576793f8903cb 100644
--- a/src/edu/nps/moves/dis/DisTime.java
+++ b/src/edu/nps/moves/dis7/DisTime.java
@@ -3,7 +3,7 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.util.*;
diff --git a/src/edu/nps/moves/dis/EntityCapabilities.java b/src/edu/nps/moves/dis7/EntityCapabilities.java
similarity index 93%
rename from src/edu/nps/moves/dis/EntityCapabilities.java
rename to src/edu/nps/moves/dis7/EntityCapabilities.java
index b02372308c8c68d66a27003ed0ed3f2dc6ff6597..dd6898840c46de9398056d181487c820a55f92c9 100644
--- a/src/edu/nps/moves/dis/EntityCapabilities.java
+++ b/src/edu/nps/moves/dis7/EntityCapabilities.java
@@ -3,7 +3,7 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
/**
* EntityCapabilities.java created on May 7, 2019
diff --git a/src/edu/nps/moves/dis/EnumNotFoundException.java b/src/edu/nps/moves/dis7/EnumNotFoundException.java
similarity index 93%
rename from src/edu/nps/moves/dis/EnumNotFoundException.java
rename to src/edu/nps/moves/dis7/EnumNotFoundException.java
index 69f54cac051b2d879da883661ce74b3812976a5e..32fdb25ecb20b73ec253b6583f3d56f7bbe61509 100644
--- a/src/edu/nps/moves/dis/EnumNotFoundException.java
+++ b/src/edu/nps/moves/dis7/EnumNotFoundException.java
@@ -3,7 +3,7 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
/**
* EnumNotFoundException.java created on Apr 15, 2019
diff --git a/src/edu/nps/moves/dis/Marshaller.java b/src/edu/nps/moves/dis7/Marshaller.java
similarity index 97%
rename from src/edu/nps/moves/dis/Marshaller.java
rename to src/edu/nps/moves/dis7/Marshaller.java
index 7455a6fb6d802621d2d23486bce13b970309cfa5..b3fbb1e48f0ae63072669db40a1ecea058a8d374 100644
--- a/src/edu/nps/moves/dis/Marshaller.java
+++ b/src/edu/nps/moves/dis7/Marshaller.java
@@ -3,7 +3,7 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.io.DataInputStream;
import java.io.DataOutputStream;
diff --git a/src/edu/nps/moves/dis/PduStatus.java b/src/edu/nps/moves/dis7/PduStatus.java
similarity index 99%
rename from src/edu/nps/moves/dis/PduStatus.java
rename to src/edu/nps/moves/dis7/PduStatus.java
index 037988c62b9e4c8b0149dffa96297563384f1ae6..8c32434c066be637d6209646a550bfba505c6117 100644
--- a/src/edu/nps/moves/dis/PduStatus.java
+++ b/src/edu/nps/moves/dis7/PduStatus.java
@@ -3,7 +3,7 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
import java.io.DataInputStream;
import java.io.DataOutputStream;
diff --git a/src/edu/nps/moves/dis/SubCategory.java b/src/edu/nps/moves/dis7/SubCategory.java
similarity index 91%
rename from src/edu/nps/moves/dis/SubCategory.java
rename to src/edu/nps/moves/dis7/SubCategory.java
index 8470af2697fca0f11814df07ed3b09514906f9fc..7d05e5c7a98d26c6419b3782214b809d95b3f937 100644
--- a/src/edu/nps/moves/dis/SubCategory.java
+++ b/src/edu/nps/moves/dis7/SubCategory.java
@@ -3,7 +3,7 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis;
+package edu.nps.moves.dis7;
public interface SubCategory
{
diff --git a/src/edu/nps/moves/dis/examples/EntityUse.java b/src/edu/nps/moves/dis7/examples/EntityUse.java
similarity index 90%
rename from src/edu/nps/moves/dis/examples/EntityUse.java
rename to src/edu/nps/moves/dis7/examples/EntityUse.java
index 343645d68bd16b73bf7d23829e37e3a4de5f6115..d33bb74ff6798722aea808fd345f8b1d7fffa82c 100644
--- a/src/edu/nps/moves/dis/examples/EntityUse.java
+++ b/src/edu/nps/moves/dis7/examples/EntityUse.java
@@ -3,14 +3,14 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis.examples;
+package edu.nps.moves.dis7.examples;
-import edu.nps.moves.dis.EntityStatePdu;
-import edu.nps.moves.dis.EntityType;
-import edu.nps.moves.dis.util.DisNetworking;
-import edu.nps.moves.dis.util.PduFactory;
-import edu.nps.moves.dis.entities.EntityTypeFactory;
-import edu.nps.moves.dis.enumerations.DISPDUType;
+import edu.nps.moves.dis7.EntityStatePdu;
+import edu.nps.moves.dis7.EntityType;
+import edu.nps.moves.dis7.util.DisNetworking;
+import edu.nps.moves.dis7.util.PduFactory;
+import edu.nps.moves.dis7.entities.EntityTypeFactory;
+import edu.nps.moves.dis7.enumerations.DISPDUType;
import java.io.IOException;
/**
@@ -94,7 +94,7 @@ public class EntityUse
EntityStatePdu pdu2 = (EntityStatePdu)pduFactory.createPdu(DISPDUType.ENTITY_STATE);
/* set desired entity state fields here */
- edu.nps.moves.dis.entities.usa.platform.surface.AD44Shenandoah et2 = new edu.nps.moves.dis.entities.usa.platform.surface.AD44Shenandoah();
+ edu.nps.moves.dis7.entities.usa.platform.surface.AD44Shenandoah et2 = new edu.nps.moves.dis7.entities.usa.platform.surface.AD44Shenandoah();
/* Use import statement to make the code above more readable */
pdu2.setEntityType(et2);
diff --git a/src/edu/nps/moves/dis/util/CoordinateConversions.java b/src/edu/nps/moves/dis7/util/CoordinateConversions.java
similarity index 99%
rename from src/edu/nps/moves/dis/util/CoordinateConversions.java
rename to src/edu/nps/moves/dis7/util/CoordinateConversions.java
index 3a462c96f1f7a1a1758d20c3cd5fd0282036dbf1..3c114afe4027324e34b8a15d319fc9bf99b14182 100644
--- a/src/edu/nps/moves/dis/util/CoordinateConversions.java
+++ b/src/edu/nps/moves/dis7/util/CoordinateConversions.java
@@ -3,7 +3,7 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis.util;
+package edu.nps.moves.dis7.util;
/**
* Converts DIS (x,y,z) rectilinear coordinates (earth-centered RH coordinate system)
diff --git a/src/edu/nps/moves/dis/util/DisNetworking.java b/src/edu/nps/moves/dis7/util/DisNetworking.java
similarity index 98%
rename from src/edu/nps/moves/dis/util/DisNetworking.java
rename to src/edu/nps/moves/dis7/util/DisNetworking.java
index 3e94ef667ca33915d95b33fde618f135374c07f4..611bfd4a3fe057d99bdfbfcedbe4d5fda7fee045 100644
--- a/src/edu/nps/moves/dis/util/DisNetworking.java
+++ b/src/edu/nps/moves/dis7/util/DisNetworking.java
@@ -3,9 +3,9 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis.util;
+package edu.nps.moves.dis7.util;
-import edu.nps.moves.dis.Pdu;
+import edu.nps.moves.dis7.Pdu;
import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;
import java.io.IOException;
diff --git a/src/edu/nps/moves/dis/util/DisThreadedNetIF.java b/src/edu/nps/moves/dis7/util/DisThreadedNetIF.java
similarity index 98%
rename from src/edu/nps/moves/dis/util/DisThreadedNetIF.java
rename to src/edu/nps/moves/dis7/util/DisThreadedNetIF.java
index 13284ba27275c5569d964ceb40c00f9a6cf65b76..36fbc297bb6b527ce640041b73d7fe8068bddaf8 100644
--- a/src/edu/nps/moves/dis/util/DisThreadedNetIF.java
+++ b/src/edu/nps/moves/dis7/util/DisThreadedNetIF.java
@@ -3,10 +3,10 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis.util;
+package edu.nps.moves.dis7.util;
-import edu.nps.moves.dis.Pdu;
-import edu.nps.moves.dis.enumerations.DISPDUType;
+import edu.nps.moves.dis7.Pdu;
+import edu.nps.moves.dis7.enumerations.DISPDUType;
import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;
import java.io.IOException;
diff --git a/src/edu/nps/moves/dis/util/PduFactory.java b/src/edu/nps/moves/dis7/util/PduFactory.java
similarity index 97%
rename from src/edu/nps/moves/dis/util/PduFactory.java
rename to src/edu/nps/moves/dis7/util/PduFactory.java
index 4b61a5c44697fba167d2cf0db399c8a39f11fc39..41b8c43db6f0644241eb4cf94030a622461b795c 100644
--- a/src/edu/nps/moves/dis/util/PduFactory.java
+++ b/src/edu/nps/moves/dis7/util/PduFactory.java
@@ -3,10 +3,10 @@
* This work is licensed under the BSD open source license, available at https://www.movesinstitute.org/licenses/bsd.html
*/
-package edu.nps.moves.dis.util;
+package edu.nps.moves.dis7.util;
-import edu.nps.moves.dis.*;
-import edu.nps.moves.dis.enumerations.*;
+import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.enumerations.*;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.nio.ByteBuffer;
@@ -415,15 +415,15 @@ public class PduFactory
return (CommentPdu) addBoilerPlate(pdu);
}
- public ElectronicEmissionsPdu makeElectronicEmissionsPdu()
+ public ElectromagneticEmissionPdu makeElectronicEmissionsPdu()
{
- ElectronicEmissionsPdu pdu = new ElectronicEmissionsPdu()
+ ElectromagneticEmissionPdu pdu = new ElectromagneticEmissionPdu()
.setEmittingEntityID(newEntityID())
.setEventID(newEventIdentifier());
/*
.setStateUpdateIndicator(ElectromagneticEmissionStateUpdateIndicator.HEARTBEAT_UPDATE)
*/
- return (ElectronicEmissionsPdu) addBoilerPlate(pdu);
+ return (ElectromagneticEmissionPdu) addBoilerPlate(pdu);
}
public DesignatorPdu makeDesignatorPdu()
@@ -480,9 +480,9 @@ public class PduFactory
return (ReceiverPdu) addBoilerPlate(pdu);
}
- public IffPdu makeIffPdu()
+ public IFFPdu makeIffPdu()
{
- IffPdu pdu = new IffPdu()
+ IFFPdu pdu = new IFFPdu()
.setEmittingEntityId(newEntityID())
.setEventID(newEventIdentifier());
/*
@@ -491,7 +491,7 @@ public class PduFactory
.setSystemID(newSystemIdentifier())
*/
- return (IffPdu) addBoilerPlate(pdu);
+ return (IFFPdu) addBoilerPlate(pdu);
}
public UnderwaterAcousticPdu makeUnderwaterAcousticPdu()
@@ -506,11 +506,11 @@ public class PduFactory
return (UnderwaterAcousticPdu) addBoilerPlate(pdu);
}
- public SeesPdu makeSeesPdu()
+ public SEESPdu makeSeesPdu()
{
- SeesPdu pdu = new SeesPdu();
+ SEESPdu pdu = new SEESPdu();
- return (SeesPdu) addBoilerPlate(pdu);
+ return (SEESPdu) addBoilerPlate(pdu);
}
public IntercomSignalPdu makeIntercomSignalPdu()
@@ -625,11 +625,11 @@ public class PduFactory
return (MinefieldDataPdu) addBoilerPlate(pdu);
}
- public MinefieldResponseNackPdu makeMinefieldResponseNackPdu()
+ public MinefieldResponseNACKPdu makeMinefieldResponseNackPdu()
{
- MinefieldResponseNackPdu pdu = new MinefieldResponseNackPdu();
+ MinefieldResponseNACKPdu pdu = new MinefieldResponseNACKPdu();
- return (MinefieldResponseNackPdu) addBoilerPlate(pdu);
+ return (MinefieldResponseNACKPdu) addBoilerPlate(pdu);
}
public EnvironmentalProcessPdu makeEnvironmentalProcessPdu()
@@ -700,9 +700,9 @@ public class PduFactory
return (ArealObjectStatePdu) addBoilerPlate(pdu);
}
- public TspiPdu makeTspiPdu()
+ public TSPIPdu makeTspiPdu()
{
- TspiPdu pdu = new TspiPdu()
+ TSPIPdu pdu = new TSPIPdu()
.setLiveEntityId(newEntityID());
/*
.setDeadReckoningParameters(newLiveDeadReckoningParameters())
@@ -712,7 +712,7 @@ public class PduFactory
.setOrientationError(new LiveEntityOrientationError())
.setPositionError(new LiveEntityPositionError())*/;
pdu.setSubprotocolNumber(DISLiveEntitySubprotocolNumber.NO_SUBPROTOCOL);
- return (TspiPdu) addBoilerPlate(pdu);
+ return (TSPIPdu) addBoilerPlate(pdu);
}
public AppearancePdu makeAppearancePdu()
@@ -1149,7 +1149,7 @@ public class PduFactory
break;
case ELECTROMAGNETIC_EMISSION:
- aPdu = new ElectronicEmissionsPdu();
+ aPdu = new ElectromagneticEmissionPdu();
break;
case DESIGNATOR:
@@ -1169,7 +1169,7 @@ public class PduFactory
break;
case IFF:
- aPdu = new IffPdu();
+ aPdu = new IFFPdu();
break;
case UNDERWATER_ACOUSTIC:
@@ -1177,7 +1177,7 @@ public class PduFactory
break;
case SUPPLEMENTAL_EMISSION_ENTITY_STATE:
- aPdu = new SeesPdu();
+ aPdu = new SEESPdu();
break;
case INTERCOM_SIGNAL:
@@ -1217,7 +1217,7 @@ public class PduFactory
break;
case MINEFIELD_RESPONSE_NACK:
- aPdu = new MinefieldResponseNackPdu();
+ aPdu = new MinefieldResponseNACKPdu();
break;
case ENVIRONMENTAL_PROCESS:
@@ -1241,7 +1241,7 @@ public class PduFactory
break;
case TSPI:
- aPdu = new TspiPdu();
+ aPdu = new TSPIPdu();
break;
case APPEARANCE:
diff --git a/src/edu/nps/moves/dis/util/playerrecorder/LogCompare.java b/src/edu/nps/moves/dis7/util/playerrecorder/LogCompare.java
similarity index 91%
rename from src/edu/nps/moves/dis/util/playerrecorder/LogCompare.java
rename to src/edu/nps/moves/dis7/util/playerrecorder/LogCompare.java
index c01f89b401bf283208c2814985ba4b1cf4d8cf14..29b38668728cc988f034f71bee614ad3fa204682 100644
--- a/src/edu/nps/moves/dis/util/playerrecorder/LogCompare.java
+++ b/src/edu/nps/moves/dis7/util/playerrecorder/LogCompare.java
@@ -1,8 +1,8 @@
-package edu.nps.moves.dis.util.playerrecorder;
+package edu.nps.moves.dis7.util.playerrecorder;
-import edu.nps.moves.dis.Pdu;
-import edu.nps.moves.dis.util.PduFactory;
-import static edu.nps.moves.dis.util.playerrecorder.Recorder.COMMENT_MARKER;
+import edu.nps.moves.dis7.Pdu;
+import edu.nps.moves.dis7.util.PduFactory;
+import static edu.nps.moves.dis7.util.playerrecorder.Recorder.COMMENT_MARKER;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
@@ -17,7 +17,8 @@ import java.util.Base64;
*/
public class LogCompare
{
- private static String[] paths = {"/Users/mike/NetbeansProjects/open-dis7-java/examples/pdulog/Pdusave.dislog",
+ private static String[] paths = {
+ "/Users/mike/NetbeansProjects/open-dis7-java/examples/pdulog/Pdusave.dislog",
"/Users/mike/NetbeansProjects/open-dis7-java/examples/pdulog/Pdusave1.dislog"};
public static void main(String[] args)
diff --git a/src/edu/nps/moves/dis/util/playerrecorder/PduReceiver.java b/src/edu/nps/moves/dis7/util/playerrecorder/PduReceiver.java
similarity index 60%
rename from src/edu/nps/moves/dis/util/playerrecorder/PduReceiver.java
rename to src/edu/nps/moves/dis7/util/playerrecorder/PduReceiver.java
index 9ed8fd8c30fcdba26bd29ff4fc01d2befcaaf836..9a1e276921a2e7b745414c970cfc6e29bf648538 100644
--- a/src/edu/nps/moves/dis/util/playerrecorder/PduReceiver.java
+++ b/src/edu/nps/moves/dis7/util/playerrecorder/PduReceiver.java
@@ -1,4 +1,4 @@
-package edu.nps.moves.dis.util.playerrecorder;
+package edu.nps.moves.dis7.util.playerrecorder;
public interface PduReceiver
{
diff --git a/src/edu/nps/moves/dis/util/playerrecorder/Player.java b/src/edu/nps/moves/dis7/util/playerrecorder/Player.java
similarity index 97%
rename from src/edu/nps/moves/dis/util/playerrecorder/Player.java
rename to src/edu/nps/moves/dis7/util/playerrecorder/Player.java
index d9d2ec1d73a3d05716b17f95e355a22b6a8d74d2..d40116d2e386a27d66af911676957335bd617701 100644
--- a/src/edu/nps/moves/dis/util/playerrecorder/Player.java
+++ b/src/edu/nps/moves/dis7/util/playerrecorder/Player.java
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
-package edu.nps.moves.dis.util.playerrecorder;
+package edu.nps.moves.dis7.util.playerrecorder;
import com.google.common.primitives.Longs;
@@ -17,7 +17,7 @@ import java.nio.file.Path;
import java.util.Arrays;
import java.util.Base64;
-import static edu.nps.moves.dis.util.playerrecorder.Recorder.*;
+import static edu.nps.moves.dis7.util.playerrecorder.Recorder.*;
public class Player
{
diff --git a/src/edu/nps/moves/dis/util/playerrecorder/Recorder.java b/src/edu/nps/moves/dis7/util/playerrecorder/Recorder.java
similarity index 94%
rename from src/edu/nps/moves/dis/util/playerrecorder/Recorder.java
rename to src/edu/nps/moves/dis7/util/playerrecorder/Recorder.java
index c04862f105ae0a6ddef76d6845fef6db57cd4691..26bdd88f66bd518739a85afc4680985a08048be1 100644
--- a/src/edu/nps/moves/dis/util/playerrecorder/Recorder.java
+++ b/src/edu/nps/moves/dis7/util/playerrecorder/Recorder.java
@@ -1,11 +1,11 @@
-package edu.nps.moves.dis.util.playerrecorder;
+package edu.nps.moves.dis7.util.playerrecorder;
import com.google.common.primitives.Longs;
-import edu.nps.moves.dis.Pdu;
-import edu.nps.moves.dis.enumerations.DISPDUType;
-import edu.nps.moves.dis.util.DisNetworking;
-import edu.nps.moves.dis.util.DisNetworking.BuffAndLength;
-import edu.nps.moves.dis.util.PduFactory;
+import edu.nps.moves.dis7.Pdu;
+import edu.nps.moves.dis7.enumerations.DISPDUType;
+import edu.nps.moves.dis7.util.DisNetworking;
+import edu.nps.moves.dis7.util.DisNetworking.BuffAndLength;
+import edu.nps.moves.dis7.util.PduFactory;
import org.apache.commons.io.FilenameUtils;
import java.io.BufferedWriter;