From bca217dd34c8504af8b7fcea36b47c100b1e2bb8 Mon Sep 17 00:00:00 2001
From: Tobias <tobias.brennenstuhl.gy@nps.edu>
Date: Tue, 3 Sep 2019 19:39:02 -0700
Subject: [PATCH] Merge origin/master
Conflicts:
assignments/ReportingForDuty.md
---
.../homework4/Brennenstuhl/BrennenstuhlPduSender.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/assignments/src/MV3500Cohort2019JulySeptember/homework4/Brennenstuhl/BrennenstuhlPduSender.java b/assignments/src/MV3500Cohort2019JulySeptember/homework4/Brennenstuhl/BrennenstuhlPduSender.java
index 0240bd2b9d..ca8e9bf458 100755
--- a/assignments/src/MV3500Cohort2019JulySeptember/homework4/Brennenstuhl/BrennenstuhlPduSender.java
+++ b/assignments/src/MV3500Cohort2019JulySeptember/homework4/Brennenstuhl/BrennenstuhlPduSender.java
@@ -6,6 +6,7 @@ import java.util.*;
import edu.nps.moves.dis7.*;
import edu.nps.moves.dis7.enumerations.*;
+import javax.swing.text.html.parser.Entity;
/**
* This is an example that sends many/most types of PDUs. Useful for testing standards
@@ -43,6 +44,7 @@ public class BrennenstuhlPduSender
public void run()
{
+
System.out.println("DisExamplesOpenDis7.AllPduSender started...");
try
{
@@ -364,7 +366,9 @@ public class BrennenstuhlPduSender
case COMMENT:
aPdu = new CommentPdu();
- CommentPdu newCommentPdu = (CommentPdu)aPdu;
+ CommentPdu chuckNorris = (CommentPdu)aPdu;
+ chuckNorris.setExerciseID((byte)0);
+ //chuckNorris.setOriginatingID(ChuckNorrisEntityID);
VariableDatum newVariableDatum = new VariableDatum();
// etc. see Garrett and Pete's code
break;
--
GitLab