From 7061138e3c23eda210b2877ba52e6e6dcd940ce7 Mon Sep 17 00:00:00 2001
From: brutzman <brutzman@nps.edu>
Date: Wed, 25 Aug 2021 14:46:44 -0700
Subject: [PATCH] update deprecated method names
---
.../projects/SchuttFetterolf/AllPduRoundTripTest.java | 6 +++---
.../homework4/Britt/BrittSimulation.java | 4 ++--
.../homework4/Britt/ExampleSimulationProgram.java | 4 ++--
.../homework4/Cannon/CannonArtillerySimulation.java | 4 ++--
.../homework4/White/test/WhiteSimulation.java | 4 ++--
.../homework4/White/working/WhiteSimulation.java | 4 ++--
6 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/assignments/src/MV3500Cohort2019JulySeptember/projects/SchuttFetterolf/AllPduRoundTripTest.java b/assignments/src/MV3500Cohort2019JulySeptember/projects/SchuttFetterolf/AllPduRoundTripTest.java
index 54d6a8d6d8..2f7eb31d36 100644
--- a/assignments/src/MV3500Cohort2019JulySeptember/projects/SchuttFetterolf/AllPduRoundTripTest.java
+++ b/assignments/src/MV3500Cohort2019JulySeptember/projects/SchuttFetterolf/AllPduRoundTripTest.java
@@ -184,7 +184,7 @@
//
// private void shutDownReceiver()
// {
-// disNetworkInterface.kill();
+// disNetworkInterface.close();
// }
//
// private void sendOne(Pdu pdu)
@@ -196,7 +196,7 @@
// private void setupRecorder() throws Exception
// {
// recorderDirectory = Files.createTempDir();
-// recorder = new Recorder(recorderDirectory.getAbsolutePath(), disNetworkInterface.getMulticastGroup(), disNetworkInterface.getDisPort());
+// recorder = new Recorder(recorderDirectory.getAbsolutePath(), disNetworkInterface.getAddress(), disNetworkInterface.getPort());
// System.out.println("Recorder log at " + recorderDirectory.getAbsolutePath());
// }
//
@@ -215,7 +215,7 @@
// private void getAllFromRecorder(Semaphore sem) throws Exception
// {
// sem.acquire();
-// Player player = new Player(disNetworkInterface.getMulticastGroup(), disNetworkInterface.getDisPort(), recorderDirectory.toPath());
+// Player player = new Player(disNetworkInterface.getAddress(), disNetworkInterface.getPort(), recorderDirectory.toPath());
// player.sendToNet(false);
// player.addRawListener(ba -> {
// if (ba != null) {
diff --git a/assignments/src/MV3500Cohort2020JulySeptember/homework4/Britt/BrittSimulation.java b/assignments/src/MV3500Cohort2020JulySeptember/homework4/Britt/BrittSimulation.java
index 6abc7c2579..bcc46f6637 100644
--- a/assignments/src/MV3500Cohort2020JulySeptember/homework4/Britt/BrittSimulation.java
+++ b/assignments/src/MV3500Cohort2020JulySeptember/homework4/Britt/BrittSimulation.java
@@ -92,7 +92,7 @@ public class BrittSimulation
{
disNetworkInterface = new DisThreadedNetworkInterface(getNetworkAddress(), getNetworkPort());
- System.out.println("Network confirmation: address=" + disNetworkInterface.getMulticastGroup() + " port=" + disNetworkInterface.getDisPort());
+ System.out.println("Network confirmation: address=" + disNetworkInterface.getAddress() + " port=" + disNetworkInterface.getPort());
pduListener = new DisThreadedNetworkInterface.PduListener()
{
/** Callback handler for listener */
@@ -109,7 +109,7 @@ public class BrittSimulation
public void tearDownNetworkInterface()
{
disNetworkInterface.removeListener(pduListener);
- disNetworkInterface.kill();
+ disNetworkInterface.close();
disNetworkInterface = null;
}
diff --git a/assignments/src/MV3500Cohort2020JulySeptember/homework4/Britt/ExampleSimulationProgram.java b/assignments/src/MV3500Cohort2020JulySeptember/homework4/Britt/ExampleSimulationProgram.java
index 5c13f1a55a..8c3a7adc3f 100644
--- a/assignments/src/MV3500Cohort2020JulySeptember/homework4/Britt/ExampleSimulationProgram.java
+++ b/assignments/src/MV3500Cohort2020JulySeptember/homework4/Britt/ExampleSimulationProgram.java
@@ -82,7 +82,7 @@ public class ExampleSimulationProgram
{
disNetworkInterface = new DisThreadedNetworkInterface(getNetworkAddress(), getNetworkPort());
- System.out.println("Network confirmation: address=" + disNetworkInterface.getMulticastGroup() + " port=" + disNetworkInterface.getDisPort());
+ System.out.println("Network confirmation: address=" + disNetworkInterface.getAddress() + " port=" + disNetworkInterface.getPort());
pduListener = new DisThreadedNetworkInterface.PduListener()
{
/** Callback handler for listener */
@@ -99,7 +99,7 @@ public class ExampleSimulationProgram
public void tearDownNetworkInterface()
{
disNetworkInterface.removeListener(pduListener);
- disNetworkInterface.kill();
+ disNetworkInterface.close();
disNetworkInterface = null;
}
diff --git a/assignments/src/MV3500Cohort2020JulySeptember/homework4/Cannon/CannonArtillerySimulation.java b/assignments/src/MV3500Cohort2020JulySeptember/homework4/Cannon/CannonArtillerySimulation.java
index 585b860651..83ab65ca8c 100644
--- a/assignments/src/MV3500Cohort2020JulySeptember/homework4/Cannon/CannonArtillerySimulation.java
+++ b/assignments/src/MV3500Cohort2020JulySeptember/homework4/Cannon/CannonArtillerySimulation.java
@@ -87,7 +87,7 @@ public class CannonArtillerySimulation {
public void setUpNetworkInterface() {
disNetworkInterface = new DisThreadedNetworkInterface(getNetworkAddress(), getNetworkPort());
- System.out.println("Network confirmation: address=" + disNetworkInterface.getMulticastGroup() + " port=" + disNetworkInterface.getDisPort());
+ System.out.println("Network confirmation: address=" + disNetworkInterface.getAddress() + " port=" + disNetworkInterface.getPort());
pduListener = new DisThreadedNetworkInterface.PduListener() {
/**
* Callback handler for listener
@@ -105,7 +105,7 @@ public class CannonArtillerySimulation {
*/
public void tearDownNetworkInterface() {
disNetworkInterface.removeListener(pduListener);
- disNetworkInterface.kill();
+ disNetworkInterface.close();
disNetworkInterface = null;
}
diff --git a/assignments/src/MV3500Cohort2020JulySeptember/homework4/White/test/WhiteSimulation.java b/assignments/src/MV3500Cohort2020JulySeptember/homework4/White/test/WhiteSimulation.java
index 669117f1ec..a0fb6b7672 100644
--- a/assignments/src/MV3500Cohort2020JulySeptember/homework4/White/test/WhiteSimulation.java
+++ b/assignments/src/MV3500Cohort2020JulySeptember/homework4/White/test/WhiteSimulation.java
@@ -93,7 +93,7 @@ public class WhiteSimulation
{
disNetworkInterface = new DisThreadedNetworkInterface(getNetworkAddress(), getNetworkPort());
- System.out.println("Network confirmation: address=" + disNetworkInterface.getMulticastGroup() + " port=" + disNetworkInterface.getDisPort());
+ System.out.println("Network confirmation: address=" + disNetworkInterface.getAddress() + " port=" + disNetworkInterface.getPort());
pduListener = new DisThreadedNetworkInterface.PduListener()
{
/** Callback handler for listener */
@@ -110,7 +110,7 @@ public class WhiteSimulation
public void tearDownNetworkInterface()
{
disNetworkInterface.removeListener(pduListener);
- disNetworkInterface.kill();
+ disNetworkInterface.close();
disNetworkInterface = null;
}
diff --git a/assignments/src/MV3500Cohort2020JulySeptember/homework4/White/working/WhiteSimulation.java b/assignments/src/MV3500Cohort2020JulySeptember/homework4/White/working/WhiteSimulation.java
index bf004e918f..8f8ab27b60 100644
--- a/assignments/src/MV3500Cohort2020JulySeptember/homework4/White/working/WhiteSimulation.java
+++ b/assignments/src/MV3500Cohort2020JulySeptember/homework4/White/working/WhiteSimulation.java
@@ -92,7 +92,7 @@ public class WhiteSimulation
{
disNetworkInterface = new DisThreadedNetworkInterface(getNetworkAddress(), getNetworkPort());
- System.out.println("Network confirmation: address=" + disNetworkInterface.getMulticastGroup() + " port=" + disNetworkInterface.getDisPort());
+ System.out.println("Network confirmation: address=" + disNetworkInterface.getAddress() + " port=" + disNetworkInterface.getPort());
pduListener = new DisThreadedNetworkInterface.PduListener()
{
/** Callback handler for listener */
@@ -109,7 +109,7 @@ public class WhiteSimulation
public void tearDownNetworkInterface()
{
disNetworkInterface.removeListener(pduListener);
- disNetworkInterface.kill();
+ disNetworkInterface.close();
disNetworkInterface = null;
}
--
GitLab