Fixes to Underwater Accoustics PDU (DIS7)

src/main/java/edu/nps/moves/dis7/AcousticBeamData.java

@@ -0,0 +1,192 @@
+package edu.nps.moves.dis7;
+
+import java.io.*;
+
+/**
+ * Used in UA PDU
+ *
+ * Copyright (c) 2008-2016, 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
+ *
+ * @author DMcG
+ */
+public class AcousticBeamData extends Object implements Serializable {
+
+    /**
+     * beam data length
+     */
+    protected int beamDataLength;
+
+    /**
+     * beamIDNumber
+     */
+    protected short beamIDNumber;
+
+    /**
+     * padding
+     */
+    protected int pad2;
+
+    /**
+     * fundamental data parameters
+     */
+    protected AcousticBeamFundamentalParameter fundamentalDataParameters = new AcousticBeamFundamentalParameter();
+
+    /**
+     * Constructor
+     */
+    public AcousticBeamData() {
+    }
+
+    public int getMarshalledSize() {
+        int marshalSize = 0;
+
+        marshalSize = marshalSize + 2;  // beamDataLength
+        marshalSize = marshalSize + 1;  // beamIDNumber
+        marshalSize = marshalSize + 2;  // pad2
+        marshalSize = marshalSize + fundamentalDataParameters.getMarshalledSize();  // fundamentalDataParameters
+
+        return marshalSize;
+    }
+
+    public void setBeamDataLength(int pBeamDataLength) {
+        beamDataLength = pBeamDataLength;
+    }
+
+    public int getBeamDataLength() {
+        return beamDataLength;
+    }
+
+    public void setBeamIDNumber(short pBeamIDNumber) {
+        beamIDNumber = pBeamIDNumber;
+    }
+
+    public short getBeamIDNumber() {
+        return beamIDNumber;
+    }
+
+    public void setPad2(int pPad2) {
+        pad2 = pPad2;
+    }
+
+    public int getPad2() {
+        return pad2;
+    }
+
+    public void setFundamentalDataParameters(AcousticBeamFundamentalParameter pFundamentalDataParameters) {
+        fundamentalDataParameters = pFundamentalDataParameters;
+    }
+
+    public AcousticBeamFundamentalParameter getFundamentalDataParameters() {
+        return fundamentalDataParameters;
+    }
+
+    /**
+     * Packs a Pdu into the ByteBuffer.
+     *
+     * @throws java.nio.BufferOverflowException if buff is too small
+     * @throws java.nio.ReadOnlyBufferException if buff is read only
+     * @see java.nio.ByteBuffer
+     * @param buff The ByteBuffer at the position to begin writing
+     * @since ??
+     */
+    public void marshal(java.nio.ByteBuffer buff) {
+        buff.putShort((short) beamDataLength);
+        buff.put((byte) beamIDNumber);
+        buff.putShort((short) pad2);
+        fundamentalDataParameters.marshal(buff);
+    } // end of marshal method
+
+    /**
+     * Unpacks a Pdu from the underlying data.
+     *
+     * @throws java.nio.BufferUnderflowException if buff is too small
+     * @see java.nio.ByteBuffer
+     * @param buff The ByteBuffer at the position to begin reading
+     * @since ??
+     */
+    public void unmarshal(java.nio.ByteBuffer buff) {
+        beamDataLength = (int) (buff.getShort() & 0xFFFF);
+        beamIDNumber = (short) (buff.get() & 0xFF);
+        pad2 = (int) (buff.getShort() & 0xFFFF);
+        fundamentalDataParameters.unmarshal(buff);
+    } // end of unmarshal method 
+
+    public void marshal(DataOutputStream dos) {
+        try {
+            dos.writeShort((short) beamDataLength);
+            dos.writeByte((byte) beamIDNumber);
+            dos.writeShort((short) pad2);
+            fundamentalDataParameters.marshal(dos);
+        } // end try 
+        catch (Exception e) {
+            System.out.println(e);
+        }
+    }
+
+    public void unmarshal(DataInputStream dis) {
+        try {
+            beamDataLength = (int) dis.readShort();
+            beamIDNumber = (short) dis.readByte();
+            pad2 = (int) dis.readShort();
+            fundamentalDataParameters.unmarshal(dis);
+        } // end try 
+        catch (Exception e) {
+            System.out.println(e);
+        }
+    } // end of unmarshal method 
+
+    /*
+  * 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 AcousticBeamData)) {
+            return false;
+        }
+
+        final AcousticBeamData rhs = (AcousticBeamData) obj;
+
+        if (!(beamDataLength == rhs.beamDataLength)) {
+            ivarsEqual = false;
+        }
+        if (!(beamIDNumber == rhs.beamIDNumber)) {
+            ivarsEqual = false;
+        }
+        if (!(pad2 == rhs.pad2)) {
+            ivarsEqual = false;
+        }
+        if (!(fundamentalDataParameters.equals(rhs.fundamentalDataParameters))) {
+            ivarsEqual = false;
+        }
+
+        return ivarsEqual;
+    }
+} // end of class