diff --git a/src-generated/edu/nps/moves/dis/JammingTechnique.java b/src-generated/edu/nps/moves/dis/JammingTechnique.java
index 886f5cf9f23f5ed7dab300f2f7edafc2f158ee4d..495e5104ee12f6c21c54e964bedaa5765316dcf6 100644
--- a/src-generated/edu/nps/moves/dis/JammingTechnique.java
+++ b/src-generated/edu/nps/moves/dis/JammingTechnique.java
@@ -15,13 +15,13 @@ import edu.nps.moves.dis.enumerations.*;
*/
public class JammingTechnique extends Object implements Serializable
{
- protected JammerKind kind = edu.nps.moves.dis.jammers.JammerKind.DECEPTIONANDNOISE;
+ protected byte kind;
- protected JammerCategory category = edu.nps.moves.dis.jammers.DeceptionandNoise.Category.GATESTEALERANDNOISE;
+ protected byte category;
- protected JammerSubCategory subcategory = edu.nps.moves.dis.jammers.DeceptionandNoise.GateStealerandNoise.SubCategory.NOISEANDVGPO;
+ protected byte subCategory;
- protected JammerSpecific specific = edu.nps.moves.dis.jammers.DeceptionandNoise.GateStealerandNoise.NoiseandVGPO.Specific.LOWLEVELNOISEANDVGPO;
+ protected byte specific;
/** Constructor */
@@ -33,55 +33,55 @@ public int getMarshalledSize()
{
int marshalSize = 0;
- marshalSize += kind.getMarshalledSize();
- marshalSize += category.getMarshalledSize();
- marshalSize += subcategory.getMarshalledSize();
- marshalSize += specific.getMarshalledSize();
+ marshalSize += 1; // kind
+ marshalSize += 1; // category
+ marshalSize += 1; // subCategory
+ marshalSize += 1; // specific
return marshalSize;
}
-public JammingTechnique setKind(JammerKind pKind)
+public JammingTechnique setKind(byte pKind)
{
kind = pKind;
return this;
}
-public JammerKind getKind()
+public byte getKind()
{
return kind;
}
-public JammingTechnique setCategory(JammerCategory pCategory)
+public JammingTechnique setCategory(byte pCategory)
{
category = pCategory;
return this;
}
-public JammerCategory getCategory()
+public byte getCategory()
{
return category;
}
-public JammingTechnique setSubcategory(JammerSubCategory pSubcategory)
+public JammingTechnique setSubCategory(byte pSubCategory)
{
- subcategory = pSubcategory;
+ subCategory = pSubCategory;
return this;
}
-public JammerSubCategory getSubcategory()
+public byte getSubCategory()
{
- return subcategory;
+ return subCategory;
}
-public JammingTechnique setSpecific(JammerSpecific pSpecific)
+public JammingTechnique setSpecific(byte pSpecific)
{
specific = pSpecific;
return this;
}
-public JammerSpecific getSpecific()
+public byte getSpecific()
{
return specific;
}
@@ -95,10 +95,10 @@ public void marshal(DataOutputStream dos)
{
try
{
- kind.marshal(dos);
- category.marshal(dos);
- subcategory.marshal(dos);
- specific.marshal(dos);
+ dos.writeByte( (byte)kind);
+ dos.writeByte( (byte)category);
+ dos.writeByte( (byte)subCategory);
+ dos.writeByte( (byte)specific);
}
catch(Exception e)
{
@@ -117,10 +117,14 @@ public int unmarshal(DataInputStream dis)
int uPosition = 0;
try
{
- uPosition += kind.unmarshal(dis);
- uPosition += category.unmarshal(dis);
- uPosition += subcategory.unmarshal(dis);
- uPosition += specific.unmarshal(dis);
+ kind = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ category = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ subCategory = (byte)dis.readUnsignedByte();
+ uPosition += 1;
+ specific = (byte)dis.readUnsignedByte();
+ uPosition += 1;
}
catch(Exception e)
{
@@ -139,10 +143,10 @@ public int unmarshal(DataInputStream dis)
*/
public void marshal(java.nio.ByteBuffer buff) throws Exception
{
- kind.marshal(buff);
- category.marshal(buff);
- subcategory.marshal(buff);
- specific.marshal(buff);
+ buff.put( (byte)kind);
+ buff.put( (byte)category);
+ buff.put( (byte)subCategory);
+ buff.put( (byte)specific);
}
/**
@@ -155,10 +159,10 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
*/
public int unmarshal(java.nio.ByteBuffer buff) throws Exception
{
- kind.unmarshal(buff);
- category.unmarshal(buff);
- subcategory.unmarshal(buff);
- specific.unmarshal(buff);
+ kind = (byte)(buff.get() & 0xFF);
+ category = (byte)(buff.get() & 0xFF);
+ subCategory = (byte)(buff.get() & 0xFF);
+ specific = (byte)(buff.get() & 0xFF);
return getMarshalledSize();
}
@@ -195,10 +199,10 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
final JammingTechnique rhs = (JammingTechnique)obj;
- if( ! (kind.equals( rhs.kind) )) ivarsEqual = false;
- if( ! (category.equals( rhs.category) )) ivarsEqual = false;
- if( ! (subcategory.equals( rhs.subcategory) )) ivarsEqual = false;
- if( ! (specific.equals( rhs.specific) )) ivarsEqual = false;
+ if( ! (kind == rhs.kind)) ivarsEqual = false;
+ if( ! (category == rhs.category)) ivarsEqual = false;
+ if( ! (subCategory == rhs.subCategory)) ivarsEqual = false;
+ if( ! (specific == rhs.specific)) ivarsEqual = false;
return ivarsEqual;
}
} // end of class
diff --git a/src-generated/edu/nps/moves/dis/JammingTechniqueRaw.java b/src-generated/edu/nps/moves/dis/JammingTechniqueRaw.java
deleted file mode 100644
index 509c0cc59deabdd4f1731e59002eed8c243eb1da..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/JammingTechniqueRaw.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/**
- * 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.dis;
-
-import java.util.*;
-import java.io.*;
-import edu.nps.moves.dis.enumerations.*;
-
-/**
- * Jamming technique. Section 6.2.49, uid 284
- * IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation—Application Protocols
- */
-public class JammingTechniqueRaw extends Object implements Serializable
-{
- protected byte kind;
-
- protected byte category;
-
- protected byte subcategory;
-
- protected byte specific;
-
-
-/** Constructor */
- public JammingTechniqueRaw()
- {
- }
-
-public int getMarshalledSize()
-{
- int marshalSize = 0;
-
- marshalSize += 1; // kind
- marshalSize += 1; // category
- marshalSize += 1; // subcategory
- marshalSize += 1; // specific
-
- return marshalSize;
-}
-
-
-public JammingTechniqueRaw setKind(byte pKind)
-{
- kind = pKind;
- return this;
-}
-
-public byte getKind()
-{
- return kind;
-}
-
-public JammingTechniqueRaw setCategory(byte pCategory)
-{
- category = pCategory;
- return this;
-}
-
-public byte getCategory()
-{
- return category;
-}
-
-public JammingTechniqueRaw setSubcategory(byte pSubcategory)
-{
- subcategory = pSubcategory;
- return this;
-}
-
-public byte getSubcategory()
-{
- return subcategory;
-}
-
-public JammingTechniqueRaw setSpecific(byte pSpecific)
-{
- specific = pSpecific;
- return this;
-}
-
-public byte getSpecific()
-{
- return specific;
-}
-
-/**
- * Serializes an object to a DataOutputStream.
- * @see java.io.DataOutputStream
- * @param dos The DataOutputStream
- */
-public void marshal(DataOutputStream dos)
-{
- try
- {
- dos.writeByte( (byte)kind);
- dos.writeByte( (byte)category);
- dos.writeByte( (byte)subcategory);
- dos.writeByte( (byte)specific);
- }
- catch(Exception e)
- {
- System.err.println(e);
- }
-}
-
-/**
- * Unserializes an object from a DataInputStream.
- * @see java.io.DataInputStream
- * @param dis The DataInputStream
- * @return marshalled size
- */
-public int unmarshal(DataInputStream dis)
-{
- int uPosition = 0;
- try
- {
- kind = (byte)dis.readUnsignedByte();
- uPosition += 1;
- category = (byte)dis.readUnsignedByte();
- uPosition += 1;
- subcategory = (byte)dis.readUnsignedByte();
- uPosition += 1;
- specific = (byte)dis.readUnsignedByte();
- uPosition += 1;
- }
- catch(Exception e)
- {
- System.out.println(e);
- }
- return getMarshalledSize();
-}
-
-/**
- * Packs an object into the ByteBuffer.
- * @throws java.nio.BufferOverflowException if buff is too small
- * @throws java.nio.ReadOnlyBufferException if buff is read only
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin writing
- * @throws Exception ByteBuffer-generated exception
- */
-public void marshal(java.nio.ByteBuffer buff) throws Exception
-{
- buff.put( (byte)kind);
- buff.put( (byte)category);
- buff.put( (byte)subcategory);
- buff.put( (byte)specific);
-}
-
-/**
- * Unpacks a Pdu from the underlying data.
- * @throws java.nio.BufferUnderflowException if buff is too small
- * @see java.nio.ByteBuffer
- * @param buff The ByteBuffer at the position to begin reading
- * @return marshalled size
- * @throws Exception ByteBuffer-generated exception
- */
-public int unmarshal(java.nio.ByteBuffer buff) throws Exception
-{
- kind = (byte)(buff.get() & 0xFF);
- category = (byte)(buff.get() & 0xFF);
- subcategory = (byte)(buff.get() & 0xFF);
- specific = (byte)(buff.get() & 0xFF);
- return getMarshalledSize();
-}
-
- /*
- * The equals method doesn't always work--mostly it works only on classes that consist only of primitives. Be careful.
- */
-@Override
- public boolean equals(Object obj)
- {
- if(this == obj)
- return true;
-
- if(obj == null)
- return false;
-
- if(getClass() != obj.getClass())
- return false;
-
- return equalsImpl(obj);
- }
-
- /**
- * Compare all fields that contribute to the state, ignoring
- * transient and static fields, for <code>this</code> and the supplied object
- * @param obj the object to compare to
- * @return true if the objects are equal, false otherwise.
- */
- public boolean equalsImpl(Object obj)
- {
- boolean ivarsEqual = true;
-
- if(!(obj instanceof JammingTechniqueRaw))
- return false;
-
- final JammingTechniqueRaw rhs = (JammingTechniqueRaw)obj;
-
- if( ! (kind == rhs.kind)) ivarsEqual = false;
- if( ! (category == rhs.category)) ivarsEqual = false;
- if( ! (subcategory == rhs.subcategory)) ivarsEqual = false;
- if( ! (specific == rhs.specific)) ivarsEqual = false;
- return ivarsEqual;
- }
-} // end of class
diff --git a/src-generated/edu/nps/moves/dis/ObjectType.java b/src-generated/edu/nps/moves/dis/ObjectType.java
index bedd4c7461afa8653d55630f313af4da748fb25f..09a3ed9c1fa4845e084b0fa16603673ace1e10f3 100644
--- a/src-generated/edu/nps/moves/dis/ObjectType.java
+++ b/src-generated/edu/nps/moves/dis/ObjectType.java
@@ -25,7 +25,7 @@ public class ObjectType extends Object implements Serializable
protected byte category;
/** subcategory of entity */
- protected byte subcategory;
+ protected byte subCategory;
/** Constructor */
@@ -40,7 +40,7 @@ public int getMarshalledSize()
marshalSize += domain.getMarshalledSize();
marshalSize += objectKind.getMarshalledSize();
marshalSize += 1; // category
- marshalSize += 1; // subcategory
+ marshalSize += 1; // subCategory
return marshalSize;
}
@@ -79,15 +79,15 @@ public byte getCategory()
return category;
}
-public ObjectType setSubcategory(byte pSubcategory)
+public ObjectType setSubCategory(byte pSubCategory)
{
- subcategory = pSubcategory;
+ subCategory = pSubCategory;
return this;
}
-public byte getSubcategory()
+public byte getSubCategory()
{
- return subcategory;
+ return subCategory;
}
/**
@@ -102,7 +102,7 @@ public void marshal(DataOutputStream dos)
domain.marshal(dos);
objectKind.marshal(dos);
dos.writeByte( (byte)category);
- dos.writeByte( (byte)subcategory);
+ dos.writeByte( (byte)subCategory);
}
catch(Exception e)
{
@@ -127,7 +127,7 @@ public int unmarshal(DataInputStream dis)
uPosition += objectKind.getMarshalledSize();
category = (byte)dis.readUnsignedByte();
uPosition += 1;
- subcategory = (byte)dis.readUnsignedByte();
+ subCategory = (byte)dis.readUnsignedByte();
uPosition += 1;
}
catch(Exception e)
@@ -150,7 +150,7 @@ public void marshal(java.nio.ByteBuffer buff) throws Exception
domain.marshal(buff);
objectKind.marshal(buff);
buff.put( (byte)category);
- buff.put( (byte)subcategory);
+ buff.put( (byte)subCategory);
}
/**
@@ -166,7 +166,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
domain = PlatformDomain.unmarshalEnum(buff);
objectKind = ObjectKind.unmarshalEnum(buff);
category = (byte)(buff.get() & 0xFF);
- subcategory = (byte)(buff.get() & 0xFF);
+ subCategory = (byte)(buff.get() & 0xFF);
return getMarshalledSize();
}
@@ -206,7 +206,7 @@ public int unmarshal(java.nio.ByteBuffer buff) throws Exception
if( ! (domain == rhs.domain)) ivarsEqual = false;
if( ! (objectKind == rhs.objectKind)) ivarsEqual = false;
if( ! (category == rhs.category)) ivarsEqual = false;
- if( ! (subcategory == rhs.subcategory)) ivarsEqual = false;
+ if( ! (subCategory == rhs.subCategory)) ivarsEqual = false;
return ivarsEqual;
}
} // end of class
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AGCandGateStealer/AGCandGateStealer.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AGCandGateStealer/AGCandGateStealer.java
new file mode 100644
index 0000000000000000000000000000000000000000..72d0b9085685b2778c65b870c9696c78cfff2221
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/AGCandGateStealer/AGCandGateStealer.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.Deception.AGCandGateStealer;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class AGCandGateStealer extends JammingTechnique
+{
+ public AGCandGateStealer()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)40); // AGC and Gate Stealer
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AGCandGateStealer/AGCandRGPO.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AGCandGateStealer/AGCandRGPO.java
deleted file mode 100644
index b3945eb08e60d778bd8fccf4f2e9a906d6bc613b..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AGCandGateStealer/AGCandRGPO.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.AGCandGateStealer;
-
-public class AGCandRGPO extends Base
-{
- public AGCandRGPO()
- {
- setSubcategory(SubCategory.AGCANDRGPO);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AGCandGateStealer/AGCandRGPO/AGCandRGPO.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AGCandGateStealer/AGCandRGPO/AGCandRGPO.java
new file mode 100644
index 0000000000000000000000000000000000000000..849e5bb4f029781f9e6454d31d3d22da38712415
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/AGCandGateStealer/AGCandRGPO/AGCandRGPO.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Deception.AGCandGateStealer.AGCandRGPO;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class AGCandRGPO extends JammingTechnique
+{
+ public AGCandRGPO()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)40); // AGC and Gate Stealer
+ setSubCategory((byte)5); // AGC and RGPO
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AGCandGateStealer/AGCandRGPOandVGPO.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AGCandGateStealer/AGCandRGPOandVGPO.java
deleted file mode 100644
index 2212690e26c3ad9f23af9887c64128dfc00e7ddc..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AGCandGateStealer/AGCandRGPOandVGPO.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.AGCandGateStealer;
-
-public class AGCandRGPOandVGPO extends Base
-{
- public AGCandRGPOandVGPO()
- {
- setSubcategory(SubCategory.AGCANDRGPOANDVGPO);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AGCandGateStealer/AGCandRGPOandVGPO/AGCandRGPOandVGPO.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AGCandGateStealer/AGCandRGPOandVGPO/AGCandRGPOandVGPO.java
new file mode 100644
index 0000000000000000000000000000000000000000..73fa0c375656098b0656ef05a1c561abe83929ed
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/AGCandGateStealer/AGCandRGPOandVGPO/AGCandRGPOandVGPO.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Deception.AGCandGateStealer.AGCandRGPOandVGPO;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class AGCandRGPOandVGPO extends JammingTechnique
+{
+ public AGCandRGPOandVGPO()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)40); // AGC and Gate Stealer
+ setSubCategory((byte)15); // AGC and RGPO and VGPO
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AGCandGateStealer/AGCandVGPO.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AGCandGateStealer/AGCandVGPO.java
deleted file mode 100644
index db028b32f3be5cf98297c00fdbf705447b9254e1..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AGCandGateStealer/AGCandVGPO.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.AGCandGateStealer;
-
-public class AGCandVGPO extends Base
-{
- public AGCandVGPO()
- {
- setSubcategory(SubCategory.AGCANDVGPO);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AGCandGateStealer/AGCandVGPO/AGCandVGPO.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AGCandGateStealer/AGCandVGPO/AGCandVGPO.java
new file mode 100644
index 0000000000000000000000000000000000000000..9fd237062bac6a4c2f8110376b735a3e8d57586d
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/AGCandGateStealer/AGCandVGPO/AGCandVGPO.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Deception.AGCandGateStealer.AGCandVGPO;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class AGCandVGPO extends JammingTechnique
+{
+ public AGCandVGPO()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)40); // AGC and Gate Stealer
+ setSubCategory((byte)10); // AGC and VGPO
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AGCandGateStealer/Base.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AGCandGateStealer/Base.java
deleted file mode 100644
index 0303ee5c1b93a0f42e87bc78ee55bb2c32dedb70..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AGCandGateStealer/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.AGCandGateStealer;
-
-import edu.nps.moves.dis.jammers.Deception.Category;
-
-abstract public class Base extends edu.nps.moves.dis.jammers.Deception.Base
-{
- public Base()
- {
- setCategory(Category.AGCANDGATESTEALER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AGCandGateStealer/SubCategory.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AGCandGateStealer/SubCategory.java
deleted file mode 100644
index 4b82559cb167005e773d411e058719643336212e..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AGCandGateStealer/SubCategory.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.AGCandGateStealer;
-
-import java.nio.ByteBuffer;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import edu.nps.moves.dis.*;
-
-/* marshal size 8 bits*/
-public enum SubCategory implements edu.nps.moves.dis.JammerSubCategory
-{
- AGCANDRGPO (5, "AGC and RGPO"),
- AGCANDVGPO (10, "AGC and VGPO"),
- AGCANDRGPOANDVGPO (15, "AGC and RGPO and VGPO");
-
- private byte value;
- private final String description;
-
- SubCategory(int value, String description)
- {
- this.value = (byte)value;
- this.description = description;
- }
-
- public byte getValue()
- {
- return value;
- }
-
- public String getDescription()
- {
- return description;
- }
-
- public static SubCategory getEnumerationForValue(int i)
- {
- for(SubCategory val: values()) {
- if(val.getValue()==i)
- return val;
- }
- System.err.println("No enumeration found for value " + i + " of enumeration SubCategory");
- return null;
- }
-
- @Override
- public void marshal(DataOutputStream dos)
- {
- try {
- dos.writeByte(getValue());
- }
- catch(IOException ex) {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
- }
-
- @Override
- public int unmarshal(DataInputStream dis)
- {
- try {
- value = dis.readByte();
- }
- catch(IOException ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public void marshal(ByteBuffer buff)
- {
- try {
- buff.put(getValue());
- }
- catch(Exception ex) {
- showError(ex);
- }
- }
-
- @Override
- public int unmarshal(ByteBuffer buff)
- {
- try {
- value = buff.get();
- }
- catch(Exception ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public int getMarshalledSize()
- {
- return 1; // 8 bits
- }
-
- private void showError(Exception ex)
- {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Analyzer.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Analyzer.java
deleted file mode 100644
index 33180c17d606677309bd766f5dbd79d882bd09fb..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Analyzer.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception;
-
-public class Analyzer extends Base
-{
- public Analyzer()
- {
- setCategory(Category.ANALYZER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Analyzer/Analyzer.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Analyzer/Analyzer.java
new file mode 100644
index 0000000000000000000000000000000000000000..a8791a79504f9452a266797a3286150d763a4522
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/Analyzer/Analyzer.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.Deception.Analyzer;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class Analyzer extends JammingTechnique
+{
+ public Analyzer()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)5); // Analyzer
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/Angle.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/Angle.java
new file mode 100644
index 0000000000000000000000000000000000000000..408fc4a56da1b204cb46078ca933bcc1bc351c07
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/Angle.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.Deception.Angle;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class Angle extends JammingTechnique
+{
+ public Angle()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)10); // Angle
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/AngleGateWalk_Off.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/AngleGateWalk_Off.java
deleted file mode 100644
index 242a5090a3487a44e49725a07b4659e7e9f7bc0a..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/AngleGateWalk_Off.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.Angle;
-
-public class AngleGateWalk_Off extends Base
-{
- public AngleGateWalk_Off()
- {
- setSubcategory(SubCategory.ANGLEGATEWALK_OFF);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/AngleGateWalk_Off/AngleGateWalk_Off.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/AngleGateWalk_Off/AngleGateWalk_Off.java
new file mode 100644
index 0000000000000000000000000000000000000000..175c82a5ab06f5f19ea2af4ed7325cfd9b1cc04f
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/AngleGateWalk_Off/AngleGateWalk_Off.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Deception.Angle.AngleGateWalk_Off;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class AngleGateWalk_Off extends JammingTechnique
+{
+ public AngleGateWalk_Off()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)10); // Angle
+ setSubCategory((byte)5); // Angle Gate Walk-Off
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/Base.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/Base.java
deleted file mode 100644
index 2e9cbda77327ea85711c492ed0810d069f349106..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.Angle;
-
-import edu.nps.moves.dis.jammers.Deception.Category;
-
-abstract public class Base extends edu.nps.moves.dis.jammers.Deception.Base
-{
- public Base()
- {
- setCategory(Category.ANGLE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/CooperativeAngleCAJ.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/CooperativeAngleCAJ.java
deleted file mode 100644
index 9bdc1b2ed112d00b9dddc55f465686a1a73fb296..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/CooperativeAngleCAJ.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.Angle;
-
-public class CooperativeAngleCAJ extends Base
-{
- public CooperativeAngleCAJ()
- {
- setSubcategory(SubCategory.COOPERATIVEANGLECAJ);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/CooperativeAngleCAJ/CooperativeAngleCAJ.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/CooperativeAngleCAJ/CooperativeAngleCAJ.java
new file mode 100644
index 0000000000000000000000000000000000000000..78952ddd360f33c8b15f441f8d14efbaa9e63522
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/CooperativeAngleCAJ/CooperativeAngleCAJ.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Deception.Angle.CooperativeAngleCAJ;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class CooperativeAngleCAJ extends JammingTechnique
+{
+ public CooperativeAngleCAJ()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)10); // Angle
+ setSubCategory((byte)10); // Cooperative Angle (CAJ)
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/Cross_Eye.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/Cross_Eye.java
deleted file mode 100644
index f7b7390eae88462d15f9dd77ef020f689bca783b..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/Cross_Eye.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.Angle;
-
-public class Cross_Eye extends Base
-{
- public Cross_Eye()
- {
- setSubcategory(SubCategory.CROSS_EYE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/Cross_Eye/Cross_Eye.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/Cross_Eye/Cross_Eye.java
new file mode 100644
index 0000000000000000000000000000000000000000..5ccfb3dc20cf6f751b14a96c820dcd9a7519d1d3
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/Cross_Eye/Cross_Eye.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Deception.Angle.Cross_Eye;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class Cross_Eye extends JammingTechnique
+{
+ public Cross_Eye()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)10); // Angle
+ setSubCategory((byte)15); // Cross-Eye
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/Cross_Polarization.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/Cross_Polarization.java
deleted file mode 100644
index 140d37baf60504dd3dcc2b1f9790465ed84290fb..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/Cross_Polarization.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.Angle;
-
-public class Cross_Polarization extends Base
-{
- public Cross_Polarization()
- {
- setSubcategory(SubCategory.CROSS_POLARIZATION);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/Cross_Polarization/Cross_Polarization.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/Cross_Polarization/Cross_Polarization.java
new file mode 100644
index 0000000000000000000000000000000000000000..bcb59cc99e0fc52265fac47ac66df98d34247085
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/Cross_Polarization/Cross_Polarization.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Deception.Angle.Cross_Polarization;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class Cross_Polarization extends JammingTechnique
+{
+ public Cross_Polarization()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)10); // Angle
+ setSubCategory((byte)20); // Cross-Polarization
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/Delta.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/Delta.java
deleted file mode 100644
index 8d3b3d080d0803262a4b5363e379ab427f5dded6..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/Delta.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.Angle;
-
-public class Delta extends Base
-{
- public Delta()
- {
- setSubcategory(SubCategory.DELTA);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/Delta/Delta.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/Delta/Delta.java
new file mode 100644
index 0000000000000000000000000000000000000000..fa3d4d3c00af5fcce70a80d096ddf998950cea67
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/Delta/Delta.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Deception.Angle.Delta;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class Delta extends JammingTechnique
+{
+ public Delta()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)10); // Angle
+ setSubCategory((byte)25); // Delta
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/InverseGainakaInverseAmplitude.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/InverseGainakaInverseAmplitude.java
deleted file mode 100644
index a13e941af214e1862d96b184881ee68997e84fb0..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/InverseGainakaInverseAmplitude.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.Angle;
-
-public class InverseGainakaInverseAmplitude extends Base
-{
- public InverseGainakaInverseAmplitude()
- {
- setSubcategory(SubCategory.INVERSEGAINAKAINVERSEAMPLITUDE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/InverseGainakaInverseAmplitude/InverseGainakaInverseAmplitude.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/InverseGainakaInverseAmplitude/InverseGainakaInverseAmplitude.java
new file mode 100644
index 0000000000000000000000000000000000000000..8f40e2cb6eea3bba1b09b41d3c225ac57563a765
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/InverseGainakaInverseAmplitude/InverseGainakaInverseAmplitude.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Deception.Angle.InverseGainakaInverseAmplitude;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class InverseGainakaInverseAmplitude extends JammingTechnique
+{
+ public InverseGainakaInverseAmplitude()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)10); // Angle
+ setSubCategory((byte)30); // Inverse Gain (aka Inverse Amplitude)
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/Sea_Bounced.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/Sea_Bounced.java
deleted file mode 100644
index e1dc878cb39574f6abe7fb0ae3d924b21a6682f8..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/Sea_Bounced.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.Angle;
-
-public class Sea_Bounced extends Base
-{
- public Sea_Bounced()
- {
- setSubcategory(SubCategory.SEA_BOUNCED);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/Sea_Bounced/Sea_Bounced.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/Sea_Bounced/Sea_Bounced.java
new file mode 100644
index 0000000000000000000000000000000000000000..5e1b0b071dd4eb6cb01c9a9bc38e5d1f1ac7449e
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/Sea_Bounced/Sea_Bounced.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Deception.Angle.Sea_Bounced;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class Sea_Bounced extends JammingTechnique
+{
+ public Sea_Bounced()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)10); // Angle
+ setSubCategory((byte)35); // Sea-Bounced
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/SubCategory.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/SubCategory.java
deleted file mode 100644
index d23b3e41b5ce23621a86f772b6b3be4e54b4dc66..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/SubCategory.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.Angle;
-
-import java.nio.ByteBuffer;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import edu.nps.moves.dis.*;
-
-/* marshal size 8 bits*/
-public enum SubCategory implements edu.nps.moves.dis.JammerSubCategory
-{
- ANGLEGATEWALK_OFF (5, "Angle Gate Walk-Off"),
- COOPERATIVEANGLECAJ (10, "Cooperative Angle (CAJ)"),
- CROSS_EYE (15, "Cross-Eye"),
- CROSS_POLARIZATION (20, "Cross-Polarization"),
- DELTA (25, "Delta"),
- INVERSEGAINAKAINVERSEAMPLITUDE (30, "Inverse Gain (aka Inverse Amplitude)"),
- SEA_BOUNCED (35, "Sea-Bounced"),
- SWEPTSQUAREWAVESSW (40, "Swept Square Wave (SSW)"),
- TERRAINBOUNCE (45, "Terrain Bounce");
-
- private byte value;
- private final String description;
-
- SubCategory(int value, String description)
- {
- this.value = (byte)value;
- this.description = description;
- }
-
- public byte getValue()
- {
- return value;
- }
-
- public String getDescription()
- {
- return description;
- }
-
- public static SubCategory getEnumerationForValue(int i)
- {
- for(SubCategory val: values()) {
- if(val.getValue()==i)
- return val;
- }
- System.err.println("No enumeration found for value " + i + " of enumeration SubCategory");
- return null;
- }
-
- @Override
- public void marshal(DataOutputStream dos)
- {
- try {
- dos.writeByte(getValue());
- }
- catch(IOException ex) {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
- }
-
- @Override
- public int unmarshal(DataInputStream dis)
- {
- try {
- value = dis.readByte();
- }
- catch(IOException ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public void marshal(ByteBuffer buff)
- {
- try {
- buff.put(getValue());
- }
- catch(Exception ex) {
- showError(ex);
- }
- }
-
- @Override
- public int unmarshal(ByteBuffer buff)
- {
- try {
- value = buff.get();
- }
- catch(Exception ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public int getMarshalledSize()
- {
- return 1; // 8 bits
- }
-
- private void showError(Exception ex)
- {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/SweptSquareWaveSSW.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/SweptSquareWaveSSW.java
deleted file mode 100644
index e0cb49ba6c1e5c15b504615d75234a102dcb945e..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/SweptSquareWaveSSW.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.Angle;
-
-public class SweptSquareWaveSSW extends Base
-{
- public SweptSquareWaveSSW()
- {
- setSubcategory(SubCategory.SWEPTSQUAREWAVESSW);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/SweptSquareWaveSSW/SweptSquareWaveSSW.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/SweptSquareWaveSSW/SweptSquareWaveSSW.java
new file mode 100644
index 0000000000000000000000000000000000000000..8bb6dcfe17899c1197e4d70373a7dff22cc91517
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/SweptSquareWaveSSW/SweptSquareWaveSSW.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Deception.Angle.SweptSquareWaveSSW;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class SweptSquareWaveSSW extends JammingTechnique
+{
+ public SweptSquareWaveSSW()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)10); // Angle
+ setSubCategory((byte)40); // Swept Square Wave (SSW)
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/TerrainBounce.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/TerrainBounce.java
deleted file mode 100644
index dc0492c9befb895868348a71f4e0368666d3b1b0..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/TerrainBounce.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.Angle;
-
-public class TerrainBounce extends Base
-{
- public TerrainBounce()
- {
- setSubcategory(SubCategory.TERRAINBOUNCE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/TerrainBounce/TerrainBounce.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/TerrainBounce/TerrainBounce.java
new file mode 100644
index 0000000000000000000000000000000000000000..e4d03f7463c5512f575b331561b6f4dc1410e82d
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/Angle/TerrainBounce/TerrainBounce.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Deception.Angle.TerrainBounce;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class TerrainBounce extends JammingTechnique
+{
+ public TerrainBounce()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)10); // Angle
+ setSubCategory((byte)45); // Terrain Bounce
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/AngleandFalseTarget.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/AngleandFalseTarget.java
new file mode 100644
index 0000000000000000000000000000000000000000..fac1c133862d21e1c8bf758a527fafec863d0803
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/AngleandFalseTarget.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.Deception.AngleandFalseTarget;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class AngleandFalseTarget extends JammingTechnique
+{
+ public AngleandFalseTarget()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)20); // Angle and False Target
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/AngleandVelocityFalseTargetsVFT.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/AngleandVelocityFalseTargetsVFT.java
new file mode 100644
index 0000000000000000000000000000000000000000..6da867cb79dba0a1e31d0a814ccd16241f0f4009
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/AngleandVelocityFalseTargetsVFT.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Deception.AngleandFalseTarget.AngleandVelocityFalseTargetsVFT;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class AngleandVelocityFalseTargetsVFT extends JammingTechnique
+{
+ public AngleandVelocityFalseTargetsVFT()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)20); // Angle and False Target
+ setSubCategory((byte)5); // Angle and Velocity False Targets (VFT)
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/Base.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/Base.java
deleted file mode 100644
index 53ae7b77de51b2d9ee24c1a7c86de275a326c232..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.AngleandFalseTarget.AngleandVelocityFalseTargetsVFT;
-
-import edu.nps.moves.dis.jammers.Deception.AngleandFalseTarget.SubCategory;
-
-abstract public class Base extends edu.nps.moves.dis.jammers.Deception.AngleandFalseTarget.Base
-{
- public Base()
- {
- setSubcategory(SubCategory.ANGLEANDVELOCITYFALSETARGETSVFT);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/InverseGainandVFT.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/InverseGainandVFT.java
deleted file mode 100644
index c6eb5b6f4881b1f78bed029708a3e193bcb3aad4..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/InverseGainandVFT.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.AngleandFalseTarget.AngleandVelocityFalseTargetsVFT;
-
-public class InverseGainandVFT extends Base
-{
- public InverseGainandVFT()
- {
- setSpecific(Specific.INVERSEGAINANDVFT);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/InverseGainandVFT/InverseGainandVFT.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/InverseGainandVFT/InverseGainandVFT.java
new file mode 100644
index 0000000000000000000000000000000000000000..40f5a271a94686bd1906f42bf0e712440d6dc12a
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/InverseGainandVFT/InverseGainandVFT.java
@@ -0,0 +1,20 @@
+package edu.nps.moves.dis.jammers.Deception.AngleandFalseTarget.AngleandVelocityFalseTargetsVFT.InverseGainandVFT;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class InverseGainandVFT extends JammingTechnique
+{
+ public InverseGainandVFT()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)20); // Angle and False Target
+ setSubCategory((byte)5); // Angle and Velocity False Targets (VFT)
+ setSpecific((byte)5); // Inverse Gain and VFT
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/SSWandVFT.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/SSWandVFT.java
deleted file mode 100644
index 9dfe580a92855a5691fd63fcc02f382f5f3ba4f5..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/SSWandVFT.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.AngleandFalseTarget.AngleandVelocityFalseTargetsVFT;
-
-public class SSWandVFT extends Base
-{
- public SSWandVFT()
- {
- setSpecific(Specific.SSWANDVFT);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/SSWandVFT/SSWandVFT.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/SSWandVFT/SSWandVFT.java
new file mode 100644
index 0000000000000000000000000000000000000000..7b8e2bda613129c10c2cea27a2e0038614fc2324
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/SSWandVFT/SSWandVFT.java
@@ -0,0 +1,20 @@
+package edu.nps.moves.dis.jammers.Deception.AngleandFalseTarget.AngleandVelocityFalseTargetsVFT.SSWandVFT;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class SSWandVFT extends JammingTechnique
+{
+ public SSWandVFT()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)20); // Angle and False Target
+ setSubCategory((byte)5); // Angle and Velocity False Targets (VFT)
+ setSpecific((byte)10); // SSW and VFT
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/Specific.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/Specific.java
deleted file mode 100644
index 5d6da227a84d6361e033c657909d37a0005bc163..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/AngleandVelocityFalseTargetsVFT/Specific.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.AngleandFalseTarget.AngleandVelocityFalseTargetsVFT;
-
-import java.nio.ByteBuffer;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import edu.nps.moves.dis.*;
-
-/* marshal size 8 bits*/
-public enum Specific implements edu.nps.moves.dis.JammerSpecific
-{
- INVERSEGAINANDVFT (5, "Inverse Gain and VFT"),
- SSWANDVFT (10, "SSW and VFT");
-
- private byte value;
- private final String description;
-
- Specific(int value, String description)
- {
- this.value = (byte)value;
- this.description = description;
- }
-
- public byte getValue()
- {
- return value;
- }
-
- public String getDescription()
- {
- return description;
- }
-
- public static Specific getEnumerationForValue(int i)
- {
- for(Specific val: values()) {
- if(val.getValue()==i)
- return val;
- }
- System.err.println("No enumeration found for value " + i + " of enumeration Specific");
- return null;
- }
-
- @Override
- public void marshal(DataOutputStream dos)
- {
- try {
- dos.writeByte(getValue());
- }
- catch(IOException ex) {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
- }
-
- @Override
- public int unmarshal(DataInputStream dis)
- {
- try {
- value = dis.readByte();
- }
- catch(IOException ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public void marshal(ByteBuffer buff)
- {
- try {
- buff.put(getValue());
- }
- catch(Exception ex) {
- showError(ex);
- }
- }
-
- @Override
- public int unmarshal(ByteBuffer buff)
- {
- try {
- value = buff.get();
- }
- catch(Exception ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public int getMarshalledSize()
- {
- return 1; // 8 bits
- }
-
- private void showError(Exception ex)
- {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/Base.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/Base.java
deleted file mode 100644
index 5fdb1b55e2979bf1d5ac2bb7e26d34b802034ac2..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.AngleandFalseTarget;
-
-import edu.nps.moves.dis.jammers.Deception.Category;
-
-abstract public class Base extends edu.nps.moves.dis.jammers.Deception.Base
-{
- public Base()
- {
- setCategory(Category.ANGLEANDFALSETARGET);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/RFTandSSW.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/RFTandSSW.java
deleted file mode 100644
index 7930a9ab9ad43ed892260ac7c22b5dee201ca7e6..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/RFTandSSW.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.AngleandFalseTarget;
-
-public class RFTandSSW extends Base
-{
- public RFTandSSW()
- {
- setSubcategory(SubCategory.RFTANDSSW);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/RFTandSSW/RFTandSSW.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/RFTandSSW/RFTandSSW.java
new file mode 100644
index 0000000000000000000000000000000000000000..68a2075a67445ba318feb46f1302f3ad0da49b75
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/RFTandSSW/RFTandSSW.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Deception.AngleandFalseTarget.RFTandSSW;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class RFTandSSW extends JammingTechnique
+{
+ public RFTandSSW()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)20); // Angle and False Target
+ setSubCategory((byte)15); // RFT and SSW
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/RangeFalseTargetsRFTandInverseGain.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/RangeFalseTargetsRFTandInverseGain.java
deleted file mode 100644
index 577c6a815e7341a61b5dd83f7038a9248be7ff86..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/RangeFalseTargetsRFTandInverseGain.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.AngleandFalseTarget;
-
-public class RangeFalseTargetsRFTandInverseGain extends Base
-{
- public RangeFalseTargetsRFTandInverseGain()
- {
- setSubcategory(SubCategory.RANGEFALSETARGETSRFTANDINVERSEGAIN);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/RangeFalseTargetsRFTandInverseGain/RangeFalseTargetsRFTandInverseGain.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/RangeFalseTargetsRFTandInverseGain/RangeFalseTargetsRFTandInverseGain.java
new file mode 100644
index 0000000000000000000000000000000000000000..479e8495fe784fb6de1d9758a30a4d081f9e066f
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/RangeFalseTargetsRFTandInverseGain/RangeFalseTargetsRFTandInverseGain.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Deception.AngleandFalseTarget.RangeFalseTargetsRFTandInverseGain;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class RangeFalseTargetsRFTandInverseGain extends JammingTechnique
+{
+ public RangeFalseTargetsRFTandInverseGain()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)20); // Angle and False Target
+ setSubCategory((byte)10); // Range False Targets (RFT) and Inverse Gain
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/SubCategory.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/SubCategory.java
deleted file mode 100644
index 42612b27ce159ddaa3510dedb71cce618c0833cc..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandFalseTarget/SubCategory.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.AngleandFalseTarget;
-
-import java.nio.ByteBuffer;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import edu.nps.moves.dis.*;
-
-/* marshal size 8 bits*/
-public enum SubCategory implements edu.nps.moves.dis.JammerSubCategory
-{
- ANGLEANDVELOCITYFALSETARGETSVFT (5, "Angle and Velocity False Targets (VFT)"),
- RANGEFALSETARGETSRFTANDINVERSEGAIN (10, "Range False Targets (RFT) and Inverse Gain"),
- RFTANDSSW (15, "RFT and SSW");
-
- private byte value;
- private final String description;
-
- SubCategory(int value, String description)
- {
- this.value = (byte)value;
- this.description = description;
- }
-
- public byte getValue()
- {
- return value;
- }
-
- public String getDescription()
- {
- return description;
- }
-
- public static SubCategory getEnumerationForValue(int i)
- {
- for(SubCategory val: values()) {
- if(val.getValue()==i)
- return val;
- }
- System.err.println("No enumeration found for value " + i + " of enumeration SubCategory");
- return null;
- }
-
- @Override
- public void marshal(DataOutputStream dos)
- {
- try {
- dos.writeByte(getValue());
- }
- catch(IOException ex) {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
- }
-
- @Override
- public int unmarshal(DataInputStream dis)
- {
- try {
- value = dis.readByte();
- }
- catch(IOException ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public void marshal(ByteBuffer buff)
- {
- try {
- buff.put(getValue());
- }
- catch(Exception ex) {
- showError(ex);
- }
- }
-
- @Override
- public int unmarshal(ByteBuffer buff)
- {
- try {
- value = buff.get();
- }
- catch(Exception ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public int getMarshalledSize()
- {
- return 1; // 8 bits
- }
-
- private void showError(Exception ex)
- {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/AngleandGateStealer.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/AngleandGateStealer.java
new file mode 100644
index 0000000000000000000000000000000000000000..ac1464af1816cffb0f1b3b10d668b7ba08db7491
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/AngleandGateStealer.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.Deception.AngleandGateStealer;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class AngleandGateStealer extends JammingTechnique
+{
+ public AngleandGateStealer()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)15); // Angle and Gate Stealer
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/Base.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/Base.java
deleted file mode 100644
index ce0507023a3c2b16a7ea779b98f7eb3c745e5db7..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.AngleandGateStealer;
-
-import edu.nps.moves.dis.jammers.Deception.Category;
-
-abstract public class Base extends edu.nps.moves.dis.jammers.Deception.Base
-{
- public Base()
- {
- setCategory(Category.ANGLEANDGATESTEALER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/Cross_Polarization_RGPOandVGPO.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/Cross_Polarization_RGPOandVGPO.java
deleted file mode 100644
index a1288d256eb678a8e8cdcfdb74810dc0f2845b48..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/Cross_Polarization_RGPOandVGPO.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.AngleandGateStealer;
-
-public class Cross_Polarization_RGPOandVGPO extends Base
-{
- public Cross_Polarization_RGPOandVGPO()
- {
- setSubcategory(SubCategory.CROSS_POLARIZATION_RGPOANDVGPO);
- }
-}
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/dis/jammers/Deception/AngleandGateStealer/Cross_Polarization_RGPOandVGPO/Cross_Polarization_RGPOandVGPO.java
new file mode 100644
index 0000000000000000000000000000000000000000..2cf94c5fababbe9cb5a11264419fab27d5f6bf92
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/Cross_Polarization_RGPOandVGPO/Cross_Polarization_RGPOandVGPO.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Deception.AngleandGateStealer.Cross_Polarization_RGPOandVGPO;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class Cross_Polarization_RGPOandVGPO extends JammingTechnique
+{
+ public Cross_Polarization_RGPOandVGPO()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)15); // Angle and Gate Stealer
+ setSubCategory((byte)15); // Cross-Polarization, RGPO and VGPO
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/Cross_PolarizationandRangeGatePull_OffRGPO.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/Cross_PolarizationandRangeGatePull_OffRGPO.java
deleted file mode 100644
index 81da0acd83b0bf841fc0fe700f04ef076fcad66c..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/Cross_PolarizationandRangeGatePull_OffRGPO.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.AngleandGateStealer;
-
-public class Cross_PolarizationandRangeGatePull_OffRGPO extends Base
-{
- public Cross_PolarizationandRangeGatePull_OffRGPO()
- {
- setSubcategory(SubCategory.CROSS_POLARIZATIONANDRANGEGATEPULL_OFFRGPO);
- }
-}
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/dis/jammers/Deception/AngleandGateStealer/Cross_PolarizationandRangeGatePull_OffRGPO/Cross_PolarizationandRangeGatePull_OffRGPO.java
new file mode 100644
index 0000000000000000000000000000000000000000..2dc55abef9d0435e9585ff4c3d84c67cd88a83f1
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/Cross_PolarizationandRangeGatePull_OffRGPO/Cross_PolarizationandRangeGatePull_OffRGPO.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Deception.AngleandGateStealer.Cross_PolarizationandRangeGatePull_OffRGPO;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class Cross_PolarizationandRangeGatePull_OffRGPO extends JammingTechnique
+{
+ public Cross_PolarizationandRangeGatePull_OffRGPO()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)15); // Angle and Gate Stealer
+ setSubCategory((byte)5); // Cross-Polarization and Range Gate Pull-Off (RGPO)
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/Cross_PolarizationandVelocityGatePull_OffVGPO.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/Cross_PolarizationandVelocityGatePull_OffVGPO.java
deleted file mode 100644
index 95ce6569dd1e2f864d56886b574d6892ed5e98c0..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/Cross_PolarizationandVelocityGatePull_OffVGPO.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.AngleandGateStealer;
-
-public class Cross_PolarizationandVelocityGatePull_OffVGPO extends Base
-{
- public Cross_PolarizationandVelocityGatePull_OffVGPO()
- {
- setSubcategory(SubCategory.CROSS_POLARIZATIONANDVELOCITYGATEPULL_OFFVGPO);
- }
-}
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/dis/jammers/Deception/AngleandGateStealer/Cross_PolarizationandVelocityGatePull_OffVGPO/Cross_PolarizationandVelocityGatePull_OffVGPO.java
new file mode 100644
index 0000000000000000000000000000000000000000..9fea63105c0e0fec7ce1c0826d21e79038f0b5ae
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/Cross_PolarizationandVelocityGatePull_OffVGPO/Cross_PolarizationandVelocityGatePull_OffVGPO.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Deception.AngleandGateStealer.Cross_PolarizationandVelocityGatePull_OffVGPO;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class Cross_PolarizationandVelocityGatePull_OffVGPO extends JammingTechnique
+{
+ public Cross_PolarizationandVelocityGatePull_OffVGPO()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)15); // Angle and Gate Stealer
+ setSubCategory((byte)10); // Cross-Polarization and Velocity Gate Pull-Off (VGPO)
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/InverseGainandRGPO.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/InverseGainandRGPO.java
deleted file mode 100644
index 3f74f3482cb86a3a02193d7510c39a5160fab1f0..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/InverseGainandRGPO.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.AngleandGateStealer;
-
-public class InverseGainandRGPO extends Base
-{
- public InverseGainandRGPO()
- {
- setSubcategory(SubCategory.INVERSEGAINANDRGPO);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/InverseGainandRGPO/InverseGainandRGPO.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/InverseGainandRGPO/InverseGainandRGPO.java
new file mode 100644
index 0000000000000000000000000000000000000000..09cd1d2b4abae005bae3e209b4a573b5ceb2fdea
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/InverseGainandRGPO/InverseGainandRGPO.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Deception.AngleandGateStealer.InverseGainandRGPO;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class InverseGainandRGPO extends JammingTechnique
+{
+ public InverseGainandRGPO()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)15); // Angle and Gate Stealer
+ setSubCategory((byte)20); // Inverse Gain and RGPO
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/InverseGainandRGPOandVGPO.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/InverseGainandRGPOandVGPO.java
deleted file mode 100644
index ba9f094d9fd25ca7337fb436fab1ed5145722c33..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/InverseGainandRGPOandVGPO.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.AngleandGateStealer;
-
-public class InverseGainandRGPOandVGPO extends Base
-{
- public InverseGainandRGPOandVGPO()
- {
- setSubcategory(SubCategory.INVERSEGAINANDRGPOANDVGPO);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/InverseGainandRGPOandVGPO/InverseGainandRGPOandVGPO.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/InverseGainandRGPOandVGPO/InverseGainandRGPOandVGPO.java
new file mode 100644
index 0000000000000000000000000000000000000000..8cc0119deab30f01bfc01172850b2af5bd6dd94b
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/InverseGainandRGPOandVGPO/InverseGainandRGPOandVGPO.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Deception.AngleandGateStealer.InverseGainandRGPOandVGPO;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class InverseGainandRGPOandVGPO extends JammingTechnique
+{
+ public InverseGainandRGPOandVGPO()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)15); // Angle and Gate Stealer
+ setSubCategory((byte)25); // Inverse Gain and RGPO and VGPO
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/InverseGainandVGPO.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/InverseGainandVGPO.java
deleted file mode 100644
index 939cfaf8b8bdc5896b584cf55c17a02d6b99fdff..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/InverseGainandVGPO.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.AngleandGateStealer;
-
-public class InverseGainandVGPO extends Base
-{
- public InverseGainandVGPO()
- {
- setSubcategory(SubCategory.INVERSEGAINANDVGPO);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/InverseGainandVGPO/InverseGainandVGPO.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/InverseGainandVGPO/InverseGainandVGPO.java
new file mode 100644
index 0000000000000000000000000000000000000000..963e007edbd0d7f02889cda248e9187696608002
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/InverseGainandVGPO/InverseGainandVGPO.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Deception.AngleandGateStealer.InverseGainandVGPO;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class InverseGainandVGPO extends JammingTechnique
+{
+ public InverseGainandVGPO()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)15); // Angle and Gate Stealer
+ setSubCategory((byte)30); // Inverse Gain and VGPO
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/RGPOandSSW.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/RGPOandSSW.java
deleted file mode 100644
index 126f3b12126085984bfac99fef4d70ee8b9cab77..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/RGPOandSSW.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.AngleandGateStealer;
-
-public class RGPOandSSW extends Base
-{
- public RGPOandSSW()
- {
- setSubcategory(SubCategory.RGPOANDSSW);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/RGPOandSSW/RGPOandSSW.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/RGPOandSSW/RGPOandSSW.java
new file mode 100644
index 0000000000000000000000000000000000000000..06233054cc1647bae3caa3841a9a199c238b3f75
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/RGPOandSSW/RGPOandSSW.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Deception.AngleandGateStealer.RGPOandSSW;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class RGPOandSSW extends JammingTechnique
+{
+ public RGPOandSSW()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)15); // Angle and Gate Stealer
+ setSubCategory((byte)35); // RGPO and SSW
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/SSWandVGPO.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/SSWandVGPO.java
deleted file mode 100644
index 2ba8d57e69fd2bd72efb0f40abf6b3fb5009195d..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/SSWandVGPO.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.AngleandGateStealer;
-
-public class SSWandVGPO extends Base
-{
- public SSWandVGPO()
- {
- setSubcategory(SubCategory.SSWANDVGPO);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/SSWandVGPO/SSWandVGPO.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/SSWandVGPO/SSWandVGPO.java
new file mode 100644
index 0000000000000000000000000000000000000000..3f5f252d877a9d6c3afe3f32da566d2a13dee4f2
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/SSWandVGPO/SSWandVGPO.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Deception.AngleandGateStealer.SSWandVGPO;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class SSWandVGPO extends JammingTechnique
+{
+ public SSWandVGPO()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)15); // Angle and Gate Stealer
+ setSubCategory((byte)40); // SSW and VGPO
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/SubCategory.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/SubCategory.java
deleted file mode 100644
index 1d515054ce28ad6d9ca533a3b81f5eba7a341b04..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandGateStealer/SubCategory.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.AngleandGateStealer;
-
-import java.nio.ByteBuffer;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import edu.nps.moves.dis.*;
-
-/* marshal size 8 bits*/
-public enum SubCategory implements edu.nps.moves.dis.JammerSubCategory
-{
- CROSS_POLARIZATIONANDRANGEGATEPULL_OFFRGPO (5, "Cross-Polarization and Range Gate Pull-Off (RGPO)"),
- CROSS_POLARIZATIONANDVELOCITYGATEPULL_OFFVGPO (10, "Cross-Polarization and Velocity Gate Pull-Off (VGPO)"),
- CROSS_POLARIZATION_RGPOANDVGPO (15, "Cross-Polarization, RGPO and VGPO"),
- INVERSEGAINANDRGPO (20, "Inverse Gain and RGPO"),
- INVERSEGAINANDRGPOANDVGPO (25, "Inverse Gain and RGPO and VGPO"),
- INVERSEGAINANDVGPO (30, "Inverse Gain and VGPO"),
- RGPOANDSSW (35, "RGPO and SSW"),
- SSWANDVGPO (40, "SSW and VGPO");
-
- private byte value;
- private final String description;
-
- SubCategory(int value, String description)
- {
- this.value = (byte)value;
- this.description = description;
- }
-
- public byte getValue()
- {
- return value;
- }
-
- public String getDescription()
- {
- return description;
- }
-
- public static SubCategory getEnumerationForValue(int i)
- {
- for(SubCategory val: values()) {
- if(val.getValue()==i)
- return val;
- }
- System.err.println("No enumeration found for value " + i + " of enumeration SubCategory");
- return null;
- }
-
- @Override
- public void marshal(DataOutputStream dos)
- {
- try {
- dos.writeByte(getValue());
- }
- catch(IOException ex) {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
- }
-
- @Override
- public int unmarshal(DataInputStream dis)
- {
- try {
- value = dis.readByte();
- }
- catch(IOException ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public void marshal(ByteBuffer buff)
- {
- try {
- buff.put(getValue());
- }
- catch(Exception ex) {
- showError(ex);
- }
- }
-
- @Override
- public int unmarshal(ByteBuffer buff)
- {
- try {
- value = buff.get();
- }
- catch(Exception ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public int getMarshalledSize()
- {
- return 1; // 8 bits
- }
-
- private void showError(Exception ex)
- {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandRandomRangeProgramsRANRAP/AngleandRandomRangeProgramsRANRAP.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandRandomRangeProgramsRANRAP/AngleandRandomRangeProgramsRANRAP.java
new file mode 100644
index 0000000000000000000000000000000000000000..999e18c539fee6f6a1956ae9396bd143a3e2a202
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandRandomRangeProgramsRANRAP/AngleandRandomRangeProgramsRANRAP.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.Deception.AngleandRandomRangeProgramsRANRAP;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class AngleandRandomRangeProgramsRANRAP extends JammingTechnique
+{
+ public AngleandRandomRangeProgramsRANRAP()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)25); // Angle and Random Range Programs (RANRAP)
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandRandomRangeProgramsRANRAP/Base.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandRandomRangeProgramsRANRAP/Base.java
deleted file mode 100644
index 6331098090ff1e2616590b89c0ddbc2270b8043e..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandRandomRangeProgramsRANRAP/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.AngleandRandomRangeProgramsRANRAP;
-
-import edu.nps.moves.dis.jammers.Deception.Category;
-
-abstract public class Base extends edu.nps.moves.dis.jammers.Deception.Base
-{
- public Base()
- {
- setCategory(Category.ANGLEANDRANDOMRANGEPROGRAMSRANRAP);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandRandomRangeProgramsRANRAP/RANRAPandSSW.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandRandomRangeProgramsRANRAP/RANRAPandSSW.java
deleted file mode 100644
index e5c4b4c7a5812fb0803ccdd16ba26707060600e0..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandRandomRangeProgramsRANRAP/RANRAPandSSW.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.AngleandRandomRangeProgramsRANRAP;
-
-public class RANRAPandSSW extends Base
-{
- public RANRAPandSSW()
- {
- setSubcategory(SubCategory.RANRAPANDSSW);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandRandomRangeProgramsRANRAP/RANRAPandSSW/RANRAPandSSW.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandRandomRangeProgramsRANRAP/RANRAPandSSW/RANRAPandSSW.java
new file mode 100644
index 0000000000000000000000000000000000000000..4a57dc7bf94108e29cede8540446563f9ed6ce37
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandRandomRangeProgramsRANRAP/RANRAPandSSW/RANRAPandSSW.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Deception.AngleandRandomRangeProgramsRANRAP.RANRAPandSSW;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class RANRAPandSSW extends JammingTechnique
+{
+ public RANRAPandSSW()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)25); // Angle and Random Range Programs (RANRAP)
+ setSubCategory((byte)5); // RANRAP and SSW
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandRandomRangeProgramsRANRAP/SubCategory.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandRandomRangeProgramsRANRAP/SubCategory.java
deleted file mode 100644
index 1588adba010dd88a76631381501b477793e73dcd..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandRandomRangeProgramsRANRAP/SubCategory.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.AngleandRandomRangeProgramsRANRAP;
-
-import java.nio.ByteBuffer;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import edu.nps.moves.dis.*;
-
-/* marshal size 8 bits*/
-public enum SubCategory implements edu.nps.moves.dis.JammerSubCategory
-{
- RANRAPANDSSW (5, "RANRAP and SSW");
-
- private byte value;
- private final String description;
-
- SubCategory(int value, String description)
- {
- this.value = (byte)value;
- this.description = description;
- }
-
- public byte getValue()
- {
- return value;
- }
-
- public String getDescription()
- {
- return description;
- }
-
- public static SubCategory getEnumerationForValue(int i)
- {
- for(SubCategory val: values()) {
- if(val.getValue()==i)
- return val;
- }
- System.err.println("No enumeration found for value " + i + " of enumeration SubCategory");
- return null;
- }
-
- @Override
- public void marshal(DataOutputStream dos)
- {
- try {
- dos.writeByte(getValue());
- }
- catch(IOException ex) {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
- }
-
- @Override
- public int unmarshal(DataInputStream dis)
- {
- try {
- value = dis.readByte();
- }
- catch(IOException ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public void marshal(ByteBuffer buff)
- {
- try {
- buff.put(getValue());
- }
- catch(Exception ex) {
- showError(ex);
- }
- }
-
- @Override
- public int unmarshal(ByteBuffer buff)
- {
- try {
- value = buff.get();
- }
- catch(Exception ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public int getMarshalledSize()
- {
- return 1; // 8 bits
- }
-
- private void showError(Exception ex)
- {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandVelocity/AngleandVelocity.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandVelocity/AngleandVelocity.java
new file mode 100644
index 0000000000000000000000000000000000000000..e1cc0a116d7f262df4aefd0c40361598d6c77025
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandVelocity/AngleandVelocity.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.Deception.AngleandVelocity;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class AngleandVelocity extends JammingTechnique
+{
+ public AngleandVelocity()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)30); // Angle and Velocity
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandVelocity/Base.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandVelocity/Base.java
deleted file mode 100644
index 8c01721ca8bd1e5df080ab99167c1c28ab38cd93..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandVelocity/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.AngleandVelocity;
-
-import edu.nps.moves.dis.jammers.Deception.Category;
-
-abstract public class Base extends edu.nps.moves.dis.jammers.Deception.Base
-{
- public Base()
- {
- setCategory(Category.ANGLEANDVELOCITY);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandVelocity/InverseGainandVBM.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandVelocity/InverseGainandVBM.java
deleted file mode 100644
index 07a23f893019d0621681a19878a4ea84994f98e3..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandVelocity/InverseGainandVBM.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.AngleandVelocity;
-
-public class InverseGainandVBM extends Base
-{
- public InverseGainandVBM()
- {
- setSubcategory(SubCategory.INVERSEGAINANDVBM);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandVelocity/InverseGainandVBM/InverseGainandVBM.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandVelocity/InverseGainandVBM/InverseGainandVBM.java
new file mode 100644
index 0000000000000000000000000000000000000000..a789d3f740e6fcf6a2c219da3a366b31235db62a
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandVelocity/InverseGainandVBM/InverseGainandVBM.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Deception.AngleandVelocity.InverseGainandVBM;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class InverseGainandVBM extends JammingTechnique
+{
+ public InverseGainandVBM()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)30); // Angle and Velocity
+ setSubCategory((byte)5); // Inverse Gain and VBM
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandVelocity/SSWandVBM.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandVelocity/SSWandVBM.java
deleted file mode 100644
index 96346c01601bd7088b82826b5305276e27a53744..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandVelocity/SSWandVBM.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.AngleandVelocity;
-
-public class SSWandVBM extends Base
-{
- public SSWandVBM()
- {
- setSubcategory(SubCategory.SSWANDVBM);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandVelocity/SSWandVBM/SSWandVBM.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandVelocity/SSWandVBM/SSWandVBM.java
new file mode 100644
index 0000000000000000000000000000000000000000..a0c9cda55f6aeb5d7928c3508ba80e8db646076d
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandVelocity/SSWandVBM/SSWandVBM.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Deception.AngleandVelocity.SSWandVBM;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class SSWandVBM extends JammingTechnique
+{
+ public SSWandVBM()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)30); // Angle and Velocity
+ setSubCategory((byte)10); // SSW and VBM
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandVelocity/SubCategory.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandVelocity/SubCategory.java
deleted file mode 100644
index e2d4a1a4c909a2ecf6d057b2d63eb921a3627bef..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AngleandVelocity/SubCategory.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.AngleandVelocity;
-
-import java.nio.ByteBuffer;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import edu.nps.moves.dis.*;
-
-/* marshal size 8 bits*/
-public enum SubCategory implements edu.nps.moves.dis.JammerSubCategory
-{
- INVERSEGAINANDVBM (5, "Inverse Gain and VBM"),
- SSWANDVBM (10, "SSW and VBM");
-
- private byte value;
- private final String description;
-
- SubCategory(int value, String description)
- {
- this.value = (byte)value;
- this.description = description;
- }
-
- public byte getValue()
- {
- return value;
- }
-
- public String getDescription()
- {
- return description;
- }
-
- public static SubCategory getEnumerationForValue(int i)
- {
- for(SubCategory val: values()) {
- if(val.getValue()==i)
- return val;
- }
- System.err.println("No enumeration found for value " + i + " of enumeration SubCategory");
- return null;
- }
-
- @Override
- public void marshal(DataOutputStream dos)
- {
- try {
- dos.writeByte(getValue());
- }
- catch(IOException ex) {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
- }
-
- @Override
- public int unmarshal(DataInputStream dis)
- {
- try {
- value = dis.readByte();
- }
- catch(IOException ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public void marshal(ByteBuffer buff)
- {
- try {
- buff.put(getValue());
- }
- catch(Exception ex) {
- showError(ex);
- }
- }
-
- @Override
- public int unmarshal(ByteBuffer buff)
- {
- try {
- value = buff.get();
- }
- catch(Exception ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public int getMarshalledSize()
- {
- return 1; // 8 bits
- }
-
- private void showError(Exception ex)
- {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AutomaticGainControlAGC.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AutomaticGainControlAGC.java
deleted file mode 100644
index dedb08c1e5a004c7b0b88a157cbaab211ef12e3a..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/AutomaticGainControlAGC.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception;
-
-public class AutomaticGainControlAGC extends Base
-{
- public AutomaticGainControlAGC()
- {
- setCategory(Category.AUTOMATICGAINCONTROLAGC);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/AutomaticGainControlAGC/AutomaticGainControlAGC.java b/src-generated/edu/nps/moves/dis/jammers/Deception/AutomaticGainControlAGC/AutomaticGainControlAGC.java
new file mode 100644
index 0000000000000000000000000000000000000000..57554f0a469c71aacaba723177cca35f9520b4dd
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/AutomaticGainControlAGC/AutomaticGainControlAGC.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.Deception.AutomaticGainControlAGC;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class AutomaticGainControlAGC extends JammingTechnique
+{
+ public AutomaticGainControlAGC()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)35); // Automatic Gain Control (AGC)
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Base.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Base.java
deleted file mode 100644
index 67d5e400cfc042f9a7a5ba72a71ea41af8e9d859..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception;
-
-import edu.nps.moves.dis.jammers.JammerKind;
-
-abstract public class Base extends edu.nps.moves.dis.JammingTechnique
-{
- public Base()
- {
- setKind(JammerKind.DECEPTION);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Category.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Category.java
deleted file mode 100644
index 5ab72275364d794422d116ff6b599cd616dbbc2a..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Category.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception;
-
-import java.nio.ByteBuffer;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import edu.nps.moves.dis.*;
-
-/* marshal size 8 bits*/
-public enum Category implements edu.nps.moves.dis.JammerCategory
-{
- ANALYZER (5, "Analyzer"),
- ANGLE (10, "Angle"),
- ANGLEANDGATESTEALER (15, "Angle and Gate Stealer"),
- ANGLEANDFALSETARGET (20, "Angle and False Target"),
- ANGLEANDRANDOMRANGEPROGRAMSRANRAP (25, "Angle and Random Range Programs (RANRAP)"),
- ANGLEANDVELOCITY (30, "Angle and Velocity"),
- AUTOMATICGAINCONTROLAGC (35, "Automatic Gain Control (AGC)"),
- AGCANDGATESTEALER (40, "AGC and Gate Stealer"),
- COLINEAR (45, "Colinear"),
- CONSTANTFALSEALARMRATE (50, "Constant False Alarm Rate"),
- DOUBLECROSS (55, "Double Cross"),
- DOWNLINK (60, "Down Link"),
- FALSETARGET (65, "False Target"),
- FIGUREEIGHT (70, "Figure Eight"),
- GATESTEALER (75, "Gate Stealer"),
- GATESTEALERANDREPEATER (80, "Gate Stealer and Repeater"),
- GLINTENHANCE (85, "Glint Enhance"),
- IMAGEFREQUENCY (90, "Image Frequency"),
- JITTEREDPULSEREPETITIONFREQUENCY (95, "Jittered Pulse Repetition Frequency"),
- JITTEREDPULSEWIDTH (100, "Jittered Pulse Width"),
- PSEUDORANDOMNOISEPRN (105, "Pseudorandom Noise (PRN)"),
- PULSE (110, "Pulse"),
- PULSECOMPRESSIONDECEPTION (115, "Pulse Compression Deception"),
- RANDOMRANGEPROGRAMSRANRAP (120, "Random Range Programs (RANRAP)"),
- REFRACTION (125, "Refraction"),
- REPEATER (130, "Repeater"),
- SCINTILLATION (135, "Scintillation"),
- SERRODYNE (140, "Serrodyne"),
- VELOCITY (145, "Velocity");
-
- private byte value;
- private final String description;
-
- Category(int value, String description)
- {
- this.value = (byte)value;
- this.description = description;
- }
-
- public byte getValue()
- {
- return value;
- }
-
- public String getDescription()
- {
- return description;
- }
-
- public static Category getEnumerationForValue(int i)
- {
- for(Category val: values()) {
- if(val.getValue()==i)
- return val;
- }
- System.err.println("No enumeration found for value " + i + " of enumeration Category");
- return null;
- }
-
- @Override
- public void marshal(DataOutputStream dos)
- {
- try {
- dos.writeByte(getValue());
- }
- catch(IOException ex) {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
- }
-
- @Override
- public int unmarshal(DataInputStream dis)
- {
- try {
- value = dis.readByte();
- }
- catch(IOException ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public void marshal(ByteBuffer buff)
- {
- try {
- buff.put(getValue());
- }
- catch(Exception ex) {
- showError(ex);
- }
- }
-
- @Override
- public int unmarshal(ByteBuffer buff)
- {
- try {
- value = buff.get();
- }
- catch(Exception ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public int getMarshalledSize()
- {
- return 1; // 8 bits
- }
-
- private void showError(Exception ex)
- {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Colinear.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Colinear.java
deleted file mode 100644
index 722287ce6752771250557109fc1f224e85dbf8a7..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Colinear.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception;
-
-public class Colinear extends Base
-{
- public Colinear()
- {
- setCategory(Category.COLINEAR);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Colinear/Colinear.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Colinear/Colinear.java
new file mode 100644
index 0000000000000000000000000000000000000000..256fb8be7a102cd6ebd3eaa61c408ec47590339a
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/Colinear/Colinear.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.Deception.Colinear;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class Colinear extends JammingTechnique
+{
+ public Colinear()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)45); // Colinear
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/ConstantFalseAlarmRate.java b/src-generated/edu/nps/moves/dis/jammers/Deception/ConstantFalseAlarmRate.java
deleted file mode 100644
index 220fcf2de88cf930f3e505ec68ae01d85086723b..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/ConstantFalseAlarmRate.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception;
-
-public class ConstantFalseAlarmRate extends Base
-{
- public ConstantFalseAlarmRate()
- {
- setCategory(Category.CONSTANTFALSEALARMRATE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/ConstantFalseAlarmRate/ConstantFalseAlarmRate.java b/src-generated/edu/nps/moves/dis/jammers/Deception/ConstantFalseAlarmRate/ConstantFalseAlarmRate.java
new file mode 100644
index 0000000000000000000000000000000000000000..cf8068f029983f1b09a5edcce5fc29e8e7fbc6c4
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/ConstantFalseAlarmRate/ConstantFalseAlarmRate.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.Deception.ConstantFalseAlarmRate;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class ConstantFalseAlarmRate extends JammingTechnique
+{
+ public ConstantFalseAlarmRate()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)50); // Constant False Alarm Rate
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Deception.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Deception.java
new file mode 100644
index 0000000000000000000000000000000000000000..5b5715be77806c9e584e980d4b15b4b577f9ae02
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/Deception.java
@@ -0,0 +1,17 @@
+package edu.nps.moves.dis.jammers.Deception;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class Deception extends JammingTechnique
+{
+ public Deception()
+ {
+ setKind((byte)2); // Deception
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/DoubleCross.java b/src-generated/edu/nps/moves/dis/jammers/Deception/DoubleCross.java
deleted file mode 100644
index f6bdf1d3430eb018f33cdaa5a8317132f7ff3853..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/DoubleCross.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception;
-
-public class DoubleCross extends Base
-{
- public DoubleCross()
- {
- setCategory(Category.DOUBLECROSS);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/DoubleCross/DoubleCross.java b/src-generated/edu/nps/moves/dis/jammers/Deception/DoubleCross/DoubleCross.java
new file mode 100644
index 0000000000000000000000000000000000000000..97e521fec03550cd30292a3f0ef9a3b8c9ce8aa7
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/DoubleCross/DoubleCross.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.Deception.DoubleCross;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class DoubleCross extends JammingTechnique
+{
+ public DoubleCross()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)55); // Double Cross
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/DownLink.java b/src-generated/edu/nps/moves/dis/jammers/Deception/DownLink.java
deleted file mode 100644
index ec08c6b94f295d1b21ecbf4cf50345d37bdf4092..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/DownLink.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception;
-
-public class DownLink extends Base
-{
- public DownLink()
- {
- setCategory(Category.DOWNLINK);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/DownLink/DownLink.java b/src-generated/edu/nps/moves/dis/jammers/Deception/DownLink/DownLink.java
new file mode 100644
index 0000000000000000000000000000000000000000..17f015e591b0401fb29b1ab0c8d93f98d0b439e7
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/DownLink/DownLink.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.Deception.DownLink;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class DownLink extends JammingTechnique
+{
+ public DownLink()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)60); // Down Link
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/Base.java b/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/Base.java
deleted file mode 100644
index 8134315b094e1d8ddd4a71494a3fec7affc0ef23..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.FalseTarget;
-
-import edu.nps.moves.dis.jammers.Deception.Category;
-
-abstract public class Base extends edu.nps.moves.dis.jammers.Deception.Base
-{
- public Base()
- {
- setCategory(Category.FALSETARGET);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/CoherentFalseTargets.java b/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/CoherentFalseTargets.java
deleted file mode 100644
index 36e81345503fd6234b68a03b6af0ac61bc49d94c..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/CoherentFalseTargets.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.FalseTarget;
-
-public class CoherentFalseTargets extends Base
-{
- public CoherentFalseTargets()
- {
- setSubcategory(SubCategory.COHERENTFALSETARGETS);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/CoherentFalseTargets/CoherentFalseTargets.java b/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/CoherentFalseTargets/CoherentFalseTargets.java
new file mode 100644
index 0000000000000000000000000000000000000000..f6a01d99f7f48a48ba11b8e6564c6c1b3bd0a34e
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/CoherentFalseTargets/CoherentFalseTargets.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Deception.FalseTarget.CoherentFalseTargets;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class CoherentFalseTargets extends JammingTechnique
+{
+ public CoherentFalseTargets()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)65); // False Target
+ setSubCategory((byte)5); // Coherent False Targets
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/FalseDopplerTargetFDT.java b/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/FalseDopplerTargetFDT.java
deleted file mode 100644
index 348fde2b4766b5f0d796bfceb2f93952c5493668..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/FalseDopplerTargetFDT.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.FalseTarget;
-
-public class FalseDopplerTargetFDT extends Base
-{
- public FalseDopplerTargetFDT()
- {
- setSubcategory(SubCategory.FALSEDOPPLERTARGETFDT);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/FalseDopplerTargetFDT/FalseDopplerTargetFDT.java b/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/FalseDopplerTargetFDT/FalseDopplerTargetFDT.java
new file mode 100644
index 0000000000000000000000000000000000000000..7c2a1fd489cd99f0f3fefd7cfe4eed48dadd374e
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/FalseDopplerTargetFDT/FalseDopplerTargetFDT.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Deception.FalseTarget.FalseDopplerTargetFDT;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class FalseDopplerTargetFDT extends JammingTechnique
+{
+ public FalseDopplerTargetFDT()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)65); // False Target
+ setSubCategory((byte)10); // False Doppler Target (FDT)
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/FalseTarget.java b/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/FalseTarget.java
new file mode 100644
index 0000000000000000000000000000000000000000..cc0e6be6c5e68ec0eadb9d64e15599d1f819f929
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/FalseTarget.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.Deception.FalseTarget;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class FalseTarget extends JammingTechnique
+{
+ public FalseTarget()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)65); // False Target
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/MultipleFalseTargets.java b/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/MultipleFalseTargets.java
deleted file mode 100644
index e0f312f3d5e186172ae5129d8333aaaa385d81bb..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/MultipleFalseTargets.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.FalseTarget;
-
-public class MultipleFalseTargets extends Base
-{
- public MultipleFalseTargets()
- {
- setSubcategory(SubCategory.MULTIPLEFALSETARGETS);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/MultipleFalseTargets/MultipleFalseTargets.java b/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/MultipleFalseTargets/MultipleFalseTargets.java
new file mode 100644
index 0000000000000000000000000000000000000000..3eb2b69c72a119fa08e9fe0214bdbf8fb60de98d
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/MultipleFalseTargets/MultipleFalseTargets.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Deception.FalseTarget.MultipleFalseTargets;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class MultipleFalseTargets extends JammingTechnique
+{
+ public MultipleFalseTargets()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)65); // False Target
+ setSubCategory((byte)15); // Multiple False Targets
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/RangeFalseTargetsRFT.java b/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/RangeFalseTargetsRFT.java
deleted file mode 100644
index 046c18f766e8d4331dc0f4c4e7fd53c44552af55..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/RangeFalseTargetsRFT.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.FalseTarget;
-
-public class RangeFalseTargetsRFT extends Base
-{
- public RangeFalseTargetsRFT()
- {
- setSubcategory(SubCategory.RANGEFALSETARGETSRFT);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/RangeFalseTargetsRFT/RangeFalseTargetsRFT.java b/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/RangeFalseTargetsRFT/RangeFalseTargetsRFT.java
new file mode 100644
index 0000000000000000000000000000000000000000..18b10f81cb3b50a17602f27dacb1721ced7e94b0
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/RangeFalseTargetsRFT/RangeFalseTargetsRFT.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Deception.FalseTarget.RangeFalseTargetsRFT;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class RangeFalseTargetsRFT extends JammingTechnique
+{
+ public RangeFalseTargetsRFT()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)65); // False Target
+ setSubCategory((byte)20); // Range False Targets (RFT)
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/SubCategory.java b/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/SubCategory.java
deleted file mode 100644
index 7f076934d0291bed61e9ac8bdee62c03fe2f77ec..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/SubCategory.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.FalseTarget;
-
-import java.nio.ByteBuffer;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import edu.nps.moves.dis.*;
-
-/* marshal size 8 bits*/
-public enum SubCategory implements edu.nps.moves.dis.JammerSubCategory
-{
- COHERENTFALSETARGETS (5, "Coherent False Targets"),
- FALSEDOPPLERTARGETFDT (10, "False Doppler Target (FDT)"),
- MULTIPLEFALSETARGETS (15, "Multiple False Targets"),
- RANGEFALSETARGETSRFT (20, "Range False Targets (RFT)"),
- TRANSPONDER (25, "Transponder"),
- VELOCITYFALSETARGETSVFT (30, "Velocity False Targets (VFT)");
-
- private byte value;
- private final String description;
-
- SubCategory(int value, String description)
- {
- this.value = (byte)value;
- this.description = description;
- }
-
- public byte getValue()
- {
- return value;
- }
-
- public String getDescription()
- {
- return description;
- }
-
- public static SubCategory getEnumerationForValue(int i)
- {
- for(SubCategory val: values()) {
- if(val.getValue()==i)
- return val;
- }
- System.err.println("No enumeration found for value " + i + " of enumeration SubCategory");
- return null;
- }
-
- @Override
- public void marshal(DataOutputStream dos)
- {
- try {
- dos.writeByte(getValue());
- }
- catch(IOException ex) {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
- }
-
- @Override
- public int unmarshal(DataInputStream dis)
- {
- try {
- value = dis.readByte();
- }
- catch(IOException ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public void marshal(ByteBuffer buff)
- {
- try {
- buff.put(getValue());
- }
- catch(Exception ex) {
- showError(ex);
- }
- }
-
- @Override
- public int unmarshal(ByteBuffer buff)
- {
- try {
- value = buff.get();
- }
- catch(Exception ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public int getMarshalledSize()
- {
- return 1; // 8 bits
- }
-
- private void showError(Exception ex)
- {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/Transponder.java b/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/Transponder.java
deleted file mode 100644
index 5019ab909453ebc1bf917e93e634d2b520f4eabb..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/Transponder.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.FalseTarget;
-
-public class Transponder extends Base
-{
- public Transponder()
- {
- setSubcategory(SubCategory.TRANSPONDER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/Transponder/Transponder.java b/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/Transponder/Transponder.java
new file mode 100644
index 0000000000000000000000000000000000000000..85fc64bf3d460d78c7899280ab3ca5c2109d0d56
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/Transponder/Transponder.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Deception.FalseTarget.Transponder;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class Transponder extends JammingTechnique
+{
+ public Transponder()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)65); // False Target
+ setSubCategory((byte)25); // Transponder
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/VelocityFalseTargetsVFT.java b/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/VelocityFalseTargetsVFT.java
deleted file mode 100644
index 65a397347c81bc1837e8c3f6d79feb473ec3eaab..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/VelocityFalseTargetsVFT.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.FalseTarget;
-
-public class VelocityFalseTargetsVFT extends Base
-{
- public VelocityFalseTargetsVFT()
- {
- setSubcategory(SubCategory.VELOCITYFALSETARGETSVFT);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/VelocityFalseTargetsVFT/VelocityFalseTargetsVFT.java b/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/VelocityFalseTargetsVFT/VelocityFalseTargetsVFT.java
new file mode 100644
index 0000000000000000000000000000000000000000..bb72844807e72d0b1415d1b110c0404b1fe4ff3d
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/FalseTarget/VelocityFalseTargetsVFT/VelocityFalseTargetsVFT.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Deception.FalseTarget.VelocityFalseTargetsVFT;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class VelocityFalseTargetsVFT extends JammingTechnique
+{
+ public VelocityFalseTargetsVFT()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)65); // False Target
+ setSubCategory((byte)30); // Velocity False Targets (VFT)
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/FigureEight.java b/src-generated/edu/nps/moves/dis/jammers/Deception/FigureEight.java
deleted file mode 100644
index fc0b9947aa55953028a8c11179a821441cc88d4a..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/FigureEight.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception;
-
-public class FigureEight extends Base
-{
- public FigureEight()
- {
- setCategory(Category.FIGUREEIGHT);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/FigureEight/FigureEight.java b/src-generated/edu/nps/moves/dis/jammers/Deception/FigureEight/FigureEight.java
new file mode 100644
index 0000000000000000000000000000000000000000..365c2a49c2cbfd3a8acc7b77fa50d6a9b79c8766
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/FigureEight/FigureEight.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.Deception.FigureEight;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class FigureEight extends JammingTechnique
+{
+ public FigureEight()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)70); // Figure Eight
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealer/Base.java b/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealer/Base.java
deleted file mode 100644
index 18a99c947faa24bd5ee0a76b479b7caf2719c3bb..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealer/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.GateStealer;
-
-import edu.nps.moves.dis.jammers.Deception.Category;
-
-abstract public class Base extends edu.nps.moves.dis.jammers.Deception.Base
-{
- public Base()
- {
- setCategory(Category.GATESTEALER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealer/ChirpGateStealerCGS.java b/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealer/ChirpGateStealerCGS.java
deleted file mode 100644
index 939733afe0d1d5fc767e2095ef76bb5b3cc5b358..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealer/ChirpGateStealerCGS.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.GateStealer;
-
-public class ChirpGateStealerCGS extends Base
-{
- public ChirpGateStealerCGS()
- {
- setSubcategory(SubCategory.CHIRPGATESTEALERCGS);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealer/ChirpGateStealerCGS/ChirpGateStealerCGS.java b/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealer/ChirpGateStealerCGS/ChirpGateStealerCGS.java
new file mode 100644
index 0000000000000000000000000000000000000000..e7ad3e4083e6ed6f6caabc3248373189c776569e
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealer/ChirpGateStealerCGS/ChirpGateStealerCGS.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Deception.GateStealer.ChirpGateStealerCGS;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class ChirpGateStealerCGS extends JammingTechnique
+{
+ public ChirpGateStealerCGS()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)75); // Gate Stealer
+ setSubCategory((byte)5); // Chirp Gate Stealer (CGS)
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealer/GateStealer.java b/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealer/GateStealer.java
new file mode 100644
index 0000000000000000000000000000000000000000..f7dbf4e4f954c6ef31408a770eea9858074b31e1
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealer/GateStealer.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.Deception.GateStealer;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class GateStealer extends JammingTechnique
+{
+ public GateStealer()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)75); // Gate Stealer
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealer/RGPOandVGPO.java b/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealer/RGPOandVGPO.java
deleted file mode 100644
index 02a43115290f5537c3ba0da619db45ce2d8c5116..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealer/RGPOandVGPO.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.GateStealer;
-
-public class RGPOandVGPO extends Base
-{
- public RGPOandVGPO()
- {
- setSubcategory(SubCategory.RGPOANDVGPO);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealer/RGPOandVGPO/RGPOandVGPO.java b/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealer/RGPOandVGPO/RGPOandVGPO.java
new file mode 100644
index 0000000000000000000000000000000000000000..05f668deab0ac116e15dfac6d6421dea1aa4f24b
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealer/RGPOandVGPO/RGPOandVGPO.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Deception.GateStealer.RGPOandVGPO;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class RGPOandVGPO extends JammingTechnique
+{
+ public RGPOandVGPO()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)75); // Gate Stealer
+ setSubCategory((byte)15); // RGPO and VGPO
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealer/RangeGatePull_OffRGPO.java b/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealer/RangeGatePull_OffRGPO.java
deleted file mode 100644
index 1ed4f15fe69e1a6fd65628d834cad92d53973d98..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealer/RangeGatePull_OffRGPO.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.GateStealer;
-
-public class RangeGatePull_OffRGPO extends Base
-{
- public RangeGatePull_OffRGPO()
- {
- setSubcategory(SubCategory.RANGEGATEPULL_OFFRGPO);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealer/RangeGatePull_OffRGPO/RangeGatePull_OffRGPO.java b/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealer/RangeGatePull_OffRGPO/RangeGatePull_OffRGPO.java
new file mode 100644
index 0000000000000000000000000000000000000000..369a235df06204314148561ee309f675e98ec160
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealer/RangeGatePull_OffRGPO/RangeGatePull_OffRGPO.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Deception.GateStealer.RangeGatePull_OffRGPO;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class RangeGatePull_OffRGPO extends JammingTechnique
+{
+ public RangeGatePull_OffRGPO()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)75); // Gate Stealer
+ setSubCategory((byte)10); // Range Gate Pull-Off (RGPO)
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealer/SubCategory.java b/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealer/SubCategory.java
deleted file mode 100644
index ed07b55cd285b3d106ef7493a2f45db79d00c237..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealer/SubCategory.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.GateStealer;
-
-import java.nio.ByteBuffer;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import edu.nps.moves.dis.*;
-
-/* marshal size 8 bits*/
-public enum SubCategory implements edu.nps.moves.dis.JammerSubCategory
-{
- CHIRPGATESTEALERCGS (5, "Chirp Gate Stealer (CGS)"),
- RANGEGATEPULL_OFFRGPO (10, "Range Gate Pull-Off (RGPO)"),
- RGPOANDVGPO (15, "RGPO and VGPO"),
- VGPOAKAVELOCITYGATESTEALER_VGS (20, "VGPO (aka Velocity Gate Stealer, VGS)");
-
- private byte value;
- private final String description;
-
- SubCategory(int value, String description)
- {
- this.value = (byte)value;
- this.description = description;
- }
-
- public byte getValue()
- {
- return value;
- }
-
- public String getDescription()
- {
- return description;
- }
-
- public static SubCategory getEnumerationForValue(int i)
- {
- for(SubCategory val: values()) {
- if(val.getValue()==i)
- return val;
- }
- System.err.println("No enumeration found for value " + i + " of enumeration SubCategory");
- return null;
- }
-
- @Override
- public void marshal(DataOutputStream dos)
- {
- try {
- dos.writeByte(getValue());
- }
- catch(IOException ex) {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
- }
-
- @Override
- public int unmarshal(DataInputStream dis)
- {
- try {
- value = dis.readByte();
- }
- catch(IOException ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public void marshal(ByteBuffer buff)
- {
- try {
- buff.put(getValue());
- }
- catch(Exception ex) {
- showError(ex);
- }
- }
-
- @Override
- public int unmarshal(ByteBuffer buff)
- {
- try {
- value = buff.get();
- }
- catch(Exception ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public int getMarshalledSize()
- {
- return 1; // 8 bits
- }
-
- private void showError(Exception ex)
- {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealer/VGPOakaVelocityGateStealer_VGS.java b/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealer/VGPOakaVelocityGateStealer_VGS.java
deleted file mode 100644
index 33ae4d38d0d3cc73da0b21e74198a2cc952307c6..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealer/VGPOakaVelocityGateStealer_VGS.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.GateStealer;
-
-public class VGPOakaVelocityGateStealer_VGS extends Base
-{
- public VGPOakaVelocityGateStealer_VGS()
- {
- setSubcategory(SubCategory.VGPOAKAVELOCITYGATESTEALER_VGS);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealer/VGPOakaVelocityGateStealer_VGS/VGPOakaVelocityGateStealer_VGS.java b/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealer/VGPOakaVelocityGateStealer_VGS/VGPOakaVelocityGateStealer_VGS.java
new file mode 100644
index 0000000000000000000000000000000000000000..49d512a294557e9ad8984615f456aeba04429af8
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealer/VGPOakaVelocityGateStealer_VGS/VGPOakaVelocityGateStealer_VGS.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Deception.GateStealer.VGPOakaVelocityGateStealer_VGS;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class VGPOakaVelocityGateStealer_VGS extends JammingTechnique
+{
+ public VGPOakaVelocityGateStealer_VGS()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)75); // Gate Stealer
+ setSubCategory((byte)20); // VGPO (aka Velocity Gate Stealer, VGS)
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealerandRepeater/Base.java b/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealerandRepeater/Base.java
deleted file mode 100644
index f623b061082d0b9a092e9008cc4c7131f9c3637c..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealerandRepeater/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.GateStealerandRepeater;
-
-import edu.nps.moves.dis.jammers.Deception.Category;
-
-abstract public class Base extends edu.nps.moves.dis.jammers.Deception.Base
-{
- public Base()
- {
- setCategory(Category.GATESTEALERANDREPEATER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealerandRepeater/GateStealerandRepeater.java b/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealerandRepeater/GateStealerandRepeater.java
new file mode 100644
index 0000000000000000000000000000000000000000..0b3de0a1cc98b0710c37913dd7af4b63e195f67e
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealerandRepeater/GateStealerandRepeater.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.Deception.GateStealerandRepeater;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class GateStealerandRepeater extends JammingTechnique
+{
+ public GateStealerandRepeater()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)80); // Gate Stealer and Repeater
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealerandRepeater/RepeaterSweptAmplitudeModulationRSAMandVGPO.java b/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealerandRepeater/RepeaterSweptAmplitudeModulationRSAMandVGPO.java
deleted file mode 100644
index 49bff7c0dcd1b197da0210e7db532a4f712ec24e..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealerandRepeater/RepeaterSweptAmplitudeModulationRSAMandVGPO.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.GateStealerandRepeater;
-
-public class RepeaterSweptAmplitudeModulationRSAMandVGPO extends Base
-{
- public RepeaterSweptAmplitudeModulationRSAMandVGPO()
- {
- setSubcategory(SubCategory.REPEATERSWEPTAMPLITUDEMODULATIONRSAMANDVGPO);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealerandRepeater/RepeaterSweptAmplitudeModulationRSAMandVGPO/RepeaterSweptAmplitudeModulationRSAMandVGPO.java b/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealerandRepeater/RepeaterSweptAmplitudeModulationRSAMandVGPO/RepeaterSweptAmplitudeModulationRSAMandVGPO.java
new file mode 100644
index 0000000000000000000000000000000000000000..227bd7a770891256e80d23fb24b4c1dacbde9ed6
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealerandRepeater/RepeaterSweptAmplitudeModulationRSAMandVGPO/RepeaterSweptAmplitudeModulationRSAMandVGPO.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Deception.GateStealerandRepeater.RepeaterSweptAmplitudeModulationRSAMandVGPO;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class RepeaterSweptAmplitudeModulationRSAMandVGPO extends JammingTechnique
+{
+ public RepeaterSweptAmplitudeModulationRSAMandVGPO()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)80); // Gate Stealer and Repeater
+ setSubCategory((byte)5); // Repeater Swept Amplitude Modulation (RSAM) and VGPO
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealerandRepeater/SubCategory.java b/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealerandRepeater/SubCategory.java
deleted file mode 100644
index eb418ed1c4f0dac93514a2af8b786158f4b286e6..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/GateStealerandRepeater/SubCategory.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.GateStealerandRepeater;
-
-import java.nio.ByteBuffer;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import edu.nps.moves.dis.*;
-
-/* marshal size 8 bits*/
-public enum SubCategory implements edu.nps.moves.dis.JammerSubCategory
-{
- REPEATERSWEPTAMPLITUDEMODULATIONRSAMANDVGPO (5, "Repeater Swept Amplitude Modulation (RSAM) and VGPO");
-
- private byte value;
- private final String description;
-
- SubCategory(int value, String description)
- {
- this.value = (byte)value;
- this.description = description;
- }
-
- public byte getValue()
- {
- return value;
- }
-
- public String getDescription()
- {
- return description;
- }
-
- public static SubCategory getEnumerationForValue(int i)
- {
- for(SubCategory val: values()) {
- if(val.getValue()==i)
- return val;
- }
- System.err.println("No enumeration found for value " + i + " of enumeration SubCategory");
- return null;
- }
-
- @Override
- public void marshal(DataOutputStream dos)
- {
- try {
- dos.writeByte(getValue());
- }
- catch(IOException ex) {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
- }
-
- @Override
- public int unmarshal(DataInputStream dis)
- {
- try {
- value = dis.readByte();
- }
- catch(IOException ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public void marshal(ByteBuffer buff)
- {
- try {
- buff.put(getValue());
- }
- catch(Exception ex) {
- showError(ex);
- }
- }
-
- @Override
- public int unmarshal(ByteBuffer buff)
- {
- try {
- value = buff.get();
- }
- catch(Exception ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public int getMarshalledSize()
- {
- return 1; // 8 bits
- }
-
- private void showError(Exception ex)
- {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/GlintEnhance.java b/src-generated/edu/nps/moves/dis/jammers/Deception/GlintEnhance.java
deleted file mode 100644
index 77d037056cb50f960c9bf50f2da2c2b01062c2e9..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/GlintEnhance.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception;
-
-public class GlintEnhance extends Base
-{
- public GlintEnhance()
- {
- setCategory(Category.GLINTENHANCE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/GlintEnhance/GlintEnhance.java b/src-generated/edu/nps/moves/dis/jammers/Deception/GlintEnhance/GlintEnhance.java
new file mode 100644
index 0000000000000000000000000000000000000000..93823d4adeac13f938a696f341d5ef6d5cfb0f14
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/GlintEnhance/GlintEnhance.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.Deception.GlintEnhance;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class GlintEnhance extends JammingTechnique
+{
+ public GlintEnhance()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)85); // Glint Enhance
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/ImageFrequency.java b/src-generated/edu/nps/moves/dis/jammers/Deception/ImageFrequency.java
deleted file mode 100644
index b01f113ba18799f332e0400ec9e6ff8ea0a3bec4..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/ImageFrequency.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception;
-
-public class ImageFrequency extends Base
-{
- public ImageFrequency()
- {
- setCategory(Category.IMAGEFREQUENCY);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/ImageFrequency/ImageFrequency.java b/src-generated/edu/nps/moves/dis/jammers/Deception/ImageFrequency/ImageFrequency.java
new file mode 100644
index 0000000000000000000000000000000000000000..c6eb2ac1a8a1c4740347384b55d500f65e572293
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/ImageFrequency/ImageFrequency.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.Deception.ImageFrequency;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class ImageFrequency extends JammingTechnique
+{
+ public ImageFrequency()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)90); // Image Frequency
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/JitteredPulseRepetitionFrequency.java b/src-generated/edu/nps/moves/dis/jammers/Deception/JitteredPulseRepetitionFrequency.java
deleted file mode 100644
index ba0f48f44e40cee98d60fe7135442b9f40e31422..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/JitteredPulseRepetitionFrequency.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception;
-
-public class JitteredPulseRepetitionFrequency extends Base
-{
- public JitteredPulseRepetitionFrequency()
- {
- setCategory(Category.JITTEREDPULSEREPETITIONFREQUENCY);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/JitteredPulseRepetitionFrequency/JitteredPulseRepetitionFrequency.java b/src-generated/edu/nps/moves/dis/jammers/Deception/JitteredPulseRepetitionFrequency/JitteredPulseRepetitionFrequency.java
new file mode 100644
index 0000000000000000000000000000000000000000..f4ae1ceadaa9613ea4ccaa332d47c0800922931f
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/JitteredPulseRepetitionFrequency/JitteredPulseRepetitionFrequency.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.Deception.JitteredPulseRepetitionFrequency;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class JitteredPulseRepetitionFrequency extends JammingTechnique
+{
+ public JitteredPulseRepetitionFrequency()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)95); // Jittered Pulse Repetition Frequency
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/JitteredPulseWidth.java b/src-generated/edu/nps/moves/dis/jammers/Deception/JitteredPulseWidth.java
deleted file mode 100644
index f974129c2196fed564267792dbdd02b45e4b4e3f..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/JitteredPulseWidth.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception;
-
-public class JitteredPulseWidth extends Base
-{
- public JitteredPulseWidth()
- {
- setCategory(Category.JITTEREDPULSEWIDTH);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/JitteredPulseWidth/JitteredPulseWidth.java b/src-generated/edu/nps/moves/dis/jammers/Deception/JitteredPulseWidth/JitteredPulseWidth.java
new file mode 100644
index 0000000000000000000000000000000000000000..82451ff1842c31a9e1ba00c1ca1be4033bf70a1e
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/JitteredPulseWidth/JitteredPulseWidth.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.Deception.JitteredPulseWidth;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class JitteredPulseWidth extends JammingTechnique
+{
+ public JitteredPulseWidth()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)100); // Jittered Pulse Width
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/PseudorandomNoisePRN.java b/src-generated/edu/nps/moves/dis/jammers/Deception/PseudorandomNoisePRN.java
deleted file mode 100644
index 06eefeb83fa9ea6a0bf15515ba087e62475ce58b..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/PseudorandomNoisePRN.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception;
-
-public class PseudorandomNoisePRN extends Base
-{
- public PseudorandomNoisePRN()
- {
- setCategory(Category.PSEUDORANDOMNOISEPRN);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/PseudorandomNoisePRN/PseudorandomNoisePRN.java b/src-generated/edu/nps/moves/dis/jammers/Deception/PseudorandomNoisePRN/PseudorandomNoisePRN.java
new file mode 100644
index 0000000000000000000000000000000000000000..350a066680ff956866d557d788d1bd851cc5d2a5
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/PseudorandomNoisePRN/PseudorandomNoisePRN.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.Deception.PseudorandomNoisePRN;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class PseudorandomNoisePRN extends JammingTechnique
+{
+ public PseudorandomNoisePRN()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)105); // Pseudorandom Noise (PRN)
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Pulse.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Pulse.java
deleted file mode 100644
index 2b14da6112ef31be4cacf79ce3dc54573bed9843..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Pulse.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception;
-
-public class Pulse extends Base
-{
- public Pulse()
- {
- setCategory(Category.PULSE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Pulse/Pulse.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Pulse/Pulse.java
new file mode 100644
index 0000000000000000000000000000000000000000..744440eae58ab9edc298882e1fe983758a2b44ee
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/Pulse/Pulse.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.Deception.Pulse;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class Pulse extends JammingTechnique
+{
+ public Pulse()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)110); // Pulse
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/PulseCompressionDeception.java b/src-generated/edu/nps/moves/dis/jammers/Deception/PulseCompressionDeception.java
deleted file mode 100644
index c9814348b96ef1d23e36dafdba3c9e9cd89ae4f9..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/PulseCompressionDeception.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception;
-
-public class PulseCompressionDeception extends Base
-{
- public PulseCompressionDeception()
- {
- setCategory(Category.PULSECOMPRESSIONDECEPTION);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/PulseCompressionDeception/PulseCompressionDeception.java b/src-generated/edu/nps/moves/dis/jammers/Deception/PulseCompressionDeception/PulseCompressionDeception.java
new file mode 100644
index 0000000000000000000000000000000000000000..9163826299a735b2ec617fdb3deef3f6dd5e51ce
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/PulseCompressionDeception/PulseCompressionDeception.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.Deception.PulseCompressionDeception;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class PulseCompressionDeception extends JammingTechnique
+{
+ public PulseCompressionDeception()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)115); // Pulse Compression Deception
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/RandomRangeProgramsRANRAP.java b/src-generated/edu/nps/moves/dis/jammers/Deception/RandomRangeProgramsRANRAP.java
deleted file mode 100644
index b7ec074475eb8abc9f85354e1aa285d993551ca4..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/RandomRangeProgramsRANRAP.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception;
-
-public class RandomRangeProgramsRANRAP extends Base
-{
- public RandomRangeProgramsRANRAP()
- {
- setCategory(Category.RANDOMRANGEPROGRAMSRANRAP);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/RandomRangeProgramsRANRAP/RandomRangeProgramsRANRAP.java b/src-generated/edu/nps/moves/dis/jammers/Deception/RandomRangeProgramsRANRAP/RandomRangeProgramsRANRAP.java
new file mode 100644
index 0000000000000000000000000000000000000000..e85580a3a82f42f7b613d364358e8666a0d04ce8
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/RandomRangeProgramsRANRAP/RandomRangeProgramsRANRAP.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.Deception.RandomRangeProgramsRANRAP;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class RandomRangeProgramsRANRAP extends JammingTechnique
+{
+ public RandomRangeProgramsRANRAP()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)120); // Random Range Programs (RANRAP)
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Refraction.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Refraction.java
deleted file mode 100644
index e1b762e050162a3cb5205645a8ce2efa4f4a46b6..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Refraction.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception;
-
-public class Refraction extends Base
-{
- public Refraction()
- {
- setCategory(Category.REFRACTION);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Refraction/Refraction.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Refraction/Refraction.java
new file mode 100644
index 0000000000000000000000000000000000000000..f0d9d370c57e530dac35a30c41e71d4e5407fb4a
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/Refraction/Refraction.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.Deception.Refraction;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class Refraction extends JammingTechnique
+{
+ public Refraction()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)125); // Refraction
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/Base.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/Base.java
deleted file mode 100644
index 52d5900978b254116ced8d7578830e94ca81e4f8..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.Repeater;
-
-import edu.nps.moves.dis.jammers.Deception.Category;
-
-abstract public class Base extends edu.nps.moves.dis.jammers.Deception.Base
-{
- public Base()
- {
- setCategory(Category.REPEATER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/ContinuousWaveRepeater.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/ContinuousWaveRepeater.java
deleted file mode 100644
index 6acb02385f8352240b25f131d1f0c4f9541a716b..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/ContinuousWaveRepeater.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.Repeater;
-
-public class ContinuousWaveRepeater extends Base
-{
- public ContinuousWaveRepeater()
- {
- setSubcategory(SubCategory.CONTINUOUSWAVEREPEATER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/ContinuousWaveRepeater/ContinuousWaveRepeater.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/ContinuousWaveRepeater/ContinuousWaveRepeater.java
new file mode 100644
index 0000000000000000000000000000000000000000..a3c971bcaa7e5ecc18fc06d3a25bf47101462e67
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/ContinuousWaveRepeater/ContinuousWaveRepeater.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Deception.Repeater.ContinuousWaveRepeater;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class ContinuousWaveRepeater extends JammingTechnique
+{
+ public ContinuousWaveRepeater()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)130); // Repeater
+ setSubCategory((byte)5); // Continuous Wave Repeater
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/MultipleFrequencyRepeaterMFR.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/MultipleFrequencyRepeaterMFR.java
deleted file mode 100644
index 8e344e4783b30cfa7fdf4d855c15b6eec9b2b916..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/MultipleFrequencyRepeaterMFR.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.Repeater;
-
-public class MultipleFrequencyRepeaterMFR extends Base
-{
- public MultipleFrequencyRepeaterMFR()
- {
- setSubcategory(SubCategory.MULTIPLEFREQUENCYREPEATERMFR);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/MultipleFrequencyRepeaterMFR/MultipleFrequencyRepeaterMFR.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/MultipleFrequencyRepeaterMFR/MultipleFrequencyRepeaterMFR.java
new file mode 100644
index 0000000000000000000000000000000000000000..e998fef720654ae2db5cfaaab351409493bcf69f
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/MultipleFrequencyRepeaterMFR/MultipleFrequencyRepeaterMFR.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Deception.Repeater.MultipleFrequencyRepeaterMFR;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class MultipleFrequencyRepeaterMFR extends JammingTechnique
+{
+ public MultipleFrequencyRepeaterMFR()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)130); // Repeater
+ setSubCategory((byte)15); // Multiple Frequency Repeater (MFR)
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/NarrowBandRepeaterNoiseNBRN.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/NarrowBandRepeaterNoiseNBRN.java
deleted file mode 100644
index 9877114808539f27d7fdb9a3ed43b9fa64f4ec6f..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/NarrowBandRepeaterNoiseNBRN.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.Repeater;
-
-public class NarrowBandRepeaterNoiseNBRN extends Base
-{
- public NarrowBandRepeaterNoiseNBRN()
- {
- setSubcategory(SubCategory.NARROWBANDREPEATERNOISENBRN);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/NarrowBandRepeaterNoiseNBRN/NarrowBandRepeaterNoiseNBRN.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/NarrowBandRepeaterNoiseNBRN/NarrowBandRepeaterNoiseNBRN.java
new file mode 100644
index 0000000000000000000000000000000000000000..78eeed1b1212b6f5fb5d983f93ecfdd8555f5847
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/NarrowBandRepeaterNoiseNBRN/NarrowBandRepeaterNoiseNBRN.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Deception.Repeater.NarrowBandRepeaterNoiseNBRN;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class NarrowBandRepeaterNoiseNBRN extends JammingTechnique
+{
+ public NarrowBandRepeaterNoiseNBRN()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)130); // Repeater
+ setSubCategory((byte)20); // Narrow Band Repeater Noise (NBRN)
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RandomDopplerRD.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RandomDopplerRD.java
deleted file mode 100644
index ac50b7238a2908a5eedd248d26f65131c6ecf361..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RandomDopplerRD.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.Repeater;
-
-public class RandomDopplerRD extends Base
-{
- public RandomDopplerRD()
- {
- setSubcategory(SubCategory.RANDOMDOPPLERRD);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RandomDopplerRD/RandomDopplerRD.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RandomDopplerRD/RandomDopplerRD.java
new file mode 100644
index 0000000000000000000000000000000000000000..887bf7f1f2df7d552524bd48f760d06f202437d2
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RandomDopplerRD/RandomDopplerRD.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Deception.Repeater.RandomDopplerRD;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class RandomDopplerRD extends JammingTechnique
+{
+ public RandomDopplerRD()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)130); // Repeater
+ setSubCategory((byte)25); // Random Doppler (RD)
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/Repeater.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/Repeater.java
new file mode 100644
index 0000000000000000000000000000000000000000..f28517cb8ec495a07172ad11520026ee47ac4da0
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/Repeater.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.Deception.Repeater;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class Repeater extends JammingTechnique
+{
+ public Repeater()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)130); // Repeater
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/Base.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/Base.java
deleted file mode 100644
index 7e38abfdb5ab1593eade3b9b15e98997337cba67..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.Repeater.RepeaterDigitalRadioFrequencyMemoryDRFM;
-
-import edu.nps.moves.dis.jammers.Deception.Repeater.SubCategory;
-
-abstract public class Base extends edu.nps.moves.dis.jammers.Deception.Repeater.Base
-{
- public Base()
- {
- setSubcategory(SubCategory.REPEATERDIGITALRADIOFREQUENCYMEMORYDRFM);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelA.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelA.java
deleted file mode 100644
index bf936ef0fada4f1a37985e154bf9f6b82f0beedf..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelA.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.Repeater.RepeaterDigitalRadioFrequencyMemoryDRFM;
-
-public class DRFMLevelA extends Base
-{
- public DRFMLevelA()
- {
- setSpecific(Specific.DRFMLEVELA);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelA/DRFMLevelA.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelA/DRFMLevelA.java
new file mode 100644
index 0000000000000000000000000000000000000000..1424d09ec813dfb29441844c963d2417d45c2cd1
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelA/DRFMLevelA.java
@@ -0,0 +1,20 @@
+package edu.nps.moves.dis.jammers.Deception.Repeater.RepeaterDigitalRadioFrequencyMemoryDRFM.DRFMLevelA;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class DRFMLevelA extends JammingTechnique
+{
+ public DRFMLevelA()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)130); // Repeater
+ setSubCategory((byte)30); // Repeater Digital Radio Frequency Memory (DRFM)
+ setSpecific((byte)1); // DRFM Level A
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelB.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelB.java
deleted file mode 100644
index d020b95e52014100fd45a1e5041a2a05aeda322a..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelB.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.Repeater.RepeaterDigitalRadioFrequencyMemoryDRFM;
-
-public class DRFMLevelB extends Base
-{
- public DRFMLevelB()
- {
- setSpecific(Specific.DRFMLEVELB);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelB/DRFMLevelB.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelB/DRFMLevelB.java
new file mode 100644
index 0000000000000000000000000000000000000000..6dd9d74c96da93756713abb96a444697a0e60ec4
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelB/DRFMLevelB.java
@@ -0,0 +1,20 @@
+package edu.nps.moves.dis.jammers.Deception.Repeater.RepeaterDigitalRadioFrequencyMemoryDRFM.DRFMLevelB;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class DRFMLevelB extends JammingTechnique
+{
+ public DRFMLevelB()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)130); // Repeater
+ setSubCategory((byte)30); // Repeater Digital Radio Frequency Memory (DRFM)
+ setSpecific((byte)2); // DRFM Level B
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelC.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelC.java
deleted file mode 100644
index 42424210f385fd482d95308dfd0c65c5d89697bf..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelC.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.Repeater.RepeaterDigitalRadioFrequencyMemoryDRFM;
-
-public class DRFMLevelC extends Base
-{
- public DRFMLevelC()
- {
- setSpecific(Specific.DRFMLEVELC);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelC/DRFMLevelC.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelC/DRFMLevelC.java
new file mode 100644
index 0000000000000000000000000000000000000000..5b89520f7736264dfabaca68b2e1f1576aa7acc4
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelC/DRFMLevelC.java
@@ -0,0 +1,20 @@
+package edu.nps.moves.dis.jammers.Deception.Repeater.RepeaterDigitalRadioFrequencyMemoryDRFM.DRFMLevelC;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class DRFMLevelC extends JammingTechnique
+{
+ public DRFMLevelC()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)130); // Repeater
+ setSubCategory((byte)30); // Repeater Digital Radio Frequency Memory (DRFM)
+ setSpecific((byte)3); // DRFM Level C
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelD.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelD.java
deleted file mode 100644
index e734f8a40e8b7175a353260566ee9c76b993a0fd..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelD.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.Repeater.RepeaterDigitalRadioFrequencyMemoryDRFM;
-
-public class DRFMLevelD extends Base
-{
- public DRFMLevelD()
- {
- setSpecific(Specific.DRFMLEVELD);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelD/DRFMLevelD.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelD/DRFMLevelD.java
new file mode 100644
index 0000000000000000000000000000000000000000..fa819b6e601b292fe60e80c34bbebcfffd4bfd3f
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelD/DRFMLevelD.java
@@ -0,0 +1,20 @@
+package edu.nps.moves.dis.jammers.Deception.Repeater.RepeaterDigitalRadioFrequencyMemoryDRFM.DRFMLevelD;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class DRFMLevelD extends JammingTechnique
+{
+ public DRFMLevelD()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)130); // Repeater
+ setSubCategory((byte)30); // Repeater Digital Radio Frequency Memory (DRFM)
+ setSpecific((byte)4); // DRFM Level D
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelE.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelE.java
deleted file mode 100644
index bf5c85ca894f0652b2b833a12e6ea3d292386187..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelE.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.Repeater.RepeaterDigitalRadioFrequencyMemoryDRFM;
-
-public class DRFMLevelE extends Base
-{
- public DRFMLevelE()
- {
- setSpecific(Specific.DRFMLEVELE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelE/DRFMLevelE.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelE/DRFMLevelE.java
new file mode 100644
index 0000000000000000000000000000000000000000..584f2c05c599cc840103cc0d30bcabb8852b1d45
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/DRFMLevelE/DRFMLevelE.java
@@ -0,0 +1,20 @@
+package edu.nps.moves.dis.jammers.Deception.Repeater.RepeaterDigitalRadioFrequencyMemoryDRFM.DRFMLevelE;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class DRFMLevelE extends JammingTechnique
+{
+ public DRFMLevelE()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)130); // Repeater
+ setSubCategory((byte)30); // Repeater Digital Radio Frequency Memory (DRFM)
+ setSpecific((byte)5); // DRFM Level E
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/RepeaterDigitalRadioFrequencyMemoryDRFM.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/RepeaterDigitalRadioFrequencyMemoryDRFM.java
new file mode 100644
index 0000000000000000000000000000000000000000..3d753ff9313996cdcb83fe094eb908cba51666d0
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/RepeaterDigitalRadioFrequencyMemoryDRFM.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Deception.Repeater.RepeaterDigitalRadioFrequencyMemoryDRFM;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class RepeaterDigitalRadioFrequencyMemoryDRFM extends JammingTechnique
+{
+ public RepeaterDigitalRadioFrequencyMemoryDRFM()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)130); // Repeater
+ setSubCategory((byte)30); // Repeater Digital Radio Frequency Memory (DRFM)
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/Specific.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/Specific.java
deleted file mode 100644
index 8522a0e1492b80de27e844af9675cacbfea36ec2..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterDigitalRadioFrequencyMemoryDRFM/Specific.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.Repeater.RepeaterDigitalRadioFrequencyMemoryDRFM;
-
-import java.nio.ByteBuffer;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import edu.nps.moves.dis.*;
-
-/* marshal size 8 bits*/
-public enum Specific implements edu.nps.moves.dis.JammerSpecific
-{
- DRFMLEVELA (1, "DRFM Level A"),
- DRFMLEVELB (2, "DRFM Level B"),
- DRFMLEVELC (3, "DRFM Level C"),
- DRFMLEVELD (4, "DRFM Level D"),
- DRFMLEVELE (5, "DRFM Level E");
-
- private byte value;
- private final String description;
-
- Specific(int value, String description)
- {
- this.value = (byte)value;
- this.description = description;
- }
-
- public byte getValue()
- {
- return value;
- }
-
- public String getDescription()
- {
- return description;
- }
-
- public static Specific getEnumerationForValue(int i)
- {
- for(Specific val: values()) {
- if(val.getValue()==i)
- return val;
- }
- System.err.println("No enumeration found for value " + i + " of enumeration Specific");
- return null;
- }
-
- @Override
- public void marshal(DataOutputStream dos)
- {
- try {
- dos.writeByte(getValue());
- }
- catch(IOException ex) {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
- }
-
- @Override
- public int unmarshal(DataInputStream dis)
- {
- try {
- value = dis.readByte();
- }
- catch(IOException ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public void marshal(ByteBuffer buff)
- {
- try {
- buff.put(getValue());
- }
- catch(Exception ex) {
- showError(ex);
- }
- }
-
- @Override
- public int unmarshal(ByteBuffer buff)
- {
- try {
- value = buff.get();
- }
- catch(Exception ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public int getMarshalledSize()
- {
- return 1; // 8 bits
- }
-
- private void showError(Exception ex)
- {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterNoise.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterNoise.java
deleted file mode 100644
index e24bfcbc2b490690e684d9373b1c40e6b079f05e..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterNoise.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.Repeater;
-
-public class RepeaterNoise extends Base
-{
- public RepeaterNoise()
- {
- setSubcategory(SubCategory.REPEATERNOISE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterNoise/RepeaterNoise.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterNoise/RepeaterNoise.java
new file mode 100644
index 0000000000000000000000000000000000000000..0eaa8cb36884e04801719a1ef2d7baeeb8c8e3c4
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterNoise/RepeaterNoise.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Deception.Repeater.RepeaterNoise;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class RepeaterNoise extends JammingTechnique
+{
+ public RepeaterNoise()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)130); // Repeater
+ setSubCategory((byte)10); // Repeater Noise
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterSweptAmplitudeModulationRSAM.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterSweptAmplitudeModulationRSAM.java
deleted file mode 100644
index 4425d0c0a4a42d5ec6ebb709b39c071c49bde0e4..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterSweptAmplitudeModulationRSAM.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.Repeater;
-
-public class RepeaterSweptAmplitudeModulationRSAM extends Base
-{
- public RepeaterSweptAmplitudeModulationRSAM()
- {
- setSubcategory(SubCategory.REPEATERSWEPTAMPLITUDEMODULATIONRSAM);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterSweptAmplitudeModulationRSAM/RepeaterSweptAmplitudeModulationRSAM.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterSweptAmplitudeModulationRSAM/RepeaterSweptAmplitudeModulationRSAM.java
new file mode 100644
index 0000000000000000000000000000000000000000..8eaa2ab3126bb0a4c32529992779265c523b3fc5
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/RepeaterSweptAmplitudeModulationRSAM/RepeaterSweptAmplitudeModulationRSAM.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Deception.Repeater.RepeaterSweptAmplitudeModulationRSAM;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class RepeaterSweptAmplitudeModulationRSAM extends JammingTechnique
+{
+ public RepeaterSweptAmplitudeModulationRSAM()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)130); // Repeater
+ setSubCategory((byte)35); // Repeater Swept Amplitude Modulation (RSAM)
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/SubCategory.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/SubCategory.java
deleted file mode 100644
index 3b09440c4a3449632a66087d34b82b58d3b0c34a..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Repeater/SubCategory.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception.Repeater;
-
-import java.nio.ByteBuffer;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import edu.nps.moves.dis.*;
-
-/* marshal size 8 bits*/
-public enum SubCategory implements edu.nps.moves.dis.JammerSubCategory
-{
- CONTINUOUSWAVEREPEATER (5, "Continuous Wave Repeater"),
- REPEATERNOISE (10, "Repeater Noise"),
- MULTIPLEFREQUENCYREPEATERMFR (15, "Multiple Frequency Repeater (MFR)"),
- NARROWBANDREPEATERNOISENBRN (20, "Narrow Band Repeater Noise (NBRN)"),
- RANDOMDOPPLERRD (25, "Random Doppler (RD)"),
- REPEATERDIGITALRADIOFREQUENCYMEMORYDRFM (30, "Repeater Digital Radio Frequency Memory (DRFM)"),
- REPEATERSWEPTAMPLITUDEMODULATIONRSAM (35, "Repeater Swept Amplitude Modulation (RSAM)");
-
- private byte value;
- private final String description;
-
- SubCategory(int value, String description)
- {
- this.value = (byte)value;
- this.description = description;
- }
-
- public byte getValue()
- {
- return value;
- }
-
- public String getDescription()
- {
- return description;
- }
-
- public static SubCategory getEnumerationForValue(int i)
- {
- for(SubCategory val: values()) {
- if(val.getValue()==i)
- return val;
- }
- System.err.println("No enumeration found for value " + i + " of enumeration SubCategory");
- return null;
- }
-
- @Override
- public void marshal(DataOutputStream dos)
- {
- try {
- dos.writeByte(getValue());
- }
- catch(IOException ex) {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
- }
-
- @Override
- public int unmarshal(DataInputStream dis)
- {
- try {
- value = dis.readByte();
- }
- catch(IOException ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public void marshal(ByteBuffer buff)
- {
- try {
- buff.put(getValue());
- }
- catch(Exception ex) {
- showError(ex);
- }
- }
-
- @Override
- public int unmarshal(ByteBuffer buff)
- {
- try {
- value = buff.get();
- }
- catch(Exception ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public int getMarshalledSize()
- {
- return 1; // 8 bits
- }
-
- private void showError(Exception ex)
- {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Scintillation.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Scintillation.java
deleted file mode 100644
index 399640bc54735e692a27fd04ef178b6a42226f4e..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Scintillation.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception;
-
-public class Scintillation extends Base
-{
- public Scintillation()
- {
- setCategory(Category.SCINTILLATION);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Scintillation/Scintillation.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Scintillation/Scintillation.java
new file mode 100644
index 0000000000000000000000000000000000000000..118d883badc73b179c89728d0cc9a4845453a976
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/Scintillation/Scintillation.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.Deception.Scintillation;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class Scintillation extends JammingTechnique
+{
+ public Scintillation()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)135); // Scintillation
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Serrodyne.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Serrodyne.java
deleted file mode 100644
index fd6ad09f1fadb11798f5c494416632bd147c5c7a..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Serrodyne.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception;
-
-public class Serrodyne extends Base
-{
- public Serrodyne()
- {
- setCategory(Category.SERRODYNE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Serrodyne/Serrodyne.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Serrodyne/Serrodyne.java
new file mode 100644
index 0000000000000000000000000000000000000000..77fe9196645f7cbced1df29b5b2b349abb39f9be
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/Serrodyne/Serrodyne.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.Deception.Serrodyne;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class Serrodyne extends JammingTechnique
+{
+ public Serrodyne()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)140); // Serrodyne
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Velocity.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Velocity.java
deleted file mode 100644
index b02e7cbe9c2724f520e68ee2c5b5f68e3918b809..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Deception/Velocity.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Deception;
-
-public class Velocity extends Base
-{
- public Velocity()
- {
- setCategory(Category.VELOCITY);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Deception/Velocity/Velocity.java b/src-generated/edu/nps/moves/dis/jammers/Deception/Velocity/Velocity.java
new file mode 100644
index 0000000000000000000000000000000000000000..1b363096e612a42a54c53509c5041f190eab7b3f
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Deception/Velocity/Velocity.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.Deception.Velocity;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class Velocity extends JammingTechnique
+{
+ public Velocity()
+ {
+ setKind((byte)2); // Deception
+ setCategory((byte)145); // Velocity
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandFMbyNoise/AngleandFMbyNoise.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandFMbyNoise/AngleandFMbyNoise.java
new file mode 100644
index 0000000000000000000000000000000000000000..5979b70bc254256771f3b45559f6535cf11b167e
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandFMbyNoise/AngleandFMbyNoise.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.DeceptionandNoise.AngleandFMbyNoise;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class AngleandFMbyNoise extends JammingTechnique
+{
+ public AngleandFMbyNoise()
+ {
+ setKind((byte)3); // Deception and Noise
+ setCategory((byte)10); // Angle and FM by Noise
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandFMbyNoise/Base.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandFMbyNoise/Base.java
deleted file mode 100644
index 4bdaf9e164417dea630431fd055df3a1b9833331..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandFMbyNoise/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise.AngleandFMbyNoise;
-
-import edu.nps.moves.dis.jammers.DeceptionandNoise.Category;
-
-abstract public class Base extends edu.nps.moves.dis.jammers.DeceptionandNoise.Base
-{
- public Base()
- {
- setCategory(Category.ANGLEANDFMBYNOISE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandFMbyNoise/FMbyNoiseandInverseGain.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandFMbyNoise/FMbyNoiseandInverseGain.java
deleted file mode 100644
index 47aeaa391c39f5b3e1597edb2d087f8ebab254c1..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandFMbyNoise/FMbyNoiseandInverseGain.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise.AngleandFMbyNoise;
-
-public class FMbyNoiseandInverseGain extends Base
-{
- public FMbyNoiseandInverseGain()
- {
- setSubcategory(SubCategory.FMBYNOISEANDINVERSEGAIN);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandFMbyNoise/FMbyNoiseandInverseGain/FMbyNoiseandInverseGain.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandFMbyNoise/FMbyNoiseandInverseGain/FMbyNoiseandInverseGain.java
new file mode 100644
index 0000000000000000000000000000000000000000..633a787869a73fec71911faa695371e3bc339e5d
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandFMbyNoise/FMbyNoiseandInverseGain/FMbyNoiseandInverseGain.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.DeceptionandNoise.AngleandFMbyNoise.FMbyNoiseandInverseGain;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class FMbyNoiseandInverseGain extends JammingTechnique
+{
+ public FMbyNoiseandInverseGain()
+ {
+ setKind((byte)3); // Deception and Noise
+ setCategory((byte)10); // Angle and FM by Noise
+ setSubCategory((byte)5); // FM by Noise and Inverse Gain
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandFMbyNoise/FMbyNoiseandSSW.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandFMbyNoise/FMbyNoiseandSSW.java
deleted file mode 100644
index 0672e9d3499a92ca92f78e903f2a6b59748fdb17..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandFMbyNoise/FMbyNoiseandSSW.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise.AngleandFMbyNoise;
-
-public class FMbyNoiseandSSW extends Base
-{
- public FMbyNoiseandSSW()
- {
- setSubcategory(SubCategory.FMBYNOISEANDSSW);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandFMbyNoise/FMbyNoiseandSSW/FMbyNoiseandSSW.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandFMbyNoise/FMbyNoiseandSSW/FMbyNoiseandSSW.java
new file mode 100644
index 0000000000000000000000000000000000000000..8bbe38a14ffd4e0cf5111e814851e72fcfd29ba5
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandFMbyNoise/FMbyNoiseandSSW/FMbyNoiseandSSW.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.DeceptionandNoise.AngleandFMbyNoise.FMbyNoiseandSSW;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class FMbyNoiseandSSW extends JammingTechnique
+{
+ public FMbyNoiseandSSW()
+ {
+ setKind((byte)3); // Deception and Noise
+ setCategory((byte)10); // Angle and FM by Noise
+ setSubCategory((byte)10); // FM by Noise and SSW
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandFMbyNoise/SubCategory.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandFMbyNoise/SubCategory.java
deleted file mode 100644
index cdaf327b79e304aecf118e4f0cc055bf4a84ed5a..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandFMbyNoise/SubCategory.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise.AngleandFMbyNoise;
-
-import java.nio.ByteBuffer;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import edu.nps.moves.dis.*;
-
-/* marshal size 8 bits*/
-public enum SubCategory implements edu.nps.moves.dis.JammerSubCategory
-{
- FMBYNOISEANDINVERSEGAIN (5, "FM by Noise and Inverse Gain"),
- FMBYNOISEANDSSW (10, "FM by Noise and SSW");
-
- private byte value;
- private final String description;
-
- SubCategory(int value, String description)
- {
- this.value = (byte)value;
- this.description = description;
- }
-
- public byte getValue()
- {
- return value;
- }
-
- public String getDescription()
- {
- return description;
- }
-
- public static SubCategory getEnumerationForValue(int i)
- {
- for(SubCategory val: values()) {
- if(val.getValue()==i)
- return val;
- }
- System.err.println("No enumeration found for value " + i + " of enumeration SubCategory");
- return null;
- }
-
- @Override
- public void marshal(DataOutputStream dos)
- {
- try {
- dos.writeByte(getValue());
- }
- catch(IOException ex) {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
- }
-
- @Override
- public int unmarshal(DataInputStream dis)
- {
- try {
- value = dis.readByte();
- }
- catch(IOException ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public void marshal(ByteBuffer buff)
- {
- try {
- buff.put(getValue());
- }
- catch(Exception ex) {
- showError(ex);
- }
- }
-
- @Override
- public int unmarshal(ByteBuffer buff)
- {
- try {
- value = buff.get();
- }
- catch(Exception ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public int getMarshalledSize()
- {
- return 1; // 8 bits
- }
-
- private void showError(Exception ex)
- {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/AngleandBarrage.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/AngleandBarrage.java
new file mode 100644
index 0000000000000000000000000000000000000000..9a2b6cc65364c618cf3030d56d1a9f554150ea3d
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/AngleandBarrage.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.DeceptionandNoise.AngleandNoise.AngleandBarrage;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class AngleandBarrage extends JammingTechnique
+{
+ public AngleandBarrage()
+ {
+ setKind((byte)3); // Deception and Noise
+ setCategory((byte)5); // Angle and Noise
+ setSubCategory((byte)5); // Angle and Barrage
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/BarrageandInverseGain.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/BarrageandInverseGain.java
deleted file mode 100644
index c7cf0eeeee3f29af9ca0966d2bce662eb1c020a9..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/BarrageandInverseGain.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise.AngleandNoise.AngleandBarrage;
-
-public class BarrageandInverseGain extends Base
-{
- public BarrageandInverseGain()
- {
- setSpecific(Specific.BARRAGEANDINVERSEGAIN);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/BarrageandInverseGain/BarrageandInverseGain.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/BarrageandInverseGain/BarrageandInverseGain.java
new file mode 100644
index 0000000000000000000000000000000000000000..2a823b473fa27b2f13cb3c003970fcd0f36ffc44
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/BarrageandInverseGain/BarrageandInverseGain.java
@@ -0,0 +1,20 @@
+package edu.nps.moves.dis.jammers.DeceptionandNoise.AngleandNoise.AngleandBarrage.BarrageandInverseGain;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class BarrageandInverseGain extends JammingTechnique
+{
+ public BarrageandInverseGain()
+ {
+ setKind((byte)3); // Deception and Noise
+ setCategory((byte)5); // Angle and Noise
+ setSubCategory((byte)5); // Angle and Barrage
+ setSpecific((byte)5); // Barrage and Inverse Gain
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/BarrageandSSW.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/BarrageandSSW.java
deleted file mode 100644
index 260cbffdfb27a27cfbbb3246f4e8f9cacc6cd272..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/BarrageandSSW.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise.AngleandNoise.AngleandBarrage;
-
-public class BarrageandSSW extends Base
-{
- public BarrageandSSW()
- {
- setSpecific(Specific.BARRAGEANDSSW);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/BarrageandSSW/BarrageandSSW.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/BarrageandSSW/BarrageandSSW.java
new file mode 100644
index 0000000000000000000000000000000000000000..141736ea46c4817954d0ed49a03cd447f977e1cc
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/BarrageandSSW/BarrageandSSW.java
@@ -0,0 +1,20 @@
+package edu.nps.moves.dis.jammers.DeceptionandNoise.AngleandNoise.AngleandBarrage.BarrageandSSW;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class BarrageandSSW extends JammingTechnique
+{
+ public BarrageandSSW()
+ {
+ setKind((byte)3); // Deception and Noise
+ setCategory((byte)5); // Angle and Noise
+ setSubCategory((byte)5); // Angle and Barrage
+ setSpecific((byte)10); // Barrage and SSW
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/Base.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/Base.java
deleted file mode 100644
index 82e950f2a5e9731fa62a1a92237e8a740540d908..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise.AngleandNoise.AngleandBarrage;
-
-import edu.nps.moves.dis.jammers.DeceptionandNoise.AngleandNoise.SubCategory;
-
-abstract public class Base extends edu.nps.moves.dis.jammers.DeceptionandNoise.AngleandNoise.Base
-{
- public Base()
- {
- setSubcategory(SubCategory.ANGLEANDBARRAGE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/Specific.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/Specific.java
deleted file mode 100644
index e8e8a4116a7d1b672d70b90e2a3f03c7728f1a6e..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandNoise/AngleandBarrage/Specific.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise.AngleandNoise.AngleandBarrage;
-
-import java.nio.ByteBuffer;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import edu.nps.moves.dis.*;
-
-/* marshal size 8 bits*/
-public enum Specific implements edu.nps.moves.dis.JammerSpecific
-{
- BARRAGEANDINVERSEGAIN (5, "Barrage and Inverse Gain"),
- BARRAGEANDSSW (10, "Barrage and SSW");
-
- private byte value;
- private final String description;
-
- Specific(int value, String description)
- {
- this.value = (byte)value;
- this.description = description;
- }
-
- public byte getValue()
- {
- return value;
- }
-
- public String getDescription()
- {
- return description;
- }
-
- public static Specific getEnumerationForValue(int i)
- {
- for(Specific val: values()) {
- if(val.getValue()==i)
- return val;
- }
- System.err.println("No enumeration found for value " + i + " of enumeration Specific");
- return null;
- }
-
- @Override
- public void marshal(DataOutputStream dos)
- {
- try {
- dos.writeByte(getValue());
- }
- catch(IOException ex) {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
- }
-
- @Override
- public int unmarshal(DataInputStream dis)
- {
- try {
- value = dis.readByte();
- }
- catch(IOException ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public void marshal(ByteBuffer buff)
- {
- try {
- buff.put(getValue());
- }
- catch(Exception ex) {
- showError(ex);
- }
- }
-
- @Override
- public int unmarshal(ByteBuffer buff)
- {
- try {
- value = buff.get();
- }
- catch(Exception ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public int getMarshalledSize()
- {
- return 1; // 8 bits
- }
-
- private void showError(Exception ex)
- {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandNoise/AngleandNoise.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandNoise/AngleandNoise.java
new file mode 100644
index 0000000000000000000000000000000000000000..f46d690e755d803b628bb2b50a48e55d8a9fa819
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandNoise/AngleandNoise.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.DeceptionandNoise.AngleandNoise;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class AngleandNoise extends JammingTechnique
+{
+ public AngleandNoise()
+ {
+ setKind((byte)3); // Deception and Noise
+ setCategory((byte)5); // Angle and Noise
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandNoise/Base.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandNoise/Base.java
deleted file mode 100644
index 26e3cc78dc0b26ae218b8a299d3f703c6631dfec..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandNoise/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise.AngleandNoise;
-
-import edu.nps.moves.dis.jammers.DeceptionandNoise.Category;
-
-abstract public class Base extends edu.nps.moves.dis.jammers.DeceptionandNoise.Base
-{
- public Base()
- {
- setCategory(Category.ANGLEANDNOISE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandNoise/SubCategory.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandNoise/SubCategory.java
deleted file mode 100644
index 5b73ad1fd2e3b0f873b269383dad6933f99f200b..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandNoise/SubCategory.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise.AngleandNoise;
-
-import java.nio.ByteBuffer;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import edu.nps.moves.dis.*;
-
-/* marshal size 8 bits*/
-public enum SubCategory implements edu.nps.moves.dis.JammerSubCategory
-{
- ANGLEANDBARRAGE (5, "Angle and Barrage");
-
- private byte value;
- private final String description;
-
- SubCategory(int value, String description)
- {
- this.value = (byte)value;
- this.description = description;
- }
-
- public byte getValue()
- {
- return value;
- }
-
- public String getDescription()
- {
- return description;
- }
-
- public static SubCategory getEnumerationForValue(int i)
- {
- for(SubCategory val: values()) {
- if(val.getValue()==i)
- return val;
- }
- System.err.println("No enumeration found for value " + i + " of enumeration SubCategory");
- return null;
- }
-
- @Override
- public void marshal(DataOutputStream dos)
- {
- try {
- dos.writeByte(getValue());
- }
- catch(IOException ex) {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
- }
-
- @Override
- public int unmarshal(DataInputStream dis)
- {
- try {
- value = dis.readByte();
- }
- catch(IOException ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public void marshal(ByteBuffer buff)
- {
- try {
- buff.put(getValue());
- }
- catch(Exception ex) {
- showError(ex);
- }
- }
-
- @Override
- public int unmarshal(ByteBuffer buff)
- {
- try {
- value = buff.get();
- }
- catch(Exception ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public int getMarshalledSize()
- {
- return 1; // 8 bits
- }
-
- private void showError(Exception ex)
- {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandPseudorandomAM/AngleandPseudorandomAM.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandPseudorandomAM/AngleandPseudorandomAM.java
new file mode 100644
index 0000000000000000000000000000000000000000..d31df66394cf2a350244fb777c7156e5064aa11f
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandPseudorandomAM/AngleandPseudorandomAM.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.DeceptionandNoise.AngleandPseudorandomAM;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class AngleandPseudorandomAM extends JammingTechnique
+{
+ public AngleandPseudorandomAM()
+ {
+ setKind((byte)3); // Deception and Noise
+ setCategory((byte)15); // Angle and Pseudorandom AM
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandPseudorandomAM/Base.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandPseudorandomAM/Base.java
deleted file mode 100644
index ae3bb69f3bd3cb2b840a94a245e38150f61b90aa..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandPseudorandomAM/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise.AngleandPseudorandomAM;
-
-import edu.nps.moves.dis.jammers.DeceptionandNoise.Category;
-
-abstract public class Base extends edu.nps.moves.dis.jammers.DeceptionandNoise.Base
-{
- public Base()
- {
- setCategory(Category.ANGLEANDPSEUDORANDOMAM);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandPseudorandomAM/InverseGainandPseudorandomAM.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandPseudorandomAM/InverseGainandPseudorandomAM.java
deleted file mode 100644
index b074edc25b62f48446192458f5075e39c7a0ad7c..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandPseudorandomAM/InverseGainandPseudorandomAM.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise.AngleandPseudorandomAM;
-
-public class InverseGainandPseudorandomAM extends Base
-{
- public InverseGainandPseudorandomAM()
- {
- setSubcategory(SubCategory.INVERSEGAINANDPSEUDORANDOMAM);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandPseudorandomAM/InverseGainandPseudorandomAM/InverseGainandPseudorandomAM.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandPseudorandomAM/InverseGainandPseudorandomAM/InverseGainandPseudorandomAM.java
new file mode 100644
index 0000000000000000000000000000000000000000..80ddc26be873f5b3659ec3b9d8b5af1eb46dd2d3
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandPseudorandomAM/InverseGainandPseudorandomAM/InverseGainandPseudorandomAM.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.DeceptionandNoise.AngleandPseudorandomAM.InverseGainandPseudorandomAM;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class InverseGainandPseudorandomAM extends JammingTechnique
+{
+ public InverseGainandPseudorandomAM()
+ {
+ setKind((byte)3); // Deception and Noise
+ setCategory((byte)15); // Angle and Pseudorandom AM
+ setSubCategory((byte)5); // Inverse Gain and Pseudorandom AM
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandPseudorandomAM/PseudorandomAMandSSW.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandPseudorandomAM/PseudorandomAMandSSW.java
deleted file mode 100644
index 97e911891ae537d78eb960035e696bc60be338ef..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandPseudorandomAM/PseudorandomAMandSSW.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise.AngleandPseudorandomAM;
-
-public class PseudorandomAMandSSW extends Base
-{
- public PseudorandomAMandSSW()
- {
- setSubcategory(SubCategory.PSEUDORANDOMAMANDSSW);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandPseudorandomAM/PseudorandomAMandSSW/PseudorandomAMandSSW.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandPseudorandomAM/PseudorandomAMandSSW/PseudorandomAMandSSW.java
new file mode 100644
index 0000000000000000000000000000000000000000..13134b1ed52c17108b7f51f5a5175dc15487f290
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandPseudorandomAM/PseudorandomAMandSSW/PseudorandomAMandSSW.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.DeceptionandNoise.AngleandPseudorandomAM.PseudorandomAMandSSW;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class PseudorandomAMandSSW extends JammingTechnique
+{
+ public PseudorandomAMandSSW()
+ {
+ setKind((byte)3); // Deception and Noise
+ setCategory((byte)15); // Angle and Pseudorandom AM
+ setSubCategory((byte)10); // Pseudorandom AM and SSW
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandPseudorandomAM/SubCategory.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandPseudorandomAM/SubCategory.java
deleted file mode 100644
index ff179cded5efdb3d091c2a71e891953e7e7f4516..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandPseudorandomAM/SubCategory.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise.AngleandPseudorandomAM;
-
-import java.nio.ByteBuffer;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import edu.nps.moves.dis.*;
-
-/* marshal size 8 bits*/
-public enum SubCategory implements edu.nps.moves.dis.JammerSubCategory
-{
- INVERSEGAINANDPSEUDORANDOMAM (5, "Inverse Gain and Pseudorandom AM"),
- PSEUDORANDOMAMANDSSW (10, "Pseudorandom AM and SSW");
-
- private byte value;
- private final String description;
-
- SubCategory(int value, String description)
- {
- this.value = (byte)value;
- this.description = description;
- }
-
- public byte getValue()
- {
- return value;
- }
-
- public String getDescription()
- {
- return description;
- }
-
- public static SubCategory getEnumerationForValue(int i)
- {
- for(SubCategory val: values()) {
- if(val.getValue()==i)
- return val;
- }
- System.err.println("No enumeration found for value " + i + " of enumeration SubCategory");
- return null;
- }
-
- @Override
- public void marshal(DataOutputStream dos)
- {
- try {
- dos.writeByte(getValue());
- }
- catch(IOException ex) {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
- }
-
- @Override
- public int unmarshal(DataInputStream dis)
- {
- try {
- value = dis.readByte();
- }
- catch(IOException ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public void marshal(ByteBuffer buff)
- {
- try {
- buff.put(getValue());
- }
- catch(Exception ex) {
- showError(ex);
- }
- }
-
- @Override
- public int unmarshal(ByteBuffer buff)
- {
- try {
- value = buff.get();
- }
- catch(Exception ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public int getMarshalledSize()
- {
- return 1; // 8 bits
- }
-
- private void showError(Exception ex)
- {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandSpot/AngleandSpot.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandSpot/AngleandSpot.java
new file mode 100644
index 0000000000000000000000000000000000000000..a81f67ea3fc8b7ab1a92b83caa25f7b65cf9bb1a
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandSpot/AngleandSpot.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.DeceptionandNoise.AngleandSpot;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class AngleandSpot extends JammingTechnique
+{
+ public AngleandSpot()
+ {
+ setKind((byte)3); // Deception and Noise
+ setCategory((byte)20); // Angle and Spot
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandSpot/Base.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandSpot/Base.java
deleted file mode 100644
index 5fcba4514c237f769a1cea706580ffa61cdda678..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandSpot/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise.AngleandSpot;
-
-import edu.nps.moves.dis.jammers.DeceptionandNoise.Category;
-
-abstract public class Base extends edu.nps.moves.dis.jammers.DeceptionandNoise.Base
-{
- public Base()
- {
- setCategory(Category.ANGLEANDSPOT);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandSpot/InverseGainandLowLevelNoise.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandSpot/InverseGainandLowLevelNoise.java
deleted file mode 100644
index fad92e7ce6722a7345588d62fa706a999030ce67..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandSpot/InverseGainandLowLevelNoise.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise.AngleandSpot;
-
-public class InverseGainandLowLevelNoise extends Base
-{
- public InverseGainandLowLevelNoise()
- {
- setSubcategory(SubCategory.INVERSEGAINANDLOWLEVELNOISE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandSpot/InverseGainandLowLevelNoise/InverseGainandLowLevelNoise.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandSpot/InverseGainandLowLevelNoise/InverseGainandLowLevelNoise.java
new file mode 100644
index 0000000000000000000000000000000000000000..9f4a3b45a97e8e01a9287f014c3a7d8f3eb3c310
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandSpot/InverseGainandLowLevelNoise/InverseGainandLowLevelNoise.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.DeceptionandNoise.AngleandSpot.InverseGainandLowLevelNoise;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class InverseGainandLowLevelNoise extends JammingTechnique
+{
+ public InverseGainandLowLevelNoise()
+ {
+ setKind((byte)3); // Deception and Noise
+ setCategory((byte)20); // Angle and Spot
+ setSubCategory((byte)5); // Inverse Gain and Low Level Noise
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandSpot/InverseGainandSpotNoise.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandSpot/InverseGainandSpotNoise.java
deleted file mode 100644
index 07be99887994aa47132132e6627d40b7a30dc7b3..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandSpot/InverseGainandSpotNoise.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise.AngleandSpot;
-
-public class InverseGainandSpotNoise extends Base
-{
- public InverseGainandSpotNoise()
- {
- setSubcategory(SubCategory.INVERSEGAINANDSPOTNOISE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandSpot/InverseGainandSpotNoise/InverseGainandSpotNoise.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandSpot/InverseGainandSpotNoise/InverseGainandSpotNoise.java
new file mode 100644
index 0000000000000000000000000000000000000000..f0809ba35d2bbaabca7e2267380e1653b4e7a06d
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandSpot/InverseGainandSpotNoise/InverseGainandSpotNoise.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.DeceptionandNoise.AngleandSpot.InverseGainandSpotNoise;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class InverseGainandSpotNoise extends JammingTechnique
+{
+ public InverseGainandSpotNoise()
+ {
+ setKind((byte)3); // Deception and Noise
+ setCategory((byte)20); // Angle and Spot
+ setSubCategory((byte)10); // Inverse Gain and Spot Noise
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandSpot/SpotandSSW.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandSpot/SpotandSSW.java
deleted file mode 100644
index 3f3b7ef055ea64d8cc53d2daa972ad4e4c75f2a1..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandSpot/SpotandSSW.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise.AngleandSpot;
-
-public class SpotandSSW extends Base
-{
- public SpotandSSW()
- {
- setSubcategory(SubCategory.SPOTANDSSW);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandSpot/SpotandSSW/SpotandSSW.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandSpot/SpotandSSW/SpotandSSW.java
new file mode 100644
index 0000000000000000000000000000000000000000..72aa8ae1383776eaab184c59996c3be257aaf811
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandSpot/SpotandSSW/SpotandSSW.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.DeceptionandNoise.AngleandSpot.SpotandSSW;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class SpotandSSW extends JammingTechnique
+{
+ public SpotandSSW()
+ {
+ setKind((byte)3); // Deception and Noise
+ setCategory((byte)20); // Angle and Spot
+ setSubCategory((byte)15); // Spot and SSW
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandSpot/SubCategory.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandSpot/SubCategory.java
deleted file mode 100644
index 737e4d7e9915786fa22bc02e6fb1e8f42b8e42b8..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/AngleandSpot/SubCategory.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise.AngleandSpot;
-
-import java.nio.ByteBuffer;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import edu.nps.moves.dis.*;
-
-/* marshal size 8 bits*/
-public enum SubCategory implements edu.nps.moves.dis.JammerSubCategory
-{
- INVERSEGAINANDLOWLEVELNOISE (5, "Inverse Gain and Low Level Noise"),
- INVERSEGAINANDSPOTNOISE (10, "Inverse Gain and Spot Noise"),
- SPOTANDSSW (15, "Spot and SSW");
-
- private byte value;
- private final String description;
-
- SubCategory(int value, String description)
- {
- this.value = (byte)value;
- this.description = description;
- }
-
- public byte getValue()
- {
- return value;
- }
-
- public String getDescription()
- {
- return description;
- }
-
- public static SubCategory getEnumerationForValue(int i)
- {
- for(SubCategory val: values()) {
- if(val.getValue()==i)
- return val;
- }
- System.err.println("No enumeration found for value " + i + " of enumeration SubCategory");
- return null;
- }
-
- @Override
- public void marshal(DataOutputStream dos)
- {
- try {
- dos.writeByte(getValue());
- }
- catch(IOException ex) {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
- }
-
- @Override
- public int unmarshal(DataInputStream dis)
- {
- try {
- value = dis.readByte();
- }
- catch(IOException ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public void marshal(ByteBuffer buff)
- {
- try {
- buff.put(getValue());
- }
- catch(Exception ex) {
- showError(ex);
- }
- }
-
- @Override
- public int unmarshal(ByteBuffer buff)
- {
- try {
- value = buff.get();
- }
- catch(Exception ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public int getMarshalledSize()
- {
- return 1; // 8 bits
- }
-
- private void showError(Exception ex)
- {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/Base.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/Base.java
deleted file mode 100644
index bb47e8823ec87c40aa8b0a2bcc1bcba5b9f6bbf2..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise;
-
-import edu.nps.moves.dis.jammers.JammerKind;
-
-abstract public class Base extends edu.nps.moves.dis.JammingTechnique
-{
- public Base()
- {
- setKind(JammerKind.DECEPTIONANDNOISE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/Category.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/Category.java
deleted file mode 100644
index ed8c72c08ef369f1cb12dec2d82b5e0a54a08b10..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/Category.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise;
-
-import java.nio.ByteBuffer;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import edu.nps.moves.dis.*;
-
-/* marshal size 8 bits*/
-public enum Category implements edu.nps.moves.dis.JammerCategory
-{
- ANGLEANDNOISE (5, "Angle and Noise"),
- ANGLEANDFMBYNOISE (10, "Angle and FM by Noise"),
- ANGLEANDPSEUDORANDOMAM (15, "Angle and Pseudorandom AM"),
- ANGLEANDSPOT (20, "Angle and Spot"),
- GATESTEALERANDNOISE (25, "Gate Stealer and Noise"),
- FALSETARGETDECEPTIONANDSWEPTNOISE (30, "False Target Deception and Swept Noise");
-
- private byte value;
- private final String description;
-
- Category(int value, String description)
- {
- this.value = (byte)value;
- this.description = description;
- }
-
- public byte getValue()
- {
- return value;
- }
-
- public String getDescription()
- {
- return description;
- }
-
- public static Category getEnumerationForValue(int i)
- {
- for(Category val: values()) {
- if(val.getValue()==i)
- return val;
- }
- System.err.println("No enumeration found for value " + i + " of enumeration Category");
- return null;
- }
-
- @Override
- public void marshal(DataOutputStream dos)
- {
- try {
- dos.writeByte(getValue());
- }
- catch(IOException ex) {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
- }
-
- @Override
- public int unmarshal(DataInputStream dis)
- {
- try {
- value = dis.readByte();
- }
- catch(IOException ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public void marshal(ByteBuffer buff)
- {
- try {
- buff.put(getValue());
- }
- catch(Exception ex) {
- showError(ex);
- }
- }
-
- @Override
- public int unmarshal(ByteBuffer buff)
- {
- try {
- value = buff.get();
- }
- catch(Exception ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public int getMarshalledSize()
- {
- return 1; // 8 bits
- }
-
- private void showError(Exception ex)
- {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/DeceptionandNoise.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/DeceptionandNoise.java
new file mode 100644
index 0000000000000000000000000000000000000000..98bcd5aedba1b3ee81d7e0ba81b23659ddd52a97
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/DeceptionandNoise.java
@@ -0,0 +1,17 @@
+package edu.nps.moves.dis.jammers.DeceptionandNoise;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class DeceptionandNoise extends JammingTechnique
+{
+ public DeceptionandNoise()
+ {
+ setKind((byte)3); // Deception and Noise
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/FalseTargetDeceptionandSweptNoise.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/FalseTargetDeceptionandSweptNoise.java
deleted file mode 100644
index d188ecfedfd95034a3397f5e49fab6e01ab8fe40..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/FalseTargetDeceptionandSweptNoise.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise;
-
-public class FalseTargetDeceptionandSweptNoise extends Base
-{
- public FalseTargetDeceptionandSweptNoise()
- {
- setCategory(Category.FALSETARGETDECEPTIONANDSWEPTNOISE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/FalseTargetDeceptionandSweptNoise/FalseTargetDeceptionandSweptNoise.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/FalseTargetDeceptionandSweptNoise/FalseTargetDeceptionandSweptNoise.java
new file mode 100644
index 0000000000000000000000000000000000000000..ddd95dbd51dd594f334a6ab8d0be61a3d07e4cf5
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/FalseTargetDeceptionandSweptNoise/FalseTargetDeceptionandSweptNoise.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.DeceptionandNoise.FalseTargetDeceptionandSweptNoise;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class FalseTargetDeceptionandSweptNoise extends JammingTechnique
+{
+ public FalseTargetDeceptionandSweptNoise()
+ {
+ setKind((byte)3); // Deception and Noise
+ setCategory((byte)30); // False Target Deception and Swept Noise
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/Base.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/Base.java
deleted file mode 100644
index 5358ab920f5bfc1a82f2a4303137f6501a15aaa8..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise.GateStealerandNoise;
-
-import edu.nps.moves.dis.jammers.DeceptionandNoise.Category;
-
-abstract public class Base extends edu.nps.moves.dis.jammers.DeceptionandNoise.Base
-{
- public Base()
- {
- setCategory(Category.GATESTEALERANDNOISE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/GateStealerandNoise.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/GateStealerandNoise.java
new file mode 100644
index 0000000000000000000000000000000000000000..9152cdfd81ba80f0da0c822fe1de8ebe21925d77
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/GateStealerandNoise.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.DeceptionandNoise.GateStealerandNoise;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class GateStealerandNoise extends JammingTechnique
+{
+ public GateStealerandNoise()
+ {
+ setKind((byte)3); // Deception and Noise
+ setCategory((byte)25); // Gate Stealer and Noise
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandRGPO/Base.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandRGPO/Base.java
deleted file mode 100644
index 06682522b019c0c385bfca11791d04af335cf635..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandRGPO/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise.GateStealerandNoise.NoiseandRGPO;
-
-import edu.nps.moves.dis.jammers.DeceptionandNoise.GateStealerandNoise.SubCategory;
-
-abstract public class Base extends edu.nps.moves.dis.jammers.DeceptionandNoise.GateStealerandNoise.Base
-{
- public Base()
- {
- setSubcategory(SubCategory.NOISEANDRGPO);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandRGPO/LowLevelNoiseandRGPO.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandRGPO/LowLevelNoiseandRGPO.java
deleted file mode 100644
index 9ba4e62499f226a87fc91bd882d6b54c89e3575a..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandRGPO/LowLevelNoiseandRGPO.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise.GateStealerandNoise.NoiseandRGPO;
-
-public class LowLevelNoiseandRGPO extends Base
-{
- public LowLevelNoiseandRGPO()
- {
- setSpecific(Specific.LOWLEVELNOISEANDRGPO);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandRGPO/LowLevelNoiseandRGPO/LowLevelNoiseandRGPO.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandRGPO/LowLevelNoiseandRGPO/LowLevelNoiseandRGPO.java
new file mode 100644
index 0000000000000000000000000000000000000000..84334e5f747c8f1edf5f7a125e3d9a615c0d889d
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandRGPO/LowLevelNoiseandRGPO/LowLevelNoiseandRGPO.java
@@ -0,0 +1,20 @@
+package edu.nps.moves.dis.jammers.DeceptionandNoise.GateStealerandNoise.NoiseandRGPO.LowLevelNoiseandRGPO;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class LowLevelNoiseandRGPO extends JammingTechnique
+{
+ public LowLevelNoiseandRGPO()
+ {
+ setKind((byte)3); // Deception and Noise
+ setCategory((byte)25); // Gate Stealer and Noise
+ setSubCategory((byte)5); // Noise and RGPO
+ setSpecific((byte)5); // Low Level Noise and RGPO
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandRGPO/NoiseandRGPO.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandRGPO/NoiseandRGPO.java
new file mode 100644
index 0000000000000000000000000000000000000000..331d25cad727788fef93a0332bc8bde31057f822
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandRGPO/NoiseandRGPO.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.DeceptionandNoise.GateStealerandNoise.NoiseandRGPO;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class NoiseandRGPO extends JammingTechnique
+{
+ public NoiseandRGPO()
+ {
+ setKind((byte)3); // Deception and Noise
+ setCategory((byte)25); // Gate Stealer and Noise
+ setSubCategory((byte)5); // Noise and RGPO
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandRGPO/Specific.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandRGPO/Specific.java
deleted file mode 100644
index 72c359c6de6973390c4bd4072fb197203ebb3358..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandRGPO/Specific.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise.GateStealerandNoise.NoiseandRGPO;
-
-import java.nio.ByteBuffer;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import edu.nps.moves.dis.*;
-
-/* marshal size 8 bits*/
-public enum Specific implements edu.nps.moves.dis.JammerSpecific
-{
- LOWLEVELNOISEANDRGPO (5, "Low Level Noise and RGPO");
-
- private byte value;
- private final String description;
-
- Specific(int value, String description)
- {
- this.value = (byte)value;
- this.description = description;
- }
-
- public byte getValue()
- {
- return value;
- }
-
- public String getDescription()
- {
- return description;
- }
-
- public static Specific getEnumerationForValue(int i)
- {
- for(Specific val: values()) {
- if(val.getValue()==i)
- return val;
- }
- System.err.println("No enumeration found for value " + i + " of enumeration Specific");
- return null;
- }
-
- @Override
- public void marshal(DataOutputStream dos)
- {
- try {
- dos.writeByte(getValue());
- }
- catch(IOException ex) {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
- }
-
- @Override
- public int unmarshal(DataInputStream dis)
- {
- try {
- value = dis.readByte();
- }
- catch(IOException ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public void marshal(ByteBuffer buff)
- {
- try {
- buff.put(getValue());
- }
- catch(Exception ex) {
- showError(ex);
- }
- }
-
- @Override
- public int unmarshal(ByteBuffer buff)
- {
- try {
- value = buff.get();
- }
- catch(Exception ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public int getMarshalledSize()
- {
- return 1; // 8 bits
- }
-
- private void showError(Exception ex)
- {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandVGPO/Base.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandVGPO/Base.java
deleted file mode 100644
index e052d31e5dc36ffe4fe539d69fd023dc06e37b3c..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandVGPO/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise.GateStealerandNoise.NoiseandVGPO;
-
-import edu.nps.moves.dis.jammers.DeceptionandNoise.GateStealerandNoise.SubCategory;
-
-abstract public class Base extends edu.nps.moves.dis.jammers.DeceptionandNoise.GateStealerandNoise.Base
-{
- public Base()
- {
- setSubcategory(SubCategory.NOISEANDVGPO);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandVGPO/LowLevelNoiseandVGPO.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandVGPO/LowLevelNoiseandVGPO.java
deleted file mode 100644
index 0a8f5965e482dcd1c68509b94a1872a553d2c079..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandVGPO/LowLevelNoiseandVGPO.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise.GateStealerandNoise.NoiseandVGPO;
-
-public class LowLevelNoiseandVGPO extends Base
-{
- public LowLevelNoiseandVGPO()
- {
- setSpecific(Specific.LOWLEVELNOISEANDVGPO);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandVGPO/LowLevelNoiseandVGPO/LowLevelNoiseandVGPO.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandVGPO/LowLevelNoiseandVGPO/LowLevelNoiseandVGPO.java
new file mode 100644
index 0000000000000000000000000000000000000000..cdee6dab65bb9e0740e9ba259dcaa2682c6c8d41
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandVGPO/LowLevelNoiseandVGPO/LowLevelNoiseandVGPO.java
@@ -0,0 +1,20 @@
+package edu.nps.moves.dis.jammers.DeceptionandNoise.GateStealerandNoise.NoiseandVGPO.LowLevelNoiseandVGPO;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class LowLevelNoiseandVGPO extends JammingTechnique
+{
+ public LowLevelNoiseandVGPO()
+ {
+ setKind((byte)3); // Deception and Noise
+ setCategory((byte)25); // Gate Stealer and Noise
+ setSubCategory((byte)10); // Noise and VGPO
+ setSpecific((byte)5); // Low Level Noise and VGPO
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandVGPO/NoiseandVGPO.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandVGPO/NoiseandVGPO.java
new file mode 100644
index 0000000000000000000000000000000000000000..547889267951474cd1b1cd3a56d3ffe8d5eab836
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandVGPO/NoiseandVGPO.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.DeceptionandNoise.GateStealerandNoise.NoiseandVGPO;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class NoiseandVGPO extends JammingTechnique
+{
+ public NoiseandVGPO()
+ {
+ setKind((byte)3); // Deception and Noise
+ setCategory((byte)25); // Gate Stealer and Noise
+ setSubCategory((byte)10); // Noise and VGPO
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandVGPO/Specific.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandVGPO/Specific.java
deleted file mode 100644
index 1dbdab7e344df083b1d3ad8ef12ad14974cf921a..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/NoiseandVGPO/Specific.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise.GateStealerandNoise.NoiseandVGPO;
-
-import java.nio.ByteBuffer;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import edu.nps.moves.dis.*;
-
-/* marshal size 8 bits*/
-public enum Specific implements edu.nps.moves.dis.JammerSpecific
-{
- LOWLEVELNOISEANDVGPO (5, "Low Level Noise and VGPO");
-
- private byte value;
- private final String description;
-
- Specific(int value, String description)
- {
- this.value = (byte)value;
- this.description = description;
- }
-
- public byte getValue()
- {
- return value;
- }
-
- public String getDescription()
- {
- return description;
- }
-
- public static Specific getEnumerationForValue(int i)
- {
- for(Specific val: values()) {
- if(val.getValue()==i)
- return val;
- }
- System.err.println("No enumeration found for value " + i + " of enumeration Specific");
- return null;
- }
-
- @Override
- public void marshal(DataOutputStream dos)
- {
- try {
- dos.writeByte(getValue());
- }
- catch(IOException ex) {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
- }
-
- @Override
- public int unmarshal(DataInputStream dis)
- {
- try {
- value = dis.readByte();
- }
- catch(IOException ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public void marshal(ByteBuffer buff)
- {
- try {
- buff.put(getValue());
- }
- catch(Exception ex) {
- showError(ex);
- }
- }
-
- @Override
- public int unmarshal(ByteBuffer buff)
- {
- try {
- value = buff.get();
- }
- catch(Exception ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public int getMarshalledSize()
- {
- return 1; // 8 bits
- }
-
- private void showError(Exception ex)
- {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/SubCategory.java b/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/SubCategory.java
deleted file mode 100644
index 25da9048835c2942e5fd8b7c6ad7af3ea75b1cd6..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/DeceptionandNoise/GateStealerandNoise/SubCategory.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package edu.nps.moves.dis.jammers.DeceptionandNoise.GateStealerandNoise;
-
-import java.nio.ByteBuffer;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import edu.nps.moves.dis.*;
-
-/* marshal size 8 bits*/
-public enum SubCategory implements edu.nps.moves.dis.JammerSubCategory
-{
- NOISEANDRGPO (5, "Noise and RGPO"),
- NOISEANDVGPO (10, "Noise and VGPO");
-
- private byte value;
- private final String description;
-
- SubCategory(int value, String description)
- {
- this.value = (byte)value;
- this.description = description;
- }
-
- public byte getValue()
- {
- return value;
- }
-
- public String getDescription()
- {
- return description;
- }
-
- public static SubCategory getEnumerationForValue(int i)
- {
- for(SubCategory val: values()) {
- if(val.getValue()==i)
- return val;
- }
- System.err.println("No enumeration found for value " + i + " of enumeration SubCategory");
- return null;
- }
-
- @Override
- public void marshal(DataOutputStream dos)
- {
- try {
- dos.writeByte(getValue());
- }
- catch(IOException ex) {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
- }
-
- @Override
- public int unmarshal(DataInputStream dis)
- {
- try {
- value = dis.readByte();
- }
- catch(IOException ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public void marshal(ByteBuffer buff)
- {
- try {
- buff.put(getValue());
- }
- catch(Exception ex) {
- showError(ex);
- }
- }
-
- @Override
- public int unmarshal(ByteBuffer buff)
- {
- try {
- value = buff.get();
- }
- catch(Exception ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public int getMarshalledSize()
- {
- return 1; // 8 bits
- }
-
- private void showError(Exception ex)
- {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/JammerKind.java b/src-generated/edu/nps/moves/dis/jammers/JammerKind.java
deleted file mode 100644
index 66451b94d6f6901396329107030d7652b32095d7..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/JammerKind.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package edu.nps.moves.dis.jammers;
-
-import java.nio.ByteBuffer;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import edu.nps.moves.dis.*;
-
-/* marshal size 8 bits*/
-public enum JammerKind implements edu.nps.moves.dis.JammerKind
-{
- NOISE (1, "Noise"),
- DECEPTION (2, "Deception"),
- DECEPTIONANDNOISE (3, "Deception and Noise"),
- SPECIAL (4, "Special");
-
- private byte value;
- private final String description;
-
- JammerKind(int value, String description)
- {
- this.value = (byte)value;
- this.description = description;
- }
-
- public byte getValue()
- {
- return value;
- }
-
- public String getDescription()
- {
- return description;
- }
-
- public static JammerKind getEnumerationForValue(int i)
- {
- for(JammerKind val: values()) {
- if(val.getValue()==i)
- return val;
- }
- System.err.println("No enumeration found for value " + i + " of enumeration JammerKind");
- return null;
- }
-
- @Override
- public void marshal(DataOutputStream dos)
- {
- try {
- dos.writeByte(getValue());
- }
- catch(IOException ex) {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
- }
-
- @Override
- public int unmarshal(DataInputStream dis)
- {
- try {
- value = dis.readByte();
- }
- catch(IOException ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public void marshal(ByteBuffer buff)
- {
- try {
- buff.put(getValue());
- }
- catch(Exception ex) {
- showError(ex);
- }
- }
-
- @Override
- public int unmarshal(ByteBuffer buff)
- {
- try {
- value = buff.get();
- }
- catch(Exception ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public int getMarshalledSize()
- {
- return 1; // 8 bits
- }
-
- private void showError(Exception ex)
- {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/AmplitudeModulationAMNoise.java b/src-generated/edu/nps/moves/dis/jammers/Noise/AmplitudeModulationAMNoise.java
deleted file mode 100644
index c3e1898f3623ad1d8114d427681e96a438773924..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/AmplitudeModulationAMNoise.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Noise;
-
-public class AmplitudeModulationAMNoise extends Base
-{
- public AmplitudeModulationAMNoise()
- {
- setCategory(Category.AMPLITUDEMODULATIONAMNOISE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/AmplitudeModulationAMNoise/AmplitudeModulationAMNoise.java b/src-generated/edu/nps/moves/dis/jammers/Noise/AmplitudeModulationAMNoise/AmplitudeModulationAMNoise.java
new file mode 100644
index 0000000000000000000000000000000000000000..5c1d6177b2d9580e0a5f5f75d6699e66f218036c
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Noise/AmplitudeModulationAMNoise/AmplitudeModulationAMNoise.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.Noise.AmplitudeModulationAMNoise;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class AmplitudeModulationAMNoise extends JammingTechnique
+{
+ public AmplitudeModulationAMNoise()
+ {
+ setKind((byte)1); // Noise
+ setCategory((byte)5); // Amplitude Modulation (AM) Noise
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/BarrageNoise/BarrageNoise.java b/src-generated/edu/nps/moves/dis/jammers/Noise/BarrageNoise/BarrageNoise.java
new file mode 100644
index 0000000000000000000000000000000000000000..c525a0ee5682a4f7054b831b65747018b0fecd01
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Noise/BarrageNoise/BarrageNoise.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.Noise.BarrageNoise;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class BarrageNoise extends JammingTechnique
+{
+ public BarrageNoise()
+ {
+ setKind((byte)1); // Noise
+ setCategory((byte)10); // Barrage Noise
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/BarrageNoise/Base.java b/src-generated/edu/nps/moves/dis/jammers/Noise/BarrageNoise/Base.java
deleted file mode 100644
index baec1f986b7a383f11037ae361546a2497c7b936..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/BarrageNoise/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.jammers.Noise.BarrageNoise;
-
-import edu.nps.moves.dis.jammers.Noise.Category;
-
-abstract public class Base extends edu.nps.moves.dis.jammers.Noise.Base
-{
- public Base()
- {
- setCategory(Category.BARRAGENOISE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/BarrageNoise/Click.java b/src-generated/edu/nps/moves/dis/jammers/Noise/BarrageNoise/Click.java
deleted file mode 100644
index 5375aebe3d031234df42f155bdd56d913a070f5c..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/BarrageNoise/Click.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Noise.BarrageNoise;
-
-public class Click extends Base
-{
- public Click()
- {
- setSubcategory(SubCategory.CLICK);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/BarrageNoise/Click/Click.java b/src-generated/edu/nps/moves/dis/jammers/Noise/BarrageNoise/Click/Click.java
new file mode 100644
index 0000000000000000000000000000000000000000..8c5b8fc106a5219fa4fcab61a53d633b3fc02d88
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Noise/BarrageNoise/Click/Click.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Noise.BarrageNoise.Click;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class Click extends JammingTechnique
+{
+ public Click()
+ {
+ setKind((byte)1); // Noise
+ setCategory((byte)10); // Barrage Noise
+ setSubCategory((byte)5); // Click
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/BarrageNoise/SourceNoise.java b/src-generated/edu/nps/moves/dis/jammers/Noise/BarrageNoise/SourceNoise.java
deleted file mode 100644
index 04a33782bc61d49a35d45312febeef663a6ce68f..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/BarrageNoise/SourceNoise.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Noise.BarrageNoise;
-
-public class SourceNoise extends Base
-{
- public SourceNoise()
- {
- setSubcategory(SubCategory.SOURCENOISE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/BarrageNoise/SourceNoise/SourceNoise.java b/src-generated/edu/nps/moves/dis/jammers/Noise/BarrageNoise/SourceNoise/SourceNoise.java
new file mode 100644
index 0000000000000000000000000000000000000000..b48faf53829f24a2f383100b37561e5887afe9ff
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Noise/BarrageNoise/SourceNoise/SourceNoise.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Noise.BarrageNoise.SourceNoise;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class SourceNoise extends JammingTechnique
+{
+ public SourceNoise()
+ {
+ setKind((byte)1); // Noise
+ setCategory((byte)10); // Barrage Noise
+ setSubCategory((byte)10); // Source Noise
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/BarrageNoise/SubCategory.java b/src-generated/edu/nps/moves/dis/jammers/Noise/BarrageNoise/SubCategory.java
deleted file mode 100644
index 6a2f9df243f58f78b331e4401ec5f87d0260ccc9..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/BarrageNoise/SubCategory.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package edu.nps.moves.dis.jammers.Noise.BarrageNoise;
-
-import java.nio.ByteBuffer;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import edu.nps.moves.dis.*;
-
-/* marshal size 8 bits*/
-public enum SubCategory implements edu.nps.moves.dis.JammerSubCategory
-{
- CLICK (5, "Click"),
- SOURCENOISE (10, "Source Noise");
-
- private byte value;
- private final String description;
-
- SubCategory(int value, String description)
- {
- this.value = (byte)value;
- this.description = description;
- }
-
- public byte getValue()
- {
- return value;
- }
-
- public String getDescription()
- {
- return description;
- }
-
- public static SubCategory getEnumerationForValue(int i)
- {
- for(SubCategory val: values()) {
- if(val.getValue()==i)
- return val;
- }
- System.err.println("No enumeration found for value " + i + " of enumeration SubCategory");
- return null;
- }
-
- @Override
- public void marshal(DataOutputStream dos)
- {
- try {
- dos.writeByte(getValue());
- }
- catch(IOException ex) {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
- }
-
- @Override
- public int unmarshal(DataInputStream dis)
- {
- try {
- value = dis.readByte();
- }
- catch(IOException ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public void marshal(ByteBuffer buff)
- {
- try {
- buff.put(getValue());
- }
- catch(Exception ex) {
- showError(ex);
- }
- }
-
- @Override
- public int unmarshal(ByteBuffer buff)
- {
- try {
- value = buff.get();
- }
- catch(Exception ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public int getMarshalledSize()
- {
- return 1; // 8 bits
- }
-
- private void showError(Exception ex)
- {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/Base.java b/src-generated/edu/nps/moves/dis/jammers/Noise/Base.java
deleted file mode 100644
index c9e9701c044fcd12f66d4b074a7d2ed59f190271..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.jammers.Noise;
-
-import edu.nps.moves.dis.jammers.JammerKind;
-
-abstract public class Base extends edu.nps.moves.dis.JammingTechnique
-{
- public Base()
- {
- setKind(JammerKind.NOISE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/BistaticClutter.java b/src-generated/edu/nps/moves/dis/jammers/Noise/BistaticClutter.java
deleted file mode 100644
index 28d1e8b8f9142dc81ac718e4b5da7ff0d6ccb9c4..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/BistaticClutter.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Noise;
-
-public class BistaticClutter extends Base
-{
- public BistaticClutter()
- {
- setCategory(Category.BISTATICCLUTTER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/BistaticClutter/BistaticClutter.java b/src-generated/edu/nps/moves/dis/jammers/Noise/BistaticClutter/BistaticClutter.java
new file mode 100644
index 0000000000000000000000000000000000000000..2b81937d20776072531b2c902e5b8f103bbcebfc
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Noise/BistaticClutter/BistaticClutter.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.Noise.BistaticClutter;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class BistaticClutter extends JammingTechnique
+{
+ public BistaticClutter()
+ {
+ setKind((byte)1); // Noise
+ setCategory((byte)15); // Bistatic Clutter
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/Category.java b/src-generated/edu/nps/moves/dis/jammers/Noise/Category.java
deleted file mode 100644
index 451b6c8b56354efbbfd06d0712c80ad28803e3fa..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/Category.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package edu.nps.moves.dis.jammers.Noise;
-
-import java.nio.ByteBuffer;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import edu.nps.moves.dis.*;
-
-/* marshal size 8 bits*/
-public enum Category implements edu.nps.moves.dis.JammerCategory
-{
- AMPLITUDEMODULATIONAMNOISE (5, "Amplitude Modulation (AM) Noise"),
- BARRAGENOISE (10, "Barrage Noise"),
- BISTATICCLUTTER (15, "Bistatic Clutter"),
- COMB (20, "Comb"),
- COOPERATIVEBLINKEDNOISECBN (25, "Cooperative Blinked Noise (CBN)"),
- DOPPLERNOISE (30, "Doppler Noise"),
- FREQUENCYMODULATIONFMBYNOISE (35, "Frequency Modulation (FM) by Noise"),
- IMPULSENOISE (40, "Impulse Noise"),
- PARTIALBAND (45, "Partial Band"),
- PSEUDORANDOMAM (50, "Pseudorandom AM"),
- PULSENOISE (55, "Pulse Noise"),
- QUASI_NOISEAKAPSEUDORANDOM (60, "Quasi-Noise (aka Pseudorandom)"),
- RANGEBINMASKINGRBMAKACOVERPULSE (65, "Range Bin Masking (RBM) (aka Cover Pulse)"),
- REPEATERNOISE (70, "Repeater Noise"),
- SPOTNOISE (75, "Spot Noise"),
- SWEPTNOISEAKASWEPTSPOTNOISE_SWEEP (80, "Swept Noise (aka Swept Spot Noise, Sweep)"),
- VELOCITYBINMASKINGVBM (85, "Velocity Bin Masking (VBM)");
-
- private byte value;
- private final String description;
-
- Category(int value, String description)
- {
- this.value = (byte)value;
- this.description = description;
- }
-
- public byte getValue()
- {
- return value;
- }
-
- public String getDescription()
- {
- return description;
- }
-
- public static Category getEnumerationForValue(int i)
- {
- for(Category val: values()) {
- if(val.getValue()==i)
- return val;
- }
- System.err.println("No enumeration found for value " + i + " of enumeration Category");
- return null;
- }
-
- @Override
- public void marshal(DataOutputStream dos)
- {
- try {
- dos.writeByte(getValue());
- }
- catch(IOException ex) {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
- }
-
- @Override
- public int unmarshal(DataInputStream dis)
- {
- try {
- value = dis.readByte();
- }
- catch(IOException ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public void marshal(ByteBuffer buff)
- {
- try {
- buff.put(getValue());
- }
- catch(Exception ex) {
- showError(ex);
- }
- }
-
- @Override
- public int unmarshal(ByteBuffer buff)
- {
- try {
- value = buff.get();
- }
- catch(Exception ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public int getMarshalledSize()
- {
- return 1; // 8 bits
- }
-
- private void showError(Exception ex)
- {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/Comb.java b/src-generated/edu/nps/moves/dis/jammers/Noise/Comb.java
deleted file mode 100644
index bd51c106338856e4c9abeecb1de7b8e50884949f..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/Comb.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Noise;
-
-public class Comb extends Base
-{
- public Comb()
- {
- setCategory(Category.COMB);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/Comb/Comb.java b/src-generated/edu/nps/moves/dis/jammers/Noise/Comb/Comb.java
new file mode 100644
index 0000000000000000000000000000000000000000..34a3b62ed99c006296ff7ce6d84acd6d0be77f80
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Noise/Comb/Comb.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.Noise.Comb;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class Comb extends JammingTechnique
+{
+ public Comb()
+ {
+ setKind((byte)1); // Noise
+ setCategory((byte)20); // Comb
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/CooperativeBlinkedNoiseCBN.java b/src-generated/edu/nps/moves/dis/jammers/Noise/CooperativeBlinkedNoiseCBN.java
deleted file mode 100644
index 5850b075d8935ec2d643d27351673bf5ff8589bc..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/CooperativeBlinkedNoiseCBN.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Noise;
-
-public class CooperativeBlinkedNoiseCBN extends Base
-{
- public CooperativeBlinkedNoiseCBN()
- {
- setCategory(Category.COOPERATIVEBLINKEDNOISECBN);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/CooperativeBlinkedNoiseCBN/CooperativeBlinkedNoiseCBN.java b/src-generated/edu/nps/moves/dis/jammers/Noise/CooperativeBlinkedNoiseCBN/CooperativeBlinkedNoiseCBN.java
new file mode 100644
index 0000000000000000000000000000000000000000..0e9987278b6aa9e60f3534013e8512e895e4443c
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Noise/CooperativeBlinkedNoiseCBN/CooperativeBlinkedNoiseCBN.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.Noise.CooperativeBlinkedNoiseCBN;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class CooperativeBlinkedNoiseCBN extends JammingTechnique
+{
+ public CooperativeBlinkedNoiseCBN()
+ {
+ setKind((byte)1); // Noise
+ setCategory((byte)25); // Cooperative Blinked Noise (CBN)
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/DopplerNoise.java b/src-generated/edu/nps/moves/dis/jammers/Noise/DopplerNoise.java
deleted file mode 100644
index 66952cae959de30e511f8ce14a0ec40ac8c759fc..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/DopplerNoise.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Noise;
-
-public class DopplerNoise extends Base
-{
- public DopplerNoise()
- {
- setCategory(Category.DOPPLERNOISE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/DopplerNoise/DopplerNoise.java b/src-generated/edu/nps/moves/dis/jammers/Noise/DopplerNoise/DopplerNoise.java
new file mode 100644
index 0000000000000000000000000000000000000000..b794241add1b8911c3783809fff6a5172e2d3e4d
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Noise/DopplerNoise/DopplerNoise.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.Noise.DopplerNoise;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class DopplerNoise extends JammingTechnique
+{
+ public DopplerNoise()
+ {
+ setKind((byte)1); // Noise
+ setCategory((byte)30); // Doppler Noise
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/FrequencyModulationFMbyNoise.java b/src-generated/edu/nps/moves/dis/jammers/Noise/FrequencyModulationFMbyNoise.java
deleted file mode 100644
index 65d3dd70b090c87359fe683ff6f8392998f9ed32..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/FrequencyModulationFMbyNoise.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Noise;
-
-public class FrequencyModulationFMbyNoise extends Base
-{
- public FrequencyModulationFMbyNoise()
- {
- setCategory(Category.FREQUENCYMODULATIONFMBYNOISE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/FrequencyModulationFMbyNoise/FrequencyModulationFMbyNoise.java b/src-generated/edu/nps/moves/dis/jammers/Noise/FrequencyModulationFMbyNoise/FrequencyModulationFMbyNoise.java
new file mode 100644
index 0000000000000000000000000000000000000000..52c64d749e6e25e5a9cb66c966236646e2a629fa
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Noise/FrequencyModulationFMbyNoise/FrequencyModulationFMbyNoise.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.Noise.FrequencyModulationFMbyNoise;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class FrequencyModulationFMbyNoise extends JammingTechnique
+{
+ public FrequencyModulationFMbyNoise()
+ {
+ setKind((byte)1); // Noise
+ setCategory((byte)35); // Frequency Modulation (FM) by Noise
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/ImpulseNoise.java b/src-generated/edu/nps/moves/dis/jammers/Noise/ImpulseNoise.java
deleted file mode 100644
index b674209da49a15591e5bce3e8ef9a546e24bdfc5..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/ImpulseNoise.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Noise;
-
-public class ImpulseNoise extends Base
-{
- public ImpulseNoise()
- {
- setCategory(Category.IMPULSENOISE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/ImpulseNoise/ImpulseNoise.java b/src-generated/edu/nps/moves/dis/jammers/Noise/ImpulseNoise/ImpulseNoise.java
new file mode 100644
index 0000000000000000000000000000000000000000..2b61cf8256185e9abbdfec0b06a8f84f51b7b56c
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Noise/ImpulseNoise/ImpulseNoise.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.Noise.ImpulseNoise;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class ImpulseNoise extends JammingTechnique
+{
+ public ImpulseNoise()
+ {
+ setKind((byte)1); // Noise
+ setCategory((byte)40); // Impulse Noise
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/Noise.java b/src-generated/edu/nps/moves/dis/jammers/Noise/Noise.java
new file mode 100644
index 0000000000000000000000000000000000000000..f041225e0fba3f67a4fe5adc2657b6196a6dde1b
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Noise/Noise.java
@@ -0,0 +1,17 @@
+package edu.nps.moves.dis.jammers.Noise;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class Noise extends JammingTechnique
+{
+ public Noise()
+ {
+ setKind((byte)1); // Noise
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/PartialBand.java b/src-generated/edu/nps/moves/dis/jammers/Noise/PartialBand.java
deleted file mode 100644
index 876cb37d0d2c2f0ad23de9d24e58009229dd42a3..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/PartialBand.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Noise;
-
-public class PartialBand extends Base
-{
- public PartialBand()
- {
- setCategory(Category.PARTIALBAND);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/PartialBand/PartialBand.java b/src-generated/edu/nps/moves/dis/jammers/Noise/PartialBand/PartialBand.java
new file mode 100644
index 0000000000000000000000000000000000000000..e12ff5f60bbf556a93f257dd16d8d33fc45cc575
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Noise/PartialBand/PartialBand.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.Noise.PartialBand;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class PartialBand extends JammingTechnique
+{
+ public PartialBand()
+ {
+ setKind((byte)1); // Noise
+ setCategory((byte)45); // Partial Band
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/PseudorandomAM.java b/src-generated/edu/nps/moves/dis/jammers/Noise/PseudorandomAM.java
deleted file mode 100644
index a8606cb3f38bb7b0bee134d3f6bf9c1df1ada36a..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/PseudorandomAM.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Noise;
-
-public class PseudorandomAM extends Base
-{
- public PseudorandomAM()
- {
- setCategory(Category.PSEUDORANDOMAM);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/PseudorandomAM/PseudorandomAM.java b/src-generated/edu/nps/moves/dis/jammers/Noise/PseudorandomAM/PseudorandomAM.java
new file mode 100644
index 0000000000000000000000000000000000000000..872c31d8a44dce7d2502b760697b8352b3393299
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Noise/PseudorandomAM/PseudorandomAM.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.Noise.PseudorandomAM;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class PseudorandomAM extends JammingTechnique
+{
+ public PseudorandomAM()
+ {
+ setKind((byte)1); // Noise
+ setCategory((byte)50); // Pseudorandom AM
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/PulseNoise.java b/src-generated/edu/nps/moves/dis/jammers/Noise/PulseNoise.java
deleted file mode 100644
index c033a3f8973d793c8a51374fedd433e1c8c89058..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/PulseNoise.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Noise;
-
-public class PulseNoise extends Base
-{
- public PulseNoise()
- {
- setCategory(Category.PULSENOISE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/PulseNoise/PulseNoise.java b/src-generated/edu/nps/moves/dis/jammers/Noise/PulseNoise/PulseNoise.java
new file mode 100644
index 0000000000000000000000000000000000000000..2f402f92d4f136858b2aa54c51d3cdb483f84b87
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Noise/PulseNoise/PulseNoise.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.Noise.PulseNoise;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class PulseNoise extends JammingTechnique
+{
+ public PulseNoise()
+ {
+ setKind((byte)1); // Noise
+ setCategory((byte)55); // Pulse Noise
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/Quasi_NoiseakaPseudorandom.java b/src-generated/edu/nps/moves/dis/jammers/Noise/Quasi_NoiseakaPseudorandom.java
deleted file mode 100644
index 25edcec4ef5c76a85c46d7c9bf2005453d032e35..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/Quasi_NoiseakaPseudorandom.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Noise;
-
-public class Quasi_NoiseakaPseudorandom extends Base
-{
- public Quasi_NoiseakaPseudorandom()
- {
- setCategory(Category.QUASI_NOISEAKAPSEUDORANDOM);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/Quasi_NoiseakaPseudorandom/Quasi_NoiseakaPseudorandom.java b/src-generated/edu/nps/moves/dis/jammers/Noise/Quasi_NoiseakaPseudorandom/Quasi_NoiseakaPseudorandom.java
new file mode 100644
index 0000000000000000000000000000000000000000..30c4418aa206fa2741fe460260bd3c3d19ea7abe
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Noise/Quasi_NoiseakaPseudorandom/Quasi_NoiseakaPseudorandom.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.Noise.Quasi_NoiseakaPseudorandom;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class Quasi_NoiseakaPseudorandom extends JammingTechnique
+{
+ public Quasi_NoiseakaPseudorandom()
+ {
+ setKind((byte)1); // Noise
+ setCategory((byte)60); // Quasi-Noise (aka Pseudorandom)
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/RangeBinMaskingRBMakaCoverPulse/Base.java b/src-generated/edu/nps/moves/dis/jammers/Noise/RangeBinMaskingRBMakaCoverPulse/Base.java
deleted file mode 100644
index 0bfa64445d0660bdc8ad7129256856fb1009be59..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/RangeBinMaskingRBMakaCoverPulse/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.jammers.Noise.RangeBinMaskingRBMakaCoverPulse;
-
-import edu.nps.moves.dis.jammers.Noise.Category;
-
-abstract public class Base extends edu.nps.moves.dis.jammers.Noise.Base
-{
- public Base()
- {
- setCategory(Category.RANGEBINMASKINGRBMAKACOVERPULSE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/RangeBinMaskingRBMakaCoverPulse/RangeBinMaskingRBMakaCoverPulse.java b/src-generated/edu/nps/moves/dis/jammers/Noise/RangeBinMaskingRBMakaCoverPulse/RangeBinMaskingRBMakaCoverPulse.java
new file mode 100644
index 0000000000000000000000000000000000000000..f1a30ae04ad6c9b58b5dc17cb3f66f86c273f859
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Noise/RangeBinMaskingRBMakaCoverPulse/RangeBinMaskingRBMakaCoverPulse.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.Noise.RangeBinMaskingRBMakaCoverPulse;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class RangeBinMaskingRBMakaCoverPulse extends JammingTechnique
+{
+ public RangeBinMaskingRBMakaCoverPulse()
+ {
+ setKind((byte)1); // Noise
+ setCategory((byte)65); // Range Bin Masking (RBM) (aka Cover Pulse)
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/RangeBinMaskingRBMakaCoverPulse/RangeBinMaskingwithVelocityBinMasking.java b/src-generated/edu/nps/moves/dis/jammers/Noise/RangeBinMaskingRBMakaCoverPulse/RangeBinMaskingwithVelocityBinMasking.java
deleted file mode 100644
index 2aae9f26b537c12846fd01ee6ffd88346f234304..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/RangeBinMaskingRBMakaCoverPulse/RangeBinMaskingwithVelocityBinMasking.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Noise.RangeBinMaskingRBMakaCoverPulse;
-
-public class RangeBinMaskingwithVelocityBinMasking extends Base
-{
- public RangeBinMaskingwithVelocityBinMasking()
- {
- setSubcategory(SubCategory.RANGEBINMASKINGWITHVELOCITYBINMASKING);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/RangeBinMaskingRBMakaCoverPulse/RangeBinMaskingwithVelocityBinMasking/RangeBinMaskingwithVelocityBinMasking.java b/src-generated/edu/nps/moves/dis/jammers/Noise/RangeBinMaskingRBMakaCoverPulse/RangeBinMaskingwithVelocityBinMasking/RangeBinMaskingwithVelocityBinMasking.java
new file mode 100644
index 0000000000000000000000000000000000000000..10658139ed34cccd512b125551f5eada428c854c
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Noise/RangeBinMaskingRBMakaCoverPulse/RangeBinMaskingwithVelocityBinMasking/RangeBinMaskingwithVelocityBinMasking.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Noise.RangeBinMaskingRBMakaCoverPulse.RangeBinMaskingwithVelocityBinMasking;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class RangeBinMaskingwithVelocityBinMasking extends JammingTechnique
+{
+ public RangeBinMaskingwithVelocityBinMasking()
+ {
+ setKind((byte)1); // Noise
+ setCategory((byte)65); // Range Bin Masking (RBM) (aka Cover Pulse)
+ setSubCategory((byte)5); // Range Bin Masking with Velocity Bin Masking
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/RangeBinMaskingRBMakaCoverPulse/SubCategory.java b/src-generated/edu/nps/moves/dis/jammers/Noise/RangeBinMaskingRBMakaCoverPulse/SubCategory.java
deleted file mode 100644
index 04756730233c4ea1b4e58467a0e2ad0d39fbf4ba..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/RangeBinMaskingRBMakaCoverPulse/SubCategory.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package edu.nps.moves.dis.jammers.Noise.RangeBinMaskingRBMakaCoverPulse;
-
-import java.nio.ByteBuffer;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import edu.nps.moves.dis.*;
-
-/* marshal size 8 bits*/
-public enum SubCategory implements edu.nps.moves.dis.JammerSubCategory
-{
- RANGEBINMASKINGWITHVELOCITYBINMASKING (5, "Range Bin Masking with Velocity Bin Masking");
-
- private byte value;
- private final String description;
-
- SubCategory(int value, String description)
- {
- this.value = (byte)value;
- this.description = description;
- }
-
- public byte getValue()
- {
- return value;
- }
-
- public String getDescription()
- {
- return description;
- }
-
- public static SubCategory getEnumerationForValue(int i)
- {
- for(SubCategory val: values()) {
- if(val.getValue()==i)
- return val;
- }
- System.err.println("No enumeration found for value " + i + " of enumeration SubCategory");
- return null;
- }
-
- @Override
- public void marshal(DataOutputStream dos)
- {
- try {
- dos.writeByte(getValue());
- }
- catch(IOException ex) {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
- }
-
- @Override
- public int unmarshal(DataInputStream dis)
- {
- try {
- value = dis.readByte();
- }
- catch(IOException ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public void marshal(ByteBuffer buff)
- {
- try {
- buff.put(getValue());
- }
- catch(Exception ex) {
- showError(ex);
- }
- }
-
- @Override
- public int unmarshal(ByteBuffer buff)
- {
- try {
- value = buff.get();
- }
- catch(Exception ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public int getMarshalledSize()
- {
- return 1; // 8 bits
- }
-
- private void showError(Exception ex)
- {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/RepeaterNoise/Base.java b/src-generated/edu/nps/moves/dis/jammers/Noise/RepeaterNoise/Base.java
deleted file mode 100644
index 150c5da6a84dc4edad807a87c09714ffc7dffca6..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/RepeaterNoise/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.jammers.Noise.RepeaterNoise;
-
-import edu.nps.moves.dis.jammers.Noise.Category;
-
-abstract public class Base extends edu.nps.moves.dis.jammers.Noise.Base
-{
- public Base()
- {
- setCategory(Category.REPEATERNOISE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/RepeaterNoise/NarrowbandRepeaterNoise.java b/src-generated/edu/nps/moves/dis/jammers/Noise/RepeaterNoise/NarrowbandRepeaterNoise.java
deleted file mode 100644
index df136b1c7017add453dfafc2f60cec87a2830689..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/RepeaterNoise/NarrowbandRepeaterNoise.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Noise.RepeaterNoise;
-
-public class NarrowbandRepeaterNoise extends Base
-{
- public NarrowbandRepeaterNoise()
- {
- setSubcategory(SubCategory.NARROWBANDREPEATERNOISE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/RepeaterNoise/NarrowbandRepeaterNoise/NarrowbandRepeaterNoise.java b/src-generated/edu/nps/moves/dis/jammers/Noise/RepeaterNoise/NarrowbandRepeaterNoise/NarrowbandRepeaterNoise.java
new file mode 100644
index 0000000000000000000000000000000000000000..c01913ca3b89d715e3f44c95269b0f88b6e96df0
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Noise/RepeaterNoise/NarrowbandRepeaterNoise/NarrowbandRepeaterNoise.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Noise.RepeaterNoise.NarrowbandRepeaterNoise;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class NarrowbandRepeaterNoise extends JammingTechnique
+{
+ public NarrowbandRepeaterNoise()
+ {
+ setKind((byte)1); // Noise
+ setCategory((byte)70); // Repeater Noise
+ setSubCategory((byte)5); // Narrowband Repeater Noise
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/RepeaterNoise/RepeaterNoise.java b/src-generated/edu/nps/moves/dis/jammers/Noise/RepeaterNoise/RepeaterNoise.java
new file mode 100644
index 0000000000000000000000000000000000000000..457ad000ea53d270d37aae7b88a6d7059af41c51
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Noise/RepeaterNoise/RepeaterNoise.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.Noise.RepeaterNoise;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class RepeaterNoise extends JammingTechnique
+{
+ public RepeaterNoise()
+ {
+ setKind((byte)1); // Noise
+ setCategory((byte)70); // Repeater Noise
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/RepeaterNoise/SubCategory.java b/src-generated/edu/nps/moves/dis/jammers/Noise/RepeaterNoise/SubCategory.java
deleted file mode 100644
index aa3b6b523d760df886839e5e060d5c5f9b32ab71..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/RepeaterNoise/SubCategory.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package edu.nps.moves.dis.jammers.Noise.RepeaterNoise;
-
-import java.nio.ByteBuffer;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import edu.nps.moves.dis.*;
-
-/* marshal size 8 bits*/
-public enum SubCategory implements edu.nps.moves.dis.JammerSubCategory
-{
- NARROWBANDREPEATERNOISE (5, "Narrowband Repeater Noise"),
- WIDEBANDREPEATERNOISE (10, "Wide Band Repeater Noise");
-
- private byte value;
- private final String description;
-
- SubCategory(int value, String description)
- {
- this.value = (byte)value;
- this.description = description;
- }
-
- public byte getValue()
- {
- return value;
- }
-
- public String getDescription()
- {
- return description;
- }
-
- public static SubCategory getEnumerationForValue(int i)
- {
- for(SubCategory val: values()) {
- if(val.getValue()==i)
- return val;
- }
- System.err.println("No enumeration found for value " + i + " of enumeration SubCategory");
- return null;
- }
-
- @Override
- public void marshal(DataOutputStream dos)
- {
- try {
- dos.writeByte(getValue());
- }
- catch(IOException ex) {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
- }
-
- @Override
- public int unmarshal(DataInputStream dis)
- {
- try {
- value = dis.readByte();
- }
- catch(IOException ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public void marshal(ByteBuffer buff)
- {
- try {
- buff.put(getValue());
- }
- catch(Exception ex) {
- showError(ex);
- }
- }
-
- @Override
- public int unmarshal(ByteBuffer buff)
- {
- try {
- value = buff.get();
- }
- catch(Exception ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public int getMarshalledSize()
- {
- return 1; // 8 bits
- }
-
- private void showError(Exception ex)
- {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/RepeaterNoise/WideBandRepeaterNoise.java b/src-generated/edu/nps/moves/dis/jammers/Noise/RepeaterNoise/WideBandRepeaterNoise.java
deleted file mode 100644
index df2eb67d79a9a27ad7e26fc812a4bed8b08306af..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/RepeaterNoise/WideBandRepeaterNoise.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Noise.RepeaterNoise;
-
-public class WideBandRepeaterNoise extends Base
-{
- public WideBandRepeaterNoise()
- {
- setSubcategory(SubCategory.WIDEBANDREPEATERNOISE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/RepeaterNoise/WideBandRepeaterNoise/WideBandRepeaterNoise.java b/src-generated/edu/nps/moves/dis/jammers/Noise/RepeaterNoise/WideBandRepeaterNoise/WideBandRepeaterNoise.java
new file mode 100644
index 0000000000000000000000000000000000000000..18c6560ef7f1ae1a6ab64e118d6a0bf6c9bb6e15
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Noise/RepeaterNoise/WideBandRepeaterNoise/WideBandRepeaterNoise.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Noise.RepeaterNoise.WideBandRepeaterNoise;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class WideBandRepeaterNoise extends JammingTechnique
+{
+ public WideBandRepeaterNoise()
+ {
+ setKind((byte)1); // Noise
+ setCategory((byte)70); // Repeater Noise
+ setSubCategory((byte)10); // Wide Band Repeater Noise
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/AutomaticSpotNoiseASJ.java b/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/AutomaticSpotNoiseASJ.java
deleted file mode 100644
index 7eca0b8af58a076b144e378225e679ef8317753b..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/AutomaticSpotNoiseASJ.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Noise.SpotNoise;
-
-public class AutomaticSpotNoiseASJ extends Base
-{
- public AutomaticSpotNoiseASJ()
- {
- setSubcategory(SubCategory.AUTOMATICSPOTNOISEASJ);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/AutomaticSpotNoiseASJ/AutomaticSpotNoiseASJ.java b/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/AutomaticSpotNoiseASJ/AutomaticSpotNoiseASJ.java
new file mode 100644
index 0000000000000000000000000000000000000000..d1bc69ef6e7629fdedb31b98322234104486bb2e
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/AutomaticSpotNoiseASJ/AutomaticSpotNoiseASJ.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Noise.SpotNoise.AutomaticSpotNoiseASJ;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class AutomaticSpotNoiseASJ extends JammingTechnique
+{
+ public AutomaticSpotNoiseASJ()
+ {
+ setKind((byte)1); // Noise
+ setCategory((byte)75); // Spot Noise
+ setSubCategory((byte)5); // Automatic Spot Noise (ASJ)
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/Base.java b/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/Base.java
deleted file mode 100644
index 09204f8e554d602730031e70bf2020a0ecf4852b..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.jammers.Noise.SpotNoise;
-
-import edu.nps.moves.dis.jammers.Noise.Category;
-
-abstract public class Base extends edu.nps.moves.dis.jammers.Noise.Base
-{
- public Base()
- {
- setCategory(Category.SPOTNOISE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/BlinkingSpotNoise.java b/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/BlinkingSpotNoise.java
deleted file mode 100644
index f78ddec4d5294b1240695efeb37b29427b7f3211..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/BlinkingSpotNoise.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Noise.SpotNoise;
-
-public class BlinkingSpotNoise extends Base
-{
- public BlinkingSpotNoise()
- {
- setSubcategory(SubCategory.BLINKINGSPOTNOISE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/BlinkingSpotNoise/BlinkingSpotNoise.java b/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/BlinkingSpotNoise/BlinkingSpotNoise.java
new file mode 100644
index 0000000000000000000000000000000000000000..5edc0bf20fc1aada9f5c2658f4a6243d1c90b81a
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/BlinkingSpotNoise/BlinkingSpotNoise.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Noise.SpotNoise.BlinkingSpotNoise;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class BlinkingSpotNoise extends JammingTechnique
+{
+ public BlinkingSpotNoise()
+ {
+ setKind((byte)1); // Noise
+ setCategory((byte)75); // Spot Noise
+ setSubCategory((byte)10); // Blinking Spot Noise
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/BurstSpotNoise.java b/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/BurstSpotNoise.java
deleted file mode 100644
index 0dcb316fecd2e9a41d645cc1457dbc1bac030c67..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/BurstSpotNoise.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Noise.SpotNoise;
-
-public class BurstSpotNoise extends Base
-{
- public BurstSpotNoise()
- {
- setSubcategory(SubCategory.BURSTSPOTNOISE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/BurstSpotNoise/BurstSpotNoise.java b/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/BurstSpotNoise/BurstSpotNoise.java
new file mode 100644
index 0000000000000000000000000000000000000000..b6fdaf6264ac9c13ca646e3d98a96b0e1cc40b2e
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/BurstSpotNoise/BurstSpotNoise.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Noise.SpotNoise.BurstSpotNoise;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class BurstSpotNoise extends JammingTechnique
+{
+ public BurstSpotNoise()
+ {
+ setKind((byte)1); // Noise
+ setCategory((byte)75); // Spot Noise
+ setSubCategory((byte)15); // Burst Spot Noise
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/DopplerSpotNoise.java b/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/DopplerSpotNoise.java
deleted file mode 100644
index cefd7ffd23f25899a2e75fafe9a31d839b37bbec..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/DopplerSpotNoise.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Noise.SpotNoise;
-
-public class DopplerSpotNoise extends Base
-{
- public DopplerSpotNoise()
- {
- setSubcategory(SubCategory.DOPPLERSPOTNOISE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/DopplerSpotNoise/DopplerSpotNoise.java b/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/DopplerSpotNoise/DopplerSpotNoise.java
new file mode 100644
index 0000000000000000000000000000000000000000..0ba6487c951cffc410176d25fa3a4a139296efe5
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/DopplerSpotNoise/DopplerSpotNoise.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Noise.SpotNoise.DopplerSpotNoise;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class DopplerSpotNoise extends JammingTechnique
+{
+ public DopplerSpotNoise()
+ {
+ setKind((byte)1); // Noise
+ setCategory((byte)75); // Spot Noise
+ setSubCategory((byte)20); // Doppler Spot Noise
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/SkirtFrequency.java b/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/SkirtFrequency.java
deleted file mode 100644
index 6ce7055dbc8f19c0cfc98aa0a026b555efba0ac4..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/SkirtFrequency.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Noise.SpotNoise;
-
-public class SkirtFrequency extends Base
-{
- public SkirtFrequency()
- {
- setSubcategory(SubCategory.SKIRTFREQUENCY);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/SkirtFrequency/SkirtFrequency.java b/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/SkirtFrequency/SkirtFrequency.java
new file mode 100644
index 0000000000000000000000000000000000000000..77527787850593b963bbd488335ff0eabfee3d15
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/SkirtFrequency/SkirtFrequency.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Noise.SpotNoise.SkirtFrequency;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class SkirtFrequency extends JammingTechnique
+{
+ public SkirtFrequency()
+ {
+ setKind((byte)1); // Noise
+ setCategory((byte)75); // Spot Noise
+ setSubCategory((byte)25); // Skirt Frequency
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/SpotNoise.java b/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/SpotNoise.java
new file mode 100644
index 0000000000000000000000000000000000000000..40fa96639cf48990dde6ad1d44aa394a506ddf76
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/SpotNoise.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.Noise.SpotNoise;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class SpotNoise extends JammingTechnique
+{
+ public SpotNoise()
+ {
+ setKind((byte)1); // Noise
+ setCategory((byte)75); // Spot Noise
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/SubCategory.java b/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/SubCategory.java
deleted file mode 100644
index cdf08a439fdcdb73d6c175dff867e884cb197f65..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/SpotNoise/SubCategory.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package edu.nps.moves.dis.jammers.Noise.SpotNoise;
-
-import java.nio.ByteBuffer;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import edu.nps.moves.dis.*;
-
-/* marshal size 8 bits*/
-public enum SubCategory implements edu.nps.moves.dis.JammerSubCategory
-{
- AUTOMATICSPOTNOISEASJ (5, "Automatic Spot Noise (ASJ)"),
- BLINKINGSPOTNOISE (10, "Blinking Spot Noise"),
- BURSTSPOTNOISE (15, "Burst Spot Noise"),
- DOPPLERSPOTNOISE (20, "Doppler Spot Noise"),
- SKIRTFREQUENCY (25, "Skirt Frequency");
-
- private byte value;
- private final String description;
-
- SubCategory(int value, String description)
- {
- this.value = (byte)value;
- this.description = description;
- }
-
- public byte getValue()
- {
- return value;
- }
-
- public String getDescription()
- {
- return description;
- }
-
- public static SubCategory getEnumerationForValue(int i)
- {
- for(SubCategory val: values()) {
- if(val.getValue()==i)
- return val;
- }
- System.err.println("No enumeration found for value " + i + " of enumeration SubCategory");
- return null;
- }
-
- @Override
- public void marshal(DataOutputStream dos)
- {
- try {
- dos.writeByte(getValue());
- }
- catch(IOException ex) {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
- }
-
- @Override
- public int unmarshal(DataInputStream dis)
- {
- try {
- value = dis.readByte();
- }
- catch(IOException ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public void marshal(ByteBuffer buff)
- {
- try {
- buff.put(getValue());
- }
- catch(Exception ex) {
- showError(ex);
- }
- }
-
- @Override
- public int unmarshal(ByteBuffer buff)
- {
- try {
- value = buff.get();
- }
- catch(Exception ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public int getMarshalledSize()
- {
- return 1; // 8 bits
- }
-
- private void showError(Exception ex)
- {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/Base.java b/src-generated/edu/nps/moves/dis/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/Base.java
deleted file mode 100644
index 0b42b221706c9f512d230b80ae2638038470450e..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.jammers.Noise.SweptNoiseakaSweptSpotNoise_Sweep;
-
-import edu.nps.moves.dis.jammers.Noise.Category;
-
-abstract public class Base extends edu.nps.moves.dis.jammers.Noise.Base
-{
- public Base()
- {
- setCategory(Category.SWEPTNOISEAKASWEPTSPOTNOISE_SWEEP);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/FrequencySwept.java b/src-generated/edu/nps/moves/dis/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/FrequencySwept.java
deleted file mode 100644
index 5930d7e8c4a182af5c70eed5cdcc96a12ce7f0fc..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/FrequencySwept.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Noise.SweptNoiseakaSweptSpotNoise_Sweep;
-
-public class FrequencySwept extends Base
-{
- public FrequencySwept()
- {
- setSubcategory(SubCategory.FREQUENCYSWEPT);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/FrequencySwept/FrequencySwept.java b/src-generated/edu/nps/moves/dis/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/FrequencySwept/FrequencySwept.java
new file mode 100644
index 0000000000000000000000000000000000000000..ed10fd49a482b5cc7b930afc96ba0b0f04a8cdc4
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/FrequencySwept/FrequencySwept.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Noise.SweptNoiseakaSweptSpotNoise_Sweep.FrequencySwept;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class FrequencySwept extends JammingTechnique
+{
+ public FrequencySwept()
+ {
+ setKind((byte)1); // Noise
+ setCategory((byte)80); // Swept Noise (aka Swept Spot Noise, Sweep)
+ setSubCategory((byte)5); // Frequency Swept
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/SubCategory.java b/src-generated/edu/nps/moves/dis/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/SubCategory.java
deleted file mode 100644
index 5130f8c4ed721922fff9140380a1b72b7d965742..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/SubCategory.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package edu.nps.moves.dis.jammers.Noise.SweptNoiseakaSweptSpotNoise_Sweep;
-
-import java.nio.ByteBuffer;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import edu.nps.moves.dis.*;
-
-/* marshal size 8 bits*/
-public enum SubCategory implements edu.nps.moves.dis.JammerSubCategory
-{
- FREQUENCYSWEPT (5, "Frequency Swept"),
- SWEPTAM (10, "Swept AM");
-
- private byte value;
- private final String description;
-
- SubCategory(int value, String description)
- {
- this.value = (byte)value;
- this.description = description;
- }
-
- public byte getValue()
- {
- return value;
- }
-
- public String getDescription()
- {
- return description;
- }
-
- public static SubCategory getEnumerationForValue(int i)
- {
- for(SubCategory val: values()) {
- if(val.getValue()==i)
- return val;
- }
- System.err.println("No enumeration found for value " + i + " of enumeration SubCategory");
- return null;
- }
-
- @Override
- public void marshal(DataOutputStream dos)
- {
- try {
- dos.writeByte(getValue());
- }
- catch(IOException ex) {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
- }
-
- @Override
- public int unmarshal(DataInputStream dis)
- {
- try {
- value = dis.readByte();
- }
- catch(IOException ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public void marshal(ByteBuffer buff)
- {
- try {
- buff.put(getValue());
- }
- catch(Exception ex) {
- showError(ex);
- }
- }
-
- @Override
- public int unmarshal(ByteBuffer buff)
- {
- try {
- value = buff.get();
- }
- catch(Exception ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public int getMarshalledSize()
- {
- return 1; // 8 bits
- }
-
- private void showError(Exception ex)
- {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/SweptAM.java b/src-generated/edu/nps/moves/dis/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/SweptAM.java
deleted file mode 100644
index 588d3cd8019da2ccb8cd9aa9dd7b62d75bdd1b6a..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/SweptAM.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Noise.SweptNoiseakaSweptSpotNoise_Sweep;
-
-public class SweptAM extends Base
-{
- public SweptAM()
- {
- setSubcategory(SubCategory.SWEPTAM);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/SweptAM/SweptAM.java b/src-generated/edu/nps/moves/dis/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/SweptAM/SweptAM.java
new file mode 100644
index 0000000000000000000000000000000000000000..230730473e0ff8a71fcc469dbddf6e31c46367d9
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/SweptAM/SweptAM.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.jammers.Noise.SweptNoiseakaSweptSpotNoise_Sweep.SweptAM;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class SweptAM extends JammingTechnique
+{
+ public SweptAM()
+ {
+ setKind((byte)1); // Noise
+ setCategory((byte)80); // Swept Noise (aka Swept Spot Noise, Sweep)
+ setSubCategory((byte)10); // Swept AM
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/SweptNoiseakaSweptSpotNoise_Sweep.java b/src-generated/edu/nps/moves/dis/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/SweptNoiseakaSweptSpotNoise_Sweep.java
new file mode 100644
index 0000000000000000000000000000000000000000..30772759a62da46142bac6544cd9e3623c55a591
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Noise/SweptNoiseakaSweptSpotNoise_Sweep/SweptNoiseakaSweptSpotNoise_Sweep.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.Noise.SweptNoiseakaSweptSpotNoise_Sweep;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class SweptNoiseakaSweptSpotNoise_Sweep extends JammingTechnique
+{
+ public SweptNoiseakaSweptSpotNoise_Sweep()
+ {
+ setKind((byte)1); // Noise
+ setCategory((byte)80); // Swept Noise (aka Swept Spot Noise, Sweep)
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/VelocityBinMaskingVBM.java b/src-generated/edu/nps/moves/dis/jammers/Noise/VelocityBinMaskingVBM.java
deleted file mode 100644
index 311e9fcebbcf10a6716d6985d91b9932ae5cf0aa..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Noise/VelocityBinMaskingVBM.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Noise;
-
-public class VelocityBinMaskingVBM extends Base
-{
- public VelocityBinMaskingVBM()
- {
- setCategory(Category.VELOCITYBINMASKINGVBM);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Noise/VelocityBinMaskingVBM/VelocityBinMaskingVBM.java b/src-generated/edu/nps/moves/dis/jammers/Noise/VelocityBinMaskingVBM/VelocityBinMaskingVBM.java
new file mode 100644
index 0000000000000000000000000000000000000000..8adf4c5e38437145139aa9601aec73e087211bda
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Noise/VelocityBinMaskingVBM/VelocityBinMaskingVBM.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.Noise.VelocityBinMaskingVBM;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class VelocityBinMaskingVBM extends JammingTechnique
+{
+ public VelocityBinMaskingVBM()
+ {
+ setKind((byte)1); // Noise
+ setCategory((byte)85); // Velocity Bin Masking (VBM)
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Special/Base.java b/src-generated/edu/nps/moves/dis/jammers/Special/Base.java
deleted file mode 100644
index dd1943b0cf4c8455b6116674e5b0908f08094477..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Special/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.jammers.Special;
-
-import edu.nps.moves.dis.jammers.JammerKind;
-
-abstract public class Base extends edu.nps.moves.dis.JammingTechnique
-{
- public Base()
- {
- setKind(JammerKind.SPECIAL);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Special/Category.java b/src-generated/edu/nps/moves/dis/jammers/Special/Category.java
deleted file mode 100644
index a70094a11c1ab1ad0e7deb1c3d52ebef0d6d5d25..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Special/Category.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package edu.nps.moves.dis.jammers.Special;
-
-import java.nio.ByteBuffer;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import edu.nps.moves.dis.*;
-
-/* marshal size 8 bits*/
-public enum Category implements edu.nps.moves.dis.JammerCategory
-{
- SUPERJAM (1, "Super Jam");
-
- private byte value;
- private final String description;
-
- Category(int value, String description)
- {
- this.value = (byte)value;
- this.description = description;
- }
-
- public byte getValue()
- {
- return value;
- }
-
- public String getDescription()
- {
- return description;
- }
-
- public static Category getEnumerationForValue(int i)
- {
- for(Category val: values()) {
- if(val.getValue()==i)
- return val;
- }
- System.err.println("No enumeration found for value " + i + " of enumeration Category");
- return null;
- }
-
- @Override
- public void marshal(DataOutputStream dos)
- {
- try {
- dos.writeByte(getValue());
- }
- catch(IOException ex) {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
- }
-
- @Override
- public int unmarshal(DataInputStream dis)
- {
- try {
- value = dis.readByte();
- }
- catch(IOException ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public void marshal(ByteBuffer buff)
- {
- try {
- buff.put(getValue());
- }
- catch(Exception ex) {
- showError(ex);
- }
- }
-
- @Override
- public int unmarshal(ByteBuffer buff)
- {
- try {
- value = buff.get();
- }
- catch(Exception ex) {
- showError(ex);
- }
- return 1;
- }
-
- @Override
- public int getMarshalledSize()
- {
- return 1; // 8 bits
- }
-
- private void showError(Exception ex)
- {
- System.err.println(ex.getClass().getSimpleName()+": "+ex.getMessage());
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Special/Special.java b/src-generated/edu/nps/moves/dis/jammers/Special/Special.java
new file mode 100644
index 0000000000000000000000000000000000000000..76673b36cb46fa90a2442bc1b910d73c6e9f7ecb
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Special/Special.java
@@ -0,0 +1,17 @@
+package edu.nps.moves.dis.jammers.Special;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class Special extends JammingTechnique
+{
+ public Special()
+ {
+ setKind((byte)4); // Special
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Special/SuperJam.java b/src-generated/edu/nps/moves/dis/jammers/Special/SuperJam.java
deleted file mode 100644
index 40415364a812e5a028c163ba54b2f535d0e75899..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/jammers/Special/SuperJam.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.jammers.Special;
-
-public class SuperJam extends Base
-{
- public SuperJam()
- {
- setCategory(Category.SUPERJAM);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/jammers/Special/SuperJam/SuperJam.java b/src-generated/edu/nps/moves/dis/jammers/Special/SuperJam/SuperJam.java
new file mode 100644
index 0000000000000000000000000000000000000000..0dcd043fa024898c1e19da0c1c6cd0692b05a22f
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/jammers/Special/SuperJam/SuperJam.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.jammers.Special.SuperJam;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * Jamming technique uid: 284
+ */
+public class SuperJam extends JammingTechnique
+{
+ public SuperJam()
+ {
+ setKind((byte)4); // Special
+ setCategory((byte)1); // Super Jam
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ArealObject/ArealObject.java b/src-generated/edu/nps/moves/dis/objecttypes/ArealObject/ArealObject.java
new file mode 100644
index 0000000000000000000000000000000000000000..0f1c6132fbed557fa0fc1d5e0d01838ff4e4d909
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/ArealObject/ArealObject.java
@@ -0,0 +1,17 @@
+package edu.nps.moves.dis.objecttypes.ArealObject;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 228
+ */
+public class ArealObject extends ObjectType
+{
+ public ArealObject()
+ {
+ setDomain(PlatformDomain.getEnumForValue(0));
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ArealObject/Obstacle/Minefield/Minefield.java b/src-generated/edu/nps/moves/dis/objecttypes/ArealObject/Obstacle/Minefield/Minefield.java
new file mode 100644
index 0000000000000000000000000000000000000000..c0c42511464eb4a5f245cf5d07529f335d84d9c3
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/ArealObject/Obstacle/Minefield/Minefield.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.ArealObject.Obstacle.Minefield;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 228
+ */
+public class Minefield extends ObjectType
+{
+ public Minefield()
+ {
+ setDomain(PlatformDomain.getEnumForValue(0));
+ setObjectKind(ObjectKind.getEnumForValue(1)); // Obstacle
+ setCategory((byte)1); // Minefield
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ArealObject/Obstacle/Obstacle.java b/src-generated/edu/nps/moves/dis/objecttypes/ArealObject/Obstacle/Obstacle.java
new file mode 100644
index 0000000000000000000000000000000000000000..f166d5d1f5f3146b649c492b64c881972fe45931
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/ArealObject/Obstacle/Obstacle.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.objecttypes.ArealObject.Obstacle;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 228
+ */
+public class Obstacle extends ObjectType
+{
+ public Obstacle()
+ {
+ setDomain(PlatformDomain.getEnumForValue(0));
+ setObjectKind(ObjectKind.getEnumForValue(1)); // Obstacle
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ArealObject/Obstacle/Other/Other.java b/src-generated/edu/nps/moves/dis/objecttypes/ArealObject/Obstacle/Other/Other.java
new file mode 100644
index 0000000000000000000000000000000000000000..4fdef58e41758ed999994b31c340916493169dbb
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/ArealObject/Obstacle/Other/Other.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.ArealObject.Obstacle.Other;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 228
+ */
+public class Other extends ObjectType
+{
+ public Other()
+ {
+ setDomain(PlatformDomain.getEnumForValue(0));
+ setObjectKind(ObjectKind.getEnumForValue(1)); // Obstacle
+ setCategory((byte)0); // Other
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Culturalfeature/Culturalfeature.java b/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Culturalfeature/Culturalfeature.java
new file mode 100644
index 0000000000000000000000000000000000000000..202355541da68150ff4ce602c2c5dd38f6105416
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Culturalfeature/Culturalfeature.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.objecttypes.LinearObject.Culturalfeature;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 227
+ */
+public class Culturalfeature extends ObjectType
+{
+ public Culturalfeature()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(3)); // Cultural feature
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Culturalfeature/Tracks_Tire/Tracks_Tire.java b/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Culturalfeature/Tracks_Tire/Tracks_Tire.java
new file mode 100644
index 0000000000000000000000000000000000000000..6cef00f0bd1fd3e2284e79ff71e65f4990a88329
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Culturalfeature/Tracks_Tire/Tracks_Tire.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.LinearObject.Culturalfeature.Tracks_Tire;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 227
+ */
+public class Tracks_Tire extends ObjectType
+{
+ public Tracks_Tire()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(3)); // Cultural feature
+ setCategory((byte)2); // Tracks, Tire
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Culturalfeature/Wire/Wire.java b/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Culturalfeature/Wire/Wire.java
new file mode 100644
index 0000000000000000000000000000000000000000..bf5693bfdcbaec982e124839cfab2325f8e937c6
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Culturalfeature/Wire/Wire.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.LinearObject.Culturalfeature.Wire;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 227
+ */
+public class Wire extends ObjectType
+{
+ public Wire()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(3)); // Cultural feature
+ setCategory((byte)1); // Wire
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/LinearObject.java b/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/LinearObject.java
new file mode 100644
index 0000000000000000000000000000000000000000..bf7b2df0b8e277ec500cfc24780768a374724d34
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/LinearObject.java
@@ -0,0 +1,17 @@
+package edu.nps.moves.dis.objecttypes.LinearObject;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 227
+ */
+public class LinearObject extends ObjectType
+{
+ public LinearObject()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstacle/ChainLinkFence/ChainLinkFence.java b/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstacle/ChainLinkFence/ChainLinkFence.java
new file mode 100644
index 0000000000000000000000000000000000000000..5310cea4b8d5f22b5e23f0d65122117770ab27c9
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstacle/ChainLinkFence/ChainLinkFence.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.LinearObject.Obstacle.ChainLinkFence;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 227
+ */
+public class ChainLinkFence extends ObjectType
+{
+ public ChainLinkFence()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(1)); // Obstacle
+ setCategory((byte)9); // Chain Link Fence
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstacle/ConcertinaWire/ConcertinaWire.java b/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstacle/ConcertinaWire/ConcertinaWire.java
new file mode 100644
index 0000000000000000000000000000000000000000..5d3d9b86ca8dc3688fe357118da4926fe8eab713
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstacle/ConcertinaWire/ConcertinaWire.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.LinearObject.Obstacle.ConcertinaWire;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 227
+ */
+public class ConcertinaWire extends ObjectType
+{
+ public ConcertinaWire()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(1)); // Obstacle
+ setCategory((byte)2); // Concertina Wire
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstacle/ConcreteBarrier/ConcreteBarrier.java b/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstacle/ConcreteBarrier/ConcreteBarrier.java
new file mode 100644
index 0000000000000000000000000000000000000000..37ce73d73f233e472665cbfffa2a4c2d76482963
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstacle/ConcreteBarrier/ConcreteBarrier.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.LinearObject.Obstacle.ConcreteBarrier;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 227
+ */
+public class ConcreteBarrier extends ObjectType
+{
+ public ConcreteBarrier()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(1)); // Obstacle
+ setCategory((byte)3); // Concrete Barrier
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstacle/Obstacle.java b/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstacle/Obstacle.java
new file mode 100644
index 0000000000000000000000000000000000000000..4027dde145bb346f0e8a80092146c1b80c4c417d
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstacle/Obstacle.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.objecttypes.LinearObject.Obstacle;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 227
+ */
+public class Obstacle extends ObjectType
+{
+ public Obstacle()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(1)); // Obstacle
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstacle/Other/Other.java b/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstacle/Other/Other.java
new file mode 100644
index 0000000000000000000000000000000000000000..9a3e0769fab392e6dfaa98ed0c16d93735af9efc
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstacle/Other/Other.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.LinearObject.Obstacle.Other;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 227
+ */
+public class Other extends ObjectType
+{
+ public Other()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(1)); // Obstacle
+ setCategory((byte)0); // Other
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstacle/Rut/Rut.java b/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstacle/Rut/Rut.java
new file mode 100644
index 0000000000000000000000000000000000000000..fcebc94e16bd7248b2c08cd55c594b603da9ce2f
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstacle/Rut/Rut.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.LinearObject.Obstacle.Rut;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 227
+ */
+public class Rut extends ObjectType
+{
+ public Rut()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(1)); // Obstacle
+ setCategory((byte)5); // Rut
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstacle/SpeedBump/SpeedBump.java b/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstacle/SpeedBump/SpeedBump.java
new file mode 100644
index 0000000000000000000000000000000000000000..ac1e5f61609c9d44fb3fa2890535bcfe1db12fc2
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstacle/SpeedBump/SpeedBump.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.LinearObject.Obstacle.SpeedBump;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 227
+ */
+public class SpeedBump extends ObjectType
+{
+ public SpeedBump()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(1)); // Obstacle
+ setCategory((byte)4); // Speed Bump
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstacle/TankDitch/TankDitch.java b/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstacle/TankDitch/TankDitch.java
new file mode 100644
index 0000000000000000000000000000000000000000..3b8df5b4e265edf8f484aab1ef929ba7a46585a9
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstacle/TankDitch/TankDitch.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.LinearObject.Obstacle.TankDitch;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 227
+ */
+public class TankDitch extends ObjectType
+{
+ public TankDitch()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(1)); // Obstacle
+ setCategory((byte)1); // Tank Ditch
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstaclebreach/Breach/Breach.java b/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstaclebreach/Breach/Breach.java
new file mode 100644
index 0000000000000000000000000000000000000000..fb76045c205a0e28e73379505041c5d0f43f2124
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstaclebreach/Breach/Breach.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.LinearObject.Obstaclebreach.Breach;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 227
+ */
+public class Breach extends ObjectType
+{
+ public Breach()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(7)); // Obstacle breach
+ setCategory((byte)1); // Breach
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstaclebreach/Obstaclebreach.java b/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstaclebreach/Obstaclebreach.java
new file mode 100644
index 0000000000000000000000000000000000000000..5b2f25cdec43caf772e75a5810cb8c06f1681a6f
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstaclebreach/Obstaclebreach.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.objecttypes.LinearObject.Obstaclebreach;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 227
+ */
+public class Obstaclebreach extends ObjectType
+{
+ public Obstaclebreach()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(7)); // Obstacle breach
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstaclebreach/Other/Other.java b/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstaclebreach/Other/Other.java
new file mode 100644
index 0000000000000000000000000000000000000000..53f300d037294d00c977fb48537c48948e4a7475
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstaclebreach/Other/Other.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.LinearObject.Obstaclebreach.Other;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 227
+ */
+public class Other extends ObjectType
+{
+ public Other()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(7)); // Obstacle breach
+ setCategory((byte)0); // Other
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstaclemarker/MinefieldLaneMarker/MinefieldLaneMarker.java b/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstaclemarker/MinefieldLaneMarker/MinefieldLaneMarker.java
new file mode 100644
index 0000000000000000000000000000000000000000..68a81dbb54579db2e3c5ba3cc2cdaadfccc02163
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstaclemarker/MinefieldLaneMarker/MinefieldLaneMarker.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.LinearObject.Obstaclemarker.MinefieldLaneMarker;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 227
+ */
+public class MinefieldLaneMarker extends ObjectType
+{
+ public MinefieldLaneMarker()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(6)); // Obstacle marker
+ setCategory((byte)1); // Minefield Lane Marker
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstaclemarker/Obstaclemarker.java b/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstaclemarker/Obstaclemarker.java
new file mode 100644
index 0000000000000000000000000000000000000000..e186b78489adc81fd83264b7f5653a604f8d1058
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstaclemarker/Obstaclemarker.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.objecttypes.LinearObject.Obstaclemarker;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 227
+ */
+public class Obstaclemarker extends ObjectType
+{
+ public Obstaclemarker()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(6)); // Obstacle marker
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstaclemarker/Other/Other.java b/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstaclemarker/Other/Other.java
new file mode 100644
index 0000000000000000000000000000000000000000..bbbdcb54420aaa938c9baad9d0b2a448919aa828
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Obstaclemarker/Other/Other.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.LinearObject.Obstaclemarker.Other;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 227
+ */
+public class Other extends ObjectType
+{
+ public Other()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(6)); // Obstacle marker
+ setCategory((byte)0); // Other
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Tacticalsmoke/ExhaustSmoke/ExhaustSmoke.java b/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Tacticalsmoke/ExhaustSmoke/ExhaustSmoke.java
new file mode 100644
index 0000000000000000000000000000000000000000..3d0961ef180e2f000e300567cb614a2f3a0ec753
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Tacticalsmoke/ExhaustSmoke/ExhaustSmoke.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.LinearObject.Tacticalsmoke.ExhaustSmoke;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 227
+ */
+public class ExhaustSmoke extends ObjectType
+{
+ public ExhaustSmoke()
+ {
+ setDomain(PlatformDomain.getEnumForValue(0));
+ setObjectKind(ObjectKind.getEnumForValue(5)); // Tactical smoke
+ setCategory((byte)1); // Exhaust Smoke
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Tacticalsmoke/Other/Other.java b/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Tacticalsmoke/Other/Other.java
new file mode 100644
index 0000000000000000000000000000000000000000..9d2658c46ebfcaeaf4e43d4499b0b96cfde88acd
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Tacticalsmoke/Other/Other.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.LinearObject.Tacticalsmoke.Other;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 227
+ */
+public class Other extends ObjectType
+{
+ public Other()
+ {
+ setDomain(PlatformDomain.getEnumForValue(0));
+ setObjectKind(ObjectKind.getEnumForValue(5)); // Tactical smoke
+ setCategory((byte)0); // Other
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Tacticalsmoke/Tacticalsmoke.java b/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Tacticalsmoke/Tacticalsmoke.java
new file mode 100644
index 0000000000000000000000000000000000000000..ac5e3c03e9a62b61d029870964f2a81be75c8219
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/LinearObject/Tacticalsmoke/Tacticalsmoke.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.objecttypes.LinearObject.Tacticalsmoke;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 227
+ */
+public class Tacticalsmoke extends ObjectType
+{
+ public Tacticalsmoke()
+ {
+ setDomain(PlatformDomain.getEnumForValue(0));
+ setObjectKind(ObjectKind.getEnumForValue(5)); // Tactical smoke
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_ArealObject/ArealObject.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_ArealObject/ArealObject.java
deleted file mode 100644
index 1efc98a46363a2801634934d63454104c87be935..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_ArealObject/ArealObject.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_ArealObject;
-
-public class ArealObject extends edu.nps.moves.dis.ObjectType
-{
- /* uid 228 */
- public ArealObject()
- {
- }
-}
\ No newline at end of file
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_ArealObject/Obstacle/Base.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_ArealObject/Obstacle/Base.java
deleted file mode 100644
index 006b4f8e791d440328a94a06b5c4df36f1b5a58c..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_ArealObject/Obstacle/Base.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_ArealObject.Obstacle;
-
-import edu.nps.moves.dis.enumerations.*;
-import edu.nps.moves.dis.objecttypes.ObjectTypes_ArealObject.ArealObject;
-
-abstract public class Base extends ArealObject
-{
- public Base()
- {
- setDomain(PlatformDomain.OTHER);
- setObjectKind(ObjectKind.OBSTACLE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_ArealObject/Obstacle/Category.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_ArealObject/Obstacle/Category.java
deleted file mode 100644
index 9520ae4c8d4769deeb42c4a01f870875c6ae0de7..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_ArealObject/Obstacle/Category.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_ArealObject.Obstacle;
-
-/* marshal size 8 bits */
-public class Category
-{
- public static final byte OTHER = 0; // Other
- public static final byte MINEFIELD = 1; // Minefiel
-}
-
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_ArealObject/Obstacle/Minefield/Base.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_ArealObject/Obstacle/Minefield/Base.java
deleted file mode 100644
index a3b986bd51aad5d5e3b6e99f1ac8847bf5d7a97d..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_ArealObject/Obstacle/Minefield/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_ArealObject.Obstacle.Minefield;
-
-import edu.nps.moves.dis.objecttypes.ObjectTypes_ArealObject.Obstacle.Category;
-
-abstract public class Base extends edu.nps.moves.dis.objecttypes.ObjectTypes_ArealObject.Obstacle.Base
-{
- public Base()
- {
- setCategory(Category.MINEFIELD);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_ArealObject/Obstacle/Minefield/Hasty.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_ArealObject/Obstacle/Minefield/Hasty.java
deleted file mode 100644
index 48adde6fe49b8175425034e7d237a8a60c83d4ca..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_ArealObject/Obstacle/Minefield/Hasty.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_ArealObject.Obstacle.Minefield;
-
-/** Hasty (EntityType) */
-public class Hasty extends Base
-{
- public Hasty()
- {
- setSubcategory(SubCategory.HASTY);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_ArealObject/Obstacle/Minefield/Other.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_ArealObject/Obstacle/Minefield/Other.java
deleted file mode 100644
index 3559bd2ee6587fdc4bf79e7462ccc29d755970e3..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_ArealObject/Obstacle/Minefield/Other.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_ArealObject.Obstacle.Minefield;
-
-/** Other (EntityType) */
-public class Other extends Base
-{
- public Other()
- {
- setSubcategory(SubCategory.OTHER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_ArealObject/Obstacle/Minefield/Prepared.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_ArealObject/Obstacle/Minefield/Prepared.java
deleted file mode 100644
index 38110d41ee30a757beacc50149090432ab814824..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_ArealObject/Obstacle/Minefield/Prepared.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_ArealObject.Obstacle.Minefield;
-
-/** Prepared (EntityType) */
-public class Prepared extends Base
-{
- public Prepared()
- {
- setSubcategory(SubCategory.PREPARED);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_ArealObject/Obstacle/Minefield/Scattered.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_ArealObject/Obstacle/Minefield/Scattered.java
deleted file mode 100644
index 2ec6eb034cd6d47135b0d712be77732a444541cf..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_ArealObject/Obstacle/Minefield/Scattered.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_ArealObject.Obstacle.Minefield;
-
-/** Scattered (EntityType) */
-public class Scattered extends Base
-{
- public Scattered()
- {
- setSubcategory(SubCategory.SCATTERED);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_ArealObject/Obstacle/Minefield/Solitary.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_ArealObject/Obstacle/Minefield/Solitary.java
deleted file mode 100644
index 7b2806ffec5812fc894f340486bd94ef2a5274b1..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_ArealObject/Obstacle/Minefield/Solitary.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_ArealObject.Obstacle.Minefield;
-
-/** Solitary (EntityType) */
-public class Solitary extends Base
-{
- public Solitary()
- {
- setSubcategory(SubCategory.SOLITARY);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_ArealObject/Obstacle/Minefield/SubCategory.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_ArealObject/Obstacle/Minefield/SubCategory.java
deleted file mode 100644
index bebb43bae9759c3433433ed4cc91611d6f4751b2..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_ArealObject/Obstacle/Minefield/SubCategory.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_ArealObject.Obstacle.Minefield;
-
-/* marshal size 8 bits */
-public class SubCategory
-{
- public static final byte OTHER = 0; // Other
- public static final byte HASTY = 1; // Hasty
- public static final byte PREPARED = 2; // Prepared
- public static final byte SCATTERED = 3; // Scattered
- public static final byte SOLITARY = 4; // Solitar
-}
-
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_ArealObject/Obstacle/Other.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_ArealObject/Obstacle/Other.java
deleted file mode 100644
index 4d3758079b49e52f813a7bf320d88b844e3eb5b4..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_ArealObject/Obstacle/Other.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_ArealObject.Obstacle;
-
-/** Other (EntityType) */
-public class Other extends Base
-{
- public Other()
- {
- setCategory(Category.OTHER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Culturalfeature/Base.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Culturalfeature/Base.java
deleted file mode 100644
index 3cbfdcdc0463b0b5d2838a860a3c77cb8ea6ecbf..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Culturalfeature/Base.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Culturalfeature;
-
-import edu.nps.moves.dis.enumerations.*;
-import edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.LinearObject;
-
-abstract public class Base extends LinearObject
-{
- public Base()
- {
- setDomain(PlatformDomain.LAND);
- setObjectKind(ObjectKind.CULTURAL_FEATURE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Culturalfeature/Category.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Culturalfeature/Category.java
deleted file mode 100644
index 86a082137877dba4e121461ae32110614fe5c8df..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Culturalfeature/Category.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Culturalfeature;
-
-/* marshal size 8 bits */
-public class Category
-{
- public static final byte WIRE = 1; // Wire
- public static final byte TRACKS_TIRE = 2; // Tracks, Tir
-}
-
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Culturalfeature/Tracks_Tire.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Culturalfeature/Tracks_Tire.java
deleted file mode 100644
index fd52adab57020102084b0bd32b77fc6e57ee4e1c..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Culturalfeature/Tracks_Tire.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Culturalfeature;
-
-/** Tracks, Tire (EntityType) */
-public class Tracks_Tire extends Base
-{
- public Tracks_Tire()
- {
- setCategory(Category.TRACKS_TIRE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Culturalfeature/Wire/Base.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Culturalfeature/Wire/Base.java
deleted file mode 100644
index 0b5ab2309c7f916288a348757d1726fcc69e333c..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Culturalfeature/Wire/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Culturalfeature.Wire;
-
-import edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Culturalfeature.Category;
-
-abstract public class Base extends edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Culturalfeature.Base
-{
- public Base()
- {
- setCategory(Category.WIRE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Culturalfeature/Wire/SubCategory.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Culturalfeature/Wire/SubCategory.java
deleted file mode 100644
index 999854f4f963362ba539e7ba5b23b003adae68a1..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Culturalfeature/Wire/SubCategory.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Culturalfeature.Wire;
-
-/* marshal size 8 bits */
-public class SubCategory
-{
- public static final byte WIRE_CRUSH = 1; // Wire, Crus
-}
-
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Culturalfeature/Wire/Wire_Crush.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Culturalfeature/Wire/Wire_Crush.java
deleted file mode 100644
index ac2c35b16ea5e1a26e0c571de3607d64422218c4..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Culturalfeature/Wire/Wire_Crush.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Culturalfeature.Wire;
-
-/** Wire, Crush (EntityType) */
-public class Wire_Crush extends Base
-{
- public Wire_Crush()
- {
- setSubcategory(SubCategory.WIRE_CRUSH);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/LinearObject.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/LinearObject.java
deleted file mode 100644
index 91292bf1b218631e92c806c3c004935bdba3562a..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/LinearObject.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject;
-
-public class LinearObject extends edu.nps.moves.dis.ObjectType
-{
- /* uid 227 */
- public LinearObject()
- {
- }
-}
\ No newline at end of file
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstacle/Base.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstacle/Base.java
deleted file mode 100644
index 6e77fe92a18731d8f762deff462823baf3b308e5..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstacle/Base.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Obstacle;
-
-import edu.nps.moves.dis.enumerations.*;
-import edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.LinearObject;
-
-abstract public class Base extends LinearObject
-{
- public Base()
- {
- setDomain(PlatformDomain.LAND);
- setObjectKind(ObjectKind.OBSTACLE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstacle/Category.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstacle/Category.java
deleted file mode 100644
index 2b3d540198e4019e9911b6384b7ba8208076adbf..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstacle/Category.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Obstacle;
-
-/* marshal size 8 bits */
-public class Category
-{
- public static final byte OTHER = 0; // Other
- public static final byte TANKDITCH = 1; // Tank Ditch
- public static final byte CONCERTINAWIRE = 2; // Concertina Wire
- public static final byte CONCRETEBARRIER = 3; // Concrete Barrier
- public static final byte SPEEDBUMP = 4; // Speed Bump
- public static final byte RUT = 5; // Rut
- public static final byte CHAINLINKFENCE = 9; // Chain Link Fenc
-}
-
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstacle/ChainLinkFence.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstacle/ChainLinkFence.java
deleted file mode 100644
index 1b7883ec22294cf1301468992433dd18dae1cee9..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstacle/ChainLinkFence.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Obstacle;
-
-/** Chain Link Fence (EntityType) */
-public class ChainLinkFence extends Base
-{
- public ChainLinkFence()
- {
- setCategory(Category.CHAINLINKFENCE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstacle/ConcertinaWire/Base.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstacle/ConcertinaWire/Base.java
deleted file mode 100644
index 0c20f7427697c2ba1597152d364b5fa1a9683282..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstacle/ConcertinaWire/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Obstacle.ConcertinaWire;
-
-import edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Obstacle.Category;
-
-abstract public class Base extends edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Obstacle.Base
-{
- public Base()
- {
- setCategory(Category.CONCERTINAWIRE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstacle/ConcertinaWire/Other.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstacle/ConcertinaWire/Other.java
deleted file mode 100644
index a9e22a044cb5cd4bbe2ff99d5f1045e8f71cf5c0..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstacle/ConcertinaWire/Other.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Obstacle.ConcertinaWire;
-
-/** Other (EntityType) */
-public class Other extends Base
-{
- public Other()
- {
- setSubcategory(SubCategory.OTHER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstacle/ConcertinaWire/SubCategory.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstacle/ConcertinaWire/SubCategory.java
deleted file mode 100644
index 76676624a652389301b753bedd7cae161bf33988..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstacle/ConcertinaWire/SubCategory.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Obstacle.ConcertinaWire;
-
-/* marshal size 8 bits */
-public class SubCategory
-{
- public static final byte OTHER = 0; // Other
- public static final byte _2_ROLL = 1; // 2-Roll
- public static final byte _3_ROLL = 2; // 3-Rol
-}
-
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstacle/ConcertinaWire/_2_Roll.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstacle/ConcertinaWire/_2_Roll.java
deleted file mode 100644
index d0ef282cc5f85a991a8c9568a6051c2a27a74338..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstacle/ConcertinaWire/_2_Roll.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Obstacle.ConcertinaWire;
-
-/** 2-Roll (EntityType) */
-public class _2_Roll extends Base
-{
- public _2_Roll()
- {
- setSubcategory(SubCategory._2_ROLL);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstacle/ConcertinaWire/_3_Roll.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstacle/ConcertinaWire/_3_Roll.java
deleted file mode 100644
index e5150ed1a76278bcb0b67b9f2b473889d9f66116..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstacle/ConcertinaWire/_3_Roll.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Obstacle.ConcertinaWire;
-
-/** 3-Roll (EntityType) */
-public class _3_Roll extends Base
-{
- public _3_Roll()
- {
- setSubcategory(SubCategory._3_ROLL);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstacle/ConcreteBarrier.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstacle/ConcreteBarrier.java
deleted file mode 100644
index f2d1c308f8a3563e7a3a745126d09f6c9d0cf06b..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstacle/ConcreteBarrier.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Obstacle;
-
-/** Concrete Barrier (EntityType) */
-public class ConcreteBarrier extends Base
-{
- public ConcreteBarrier()
- {
- setCategory(Category.CONCRETEBARRIER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstacle/Other.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstacle/Other.java
deleted file mode 100644
index ed5000d39de6474c81e53c60b91b7e6bff4c0b1f..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstacle/Other.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Obstacle;
-
-/** Other (EntityType) */
-public class Other extends Base
-{
- public Other()
- {
- setCategory(Category.OTHER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstacle/Rut.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstacle/Rut.java
deleted file mode 100644
index 1741afe4daa606ce8f73ab9f4534a98b45d5794d..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstacle/Rut.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Obstacle;
-
-/** Rut (EntityType) */
-public class Rut extends Base
-{
- public Rut()
- {
- setCategory(Category.RUT);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstacle/SpeedBump.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstacle/SpeedBump.java
deleted file mode 100644
index 18ceeadc476bdba1e2ece137892d6aef83391a0e..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstacle/SpeedBump.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Obstacle;
-
-/** Speed Bump (EntityType) */
-public class SpeedBump extends Base
-{
- public SpeedBump()
- {
- setCategory(Category.SPEEDBUMP);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstacle/TankDitch/Base.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstacle/TankDitch/Base.java
deleted file mode 100644
index a1997b2b662819a5c7ab4a1f917448e7e0464519..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstacle/TankDitch/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Obstacle.TankDitch;
-
-import edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Obstacle.Category;
-
-abstract public class Base extends edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Obstacle.Base
-{
- public Base()
- {
- setCategory(Category.TANKDITCH);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstacle/TankDitch/Other.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstacle/TankDitch/Other.java
deleted file mode 100644
index 5639608e4a3a1e7fde01de450cff6078f112575b..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstacle/TankDitch/Other.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Obstacle.TankDitch;
-
-/** Other (EntityType) */
-public class Other extends Base
-{
- public Other()
- {
- setSubcategory(SubCategory.OTHER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstacle/TankDitch/SubCategory.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstacle/TankDitch/SubCategory.java
deleted file mode 100644
index 98878a5c24a4395816546fb1e27badbf6a319893..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstacle/TankDitch/SubCategory.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Obstacle.TankDitch;
-
-/* marshal size 8 bits */
-public class SubCategory
-{
- public static final byte OTHER = 0; // Othe
-}
-
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstaclebreach/Base.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstaclebreach/Base.java
deleted file mode 100644
index 81e96bfdaeb20884c501a35051ac0b820b6caa9f..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstaclebreach/Base.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Obstaclebreach;
-
-import edu.nps.moves.dis.enumerations.*;
-import edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.LinearObject;
-
-abstract public class Base extends LinearObject
-{
- public Base()
- {
- setDomain(PlatformDomain.LAND);
- setObjectKind(ObjectKind.OBSTACLE_BREACH);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstaclebreach/Breach/Base.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstaclebreach/Breach/Base.java
deleted file mode 100644
index 5960377f0cf31e7870499c6364831ad46c1b2961..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstaclebreach/Breach/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Obstaclebreach.Breach;
-
-import edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Obstaclebreach.Category;
-
-abstract public class Base extends edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Obstaclebreach.Base
-{
- public Base()
- {
- setCategory(Category.BREACH);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstaclebreach/Breach/Other.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstaclebreach/Breach/Other.java
deleted file mode 100644
index 676bedd956f5f6b419e90ed05662d9fa40ee8489..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstaclebreach/Breach/Other.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Obstaclebreach.Breach;
-
-/** Other (EntityType) */
-public class Other extends Base
-{
- public Other()
- {
- setSubcategory(SubCategory.OTHER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstaclebreach/Breach/SubCategory.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstaclebreach/Breach/SubCategory.java
deleted file mode 100644
index 1439a44d98e4d9cc1922f08b4d84ff5ea6e14195..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstaclebreach/Breach/SubCategory.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Obstaclebreach.Breach;
-
-/* marshal size 8 bits */
-public class SubCategory
-{
- public static final byte OTHER = 0; // Othe
-}
-
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstaclebreach/Category.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstaclebreach/Category.java
deleted file mode 100644
index 19ebfb3134e10c93122bdf8bd4c04711b181c9dd..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstaclebreach/Category.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Obstaclebreach;
-
-/* marshal size 8 bits */
-public class Category
-{
- public static final byte OTHER = 0; // Other
- public static final byte BREACH = 1; // Breac
-}
-
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstaclebreach/Other.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstaclebreach/Other.java
deleted file mode 100644
index 702cb5cd5e19209166ab0a2ed4c2068f9d5d05b4..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstaclebreach/Other.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Obstaclebreach;
-
-/** Other (EntityType) */
-public class Other extends Base
-{
- public Other()
- {
- setCategory(Category.OTHER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstaclemarker/Base.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstaclemarker/Base.java
deleted file mode 100644
index f5b91e760709271e75f53dc5a349e815e58e84fc..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstaclemarker/Base.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Obstaclemarker;
-
-import edu.nps.moves.dis.enumerations.*;
-import edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.LinearObject;
-
-abstract public class Base extends LinearObject
-{
- public Base()
- {
- setDomain(PlatformDomain.LAND);
- setObjectKind(ObjectKind.OBSTACLE_MARKER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstaclemarker/Category.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstaclemarker/Category.java
deleted file mode 100644
index 1134f877400e0eb983c7bfce2e30ce470f95dbe5..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstaclemarker/Category.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Obstaclemarker;
-
-/* marshal size 8 bits */
-public class Category
-{
- public static final byte OTHER = 0; // Other
- public static final byte MINEFIELDLANEMARKER = 1; // Minefield Lane Marke
-}
-
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstaclemarker/MinefieldLaneMarker/Base.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstaclemarker/MinefieldLaneMarker/Base.java
deleted file mode 100644
index 838e53f9335db4c7783f0d32eacec1ef7b807f32..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstaclemarker/MinefieldLaneMarker/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Obstaclemarker.MinefieldLaneMarker;
-
-import edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Obstaclemarker.Category;
-
-abstract public class Base extends edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Obstaclemarker.Base
-{
- public Base()
- {
- setCategory(Category.MINEFIELDLANEMARKER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstaclemarker/MinefieldLaneMarker/Other.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstaclemarker/MinefieldLaneMarker/Other.java
deleted file mode 100644
index 6b3455496782ef24b0cb0d0b133fc49aee6a6e3b..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstaclemarker/MinefieldLaneMarker/Other.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Obstaclemarker.MinefieldLaneMarker;
-
-/** Other (EntityType) */
-public class Other extends Base
-{
- public Other()
- {
- setSubcategory(SubCategory.OTHER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstaclemarker/MinefieldLaneMarker/SubCategory.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstaclemarker/MinefieldLaneMarker/SubCategory.java
deleted file mode 100644
index 1da4b1f26bb972eb6ee74bf2a7cf151270baea70..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstaclemarker/MinefieldLaneMarker/SubCategory.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Obstaclemarker.MinefieldLaneMarker;
-
-/* marshal size 8 bits */
-public class SubCategory
-{
- public static final byte OTHER = 0; // Othe
-}
-
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstaclemarker/Other.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstaclemarker/Other.java
deleted file mode 100644
index 227423bd1cc3bd8cade82127afb7aab3fc7c56b2..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Obstaclemarker/Other.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Obstaclemarker;
-
-/** Other (EntityType) */
-public class Other extends Base
-{
- public Other()
- {
- setCategory(Category.OTHER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Tacticalsmoke/Base.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Tacticalsmoke/Base.java
deleted file mode 100644
index 17ea0f28ca17bd9269600bc9436ed26d1a856df1..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Tacticalsmoke/Base.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Tacticalsmoke;
-
-import edu.nps.moves.dis.enumerations.*;
-import edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.LinearObject;
-
-abstract public class Base extends LinearObject
-{
- public Base()
- {
- setDomain(PlatformDomain.OTHER);
- setObjectKind(ObjectKind.TACTICAL_SMOKE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Tacticalsmoke/Category.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Tacticalsmoke/Category.java
deleted file mode 100644
index 739d617674a2c399848ed239ba5a9e8ab983dc2b..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Tacticalsmoke/Category.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Tacticalsmoke;
-
-/* marshal size 8 bits */
-public class Category
-{
- public static final byte OTHER = 0; // Other
- public static final byte EXHAUSTSMOKE = 1; // Exhaust Smok
-}
-
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Tacticalsmoke/ExhaustSmoke/Base.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Tacticalsmoke/ExhaustSmoke/Base.java
deleted file mode 100644
index ce475b30eeb8b6e9383dd3c806631b6c4e273e6d..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Tacticalsmoke/ExhaustSmoke/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Tacticalsmoke.ExhaustSmoke;
-
-import edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Tacticalsmoke.Category;
-
-abstract public class Base extends edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Tacticalsmoke.Base
-{
- public Base()
- {
- setCategory(Category.EXHAUSTSMOKE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Tacticalsmoke/ExhaustSmoke/Other.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Tacticalsmoke/ExhaustSmoke/Other.java
deleted file mode 100644
index 819c6a7870687b5fcebc4aaf0de83d01cbfbfa28..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Tacticalsmoke/ExhaustSmoke/Other.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Tacticalsmoke.ExhaustSmoke;
-
-/** Other (EntityType) */
-public class Other extends Base
-{
- public Other()
- {
- setSubcategory(SubCategory.OTHER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Tacticalsmoke/ExhaustSmoke/SubCategory.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Tacticalsmoke/ExhaustSmoke/SubCategory.java
deleted file mode 100644
index 19cc3b6a39fbbab0cd531029c3a8b0b0d940cb9c..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Tacticalsmoke/ExhaustSmoke/SubCategory.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Tacticalsmoke.ExhaustSmoke;
-
-/* marshal size 8 bits */
-public class SubCategory
-{
- public static final byte OTHER = 0; // Othe
-}
-
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Tacticalsmoke/Other.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Tacticalsmoke/Other.java
deleted file mode 100644
index 11529fb518e0a4dc56206cff41b9a3971ff05685..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_LinearObject/Tacticalsmoke/Other.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_LinearObject.Tacticalsmoke;
-
-/** Other (EntityType) */
-public class Other extends Base
-{
- public Other()
- {
- setCategory(Category.OTHER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Base.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Base.java
deleted file mode 100644
index f387844e8ffc2c6cbff97e4e321ccfac7d89dc80..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Base.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature;
-
-import edu.nps.moves.dis.enumerations.*;
-import edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.PointObject;
-
-abstract public class Base extends PointObject
-{
- public Base()
- {
- setDomain(PlatformDomain.LAND);
- setObjectKind(ObjectKind.CULTURAL_FEATURE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/BuildingRubble/Base.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/BuildingRubble/Base.java
deleted file mode 100644
index 14a0a19eb6c498d814548d4917e3bb456af56e5c..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/BuildingRubble/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.BuildingRubble;
-
-import edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Category;
-
-abstract public class Base extends edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Base
-{
- public Base()
- {
- setCategory(Category.BUILDINGRUBBLE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/BuildingRubble/Other.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/BuildingRubble/Other.java
deleted file mode 100644
index a50537e05458e4cec236878d5e99dc2a11ade728..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/BuildingRubble/Other.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.BuildingRubble;
-
-/** Other (EntityType) */
-public class Other extends Base
-{
- public Other()
- {
- setSubcategory(SubCategory.OTHER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/BuildingRubble/SubCategory.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/BuildingRubble/SubCategory.java
deleted file mode 100644
index 42fe3cb49d189f528b805327668f3d032aa9f858..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/BuildingRubble/SubCategory.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.BuildingRubble;
-
-/* marshal size 8 bits */
-public class SubCategory
-{
- public static final byte OTHER = 0; // Othe
-}
-
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/ApartmentBuilding.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/ApartmentBuilding.java
deleted file mode 100644
index 4a9544eb8aa824b5218cc575bcc8a61b8e6497bd..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/ApartmentBuilding.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Building_Structure;
-
-/** Apartment Building (EntityType) */
-public class ApartmentBuilding extends Base
-{
- public ApartmentBuilding()
- {
- setSubcategory(SubCategory.APARTMENTBUILDING);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/Base.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/Base.java
deleted file mode 100644
index ed13e8755a1144a17502461412a74530b719cdc8..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Building_Structure;
-
-import edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Category;
-
-abstract public class Base extends edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Base
-{
- public Base()
- {
- setCategory(Category.BUILDING_STRUCTURE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/Church.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/Church.java
deleted file mode 100644
index 325fcd72b504ebe5627c8b3837d3a6cd114faf66..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/Church.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Building_Structure;
-
-/** Church (EntityType) */
-public class Church extends Base
-{
- public Church()
- {
- setSubcategory(SubCategory.CHURCH);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/FOB_GuardTower.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/FOB_GuardTower.java
deleted file mode 100644
index 181ee858ca772e29f21053bb9d7b11499223e348..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/FOB_GuardTower.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Building_Structure;
-
-/** FOB, Guard Tower (EntityType) */
-public class FOB_GuardTower extends Base
-{
- public FOB_GuardTower()
- {
- setSubcategory(SubCategory.FOB_GUARDTOWER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/FOB_TrailerOffice.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/FOB_TrailerOffice.java
deleted file mode 100644
index 0e43a2998e2ae23cdf41f55160026670ff247fcc..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/FOB_TrailerOffice.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Building_Structure;
-
-/** FOB, Trailer Office (EntityType) */
-public class FOB_TrailerOffice extends Base
-{
- public FOB_TrailerOffice()
- {
- setSubcategory(SubCategory.FOB_TRAILEROFFICE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/GovernmentBuilding.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/GovernmentBuilding.java
deleted file mode 100644
index 91d97dd6e6de3bdd5bc6970b03dcd7a3762a491e..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/GovernmentBuilding.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Building_Structure;
-
-/** Government Building (EntityType) */
-public class GovernmentBuilding extends Base
-{
- public GovernmentBuilding()
- {
- setSubcategory(SubCategory.GOVERNMENTBUILDING);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/GuardHouse.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/GuardHouse.java
deleted file mode 100644
index 54fdc3086edb11fbaa2c4f8f0a3ff29ba2d0cc53..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/GuardHouse.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Building_Structure;
-
-/** Guard House (EntityType) */
-public class GuardHouse extends Base
-{
- public GuardHouse()
- {
- setSubcategory(SubCategory.GUARDHOUSE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/Hanger.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/Hanger.java
deleted file mode 100644
index bf8271dec7bfbaa9a11396e252e718946e7bb14f..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/Hanger.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Building_Structure;
-
-/** Hanger (EntityType) */
-public class Hanger extends Base
-{
- public Hanger()
- {
- setSubcategory(SubCategory.HANGER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/IndustrialBuilding.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/IndustrialBuilding.java
deleted file mode 100644
index d8918482009d4c63f287a62cde41ad0e366ea797..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/IndustrialBuilding.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Building_Structure;
-
-/** Industrial Building (EntityType) */
-public class IndustrialBuilding extends Base
-{
- public IndustrialBuilding()
- {
- setSubcategory(SubCategory.INDUSTRIALBUILDING);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/MicrowaveTower.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/MicrowaveTower.java
deleted file mode 100644
index bff24ca5ba41d09323c6b74252f10eb551294b6c..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/MicrowaveTower.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Building_Structure;
-
-/** Microwave Tower (EntityType) */
-public class MicrowaveTower extends Base
-{
- public MicrowaveTower()
- {
- setSubcategory(SubCategory.MICROWAVETOWER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/Other.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/Other.java
deleted file mode 100644
index 5363167f5590859dfd618e2740cfa91d26db6bf3..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/Other.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Building_Structure;
-
-/** Other (EntityType) */
-public class Other extends Base
-{
- public Other()
- {
- setSubcategory(SubCategory.OTHER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/PortaPotty.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/PortaPotty.java
deleted file mode 100644
index 9c97f90b2751bd21b9a737e1249a461758d716a0..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/PortaPotty.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Building_Structure;
-
-/** Porta Potty (EntityType) */
-public class PortaPotty extends Base
-{
- public PortaPotty()
- {
- setSubcategory(SubCategory.PORTAPOTTY);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/PowerPylon.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/PowerPylon.java
deleted file mode 100644
index edc263fc52905377134ae0a3e735629248a936e2..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/PowerPylon.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Building_Structure;
-
-/** Power Pylon (EntityType) */
-public class PowerPylon extends Base
-{
- public PowerPylon()
- {
- setSubcategory(SubCategory.POWERPYLON);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/RadioTower_1000ft.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/RadioTower_1000ft.java
deleted file mode 100644
index 661c2afa50604906934794b19ad32720e5430edb..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/RadioTower_1000ft.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Building_Structure;
-
-/** Radio Tower, 1000ft (EntityType) */
-public class RadioTower_1000ft extends Base
-{
- public RadioTower_1000ft()
- {
- setSubcategory(SubCategory.RADIOTOWER_1000FT);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/RadioTower_100ft.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/RadioTower_100ft.java
deleted file mode 100644
index 85714835d1712554f510535e87d7cf224783d682..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/RadioTower_100ft.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Building_Structure;
-
-/** Radio Tower, 100ft (EntityType) */
-public class RadioTower_100ft extends Base
-{
- public RadioTower_100ft()
- {
- setSubcategory(SubCategory.RADIOTOWER_100FT);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/RadioTower_500ft.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/RadioTower_500ft.java
deleted file mode 100644
index 62654a05cacefd2b4d917a781132b599a08b40eb..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/RadioTower_500ft.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Building_Structure;
-
-/** Radio Tower, 500ft (EntityType) */
-public class RadioTower_500ft extends Base
-{
- public RadioTower_500ft()
- {
- setSubcategory(SubCategory.RADIOTOWER_500FT);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/Radio_TVTower.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/Radio_TVTower.java
deleted file mode 100644
index c21fec1c227963d3645131722e72021d026f64a6..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/Radio_TVTower.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Building_Structure;
-
-/** Radio / TV Tower (EntityType) */
-public class Radio_TVTower extends Base
-{
- public Radio_TVTower()
- {
- setSubcategory(SubCategory.RADIO_TVTOWER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/School.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/School.java
deleted file mode 100644
index f414d618594eae9be0cc74cd660efc155349b20a..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/School.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Building_Structure;
-
-/** School (EntityType) */
-public class School extends Base
-{
- public School()
- {
- setSubcategory(SubCategory.SCHOOL);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/SubCategory.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/SubCategory.java
deleted file mode 100644
index 69e7a840e13e9055be4e0004b4da288894c4311b..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/SubCategory.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Building_Structure;
-
-/* marshal size 8 bits */
-public class SubCategory
-{
- public static final byte OTHER = 0; // Other
- public static final byte CHURCH = 1; // Church
- public static final byte APARTMENTBUILDING = 2; // Apartment Building
- public static final byte GOVERNMENTBUILDING = 3; // Government Building
- public static final byte INDUSTRIALBUILDING = 4; // Industrial Building
- public static final byte HANGER = 5; // Hanger
- public static final byte MICROWAVETOWER = 6; // Microwave Tower
- public static final byte POWERPYLON = 7; // Power Pylon
- public static final byte RADIO_TVTOWER = 8; // Radio / TV Tower
- public static final byte SCHOOL = 9; // School
- public static final byte TRANSFORMERYARD = 10; // Transformer Yard
- public static final byte RADIOTOWER_100FT = 12; // Radio Tower, 100ft
- public static final byte RADIOTOWER_500FT = 13; // Radio Tower, 500ft
- public static final byte RADIOTOWER_1000FT = 14; // Radio Tower, 1000ft
- public static final byte PORTAPOTTY = 15; // Porta Potty
- public static final byte FOB_TRAILEROFFICE = 16; // FOB, Trailer Office
- public static final byte FOB_GUARDTOWER = 17; // FOB, Guard Tower
- public static final byte GUARDHOUSE = 18; // Guard House
- public static final byte WINDMILL = 19; // Windmil
-}
-
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/TransformerYard.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/TransformerYard.java
deleted file mode 100644
index e5d19230e8f28e17cf325d3c706cc8671e51f778..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/TransformerYard.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Building_Structure;
-
-/** Transformer Yard (EntityType) */
-public class TransformerYard extends Base
-{
- public TransformerYard()
- {
- setSubcategory(SubCategory.TRANSFORMERYARD);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/Windmill.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/Windmill.java
deleted file mode 100644
index b7588628ef981ad38f800c628225d887b719bf16..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Building_Structure/Windmill.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Building_Structure;
-
-/** Windmill (EntityType) */
-public class Windmill extends Base
-{
- public Windmill()
- {
- setSubcategory(SubCategory.WINDMILL);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Category.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Category.java
deleted file mode 100644
index 56cedd0222b94ef96b8975a72216c2f9d8d86a30..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Category.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature;
-
-/* marshal size 8 bits */
-public class Category
-{
- public static final byte OTHER = 0; // Other
- public static final byte BUILDING_STRUCTURE = 1; // Building / Structure
- public static final byte BUILDINGRUBBLE = 2; // Building Rubble
- public static final byte DISTURBEDEARTH = 3; // Disturbed Earth
- public static final byte DISTURBEDROAD = 4; // Disturbed Road
- public static final byte TENT = 5; // Tent
- public static final byte MAINTENANCESTRUCTURE = 6; // Maintenance Structure
- public static final byte MOUTBUILDING = 7; // MOUT Building
- public static final byte CONTAINER_BASEDBUILDING = 8; // Container-Based Building
- public static final byte TREE_DECIDUOUS = 10; // Tree, Deciduous
- public static final byte TREE_EVERGREEN = 11; // Tree, Evergreen
- public static final byte PUMP = 12; // Pump
- public static final byte INDUSTRIALPROCESSINGPLANT = 13; // Industrial Processing Plant
- public static final byte UTILITYPOLE = 14; // Utility Pol
-}
-
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Container_BasedBuilding/Base.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Container_BasedBuilding/Base.java
deleted file mode 100644
index d10298d9c228532961b5ba66552a4bc008967fe3..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Container_BasedBuilding/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Container_BasedBuilding;
-
-import edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Category;
-
-abstract public class Base extends edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Base
-{
- public Base()
- {
- setCategory(Category.CONTAINER_BASEDBUILDING);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding_Bridge_Single.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding_Bridge_Single.java
deleted file mode 100644
index ae8e4b86eca50112ce76d841cdcc64a7b1e3f58f..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding_Bridge_Single.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Container_BasedBuilding;
-
-/** Container-Based Building, Bridge, Single (EntityType) */
-public class Container_BasedBuilding_Bridge_Single extends Base
-{
- public Container_BasedBuilding_Bridge_Single()
- {
- setSubcategory(SubCategory.CONTAINER_BASEDBUILDING_BRIDGE_SINGLE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding_FOB.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding_FOB.java
deleted file mode 100644
index e97087f48f32d5aea2538a54d066b303e06c7363..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding_FOB.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Container_BasedBuilding;
-
-/** Container-Based Building, FOB (EntityType) */
-public class Container_BasedBuilding_FOB extends Base
-{
- public Container_BasedBuilding_FOB()
- {
- setSubcategory(SubCategory.CONTAINER_BASEDBUILDING_FOB);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding_House_Double.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding_House_Double.java
deleted file mode 100644
index b77398b8dbacfa91f650eef12f76ddde61569ce8..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding_House_Double.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Container_BasedBuilding;
-
-/** Container-Based Building, House, Double (EntityType) */
-public class Container_BasedBuilding_House_Double extends Base
-{
- public Container_BasedBuilding_House_Double()
- {
- setSubcategory(SubCategory.CONTAINER_BASEDBUILDING_HOUSE_DOUBLE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding_House_Single.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding_House_Single.java
deleted file mode 100644
index 5bccf79444f0cbbd608b973cc79f50ca50d30121..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding_House_Single.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Container_BasedBuilding;
-
-/** Container-Based Building, House, Single (EntityType) */
-public class Container_BasedBuilding_House_Single extends Base
-{
- public Container_BasedBuilding_House_Single()
- {
- setSubcategory(SubCategory.CONTAINER_BASEDBUILDING_HOUSE_SINGLE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding_House_Single_Railing.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding_House_Single_Railing.java
deleted file mode 100644
index 5f67a3f5f2e95174d93dcb0ff1713649b80229d3..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding_House_Single_Railing.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Container_BasedBuilding;
-
-/** Container-Based Building, House, Single, Railing (EntityType) */
-public class Container_BasedBuilding_House_Single_Railing extends Base
-{
- public Container_BasedBuilding_House_Single_Railing()
- {
- setSubcategory(SubCategory.CONTAINER_BASEDBUILDING_HOUSE_SINGLE_RAILING);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding_Mosque_Single.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding_Mosque_Single.java
deleted file mode 100644
index fee0a3a16c7f50cdce2c61f281792d946543619a..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding_Mosque_Single.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Container_BasedBuilding;
-
-/** Container-Based Building, Mosque, Single (EntityType) */
-public class Container_BasedBuilding_Mosque_Single extends Base
-{
- public Container_BasedBuilding_Mosque_Single()
- {
- setSubcategory(SubCategory.CONTAINER_BASEDBUILDING_MOSQUE_SINGLE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding_Store_Single.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding_Store_Single.java
deleted file mode 100644
index fd761e2a01752789cec40dfcf5e1f5f2cc8476dc..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding_Store_Single.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Container_BasedBuilding;
-
-/** Container-Based Building, Store, Single (EntityType) */
-public class Container_BasedBuilding_Store_Single extends Base
-{
- public Container_BasedBuilding_Store_Single()
- {
- setSubcategory(SubCategory.CONTAINER_BASEDBUILDING_STORE_SINGLE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Container_BasedBuilding/SubCategory.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Container_BasedBuilding/SubCategory.java
deleted file mode 100644
index b2dc2051f2baac2e8d5e48d054bbbe30bc772ba5..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Container_BasedBuilding/SubCategory.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Container_BasedBuilding;
-
-/* marshal size 8 bits */
-public class SubCategory
-{
- public static final byte CONTAINER_BASEDBUILDING_STORE_SINGLE = 1; // Container-Based Building, Store, Single
- public static final byte CONTAINER_BASEDBUILDING_HOUSE_SINGLE = 2; // Container-Based Building, House, Single
- public static final byte CONTAINER_BASEDBUILDING_HOUSE_SINGLE_RAILING = 3; // Container-Based Building, House, Single, Railing
- public static final byte CONTAINER_BASEDBUILDING_HOUSE_DOUBLE = 4; // Container-Based Building, House, Double
- public static final byte CONTAINER_BASEDBUILDING_MOSQUE_SINGLE = 5; // Container-Based Building, Mosque, Single
- public static final byte CONTAINER_BASEDBUILDING_BRIDGE_SINGLE = 6; // Container-Based Building, Bridge, Single
- public static final byte CONTAINER_BASEDBUILDING_FOB = 7; // Container-Based Building, FO
-}
-
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/DisturbedEarth.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/DisturbedEarth.java
deleted file mode 100644
index 382ab86c508d655ad6274a53201e8ece1553336f..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/DisturbedEarth.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature;
-
-/** Disturbed Earth (EntityType) */
-public class DisturbedEarth extends Base
-{
- public DisturbedEarth()
- {
- setCategory(Category.DISTURBEDEARTH);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/DisturbedRoad/Base.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/DisturbedRoad/Base.java
deleted file mode 100644
index def448a095400d68fdfcda8e3ca2650b11a441e5..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/DisturbedRoad/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.DisturbedRoad;
-
-import edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Category;
-
-abstract public class Base extends edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Base
-{
- public Base()
- {
- setCategory(Category.DISTURBEDROAD);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/DisturbedRoad/DisturbedRoad_Asphalt.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/DisturbedRoad/DisturbedRoad_Asphalt.java
deleted file mode 100644
index bd74d5c537a32e0543c38794e29be2b02d677d2f..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/DisturbedRoad/DisturbedRoad_Asphalt.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.DisturbedRoad;
-
-/** Disturbed Road, Asphalt (EntityType) */
-public class DisturbedRoad_Asphalt extends Base
-{
- public DisturbedRoad_Asphalt()
- {
- setSubcategory(SubCategory.DISTURBEDROAD_ASPHALT);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/DisturbedRoad/DisturbedRoad_Concrete.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/DisturbedRoad/DisturbedRoad_Concrete.java
deleted file mode 100644
index 8bf8af006dcd8a7b65a492d800d290e05f8a6703..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/DisturbedRoad/DisturbedRoad_Concrete.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.DisturbedRoad;
-
-/** Disturbed Road, Concrete (EntityType) */
-public class DisturbedRoad_Concrete extends Base
-{
- public DisturbedRoad_Concrete()
- {
- setSubcategory(SubCategory.DISTURBEDROAD_CONCRETE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/DisturbedRoad/DisturbedRoad_Gravel.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/DisturbedRoad/DisturbedRoad_Gravel.java
deleted file mode 100644
index 2a3f33c47d7a3b33eecfa6975d121004b605feb5..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/DisturbedRoad/DisturbedRoad_Gravel.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.DisturbedRoad;
-
-/** Disturbed Road, Gravel (EntityType) */
-public class DisturbedRoad_Gravel extends Base
-{
- public DisturbedRoad_Gravel()
- {
- setSubcategory(SubCategory.DISTURBEDROAD_GRAVEL);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/DisturbedRoad/SubCategory.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/DisturbedRoad/SubCategory.java
deleted file mode 100644
index e6ca90b6a948db8a0714f7622915cb7e0023d701..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/DisturbedRoad/SubCategory.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.DisturbedRoad;
-
-/* marshal size 8 bits */
-public class SubCategory
-{
- public static final byte DISTURBEDROAD_GRAVEL = 1; // Disturbed Road, Gravel
- public static final byte DISTURBEDROAD_ASPHALT = 2; // Disturbed Road, Asphalt
- public static final byte DISTURBEDROAD_CONCRETE = 3; // Disturbed Road, Concret
-}
-
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/IndustrialProcessingPlant/Base.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/IndustrialProcessingPlant/Base.java
deleted file mode 100644
index 5ef03434a9439ab5ee8b4b68d9b02a84d1efdfa2..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/IndustrialProcessingPlant/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.IndustrialProcessingPlant;
-
-import edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Category;
-
-abstract public class Base extends edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Base
-{
- public Base()
- {
- setCategory(Category.INDUSTRIALPROCESSINGPLANT);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/IndustrialProcessingPlant/OilRefinery.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/IndustrialProcessingPlant/OilRefinery.java
deleted file mode 100644
index ce295b5b963e01d930cc34e8a4ec125b432f2c09..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/IndustrialProcessingPlant/OilRefinery.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.IndustrialProcessingPlant;
-
-/** Oil Refinery (EntityType) */
-public class OilRefinery extends Base
-{
- public OilRefinery()
- {
- setSubcategory(SubCategory.OILREFINERY);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/IndustrialProcessingPlant/SubCategory.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/IndustrialProcessingPlant/SubCategory.java
deleted file mode 100644
index ddc5a90e14c6a29906915c090335c9163d51bca4..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/IndustrialProcessingPlant/SubCategory.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.IndustrialProcessingPlant;
-
-/* marshal size 8 bits */
-public class SubCategory
-{
- public static final byte OILREFINERY = 1; // Oil Refinery
-}
-
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/Base.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/Base.java
deleted file mode 100644
index 7a8519a8b7150d86669a8ba7845159aa67ab05cf..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.MOUTBuilding;
-
-import edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Category;
-
-abstract public class Base extends edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Base
-{
- public Base()
- {
- setCategory(Category.MOUTBUILDING);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_Apartment.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_Apartment.java
deleted file mode 100644
index ed4a46da18f4534fe0480603f2f7d71d79f6ef93..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_Apartment.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.MOUTBuilding;
-
-/** MOUT Building, Apartment (EntityType) */
-public class MOUTBuilding_Apartment extends Base
-{
- public MOUTBuilding_Apartment()
- {
- setSubcategory(SubCategory.MOUTBUILDING_APARTMENT);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_Church.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_Church.java
deleted file mode 100644
index 97cc7c631ddbaa8b5544c315be3dcc657e3962ce..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_Church.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.MOUTBuilding;
-
-/** MOUT Building, Church (EntityType) */
-public class MOUTBuilding_Church extends Base
-{
- public MOUTBuilding_Church()
- {
- setSubcategory(SubCategory.MOUTBUILDING_CHURCH);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_ControlTower.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_ControlTower.java
deleted file mode 100644
index d8fd97d33cfdfce76338788fb7792608248024a3..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_ControlTower.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.MOUTBuilding;
-
-/** MOUT Building, Control Tower (EntityType) */
-public class MOUTBuilding_ControlTower extends Base
-{
- public MOUTBuilding_ControlTower()
- {
- setSubcategory(SubCategory.MOUTBUILDING_CONTROLTOWER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_FarmHouse.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_FarmHouse.java
deleted file mode 100644
index 45a46eedab3cf313709d712a3989938f2579de6c..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_FarmHouse.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.MOUTBuilding;
-
-/** MOUT Building, Farm House (EntityType) */
-public class MOUTBuilding_FarmHouse extends Base
-{
- public MOUTBuilding_FarmHouse()
- {
- setSubcategory(SubCategory.MOUTBUILDING_FARMHOUSE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_FireStation.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_FireStation.java
deleted file mode 100644
index f9d4f80bde5c5fe2a0b31e314bf46c357684032a..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_FireStation.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.MOUTBuilding;
-
-/** MOUT Building, Fire Station (EntityType) */
-public class MOUTBuilding_FireStation extends Base
-{
- public MOUTBuilding_FireStation()
- {
- setSubcategory(SubCategory.MOUTBUILDING_FIRESTATION);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_GasStation.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_GasStation.java
deleted file mode 100644
index 0c6c0e74b84d3d2c0006e6144426357e7915d710..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_GasStation.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.MOUTBuilding;
-
-/** MOUT Building, Gas Station (EntityType) */
-public class MOUTBuilding_GasStation extends Base
-{
- public MOUTBuilding_GasStation()
- {
- setSubcategory(SubCategory.MOUTBUILDING_GASSTATION);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_Hospital.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_Hospital.java
deleted file mode 100644
index 0d30e68c8ff0910ffa1ad5e7cf98314dd4a11689..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_Hospital.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.MOUTBuilding;
-
-/** MOUT Building, Hospital (EntityType) */
-public class MOUTBuilding_Hospital extends Base
-{
- public MOUTBuilding_Hospital()
- {
- setSubcategory(SubCategory.MOUTBUILDING_HOSPITAL);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_House.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_House.java
deleted file mode 100644
index edf931055b6c1ef26f791fdcd6386e5f9c2506d2..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_House.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.MOUTBuilding;
-
-/** MOUT Building, House (EntityType) */
-public class MOUTBuilding_House extends Base
-{
- public MOUTBuilding_House()
- {
- setSubcategory(SubCategory.MOUTBUILDING_HOUSE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_MudbrickHouse.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_MudbrickHouse.java
deleted file mode 100644
index aba43178b0f47bb70b60a72cfdc4147dae24c05f..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_MudbrickHouse.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.MOUTBuilding;
-
-/** MOUT Building, Mudbrick House (EntityType) */
-public class MOUTBuilding_MudbrickHouse extends Base
-{
- public MOUTBuilding_MudbrickHouse()
- {
- setSubcategory(SubCategory.MOUTBUILDING_MUDBRICKHOUSE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_MudbrickStore.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_MudbrickStore.java
deleted file mode 100644
index dcf6365dcca6b2a7466d56274844cd5177d05920..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_MudbrickStore.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.MOUTBuilding;
-
-/** MOUT Building, Mudbrick Store (EntityType) */
-public class MOUTBuilding_MudbrickStore extends Base
-{
- public MOUTBuilding_MudbrickStore()
- {
- setSubcategory(SubCategory.MOUTBUILDING_MUDBRICKSTORE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_OfficeBuilding.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_OfficeBuilding.java
deleted file mode 100644
index 1e03b9e3e57edc52da749bfae610ba9199016ffc..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_OfficeBuilding.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.MOUTBuilding;
-
-/** MOUT Building, Office Building (EntityType) */
-public class MOUTBuilding_OfficeBuilding extends Base
-{
- public MOUTBuilding_OfficeBuilding()
- {
- setSubcategory(SubCategory.MOUTBUILDING_OFFICEBUILDING);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_PoliceStation.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_PoliceStation.java
deleted file mode 100644
index ac4bbe12a2a8bdefed3e996e083d513848077547..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_PoliceStation.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.MOUTBuilding;
-
-/** MOUT Building, Police Station (EntityType) */
-public class MOUTBuilding_PoliceStation extends Base
-{
- public MOUTBuilding_PoliceStation()
- {
- setSubcategory(SubCategory.MOUTBUILDING_POLICESTATION);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_PowerStation.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_PowerStation.java
deleted file mode 100644
index e99fecbc2dfcd0d1e34a1da4ba258eb79a1d4f22..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_PowerStation.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.MOUTBuilding;
-
-/** MOUT Building, Power Station (EntityType) */
-public class MOUTBuilding_PowerStation extends Base
-{
- public MOUTBuilding_PowerStation()
- {
- setSubcategory(SubCategory.MOUTBUILDING_POWERSTATION);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_School.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_School.java
deleted file mode 100644
index ec95914eb2beb8a7fd9f9367ade11f3a0f2627ae..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_School.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.MOUTBuilding;
-
-/** MOUT Building, School (EntityType) */
-public class MOUTBuilding_School extends Base
-{
- public MOUTBuilding_School()
- {
- setSubcategory(SubCategory.MOUTBUILDING_SCHOOL);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_Store.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_Store.java
deleted file mode 100644
index 962a2739ddca7edba70746af20e997879588df3f..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_Store.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.MOUTBuilding;
-
-/** MOUT Building, Store (EntityType) */
-public class MOUTBuilding_Store extends Base
-{
- public MOUTBuilding_Store()
- {
- setSubcategory(SubCategory.MOUTBUILDING_STORE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_Warehouse.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_Warehouse.java
deleted file mode 100644
index 0d2f361b898dafc8cbdff6c6dc1253eeb372f2a5..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_Warehouse.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.MOUTBuilding;
-
-/** MOUT Building, Warehouse (EntityType) */
-public class MOUTBuilding_Warehouse extends Base
-{
- public MOUTBuilding_Warehouse()
- {
- setSubcategory(SubCategory.MOUTBUILDING_WAREHOUSE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_WaterTower.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_WaterTower.java
deleted file mode 100644
index 7cc37abd766f9d87507ab6baa9453ff3b73185d3..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding_WaterTower.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.MOUTBuilding;
-
-/** MOUT Building, Water Tower (EntityType) */
-public class MOUTBuilding_WaterTower extends Base
-{
- public MOUTBuilding_WaterTower()
- {
- setSubcategory(SubCategory.MOUTBUILDING_WATERTOWER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/SubCategory.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/SubCategory.java
deleted file mode 100644
index 1badfcba0d3542b252d9c033d8b83d84ce3b28c7..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MOUTBuilding/SubCategory.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.MOUTBuilding;
-
-/* marshal size 8 bits */
-public class SubCategory
-{
- public static final byte MOUTBUILDING_HOUSE = 1; // MOUT Building, House
- public static final byte MOUTBUILDING_HOSPITAL = 2; // MOUT Building, Hospital
- public static final byte MOUTBUILDING_GASSTATION = 3; // MOUT Building, Gas Station
- public static final byte MOUTBUILDING_STORE = 4; // MOUT Building, Store
- public static final byte MOUTBUILDING_OFFICEBUILDING = 5; // MOUT Building, Office Building
- public static final byte MOUTBUILDING_WAREHOUSE = 6; // MOUT Building, Warehouse
- public static final byte MOUTBUILDING_CONTROLTOWER = 7; // MOUT Building, Control Tower
- public static final byte MOUTBUILDING_WATERTOWER = 8; // MOUT Building, Water Tower
- public static final byte MOUTBUILDING_POLICESTATION = 9; // MOUT Building, Police Station
- public static final byte MOUTBUILDING_FIRESTATION = 10; // MOUT Building, Fire Station
- public static final byte MOUTBUILDING_POWERSTATION = 11; // MOUT Building, Power Station
- public static final byte MOUTBUILDING_APARTMENT = 12; // MOUT Building, Apartment
- public static final byte MOUTBUILDING_SCHOOL = 13; // MOUT Building, School
- public static final byte MOUTBUILDING_CHURCH = 14; // MOUT Building, Church
- public static final byte MOUTBUILDING_FARMHOUSE = 15; // MOUT Building, Farm House
- public static final byte MOUTBUILDING_MUDBRICKHOUSE = 16; // MOUT Building, Mudbrick House
- public static final byte MOUTBUILDING_MUDBRICKSTORE = 17; // MOUT Building, Mudbrick Stor
-}
-
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MaintenanceStructure/Base.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MaintenanceStructure/Base.java
deleted file mode 100644
index d60047ad9eb7eeb209732d08e0fee96c5abd382a..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MaintenanceStructure/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.MaintenanceStructure;
-
-import edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Category;
-
-abstract public class Base extends edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Base
-{
- public Base()
- {
- setCategory(Category.MAINTENANCESTRUCTURE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MaintenanceStructure/LargeAreaMaintenanceShelterLAMSAviationMaintenanceAM.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MaintenanceStructure/LargeAreaMaintenanceShelterLAMSAviationMaintenanceAM.java
deleted file mode 100644
index bfc94534cc0630884abfea280b5bac589ff9a9ee..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MaintenanceStructure/LargeAreaMaintenanceShelterLAMSAviationMaintenanceAM.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.MaintenanceStructure;
-
-/** Large Area Maintenance Shelter (LAMS) Aviation Maintenance (AM) (EntityType) */
-public class LargeAreaMaintenanceShelterLAMSAviationMaintenanceAM extends Base
-{
- public LargeAreaMaintenanceShelterLAMSAviationMaintenanceAM()
- {
- setSubcategory(SubCategory.LARGEAREAMAINTENANCESHELTERLAMSAVIATIONMAINTENANCEAM);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MaintenanceStructure/LargeAreaMaintenanceShelterLAMSVehicleMaintenanceVM.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MaintenanceStructure/LargeAreaMaintenanceShelterLAMSVehicleMaintenanceVM.java
deleted file mode 100644
index 0e0d1d0446b1cd26cd12624e1c95163c932e5474..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MaintenanceStructure/LargeAreaMaintenanceShelterLAMSVehicleMaintenanceVM.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.MaintenanceStructure;
-
-/** Large Area Maintenance Shelter (LAMS) Vehicle Maintenance (VM) (EntityType) */
-public class LargeAreaMaintenanceShelterLAMSVehicleMaintenanceVM extends Base
-{
- public LargeAreaMaintenanceShelterLAMSVehicleMaintenanceVM()
- {
- setSubcategory(SubCategory.LARGEAREAMAINTENANCESHELTERLAMSVEHICLEMAINTENANCEVM);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MaintenanceStructure/LightweightMaintenanceEnclosureLME_Bradley.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MaintenanceStructure/LightweightMaintenanceEnclosureLME_Bradley.java
deleted file mode 100644
index dd4bba591d3857a522856c7eae4e45ffc9fb8b7b..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MaintenanceStructure/LightweightMaintenanceEnclosureLME_Bradley.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.MaintenanceStructure;
-
-/** Lightweight Maintenance Enclosure (LME), Bradley (EntityType) */
-public class LightweightMaintenanceEnclosureLME_Bradley extends Base
-{
- public LightweightMaintenanceEnclosureLME_Bradley()
- {
- setSubcategory(SubCategory.LIGHTWEIGHTMAINTENANCEENCLOSURELME_BRADLEY);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MaintenanceStructure/LightweightMaintenanceEnclosureLME_M1.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MaintenanceStructure/LightweightMaintenanceEnclosureLME_M1.java
deleted file mode 100644
index 4b6417135560945c8044e4733f0b00ef78b806e4..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MaintenanceStructure/LightweightMaintenanceEnclosureLME_M1.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.MaintenanceStructure;
-
-/** Lightweight Maintenance Enclosure (LME), M1 (EntityType) */
-public class LightweightMaintenanceEnclosureLME_M1 extends Base
-{
- public LightweightMaintenanceEnclosureLME_M1()
- {
- setSubcategory(SubCategory.LIGHTWEIGHTMAINTENANCEENCLOSURELME_M1);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MaintenanceStructure/SubCategory.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MaintenanceStructure/SubCategory.java
deleted file mode 100644
index 3cf016d5d35c143037deea3dd0f322d11729ed86..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/MaintenanceStructure/SubCategory.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.MaintenanceStructure;
-
-/* marshal size 8 bits */
-public class SubCategory
-{
- public static final byte LIGHTWEIGHTMAINTENANCEENCLOSURELME_BRADLEY = 1; // Lightweight Maintenance Enclosure (LME), Bradley
- public static final byte LIGHTWEIGHTMAINTENANCEENCLOSURELME_M1 = 2; // Lightweight Maintenance Enclosure (LME), M1
- public static final byte LARGEAREAMAINTENANCESHELTERLAMSVEHICLEMAINTENANCEVM = 3; // Large Area Maintenance Shelter (LAMS) Vehicle Maintenance (VM)
- public static final byte LARGEAREAMAINTENANCESHELTERLAMSAVIATIONMAINTENANCEAM = 4; // Large Area Maintenance Shelter (LAMS) Aviation Maintenance (AM
-}
-
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Other.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Other.java
deleted file mode 100644
index e69c59692f21f0c7b2b3517b97dd131e0645a203..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Other.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature;
-
-/** Other (EntityType) */
-public class Other extends Base
-{
- public Other()
- {
- setCategory(Category.OTHER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Pump/Base.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Pump/Base.java
deleted file mode 100644
index 0c54c7b55450a1611564c352a461ea1b1cd7788e..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Pump/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Pump;
-
-import edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Category;
-
-abstract public class Base extends edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Base
-{
- public Base()
- {
- setCategory(Category.PUMP);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Pump/Pump_Gas.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Pump/Pump_Gas.java
deleted file mode 100644
index c7dc0d04d5b5b1f80832472633c4a59454cdf1a5..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Pump/Pump_Gas.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Pump;
-
-/** Pump, Gas (EntityType) */
-public class Pump_Gas extends Base
-{
- public Pump_Gas()
- {
- setSubcategory(SubCategory.PUMP_GAS);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Pump/SubCategory.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Pump/SubCategory.java
deleted file mode 100644
index 24a905cd8c0df9b76ce20f845f0b50102165a0bc..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Pump/SubCategory.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Pump;
-
-/* marshal size 8 bits */
-public class SubCategory
-{
- public static final byte PUMP_GAS = 1; // Pump, Ga
-}
-
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tent/Base.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tent/Base.java
deleted file mode 100644
index ca114ea13de4b8c4bba2e0f1261792889392386b..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tent/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Tent;
-
-import edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Category;
-
-abstract public class Base extends edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Base
-{
- public Base()
- {
- setCategory(Category.TENT);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tent/SubCategory.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tent/SubCategory.java
deleted file mode 100644
index a31cd933c4ecfcdd5f215ee1762d49db404f5615..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tent/SubCategory.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Tent;
-
-/* marshal size 8 bits */
-public class SubCategory
-{
- public static final byte TENT_SMALL = 1; // Tent, Small
- public static final byte TENT_MEDIUM = 2; // Tent, Medium
- public static final byte TENT_LARGE = 3; // Tent, Large
- public static final byte TENT_MODULARGENERALPURPOSETENTSYSTEMMGPTS = 4; // Tent, Modular General Purpose Tent System (MGPTS)
- public static final byte TENT_ARCTIC = 5; // Tent, Arctic
- public static final byte TENT_TEMPER = 6; // Tent, TEMPER
- public static final byte TENT_EXPANDABLEFRAME = 7; // Tent, Expandable Frame
- public static final byte TENT_FRITSCHE = 8; // Tent, Fritsche
- public static final byte TENT_BEDOUIN = 9; // Tent, Bedouin
- public static final byte TENT_CHEMICALLYANDBIOLOGICALPROTECTEDSHELTERCBPS = 10; // Tent, Chemically and Biological Protected Shelter (CBPS)
- public static final byte TENT_KUCHI = 11; // Tent, Kuch
-}
-
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tent/Tent_Arctic.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tent/Tent_Arctic.java
deleted file mode 100644
index c4f5111852250c28fd8df5f721ecf83321185157..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tent/Tent_Arctic.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Tent;
-
-/** Tent, Arctic (EntityType) */
-public class Tent_Arctic extends Base
-{
- public Tent_Arctic()
- {
- setSubcategory(SubCategory.TENT_ARCTIC);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tent/Tent_Bedouin.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tent/Tent_Bedouin.java
deleted file mode 100644
index 4c1d5d83eb7195b27d60d8774ac3d0b33232bb30..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tent/Tent_Bedouin.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Tent;
-
-/** Tent, Bedouin (EntityType) */
-public class Tent_Bedouin extends Base
-{
- public Tent_Bedouin()
- {
- setSubcategory(SubCategory.TENT_BEDOUIN);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tent/Tent_ChemicallyandBiologicalProtectedShelterCBPS.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tent/Tent_ChemicallyandBiologicalProtectedShelterCBPS.java
deleted file mode 100644
index 81dfc684cb72c82d19a609ab241316c6032655d7..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tent/Tent_ChemicallyandBiologicalProtectedShelterCBPS.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Tent;
-
-/** Tent, Chemically and Biological Protected Shelter (CBPS) (EntityType) */
-public class Tent_ChemicallyandBiologicalProtectedShelterCBPS extends Base
-{
- public Tent_ChemicallyandBiologicalProtectedShelterCBPS()
- {
- setSubcategory(SubCategory.TENT_CHEMICALLYANDBIOLOGICALPROTECTEDSHELTERCBPS);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tent/Tent_ExpandableFrame.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tent/Tent_ExpandableFrame.java
deleted file mode 100644
index 0b395663720a69481f47e0daf1e861f1e3f7635f..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tent/Tent_ExpandableFrame.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Tent;
-
-/** Tent, Expandable Frame (EntityType) */
-public class Tent_ExpandableFrame extends Base
-{
- public Tent_ExpandableFrame()
- {
- setSubcategory(SubCategory.TENT_EXPANDABLEFRAME);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tent/Tent_Fritsche.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tent/Tent_Fritsche.java
deleted file mode 100644
index 2ea8e5c4a810c3bd72a6bab87d5a1512431f9220..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tent/Tent_Fritsche.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Tent;
-
-/** Tent, Fritsche (EntityType) */
-public class Tent_Fritsche extends Base
-{
- public Tent_Fritsche()
- {
- setSubcategory(SubCategory.TENT_FRITSCHE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tent/Tent_Kuchi.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tent/Tent_Kuchi.java
deleted file mode 100644
index e9dc9591ff46839258807cf014363aa5f8a145b2..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tent/Tent_Kuchi.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Tent;
-
-/** Tent, Kuchi (EntityType) */
-public class Tent_Kuchi extends Base
-{
- public Tent_Kuchi()
- {
- setSubcategory(SubCategory.TENT_KUCHI);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tent/Tent_Large.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tent/Tent_Large.java
deleted file mode 100644
index f0988b6a32c127d50c83309c2e46bd22d6f722ee..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tent/Tent_Large.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Tent;
-
-/** Tent, Large (EntityType) */
-public class Tent_Large extends Base
-{
- public Tent_Large()
- {
- setSubcategory(SubCategory.TENT_LARGE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tent/Tent_Medium.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tent/Tent_Medium.java
deleted file mode 100644
index 2d284b04d1f7a254f610f3b6f61121177fee59bc..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tent/Tent_Medium.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Tent;
-
-/** Tent, Medium (EntityType) */
-public class Tent_Medium extends Base
-{
- public Tent_Medium()
- {
- setSubcategory(SubCategory.TENT_MEDIUM);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tent/Tent_ModularGeneralPurposeTentSystemMGPTS.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tent/Tent_ModularGeneralPurposeTentSystemMGPTS.java
deleted file mode 100644
index 39cf6c9d0c4b5c5410484ea0f9cf7767f9c7b1ec..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tent/Tent_ModularGeneralPurposeTentSystemMGPTS.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Tent;
-
-/** Tent, Modular General Purpose Tent System (MGPTS) (EntityType) */
-public class Tent_ModularGeneralPurposeTentSystemMGPTS extends Base
-{
- public Tent_ModularGeneralPurposeTentSystemMGPTS()
- {
- setSubcategory(SubCategory.TENT_MODULARGENERALPURPOSETENTSYSTEMMGPTS);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tent/Tent_Small.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tent/Tent_Small.java
deleted file mode 100644
index fccd2f0c42e85d72a8cce12718448d904cbae5a2..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tent/Tent_Small.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Tent;
-
-/** Tent, Small (EntityType) */
-public class Tent_Small extends Base
-{
- public Tent_Small()
- {
- setSubcategory(SubCategory.TENT_SMALL);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tent/Tent_TEMPER.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tent/Tent_TEMPER.java
deleted file mode 100644
index 34946bf3c89e7ab7432c7ef5a2d133f671814881..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tent/Tent_TEMPER.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Tent;
-
-/** Tent, TEMPER (EntityType) */
-public class Tent_TEMPER extends Base
-{
- public Tent_TEMPER()
- {
- setSubcategory(SubCategory.TENT_TEMPER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tree_Deciduous/Base.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tree_Deciduous/Base.java
deleted file mode 100644
index 505ba091d159c0c5e5198802d5c1b9faef7cab9a..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tree_Deciduous/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Tree_Deciduous;
-
-import edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Category;
-
-abstract public class Base extends edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Base
-{
- public Base()
- {
- setCategory(Category.TREE_DECIDUOUS);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tree_Deciduous/SubCategory.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tree_Deciduous/SubCategory.java
deleted file mode 100644
index 50d5ed4009827f9e46eb1936470662e102368996..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tree_Deciduous/SubCategory.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Tree_Deciduous;
-
-/* marshal size 8 bits */
-public class SubCategory
-{
- public static final byte TREE_DECIDUOUS_SMALL = 1; // Tree, Deciduous, Small
- public static final byte TREE_DECIDUOUS_MEDIUM = 2; // Tree, Deciduous, Medium
- public static final byte TREE_DECIDUOUS_LARGE = 3; // Tree, Deciduous, Larg
-}
-
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tree_Deciduous/Tree_Deciduous_Large.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tree_Deciduous/Tree_Deciduous_Large.java
deleted file mode 100644
index 53bd03aa353192c895272763158c1b91990d1ae5..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tree_Deciduous/Tree_Deciduous_Large.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Tree_Deciduous;
-
-/** Tree, Deciduous, Large (EntityType) */
-public class Tree_Deciduous_Large extends Base
-{
- public Tree_Deciduous_Large()
- {
- setSubcategory(SubCategory.TREE_DECIDUOUS_LARGE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tree_Deciduous/Tree_Deciduous_Medium.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tree_Deciduous/Tree_Deciduous_Medium.java
deleted file mode 100644
index f6b93b96d18457596abf645a0b53f420a8223cc2..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tree_Deciduous/Tree_Deciduous_Medium.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Tree_Deciduous;
-
-/** Tree, Deciduous, Medium (EntityType) */
-public class Tree_Deciduous_Medium extends Base
-{
- public Tree_Deciduous_Medium()
- {
- setSubcategory(SubCategory.TREE_DECIDUOUS_MEDIUM);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tree_Deciduous/Tree_Deciduous_Small.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tree_Deciduous/Tree_Deciduous_Small.java
deleted file mode 100644
index 1eef693e5c0712f7753f0c1c359f90cd5a447ea3..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tree_Deciduous/Tree_Deciduous_Small.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Tree_Deciduous;
-
-/** Tree, Deciduous, Small (EntityType) */
-public class Tree_Deciduous_Small extends Base
-{
- public Tree_Deciduous_Small()
- {
- setSubcategory(SubCategory.TREE_DECIDUOUS_SMALL);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tree_Evergreen/Base.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tree_Evergreen/Base.java
deleted file mode 100644
index 14afdff548bf692fd0c08b8122bff3ae83f071a7..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tree_Evergreen/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Tree_Evergreen;
-
-import edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Category;
-
-abstract public class Base extends edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Base
-{
- public Base()
- {
- setCategory(Category.TREE_EVERGREEN);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tree_Evergreen/SubCategory.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tree_Evergreen/SubCategory.java
deleted file mode 100644
index 58b51afc2d6be5584580d555c25cd8ecc1995206..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tree_Evergreen/SubCategory.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Tree_Evergreen;
-
-/* marshal size 8 bits */
-public class SubCategory
-{
- public static final byte TREE_EVERGREEN_SMALL = 1; // Tree, Evergreen, Small
- public static final byte TREE_EVERGREEN_MEDIUM = 2; // Tree, Evergreen, Medium
- public static final byte TREE_EVERGREEN_LARGE = 3; // Tree, Evergreen, Larg
-}
-
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tree_Evergreen/Tree_Evergreen_Large.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tree_Evergreen/Tree_Evergreen_Large.java
deleted file mode 100644
index 43b9aedca7090b35ff4789233aa512a4851a2b92..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tree_Evergreen/Tree_Evergreen_Large.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Tree_Evergreen;
-
-/** Tree, Evergreen, Large (EntityType) */
-public class Tree_Evergreen_Large extends Base
-{
- public Tree_Evergreen_Large()
- {
- setSubcategory(SubCategory.TREE_EVERGREEN_LARGE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tree_Evergreen/Tree_Evergreen_Medium.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tree_Evergreen/Tree_Evergreen_Medium.java
deleted file mode 100644
index 7d6be2eee0a268bdc57e0541bd7374c66027cf90..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tree_Evergreen/Tree_Evergreen_Medium.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Tree_Evergreen;
-
-/** Tree, Evergreen, Medium (EntityType) */
-public class Tree_Evergreen_Medium extends Base
-{
- public Tree_Evergreen_Medium()
- {
- setSubcategory(SubCategory.TREE_EVERGREEN_MEDIUM);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tree_Evergreen/Tree_Evergreen_Small.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tree_Evergreen/Tree_Evergreen_Small.java
deleted file mode 100644
index b3bc29d158747f1690e8e4e8b06d22bb26629fb2..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/Tree_Evergreen/Tree_Evergreen_Small.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature.Tree_Evergreen;
-
-/** Tree, Evergreen, Small (EntityType) */
-public class Tree_Evergreen_Small extends Base
-{
- public Tree_Evergreen_Small()
- {
- setSubcategory(SubCategory.TREE_EVERGREEN_SMALL);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/UtilityPole.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/UtilityPole.java
deleted file mode 100644
index 64eaa0670d809239ce55bc1068c8f8be422cbf54..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Culturalfeature/UtilityPole.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Culturalfeature;
-
-/** Utility Pole (EntityType) */
-public class UtilityPole extends Base
-{
- public UtilityPole()
- {
- setCategory(Category.UTILITYPOLE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/EnvironmentalObject/Base.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/EnvironmentalObject/Base.java
deleted file mode 100644
index 45f1c29fba5b645aa556482edd6c35b086818f4b..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/EnvironmentalObject/Base.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.EnvironmentalObject;
-
-import edu.nps.moves.dis.enumerations.*;
-import edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.PointObject;
-
-abstract public class Base extends PointObject
-{
- public Base()
- {
- setDomain(PlatformDomain.LAND);
- setObjectKind(ObjectKind.ENVIRONMENTAL_OBJECT);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/EnvironmentalObject/Category.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/EnvironmentalObject/Category.java
deleted file mode 100644
index 9fc417be96d31c67ae011f3d8f2ccd761f354dfe..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/EnvironmentalObject/Category.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.EnvironmentalObject;
-
-/* marshal size 8 bits */
-public class Category
-{
- public static final byte FLOOD = 1; // Floo
-}
-
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/EnvironmentalObject/Flood/Base.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/EnvironmentalObject/Flood/Base.java
deleted file mode 100644
index 291295812a3a9af57cef8214b567cd3e670bc9c6..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/EnvironmentalObject/Flood/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.EnvironmentalObject.Flood;
-
-import edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.EnvironmentalObject.Category;
-
-abstract public class Base extends edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.EnvironmentalObject.Base
-{
- public Base()
- {
- setCategory(Category.FLOOD);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/EnvironmentalObject/Flood/Flood_Large.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/EnvironmentalObject/Flood/Flood_Large.java
deleted file mode 100644
index c004fee5e5511aab00ccabb4d1f07c229d5b7f5e..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/EnvironmentalObject/Flood/Flood_Large.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.EnvironmentalObject.Flood;
-
-/** Flood, Large (EntityType) */
-public class Flood_Large extends Base
-{
- public Flood_Large()
- {
- setSubcategory(SubCategory.FLOOD_LARGE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/EnvironmentalObject/Flood/Flood_Medium.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/EnvironmentalObject/Flood/Flood_Medium.java
deleted file mode 100644
index d1259cabf715042cdfbac4feb57d7ff815288187..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/EnvironmentalObject/Flood/Flood_Medium.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.EnvironmentalObject.Flood;
-
-/** Flood, Medium (EntityType) */
-public class Flood_Medium extends Base
-{
- public Flood_Medium()
- {
- setSubcategory(SubCategory.FLOOD_MEDIUM);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/EnvironmentalObject/Flood/Flood_Small.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/EnvironmentalObject/Flood/Flood_Small.java
deleted file mode 100644
index db7c8ae40e88b75fdfd5cc0a425dbc6ef288c15a..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/EnvironmentalObject/Flood/Flood_Small.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.EnvironmentalObject.Flood;
-
-/** Flood, Small (EntityType) */
-public class Flood_Small extends Base
-{
- public Flood_Small()
- {
- setSubcategory(SubCategory.FLOOD_SMALL);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/EnvironmentalObject/Flood/SubCategory.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/EnvironmentalObject/Flood/SubCategory.java
deleted file mode 100644
index 4283ef6184675a369db194d791dd7441bbe1120e..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/EnvironmentalObject/Flood/SubCategory.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.EnvironmentalObject.Flood;
-
-/* marshal size 8 bits */
-public class SubCategory
-{
- public static final byte FLOOD_SMALL = 1; // Flood, Small
- public static final byte FLOOD_MEDIUM = 2; // Flood, Medium
- public static final byte FLOOD_LARGE = 3; // Flood, Larg
-}
-
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Abatis/Base.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Abatis/Base.java
deleted file mode 100644
index af0646abd126301e63a20b6db5698b8a67b76320..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Abatis/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Obstacle.Abatis;
-
-import edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Obstacle.Category;
-
-abstract public class Base extends edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Obstacle.Base
-{
- public Base()
- {
- setCategory(Category.ABATIS);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Abatis/Other.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Abatis/Other.java
deleted file mode 100644
index 5cf810a26eabeb7b7bfbf142ad9d0d5d5bfa7e47..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Abatis/Other.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Obstacle.Abatis;
-
-/** Other (EntityType) */
-public class Other extends Base
-{
- public Other()
- {
- setSubcategory(SubCategory.OTHER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Abatis/SubCategory.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Abatis/SubCategory.java
deleted file mode 100644
index 9ba1949eb6e96e70e2c1ddfb9466ca2d47f63998..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Abatis/SubCategory.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Obstacle.Abatis;
-
-/* marshal size 8 bits */
-public class SubCategory
-{
- public static final byte OTHER = 0; // Other
- public static final byte _8TREE = 1; // 8 Tree
- public static final byte _14TREE = 2; // 14 Tre
-}
-
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Abatis/_14Tree.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Abatis/_14Tree.java
deleted file mode 100644
index 9f46c89bd8b95e759d4157221dd7da539b890955..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Abatis/_14Tree.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Obstacle.Abatis;
-
-/** 14 Tree (EntityType) */
-public class _14Tree extends Base
-{
- public _14Tree()
- {
- setSubcategory(SubCategory._14TREE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Abatis/_8Tree.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Abatis/_8Tree.java
deleted file mode 100644
index e644264cb77e630b849d4c707ca51f81679e42f4..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Abatis/_8Tree.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Obstacle.Abatis;
-
-/** 8 Tree (EntityType) */
-public class _8Tree extends Base
-{
- public _8Tree()
- {
- setSubcategory(SubCategory._8TREE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Barrier/Barrier_Construction.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Barrier/Barrier_Construction.java
deleted file mode 100644
index 7656d0131ac12ffac793c7756456e6044217d777..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Barrier/Barrier_Construction.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Obstacle.Barrier;
-
-/** Barrier, Construction (EntityType) */
-public class Barrier_Construction extends Base
-{
- public Barrier_Construction()
- {
- setSubcategory(SubCategory.BARRIER_CONSTRUCTION);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Barrier/Barrier_Fence_Chain_6_foot.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Barrier/Barrier_Fence_Chain_6_foot.java
deleted file mode 100644
index 99c167b797b6fdeb9cb85d7d61d29aea5093e317..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Barrier/Barrier_Fence_Chain_6_foot.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Obstacle.Barrier;
-
-/** Barrier, Fence, Chain, 6-foot (EntityType) */
-public class Barrier_Fence_Chain_6_foot extends Base
-{
- public Barrier_Fence_Chain_6_foot()
- {
- setSubcategory(SubCategory.BARRIER_FENCE_CHAIN_6_FOOT);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Barrier/Barrier_Fence_Wood_6_foot.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Barrier/Barrier_Fence_Wood_6_foot.java
deleted file mode 100644
index f9944cec7f1930ab2fdbb50d034876f93f209277..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Barrier/Barrier_Fence_Wood_6_foot.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Obstacle.Barrier;
-
-/** Barrier, Fence, Wood, 6-foot (EntityType) */
-public class Barrier_Fence_Wood_6_foot extends Base
-{
- public Barrier_Fence_Wood_6_foot()
- {
- setSubcategory(SubCategory.BARRIER_FENCE_WOOD_6_FOOT);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Barrier/Barrier_HESCOBasket_Double_Stacked.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Barrier/Barrier_HESCOBasket_Double_Stacked.java
deleted file mode 100644
index 5c443163a7eed48c88a242c30305cddd0c76007e..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Barrier/Barrier_HESCOBasket_Double_Stacked.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Obstacle.Barrier;
-
-/** Barrier, HESCO Basket, Double-Stacked (EntityType) */
-public class Barrier_HESCOBasket_Double_Stacked extends Base
-{
- public Barrier_HESCOBasket_Double_Stacked()
- {
- setSubcategory(SubCategory.BARRIER_HESCOBASKET_DOUBLE_STACKED);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Barrier/Barrier_HESCOBasket_Large.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Barrier/Barrier_HESCOBasket_Large.java
deleted file mode 100644
index c95a89b75d650cfd19e14c80416ba5615973cb9d..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Barrier/Barrier_HESCOBasket_Large.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Obstacle.Barrier;
-
-/** Barrier, HESCO Basket, Large (EntityType) */
-public class Barrier_HESCOBasket_Large extends Base
-{
- public Barrier_HESCOBasket_Large()
- {
- setSubcategory(SubCategory.BARRIER_HESCOBASKET_LARGE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Barrier/Barrier_HESCOBasket_Medium.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Barrier/Barrier_HESCOBasket_Medium.java
deleted file mode 100644
index 318b3eda733e6a3b66e4a65e3eaad65156314f4c..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Barrier/Barrier_HESCOBasket_Medium.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Obstacle.Barrier;
-
-/** Barrier, HESCO Basket, Medium (EntityType) */
-public class Barrier_HESCOBasket_Medium extends Base
-{
- public Barrier_HESCOBasket_Medium()
- {
- setSubcategory(SubCategory.BARRIER_HESCOBASKET_MEDIUM);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Barrier/Barrier_HESCOBasket_Small.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Barrier/Barrier_HESCOBasket_Small.java
deleted file mode 100644
index 5ad7611303604e6d5e94f9602c97869fcd76d1f6..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Barrier/Barrier_HESCOBasket_Small.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Obstacle.Barrier;
-
-/** Barrier, HESCO Basket, Small (EntityType) */
-public class Barrier_HESCOBasket_Small extends Base
-{
- public Barrier_HESCOBasket_Small()
- {
- setSubcategory(SubCategory.BARRIER_HESCOBASKET_SMALL);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Barrier/Barrier_Jersey_Plastic.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Barrier/Barrier_Jersey_Plastic.java
deleted file mode 100644
index 5cd8dba07e9fda082f06512d1a24507deeb45f05..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Barrier/Barrier_Jersey_Plastic.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Obstacle.Barrier;
-
-/** Barrier, Jersey, Plastic (EntityType) */
-public class Barrier_Jersey_Plastic extends Base
-{
- public Barrier_Jersey_Plastic()
- {
- setSubcategory(SubCategory.BARRIER_JERSEY_PLASTIC);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Barrier/Barrier_Texas.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Barrier/Barrier_Texas.java
deleted file mode 100644
index 294764b95a685571ef4b40e7569216abf78b0522..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Barrier/Barrier_Texas.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Obstacle.Barrier;
-
-/** Barrier, Texas (EntityType) */
-public class Barrier_Texas extends Base
-{
- public Barrier_Texas()
- {
- setSubcategory(SubCategory.BARRIER_TEXAS);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Barrier/Base.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Barrier/Base.java
deleted file mode 100644
index e4f44b338ca189828de5c70a7fc7028213e6e9b3..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Barrier/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Obstacle.Barrier;
-
-import edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Obstacle.Category;
-
-abstract public class Base extends edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Obstacle.Base
-{
- public Base()
- {
- setCategory(Category.BARRIER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Barrier/DragonsTeeth.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Barrier/DragonsTeeth.java
deleted file mode 100644
index 70c6052f8bf2502d9b2b13e1bf941340af2a53e9..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Barrier/DragonsTeeth.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Obstacle.Barrier;
-
-/** Dragon’s Teeth (EntityType) */
-public class DragonsTeeth extends Base
-{
- public DragonsTeeth()
- {
- setSubcategory(SubCategory.DRAGONSTEETH);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Barrier/SubCategory.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Barrier/SubCategory.java
deleted file mode 100644
index 5c5f783053513041d6b6c1d30079e8b36644cdef..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Barrier/SubCategory.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Obstacle.Barrier;
-
-/* marshal size 8 bits */
-public class SubCategory
-{
- public static final byte DRAGONSTEETH = 1; // Dragon’s Teeth
- public static final byte BARRIER_HESCOBASKET_SMALL = 2; // Barrier, HESCO Basket, Small
- public static final byte BARRIER_HESCOBASKET_MEDIUM = 3; // Barrier, HESCO Basket, Medium
- public static final byte BARRIER_HESCOBASKET_LARGE = 4; // Barrier, HESCO Basket, Large
- public static final byte BARRIER_HESCOBASKET_DOUBLE_STACKED = 5; // Barrier, HESCO Basket, Double-Stacked
- public static final byte BARRIER_CONSTRUCTION = 6; // Barrier, Construction
- public static final byte BARRIER_JERSEY_PLASTIC = 7; // Barrier, Jersey, Plastic
- public static final byte BARRIER_FENCE_CHAIN_6_FOOT = 8; // Barrier, Fence, Chain, 6-foot
- public static final byte BARRIER_FENCE_WOOD_6_FOOT = 9; // Barrier, Fence, Wood, 6-foot
- public static final byte BARRIER_TEXAS = 10; // Barrier, Texa
-}
-
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Base.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Base.java
deleted file mode 100644
index fb4e068166c3fcdf919f536af300ae676d1a3b5a..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Base.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Obstacle;
-
-import edu.nps.moves.dis.enumerations.*;
-import edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.PointObject;
-
-abstract public class Base extends PointObject
-{
- public Base()
- {
- setDomain(PlatformDomain.LAND);
- setObjectKind(ObjectKind.OBSTACLE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Category.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Category.java
deleted file mode 100644
index daa1cd0c250f696b2c16ad0660f47af57898d59a..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Category.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Obstacle;
-
-/* marshal size 8 bits */
-public class Category
-{
- public static final byte OTHER = 0; // Other
- public static final byte ABATIS = 1; // Abatis
- public static final byte LOGCRIB = 2; // Log Crib
- public static final byte CRATER = 3; // Crater
- public static final byte BARRIER = 4; // Barrier
- public static final byte ROCKDROP = 5; // Rock Drop
- public static final byte POTHOLE = 9; // Pot Hol
-}
-
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Crater/Base.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Crater/Base.java
deleted file mode 100644
index 33442a310190c43db1e4637bd698fdc11e91d35b..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Crater/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Obstacle.Crater;
-
-import edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Obstacle.Category;
-
-abstract public class Base extends edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Obstacle.Base
-{
- public Base()
- {
- setCategory(Category.CRATER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Crater/Large.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Crater/Large.java
deleted file mode 100644
index 034ce22314e13da234da5c1e0abbdbbbc4873436..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Crater/Large.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Obstacle.Crater;
-
-/** Large (EntityType) */
-public class Large extends Base
-{
- public Large()
- {
- setSubcategory(SubCategory.LARGE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Crater/Medium.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Crater/Medium.java
deleted file mode 100644
index e7299165b452987fa32bf27c812875e0aa96910b..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Crater/Medium.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Obstacle.Crater;
-
-/** Medium (EntityType) */
-public class Medium extends Base
-{
- public Medium()
- {
- setSubcategory(SubCategory.MEDIUM);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Crater/Other.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Crater/Other.java
deleted file mode 100644
index aceae39f744e1d70f309727f3a95d73f2582b1a7..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Crater/Other.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Obstacle.Crater;
-
-/** Other (EntityType) */
-public class Other extends Base
-{
- public Other()
- {
- setSubcategory(SubCategory.OTHER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Crater/Small.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Crater/Small.java
deleted file mode 100644
index bd7249420a8dd18fc38a6486d20ddad42ba2ed67..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Crater/Small.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Obstacle.Crater;
-
-/** Small (EntityType) */
-public class Small extends Base
-{
- public Small()
- {
- setSubcategory(SubCategory.SMALL);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Crater/SubCategory.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Crater/SubCategory.java
deleted file mode 100644
index 4ee20cbf499582c3f33faf51187ac6da454ce279..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Crater/SubCategory.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Obstacle.Crater;
-
-/* marshal size 8 bits */
-public class SubCategory
-{
- public static final byte OTHER = 0; // Other
- public static final byte SMALL = 1; // Small
- public static final byte MEDIUM = 2; // Medium
- public static final byte LARGE = 3; // Larg
-}
-
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/LogCrib/Base.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/LogCrib/Base.java
deleted file mode 100644
index ae06f44885beb92b6d1287333d6b2e2613b8cd47..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/LogCrib/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Obstacle.LogCrib;
-
-import edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Obstacle.Category;
-
-abstract public class Base extends edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Obstacle.Base
-{
- public Base()
- {
- setCategory(Category.LOGCRIB);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/LogCrib/Other.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/LogCrib/Other.java
deleted file mode 100644
index 4b74dd30d8fdaa683ef05c1a19dd26da748a97f6..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/LogCrib/Other.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Obstacle.LogCrib;
-
-/** Other (EntityType) */
-public class Other extends Base
-{
- public Other()
- {
- setSubcategory(SubCategory.OTHER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/LogCrib/Rectangular.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/LogCrib/Rectangular.java
deleted file mode 100644
index 8adecdefe56f6cfa1619eeec033ae361071e5735..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/LogCrib/Rectangular.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Obstacle.LogCrib;
-
-/** Rectangular (EntityType) */
-public class Rectangular extends Base
-{
- public Rectangular()
- {
- setSubcategory(SubCategory.RECTANGULAR);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/LogCrib/SubCategory.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/LogCrib/SubCategory.java
deleted file mode 100644
index 16f62963fc88b85d371c66d76c8d936a71773a88..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/LogCrib/SubCategory.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Obstacle.LogCrib;
-
-/* marshal size 8 bits */
-public class SubCategory
-{
- public static final byte OTHER = 0; // Other
- public static final byte RECTANGULAR = 1; // Rectangular
- public static final byte TRIANGULAR = 2; // Triangula
-}
-
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/LogCrib/Triangular.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/LogCrib/Triangular.java
deleted file mode 100644
index 7574affce1942c31fc38669994bbce5f219e1e08..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/LogCrib/Triangular.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Obstacle.LogCrib;
-
-/** Triangular (EntityType) */
-public class Triangular extends Base
-{
- public Triangular()
- {
- setSubcategory(SubCategory.TRIANGULAR);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Other.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Other.java
deleted file mode 100644
index 33221330d4f68cacfbd26bb8d51c3fee4b3e4e41..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/Other.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Obstacle;
-
-/** Other (EntityType) */
-public class Other extends Base
-{
- public Other()
- {
- setCategory(Category.OTHER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/PotHole.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/PotHole.java
deleted file mode 100644
index 82d73ea4fa05be6a5b29ebd1ab444ea635b42f2b..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/PotHole.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Obstacle;
-
-/** Pot Hole (EntityType) */
-public class PotHole extends Base
-{
- public PotHole()
- {
- setCategory(Category.POTHOLE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/RockDrop/Base.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/RockDrop/Base.java
deleted file mode 100644
index 749c29ad4aa617795827a182970722a85eb893d3..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/RockDrop/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Obstacle.RockDrop;
-
-import edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Obstacle.Category;
-
-abstract public class Base extends edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Obstacle.Base
-{
- public Base()
- {
- setCategory(Category.ROCKDROP);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/RockDrop/RockDrop_Covered.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/RockDrop/RockDrop_Covered.java
deleted file mode 100644
index 79aab66b361ce1862131d20086fb172aeed8dd51..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/RockDrop/RockDrop_Covered.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Obstacle.RockDrop;
-
-/** Rock Drop, Covered (EntityType) */
-public class RockDrop_Covered extends Base
-{
- public RockDrop_Covered()
- {
- setSubcategory(SubCategory.ROCKDROP_COVERED);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/RockDrop/RockDrop_Uncovered.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/RockDrop/RockDrop_Uncovered.java
deleted file mode 100644
index f75a6ca116d19f222541ef2d177542c0d7bd759f..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/RockDrop/RockDrop_Uncovered.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Obstacle.RockDrop;
-
-/** Rock Drop, Uncovered (EntityType) */
-public class RockDrop_Uncovered extends Base
-{
- public RockDrop_Uncovered()
- {
- setSubcategory(SubCategory.ROCKDROP_UNCOVERED);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/RockDrop/SubCategory.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/RockDrop/SubCategory.java
deleted file mode 100644
index d3c9841117ce4d64f2d46e23452de9b56f4d85ab..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstacle/RockDrop/SubCategory.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Obstacle.RockDrop;
-
-/* marshal size 8 bits */
-public class SubCategory
-{
- public static final byte ROCKDROP_COVERED = 1; // Rock Drop, Covered
- public static final byte ROCKDROP_UNCOVERED = 2; // Rock Drop, Uncovere
-}
-
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstaclemarker/Base.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstaclemarker/Base.java
deleted file mode 100644
index e1c1cbdc5008b7f05aaa5ce03c02802b128704cd..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstaclemarker/Base.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Obstaclemarker;
-
-import edu.nps.moves.dis.enumerations.*;
-import edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.PointObject;
-
-abstract public class Base extends PointObject
-{
- public Base()
- {
- setDomain(PlatformDomain.LAND);
- setObjectKind(ObjectKind.OBSTACLE_MARKER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstaclemarker/Category.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstaclemarker/Category.java
deleted file mode 100644
index cfba2ebae1449dc959c3da867006df15349eaebd..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstaclemarker/Category.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Obstaclemarker;
-
-/* marshal size 8 bits */
-public class Category
-{
- public static final byte NBCHAZARDMARKER = 2; // NBC Hazard Marke
-}
-
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstaclemarker/NBCHazardMarker.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstaclemarker/NBCHazardMarker.java
deleted file mode 100644
index 0ca9e1ab504183e469a124f0cad78a513642eaee..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Obstaclemarker/NBCHazardMarker.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Obstaclemarker;
-
-/** NBC Hazard Marker (EntityType) */
-public class NBCHazardMarker extends Base
-{
- public NBCHazardMarker()
- {
- setCategory(Category.NBCHAZARDMARKER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/AVLB/Base.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/AVLB/Base.java
deleted file mode 100644
index 2bc4e884dd7317f2fcf7fe1dbcf015760a6d9eab..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/AVLB/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Passageway.AVLB;
-
-import edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Passageway.Category;
-
-abstract public class Base extends edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Passageway.Base
-{
- public Base()
- {
- setCategory(Category.AVLB);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/AVLB/JointAssaultBridgeJAB.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/AVLB/JointAssaultBridgeJAB.java
deleted file mode 100644
index 2866ecb0e6934780c78e226da0a69f0e2edd87e3..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/AVLB/JointAssaultBridgeJAB.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Passageway.AVLB;
-
-/** Joint Assault Bridge (JAB) (EntityType) */
-public class JointAssaultBridgeJAB extends Base
-{
- public JointAssaultBridgeJAB()
- {
- setSubcategory(SubCategory.JOINTASSAULTBRIDGEJAB);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/AVLB/M60A1.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/AVLB/M60A1.java
deleted file mode 100644
index 9ac4b91ef296fcdef334f1eb78b344775dd0e46e..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/AVLB/M60A1.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Passageway.AVLB;
-
-/** M60A1 (EntityType) */
-public class M60A1 extends Base
-{
- public M60A1()
- {
- setSubcategory(SubCategory.M60A1);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/AVLB/MTU20.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/AVLB/MTU20.java
deleted file mode 100644
index dada4e4a310326fbeeba6ddd96f7a943db47e62a..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/AVLB/MTU20.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Passageway.AVLB;
-
-/** MTU20 (EntityType) */
-public class MTU20 extends Base
-{
- public MTU20()
- {
- setSubcategory(SubCategory.MTU20);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/AVLB/Other.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/AVLB/Other.java
deleted file mode 100644
index c205820711a65f3e37039ddae05589789b145b8f..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/AVLB/Other.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Passageway.AVLB;
-
-/** Other (EntityType) */
-public class Other extends Base
-{
- public Other()
- {
- setSubcategory(SubCategory.OTHER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/AVLB/SubCategory.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/AVLB/SubCategory.java
deleted file mode 100644
index a5b7bfbd8ec9806bb5ed3c5bcca3bdeb16ebb9f2..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/AVLB/SubCategory.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Passageway.AVLB;
-
-/* marshal size 8 bits */
-public class SubCategory
-{
- public static final byte OTHER = 0; // Other
- public static final byte M60A1 = 1; // M60A1
- public static final byte MTU20 = 2; // MTU20
- public static final byte JOINTASSAULTBRIDGEJAB = 3; // Joint Assault Bridge (JAB
-}
-
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/Base.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/Base.java
deleted file mode 100644
index bed6e8ee555d3f3687dce58bf9c7a748bbdeb929..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/Base.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Passageway;
-
-import edu.nps.moves.dis.enumerations.*;
-import edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.PointObject;
-
-abstract public class Base extends PointObject
-{
- public Base()
- {
- setDomain(PlatformDomain.LAND);
- setObjectKind(ObjectKind.PASSAGEWAY);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/Category.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/Category.java
deleted file mode 100644
index 966473df6d437c37a971ca159c4e716422eacc3f..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/Category.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Passageway;
-
-/* marshal size 8 bits */
-public class Category
-{
- public static final byte OTHER = 0; // Other
- public static final byte STATIONARYBRIDGE = 1; // Stationary Bridge
- public static final byte AVLB = 2; // AVLB
- public static final byte RIBBONBRIDGE = 3; // Ribbon Bridge
- public static final byte PIER = 4; // Pie
-}
-
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/Other.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/Other.java
deleted file mode 100644
index a59719444c65c06b2cdbbda06947f80f959f32e6..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/Other.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Passageway;
-
-/** Other (EntityType) */
-public class Other extends Base
-{
- public Other()
- {
- setCategory(Category.OTHER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/Pier.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/Pier.java
deleted file mode 100644
index f74b91185f3fde9e8d91cd9708c34501e306233d..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/Pier.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Passageway;
-
-/** Pier (EntityType) */
-public class Pier extends Base
-{
- public Pier()
- {
- setCategory(Category.PIER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/RibbonBridge/Base.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/RibbonBridge/Base.java
deleted file mode 100644
index 2058d18b2aa3c6aa9d4cd8f664007a2138dd72b4..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/RibbonBridge/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Passageway.RibbonBridge;
-
-import edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Passageway.Category;
-
-abstract public class Base extends edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Passageway.Base
-{
- public Base()
- {
- setCategory(Category.RIBBONBRIDGE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/RibbonBridge/Other.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/RibbonBridge/Other.java
deleted file mode 100644
index 576ec143b48734bec9b0e7fe2c52d71cc7769876..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/RibbonBridge/Other.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Passageway.RibbonBridge;
-
-/** Other (EntityType) */
-public class Other extends Base
-{
- public Other()
- {
- setSubcategory(SubCategory.OTHER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/RibbonBridge/SubCategory.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/RibbonBridge/SubCategory.java
deleted file mode 100644
index 0d42e54b8d68dfad9472ef5821b2a315c5656dae..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/RibbonBridge/SubCategory.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Passageway.RibbonBridge;
-
-/* marshal size 8 bits */
-public class SubCategory
-{
- public static final byte OTHER = 0; // Other
- public static final byte _2_LANE = 1; // 2-Lane
- public static final byte _4_LANE = 2; // 4-Lan
-}
-
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/RibbonBridge/_2_Lane.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/RibbonBridge/_2_Lane.java
deleted file mode 100644
index c515f77dce4a1e047bb773b2f021eb9cc80fc52b..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/RibbonBridge/_2_Lane.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Passageway.RibbonBridge;
-
-/** 2-Lane (EntityType) */
-public class _2_Lane extends Base
-{
- public _2_Lane()
- {
- setSubcategory(SubCategory._2_LANE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/RibbonBridge/_4_Lane.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/RibbonBridge/_4_Lane.java
deleted file mode 100644
index 471a7d783a85353c8f1a561e17b4ac95268cf9e2..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/RibbonBridge/_4_Lane.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Passageway.RibbonBridge;
-
-/** 4-Lane (EntityType) */
-public class _4_Lane extends Base
-{
- public _4_Lane()
- {
- setSubcategory(SubCategory._4_LANE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/StationaryBridge/Base.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/StationaryBridge/Base.java
deleted file mode 100644
index 351e697ad541ae55ed7951a2497d9d124272e043..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/StationaryBridge/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Passageway.StationaryBridge;
-
-import edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Passageway.Category;
-
-abstract public class Base extends edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Passageway.Base
-{
- public Base()
- {
- setCategory(Category.STATIONARYBRIDGE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/StationaryBridge/Other.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/StationaryBridge/Other.java
deleted file mode 100644
index ef60f86d693bfbcb7f92e3cfa9fd852b58a5b139..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/StationaryBridge/Other.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Passageway.StationaryBridge;
-
-/** Other (EntityType) */
-public class Other extends Base
-{
- public Other()
- {
- setSubcategory(SubCategory.OTHER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/StationaryBridge/SubCategory.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/StationaryBridge/SubCategory.java
deleted file mode 100644
index e8867851a6ca1675592d40844842e0bb578e2791..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/StationaryBridge/SubCategory.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Passageway.StationaryBridge;
-
-/* marshal size 8 bits */
-public class SubCategory
-{
- public static final byte OTHER = 0; // Other
- public static final byte _2_LANE = 1; // 2-Lane
- public static final byte _4_LANE = 2; // 4-Lan
-}
-
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/StationaryBridge/_2_Lane.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/StationaryBridge/_2_Lane.java
deleted file mode 100644
index bee9781ff3ed37a8fac006fc4d8bf9403de2888b..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/StationaryBridge/_2_Lane.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Passageway.StationaryBridge;
-
-/** 2-Lane (EntityType) */
-public class _2_Lane extends Base
-{
- public _2_Lane()
- {
- setSubcategory(SubCategory._2_LANE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/StationaryBridge/_4_Lane.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/StationaryBridge/_4_Lane.java
deleted file mode 100644
index 27edd5a96c976c2fbf9739b6f8a94d644fd19acc..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Passageway/StationaryBridge/_4_Lane.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Passageway.StationaryBridge;
-
-/** 4-Lane (EntityType) */
-public class _4_Lane extends Base
-{
- public _4_Lane()
- {
- setSubcategory(SubCategory._4_LANE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/PointObject.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/PointObject.java
deleted file mode 100644
index 69fd3f485f2c9e1ad6e50260445609e61f88dfc3..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/PointObject.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject;
-
-public class PointObject extends edu.nps.moves.dis.ObjectType
-{
- /* uid 226 */
- public PointObject()
- {
- }
-}
\ No newline at end of file
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/Base.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/Base.java
deleted file mode 100644
index 3fbf18e7a735bef1a74720fa6dad827e87cb22a5..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/Base.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Preparedposition;
-
-import edu.nps.moves.dis.enumerations.*;
-import edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.PointObject;
-
-abstract public class Base extends PointObject
-{
- public Base()
- {
- setDomain(PlatformDomain.LAND);
- setObjectKind(ObjectKind.PREPARED_POSITION);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/Category.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/Category.java
deleted file mode 100644
index 5ad29a412f8ff91e238dc1d2d30513eef3163366..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/Category.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Preparedposition;
-
-/* marshal size 8 bits */
-public class Category
-{
- public static final byte OTHER = 0; // Other
- public static final byte VEHICLEDEFILADE = 1; // Vehicle Defilade
- public static final byte INFANTRYFIGHTINGPOSITION = 2; // Infantry Fighting Positio
-}
-
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/InfantryFightingPosition/Base.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/InfantryFightingPosition/Base.java
deleted file mode 100644
index 17a104b3e65edac00fdd684f9d98e1f40de7ccb8..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/InfantryFightingPosition/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Preparedposition.InfantryFightingPosition;
-
-import edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Preparedposition.Category;
-
-abstract public class Base extends edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Preparedposition.Base
-{
- public Base()
- {
- setCategory(Category.INFANTRYFIGHTINGPOSITION);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/InfantryFightingPosition/CoveredMachineGunBunker.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/InfantryFightingPosition/CoveredMachineGunBunker.java
deleted file mode 100644
index 1071fdcef94a56260da1ca94497c5858ac0c3a7f..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/InfantryFightingPosition/CoveredMachineGunBunker.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Preparedposition.InfantryFightingPosition;
-
-/** Covered Machine Gun Bunker (EntityType) */
-public class CoveredMachineGunBunker extends Base
-{
- public CoveredMachineGunBunker()
- {
- setSubcategory(SubCategory.COVEREDMACHINEGUNBUNKER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/InfantryFightingPosition/HastyFightingPosition.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/InfantryFightingPosition/HastyFightingPosition.java
deleted file mode 100644
index 499dad6ced22eb0c2e35061df1924dfffa46f855..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/InfantryFightingPosition/HastyFightingPosition.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Preparedposition.InfantryFightingPosition;
-
-/** Hasty Fighting Position (EntityType) */
-public class HastyFightingPosition extends Base
-{
- public HastyFightingPosition()
- {
- setSubcategory(SubCategory.HASTYFIGHTINGPOSITION);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/InfantryFightingPosition/Non_CoveredInfantryPosition.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/InfantryFightingPosition/Non_CoveredInfantryPosition.java
deleted file mode 100644
index 9aa9cb33407baa914a2884e5c8f9f95822442764..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/InfantryFightingPosition/Non_CoveredInfantryPosition.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Preparedposition.InfantryFightingPosition;
-
-/** Non-Covered Infantry Position (EntityType) */
-public class Non_CoveredInfantryPosition extends Base
-{
- public Non_CoveredInfantryPosition()
- {
- setSubcategory(SubCategory.NON_COVEREDINFANTRYPOSITION);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/InfantryFightingPosition/Non_CoveredMachineGunBunker.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/InfantryFightingPosition/Non_CoveredMachineGunBunker.java
deleted file mode 100644
index 8579886b7a34500465cf80f54bc3e7818bb34db1..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/InfantryFightingPosition/Non_CoveredMachineGunBunker.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Preparedposition.InfantryFightingPosition;
-
-/** Non-Covered Machine Gun Bunker (EntityType) */
-public class Non_CoveredMachineGunBunker extends Base
-{
- public Non_CoveredMachineGunBunker()
- {
- setSubcategory(SubCategory.NON_COVEREDMACHINEGUNBUNKER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/InfantryFightingPosition/Other.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/InfantryFightingPosition/Other.java
deleted file mode 100644
index f9b52c41b5d0b01757c9151a1bd71c367647003b..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/InfantryFightingPosition/Other.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Preparedposition.InfantryFightingPosition;
-
-/** Other (EntityType) */
-public class Other extends Base
-{
- public Other()
- {
- setSubcategory(SubCategory.OTHER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/InfantryFightingPosition/OverheadCoveredInfantryPosition.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/InfantryFightingPosition/OverheadCoveredInfantryPosition.java
deleted file mode 100644
index 96b9966de599f58ae021d131b1a4f314022a626f..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/InfantryFightingPosition/OverheadCoveredInfantryPosition.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Preparedposition.InfantryFightingPosition;
-
-/** Overhead Covered Infantry Position (EntityType) */
-public class OverheadCoveredInfantryPosition extends Base
-{
- public OverheadCoveredInfantryPosition()
- {
- setSubcategory(SubCategory.OVERHEADCOVEREDINFANTRYPOSITION);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/InfantryFightingPosition/SubCategory.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/InfantryFightingPosition/SubCategory.java
deleted file mode 100644
index bd7e7bbd670681e37b391a01a5ee11db4bc845a2..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/InfantryFightingPosition/SubCategory.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Preparedposition.InfantryFightingPosition;
-
-/* marshal size 8 bits */
-public class SubCategory
-{
- public static final byte OTHER = 0; // Other
- public static final byte COVEREDMACHINEGUNBUNKER = 1; // Covered Machine Gun Bunker
- public static final byte OVERHEADCOVEREDINFANTRYPOSITION = 2; // Overhead Covered Infantry Position
- public static final byte NON_COVEREDINFANTRYPOSITION = 3; // Non-Covered Infantry Position
- public static final byte NON_COVEREDMACHINEGUNBUNKER = 4; // Non-Covered Machine Gun Bunker
- public static final byte HASTYFIGHTINGPOSITION = 5; // Hasty Fighting Positio
-}
-
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/Other.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/Other.java
deleted file mode 100644
index 09c42c4d42c7957bd0c34df68bdbb52786a2b062..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/Other.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Preparedposition;
-
-/** Other (EntityType) */
-public class Other extends Base
-{
- public Other()
- {
- setCategory(Category.OTHER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/VehicleDefilade/ArmoredVehicle.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/VehicleDefilade/ArmoredVehicle.java
deleted file mode 100644
index 7f86e7b42070c1bf74dd3c8d22ada58aabdd7ab6..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/VehicleDefilade/ArmoredVehicle.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Preparedposition.VehicleDefilade;
-
-/** Armored Vehicle (EntityType) */
-public class ArmoredVehicle extends Base
-{
- public ArmoredVehicle()
- {
- setSubcategory(SubCategory.ARMOREDVEHICLE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/VehicleDefilade/Base.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/VehicleDefilade/Base.java
deleted file mode 100644
index 0013c49bbef7b7d8a025795c1ae6ff935ee90b9f..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/VehicleDefilade/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Preparedposition.VehicleDefilade;
-
-import edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Preparedposition.Category;
-
-abstract public class Base extends edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Preparedposition.Base
-{
- public Base()
- {
- setCategory(Category.VEHICLEDEFILADE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/VehicleDefilade/FightingVehicle.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/VehicleDefilade/FightingVehicle.java
deleted file mode 100644
index d482261c0ac96ffd93531ee70ad2c8930ea16e38..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/VehicleDefilade/FightingVehicle.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Preparedposition.VehicleDefilade;
-
-/** Fighting Vehicle (EntityType) */
-public class FightingVehicle extends Base
-{
- public FightingVehicle()
- {
- setSubcategory(SubCategory.FIGHTINGVEHICLE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/VehicleDefilade/MortarCarrier.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/VehicleDefilade/MortarCarrier.java
deleted file mode 100644
index e612edc8c55a89ab1ca8583c40a242f1ac0778a9..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/VehicleDefilade/MortarCarrier.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Preparedposition.VehicleDefilade;
-
-/** Mortar Carrier (EntityType) */
-public class MortarCarrier extends Base
-{
- public MortarCarrier()
- {
- setSubcategory(SubCategory.MORTARCARRIER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/VehicleDefilade/Other.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/VehicleDefilade/Other.java
deleted file mode 100644
index 94e0aac1f4b1f39cbb1201cc2ed7ca01ead97d3b..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/VehicleDefilade/Other.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Preparedposition.VehicleDefilade;
-
-/** Other (EntityType) */
-public class Other extends Base
-{
- public Other()
- {
- setSubcategory(SubCategory.OTHER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/VehicleDefilade/SubCategory.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/VehicleDefilade/SubCategory.java
deleted file mode 100644
index ef5d972f0783d4c8c487ddd24fe27788d18cc817..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/VehicleDefilade/SubCategory.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Preparedposition.VehicleDefilade;
-
-/* marshal size 8 bits */
-public class SubCategory
-{
- public static final byte OTHER = 0; // Other
- public static final byte ARMOREDVEHICLE = 1; // Armored Vehicle
- public static final byte FIGHTINGVEHICLE = 2; // Fighting Vehicle
- public static final byte MORTARCARRIER = 3; // Mortar Carrier
- public static final byte TANK = 4; // Tan
-}
-
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/VehicleDefilade/Tank.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/VehicleDefilade/Tank.java
deleted file mode 100644
index d934a6c1c337301b7d7665d8900fde96081c5ed6..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Preparedposition/VehicleDefilade/Tank.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Preparedposition.VehicleDefilade;
-
-/** Tank (EntityType) */
-public class Tank extends Base
-{
- public Tank()
- {
- setSubcategory(SubCategory.TANK);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/AirBurst/Base.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/AirBurst/Base.java
deleted file mode 100644
index a87f4cf6feee124c43f68dcff51aa72a0ed61072..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/AirBurst/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Tacticalsmoke.AirBurst;
-
-import edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Tacticalsmoke.Category;
-
-abstract public class Base extends edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Tacticalsmoke.Base
-{
- public Base()
- {
- setCategory(Category.AIRBURST);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/AirBurst/Grenade.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/AirBurst/Grenade.java
deleted file mode 100644
index c7c87801ca3418292d74e5e1e9a13b614b83351e..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/AirBurst/Grenade.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Tacticalsmoke.AirBurst;
-
-/** Grenade (EntityType) */
-public class Grenade extends Base
-{
- public Grenade()
- {
- setSubcategory(SubCategory.GRENADE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/AirBurst/Other.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/AirBurst/Other.java
deleted file mode 100644
index fb29353a5c6d04073d931468942d57556f7c24e1..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/AirBurst/Other.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Tacticalsmoke.AirBurst;
-
-/** Other (EntityType) */
-public class Other extends Base
-{
- public Other()
- {
- setSubcategory(SubCategory.OTHER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/AirBurst/SubCategory.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/AirBurst/SubCategory.java
deleted file mode 100644
index 3b8c8dda9c766b7ab8c4b239a83999fee3fac875..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/AirBurst/SubCategory.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Tacticalsmoke.AirBurst;
-
-/* marshal size 8 bits */
-public class SubCategory
-{
- public static final byte OTHER = 0; // Other
- public static final byte GRENADE = 1; // Grenad
-}
-
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/Base.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/Base.java
deleted file mode 100644
index b90a08e96f8e4d7f62bcbb80babe67bb841f36e5..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/Base.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Tacticalsmoke;
-
-import edu.nps.moves.dis.enumerations.*;
-import edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.PointObject;
-
-abstract public class Base extends PointObject
-{
- public Base()
- {
- setDomain(PlatformDomain.OTHER);
- setObjectKind(ObjectKind.TACTICAL_SMOKE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/Category.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/Category.java
deleted file mode 100644
index 185e98ec606f543bf736abbfa074c3098f290880..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/Category.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Tacticalsmoke;
-
-/* marshal size 8 bits */
-public class Category
-{
- public static final byte OTHER = 0; // Other
- public static final byte GROUNDBURST = 1; // Ground Burst
- public static final byte AIRBURST = 2; // Air Burst
- public static final byte TACTICALSMOKE_CANISTER = 3; // Tactical Smoke, Caniste
-}
-
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/GroundBurst/Artillery.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/GroundBurst/Artillery.java
deleted file mode 100644
index 19b602454b75dde20b3dd0bd9bb58763e948b5b2..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/GroundBurst/Artillery.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Tacticalsmoke.GroundBurst;
-
-/** Artillery (EntityType) */
-public class Artillery extends Base
-{
- public Artillery()
- {
- setSubcategory(SubCategory.ARTILLERY);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/GroundBurst/Base.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/GroundBurst/Base.java
deleted file mode 100644
index 6b483bdd6720004baae41731f8727c1a226038eb..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/GroundBurst/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Tacticalsmoke.GroundBurst;
-
-import edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Tacticalsmoke.Category;
-
-abstract public class Base extends edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Tacticalsmoke.Base
-{
- public Base()
- {
- setCategory(Category.GROUNDBURST);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/GroundBurst/Other.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/GroundBurst/Other.java
deleted file mode 100644
index 910b770556955df5e673b23647defdee02332390..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/GroundBurst/Other.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Tacticalsmoke.GroundBurst;
-
-/** Other (EntityType) */
-public class Other extends Base
-{
- public Other()
- {
- setSubcategory(SubCategory.OTHER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/GroundBurst/SubCategory.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/GroundBurst/SubCategory.java
deleted file mode 100644
index 7add9c661e68801163af9cabf31ee94abfb34f7f..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/GroundBurst/SubCategory.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Tacticalsmoke.GroundBurst;
-
-/* marshal size 8 bits */
-public class SubCategory
-{
- public static final byte OTHER = 0; // Other
- public static final byte ARTILLERY = 1; // Artiller
-}
-
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/Other.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/Other.java
deleted file mode 100644
index 27c790a6587b942108967e5e01f363097937ff59..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/Other.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Tacticalsmoke;
-
-/** Other (EntityType) */
-public class Other extends Base
-{
- public Other()
- {
- setCategory(Category.OTHER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/TacticalSmoke_Canister/Base.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/TacticalSmoke_Canister/Base.java
deleted file mode 100644
index 281aec19f3518365bc0428bed22e5778dbb88c60..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/TacticalSmoke_Canister/Base.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Tacticalsmoke.TacticalSmoke_Canister;
-
-import edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Tacticalsmoke.Category;
-
-abstract public class Base extends edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Tacticalsmoke.Base
-{
- public Base()
- {
- setCategory(Category.TACTICALSMOKE_CANISTER);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/TacticalSmoke_Canister/M18_Green.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/TacticalSmoke_Canister/M18_Green.java
deleted file mode 100644
index bf6d408f7290e225fad804c38942a814999754fe..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/TacticalSmoke_Canister/M18_Green.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Tacticalsmoke.TacticalSmoke_Canister;
-
-/** M18, Green (EntityType) */
-public class M18_Green extends Base
-{
- public M18_Green()
- {
- setSubcategory(SubCategory.M18_GREEN);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/TacticalSmoke_Canister/M18_Red.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/TacticalSmoke_Canister/M18_Red.java
deleted file mode 100644
index 147a6b101a220efd78916269893bf5dc6ea0b1ee..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/TacticalSmoke_Canister/M18_Red.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Tacticalsmoke.TacticalSmoke_Canister;
-
-/** M18, Red (EntityType) */
-public class M18_Red extends Base
-{
- public M18_Red()
- {
- setSubcategory(SubCategory.M18_RED);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/TacticalSmoke_Canister/M18_Violet.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/TacticalSmoke_Canister/M18_Violet.java
deleted file mode 100644
index c68b86e442660fa170f75d0010b27d48676cb06c..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/TacticalSmoke_Canister/M18_Violet.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Tacticalsmoke.TacticalSmoke_Canister;
-
-/** M18, Violet (EntityType) */
-public class M18_Violet extends Base
-{
- public M18_Violet()
- {
- setSubcategory(SubCategory.M18_VIOLET);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/TacticalSmoke_Canister/M18_Yellow.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/TacticalSmoke_Canister/M18_Yellow.java
deleted file mode 100644
index 00776adae91c7f3c79b96fec228d1a383a546f68..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/TacticalSmoke_Canister/M18_Yellow.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Tacticalsmoke.TacticalSmoke_Canister;
-
-/** M18, Yellow (EntityType) */
-public class M18_Yellow extends Base
-{
- public M18_Yellow()
- {
- setSubcategory(SubCategory.M18_YELLOW);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/TacticalSmoke_Canister/M83_White.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/TacticalSmoke_Canister/M83_White.java
deleted file mode 100644
index 12352e1c4eaa5857d68b0432079a9f6fd4a48b42..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/TacticalSmoke_Canister/M83_White.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Tacticalsmoke.TacticalSmoke_Canister;
-
-/** M83, White (EntityType) */
-public class M83_White extends Base
-{
- public M83_White()
- {
- setSubcategory(SubCategory.M83_WHITE);
- }
-}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/TacticalSmoke_Canister/SubCategory.java b/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/TacticalSmoke_Canister/SubCategory.java
deleted file mode 100644
index 753d2d911094117f335bc328e45f47ee81d6c1e8..0000000000000000000000000000000000000000
--- a/src-generated/edu/nps/moves/dis/objecttypes/ObjectTypes_PointObject/Tacticalsmoke/TacticalSmoke_Canister/SubCategory.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package edu.nps.moves.dis.objecttypes.ObjectTypes_PointObject.Tacticalsmoke.TacticalSmoke_Canister;
-
-/* marshal size 8 bits */
-public class SubCategory
-{
- public static final byte M83_WHITE = 1; // M83, White
- public static final byte M18_GREEN = 2; // M18, Green
- public static final byte M18_VIOLET = 3; // M18, Violet
- public static final byte M18_YELLOW = 4; // M18, Yellow
- public static final byte M18_RED = 5; // M18, Re
-}
-
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/BuildingRubble/BuildingRubble.java b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/BuildingRubble/BuildingRubble.java
new file mode 100644
index 0000000000000000000000000000000000000000..4ada02c7fba4bad78b17fa5e0bbcc67d748267f3
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/BuildingRubble/BuildingRubble.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.PointObject.Culturalfeature.BuildingRubble;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 226
+ */
+public class BuildingRubble extends ObjectType
+{
+ public BuildingRubble()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(3)); // Cultural feature
+ setCategory((byte)2); // Building Rubble
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/Building_Structure/Building_Structure.java b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/Building_Structure/Building_Structure.java
new file mode 100644
index 0000000000000000000000000000000000000000..baac1d19afd9defc686553709f62df76a0a8c6fe
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/Building_Structure/Building_Structure.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.PointObject.Culturalfeature.Building_Structure;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 226
+ */
+public class Building_Structure extends ObjectType
+{
+ public Building_Structure()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(3)); // Cultural feature
+ setCategory((byte)1); // Building / Structure
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding.java b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding.java
new file mode 100644
index 0000000000000000000000000000000000000000..c9d86d187487fc4806767da06d8c9c26371a6e4e
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/Container_BasedBuilding/Container_BasedBuilding.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.PointObject.Culturalfeature.Container_BasedBuilding;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 226
+ */
+public class Container_BasedBuilding extends ObjectType
+{
+ public Container_BasedBuilding()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(3)); // Cultural feature
+ setCategory((byte)8); // Container-Based Building
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/Culturalfeature.java b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/Culturalfeature.java
new file mode 100644
index 0000000000000000000000000000000000000000..af9f3cd11dc1aea9d7928a6a6c80ccb1997ac397
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/Culturalfeature.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.objecttypes.PointObject.Culturalfeature;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 226
+ */
+public class Culturalfeature extends ObjectType
+{
+ public Culturalfeature()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(3)); // Cultural feature
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/DisturbedEarth/DisturbedEarth.java b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/DisturbedEarth/DisturbedEarth.java
new file mode 100644
index 0000000000000000000000000000000000000000..b402c56f1d1f6f2ad29d9de85d439ffe585062bd
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/DisturbedEarth/DisturbedEarth.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.PointObject.Culturalfeature.DisturbedEarth;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 226
+ */
+public class DisturbedEarth extends ObjectType
+{
+ public DisturbedEarth()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(3)); // Cultural feature
+ setCategory((byte)3); // Disturbed Earth
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/DisturbedRoad/DisturbedRoad.java b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/DisturbedRoad/DisturbedRoad.java
new file mode 100644
index 0000000000000000000000000000000000000000..d6d94e9b336a72e2e1185ad1d6815f2ce8118708
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/DisturbedRoad/DisturbedRoad.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.PointObject.Culturalfeature.DisturbedRoad;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 226
+ */
+public class DisturbedRoad extends ObjectType
+{
+ public DisturbedRoad()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(3)); // Cultural feature
+ setCategory((byte)4); // Disturbed Road
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/IndustrialProcessingPlant/IndustrialProcessingPlant.java b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/IndustrialProcessingPlant/IndustrialProcessingPlant.java
new file mode 100644
index 0000000000000000000000000000000000000000..c2f939e86f648d869c219ec8ded3925a8787f2de
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/IndustrialProcessingPlant/IndustrialProcessingPlant.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.PointObject.Culturalfeature.IndustrialProcessingPlant;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 226
+ */
+public class IndustrialProcessingPlant extends ObjectType
+{
+ public IndustrialProcessingPlant()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(3)); // Cultural feature
+ setCategory((byte)13); // Industrial Processing Plant
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding.java b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding.java
new file mode 100644
index 0000000000000000000000000000000000000000..026ca293938629093734d7892484fef67de676bb
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/MOUTBuilding/MOUTBuilding.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.PointObject.Culturalfeature.MOUTBuilding;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 226
+ */
+public class MOUTBuilding extends ObjectType
+{
+ public MOUTBuilding()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(3)); // Cultural feature
+ setCategory((byte)7); // MOUT Building
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/MaintenanceStructure/MaintenanceStructure.java b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/MaintenanceStructure/MaintenanceStructure.java
new file mode 100644
index 0000000000000000000000000000000000000000..88b5c5b7847714e956033874f2abd61ec5873a65
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/MaintenanceStructure/MaintenanceStructure.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.PointObject.Culturalfeature.MaintenanceStructure;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 226
+ */
+public class MaintenanceStructure extends ObjectType
+{
+ public MaintenanceStructure()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(3)); // Cultural feature
+ setCategory((byte)6); // Maintenance Structure
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/Other/Other.java b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/Other/Other.java
new file mode 100644
index 0000000000000000000000000000000000000000..c7800929fb48a78dd990166bdd972ad03e52f3cf
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/Other/Other.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.PointObject.Culturalfeature.Other;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 226
+ */
+public class Other extends ObjectType
+{
+ public Other()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(3)); // Cultural feature
+ setCategory((byte)0); // Other
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/Pump/Pump.java b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/Pump/Pump.java
new file mode 100644
index 0000000000000000000000000000000000000000..ecb995501c105b256b02ba0d9cea22222c6a5473
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/Pump/Pump.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.PointObject.Culturalfeature.Pump;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 226
+ */
+public class Pump extends ObjectType
+{
+ public Pump()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(3)); // Cultural feature
+ setCategory((byte)12); // Pump
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/Tent/Tent.java b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/Tent/Tent.java
new file mode 100644
index 0000000000000000000000000000000000000000..a8410486470c2c055794ffe49706632fd7f39b9c
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/Tent/Tent.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.PointObject.Culturalfeature.Tent;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 226
+ */
+public class Tent extends ObjectType
+{
+ public Tent()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(3)); // Cultural feature
+ setCategory((byte)5); // Tent
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/Tree_Deciduous/Tree_Deciduous.java b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/Tree_Deciduous/Tree_Deciduous.java
new file mode 100644
index 0000000000000000000000000000000000000000..6a4c3c83b7f560ebb1bab7fdecb58969d9a82e84
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/Tree_Deciduous/Tree_Deciduous.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.PointObject.Culturalfeature.Tree_Deciduous;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 226
+ */
+public class Tree_Deciduous extends ObjectType
+{
+ public Tree_Deciduous()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(3)); // Cultural feature
+ setCategory((byte)10); // Tree, Deciduous
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/Tree_Evergreen/Tree_Evergreen.java b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/Tree_Evergreen/Tree_Evergreen.java
new file mode 100644
index 0000000000000000000000000000000000000000..f3149d9a3e0ac3265b71c88071220bede6aeadff
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/Tree_Evergreen/Tree_Evergreen.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.PointObject.Culturalfeature.Tree_Evergreen;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 226
+ */
+public class Tree_Evergreen extends ObjectType
+{
+ public Tree_Evergreen()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(3)); // Cultural feature
+ setCategory((byte)11); // Tree, Evergreen
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/UtilityPole/UtilityPole.java b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/UtilityPole/UtilityPole.java
new file mode 100644
index 0000000000000000000000000000000000000000..acebfeb7cff0ba4787c4c20e11e2f87ccd522a91
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Culturalfeature/UtilityPole/UtilityPole.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.PointObject.Culturalfeature.UtilityPole;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 226
+ */
+public class UtilityPole extends ObjectType
+{
+ public UtilityPole()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(3)); // Cultural feature
+ setCategory((byte)14); // Utility Pole
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/EnvironmentalObject/EnvironmentalObject.java b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/EnvironmentalObject/EnvironmentalObject.java
new file mode 100644
index 0000000000000000000000000000000000000000..50a66a48fc84284232a9512c4fe976d80d7db5aa
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/EnvironmentalObject/EnvironmentalObject.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.objecttypes.PointObject.EnvironmentalObject;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 226
+ */
+public class EnvironmentalObject extends ObjectType
+{
+ public EnvironmentalObject()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(8)); // Environmental Object
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/EnvironmentalObject/Flood/Flood.java b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/EnvironmentalObject/Flood/Flood.java
new file mode 100644
index 0000000000000000000000000000000000000000..53bbc41e415ecc4a9805c5eeac72272aa3449a03
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/EnvironmentalObject/Flood/Flood.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.PointObject.EnvironmentalObject.Flood;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 226
+ */
+public class Flood extends ObjectType
+{
+ public Flood()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(8)); // Environmental Object
+ setCategory((byte)1); // Flood
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstacle/Abatis/Abatis.java b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstacle/Abatis/Abatis.java
new file mode 100644
index 0000000000000000000000000000000000000000..2a786b6301fed5df06242e5e9396596dbf33d075
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstacle/Abatis/Abatis.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.PointObject.Obstacle.Abatis;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 226
+ */
+public class Abatis extends ObjectType
+{
+ public Abatis()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(1)); // Obstacle
+ setCategory((byte)1); // Abatis
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstacle/Barrier/Barrier.java b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstacle/Barrier/Barrier.java
new file mode 100644
index 0000000000000000000000000000000000000000..53873e4a50bd50a4089a652fecbe8d066d8379c4
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstacle/Barrier/Barrier.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.PointObject.Obstacle.Barrier;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 226
+ */
+public class Barrier extends ObjectType
+{
+ public Barrier()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(1)); // Obstacle
+ setCategory((byte)4); // Barrier
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstacle/Crater/Crater.java b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstacle/Crater/Crater.java
new file mode 100644
index 0000000000000000000000000000000000000000..168a549eab15c89a32df10b9a9d3b04df08b6104
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstacle/Crater/Crater.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.PointObject.Obstacle.Crater;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 226
+ */
+public class Crater extends ObjectType
+{
+ public Crater()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(1)); // Obstacle
+ setCategory((byte)3); // Crater
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstacle/LogCrib/LogCrib.java b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstacle/LogCrib/LogCrib.java
new file mode 100644
index 0000000000000000000000000000000000000000..139158458ff3300b973ae4c767db1ccb5df8b549
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstacle/LogCrib/LogCrib.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.PointObject.Obstacle.LogCrib;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 226
+ */
+public class LogCrib extends ObjectType
+{
+ public LogCrib()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(1)); // Obstacle
+ setCategory((byte)2); // Log Crib
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstacle/Obstacle.java b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstacle/Obstacle.java
new file mode 100644
index 0000000000000000000000000000000000000000..cea542765e1018f812a7d30889ff008f0d108310
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstacle/Obstacle.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.objecttypes.PointObject.Obstacle;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 226
+ */
+public class Obstacle extends ObjectType
+{
+ public Obstacle()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(1)); // Obstacle
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstacle/Other/Other.java b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstacle/Other/Other.java
new file mode 100644
index 0000000000000000000000000000000000000000..fe448f73b286083673658bdc295fc36dae958864
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstacle/Other/Other.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.PointObject.Obstacle.Other;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 226
+ */
+public class Other extends ObjectType
+{
+ public Other()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(1)); // Obstacle
+ setCategory((byte)0); // Other
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstacle/PotHole/PotHole.java b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstacle/PotHole/PotHole.java
new file mode 100644
index 0000000000000000000000000000000000000000..8f8b991b20f4a1c5747705dd32bf149f1c4138ef
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstacle/PotHole/PotHole.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.PointObject.Obstacle.PotHole;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 226
+ */
+public class PotHole extends ObjectType
+{
+ public PotHole()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(1)); // Obstacle
+ setCategory((byte)9); // Pot Hole
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstacle/RockDrop/RockDrop.java b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstacle/RockDrop/RockDrop.java
new file mode 100644
index 0000000000000000000000000000000000000000..fed11f4c3fc8d021fc93a970afb919b67ba9a07b
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstacle/RockDrop/RockDrop.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.PointObject.Obstacle.RockDrop;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 226
+ */
+public class RockDrop extends ObjectType
+{
+ public RockDrop()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(1)); // Obstacle
+ setCategory((byte)5); // Rock Drop
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstaclemarker/NBCHazardMarker/NBCHazardMarker.java b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstaclemarker/NBCHazardMarker/NBCHazardMarker.java
new file mode 100644
index 0000000000000000000000000000000000000000..1b757df721c4fe10c677a7db91dc02d7d279939a
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstaclemarker/NBCHazardMarker/NBCHazardMarker.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.PointObject.Obstaclemarker.NBCHazardMarker;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 226
+ */
+public class NBCHazardMarker extends ObjectType
+{
+ public NBCHazardMarker()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(6)); // Obstacle marker
+ setCategory((byte)2); // NBC Hazard Marker
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstaclemarker/Obstaclemarker.java b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstaclemarker/Obstaclemarker.java
new file mode 100644
index 0000000000000000000000000000000000000000..bb72d0bb11b3e17c75b5ac53beddf8208c6f7f39
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Obstaclemarker/Obstaclemarker.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.objecttypes.PointObject.Obstaclemarker;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 226
+ */
+public class Obstaclemarker extends ObjectType
+{
+ public Obstaclemarker()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(6)); // Obstacle marker
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Passageway/AVLB/AVLB.java b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Passageway/AVLB/AVLB.java
new file mode 100644
index 0000000000000000000000000000000000000000..439c0642bbff9843b45e9596b7e4a436b26ea5bc
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Passageway/AVLB/AVLB.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.PointObject.Passageway.AVLB;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 226
+ */
+public class AVLB extends ObjectType
+{
+ public AVLB()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(4)); // Passageway
+ setCategory((byte)2); // AVLB
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Passageway/Other/Other.java b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Passageway/Other/Other.java
new file mode 100644
index 0000000000000000000000000000000000000000..95321e2cdb7a92b935b5dd0529b7d0297bf5fd03
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Passageway/Other/Other.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.PointObject.Passageway.Other;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 226
+ */
+public class Other extends ObjectType
+{
+ public Other()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(4)); // Passageway
+ setCategory((byte)0); // Other
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Passageway/Passageway.java b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Passageway/Passageway.java
new file mode 100644
index 0000000000000000000000000000000000000000..1c12d176510618a822928bae38eef4f43f7b6f84
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Passageway/Passageway.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.objecttypes.PointObject.Passageway;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 226
+ */
+public class Passageway extends ObjectType
+{
+ public Passageway()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(4)); // Passageway
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Passageway/Pier/Pier.java b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Passageway/Pier/Pier.java
new file mode 100644
index 0000000000000000000000000000000000000000..bea08412a5a9318fd4fa3cb44113d998d4681607
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Passageway/Pier/Pier.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.PointObject.Passageway.Pier;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 226
+ */
+public class Pier extends ObjectType
+{
+ public Pier()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(4)); // Passageway
+ setCategory((byte)4); // Pier
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Passageway/RibbonBridge/RibbonBridge.java b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Passageway/RibbonBridge/RibbonBridge.java
new file mode 100644
index 0000000000000000000000000000000000000000..c96678645eb4f9405dd8deb1d9f06afe39cc2757
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Passageway/RibbonBridge/RibbonBridge.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.PointObject.Passageway.RibbonBridge;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 226
+ */
+public class RibbonBridge extends ObjectType
+{
+ public RibbonBridge()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(4)); // Passageway
+ setCategory((byte)3); // Ribbon Bridge
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Passageway/StationaryBridge/StationaryBridge.java b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Passageway/StationaryBridge/StationaryBridge.java
new file mode 100644
index 0000000000000000000000000000000000000000..e0d30bde3cfa438e686b784e1abac759797c5802
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Passageway/StationaryBridge/StationaryBridge.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.PointObject.Passageway.StationaryBridge;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 226
+ */
+public class StationaryBridge extends ObjectType
+{
+ public StationaryBridge()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(4)); // Passageway
+ setCategory((byte)1); // Stationary Bridge
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/PointObject.java b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/PointObject.java
new file mode 100644
index 0000000000000000000000000000000000000000..866316c40457a9c61626851dda1e669b99b42fb7
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/PointObject.java
@@ -0,0 +1,17 @@
+package edu.nps.moves.dis.objecttypes.PointObject;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 226
+ */
+public class PointObject extends ObjectType
+{
+ public PointObject()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Preparedposition/InfantryFightingPosition/InfantryFightingPosition.java b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Preparedposition/InfantryFightingPosition/InfantryFightingPosition.java
new file mode 100644
index 0000000000000000000000000000000000000000..e7a9deec7afc7fd567a7aed4b67fa0249ba53429
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Preparedposition/InfantryFightingPosition/InfantryFightingPosition.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.PointObject.Preparedposition.InfantryFightingPosition;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 226
+ */
+public class InfantryFightingPosition extends ObjectType
+{
+ public InfantryFightingPosition()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(2)); // Prepared position
+ setCategory((byte)2); // Infantry Fighting Position
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Preparedposition/Other/Other.java b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Preparedposition/Other/Other.java
new file mode 100644
index 0000000000000000000000000000000000000000..26a38632f949c2bb1378d78f8905ca6d6a6620ab
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Preparedposition/Other/Other.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.PointObject.Preparedposition.Other;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 226
+ */
+public class Other extends ObjectType
+{
+ public Other()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(2)); // Prepared position
+ setCategory((byte)0); // Other
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Preparedposition/Preparedposition.java b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Preparedposition/Preparedposition.java
new file mode 100644
index 0000000000000000000000000000000000000000..799071a1367bf673fd21db701a005201ec35fa91
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Preparedposition/Preparedposition.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.objecttypes.PointObject.Preparedposition;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 226
+ */
+public class Preparedposition extends ObjectType
+{
+ public Preparedposition()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(2)); // Prepared position
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Preparedposition/VehicleDefilade/VehicleDefilade.java b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Preparedposition/VehicleDefilade/VehicleDefilade.java
new file mode 100644
index 0000000000000000000000000000000000000000..b491400c2a5f538a34861e2683260bd1fe1afcd2
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Preparedposition/VehicleDefilade/VehicleDefilade.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.PointObject.Preparedposition.VehicleDefilade;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 226
+ */
+public class VehicleDefilade extends ObjectType
+{
+ public VehicleDefilade()
+ {
+ setDomain(PlatformDomain.getEnumForValue(1));
+ setObjectKind(ObjectKind.getEnumForValue(2)); // Prepared position
+ setCategory((byte)1); // Vehicle Defilade
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Tacticalsmoke/AirBurst/AirBurst.java b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Tacticalsmoke/AirBurst/AirBurst.java
new file mode 100644
index 0000000000000000000000000000000000000000..9877727974ea5e673d98fc2ed8af385399248728
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Tacticalsmoke/AirBurst/AirBurst.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.PointObject.Tacticalsmoke.AirBurst;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 226
+ */
+public class AirBurst extends ObjectType
+{
+ public AirBurst()
+ {
+ setDomain(PlatformDomain.getEnumForValue(0));
+ setObjectKind(ObjectKind.getEnumForValue(5)); // Tactical smoke
+ setCategory((byte)2); // Air Burst
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Tacticalsmoke/GroundBurst/GroundBurst.java b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Tacticalsmoke/GroundBurst/GroundBurst.java
new file mode 100644
index 0000000000000000000000000000000000000000..7e6cbc1665a9f355599c87a8fca79b03dcca7472
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Tacticalsmoke/GroundBurst/GroundBurst.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.PointObject.Tacticalsmoke.GroundBurst;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 226
+ */
+public class GroundBurst extends ObjectType
+{
+ public GroundBurst()
+ {
+ setDomain(PlatformDomain.getEnumForValue(0));
+ setObjectKind(ObjectKind.getEnumForValue(5)); // Tactical smoke
+ setCategory((byte)1); // Ground Burst
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Tacticalsmoke/Other/Other.java b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Tacticalsmoke/Other/Other.java
new file mode 100644
index 0000000000000000000000000000000000000000..6899a4bc1db49e79bb9c8bf96a17061b5c35c91a
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Tacticalsmoke/Other/Other.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.PointObject.Tacticalsmoke.Other;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 226
+ */
+public class Other extends ObjectType
+{
+ public Other()
+ {
+ setDomain(PlatformDomain.getEnumForValue(0));
+ setObjectKind(ObjectKind.getEnumForValue(5)); // Tactical smoke
+ setCategory((byte)0); // Other
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Tacticalsmoke/TacticalSmoke_Canister/TacticalSmoke_Canister.java b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Tacticalsmoke/TacticalSmoke_Canister/TacticalSmoke_Canister.java
new file mode 100644
index 0000000000000000000000000000000000000000..03a3b16d4143a0a8a16dd60e56b95d739260b451
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Tacticalsmoke/TacticalSmoke_Canister/TacticalSmoke_Canister.java
@@ -0,0 +1,19 @@
+package edu.nps.moves.dis.objecttypes.PointObject.Tacticalsmoke.TacticalSmoke_Canister;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 226
+ */
+public class TacticalSmoke_Canister extends ObjectType
+{
+ public TacticalSmoke_Canister()
+ {
+ setDomain(PlatformDomain.getEnumForValue(0));
+ setObjectKind(ObjectKind.getEnumForValue(5)); // Tactical smoke
+ setCategory((byte)3); // Tactical Smoke, Canister
+ }
+}
diff --git a/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Tacticalsmoke/Tacticalsmoke.java b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Tacticalsmoke/Tacticalsmoke.java
new file mode 100644
index 0000000000000000000000000000000000000000..8a0bf83fbe4b278b5765038c79586650a44f5cba
--- /dev/null
+++ b/src-generated/edu/nps/moves/dis/objecttypes/PointObject/Tacticalsmoke/Tacticalsmoke.java
@@ -0,0 +1,18 @@
+package edu.nps.moves.dis.objecttypes.PointObject.Tacticalsmoke;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.dis.enumerations.*;
+
+/**
+ * SISO-REF-010-v25, 2018-08-29
+ *
+ * ObjectType uid: 226
+ */
+public class Tacticalsmoke extends ObjectType
+{
+ public Tacticalsmoke()
+ {
+ setDomain(PlatformDomain.getEnumForValue(0));
+ setObjectKind(ObjectKind.getEnumForValue(5)); // Tactical smoke
+ }
+}