From d9a9d484eb6a2c666d1aa27381050cf099147718 Mon Sep 17 00:00:00 2001
From: brutzman <brutzman@nps.edu>
Date: Sat, 22 Jan 2022 14:51:51 -0800
Subject: [PATCH] new package path edu.nps.moves.dis7.utilities.DisTime;
---
src/edu/nps/moves/dis7/examples/PduSender.java | 9 +++++----
src/edu/nps/moves/dis7/examples/ThreadedNetExample.java | 3 ++-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/edu/nps/moves/dis7/examples/PduSender.java b/src/edu/nps/moves/dis7/examples/PduSender.java
index 88ba9d1177..a29d1efa3c 100644
--- a/src/edu/nps/moves/dis7/examples/PduSender.java
+++ b/src/edu/nps/moves/dis7/examples/PduSender.java
@@ -7,6 +7,7 @@ package edu.nps.moves.dis7.examples;
import edu.nps.moves.dis7.pdus.*;
import edu.nps.moves.dis7.utilities.CoordinateConversions;
+import edu.nps.moves.dis7.utilities.DisTime;
import edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface;
import edu.nps.moves.dis7.utilities.PduFactory;
@@ -118,8 +119,8 @@ public class PduSender
}
// Factory with default absolute time
- PduFactory pduFac = new PduFactory();
- EntityStatePdu espdu = pduFac.makeEntityStatePdu();
+ PduFactory pduFactory = new PduFactory();
+ EntityStatePdu espdu = pduFactory.makeEntityStatePdu();
// ICBM coordinates for my office
double lat = 36.595517;
@@ -182,7 +183,7 @@ public class PduSender
// update the timestamp on ALL packets sent.
// An alterative approach: actually follow the standard. It's a crazy concept,
// but it might just work.
- timestamp = pduFac.getTimestamp();
+ timestamp = DisTime.getTimestamp();
espdu.setTimestamp(timestamp);
// Set the position of the entity in the world. DIS uses a cartesian
@@ -233,7 +234,7 @@ public class PduSender
// datagram and send it.
data = baos.toByteArray();
- fire = pduFac.makeFirePdu();
+ fire = pduFactory.makeFirePdu();
fireArray = fire.marshal();
for (InetAddress broadcast : broadcastAddresses) {
diff --git a/src/edu/nps/moves/dis7/examples/ThreadedNetExample.java b/src/edu/nps/moves/dis7/examples/ThreadedNetExample.java
index 656f724597..f1ef451e5a 100644
--- a/src/edu/nps/moves/dis7/examples/ThreadedNetExample.java
+++ b/src/edu/nps/moves/dis7/examples/ThreadedNetExample.java
@@ -7,6 +7,7 @@ package edu.nps.moves.dis7.examples;
import edu.nps.moves.dis7.pdus.Pdu;
import edu.nps.moves.dis7.enumerations.Country;
import edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface;
+import edu.nps.moves.dis7.utilities.DisTime;
import edu.nps.moves.dis7.utilities.PduFactory;
/**
@@ -35,7 +36,7 @@ public class ThreadedNetExample
// Use PduFactory to make pdus, default country = Deutschland, exercise, site, app, absolute timestamps
- PduFactory factory = new PduFactory(Country.GERMANY_DEU, (byte) 1, (short) 2, (short) 3, PduFactory.TimestampStyle.IEEE_ABSOLUTE);
+ PduFactory factory = new PduFactory(Country.GERMANY_DEU, (byte) 1, (short) 2, (short) 3, DisTime.TimestampStyle.IEEE_ABSOLUTE);
// Make and send 3 pdus with no delay between, testing threaded receiver performance
netif.send(factory.makeEntityStatePdu());
--
GitLab