Skip to content
Snippets Groups Projects
Commit bd0c6c71 authored by rojas's avatar rojas
Browse files

Merge origin/master

Conflicts:
	examples/src/ViskitOpenDis7Examples/lib/Networked_Graphics_MV3500_examples.jar
parent 0ae5d9fc
No related branches found
No related tags found
No related merge requests found
......@@ -4,9 +4,24 @@
## Description
Modification to ...
Assigment 3, show a simple Modeling & Simulation loop.
- "Add DIS outputs (general skills)"
<!--
Assigment 4
- Show use of Simkit, DIS and Viskit together.
Final essay
- What do you think?
"And you get to use the word networking and combination, whatever else interest you,
you know, thesis, challenging for my warfare community cell phone, thinking about international partnerships".
<!--
Phrases taken from: <b>https://www.divein.com/everyday/monday-motivation-quotes/</b>
......
......@@ -25,7 +25,7 @@ import java.util.logging.Logger;
* @see <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/examples/src/OpenDis7Examples/ExampleSimulationProgramWireshark.png" target="_blank">ExampleSimulationProgramWireshark.png</a>
* @see <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/examples/src/OpenDis7Examples/ExampleSimulationProgramSequenceDiagram.png" target="_blank">ExampleSimulationProgramSequenceDiagram.png</a>
*/
public class ExampleSimulationProgram
public class RomeroSimulationProgram
{
/* **************************** infrastructure code, modification is seldom needed ************************* */
......@@ -72,7 +72,7 @@ public class ExampleSimulationProgram
*/
// base constructor is not invoked automatically by other constructors
// https://stackoverflow.com/questions/581873/best-way-to-handle-multiple-constructors-in-java
public ExampleSimulationProgram()
public RomeroSimulationProgram()
{
initialize();
}
......@@ -80,7 +80,7 @@ public class ExampleSimulationProgram
* Constructor to create an instance of this class.
* @param newDescriptor describes this program, useful for logging and debugging
*/
public ExampleSimulationProgram(String newDescriptor)
public RomeroSimulationProgram(String newDescriptor)
{
descriptor = newDescriptor;
initialize();
......@@ -90,7 +90,7 @@ public class ExampleSimulationProgram
* @param address network address to use
* @param port corresponding network port to use
*/
public ExampleSimulationProgram(String address, int port)
public RomeroSimulationProgram(String address, int port)
{
disChannel.setNetworkAddress (address);
disChannel.setNetworkPort (port);
......@@ -299,7 +299,7 @@ public class ExampleSimulationProgram
}
catch (InterruptedException iex) // handle any exception that your code might choose to provoke!
{
Logger.getLogger(ExampleSimulationProgram.class.getSimpleName()).log(Level.SEVERE, null, iex);
Logger.getLogger(RomeroSimulationProgram.class.getSimpleName()).log(Level.SEVERE, null, iex);
}
}
......@@ -386,7 +386,7 @@ public class ExampleSimulationProgram
}
/** Locally instantiable copy of program, can be subclassed. */
protected static ExampleSimulationProgram thisProgram;
protected static RomeroSimulationProgram thisProgram;
/**
* Main method is first executed when a program instance is loaded.
......@@ -396,7 +396,7 @@ public class ExampleSimulationProgram
*/
public static void main(String[] args)
{
thisProgram = new ExampleSimulationProgram("test constructor"); // create instance of self within static main() method
thisProgram = new RomeroSimulationProgram("test constructor"); // create instance of self within static main() method
thisProgram.disChannel.printlnTRACE("main() started...");
......
......@@ -9,8 +9,9 @@
</BuildDirectory>
<DistDirectory name="dist" />
<LibDirectory name="lib" />
<Cached></Cached>
<Cached />
<extraClassPaths>
<path value="C:/Users/RJRRLocal/MOVES/Q5/MV3500/src/NetworkedGraphicsMV3500/examples/src/ViskitOpenDis7Examples/lib/Networked_Graphics_MV3500_examples.jar" />
</extraClassPaths>
</ViskitProject>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment