From 76fdc79504dbc9f1c5414830354b5df5211d7404 Mon Sep 17 00:00:00 2001
From: brutzman <brutzman@nps.edu>
Date: Sun, 22 May 2022 21:08:42 -0700
Subject: [PATCH] simpler usage of channelOpenDis7

---
 .../ArrivalProcessOpenDis7.java               | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/examples/src/SimkitOpenDis7Examples/ArrivalProcessOpenDis7.java b/examples/src/SimkitOpenDis7Examples/ArrivalProcessOpenDis7.java
index fc405c19b4..904a9dbe89 100644
--- a/examples/src/SimkitOpenDis7Examples/ArrivalProcessOpenDis7.java
+++ b/examples/src/SimkitOpenDis7Examples/ArrivalProcessOpenDis7.java
@@ -26,14 +26,14 @@ public class ArrivalProcessOpenDis7 extends SimEntityBase {
      */
     protected int numberArrivals;
     
-    /** initialization */
-    private void initialize()
+    /** Initialize channel setup for OpenDis7 and report a test PDU */
+    private void initializeChannelOpenDis7()
     {
-        getChannelOpenDis7().setUpNetworkInterface();
-        getChannelOpenDis7().printlnTRACE ("opendis7.getNetworkAddress()=" + getChannelOpenDis7().getNetworkAddress() +
-                                           ", getNetworkPort()="    + getChannelOpenDis7().getNetworkPort());
+        channelOpenDis7.setUpNetworkInterface();
+        channelOpenDis7.printlnTRACE ("opendis7.getNetworkAddress()=" + channelOpenDis7.getNetworkAddress() +
+                                             ", getNetworkPort()="    + channelOpenDis7.getNetworkPort());
         
-        getChannelOpenDis7().sendCommentPdu(VariableRecordType.OTHER, "ArrivalProcessOpenDis7 initialized");
+        channelOpenDis7.sendCommentPdu(VariableRecordType.OTHER, "ArrivalProcessOpenDis7 initialized");
     }
 
     /**
@@ -44,7 +44,7 @@ public class ArrivalProcessOpenDis7 extends SimEntityBase {
      */
     public ArrivalProcessOpenDis7(RandomVariate interarrivalTimeGenerator) {
         this.interarrivalTimeGenerator = interarrivalTimeGenerator;
-        initialize();
+        initializeChannelOpenDis7();
     }
 
     /**
@@ -53,7 +53,7 @@ public class ArrivalProcessOpenDis7 extends SimEntityBase {
      * explicit call to its setter method.
      */
     public ArrivalProcessOpenDis7() {
-        initialize();
+        initializeChannelOpenDis7();
     }
 
     /**
@@ -71,6 +71,8 @@ public class ArrivalProcessOpenDis7 extends SimEntityBase {
      */
     public void doRun() {
         firePropertyChange("numberArrivals", getNumberArrivals());
+        
+        // TODO send simulation management PDUs via DIS channel, announce commencement
 
         waitDelay("Arrival", interarrivalTimeGenerator);
     }
@@ -84,6 +86,8 @@ public class ArrivalProcessOpenDis7 extends SimEntityBase {
         int oldNumberArrivals = getNumberArrivals();
         numberArrivals += 1;
         firePropertyChange("numberArrivals", oldNumberArrivals, getNumberArrivals());
+        
+        // TODO announce selected arrivals via DIS channel
 
         waitDelay("Arrival", interarrivalTimeGenerator);
     }
-- 
GitLab