diff --git a/assignments/src/MV3500Cohort2019JulySeptember/homework4/Fetterolf/FetterolfPduListenerSaver.java b/assignments/src/MV3500Cohort2019JulySeptember/homework4/Fetterolf/FetterolfPduListenerSaver.java index 2c7c6a144e43f29b9dc169e0bdc3907c84452a32..2f858a3caa605d22df041c86e9be022c04c6ad49 100644 --- a/assignments/src/MV3500Cohort2019JulySeptember/homework4/Fetterolf/FetterolfPduListenerSaver.java +++ b/assignments/src/MV3500Cohort2019JulySeptember/homework4/Fetterolf/FetterolfPduListenerSaver.java @@ -77,7 +77,7 @@ public class FetterolfPduListenerSaver { } } System.out.println("Ending pdu save to " + recorder.getLogFile()); - } catch (IOException ex) { + } catch (Exception ex) { System.err.println("*** Exception: " + ex.getClass().getSimpleName() + ": " + ex.getLocalizedMessage()); } } diff --git a/assignments/src/MV3500Cohort2019JulySeptember/homework4/Fetterolf/FetterolfPduReceiver.java b/assignments/src/MV3500Cohort2019JulySeptember/homework4/Fetterolf/FetterolfPduReceiver.java index cf2f1e99151d6d5ff92d80e6ec8b24e39e834cff..703d3cc725ee1fb1c893d1d382300d5544481648 100644 --- a/assignments/src/MV3500Cohort2019JulySeptember/homework4/Fetterolf/FetterolfPduReceiver.java +++ b/assignments/src/MV3500Cohort2019JulySeptember/homework4/Fetterolf/FetterolfPduReceiver.java @@ -3,7 +3,7 @@ package MV3500Cohort2019JulySeptember.homework4.Fetterolf; import java.net.*; import java.io.*; -import edu.nps.moves.dis7.*; +import edu.nps.moves.dis7.pdus.*; import edu.nps.moves.dis7.enumerations.*; import edu.nps.moves.dis7.utilities.*; import java.util.ArrayList; diff --git a/assignments/src/MV3500Cohort2019JulySeptember/homework4/Fetterolf/FetterolfPduSender.java b/assignments/src/MV3500Cohort2019JulySeptember/homework4/Fetterolf/FetterolfPduSender.java index af97291ed05ce19edf6172e52853261111f64bd2..cf4d9649f8bbdb49fac1d05f759ef68a4c6ea939 100755 --- a/assignments/src/MV3500Cohort2019JulySeptember/homework4/Fetterolf/FetterolfPduSender.java +++ b/assignments/src/MV3500Cohort2019JulySeptember/homework4/Fetterolf/FetterolfPduSender.java @@ -4,7 +4,7 @@ import java.io.*; import java.net.*; import java.util.*; -import edu.nps.moves.dis7.*; +import edu.nps.moves.dis7.pdus.*; import edu.nps.moves.dis7.enumerations.*; /** @@ -104,7 +104,7 @@ public class FetterolfPduSender { // see Garrett Loffelman and Pete Severson's code for OpenDis version 4 example // https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/tree/master/assignments/src/MV3500Cohort2018JulySeptember/projects/LoeffelmanSeverson CommentPdu newCommentPdu = new CommentPdu(); - ArrayList<VariableDatum> payloadList = new ArrayList<VariableDatum>(); + ArrayList<VariableDatum> payloadList = new ArrayList<>(); ArrayList<String> commentsList = new ArrayList<>(); commentsList.add("Hello CommentPDU"); @@ -117,7 +117,7 @@ public class FetterolfPduSender { for (String comment : commentsList) { VariableDatum newVariableDatum = new VariableDatum(); newVariableDatum.setVariableDatumValue(comment.getBytes()); // conversion - newVariableDatum.setVariableDatumLength(comment.getBytes().length * 8); // bits, not bytes, see spec and javadoc + newVariableDatum.setVariableDatumLengthInBits(comment.getBytes().length * 8); // bits, not bytes, see spec and javadoc // alternatively, you do not need to set this and the marshaller will figure it out from the byte array // (see javadoc for VariableDatum.setVariableDatumLength()) payloadList.add(newVariableDatum);