Skip to content
Snippets Groups Projects
Commit f3785d5b authored by Brutzman, Don's avatar Brutzman, Don
Browse files

rename DISPDUType -> DisPduType

parent 1d7165e9
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 22 additions and 22 deletions
assignments/src/MV3500Cohort2019JulySeptember/homework4/Boron/BoronPduReceiver.java
+ 2
− 2
View file @ f3785d5b
......@@ -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();
......
assignments/src/MV3500Cohort2019JulySeptember/homework4/Brennenstuhl/Version2/AllPduReceiver.java
+ 2
− 2
View file @ f3785d5b
......@@ -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
......
assignments/src/MV3500Cohort2019JulySeptember/homework4/Fetterolf/FetterolfPduReceiver.java
+ 2
− 2
View file @ f3785d5b
......@@ -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
......
assignments/src/MV3500Cohort2019JulySeptember/homework4/Fetterolf/FetterolfPduSender.java
+ 3
− 3
View file @ f3785d5b
......@@ -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;
......
assignments/src/MV3500Cohort2019JulySeptember/homework4/Knobeloch/Knobeloch_PduReceiver.java
+ 1
− 1
View file @ f3785d5b
......@@ -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();
......
assignments/src/MV3500Cohort2019JulySeptember/homework4/McCann/McCannPduReceiver.java
+ 2
− 2
View file @ f3785d5b
......@@ -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
......
assignments/src/MV3500Cohort2019JulySeptember/homework4/McCann/McCannPduSender.java
+ 3
− 3
View file @ f3785d5b
......@@ -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;
......
assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC2_PC1_MCAST_PduReceiver.java
+ 1
− 1
View file @ f3785d5b
......@@ -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()))
......
assignments/src/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/BRE_KNO_MCC_PC2_PC3_UNICAST_PduSender.java
+ 2
− 2
View file @ f3785d5b
......@@ -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.");
}
......
assignments/src/MV3500Cohort2019JulySeptember/projects/SchuttFetterolf/AllPduRoundTripTest.java
+ 4
− 4
View file @ f3785d5b
......@@ -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;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment