From 037f3f58bd7496d81006069a82a7ead80a1961bf Mon Sep 17 00:00:00 2001
From: brutzman <brutzman@DESKTOP-2S09UKA>
Date: Sun, 30 Aug 2020 21:14:09 -0700
Subject: [PATCH] fix imports with new build
---
.../homework4/Fetterolf/FetterolfPduListenerSaver.java | 2 +-
.../homework4/Fetterolf/FetterolfPduReceiver.java | 2 +-
.../homework4/Fetterolf/FetterolfPduSender.java | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/assignments/src/MV3500Cohort2019JulySeptember/homework4/Fetterolf/FetterolfPduListenerSaver.java b/assignments/src/MV3500Cohort2019JulySeptember/homework4/Fetterolf/FetterolfPduListenerSaver.java
index 2c7c6a144e..2f858a3caa 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 cf2f1e9915..703d3cc725 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 af97291ed0..cf4d9649f8 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);
--
GitLab