From 878dc60393e2aacca17fb39d58d30b98408a4637 Mon Sep 17 00:00:00 2001
From: brutzman <brutzman@DESKTOP-2S09UKA>
Date: Sun, 30 Aug 2020 21:25:29 -0700
Subject: [PATCH] fix imports with new build
---
.../BRE_KNO_MCC_PC1_MCAST_PduSender.java | 4 ++--
.../BRE_KNO_MCC_PC2_Controller.java | 2 +-
.../BRE_KNO_MCC_PC2_PC1_MCAST_PduReceiver.java | 2 +-
.../BRE_KNO_MCC_PC2_PC3_UNICAST_PduReceiver.java | 1 +
.../BRE_KNO_MCC_PC2_PC3_UNICAST_PduSender.java | 3 ++-
.../BRE_KNO_MCC_PC3_PC2_UNICAST_PduReceiver.java | 4 ++--
6 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC1_MCAST_PduSender.java b/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC1_MCAST_PduSender.java
index 88b3e29bda..95c656c681 100755
--- a/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC1_MCAST_PduSender.java
+++ b/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC1_MCAST_PduSender.java
@@ -5,7 +5,7 @@ import java.io.*;
import java.net.*;
-import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.pdus.*;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -94,7 +94,7 @@ public class BRE_KNO_MCC_PC1_MCAST_PduSender
for (int i = 0; i < numbOfPDUs; i++)
{
CommentPdu newCommentPdu = new CommentPdu();
- ArrayList<VariableDatum> payloadList = new ArrayList<VariableDatum>();
+ ArrayList<VariableDatum> payloadList = new ArrayList<>();
ArrayList<String> commentsList = new ArrayList<>();
newCommentPdu.setTimestamp((intervall * 5) + i );
diff --git a/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC2_Controller.java b/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC2_Controller.java
index e1fe5cbfe3..90e7987584 100644
--- a/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC2_Controller.java
+++ b/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC2_Controller.java
@@ -1,6 +1,6 @@
package MV3500Cohort2019JulySeptember.projects.BrennenstuhlKnobelochMcCann;
-import edu.nps.moves.dis7.Pdu;
+import edu.nps.moves.dis7.pdus.Pdu;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.List;
diff --git a/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC2_PC1_MCAST_PduReceiver.java b/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC2_PC1_MCAST_PduReceiver.java
index ee513e7730..e36e82cc70 100644
--- a/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC2_PC1_MCAST_PduReceiver.java
+++ b/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC2_PC1_MCAST_PduReceiver.java
@@ -6,7 +6,7 @@ import com.sun.corba.se.impl.orbutil.concurrent.Mutex; // JDK 8
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/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC2_PC3_UNICAST_PduReceiver.java b/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC2_PC3_UNICAST_PduReceiver.java
index a0dffe5c75..5022ef29af 100644
--- a/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC2_PC3_UNICAST_PduReceiver.java
+++ b/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC2_PC3_UNICAST_PduReceiver.java
@@ -13,6 +13,7 @@ public class BRE_KNO_MCC_PC2_PC3_UNICAST_PduReceiver extends Thread
static int portPC3;
+ @Override
public void run()
{
isRunning = true;
diff --git a/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC2_PC3_UNICAST_PduSender.java b/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC2_PC3_UNICAST_PduSender.java
index 87bc5b0021..c69ab2a5ba 100755
--- a/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC2_PC3_UNICAST_PduSender.java
+++ b/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC2_PC3_UNICAST_PduSender.java
@@ -5,7 +5,7 @@ import com.sun.corba.se.impl.orbutil.concurrent.Mutex; // JDK 8
// maybe https://crunchify.com/what-is-java-semaphore-and-mutex-java-concurrency-multithread-explained-with-example/
import java.util.*;
-import edu.nps.moves.dis7.*;
+import edu.nps.moves.dis7.pdus.*;
import edu.nps.moves.dis7.enumerations.DISPDUType;
import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;
@@ -27,6 +27,7 @@ public class BRE_KNO_MCC_PC2_PC3_UNICAST_PduSender extends Thread
static InetAddress pc3IP;
static int portPC3;
+ @Override
public void run()
{
try
diff --git a/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC3_PC2_UNICAST_PduReceiver.java b/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC3_PC2_UNICAST_PduReceiver.java
index de2f52bf8f..7f17d59ebb 100644
--- a/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC3_PC2_UNICAST_PduReceiver.java
+++ b/assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC3_PC2_UNICAST_PduReceiver.java
@@ -3,8 +3,8 @@ package MV3500Cohort2019JulySeptember.projects.BrennenstuhlKnobelochMcCann;
import java.net.*;
import java.io.*;
-import edu.nps.moves.dis7.*;
-import edu.nps.moves.dis7.util.PduFactory;
+import edu.nps.moves.dis7.pdus.*;
+import edu.nps.moves.dis7.utilities.PduFactory;
import java.util.ArrayList;
import java.util.logging.Level;
import java.util.logging.Logger;
--
GitLab