Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew M. Finkbeiner2016-06-01 22:13:12 -0400
committerAndrew M. Finkbeiner2016-10-06 21:12:06 -0400
commitd2b814e673000b5b8c8f866e19be2325c9c00cfe (patch)
tree25e74d818424b5cf7a5dd9be50261868c67e762f
parentb473b521f06752ff1b02580d196174b757a7f098 (diff)
downloadorg.eclipse.osee-d2b814e673000b5b8c8f866e19be2325c9c00cfe.tar.gz
org.eclipse.osee-d2b814e673000b5b8c8f866e19be2325c9c00cfe.tar.xz
org.eclipse.osee-d2b814e673000b5b8c8f866e19be2325c9c00cfe.zip
feature[ats_ATS288968]: Update some OTE API's for improved migration
-rw-r--r--plugins/org.eclipse.osee.ote.core.test/src/org/eclipse/osee/ote/message/mock/TestRecordElement.java2
-rw-r--r--plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/Message.java4
-rw-r--r--plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/MessageEventLogger.java16
-rw-r--r--plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/ArrayElement.java14
-rw-r--r--plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/BiSci16Element.java6
-rw-r--r--plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/BooleanElement.java6
-rw-r--r--plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/CharElement.java15
-rw-r--r--plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/Dec32Element.java6
-rw-r--r--plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/DiscreteElement.java6
-rw-r--r--plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/Element.java29
-rw-r--r--plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/EmptyEnum_Element.java14
-rw-r--r--plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/EnumeratedElement.java14
-rw-r--r--plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/FixedPointElement.java10
-rw-r--r--plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/Float32Element.java6
-rw-r--r--plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/Float64Element.java6
-rw-r--r--plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/InaccessibleElement.java11
-rw-r--r--plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/IntegerElement.java14
-rw-r--r--plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/LongIntegerElement.java15
-rw-r--r--plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/NumericElement.java6
-rw-r--r--plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/RealElement.java14
-rw-r--r--plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/RecordElement.java12
-rw-r--r--plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/RecordMap.java18
-rw-r--r--plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/SignedInteger16Element.java13
-rw-r--r--plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/StringElement.java14
-rw-r--r--plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingCharElement.java6
-rw-r--r--plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingEmptyEnumElement.java6
-rw-r--r--plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingEnumeratedElement.java6
-rw-r--r--plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingFixedPointElement.java10
-rw-r--r--plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingFloat32Element.java6
-rw-r--r--plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingFloat64Element.java6
-rw-r--r--plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingIntegerElement.java6
-rw-r--r--plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingLongIntegerElement.java6
-rw-r--r--plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingRecordElement.java4
-rw-r--r--plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingSignedInteger16Element.java6
-rw-r--r--plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingStringElement.java6
-rw-r--r--plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/event/SOCKET_ADDRESS_RECORD.java2
-rw-r--r--plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/listener/MessageSystemListener.java4
-rw-r--r--plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/tool/rec/MessageRecordConfig.java8
38 files changed, 220 insertions, 133 deletions
diff --git a/plugins/org.eclipse.osee.ote.core.test/src/org/eclipse/osee/ote/message/mock/TestRecordElement.java b/plugins/org.eclipse.osee.ote.core.test/src/org/eclipse/osee/ote/message/mock/TestRecordElement.java
index 2fb5e2e020..f545a342ce 100644
--- a/plugins/org.eclipse.osee.ote.core.test/src/org/eclipse/osee/ote/message/mock/TestRecordElement.java
+++ b/plugins/org.eclipse.osee.ote.core.test/src/org/eclipse/osee/ote/message/mock/TestRecordElement.java
@@ -16,7 +16,7 @@ import org.eclipse.osee.ote.message.elements.RecordElement;
public class TestRecordElement extends RecordElement {
- public TestRecordElement(Message<?, ?, ?> message, String name, int index, int bitOffset, MessageData messageData) {
+ public TestRecordElement(Message message, String name, int index, int bitOffset, MessageData messageData) {
super(message, name, index, messageData, bitOffset, 152);
}
}
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/Message.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/Message.java
index c164caf72c..82249a11ef 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/Message.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/Message.java
@@ -1037,7 +1037,7 @@ public abstract class Message<S extends ITestEnvironmentMessageSystemAccessor, T
return true;
}
- private void notifyPostMemSourceChangeListeners(DataType old, DataType newtype, Message<?, ?, ?> message) {
+ private void notifyPostMemSourceChangeListeners(DataType old, DataType newtype, Message message) {
checkState();
for (IMemSourceChangeListener listener : postMemSourceChangeListeners) {
try {
@@ -1048,7 +1048,7 @@ public abstract class Message<S extends ITestEnvironmentMessageSystemAccessor, T
}
}
- private void notifyPreMemSourceChangeListeners(DataType old, DataType newtype, Message<?, ?, ?> message) {
+ private void notifyPreMemSourceChangeListeners(DataType old, DataType newtype, Message message) {
checkState();
for (IMemSourceChangeListener listener : preMemSourceChangeListeners) {
listener.onChange(old, newtype, message);
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/MessageEventLogger.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/MessageEventLogger.java
index 0f2b7a06b5..e9525a2b10 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/MessageEventLogger.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/MessageEventLogger.java
@@ -26,26 +26,26 @@ public class MessageEventLogger implements UniversalMessageListener {
}
}
- private final Message<?, ?, ?> message;
+ private final Message message;
private final String modeStatus;
private volatile boolean showStackTrace = false;
- public MessageEventLogger(Message<?, ?, ?> message) {
+ public MessageEventLogger(Message message) {
this(message, false);
}
/**
* @return the message
*/
- public Message<?, ?, ?> getMessage() {
+ public Message getMessage() {
return message;
}
/**
* Creates a message event logger that also prints a stack trace when the event is fired
*/
- public MessageEventLogger(Message<?, ?, ?> message, boolean showStackTrace) {
+ public MessageEventLogger(Message message, boolean showStackTrace) {
this.message = message;
modeStatus = message.isWriter() ? "wirter " : "reader";
message.addPostMemSourceChangeListener(this);
@@ -56,19 +56,19 @@ public class MessageEventLogger implements UniversalMessageListener {
}
@Override
- public void onChange(DataType oldtype, DataType newType, Message<?, ?, ?> message) {
+ public void onChange(DataType oldtype, DataType newType, Message message) {
log(Level.INFO, String.format("MemType for %s %s has changed from %s to %s", message.getName(), modeStatus,
oldtype.name(), newType.name()), showStackTrace ? new StackTrace() : null);
}
@Override
- public void onPostDispose(Message<?, ?, ?> message) {
+ public void onPostDispose(Message message) {
log(Level.INFO, String.format("%s %s has been disposed", message.getName(), modeStatus),
showStackTrace ? new StackTrace() : null);
}
@Override
- public void onPreDispose(Message<?, ?, ?> message) {
+ public void onPreDispose(Message message) {
log(Level.INFO, String.format("%s %s is about to be disposed", message.getName(), modeStatus),
showStackTrace ? new StackTrace() : null);
}
@@ -80,7 +80,7 @@ public class MessageEventLogger implements UniversalMessageListener {
}
@Override
- public void onRateChanged(Message<?, ?, ?> message, double oldRate, double newRate) {
+ public void onRateChanged(Message message, double oldRate, double newRate) {
log(Level.INFO,
String.format("rate for %s %s change from %f to %f", message.getName(), modeStatus, oldRate, newRate),
showStackTrace ? new StackTrace() : null);
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/ArrayElement.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/ArrayElement.java
index 8161a12a3c..70adb30313 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/ArrayElement.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/ArrayElement.java
@@ -18,15 +18,15 @@ import org.eclipse.osee.ote.message.data.MessageData;
public class ArrayElement extends Element {
- public ArrayElement(Message<?, ?, ?> msg, String elementName, MessageData messageData, int byteOffset, int msb, int lsb, int originalMsb, int originalLsb) {
+ public ArrayElement(Message msg, String elementName, MessageData messageData, int byteOffset, int msb, int lsb, int originalMsb, int originalLsb) {
super(msg, elementName, messageData, byteOffset, msb, lsb, originalMsb, originalLsb);
}
- public ArrayElement(Message<?, ?, ?> msg, String elementName, MessageData messageData, int bitOffset, int bitLength) {
+ public ArrayElement(Message msg, String elementName, MessageData messageData, int bitOffset, int bitLength) {
super(msg, elementName, messageData, bitOffset, bitLength);
}
- public ArrayElement(Message<?, ?, ?> msg, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
+ public ArrayElement(Message msg, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
super(msg, elementName, messageData, byteOffset, msb, lsb);
}
@@ -80,7 +80,13 @@ public class ArrayElement extends Element {
}
@Override
- public ArrayElement switchMessages(Collection<? extends Message<?, ?, ?>> messages) {
+ public ArrayElement findElementInMessages(Collection<? extends Message> messages) {
+ return (ArrayElement) super.findElementInMessages(messages);
+ }
+
+ @Override
+ @Deprecated
+ public ArrayElement switchMessages(Collection<? extends Message<?,?,?>> messages) {
return (ArrayElement) super.switchMessages(messages);
}
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/BiSci16Element.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/BiSci16Element.java
index 4af18002da..cc40d74875 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/BiSci16Element.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/BiSci16Element.java
@@ -25,15 +25,15 @@ import org.eclipse.osee.ote.message.interfaces.ITestAccessor;
*/
public class BiSci16Element extends LongIntegerElement {
- public BiSci16Element(Message<?, ?, ?> message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
+ public BiSci16Element(Message message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
this(message, elementName, messageData, byteOffset, msb, lsb, msb, lsb);
}
- public BiSci16Element(Message<?, ?, ?> message, String elementName, MessageData messageData, int bitOffset, int bitLength) {
+ public BiSci16Element(Message message, String elementName, MessageData messageData, int bitOffset, int bitLength) {
super(message, elementName, messageData, bitOffset, bitLength);
}
- public BiSci16Element(Message<?, ?, ?> message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb, int originalLsb, int originalMsb) {
+ public BiSci16Element(Message message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb, int originalLsb, int originalMsb) {
super(message, elementName, messageData, byteOffset, msb, lsb, originalLsb, originalMsb);
}
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/BooleanElement.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/BooleanElement.java
index 16a4b1f776..3b75e9acfd 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/BooleanElement.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/BooleanElement.java
@@ -17,17 +17,17 @@ import org.eclipse.osee.ote.message.data.MessageData;
public class BooleanElement extends DiscreteElement<Boolean> {
- public BooleanElement(Message<?, ?, ?> msg, String elementName, MessageData messageData, int byteOffset, int msb, int lsb, int originalMsb, int originalLsb) {
+ public BooleanElement(Message msg, String elementName, MessageData messageData, int byteOffset, int msb, int lsb, int originalMsb, int originalLsb) {
super(msg, elementName, messageData, byteOffset, msb, lsb, originalMsb, originalLsb);
}
- public BooleanElement(Message<?, ?, ?> msg, String elementName, MessageData messageData, int bitOffset, int bitLength) {
+ public BooleanElement(Message msg, String elementName, MessageData messageData, int bitOffset, int bitLength) {
super(msg, elementName, messageData, bitOffset, bitLength);
}
- public BooleanElement(Message<?, ?, ?> msg, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
+ public BooleanElement(Message msg, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
super(msg, elementName, messageData, byteOffset, msb, lsb);
}
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/CharElement.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/CharElement.java
index 4d957ffbc3..9fbe8008df 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/CharElement.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/CharElement.java
@@ -34,20 +34,27 @@ import org.eclipse.osee.ote.message.listener.MessageSystemListener;
*/
public class CharElement extends DiscreteElement<Character> {
- public CharElement(Message<?, ?, ?> message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
+ public CharElement(Message message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
this(message, elementName, messageData, byteOffset, msb, lsb, msb, lsb);
}
- public CharElement(Message<?, ?, ?> message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb, int originalLsb, int originalMsb) {
+ public CharElement(Message message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb, int originalLsb, int originalMsb) {
super(message, elementName, messageData, byteOffset, msb, lsb, originalLsb, originalMsb);
}
- public CharElement(Message<?, ?, ?> message, String elementName, MessageData messageData, int bitOffset, int bitLength) {
+ public CharElement(Message message, String elementName, MessageData messageData, int bitOffset, int bitLength) {
super(message, elementName, messageData, bitOffset, bitLength);
}
+ @SuppressWarnings("rawtypes")
+ @Override
+ public CharElement findElementInMessages(Collection<? extends Message> messages) {
+ return (CharElement) super.findElementInMessages(messages);
+ }
+
@Override
- public CharElement switchMessages(Collection<? extends Message<?, ?, ?>> messages) {
+ @Deprecated
+ public CharElement switchMessages(Collection<? extends Message<?,?,?>> messages) {
return (CharElement) super.switchMessages(messages);
}
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/Dec32Element.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/Dec32Element.java
index 7e3a59e3af..81f53da3d1 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/Dec32Element.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/Dec32Element.java
@@ -22,7 +22,7 @@ public class Dec32Element extends Float32Element {
* @param msb
* @param lsb
*/
- public Dec32Element(Message<?, ?, ?> message, String elementName, MessageData messageData,
+ public Dec32Element(Message message, String elementName, MessageData messageData,
int byteOffset, int msb, int lsb) {
super(message, elementName, messageData, byteOffset, msb, lsb);
}
@@ -37,7 +37,7 @@ public class Dec32Element extends Float32Element {
* @param originalLsb
* @param originalMsb
*/
- public Dec32Element(Message<?, ?, ?> message, String elementName, MessageData messageData,
+ public Dec32Element(Message message, String elementName, MessageData messageData,
int byteOffset, int msb, int lsb, int originalLsb, int originalMsb) {
super(message, elementName, messageData, byteOffset, msb, lsb, originalLsb, originalMsb);
}
@@ -49,7 +49,7 @@ public class Dec32Element extends Float32Element {
* @param bitOffset
* @param bitLength
*/
- public Dec32Element(Message<?, ?, ?> message, String elementName, MessageData messageData,
+ public Dec32Element(Message message, String elementName, MessageData messageData,
int bitOffset, int bitLength) {
super(message, elementName, messageData, bitOffset, bitLength);
}
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/DiscreteElement.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/DiscreteElement.java
index 3ef63f678c..0dffac83a8 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/DiscreteElement.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/DiscreteElement.java
@@ -31,15 +31,15 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element i
private static final String FOR_2_PULSES = " FOR 2 PULSES";
- public DiscreteElement(Message<?, ?, ?> msg, String elementName, MessageData messageData, int byteOffset, int msb, int lsb, int originalMsb, int originalLsb) {
+ public DiscreteElement(Message msg, String elementName, MessageData messageData, int byteOffset, int msb, int lsb, int originalMsb, int originalLsb) {
super(msg, elementName, messageData, byteOffset, msb, lsb, originalMsb, originalLsb);
}
- public DiscreteElement(Message<?, ?, ?> msg, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
+ public DiscreteElement(Message msg, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
super(msg, elementName, messageData, byteOffset, msb, lsb);
}
- public DiscreteElement(Message<?, ?, ?> msg, String elementName, MessageData messageData, int bitOffset, int bitLength) {
+ public DiscreteElement(Message msg, String elementName, MessageData messageData, int bitOffset, int bitLength) {
super(msg, elementName, messageData, bitOffset, bitLength);
}
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/Element.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/Element.java
index b031c5f371..dec4573556 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/Element.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/Element.java
@@ -27,8 +27,8 @@ import org.eclipse.osee.ote.message.enums.DataType;
* @author Andrew M. Finkbeiner
*/
public abstract class Element implements ITimeout {
-// protected final Message<?, ?, ?> msg;
- private final WeakReference<Message<?, ?, ?>> msg;
+// protected final Message msg;
+ private final WeakReference<Message> msg;
protected String elementName;
private volatile boolean timedOut;
private final List<Object> elementPath;
@@ -42,7 +42,7 @@ public abstract class Element implements ITimeout {
protected final int originalLsb;
private String elementPathAsString;
- public Element(Message<?, ?, ?> msg, String elementName, MessageData messageData, int byteOffset, int msb, int lsb, int originalMsb, int originalLsb) {
+ public Element(Message msg, String elementName, MessageData messageData, int byteOffset, int msb, int lsb, int originalMsb, int originalLsb) {
this.msg = new WeakReference<>(msg);
this.elementName = elementName;
this.messageData = messageData;
@@ -55,13 +55,13 @@ public abstract class Element implements ITimeout {
fullName = (msg != null ? msg.getName() : messageData.getName()) + "." + this.elementName;
}
- public Element(Message<?, ?, ?> msg, String elementName, MessageData messageData, int bitOffset, int bitLength) {
+ public Element(Message msg, String elementName, MessageData messageData, int bitOffset, int bitLength) {
this(msg, elementName, messageData, bitOffset / 8, 0, 0, 0, 0);
this.msb = bitOffset % 8;
this.lsb = msb + bitLength - 1;
}
- public Element(Message<?, ?, ?> msg, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
+ public Element(Message msg, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
this(msg, elementName, messageData, byteOffset, msb, lsb, msb, lsb);
}
@@ -113,7 +113,7 @@ public abstract class Element implements ITimeout {
/**
* @return Returns the msg.
*/
- public Message<?, ?, ?> getMessage() {
+ public Message getMessage() {
return msg.get();
}
@@ -188,8 +188,21 @@ public abstract class Element implements ITimeout {
* @return An element of one of the messages passed with the same name as this element or this element if no match is
* found.
*/
- public Element switchMessages(Collection<? extends Message<?, ?, ?>> messages) {
- for (Message<?, ?, ?> currentMessage : messages) {
+ @SuppressWarnings("rawtypes")
+ public Element findElementInMessages(Collection<? extends Message> messages) {
+ for (Message currentMessage : messages) {
+ // System.out.println("SwitchMessages" + currentMessage.getMessageName());
+ Element el = currentMessage.getElement(this.getElementPath());
+ if (el != null && currentMessage.isValidElement(this, el)) {
+ return el;
+ }
+ }
+ return this.getNonMappingElement();
+ }
+
+ @Deprecated
+ public Element switchMessages(Collection<? extends Message<?,?,?>> messages) {
+ for (Message currentMessage : messages) {
// System.out.println("SwitchMessages" + currentMessage.getMessageName());
Element el = currentMessage.getElement(this.getElementPath());
if (el != null && currentMessage.isValidElement(this, el)) {
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/EmptyEnum_Element.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/EmptyEnum_Element.java
index 9fb4e5fabc..39f13c5c33 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/EmptyEnum_Element.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/EmptyEnum_Element.java
@@ -24,15 +24,15 @@ import org.eclipse.osee.ote.message.interfaces.ITestAccessor;
*/
public class EmptyEnum_Element extends DiscreteElement<EmptyEnum> {
- public EmptyEnum_Element(Message<?, ?, ?> message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
+ public EmptyEnum_Element(Message message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
this(message, elementName, messageData, byteOffset, msb, lsb, msb, lsb);
}
- public EmptyEnum_Element(Message<?, ?, ?> message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb, int originalLsb, int originalMsb) {
+ public EmptyEnum_Element(Message message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb, int originalLsb, int originalMsb) {
super(message, elementName, messageData, byteOffset, msb, lsb, originalLsb, originalMsb);
}
- public EmptyEnum_Element(Message<?, ?, ?> message, String elementName, MessageData messageData, int bitOffset, int bitLength) {
+ public EmptyEnum_Element(Message message, String elementName, MessageData messageData, int bitOffset, int bitLength) {
super(message, elementName, messageData, bitOffset, bitLength);
}
@@ -67,7 +67,13 @@ public class EmptyEnum_Element extends DiscreteElement<EmptyEnum> {
}
@Override
- public EmptyEnum_Element switchMessages(Collection<? extends Message<?, ?, ?>> messages) {
+ @Deprecated
+ public EmptyEnum_Element findElementInMessages(Collection<? extends Message> messages) {
+ return (EmptyEnum_Element) super.findElementInMessages(messages);
+ }
+
+ @Override
+ public EmptyEnum_Element switchMessages(Collection<? extends Message<?,?,?>> messages) {
return (EmptyEnum_Element) super.switchMessages(messages);
}
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/EnumeratedElement.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/EnumeratedElement.java
index ef9840c52e..be3fabc6da 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/EnumeratedElement.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/EnumeratedElement.java
@@ -27,14 +27,14 @@ public class EnumeratedElement<T extends Enum<T> & IEnumValue<T>> extends Discre
private final Class<T> clazz;
private final T[] values;
- public EnumeratedElement(Message<?, ?, ?> msg, String elementName, Class<T> clazz, MessageData messageData, int byteOffset, int msb, int lsb, int originalMsb, int originalLsb) {
+ public EnumeratedElement(Message msg, String elementName, Class<T> clazz, MessageData messageData, int byteOffset, int msb, int lsb, int originalMsb, int originalLsb) {
super(msg, elementName, messageData, byteOffset, msb, lsb, originalLsb, originalMsb);
this.clazz = clazz;
values = clazz.getEnumConstants();
}
- public EnumeratedElement(Message<?, ?, ?> msg, String elementName, Class<T> clazz, MessageData messageData, int byteOffset, int msb, int lsb) {
+ public EnumeratedElement(Message msg, String elementName, Class<T> clazz, MessageData messageData, int byteOffset, int msb, int lsb) {
this(msg, elementName, clazz, messageData, byteOffset, msb, lsb, msb, lsb);
}
@@ -50,7 +50,7 @@ public class EnumeratedElement<T extends Enum<T> & IEnumValue<T>> extends Discre
return undefined;
}
- public EnumeratedElement(Message<?, ?, ?> message, String elementName, Class<T> clazz, MessageData messageData, int bitOffset, int bitLength) {
+ public EnumeratedElement(Message message, String elementName, Class<T> clazz, MessageData messageData, int bitOffset, int bitLength) {
super(message, elementName, messageData, bitOffset, bitLength);
this.clazz = clazz;
@@ -109,9 +109,15 @@ public class EnumeratedElement<T extends Enum<T> & IEnumValue<T>> extends Discre
}
+ @SuppressWarnings({ "unchecked", "rawtypes" })
+ @Override
+ public EnumeratedElement<T> findElementInMessages(Collection<? extends Message> messages) {
+ return (EnumeratedElement<T>) super.findElementInMessages(messages);
+ }
+
@Override
@SuppressWarnings("unchecked")
- public EnumeratedElement<T> switchMessages(Collection<? extends Message<?, ?, ?>> messages) {
+ public EnumeratedElement<T> switchMessages(Collection<? extends Message<?,?,?>> messages) {
return (EnumeratedElement<T>) super.switchMessages(messages);
}
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/FixedPointElement.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/FixedPointElement.java
index 1742f31dec..505e6e3b22 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/FixedPointElement.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/FixedPointElement.java
@@ -32,26 +32,26 @@ public class FixedPointElement extends RealElement {
private final boolean signed;
private final double offset;
- public FixedPointElement(Message<?, ?, ?> message, String elementName, MessageData messageData, double resolution, boolean signed, int byteOffset, int msb, int lsb) {
+ public FixedPointElement(Message message, String elementName, MessageData messageData, double resolution, boolean signed, int byteOffset, int msb, int lsb) {
this(message, elementName, messageData, resolution, 0, signed, byteOffset, msb, lsb, msb, lsb);
}
- public FixedPointElement(Message<?, ?, ?> message, String elementName, MessageData messageData, double resolution, double offset, boolean signed, int byteOffset, int msb, int lsb) {
+ public FixedPointElement(Message message, String elementName, MessageData messageData, double resolution, double offset, boolean signed, int byteOffset, int msb, int lsb) {
this(message, elementName, messageData, resolution, offset, signed, byteOffset, msb, lsb, msb, lsb);
}
- public FixedPointElement(Message<?, ?, ?> message, String elementName, MessageData messageData, double resolution, boolean signed, int byteOffset, int msb, int lsb, int originalLsb, int originalMsb) {
+ public FixedPointElement(Message message, String elementName, MessageData messageData, double resolution, boolean signed, int byteOffset, int msb, int lsb, int originalLsb, int originalMsb) {
this(message, elementName, messageData, resolution, 0, signed, byteOffset, msb, lsb, originalLsb, originalMsb);
}
- public FixedPointElement(Message<?, ?, ?> message, String elementName, MessageData messageData, double resolution, double offset, boolean signed, int byteOffset, int msb, int lsb, int originalLsb, int originalMsb) {
+ public FixedPointElement(Message message, String elementName, MessageData messageData, double resolution, double offset, boolean signed, int byteOffset, int msb, int lsb, int originalLsb, int originalMsb) {
super(message, elementName, messageData, byteOffset, msb, lsb, originalLsb, originalMsb);
this.resolution = resolution;
this.signed = signed;
this.offset = offset;
}
- public FixedPointElement(Message<?, ?, ?> message, String elementName, MessageData messageData, double resolution, double offset, boolean signed, int bitOffset, int bitLength) {
+ public FixedPointElement(Message message, String elementName, MessageData messageData, double resolution, double offset, boolean signed, int bitOffset, int bitLength) {
super(message, elementName, messageData, bitOffset, bitLength);
this.resolution = resolution;
this.signed = signed;
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/Float32Element.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/Float32Element.java
index 0a84d1092f..fccee40a4b 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/Float32Element.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/Float32Element.java
@@ -23,15 +23,15 @@ import org.eclipse.osee.ote.message.interfaces.ITestAccessor;
*/
public class Float32Element extends RealElement {
- public Float32Element(Message<?, ?, ?> message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
+ public Float32Element(Message message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
this(message, elementName, messageData, byteOffset, msb, lsb, msb, lsb);
}
- public Float32Element(Message<?, ?, ?> message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb, int originalLsb, int originalMsb) {
+ public Float32Element(Message message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb, int originalLsb, int originalMsb) {
super(message, elementName, messageData, byteOffset, msb, lsb, originalLsb, originalMsb);
}
- public Float32Element(Message<?, ?, ?> message, String elementName, MessageData messageData, int bitOffset, int bitLength) {
+ public Float32Element(Message message, String elementName, MessageData messageData, int bitOffset, int bitLength) {
super(message, elementName, messageData, bitOffset, bitLength);
}
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/Float64Element.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/Float64Element.java
index 209d2a6647..83d2abde78 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/Float64Element.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/Float64Element.java
@@ -23,15 +23,15 @@ import org.eclipse.osee.ote.message.interfaces.ITestAccessor;
*/
public class Float64Element extends RealElement {
- public Float64Element(Message<?, ?, ?> message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
+ public Float64Element(Message message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
this(message, elementName, messageData, byteOffset, msb, lsb, msb, lsb);
}
- public Float64Element(Message<?, ?, ?> message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb, int originalLsb, int originalMsb) {
+ public Float64Element(Message message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb, int originalLsb, int originalMsb) {
super(message, elementName, messageData, byteOffset, msb, lsb, originalLsb, originalMsb);
}
- public Float64Element(Message<?, ?, ?> message, String elementName, MessageData messageData, int bitOffset, int bitLength) {
+ public Float64Element(Message message, String elementName, MessageData messageData, int bitOffset, int bitLength) {
super(message, elementName, messageData, bitOffset, bitLength);
}
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/InaccessibleElement.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/InaccessibleElement.java
index 10e47ba000..e9ccc81203 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/InaccessibleElement.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/InaccessibleElement.java
@@ -20,16 +20,21 @@ public class InaccessibleElement extends Element {
// individual elements, delete this class!!! Make sure to remove it from
// MuxSignalType too!! Also make sure to take code out of Message Generation
// too.
- public InaccessibleElement(Message<?, ?, ?> message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
+ public InaccessibleElement(Message message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
this(message, elementName, messageData, byteOffset, msb, lsb, msb, lsb);
}
- public InaccessibleElement(Message<?, ?, ?> message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb, int originalLsb, int originalMsb) {
+ public InaccessibleElement(Message message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb, int originalLsb, int originalMsb) {
super(message, elementName, messageData, byteOffset, msb, lsb, originalLsb, originalMsb);
}
@Override
- public InaccessibleElement switchMessages(Collection<? extends Message<?, ?, ?>> messages) {
+ public InaccessibleElement findElementInMessages(Collection<? extends Message> messages) {
+ return (InaccessibleElement) super.findElementInMessages(messages);
+ }
+
+ @Override
+ public InaccessibleElement switchMessages(Collection<? extends Message<?,?,?>> messages) {
return (InaccessibleElement) super.switchMessages(messages);
}
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/IntegerElement.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/IntegerElement.java
index d5de5e8c1e..2e809e4c16 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/IntegerElement.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/IntegerElement.java
@@ -30,20 +30,26 @@ public class IntegerElement extends NumericElement<Integer> {
visitor.asIntegerElement(this);
}
- public IntegerElement(Message<?, ?, ?> message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
+ public IntegerElement(Message message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
this(message, elementName, messageData, byteOffset, msb, lsb, msb, lsb);
}
- public IntegerElement(Message<?, ?, ?> message, String elementName, MessageData messageData, int bitOffset, int bitLength) {
+ public IntegerElement(Message message, String elementName, MessageData messageData, int bitOffset, int bitLength) {
super(message, elementName, messageData, bitOffset, bitLength);
}
- public IntegerElement(Message<?, ?, ?> message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb, int originalLsb, int originalMsb) {
+ public IntegerElement(Message message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb, int originalLsb, int originalMsb) {
super(message, elementName, messageData, byteOffset, msb, lsb, originalLsb, originalMsb);
}
@Override
- public IntegerElement switchMessages(Collection<? extends Message<?, ?, ?>> messages) {
+ public IntegerElement findElementInMessages(Collection<? extends Message> messages) {
+ return (IntegerElement) super.findElementInMessages(messages);
+ }
+
+ @Override
+ @Deprecated
+ public IntegerElement switchMessages(Collection<? extends Message<?,?,?>> messages) {
return (IntegerElement) super.switchMessages(messages);
}
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/LongIntegerElement.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/LongIntegerElement.java
index 087aeb6d2c..b50d711bd7 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/LongIntegerElement.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/LongIntegerElement.java
@@ -11,6 +11,7 @@
package org.eclipse.osee.ote.message.elements;
import java.util.Collection;
+
import org.eclipse.osee.ote.core.environment.interfaces.ITestEnvironmentAccessor;
import org.eclipse.osee.ote.core.testPoint.CheckGroup;
import org.eclipse.osee.ote.message.Message;
@@ -30,20 +31,26 @@ public class LongIntegerElement extends NumericElement<Long> {
visitor.asLongIntegerElement(this);
}
- public LongIntegerElement(Message<?, ?, ?> message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
+ public LongIntegerElement(Message message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
this(message, elementName, messageData, byteOffset, msb, lsb, msb, lsb);
}
- public LongIntegerElement(Message<?, ?, ?> message, String elementName, MessageData messageData, int bitOffset, int bitLength) {
+ public LongIntegerElement(Message message, String elementName, MessageData messageData, int bitOffset, int bitLength) {
super(message, elementName, messageData, bitOffset, bitLength);
}
- public LongIntegerElement(Message<?, ?, ?> message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb, int originalLsb, int originalMsb) {
+ public LongIntegerElement(Message message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb, int originalLsb, int originalMsb) {
super(message, elementName, messageData, byteOffset, msb, lsb, originalLsb, originalMsb);
}
+
+ @Override
+ public LongIntegerElement findElementInMessages(Collection<? extends Message> messages) {
+ return (LongIntegerElement) super.findElementInMessages(messages);
+ }
@Override
- public LongIntegerElement switchMessages(Collection<? extends Message<?, ?, ?>> messages) {
+ @Deprecated
+ public LongIntegerElement switchMessages(Collection<? extends Message<?,?,?>> messages) {
return (LongIntegerElement) super.switchMessages(messages);
}
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/NumericElement.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/NumericElement.java
index 6bc34dc746..3e3cdb669b 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/NumericElement.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/NumericElement.java
@@ -15,15 +15,15 @@ import org.eclipse.osee.ote.message.data.MessageData;
public abstract class NumericElement<T extends Number & Comparable<T>> extends DiscreteElement<T> {
- public NumericElement(Message<?, ?, ?> msg, String elementName, MessageData messageData, int byteOffset, int msb, int lsb, int originalMsb, int originalLsb) {
+ public NumericElement(Message msg, String elementName, MessageData messageData, int byteOffset, int msb, int lsb, int originalMsb, int originalLsb) {
super(msg, elementName, messageData, byteOffset, msb, lsb, originalMsb, originalLsb);
}
- public NumericElement(Message<?, ?, ?> msg, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
+ public NumericElement(Message msg, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
super(msg, elementName, messageData, byteOffset, msb, lsb);
}
- public NumericElement(Message<?, ?, ?> msg, String elementName, MessageData messageData, int bitOffset, int bitLength) {
+ public NumericElement(Message msg, String elementName, MessageData messageData, int bitOffset, int bitLength) {
super(msg, elementName, messageData, bitOffset, bitLength);
}
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/RealElement.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/RealElement.java
index 953236d608..a4dced2c4f 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/RealElement.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/RealElement.java
@@ -27,20 +27,26 @@ public abstract class RealElement extends NumericElement<Double> {
visitor.asRealElement(this);
}
- public RealElement(Message<?, ?, ?> message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
+ public RealElement(Message message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
this(message, elementName, messageData, byteOffset, msb, lsb, msb, lsb);
}
- public RealElement(Message<?, ?, ?> message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb, int originalLsb, int originalMsb) {
+ public RealElement(Message message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb, int originalLsb, int originalMsb) {
super(message, elementName, messageData, byteOffset, msb, lsb, originalLsb, originalMsb);
}
- public RealElement(Message<?, ?, ?> message, String elementName, MessageData messageData, int bitOffset, int bitLength) {
+ public RealElement(Message message, String elementName, MessageData messageData, int bitOffset, int bitLength) {
super(message, elementName, messageData, bitOffset, bitLength);
}
@Override
- public RealElement switchMessages(Collection<? extends Message<?, ?, ?>> messages) {
+ public RealElement findElementInMessages(Collection<? extends Message> messages) {
+ return (RealElement) super.findElementInMessages(messages);
+ }
+
+ @Override
+ @Deprecated
+ public RealElement switchMessages(Collection<? extends Message<?,?,?>> messages) {
return (RealElement) super.switchMessages(messages);
}
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/RecordElement.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/RecordElement.java
index dd42ed10a2..e98dab4e8a 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/RecordElement.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/RecordElement.java
@@ -36,7 +36,7 @@ public abstract class RecordElement extends Element {
* @param message -
* @param elementName -
*/
- public RecordElement(Message<?, ?, ?> message, String elementName, int index, MessageData messageData, int firstRecordBitOffset, int recordBitSize) {
+ public RecordElement(Message message, String elementName, int index, MessageData messageData, int firstRecordBitOffset, int recordBitSize) {
super(message, elementName, messageData, firstRecordBitOffset + index * recordBitSize, recordBitSize);
elementMap = new LinkedHashMap<>();
BIT_OFFSET = this.bitOffset = firstRecordBitOffset + index * recordBitSize;
@@ -45,7 +45,7 @@ public abstract class RecordElement extends Element {
this.index = index;
}
- public RecordElement(Message<?, ?, ?> message, String elementName, MessageData messageData, int firstRecordBitOffset, int recordBitSize) {
+ public RecordElement(Message message, String elementName, MessageData messageData, int firstRecordBitOffset, int recordBitSize) {
this(message, elementName, 0, messageData, firstRecordBitOffset, recordBitSize);
isPartOfMap = false;
}
@@ -87,10 +87,14 @@ public abstract class RecordElement extends Element {
}
@Override
- public RecordElement switchMessages(Collection<? extends Message<?, ?, ?>> messages) {
+ public RecordElement findElementInMessages(Collection<? extends Message> messages) {
+ return (RecordElement) super.findElementInMessages(messages);
+ }
+
+ public RecordElement switchMessagesNew(Collection<? extends Message<?,?,?>> messages) {
return (RecordElement) super.switchMessages(messages);
}
-
+
public void put(int index, RecordElement newRecord) {
// records.put(index, (T)newRecord);
}
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/RecordMap.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/RecordMap.java
index a887d54112..8c4e778f34 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/RecordMap.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/RecordMap.java
@@ -26,14 +26,14 @@ public class RecordMap<T extends RecordElement> extends RecordElement {
private final HashMap<Integer, T> records;
private IRecordFactory factory;
- public RecordMap(Message<?, ?, ?> message, MessageData messageData, String elementName, int numberOfRecords, IRecordFactory factory) {
+ public RecordMap(Message message, MessageData messageData, String elementName, int numberOfRecords, IRecordFactory factory) {
super(message, elementName, 1, messageData, 0, factory.getBitLength());
NUMBER_OF_RECORDS = numberOfRecords;
records = new HashMap<>(numberOfRecords);
this.factory = factory;
}
- public RecordMap(Message<?, ?, ?> message, MessageData messageData, int firstRecordByteOffset, int recordByteSize, int numberOfRecords) {
+ public RecordMap(Message message, MessageData messageData, int firstRecordByteOffset, int recordByteSize, int numberOfRecords) {
super(message, "", 1, messageData, 0, 0);
NUMBER_OF_RECORDS = numberOfRecords;
records = new HashMap<>(numberOfRecords);
@@ -79,7 +79,7 @@ public class RecordMap<T extends RecordElement> extends RecordElement {
return messageData;
}
- public RecordMap<T> switchRecordMapMessages(Collection<? extends Message<?, ?, ?>> messages) {
+ public RecordMap<T> switchRecordMapMessages(Collection<? extends Message<?,?,?>> messages) {
for (RecordElement element : this.records.values()) {
element.switchMessages(messages);
}
@@ -95,8 +95,18 @@ public class RecordMap<T extends RecordElement> extends RecordElement {
// return this;
// }
+
@Override
- public RecordMap<T> switchMessages(Collection<? extends Message<?, ?, ?>> messages) {
+ public RecordMap<T> findElementInMessages(Collection<? extends Message> messages) {
+ for (RecordElement element : this.records.values()) {
+ element.findElementInMessages(messages);
+ }
+ return this;
+ }
+
+ @Override
+ @Deprecated
+ public RecordMap<T> switchMessages(Collection<? extends Message<?,?,?>> messages) {
for (RecordElement element : this.records.values()) {
element.switchMessages(messages);
}
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/SignedInteger16Element.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/SignedInteger16Element.java
index 3bddf54f3f..d4f642a42d 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/SignedInteger16Element.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/SignedInteger16Element.java
@@ -29,20 +29,25 @@ public class SignedInteger16Element extends NumericElement<Integer> {
visitor.asSignedInteger16Element(this);
}
- public SignedInteger16Element(Message<?, ?, ?> message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
+ public SignedInteger16Element(Message message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
this(message, elementName, messageData, byteOffset, msb, lsb, msb, lsb);
}
- public SignedInteger16Element(Message<?, ?, ?> message, String elementName, MessageData messageData, int bitOffset, int bitLength) {
+ public SignedInteger16Element(Message message, String elementName, MessageData messageData, int bitOffset, int bitLength) {
super(message, elementName, messageData, bitOffset, bitLength);
}
- public SignedInteger16Element(Message<?, ?, ?> message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb, int originalLsb, int originalMsb) {
+ public SignedInteger16Element(Message message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb, int originalLsb, int originalMsb) {
super(message, elementName, messageData, byteOffset, msb, lsb, originalLsb, originalMsb);
}
@Override
- public SignedInteger16Element switchMessages(Collection<? extends Message<?, ?, ?>> messages) {
+ public SignedInteger16Element findElementInMessages(Collection<? extends Message> messages) {
+ return (SignedInteger16Element) super.findElementInMessages(messages);
+ }
+
+ @Override
+ public SignedInteger16Element switchMessages(Collection<? extends Message<?,?,?>> messages) {
return (SignedInteger16Element) super.switchMessages(messages);
}
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/StringElement.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/StringElement.java
index c4bc2d8286..d6f2bc8bb8 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/StringElement.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/StringElement.java
@@ -35,20 +35,26 @@ public class StringElement extends DiscreteElement<String> {
visitor.asStringElement(this);
}
- public StringElement(Message<?, ?, ?> message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
+ public StringElement(Message message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
this(message, elementName, messageData, byteOffset, msb, lsb, msb, lsb);
}
- public StringElement(Message<?, ?, ?> message, String elementName, MessageData messageData, int bitOffset, int bitLength) {
+ public StringElement(Message message, String elementName, MessageData messageData, int bitOffset, int bitLength) {
super(message, elementName, messageData, bitOffset, bitLength);
}
- public StringElement(Message<?, ?, ?> message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb, int originalLsb, int originalMsb) {
+ public StringElement(Message message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb, int originalLsb, int originalMsb) {
super(message, elementName, messageData, byteOffset, msb, lsb, originalLsb, originalMsb);
}
@Override
- public StringElement switchMessages(Collection<? extends Message<?, ?, ?>> messages) {
+ public StringElement findElementInMessages(Collection<? extends Message> messages) {
+ return (StringElement) super.findElementInMessages(messages);
+ }
+
+ @Override
+ @Deprecated
+ public StringElement switchMessages(Collection<? extends Message<?,?,?>> messages) {
return (StringElement) super.switchMessages(messages);
}
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingCharElement.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingCharElement.java
index 05d336547c..78f0895fa2 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingCharElement.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingCharElement.java
@@ -30,15 +30,15 @@ public class NonMappingCharElement extends CharElement {
}
}
- public NonMappingCharElement(Message<?, ?, ?> message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
+ public NonMappingCharElement(Message message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
super(message, elementName, messageData, byteOffset, msb, lsb);
}
- public NonMappingCharElement(Message<?, ?, ?> message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb, int originalLsb, int originalMsb) {
+ public NonMappingCharElement(Message message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb, int originalLsb, int originalMsb) {
super(message, elementName, messageData, byteOffset, msb, lsb, originalLsb, originalMsb);
}
- public NonMappingCharElement(Message<?, ?, ?> message, String elementName, MessageData messageData, int bitOffset, int bitLength) {
+ public NonMappingCharElement(Message message, String elementName, MessageData messageData, int bitOffset, int bitLength) {
super(message, elementName, messageData, bitOffset, bitLength);
}
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingEmptyEnumElement.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingEmptyEnumElement.java
index 122b538342..738ba7e4f6 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingEmptyEnumElement.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingEmptyEnumElement.java
@@ -37,15 +37,15 @@ public class NonMappingEmptyEnumElement extends EmptyEnum_Element {
}
}
- public NonMappingEmptyEnumElement(Message<?, ?, ?> message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
+ public NonMappingEmptyEnumElement(Message message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
super(message, elementName, messageData, byteOffset, msb, lsb);
}
- public NonMappingEmptyEnumElement(Message<?, ?, ?> message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb, int originalLsb, int originalMsb) {
+ public NonMappingEmptyEnumElement(Message message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb, int originalLsb, int originalMsb) {
super(message, elementName, messageData, byteOffset, msb, lsb, originalLsb, originalMsb);
}
- public NonMappingEmptyEnumElement(Message<?, ?, ?> message, String elementName, MessageData messageData, int bitOffset, int bitLength) {
+ public NonMappingEmptyEnumElement(Message message, String elementName, MessageData messageData, int bitOffset, int bitLength) {
super(message, elementName, messageData, bitOffset, bitLength);
}
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingEnumeratedElement.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingEnumeratedElement.java
index c5eeaf6dac..02e8f8126d 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingEnumeratedElement.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingEnumeratedElement.java
@@ -33,15 +33,15 @@ public class NonMappingEnumeratedElement<T extends Enum<T> & IEnumValue<T>> exte
}
}
- public NonMappingEnumeratedElement(Message<?, ?, ?> msg, String elementName, Class<T> clazz, MessageData messageData, int byteOffset, int msb, int lsb, int originalMsb, int originalLsb) {
+ public NonMappingEnumeratedElement(Message msg, String elementName, Class<T> clazz, MessageData messageData, int byteOffset, int msb, int lsb, int originalMsb, int originalLsb) {
super(msg, elementName, clazz, messageData, byteOffset, msb, lsb, originalMsb, originalLsb);
}
- public NonMappingEnumeratedElement(Message<?, ?, ?> msg, String elementName, Class<T> clazz, MessageData messageData, int byteOffset, int msb, int lsb) {
+ public NonMappingEnumeratedElement(Message msg, String elementName, Class<T> clazz, MessageData messageData, int byteOffset, int msb, int lsb) {
super(msg, elementName, clazz, messageData, byteOffset, msb, lsb);
}
- public NonMappingEnumeratedElement(Message<?, ?, ?> message, String elementName, Class<T> clazz, MessageData messageData, int bitOffset, int bitLength) {
+ public NonMappingEnumeratedElement(Message message, String elementName, Class<T> clazz, MessageData messageData, int bitOffset, int bitLength) {
super(message, elementName, clazz, messageData, bitOffset, bitLength);
}
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingFixedPointElement.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingFixedPointElement.java
index c1a5979f33..84975d8e58 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingFixedPointElement.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingFixedPointElement.java
@@ -31,24 +31,24 @@ public class NonMappingFixedPointElement extends FixedPointElement {
}
}
- public NonMappingFixedPointElement(Message<?, ?, ?> message, String elementName, MessageData messageData, double resolution, boolean signed, int byteOffset, int msb, int lsb) {
+ public NonMappingFixedPointElement(Message message, String elementName, MessageData messageData, double resolution, boolean signed, int byteOffset, int msb, int lsb) {
super(message, elementName, messageData, resolution, signed, byteOffset, msb, lsb);
}
- public NonMappingFixedPointElement(Message<?, ?, ?> message, String elementName, MessageData messageData, double resolution, double minVal, boolean signed, int byteOffset, int msb, int lsb) {
+ public NonMappingFixedPointElement(Message message, String elementName, MessageData messageData, double resolution, double minVal, boolean signed, int byteOffset, int msb, int lsb) {
super(message, elementName, messageData, resolution, minVal, signed, byteOffset, msb, lsb);
}
- public NonMappingFixedPointElement(Message<?, ?, ?> message, String elementName, MessageData messageData, double resolution, boolean signed, int byteOffset, int msb, int lsb, int originalLsb, int originalMsb) {
+ public NonMappingFixedPointElement(Message message, String elementName, MessageData messageData, double resolution, boolean signed, int byteOffset, int msb, int lsb, int originalLsb, int originalMsb) {
super(message, elementName, messageData, resolution, signed, byteOffset, msb, lsb, originalLsb, originalMsb);
}
- public NonMappingFixedPointElement(Message<?, ?, ?> message, String elementName, MessageData messageData, double resolution, double minVal, boolean signed, int byteOffset, int msb, int lsb, int originalLsb, int originalMsb) {
+ public NonMappingFixedPointElement(Message message, String elementName, MessageData messageData, double resolution, double minVal, boolean signed, int byteOffset, int msb, int lsb, int originalLsb, int originalMsb) {
super(message, elementName, messageData, resolution, minVal, signed, byteOffset, msb, lsb, originalLsb,
originalMsb);
}
- public NonMappingFixedPointElement(Message<?, ?, ?> message, String elementName, MessageData messageData, double resolution, double minVal, boolean signed, int bitOffset, int bitLength) {
+ public NonMappingFixedPointElement(Message message, String elementName, MessageData messageData, double resolution, double minVal, boolean signed, int bitOffset, int bitLength) {
super(message, elementName, messageData, resolution, minVal, signed, bitOffset, bitLength);
}
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingFloat32Element.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingFloat32Element.java
index 1fa7d4d540..e6beb91ee8 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingFloat32Element.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingFloat32Element.java
@@ -31,15 +31,15 @@ public class NonMappingFloat32Element extends Float32Element {
}
}
- public NonMappingFloat32Element(Message<?, ?, ?> message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
+ public NonMappingFloat32Element(Message message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
super(message, elementName, messageData, byteOffset, msb, lsb);
}
- public NonMappingFloat32Element(Message<?, ?, ?> message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb, int originalLsb, int originalMsb) {
+ public NonMappingFloat32Element(Message message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb, int originalLsb, int originalMsb) {
super(message, elementName, messageData, byteOffset, msb, lsb, originalLsb, originalMsb);
}
- public NonMappingFloat32Element(Message<?, ?, ?> message, String elementName, MessageData messageData, int bitOffset, int bitLength) {
+ public NonMappingFloat32Element(Message message, String elementName, MessageData messageData, int bitOffset, int bitLength) {
super(message, elementName, messageData, bitOffset, bitLength);
}
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingFloat64Element.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingFloat64Element.java
index 932b975c1c..4b9d83d3f0 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingFloat64Element.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingFloat64Element.java
@@ -31,15 +31,15 @@ public class NonMappingFloat64Element extends Float64Element {
}
}
- public NonMappingFloat64Element(Message<?, ?, ?> message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
+ public NonMappingFloat64Element(Message message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
super(message, elementName, messageData, byteOffset, msb, lsb);
}
- public NonMappingFloat64Element(Message<?, ?, ?> message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb, int originalLsb, int originalMsb) {
+ public NonMappingFloat64Element(Message message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb, int originalLsb, int originalMsb) {
super(message, elementName, messageData, byteOffset, msb, lsb, originalLsb, originalMsb);
}
- public NonMappingFloat64Element(Message<?, ?, ?> message, String elementName, MessageData messageData, int bitOffset, int bitLength) {
+ public NonMappingFloat64Element(Message message, String elementName, MessageData messageData, int bitOffset, int bitLength) {
super(message, elementName, messageData, bitOffset, bitLength);
}
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingIntegerElement.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingIntegerElement.java
index ac02cdbe6e..ee796e7da4 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingIntegerElement.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingIntegerElement.java
@@ -33,15 +33,15 @@ public class NonMappingIntegerElement extends IntegerElement {
}
}
- public NonMappingIntegerElement(Message<?, ?, ?> message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
+ public NonMappingIntegerElement(Message message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
super(message, elementName, messageData, byteOffset, msb, lsb);
}
- public NonMappingIntegerElement(Message<?, ?, ?> message, String elementName, MessageData messageData, int bitOffset, int bitLength) {
+ public NonMappingIntegerElement(Message message, String elementName, MessageData messageData, int bitOffset, int bitLength) {
super(message, elementName, messageData, bitOffset, bitLength);
}
- public NonMappingIntegerElement(Message<?, ?, ?> message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb, int originalLsb, int originalMsb) {
+ public NonMappingIntegerElement(Message message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb, int originalLsb, int originalMsb) {
super(message, elementName, messageData, byteOffset, msb, lsb, originalLsb, originalMsb);
}
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingLongIntegerElement.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingLongIntegerElement.java
index bcb4d31b22..a5988bb5fd 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingLongIntegerElement.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingLongIntegerElement.java
@@ -34,15 +34,15 @@ public class NonMappingLongIntegerElement extends LongIntegerElement {
}
}
- public NonMappingLongIntegerElement(Message<?, ?, ?> message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
+ public NonMappingLongIntegerElement(Message message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
super(message, elementName, messageData, byteOffset, msb, lsb);
}
- public NonMappingLongIntegerElement(Message<?, ?, ?> message, String elementName, MessageData messageData, int bitOffset, int bitLength) {
+ public NonMappingLongIntegerElement(Message message, String elementName, MessageData messageData, int bitOffset, int bitLength) {
super(message, elementName, messageData, bitOffset, bitLength);
}
- public NonMappingLongIntegerElement(Message<?, ?, ?> message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb, int originalLsb, int originalMsb) {
+ public NonMappingLongIntegerElement(Message message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb, int originalLsb, int originalMsb) {
super(message, elementName, messageData, byteOffset, msb, lsb, originalLsb, originalMsb);
}
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingRecordElement.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingRecordElement.java
index 968bc0306c..c72f475f28 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingRecordElement.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingRecordElement.java
@@ -27,7 +27,7 @@ public class NonMappingRecordElement extends RecordElement {
}
}
- public NonMappingRecordElement(Message<?, ?, ?> message, String elementName, int index, MessageData messageData, int firstRecordBitOffset, int recordBitSize) {
+ public NonMappingRecordElement(Message message, String elementName, int index, MessageData messageData, int firstRecordBitOffset, int recordBitSize) {
super(message, elementName, index, messageData, firstRecordBitOffset, recordBitSize);
}
@@ -35,7 +35,7 @@ public class NonMappingRecordElement extends RecordElement {
super(message, elementName, offset, messageData, firstRecordByteOffset, recordByteSize);
}
- public NonMappingRecordElement(Message<?, ?, ?> message, String elementName, MessageData messageData, int firstRecordByteOffset, int recordByteSize) {
+ public NonMappingRecordElement(Message message, String elementName, MessageData messageData, int firstRecordByteOffset, int recordByteSize) {
super(message, elementName, messageData, firstRecordByteOffset, recordByteSize);
}
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingSignedInteger16Element.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingSignedInteger16Element.java
index 9ec3509199..be36e91db7 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingSignedInteger16Element.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingSignedInteger16Element.java
@@ -35,15 +35,15 @@ public class NonMappingSignedInteger16Element extends IntegerElement {
}
}
- public NonMappingSignedInteger16Element(Message<?, ?, ?> message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
+ public NonMappingSignedInteger16Element(Message message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
super(message, elementName, messageData, byteOffset, msb, lsb);
}
- public NonMappingSignedInteger16Element(Message<?, ?, ?> message, String elementName, MessageData messageData, int bitOffset, int bitLength) {
+ public NonMappingSignedInteger16Element(Message message, String elementName, MessageData messageData, int bitOffset, int bitLength) {
super(message, elementName, messageData, bitOffset, bitLength);
}
- public NonMappingSignedInteger16Element(Message<?, ?, ?> message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb, int originalLsb, int originalMsb) {
+ public NonMappingSignedInteger16Element(Message message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb, int originalLsb, int originalMsb) {
super(message, elementName, messageData, byteOffset, msb, lsb, originalLsb, originalMsb);
}
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingStringElement.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingStringElement.java
index 16b6566613..6bb5c7e84e 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingStringElement.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingStringElement.java
@@ -33,15 +33,15 @@ public class NonMappingStringElement extends StringElement {
}
}
- public NonMappingStringElement(Message<?, ?, ?> message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
+ public NonMappingStringElement(Message message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
super(message, elementName, messageData, byteOffset, msb, lsb);
}
- public NonMappingStringElement(Message<?, ?, ?> message, String elementName, MessageData messageData, int bitOffset, int bitLength) {
+ public NonMappingStringElement(Message message, String elementName, MessageData messageData, int bitOffset, int bitLength) {
super(message, elementName, messageData, bitOffset, bitLength);
}
- public NonMappingStringElement(Message<?, ?, ?> message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb, int originalLsb, int originalMsb) {
+ public NonMappingStringElement(Message message, String elementName, MessageData messageData, int byteOffset, int msb, int lsb, int originalLsb, int originalMsb) {
super(message, elementName, messageData, byteOffset, msb, lsb, originalLsb, originalMsb);
}
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/event/SOCKET_ADDRESS_RECORD.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/event/SOCKET_ADDRESS_RECORD.java
index 27a5ec759b..bd3d88aae2 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/event/SOCKET_ADDRESS_RECORD.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/event/SOCKET_ADDRESS_RECORD.java
@@ -17,7 +17,7 @@ public class SOCKET_ADDRESS_RECORD extends ArrayElement{
private final ArrayElement ipaddress;
private final IntegerElement port;
- public SOCKET_ADDRESS_RECORD(Message<?, ?, ?> msg, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
+ public SOCKET_ADDRESS_RECORD(Message msg, String elementName, MessageData messageData, int byteOffset, int msb, int lsb) {
super(msg, elementName, messageData, byteOffset, msb, lsb);
type = new EnumeratedElement<>(msg, "type", ADDRESS_TYPE.class, messageData, byteOffset, 0, 7);
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/listener/MessageSystemListener.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/listener/MessageSystemListener.java
index 07e8abb28e..de3cb97620 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/listener/MessageSystemListener.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/listener/MessageSystemListener.java
@@ -46,7 +46,7 @@ public class MessageSystemListener implements IOSEEMessageReaderListener, IOSEEM
private volatile boolean isTimedOut = false;
private int masterMessageCount = 0;
// private final Message message;
- private final WeakReference<Message<?, ?, ?>> message;
+ private final WeakReference<Message> message;
private static final Benchmark tbm = new Benchmark("Total Message System Listener", 2500);
@@ -80,7 +80,7 @@ public class MessageSystemListener implements IOSEEMessageReaderListener, IOSEEM
* This class takes in a message in the constructor so that it can tell the message to update when it recieves new
* data.
*/
- public MessageSystemListener(Message<?, ?, ?> msg) {
+ public MessageSystemListener(Message msg) {
super();
this.message = new WeakReference<>(msg);
}
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/tool/rec/MessageRecordConfig.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/tool/rec/MessageRecordConfig.java
index a60da94ed6..80d0698cf5 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/tool/rec/MessageRecordConfig.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/message/tool/rec/MessageRecordConfig.java
@@ -16,14 +16,14 @@ import org.eclipse.osee.ote.message.elements.Element;
import org.eclipse.osee.ote.message.enums.DataType;
public class MessageRecordConfig {
- private final Message<?, ?, ?> msg;
+ private final Message msg;
private final Element[] headerElements;
private final Element[] bodyElements;
private final DataType type;
private final boolean headerDump;
private final boolean bodyDump;
- public MessageRecordConfig(final Message<?, ?, ?> msg, final DataType type, final boolean headerDump, final Element[] headerElements, final boolean bodyDump, final Element[] bodyElements) {
+ public MessageRecordConfig(final Message msg, final DataType type, final boolean headerDump, final Element[] headerElements, final boolean bodyDump, final Element[] bodyElements) {
this.msg = msg;
this.headerElements = headerElements;
this.bodyElements = bodyElements;
@@ -32,7 +32,7 @@ public class MessageRecordConfig {
this.bodyDump = bodyDump;
}
- public MessageRecordConfig(final Message<?, ?, ?> msg, final DataType type, Element[] hdrElements) {
+ public MessageRecordConfig(final Message msg, final DataType type, Element[] hdrElements) {
this.msg = msg;
this.headerElements = hdrElements;
Collection<Element> elements = msg.getElements();
@@ -76,7 +76,7 @@ public class MessageRecordConfig {
return headerDump;
}
- public Message<?, ?, ?> getMsg() {
+ public Message getMsg() {
return msg;
}

Back to the top