From f3785d5b68ea3801b4c991235d9f0befffee1a4a Mon Sep 17 00:00:00 2001
From: brutzman <brutzman@nps.edu>
Date: Sun, 25 Jul 2021 10:31:50 -0700
Subject: [PATCH] rename DISPDUType -> DisPduType
---
.../homework4/Boron/BoronPduReceiver.java | 4 ++--
.../homework4/Brennenstuhl/Version2/AllPduReceiver.java | 4 ++--
.../homework4/Fetterolf/FetterolfPduReceiver.java | 4 ++--
.../homework4/Fetterolf/FetterolfPduSender.java | 6 +++---
.../homework4/Knobeloch/Knobeloch_PduReceiver.java | 2 +-
.../homework4/McCann/McCannPduReceiver.java | 4 ++--
.../homework4/McCann/McCannPduSender.java | 6 +++---
.../BRE_KNO_MCC_PC2_PC1_MCAST_PduReceiver.java | 2 +-
.../BRE_KNO_MCC_PC2_PC3_UNICAST_PduSender.java | 4 ++--
.../projects/SchuttFetterolf/AllPduRoundTripTest.java | 8 ++++----
10 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/assignments/src/MV3500Cohort2019JulySeptember/homework4/Boron/BoronPduReceiver.java b/assignments/src/MV3500Cohort2019JulySeptember/homework4/Boron/BoronPduReceiver.java
index ad244eed28..d0fb9650e9 100644
--- a/assignments/src/MV3500Cohort2019JulySeptember/homework4/Boron/BoronPduReceiver.java
+++ b/assignments/src/MV3500Cohort2019JulySeptember/homework4/Boron/BoronPduReceiver.java
@@ -5,7 +5,7 @@ import java.io.*;
import edu.nps.moves.dis7.pdus.*;
import edu.nps.moves.dis7.enumerations.*;
-import static edu.nps.moves.dis7.enumerations.DISPDUType.*;
+import static edu.nps.moves.dis7.enumerations.DisPduType.*;
import edu.nps.moves.dis7.utilities.*;
/**
@@ -59,7 +59,7 @@ public class BoronPduReceiver
Pdu pdu = factory.createPdu(packet.getData());
if (pdu != null) {
- DISPDUType currentPduType = pdu.getPduType(); //short currentPduType = pdu.getPduType();
+ DisPduType currentPduType = pdu.getPduType(); //short currentPduType = pdu.getPduType();
String currentPduTypeName = pdu.getClass().getName();
DISProtocolFamily currentProtocolFamilyID = pdu.getProtocolFamily(); //short currentProtocolFamilyID = pdu.getProtocolFamily();
String currentPduFamilyName = pdu.getClass().getSuperclass().getSimpleName();
diff --git a/assignments/src/MV3500Cohort2019JulySeptember/homework4/Brennenstuhl/Version2/AllPduReceiver.java b/assignments/src/MV3500Cohort2019JulySeptember/homework4/Brennenstuhl/Version2/AllPduReceiver.java
index abe2879360..ec33bba46c 100644
--- a/assignments/src/MV3500Cohort2019JulySeptember/homework4/Brennenstuhl/Version2/AllPduReceiver.java
+++ b/assignments/src/MV3500Cohort2019JulySeptember/homework4/Brennenstuhl/Version2/AllPduReceiver.java
@@ -48,7 +48,7 @@ public class AllPduReceiver
Pdu pdu = factory.createPdu(packet.getData());
if (pdu != null)
{
- DISPDUType currentPduType = pdu.getPduType(); //short currentPduType = pdu.getPduType();
+ DisPduType currentPduType = pdu.getPduType(); //short currentPduType = pdu.getPduType();
String currentPduTypeName = pdu.getClass().getName();
DISProtocolFamily currentProtocolFamilyID = pdu.getProtocolFamily(); //short currentProtocolFamilyID = pdu.getProtocolFamily();
String currentPduFamilyName = pdu.getClass().getSuperclass().getSimpleName();
@@ -67,7 +67,7 @@ public class AllPduReceiver
message.append(")");
System.out.println(message.toString());
- switch (currentPduType) // using enumeration values from edu.​nps.​moves.​dis7.​enumerations.​DISPDUType
+ switch (currentPduType) // using enumeration values from edu.​nps.​moves.​dis7.​enumerations.​DisPduType
{
case COMMENT:
CommentPdu commentPdu = (CommentPdu)pdu; // cast to precise type
diff --git a/assignments/src/MV3500Cohort2019JulySeptember/homework4/Fetterolf/FetterolfPduReceiver.java b/assignments/src/MV3500Cohort2019JulySeptember/homework4/Fetterolf/FetterolfPduReceiver.java
index 036f15730d..b5c3ef49b5 100644
--- a/assignments/src/MV3500Cohort2019JulySeptember/homework4/Fetterolf/FetterolfPduReceiver.java
+++ b/assignments/src/MV3500Cohort2019JulySeptember/homework4/Fetterolf/FetterolfPduReceiver.java
@@ -49,7 +49,7 @@ public class FetterolfPduReceiver {
Pdu pdu = factory.createPdu(packet.getData());
if (pdu != null) {
- DISPDUType currentPduType = pdu.getPduType(); //short currentPduType = pdu.getPduType();
+ DisPduType currentPduType = pdu.getPduType(); //short currentPduType = pdu.getPduType();
String currentPduTypeName = pdu.getClass().getName();
DISProtocolFamily currentProtocolFamilyID = pdu.getProtocolFamily(); //short currentProtocolFamilyID = pdu.getProtocolFamily();
String currentPduFamilyName = pdu.getClass().getSuperclass().getSimpleName();
@@ -69,7 +69,7 @@ public class FetterolfPduReceiver {
message.append(")");
System.out.println(message.toString());
- switch (currentPduType) // using enumeration values from edu.​nps.​moves.​dis7.​enumerations.​DISPDUType
+ switch (currentPduType) // using enumeration values from edu.​nps.​moves.​dis7.​enumerations.​DisPduType
{
case COMMENT:
CommentPdu commentPdu = (CommentPdu) pdu; // cast to precise type
diff --git a/assignments/src/MV3500Cohort2019JulySeptember/homework4/Fetterolf/FetterolfPduSender.java b/assignments/src/MV3500Cohort2019JulySeptember/homework4/Fetterolf/FetterolfPduSender.java
index 309de41f97..c89b9b36d5 100755
--- a/assignments/src/MV3500Cohort2019JulySeptember/homework4/Fetterolf/FetterolfPduSender.java
+++ b/assignments/src/MV3500Cohort2019JulySeptember/homework4/Fetterolf/FetterolfPduSender.java
@@ -51,16 +51,16 @@ public class FetterolfPduSender {
// Loop through all the enumerated PDU types, create a PDU for each type,
// add that PDU to generatedPdusList, and send each one
- for (DISPDUType pdu : DISPDUType.values()) {
+ for (DisPduType pdu : DisPduType.values()) {
// System.out.println("PDU " + pdu.getValue() + " " + pdu.name() + " " + pdu.getDescription()); // diagnostic
Pdu aPdu = null; // edu.​nps.​moves7.​dis.PDU superclass for all PDUs, in preparation for custom assignment
try {
- switch (pdu) // using enumeration values from edu.​nps.​moves.​dis7.​enumerations.​DISPDUType
+ switch (pdu) // using enumeration values from edu.​nps.​moves.​dis7.​enumerations.​DisPduType
{
case OTHER: // 0
- System.out.println("*** Note: DISPDUType." + pdu.name() + " not supported"); // TODO why was this received?
+ System.out.println("*** Note: DisPduType." + pdu.name() + " not supported"); // TODO why was this received?
// nothing to send
break;
diff --git a/assignments/src/MV3500Cohort2019JulySeptember/homework4/Knobeloch/Knobeloch_PduReceiver.java b/assignments/src/MV3500Cohort2019JulySeptember/homework4/Knobeloch/Knobeloch_PduReceiver.java
index c062785c8b..3de8c19b07 100644
--- a/assignments/src/MV3500Cohort2019JulySeptember/homework4/Knobeloch/Knobeloch_PduReceiver.java
+++ b/assignments/src/MV3500Cohort2019JulySeptember/homework4/Knobeloch/Knobeloch_PduReceiver.java
@@ -46,7 +46,7 @@ public class Knobeloch_PduReceiver
Pdu pdu = factory.createPdu(packet.getData());
if (pdu != null) {
- DISPDUType currentPduType = pdu.getPduType(); //short currentPduType = pdu.getPduType();
+ DisPduType currentPduType = pdu.getPduType(); //short currentPduType = pdu.getPduType();
String currentPduTypeName = pdu.getClass().getName();
DISProtocolFamily currentProtocolFamilyID = pdu.getProtocolFamily(); //short currentProtocolFamilyID = pdu.getProtocolFamily();
//String currentPduFamilyName = pdu.getClass().getSuperclass().getSimpleName();
diff --git a/assignments/src/MV3500Cohort2019JulySeptember/homework4/McCann/McCannPduReceiver.java b/assignments/src/MV3500Cohort2019JulySeptember/homework4/McCann/McCannPduReceiver.java
index e3f076bc44..2bf8e0c912 100644
--- a/assignments/src/MV3500Cohort2019JulySeptember/homework4/McCann/McCannPduReceiver.java
+++ b/assignments/src/MV3500Cohort2019JulySeptember/homework4/McCann/McCannPduReceiver.java
@@ -48,7 +48,7 @@ public class McCannPduReceiver
Pdu pdu = factory.createPdu(packet.getData());
if (pdu != null)
{
- DISPDUType currentPduType = pdu.getPduType(); //short currentPduType = pdu.getPduType();
+ DisPduType currentPduType = pdu.getPduType(); //short currentPduType = pdu.getPduType();
String currentPduTypeName = pdu.getClass().getName();
DISProtocolFamily currentProtocolFamilyID = pdu.getProtocolFamily(); //short currentProtocolFamilyID = pdu.getProtocolFamily();
String currentPduFamilyName = pdu.getClass().getSuperclass().getSimpleName();
@@ -67,7 +67,7 @@ public class McCannPduReceiver
message.append(")");
System.out.println(message.toString());
- switch (currentPduType) // using enumeration values from edu.​nps.​moves.​dis7.​enumerations.​DISPDUType
+ switch (currentPduType) // using enumeration values from edu.​nps.​moves.​dis7.​enumerations.​DisPduType
{
case COMMENT:
CommentPdu commentPdu = (CommentPdu)pdu; // cast to precise type
diff --git a/assignments/src/MV3500Cohort2019JulySeptember/homework4/McCann/McCannPduSender.java b/assignments/src/MV3500Cohort2019JulySeptember/homework4/McCann/McCannPduSender.java
index 91bb956b09..f977877f85 100755
--- a/assignments/src/MV3500Cohort2019JulySeptember/homework4/McCann/McCannPduSender.java
+++ b/assignments/src/MV3500Cohort2019JulySeptember/homework4/McCann/McCannPduSender.java
@@ -56,17 +56,17 @@ public class McCannPduSender
// Loop through all the enumerated PDU types, create a PDU for each type,
// add that PDU to generatedPdusList, and send each one
- for (DISPDUType pdu : DISPDUType.values())
+ for (DisPduType pdu : DisPduType.values())
{
// System.out.println("PDU " + pdu.getValue() + " " + pdu.name() + " " + pdu.getDescription()); // diagnostic
Pdu aPdu = null; // edu.​nps.​moves7.​dis.PDU superclass for all PDUs, in preparation for custom assignment
try {
- switch (pdu) // using enumeration values from edu.​nps.​moves.​dis7.​enumerations.​DISPDUType
+ switch (pdu) // using enumeration values from edu.​nps.​moves.​dis7.​enumerations.​DisPduType
{
case OTHER: // 0
- System.out.println ("*** Note: DISPDUType." + pdu.name() + " not supported"); // TODO why was this received?
+ System.out.println ("*** Note: DisPduType." + pdu.name() + " not supported"); // TODO why was this received?
// nothing to send
break;
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 e36e82cc70..d9a767d946 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
@@ -44,7 +44,7 @@ public class BRE_KNO_MCC_PC2_PC1_MCAST_PduReceiver extends Thread
socket.receive(packet);
Pdu pdu = factory.createPdu(packet.getData());
- if (pdu != null && (pdu.getPduType() == DISPDUType.COMMENT))
+ if (pdu != null && (pdu.getPduType() == DisPduType.COMMENT))
{
if (!savedMCASTMessages.contains(pdu.getTimestamp()))
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 c69ab2a5ba..d8ba38d744 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
@@ -6,7 +6,7 @@ import com.sun.corba.se.impl.orbutil.concurrent.Mutex; // JDK 8
import java.util.*;
import edu.nps.moves.dis7.pdus.*;
-import edu.nps.moves.dis7.enumerations.DISPDUType;
+import edu.nps.moves.dis7.enumerations.DisPduType;
import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;
import java.io.IOException;
@@ -46,7 +46,7 @@ public class BRE_KNO_MCC_PC2_PC3_UNICAST_PduSender extends Thread
messagesToSend.remove(messagesToSend.get(0));
mutex.release();
- if (tempPdu.getPduType() != DISPDUType.COMMENT)
+ if (tempPdu.getPduType() != DisPduType.COMMENT)
{
System.out.println("Received Message Is Not A CommentPDU. Skiped.");
}
diff --git a/assignments/src/MV3500Cohort2019JulySeptember/projects/SchuttFetterolf/AllPduRoundTripTest.java b/assignments/src/MV3500Cohort2019JulySeptember/projects/SchuttFetterolf/AllPduRoundTripTest.java
index 4149955944..bdfca90f48 100644
--- a/assignments/src/MV3500Cohort2019JulySeptember/projects/SchuttFetterolf/AllPduRoundTripTest.java
+++ b/assignments/src/MV3500Cohort2019JulySeptember/projects/SchuttFetterolf/AllPduRoundTripTest.java
@@ -21,7 +21,7 @@
// */
//import com.google.common.io.Files;
//import edu.nps.moves.dis7.enumerations.Country;
-//import edu.nps.moves.dis7.enumerations.DISPDUType;
+//import edu.nps.moves.dis7.enumerations.DisPduType;
//import edu.nps.moves.dis7.util.DisThreadedNetworkInterface;
//import edu.nps.moves.dis7.util.PduFactory;
//import edu.nps.moves.dis7.util.playerrecorder.Player;
@@ -167,9 +167,9 @@
// }
//
// private File recorderDirectory;
-// private HashMap<DISPDUType, Pdu> pduSentMap = new HashMap<>();
-// private HashMap<DISPDUType, Pdu> pduReceivedMap = new HashMap<>();
-// private HashMap<DISPDUType, Pdu> pduReadMap = new HashMap<>();
+// private HashMap<DisPduType, Pdu> pduSentMap = new HashMap<>();
+// private HashMap<DisPduType, Pdu> pduReceivedMap = new HashMap<>();
+// private HashMap<DisPduType, Pdu> pduReadMap = new HashMap<>();
//
// DisThreadedNetworkInterface disNetworkInterface;
// Recorder recorder;
--
GitLab