From bc8f3bc52bc8c9ed6b405277db5ab8f57b3051e7 Mon Sep 17 00:00:00 2001
From: terry-norbraten <tnorb@comcast.net>
Date: Thu, 8 Oct 2020 18:35:17 -0700
Subject: [PATCH] fix conflicts
---
nbproject/project.properties | 3 ++-
.../edu/nps/moves/dis7/entities/EntityTypeFactory.java | 2 +-
src-generated/edu/nps/moves/dis7/pdus/EntityStatePdu.java | 2 +-
.../edu/nps/moves/dis7/pdus/FastEntityStatePdu.java | 2 +-
src-generated/edu/nps/moves/dis7/pdus/VariableDatum.java | 5 +++--
5 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/nbproject/project.properties b/nbproject/project.properties
index c8b94ae5b5..e87c2e57d8 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -72,7 +72,8 @@ javac.test.classpath=\
${javac.classpath}:\
${build.classes.dir}:\
${file.reference.junit-jupiter-api-5.7.0.jar}:\
- ${file.reference.junit-jupiter-engine-5.7.0.jar}
+ ${file.reference.junit-jupiter-engine-5.7.0.jar}:\
+ ${libs.junit_5.classpath}
javac.test.modulepath=\
${javac.modulepath}
javac.test.processorpath=\
diff --git a/src-generated/edu/nps/moves/dis7/entities/EntityTypeFactory.java b/src-generated/edu/nps/moves/dis7/entities/EntityTypeFactory.java
index dff3317bb9..c03ae7bc6e 100644
--- a/src-generated/edu/nps/moves/dis7/entities/EntityTypeFactory.java
+++ b/src-generated/edu/nps/moves/dis7/entities/EntityTypeFactory.java
@@ -31,7 +31,7 @@ public class EntityTypeFactory
return null;
try {
- Class cls = Class.forName(name);
+ Class<?> cls = Class.forName(name);
Constructor<EntityType> constr = (Constructor<EntityType>) cls.getConstructors()[0];
return constr.newInstance();
}
diff --git a/src-generated/edu/nps/moves/dis7/pdus/EntityStatePdu.java b/src-generated/edu/nps/moves/dis7/pdus/EntityStatePdu.java
index a0627930aa..e2b568dd5f 100644
--- a/src-generated/edu/nps/moves/dis7/pdus/EntityStatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/pdus/EntityStatePdu.java
@@ -10,7 +10,7 @@ import java.io.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * 7.2.2. Represents the postion and state of one entity in the world. See 5.3.2.
+ * 7.2.2. Represents the position and state of one entity in the world. See 5.3.2.
* IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
*/
public class EntityStatePdu extends EntityInformationFamilyPdu implements Serializable
diff --git a/src-generated/edu/nps/moves/dis7/pdus/FastEntityStatePdu.java b/src-generated/edu/nps/moves/dis7/pdus/FastEntityStatePdu.java
index 90da811a6a..094973f3cc 100644
--- a/src-generated/edu/nps/moves/dis7/pdus/FastEntityStatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/pdus/FastEntityStatePdu.java
@@ -10,7 +10,7 @@ import java.io.*;
import edu.nps.moves.dis7.enumerations.*;
/**
- * Represents the postion and state of one entity in the world. This is identical in function to entity state pdu, but generates less garbage to collect in the Java world. Section 7.2.2.
+ * Represents the position and state of one entity in the world. This is identical in function to entity state pdu, but generates less garbage to collect in the Java world. Section 7.2.2.
* IEEE Std 1278.1-2012, IEEE Standard for Distributed Interactive Simulation - Application Protocols
*/
public class FastEntityStatePdu extends EntityInformationFamilyPdu implements Serializable
diff --git a/src-generated/edu/nps/moves/dis7/pdus/VariableDatum.java b/src-generated/edu/nps/moves/dis7/pdus/VariableDatum.java
index 135cb4f469..a0b3fd833f 100644
--- a/src-generated/edu/nps/moves/dis7/pdus/VariableDatum.java
+++ b/src-generated/edu/nps/moves/dis7/pdus/VariableDatum.java
@@ -4,8 +4,9 @@
*/
package edu.nps.moves.dis7.pdus;
-import java.io.*;
import edu.nps.moves.dis7.enumerations.*;
+
+import java.io.*;
import java.util.Arrays;
/**
@@ -197,7 +198,7 @@ public class VariableDatum extends Object implements Serializable
//uPosition += padding.length;
}
catch (Exception e) {
- System.out.println(e);
+ System.err.println(e);
}
return getMarshalledSize();
}
--
GitLab