diff options
author | kaguilar | 2010-04-08 18:14:16 +0000 |
---|---|---|
committer | kaguilar | 2010-04-08 18:14:16 +0000 |
commit | 54d7d15e63c7d7e55c88055ea8369138a5f58849 (patch) | |
tree | f1fc8fade33ed855661b7a5acf7ec211073c950b /plugins | |
parent | 7e7295ef57608fe6359d7bff0a18192b6f068fe2 (diff) | |
download | org.eclipse.osee-54d7d15e63c7d7e55c88055ea8369138a5f58849.tar.gz org.eclipse.osee-54d7d15e63c7d7e55c88055ea8369138a5f58849.tar.xz org.eclipse.osee-54d7d15e63c7d7e55c88055ea8369138a5f58849.zip |
fixed issues identified by find bugs
Diffstat (limited to 'plugins')
29 files changed, 235 insertions, 302 deletions
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/TestCase.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/TestCase.java index cb2f96c5b9a..8529d0aae42 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/TestCase.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/TestCase.java @@ -14,6 +14,7 @@ import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.Set; import java.util.logging.Level; + import org.eclipse.osee.framework.jdk.core.persistence.Xmlizable; import org.eclipse.osee.framework.jdk.core.util.xml.Jaxp; import org.eclipse.osee.framework.logging.OseeLog; @@ -91,7 +92,7 @@ import org.w3c.dom.Element; */ public abstract class TestCase implements ITestEnvironmentAccessor, Xmlizable { protected ITestLogger logger; - private final WeakReference<ITestEnvironmentAccessor> environment; + private final ITestEnvironmentAccessor environment; private final boolean standAlone; public int testCaseNumber; private final WeakReference<TestScript> testScript; @@ -133,7 +134,7 @@ public abstract class TestCase implements ITestEnvironmentAccessor, Xmlizable { this.testCaseNumber = testScript.addTestCase(this); } this.testScript = new WeakReference<TestScript>(testScript); - this.environment = new WeakReference<ITestEnvironmentAccessor>(testScript.getTestEnvironment()); + this.environment = testScript.getTestEnvironment(); GCHelper.getGCHelper().addRefWatch(this); } @@ -149,7 +150,7 @@ public abstract class TestCase implements ITestEnvironmentAccessor, Xmlizable { ; this.testCaseNumber = 1; this.testScript = null; - this.environment = new WeakReference<ITestEnvironmentAccessor>(accessor); + this.environment = accessor; } @@ -186,7 +187,7 @@ public abstract class TestCase implements ITestEnvironmentAccessor, Xmlizable { } public ITestEnvironmentAccessor getTestEnvironment() { - return environment.get(); + return environment; } public TestRecord getTestRecord() { @@ -293,23 +294,23 @@ public abstract class TestCase implements ITestEnvironmentAccessor, Xmlizable { } public void abortTestScript() { - environment.get().abortTestScript(); + environment.abortTestScript(); } public boolean addTask(EnvironmentTask task) { - return environment.get().addTask(task); + return environment.addTask(task); } public void associateObject(Class<?> c, Object obj) { - environment.get().associateObject(c, obj); + environment.associateObject(c, obj); } public Object getAssociatedObject(Class<?> c) { - return environment.get().getAssociatedObject(c); + return environment.getAssociatedObject(c); } public Set<Class<?>> getAssociatedObjects() { - return environment.get().getAssociatedObjects(); + return environment.getAssociatedObjects(); } /* @@ -321,19 +322,19 @@ public abstract class TestCase implements ITestEnvironmentAccessor, Xmlizable { // return environment.getEnvironmentType(); // } public long getEnvTime() { - return environment.get().getEnvTime(); + return environment.getEnvTime(); } public IExecutionUnitManagement getExecutionUnitManagement() { - return environment.get().getExecutionUnitManagement(); + return environment.getExecutionUnitManagement(); } public ITestLogger getLogger() { - return environment.get().getLogger(); + return environment.getLogger(); } public IScriptControl getScriptCtrl() { - return environment.get().getScriptCtrl(); + return environment.getScriptCtrl(); } /* @@ -341,23 +342,23 @@ public abstract class TestCase implements ITestEnvironmentAccessor, Xmlizable { */ public ITestStation getTestStation() { - return environment.get().getTestStation(); + return environment.getTestStation(); } public ITimerControl getTimerCtrl() { - return environment.get().getTimerCtrl(); + return environment.getTimerCtrl(); } public void onScriptComplete() throws InterruptedException { - environment.get().onScriptComplete(); + environment.onScriptComplete(); } public void onScriptSetup() { - environment.get().onScriptSetup(); + environment.onScriptSetup(); } public ICancelTimer setTimerFor(ITimeout listener, int time) { - return environment.get().setTimerFor(listener, time); + return environment.setTimerFor(listener, time); } public void logTestPoint(boolean isPassed, String testPointName, String expected, String actual) { diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/environment/TestEnvironment.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/environment/TestEnvironment.java index 2fc57f1dbcb..f810c68011a 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/environment/TestEnvironment.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/environment/TestEnvironment.java @@ -367,7 +367,7 @@ public abstract class TestEnvironment implements TestEnvironmentInterface, ITest public void removeUser(OSEEPerson1_4 user) { if (users.containsKey(user)) { - users.put(user, new Integer(((Integer) users.get(user)).intValue() - 1)); + users.put(user, Integer.valueOf(((Integer) users.get(user)).intValue() - 1)); if (((Integer) users.get(user)).intValue() == 0) { users.remove(user); } diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/environment/config/TestScriptConfig.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/environment/config/TestScriptConfig.java index b78e0a58ae9..7173ead5aad 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/environment/config/TestScriptConfig.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/environment/config/TestScriptConfig.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.ote.core.environment.config;
-import java.io.Serializable;
+import java.io.Serializable; /**
* @author Andrew M. Finkbeiner
@@ -21,7 +21,6 @@ public class TestScriptConfig implements Serializable { private String outFile;
private String fullScriptName;
private String[] classPathStrs;
- private String cppExePath;
private boolean isExe;
private ScriptVersionConfig scriptVersion;
@@ -56,10 +55,6 @@ public class TestScriptConfig implements Serializable { return isExe;
}
- public String getCppExePath() {
- return cppExePath;
- }
-
public ScriptVersionConfig getScriptVersion() {
return this.scriptVersion;
}
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/test/shells/TelnetShell.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/test/shells/TelnetShell.java index 97c81ed3987..59cd868f6d2 100644 --- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/test/shells/TelnetShell.java +++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/test/shells/TelnetShell.java @@ -24,6 +24,7 @@ import java.nio.channels.WritableByteChannel; import java.util.logging.Level;
import java.util.regex.MatchResult;
import java.util.regex.Pattern;
+
import org.apache.commons.net.telnet.EchoOptionHandler;
import org.apache.commons.net.telnet.InvalidTelnetOptionException;
import org.apache.commons.net.telnet.SuppressGAOptionHandler;
@@ -46,8 +47,6 @@ public class TelnetShell implements TelnetNotificationHandler { private final OutputStream outStream;
public final ByteBuffer buffer = ByteBuffer.allocateDirect(1024);
- private final boolean done = false;
-
public Piper(InputStream in, OutputStream out) {
super("Stream Piper");
this.inStream = in;
@@ -60,7 +59,7 @@ public class TelnetShell implements TelnetNotificationHandler { final WritableByteChannel out = Channels.newChannel(outStream);
try {
buffer.clear();
- while (!done) {
+ while (true) {
in.read(buffer);
buffer.flip();
out.write(buffer);
@@ -256,7 +255,11 @@ public class TelnetShell implements TelnetNotificationHandler { System.out.println("Enter host name or ip address (#.#.#.#))");
String host = reader.readLine();
System.out.println("Enter port");
- int port = Integer.parseInt(reader.readLine());
+ String string = reader.readLine();
+ if (string == null) {
+ return;
+ }
+ int port = Integer.parseInt(string);
TelnetShell shell = new TelnetShell(host, port, false);
Piper piper = new Piper(shell.in, System.out);
piper.start();
diff --git a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/MessageEventLogger.java b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/MessageEventLogger.java index 766f49132f0..3334fa673e5 100644 --- a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/MessageEventLogger.java +++ b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/MessageEventLogger.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.osee.ote.message; -import java.lang.ref.WeakReference; import java.util.logging.Level; + import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.ote.message.enums.MemType; @@ -27,7 +27,7 @@ public class MessageEventLogger implements UniversalMessageListener{ } } - private final WeakReference<Message<?,?,?>> message; + private final Message<?,?,?> message; private final String modeStatus; private volatile boolean showStackTrace = false; @@ -41,7 +41,7 @@ public class MessageEventLogger implements UniversalMessageListener{ * @return the message */ public Message<?, ?, ?> getMessage() { - return message.get(); + return message; } @@ -51,7 +51,7 @@ public class MessageEventLogger implements UniversalMessageListener{ * @param showStackTrace */ public MessageEventLogger(Message<?,?,?> message, boolean showStackTrace) { - this.message = new WeakReference<Message<?,?,?>>(message); + this.message = message; modeStatus = message.isWriter() ? "wirter " : "reader"; message.addPostMemSourceChangeListener(this); message.addPostMessageDisposeListener(this); @@ -86,7 +86,7 @@ public class MessageEventLogger implements UniversalMessageListener{ public void isScheduledChanged(boolean isScheduled) { log(Level.INFO, String.format( "schedule status for %s %s has changed to %s. Env time is %d", - message.get().getName(), + message.getName(), modeStatus, isScheduled ? "scheduled" : "not scheduled"), showStackTrace ? new StackTrace() : null); } diff --git a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/MessageSystemTestCase.java b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/MessageSystemTestCase.java index a57532fe5fa..d11e3d502b6 100644 --- a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/MessageSystemTestCase.java +++ b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/MessageSystemTestCase.java @@ -10,25 +10,23 @@ *******************************************************************************/ package org.eclipse.osee.ote.message;
-import java.lang.ref.WeakReference;
-
-import org.eclipse.osee.ote.core.TestCase;
-import org.eclipse.osee.ote.core.TestScript;
-import org.eclipse.osee.ote.message.enums.MemType;
-import org.eclipse.osee.ote.message.interfaces.IMessageManager;
-import org.eclipse.osee.ote.message.interfaces.ITestAccessor;
-import org.eclipse.osee.ote.message.interfaces.ITestEnvironmentMessageSystemAccessor;
+import org.eclipse.osee.ote.core.TestCase; +import org.eclipse.osee.ote.core.TestScript; +import org.eclipse.osee.ote.message.enums.MemType; +import org.eclipse.osee.ote.message.interfaces.IMessageManager; +import org.eclipse.osee.ote.message.interfaces.ITestAccessor; +import org.eclipse.osee.ote.message.interfaces.ITestEnvironmentMessageSystemAccessor; /**
* @author Andy Jury
*/
public abstract class MessageSystemTestCase extends TestCase implements ITestAccessor {
- private WeakReference<ITestEnvironmentMessageSystemAccessor> msgSysTestEnvironment;
+ private final ITestEnvironmentMessageSystemAccessor msgSysTestEnvironment;
protected MessageSystemTestCase(TestScript testScript, boolean standAlone, boolean addToRunList) {
super(testScript, standAlone, addToRunList);
- msgSysTestEnvironment = new WeakReference<ITestEnvironmentMessageSystemAccessor>((MessageSystemTestScript)testScript);
+ msgSysTestEnvironment = (MessageSystemTestScript)testScript;
}
/**
* TestCase Constructor.
@@ -50,12 +48,12 @@ public abstract class MessageSystemTestCase extends TestCase implements ITestAcc }
public IMessageManager<?,?> getMsgManager() {
- return msgSysTestEnvironment.get().getMsgManager();
+ return msgSysTestEnvironment.getMsgManager();
}
public boolean isPhysicalTypeAvailable(MemType mux) {
- return msgSysTestEnvironment.get().isPhysicalTypeAvailable(mux);
+ return msgSysTestEnvironment.isPhysicalTypeAvailable(mux);
}
public void associateObject(Class<?> c, Object obj) {
- msgSysTestEnvironment.get().associateObject(c, obj);
+ msgSysTestEnvironment.associateObject(c, obj);
}
}
diff --git a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/MessageSystemTestEnvironment.java b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/MessageSystemTestEnvironment.java index eabb9a64f09..f11d585379b 100644 --- a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/MessageSystemTestEnvironment.java +++ b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/MessageSystemTestEnvironment.java @@ -19,6 +19,7 @@ import java.rmi.RemoteException; import java.util.ArrayList; import java.util.Collection; import java.util.List; + import org.eclipse.osee.ote.core.IUserSession; import org.eclipse.osee.ote.core.TestScript; import org.eclipse.osee.ote.core.environment.BundleDescription; @@ -26,7 +27,6 @@ import org.eclipse.osee.ote.core.environment.TestEnvironment; import org.eclipse.osee.ote.core.environment.interfaces.BasicTimeout; import org.eclipse.osee.ote.core.environment.interfaces.IEnvironmentFactory; import org.eclipse.osee.ote.core.environment.interfaces.ITimeout; -import org.eclipse.osee.ote.core.log.Env; import org.eclipse.osee.ote.core.model.IModelManager; import org.eclipse.osee.ote.message.instrumentation.IOInstrumentation; import org.eclipse.osee.ote.message.interfaces.IMessageManager; @@ -136,30 +136,6 @@ public abstract class MessageSystemTestEnvironment extends TestEnvironment imple public abstract void singleStepEnv(); - public void wakeScript() { - synchronized (getTestScript()) { - System.out.println("notifying"); - getTestScript().notifyAll(); - } - } - - protected synchronized boolean waitForPromptResponse() { - this.promptResponse = false; - int count = 0; - while (count < 120) { - if (this.promptResponse) { - return true; - } - try { - Thread.sleep(1000); - } catch (InterruptedException ex) { - Env.getInstance().exception(ex); - } - count++; - } - return false; - } - public void setClientClasses(URL[] urls) throws RemoteException { clientClasses = urls; } diff --git a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/BooleanElement.java b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/BooleanElement.java index 91baca3ed60..227a6b802a9 100644 --- a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/BooleanElement.java +++ b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/BooleanElement.java @@ -44,7 +44,7 @@ public class BooleanElement extends DiscreteElement<Boolean> { @Override public Boolean getValue() { - return new Boolean(getMsgData().getMem().getBoolean(byteOffset, msb, lsb)); + return Boolean.valueOf(getMsgData().getMem().getBoolean(byteOffset, msb, lsb)); } @@ -60,7 +60,7 @@ public class BooleanElement extends DiscreteElement<Boolean> { @Override public Boolean valueOf(MemoryResource mem) { - return new Boolean(mem.getBoolean(byteOffset, msb, lsb)); + return Boolean.valueOf(mem.getBoolean(byteOffset, msb, lsb)); } @Override diff --git a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/CharElement.java b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/CharElement.java index 03814997347..0a307be8029 100644 --- a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/CharElement.java +++ b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/CharElement.java @@ -187,10 +187,11 @@ public class CharElement extends DiscreteElement<Character> { * @throws InterruptedException
*/
public boolean check(ITestAccessor accessor, CheckGroup checkGroup, String value, int milliseconds) throws InterruptedException {
- if (accessor != null) {
- accessor.getLogger().methodCalledOnObject(accessor, this.getFullName(),
- (new MethodFormatter()).add(value).add(milliseconds), this.getMessage());
+ if (accessor == null) { + throw new IllegalArgumentException("accessor cannot be null");
}
+ accessor.getLogger().methodCalledOnObject(accessor, this.getFullName(),
+ (new MethodFormatter()).add(value).add(milliseconds), this.getMessage());
long time = accessor.getEnvTime();
String currentValue;
if (milliseconds > 0) {
@@ -518,7 +519,7 @@ public class CharElement extends DiscreteElement<Character> { @Override
public Character valueOf(MemoryResource otherMem) {
- return new Character((char) otherMem.getInt(byteOffset, msb, lsb));
+ return Character.valueOf((char) otherMem.getInt(byteOffset, msb, lsb));
}
@Override
diff --git a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/DiscreteElement.java b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/DiscreteElement.java index 32f64c363c7..9dd82cef32d 100644 --- a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/DiscreteElement.java +++ b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/DiscreteElement.java @@ -63,7 +63,7 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element { public void set(ITestEnvironmentAccessor accessor, T value) {
if (accessor != null) {
accessor.getLogger().methodCalledOnObject(accessor, this.getFullName(), (new MethodFormatter()).add(value),
- this.msg.get());
+ this.msg);
}
setValue(value);
@@ -90,7 +90,7 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element { if (accessor != null) {
accessor.getLogger().methodCalledOnObject(accessor, this.getFullName(), (new MethodFormatter()).add(value),
- this.msg.get());
+ this.msg);
}
T actualValue = getValue();
@@ -111,7 +111,7 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element { public boolean checkNT(ITestAccessor accessor, CheckGroup checkGroup, T value) {
accessor.getLogger().methodCalledOnObject(accessor, this.getFullName(), (new MethodFormatter()).add(value),
- this.msg.get());
+ this.msg);
boolean v = getValue().equals(elementMask(value));
accessor.getLogger().methodEnded(accessor);
return v;
@@ -119,7 +119,7 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element { public boolean checkNotNT(ITestAccessor accessor, CheckGroup checkGroup, T value) {
accessor.getLogger().methodCalledOnObject(accessor, this.getFullName(), (new MethodFormatter()).add(value),
- this.msg.get());
+ this.msg);
boolean v = !getValue().equals(elementMask(value));
accessor.getLogger().methodEnded(accessor);
return v;
@@ -162,7 +162,7 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element { public boolean checkRange(ITestAccessor accessor, CheckGroup checkGroup, T minValue, boolean minInclusive, T maxValue, boolean maxInclusive) {
checkAccessor(accessor);
accessor.getLogger().methodCalledOnObject(accessor, this.getFullName(),
- (new MethodFormatter()).add(minValue).add(minInclusive).add(maxValue).add(maxInclusive), this.msg.get());
+ (new MethodFormatter()).add(minValue).add(minInclusive).add(maxValue).add(maxInclusive), this.msg);
InRangeCondition<T> c = new InRangeCondition<T>(this, minValue, minInclusive, maxValue, maxInclusive);
@@ -182,7 +182,7 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element { public boolean checkRangeNT(ITestAccessor accessor, T minValue, boolean minInclusive, T maxValue, boolean maxInclusive) {
checkAccessor(accessor);
accessor.getLogger().methodCalledOnObject(accessor, this.getFullName(),
- (new MethodFormatter()).add(minValue).add(minInclusive).add(maxValue).add(maxInclusive), this.msg.get());
+ (new MethodFormatter()).add(minValue).add(minInclusive).add(maxValue).add(maxInclusive), this.msg);
InRangeCondition<T> c = new InRangeCondition<T>(this, minValue, minInclusive, maxValue, maxInclusive);
boolean pass = c.check();
accessor.getLogger().methodEnded(accessor);
@@ -192,9 +192,9 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element { public boolean checkRangeNT(ITestAccessor accessor, T minValue, boolean minInclusive, T maxValue, boolean maxInclusive, int millis) throws InterruptedException {
checkAccessor(accessor);
accessor.getLogger().methodCalledOnObject(accessor, this.getFullName(),
- (new MethodFormatter()).add(minValue).add(minInclusive).add(maxValue).add(maxInclusive), this.msg.get());
+ (new MethodFormatter()).add(minValue).add(minInclusive).add(maxValue).add(maxInclusive), this.msg);
InRangeCondition<T> c = new InRangeCondition<T>(this, minValue, minInclusive, maxValue, maxInclusive);
- MsgWaitResult result = msg.get().waitForCondition(accessor, c, false, millis);
+ MsgWaitResult result = msg.waitForCondition(accessor, c, false, millis);
accessor.getLogger().methodEnded(accessor);
return result.isPassed();
}
@@ -234,7 +234,7 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element { public boolean checkNot(ITestAccessor accessor, CheckGroup checkGroup, T value) {
if (accessor != null) {
accessor.getLogger().methodCalledOnObject(accessor, this.getFullName(), (new MethodFormatter()).add(value),
- this.msg.get());
+ this.msg);
}
T actualValue = getValue();
@@ -399,10 +399,10 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element { public T waitForValue(ITestEnvironmentAccessor accessor, T value, int milliseconds) throws InterruptedException {
if (accessor != null) {
accessor.getLogger().methodCalledOnObject(accessor, this.getFullName(),
- (new MethodFormatter()).add(value).add(milliseconds), this.msg.get());
+ (new MethodFormatter()).add(value).add(milliseconds), this.msg);
}
EqualsCondition<T> c = new EqualsCondition<T>(this, value);
- msg.get().waitForCondition(accessor, c, false, milliseconds);
+ msg.waitForCondition(accessor, c, false, milliseconds);
if (accessor != null) {
accessor.getLogger().methodEnded(accessor);
}
@@ -421,10 +421,10 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element { public T waitForNotValue(ITestEnvironmentAccessor accessor, T value, int milliseconds) throws InterruptedException {
if (accessor != null) {
accessor.getLogger().methodCalledOnObject(accessor, this.getFullName(),
- (new MethodFormatter()).add(value).add(milliseconds), this.msg.get());
+ (new MethodFormatter()).add(value).add(milliseconds), this.msg);
}
EqualsCondition<T> c = new EqualsCondition<T>(this, true, value);
- msg.get().waitForCondition(accessor, c, false, milliseconds);
+ msg.waitForCondition(accessor, c, false, milliseconds);
if (accessor != null) {
accessor.getLogger().methodEnded(accessor);
}
@@ -449,10 +449,10 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element { accessor,
this.getFullName(),
(new MethodFormatter()).add(minValue).add(minInclusive).add(maxValue).add(maxInclusive).add(milliseconds),
- this.msg.get());
+ this.msg);
}
InRangeCondition<T> c = new InRangeCondition<T>(this, minValue, minInclusive, maxValue, maxInclusive);
- msg.get().waitForCondition(accessor, c, false, milliseconds);
+ msg.waitForCondition(accessor, c, false, milliseconds);
if (accessor != null) {
accessor.getLogger().methodEnded(accessor);
}
@@ -493,11 +493,11 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element { accessor,
this.getFullName(),
(new MethodFormatter()).add(minValue).add(minInclusive).add(maxValue).add(maxInclusive).add(milliseconds),
- this.msg.get());
+ this.msg);
}
NotInRangeCondition<T> c = new NotInRangeCondition<T>(this, minValue, minInclusive, maxValue, maxInclusive);
- msg.get().waitForCondition(accessor, c, false, milliseconds);
+ msg.waitForCondition(accessor, c, false, milliseconds);
if (accessor != null) {
accessor.getLogger().methodEnded(accessor);
@@ -551,7 +551,7 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element { checkAccessor(accessor);
accessor.getLogger().methodCalledOnObject(accessor, getFullName(),
- (new MethodFormatter()).add(value).add(milliseconds), msg.get());
+ (new MethodFormatter()).add(value).add(milliseconds), msg);
EqualsCondition<T> c = new EqualsCondition<T>(this, value);
@@ -583,7 +583,7 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element { checkAccessor(accessor);
accessor.getLogger().methodCalledOnObject(accessor, getFullName(),
(new MethodFormatter()).add(minValue).add(minInclusive).add(maxValue).add(maxInclusive).add(milliseconds),
- this.msg.get());
+ this.msg);
InRangeCondition<T> c = new InRangeCondition<T>(this, minValue, minInclusive, maxValue, maxInclusive);
CheckPoint cp =
@@ -693,7 +693,7 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element { public boolean checkNot(ITestAccessor accessor, CheckGroup checkGroup, T value, int milliseconds) throws InterruptedException {
checkAccessor(accessor);
accessor.getLogger().methodCalledOnObject(accessor, getFullName(),
- (new MethodFormatter()).add(value).add(milliseconds), this.msg.get());
+ (new MethodFormatter()).add(value).add(milliseconds), this.msg);
CheckPoint cp =
waitWithCheckPoint(accessor, checkGroup, "Not " + toString(value),
new EqualsCondition<T>(this, true, value), false, milliseconds);
@@ -727,7 +727,7 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element { }
protected CheckPoint waitWithCheckPoint(ITestAccessor accessor, CheckGroup checkGroup, String expected, IDiscreteElementCondition<T> condition, boolean maintain, int milliseconds) throws InterruptedException {
- MsgWaitResult result = msg.get().waitForCondition(accessor, condition, maintain, milliseconds);
+ MsgWaitResult result = msg.waitForCondition(accessor, condition, maintain, milliseconds);
CheckPoint passFail =
new CheckPoint(getFullName(), expected, toString(condition.getLastCheckValue()), result.isPassed(),
result.getXmitCount(), result.getElapsedTime());
@@ -763,7 +763,7 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element { checkAccessor(accessor);
accessor.getLogger().methodCalledOnObject(accessor, getFullName(),
(new MethodFormatter()).add(minValue).add(minInclusive).add(maxValue).add(maxInclusive).add(milliseconds),
- this.msg.get());
+ this.msg);
CheckPoint cp =
waitWithCheckPoint(accessor, checkGroup, "Not In " + expectedRangeString(toString(minValue), minInclusive,
toString(maxValue), maxInclusive), new NotInRangeCondition<T>(this, minValue, minInclusive, maxValue,
@@ -776,9 +776,9 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element { checkAccessor(accessor);
accessor.getLogger().methodCalledOnObject(accessor, getFullName(),
(new MethodFormatter()).add(minValue).add(minInclusive).add(maxValue).add(maxInclusive).add(milliseconds),
- this.msg.get());
+ this.msg);
MsgWaitResult cp =
- msg.get().waitForCondition(accessor,
+ msg.waitForCondition(accessor,
new NotInRangeCondition<T>(this, minValue, minInclusive, maxValue, maxInclusive), false, milliseconds);
accessor.getLogger().methodEnded(accessor);
return cp.isPassed();
@@ -888,7 +888,7 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element { public T checkMaintain(ITestAccessor accessor, CheckGroup checkGroup, T value, int milliseconds) throws InterruptedException {
checkAccessor(accessor);
accessor.getLogger().methodCalledOnObject(accessor, getFullName(),
- (new MethodFormatter()).add(value).add(milliseconds), this.msg.get());
+ (new MethodFormatter()).add(value).add(milliseconds), this.msg);
EqualsCondition<T> c = new EqualsCondition<T>(this, value);
waitWithCheckPoint(accessor, checkGroup, toString(value), c, true, milliseconds);
accessor.getLogger().methodEnded(accessor);
@@ -898,9 +898,9 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element { public T checkMaintainNT(ITestAccessor accessor, T value, int milliseconds) throws InterruptedException {
checkAccessor(accessor);
accessor.getLogger().methodCalledOnObject(accessor, getFullName(),
- (new MethodFormatter()).add(value).add(milliseconds), this.msg.get());
+ (new MethodFormatter()).add(value).add(milliseconds), this.msg);
EqualsCondition<T> c = new EqualsCondition<T>(this, value);
- msg.get().waitForCondition(accessor, c, true, milliseconds);
+ msg.waitForCondition(accessor, c, true, milliseconds);
accessor.getLogger().methodEnded(accessor);
return c.getLastCheckValue();
}
@@ -908,9 +908,9 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element { public T checkMaintainNotNT(ITestAccessor accessor, T value, int milliseconds) throws InterruptedException {
checkAccessor(accessor);
accessor.getLogger().methodCalledOnObject(accessor, getFullName(),
- (new MethodFormatter()).add(value).add(milliseconds), this.msg.get());
+ (new MethodFormatter()).add(value).add(milliseconds), this.msg);
EqualsCondition<T> c = new EqualsCondition<T>(this, true, value);
- msg.get().waitForCondition(accessor, c, true, milliseconds);
+ msg.waitForCondition(accessor, c, true, milliseconds);
accessor.getLogger().methodEnded(accessor);
return c.getLastCheckValue();
}
@@ -948,7 +948,7 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element { public T checkMaintainNot(ITestAccessor accessor, CheckGroup checkGroup, T value, int milliseconds) throws InterruptedException {
checkAccessor(accessor);
accessor.getLogger().methodCalledOnObject(accessor, getFullName(),
- (new MethodFormatter()).add(value).add(milliseconds), this.msg.get());
+ (new MethodFormatter()).add(value).add(milliseconds), this.msg);
EqualsCondition<T> c = new EqualsCondition<T>(this, true, value);
waitWithCheckPoint(accessor, checkGroup,
@@ -994,7 +994,7 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element { checkAccessor(accessor);
accessor.getLogger().methodCalledOnObject(accessor, getFullName(),
(new MethodFormatter()).add(minValue).add(minInclusive).add(maxValue).add(maxInclusive).add(milliseconds),
- this.msg.get());
+ this.msg);
InRangeCondition<T> c = new InRangeCondition<T>(this, minValue, minInclusive, maxValue, maxInclusive);
waitWithCheckPoint(accessor, checkGroup, "In" + expectedRangeString(toString(minValue), minInclusive,
@@ -1007,9 +1007,9 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element { checkAccessor(accessor);
accessor.getLogger().methodCalledOnObject(accessor, getFullName(),
(new MethodFormatter()).add(minValue).add(minInclusive).add(maxValue).add(maxInclusive).add(milliseconds),
- this.msg.get());
+ this.msg);
InRangeCondition<T> c = new InRangeCondition<T>(this, minValue, minInclusive, maxValue, maxInclusive);
- msg.get().waitForCondition(accessor, c, true, milliseconds);
+ msg.waitForCondition(accessor, c, true, milliseconds);
accessor.getLogger().methodEnded(accessor);
return c.getLastCheckValue();
}
@@ -1038,7 +1038,7 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element { checkAccessor(accessor);
accessor.getLogger().methodCalledOnObject(accessor, getFullName(),
(new MethodFormatter()).add(minValue).add(minInclusive).add(maxValue).add(maxInclusive).add(milliseconds),
- this.msg.get());
+ this.msg);
NotInRangeCondition<T> c = new NotInRangeCondition<T>(this, minValue, minInclusive, maxValue, maxInclusive);
waitWithCheckPoint(accessor, checkGroup, "Not In" + expectedRangeString(toString(minValue), minInclusive,
@@ -1051,10 +1051,10 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element { checkAccessor(accessor);
accessor.getLogger().methodCalledOnObject(accessor, getFullName(),
(new MethodFormatter()).add(minValue).add(minInclusive).add(maxValue).add(maxInclusive).add(milliseconds),
- this.msg.get());
+ this.msg);
NotInRangeCondition<T> c = new NotInRangeCondition<T>(this, minValue, minInclusive, maxValue, maxInclusive);
- msg.get().waitForCondition(accessor, c, true, milliseconds);
+ msg.waitForCondition(accessor, c, true, milliseconds);
accessor.getLogger().methodEnded(accessor);
return c.getLastCheckValue();
}
@@ -1086,10 +1086,10 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element { }
accessor.getLogger().methodCalledOnObject(accessor, getFullName(),
- (new MethodFormatter()).add(pulsedValue).add(nonPulsedValue).add(milliseconds), this.msg.get());
+ (new MethodFormatter()).add(pulsedValue).add(nonPulsedValue).add(milliseconds), this.msg);
final PulseCondition<T> c = new PulseCondition<T>(this, pulsedValue, nonPulsedValue);
- MsgWaitResult result = msg.get().waitForCondition(accessor, c, false, milliseconds);
+ MsgWaitResult result = msg.waitForCondition(accessor, c, false, milliseconds);
CheckPoint passFail =
new CheckPoint(getFullName(), toString(pulsedValue) + FOR_2_PULSES,
toString(c.getLastCheckValue()) + " FOR " + c.getPulses() + " PULSES", result.isPassed(),
@@ -1187,9 +1187,9 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element { throw new NullPointerException("The parameter accessor is null");
}
accessor.getLogger().methodCalledOnObject(accessor, getFullName(),
- (new MethodFormatter()).add(isInList).add(list).add(milliseconds), this.msg.get());
+ (new MethodFormatter()).add(isInList).add(list).add(milliseconds), this.msg);
- MsgWaitResult result = msg.get().waitForCondition(accessor, c, false, milliseconds);
+ MsgWaitResult result = msg.waitForCondition(accessor, c, false, milliseconds);
CheckGroup passFail = inList(accessor, isInList, c.getLastCheckValue(), list, result.getElapsedTime());
assert result.isPassed() == passFail.isPass() : "result does not match checkgroup";
if (checkGroup == null)
@@ -1413,7 +1413,7 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element { (new MethodFormatter()).add(list).add(isInList).add(milliseconds), this.getMessage());
ListCondition<T> c = new ListCondition<T>(this, isInList, list);
- msg.get().waitForCondition(accessor, c, false, milliseconds);
+ msg.waitForCondition(accessor, c, false, milliseconds);
accessor.getLogger().methodEnded(accessor);
return c.getLastCheckValue();
}
@@ -1424,7 +1424,7 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element { ListCondition<T> c = new ListCondition<T>(this, isInList, list);
- MsgWaitResult result = msg.get().waitForCondition(accessor, c, true, milliseconds);
+ MsgWaitResult result = msg.waitForCondition(accessor, c, true, milliseconds);
T value = c.getLastCheckValue();
@@ -1490,7 +1490,7 @@ public abstract class DiscreteElement<T extends Comparable<T>> extends Element { */
public synchronized void toggle(ITestEnvironmentAccessor accessor, T value1, T value2, int milliseconds) throws InterruptedException {
accessor.getLogger().methodCalledOnObject(accessor, this.getFullName(),
- new MethodFormatter().add(value1).add(value2).add(milliseconds), this.msg.get());
+ new MethodFormatter().add(value1).add(value2).add(milliseconds), this.msg);
set(accessor, value1);
accessor.setTimerFor(this, milliseconds);
diff --git a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/Element.java b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/Element.java index 5b983473d4b..de417debe07 100644 --- a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/Element.java +++ b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/Element.java @@ -10,54 +10,51 @@ *******************************************************************************/ package org.eclipse.osee.ote.message.elements;
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.logging.Level;
-import org.eclipse.osee.ote.core.environment.interfaces.ITimeout;
-import org.eclipse.osee.ote.message.Message;
-import org.eclipse.osee.ote.message.MessageSystemException;
-import org.eclipse.osee.ote.message.data.MessageData;
-import org.eclipse.osee.ote.message.enums.MemType;
+import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.logging.Level; + +import org.eclipse.osee.ote.core.environment.interfaces.ITimeout; +import org.eclipse.osee.ote.message.Message; +import org.eclipse.osee.ote.message.MessageSystemException; +import org.eclipse.osee.ote.message.data.MessageData; +import org.eclipse.osee.ote.message.enums.MemType; /**
* @author Ryan D. Brooks
* @author Andrew M. Finkbeiner
*/
public abstract class Element implements ITimeout {
- protected WeakReference<Message<?,?,?>> msg;
+ protected final Message<?,?,?> msg;
protected String elementName;
private volatile boolean timedOut;
- private List<Object> elementPath;
- private String fullName;
+ private final List<Object> elementPath;
+ private final String fullName;
- protected int byteOffset;
+ protected final int byteOffset;
protected int lsb;
- protected WeakReference<MessageData> messageData;
+ protected final MessageData messageData;
protected int msb;
- protected int originalMsb;
- protected int originalLsb;
+ protected final int originalMsb;
+ 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) {
- this.msg = new WeakReference<Message<?,?,?>>(msg);
+ this.msg = msg;
this.elementName = elementName;
- this.messageData = new WeakReference<MessageData>(messageData);
+ this.messageData = messageData;
this.byteOffset = byteOffset;
this.lsb = lsb;
this.msb = msb;
this.originalLsb = originalLsb;
this.originalMsb = originalMsb;
- // if (msg!=null)
- // msg.addElement(this);
elementPath = new ArrayList<Object>();
fullName = (msg != null ? msg.getName() : messageData.getName()) + "." + this.elementName;
}
public Element(Message<?,?,?> msg, String elementName, MessageData messageData, int bitOffset, int bitLength) {
- this(msg, elementName, messageData, 0, 0, 0, 0, 0);
- this.byteOffset = bitOffset / 8;
+ this(msg, elementName, messageData, bitOffset / 8, 0, 0, 0, 0);
this.msb = bitOffset % 8;
this.lsb = msb + (bitLength - 1);
}
@@ -79,7 +76,7 @@ public abstract class Element implements ITimeout { }
public MessageData getMsgData() {
- return messageData.get();
+ return messageData;
}
public int getBitLength() {
@@ -115,7 +112,7 @@ public abstract class Element implements ITimeout { * @return Returns the msg.
*/
public Message<?,?,?> getMessage() {
- return msg.get();
+ return msg;
}
public String getElementName() {
@@ -131,7 +128,7 @@ public abstract class Element implements ITimeout { }
public MemType getType() {
- return messageData.get().getType();
+ return messageData.getType();
}
/**
@@ -242,7 +239,7 @@ public abstract class Element implements ITimeout { protected abstract Element getNonMappingElement();
protected void throwNoMappingElementException() {
- throw new MessageSystemException("The element " + msg.get().getName() + "." + elementName + " does not exist for the message's current MemType!! "
+ throw new MessageSystemException("The element " + msg.getName() + "." + elementName + " does not exist for the message's current MemType!! "
+ "\nIt shouldn't be used for this environment type!!", Level.SEVERE);
}
diff --git a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/IntegerElement.java b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/IntegerElement.java index 2e6e9989b89..76146167872 100644 --- a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/IntegerElement.java +++ b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/IntegerElement.java @@ -10,14 +10,15 @@ *******************************************************************************/ 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.message.Message;
-import org.eclipse.osee.ote.message.data.HeaderData;
-import org.eclipse.osee.ote.message.data.MemoryResource;
-import org.eclipse.osee.ote.message.data.MessageData;
-import org.eclipse.osee.ote.message.elements.nonmapping.NonMappingIntegerElement;
-import org.eclipse.osee.ote.message.interfaces.ITestAccessor;
+import java.util.Collection; + +import org.eclipse.osee.ote.core.environment.interfaces.ITestEnvironmentAccessor; +import org.eclipse.osee.ote.message.Message; +import org.eclipse.osee.ote.message.data.HeaderData; +import org.eclipse.osee.ote.message.data.MemoryResource; +import org.eclipse.osee.ote.message.data.MessageData; +import org.eclipse.osee.ote.message.elements.nonmapping.NonMappingIntegerElement; +import org.eclipse.osee.ote.message.interfaces.ITestAccessor; /**
* @author Ryan D. Brooks
@@ -60,12 +61,12 @@ public class IntegerElement extends NumericElement<Integer> { @Override
public Integer getValue() {
- return new Integer(getMsgData().getMem().getInt(byteOffset, msb, lsb));
+ return Integer.valueOf(getMsgData().getMem().getInt(byteOffset, msb, lsb));
}
@Override
public Integer valueOf(MemoryResource mem) {
- return new Integer(mem.getInt(byteOffset, msb, lsb));
+ return Integer.valueOf(mem.getInt(byteOffset, msb, lsb));
}
/**
@@ -176,7 +177,7 @@ public class IntegerElement extends NumericElement<Integer> { * @throws InterruptedException
*/
public int waitForRange(ITestEnvironmentAccessor accessor, int minValue, boolean minInclusive, int maxValue, boolean maxInclusive, int milliseconds) throws InterruptedException {
- return (Integer) super.waitForRange(accessor, new Integer(minValue), minInclusive, new Integer(maxValue),
+ return (Integer) super.waitForRange(accessor, Integer.valueOf(minValue), minInclusive, Integer.valueOf(maxValue),
maxInclusive, milliseconds);
}
@@ -209,7 +210,7 @@ public class IntegerElement extends NumericElement<Integer> { * @throws InterruptedException
*/
public int waitForNotRange(ITestEnvironmentAccessor accessor, int minValue, boolean minInclusive, int maxValue, boolean maxInclusive, int milliseconds) throws InterruptedException {
- return (Integer) super.waitForNotRange(accessor, new Integer(minValue), minInclusive, new Integer(maxValue),
+ return (Integer) super.waitForNotRange(accessor, Integer.valueOf(minValue), minInclusive, Integer.valueOf(maxValue),
maxInclusive, milliseconds);
}
diff --git a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/LongIntegerElement.java b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/LongIntegerElement.java index 98c778a0fd5..12190178f24 100644 --- a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/LongIntegerElement.java +++ b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/LongIntegerElement.java @@ -10,14 +10,15 @@ *******************************************************************************/ 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;
-import org.eclipse.osee.ote.message.data.MemoryResource;
-import org.eclipse.osee.ote.message.data.MessageData;
-import org.eclipse.osee.ote.message.elements.nonmapping.NonMappingLongIntegerElement;
-import org.eclipse.osee.ote.message.interfaces.ITestAccessor;
+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; +import org.eclipse.osee.ote.message.data.MemoryResource; +import org.eclipse.osee.ote.message.data.MessageData; +import org.eclipse.osee.ote.message.elements.nonmapping.NonMappingLongIntegerElement; +import org.eclipse.osee.ote.message.interfaces.ITestAccessor; /**
* @author Ryan D. Brooks
@@ -60,12 +61,12 @@ public class LongIntegerElement extends NumericElement<Long> { @Override
public Long getValue() {
- return new Long(getMsgData().getMem().getLong(byteOffset, msb, lsb));
+ return Long.valueOf(getMsgData().getMem().getLong(byteOffset, msb, lsb));
}
@Override
public Long valueOf(MemoryResource mem) {
- return new Long(mem.getLong(byteOffset, msb, lsb));
+ return Long.valueOf(mem.getLong(byteOffset, msb, lsb));
}
/**
diff --git a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/RecordMap.java b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/RecordMap.java index f6f63c37fc0..2a45d07627a 100644 --- a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/RecordMap.java +++ b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/RecordMap.java @@ -10,10 +10,11 @@ *******************************************************************************/ package org.eclipse.osee.ote.message.elements;
-import java.util.Collection;
-import java.util.HashMap;
-import org.eclipse.osee.ote.message.Message;
-import org.eclipse.osee.ote.message.data.MessageData;
+import java.util.Collection; +import java.util.HashMap; + +import org.eclipse.osee.ote.message.Message; +import org.eclipse.osee.ote.message.data.MessageData; /**
* @author Ryan D. Brooks
@@ -23,14 +24,12 @@ public class RecordMap<T extends RecordElement> extends RecordElement{ private final int NUMBER_OF_RECORDS;
- MessageData messageData;
- private HashMap<Integer, T> records;
+ private final HashMap<Integer, T> records;
private IRecordFactory factory;
public RecordMap(Message<?,?,?> message, MessageData messageData, String elementName, int numberOfRecords, IRecordFactory factory) {
super(message, elementName, 1, messageData, 0, factory.getBitLength());
- this.messageData = messageData;
NUMBER_OF_RECORDS = numberOfRecords;
records = new HashMap<Integer, T>(numberOfRecords);
this.factory = factory;
@@ -39,7 +38,6 @@ public class RecordMap<T extends RecordElement> extends RecordElement{ public RecordMap(Message<?,?,?> message, MessageData messageData, int firstRecordByteOffset, int recordByteSize,
int numberOfRecords) {
super(message, "", 1, messageData, 0, 0);
- this.messageData = messageData;
NUMBER_OF_RECORDS = numberOfRecords;
records = new HashMap<Integer, T>(numberOfRecords);
}
diff --git a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/SignedInteger16Element.java b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/SignedInteger16Element.java index 07470662db1..951848a21f4 100644 --- a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/SignedInteger16Element.java +++ b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/SignedInteger16Element.java @@ -10,13 +10,14 @@ *******************************************************************************/ 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.message.Message;
-import org.eclipse.osee.ote.message.data.MemoryResource;
-import org.eclipse.osee.ote.message.data.MessageData;
-import org.eclipse.osee.ote.message.elements.nonmapping.NonMappingSignedInteger16Element;
-import org.eclipse.osee.ote.message.interfaces.ITestAccessor;
+import java.util.Collection; + +import org.eclipse.osee.ote.core.environment.interfaces.ITestEnvironmentAccessor; +import org.eclipse.osee.ote.message.Message; +import org.eclipse.osee.ote.message.data.MemoryResource; +import org.eclipse.osee.ote.message.data.MessageData; +import org.eclipse.osee.ote.message.elements.nonmapping.NonMappingSignedInteger16Element; +import org.eclipse.osee.ote.message.interfaces.ITestAccessor; /**
* @author Ryan D. Brooks
@@ -58,12 +59,12 @@ public class SignedInteger16Element extends NumericElement<Integer> { @Override
public Integer getValue() {
- return new Integer(getMsgData().getMem().getSignedInt16(byteOffset, msb, lsb));
+ return Integer.valueOf(getMsgData().getMem().getSignedInt16(byteOffset, msb, lsb));
}
@Override
public Integer valueOf(MemoryResource mem) {
- return new Integer(mem.getSignedInt16(byteOffset, msb, lsb));
+ return Integer.valueOf(mem.getSignedInt16(byteOffset, msb, lsb));
}
/**
@@ -150,7 +151,7 @@ public class SignedInteger16Element extends NumericElement<Integer> { * @throws InterruptedException
*/
public int waitForRange(ITestEnvironmentAccessor accessor, int minValue, boolean minInclusive, int maxValue, boolean maxInclusive, int milliseconds) throws InterruptedException {
- return super.waitForRange(accessor, new Integer(minValue), minInclusive, new Integer(maxValue), maxInclusive,
+ return super.waitForRange(accessor, Integer.valueOf(minValue), minInclusive, Integer.valueOf(maxValue), maxInclusive,
milliseconds);
}
@@ -183,7 +184,7 @@ public class SignedInteger16Element extends NumericElement<Integer> { * @throws InterruptedException
*/
public int waitForNotRange(ITestEnvironmentAccessor accessor, int minValue, boolean minInclusive, int maxValue, boolean maxInclusive, int milliseconds) throws InterruptedException {
- return (Integer) super.waitForNotRange(accessor, new Integer(minValue), minInclusive, new Integer(maxValue),
+ return (Integer) super.waitForNotRange(accessor, Integer.valueOf(minValue), minInclusive, Integer.valueOf(maxValue),
maxInclusive, milliseconds);
}
diff --git a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/StringElement.java b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/StringElement.java index 8c9da4b26ab..ab0f725e0a2 100644 --- a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/StringElement.java +++ b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/StringElement.java @@ -11,6 +11,7 @@ package org.eclipse.osee.ote.message.elements;
import java.util.Collection; + import org.eclipse.osee.ote.core.MethodFormatter; import org.eclipse.osee.ote.core.environment.interfaces.ITestEnvironmentAccessor; import org.eclipse.osee.ote.core.testPoint.CheckPoint; @@ -111,10 +112,10 @@ public class StringElement extends DiscreteElement<String> { }
accessor.getLogger().methodCalledOnObject(accessor, getFullName(),
- (new MethodFormatter()).add(value).add(milliseconds), this.msg.get());
+ (new MethodFormatter()).add(value).add(milliseconds), this.msg);
final StringTrimCondition c = new StringTrimCondition(this, value);
- MsgWaitResult result = msg.get().waitForCondition(accessor, c, false, milliseconds);
+ MsgWaitResult result = msg.waitForCondition(accessor, c, false, milliseconds);
CheckPoint passFail =
new CheckPoint(getFullName(), toString(value), toString(c.getLastCheckValue()), result.isPassed(),
result.getElapsedTime());
@@ -157,10 +158,10 @@ public class StringElement extends DiscreteElement<String> { }
accessor.getLogger().methodCalledOnObject(accessor, getFullName(), (new MethodFormatter()).add(milliseconds),
- this.msg.get());
+ this.msg);
final EmptyStringCondition c = new EmptyStringCondition(this);
- MsgWaitResult result = msg.get().waitForCondition(accessor, c, false, milliseconds);
+ MsgWaitResult result = msg.waitForCondition(accessor, c, false, milliseconds);
CheckPoint passFail =
new CheckPoint(getFullName(), "Empty", result.isPassed() ? "Empty" : "Not Empty", result.isPassed(),
result.getElapsedTime());
@@ -177,10 +178,10 @@ public class StringElement extends DiscreteElement<String> { }
accessor.getLogger().methodCalledOnObject(accessor, getFullName(), (new MethodFormatter()).add(milliseconds),
- this.msg.get());
+ this.msg);
final EmptyStringCondition c = new EmptyStringCondition(this);
- MsgWaitResult result = msg.get().waitForCondition(accessor, c, true, milliseconds);
+ MsgWaitResult result = msg.waitForCondition(accessor, c, true, milliseconds);
CheckPoint passFail =
new CheckPoint(getFullName(), "Empty", result.isPassed() ? "Empty" : "Not Empty", result.isPassed(),
result.getElapsedTime());
diff --git a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingCharElement.java b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingCharElement.java index d130f23c26a..4f447eff756 100644 --- a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingCharElement.java +++ b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingCharElement.java @@ -10,7 +10,6 @@ *******************************************************************************/
package org.eclipse.osee.ote.message.elements.nonmapping;
-import java.lang.ref.WeakReference;
import org.eclipse.osee.ote.core.environment.interfaces.ITestEnvironmentAccessor;
import org.eclipse.osee.ote.core.testPoint.CheckGroup;
import org.eclipse.osee.ote.message.Message;
@@ -24,10 +23,8 @@ import org.eclipse.osee.ote.message.interfaces.ITestAccessor; public class NonMappingCharElement extends CharElement {
public NonMappingCharElement(CharElement element) {
- super(null, element.getElementName(), element.getMsgData(), element.getByteOffset(), element.getMsb(),
+ super(element.getMessage(), element.getElementName(), element.getMsgData(), element.getByteOffset(), element.getMsb(),
element.getLsb());
- // This is being done so it doesn't get added to the element list hash map.
- this.msg = new WeakReference<Message<?, ?, ?>>(element.getMessage());
for (Object obj : element.getElementPath()) {
this.getElementPath().add(obj);
}
diff --git a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingEmptyEnumElement.java b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingEmptyEnumElement.java index 5476aa1945a..7fa45efc708 100644 --- a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingEmptyEnumElement.java +++ b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingEmptyEnumElement.java @@ -10,8 +10,6 @@ *******************************************************************************/ package org.eclipse.osee.ote.message.elements.nonmapping; -import java.lang.ref.WeakReference; - import org.eclipse.osee.ote.core.environment.interfaces.ITestEnvironmentAccessor; import org.eclipse.osee.ote.core.testPoint.CheckGroup; import org.eclipse.osee.ote.core.testPoint.CheckPoint; @@ -34,11 +32,8 @@ public class NonMappingEmptyEnumElement extends EmptyEnum_Element { * @param element */ public NonMappingEmptyEnumElement(EmptyEnum_Element element) { - super(null, element.getElementName(), element.getMsgData(), element + super(element.getMessage(), element.getElementName(), element.getMsgData(), element .getByteOffset(), element.getMsb(), element.getLsb()); - // This is being done so it doesn't get added to the element list hash - // map. - this.msg = new WeakReference<Message<?, ?, ?>>(element.getMessage()); for (Object obj : element.getElementPath()) { this.getElementPath().add(obj); } diff --git a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingEnumeratedElement.java b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingEnumeratedElement.java index fed691c268d..e8c3da97f17 100644 --- a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingEnumeratedElement.java +++ b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingEnumeratedElement.java @@ -10,15 +10,14 @@ *******************************************************************************/ package org.eclipse.osee.ote.message.elements.nonmapping;
-import java.lang.ref.WeakReference;
-import org.eclipse.osee.ote.core.environment.interfaces.ITestEnvironmentAccessor;
-import org.eclipse.osee.ote.core.testPoint.CheckGroup;
-import org.eclipse.osee.ote.message.Message;
-import org.eclipse.osee.ote.message.data.MemoryResource;
-import org.eclipse.osee.ote.message.data.MessageData;
-import org.eclipse.osee.ote.message.elements.EnumeratedElement;
-import org.eclipse.osee.ote.message.elements.IEnumValue;
-import org.eclipse.osee.ote.message.interfaces.ITestAccessor;
+import org.eclipse.osee.ote.core.environment.interfaces.ITestEnvironmentAccessor; +import org.eclipse.osee.ote.core.testPoint.CheckGroup; +import org.eclipse.osee.ote.message.Message; +import org.eclipse.osee.ote.message.data.MemoryResource; +import org.eclipse.osee.ote.message.data.MessageData; +import org.eclipse.osee.ote.message.elements.EnumeratedElement; +import org.eclipse.osee.ote.message.elements.IEnumValue; +import org.eclipse.osee.ote.message.interfaces.ITestAccessor; /**
* @author Andy Jury
@@ -26,10 +25,9 @@ import org.eclipse.osee.ote.message.interfaces.ITestAccessor; public class NonMappingEnumeratedElement<T extends Enum<T> & IEnumValue<T>> extends EnumeratedElement<T> {
public NonMappingEnumeratedElement(EnumeratedElement<T> element) {
- this(null, element.getElementName(), element.getEnumClass(), element.getMsgData(), element.getByteOffset(),
+ this(element.getMessage(), element.getElementName(), element.getEnumClass(), element.getMsgData(), element.getByteOffset(),
element.getMsb(), element.getLsb());
- // This is being done so it doesn't get added to the element list hash map.
- this.msg = new WeakReference<Message<?, ?, ?>>(element.getMessage());
+
for (Object obj : element.getElementPath()) {
this.getElementPath().add(obj);
}
diff --git a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingFixedPointElement.java b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingFixedPointElement.java index 4820f653869..a0059294617 100644 --- a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingFixedPointElement.java +++ b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingFixedPointElement.java @@ -10,12 +10,10 @@ *******************************************************************************/ package org.eclipse.osee.ote.message.elements.nonmapping;
-import java.lang.ref.WeakReference;
-
-import org.eclipse.osee.ote.message.Message;
-import org.eclipse.osee.ote.message.data.MessageData;
-import org.eclipse.osee.ote.message.elements.FixedPointElement;
-import org.eclipse.osee.ote.message.interfaces.ITestAccessor;
+import org.eclipse.osee.ote.message.Message; +import org.eclipse.osee.ote.message.data.MessageData; +import org.eclipse.osee.ote.message.elements.FixedPointElement; +import org.eclipse.osee.ote.message.interfaces.ITestAccessor; /**
* @author Andy Jury
@@ -28,10 +26,8 @@ public class NonMappingFixedPointElement extends FixedPointElement { * @param element
*/
public NonMappingFixedPointElement(FixedPointElement element) {
- super(null, element.getElementName(), element.getMsgData(),
+ super(element.getMessage(), element.getElementName(), element.getMsgData(),
0, false, element.getByteOffset(), element.getMsb(), element.getLsb());
- // This is being done so it doesn't get added to the element list hash map.
- this.msg = new WeakReference<Message<?,?,?>>(element.getMessage());
for(Object obj:element.getElementPath()){
this.getElementPath().add(obj);
}
diff --git a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingFloat32Element.java b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingFloat32Element.java index 1d6ed27556a..8ca7d3ce0e0 100644 --- a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingFloat32Element.java +++ b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingFloat32Element.java @@ -10,12 +10,10 @@ *******************************************************************************/ package org.eclipse.osee.ote.message.elements.nonmapping;
-import java.lang.ref.WeakReference;
-
-import org.eclipse.osee.ote.message.Message;
-import org.eclipse.osee.ote.message.data.MessageData;
-import org.eclipse.osee.ote.message.elements.Float32Element;
-import org.eclipse.osee.ote.message.interfaces.ITestAccessor;
+import org.eclipse.osee.ote.message.Message; +import org.eclipse.osee.ote.message.data.MessageData; +import org.eclipse.osee.ote.message.elements.Float32Element; +import org.eclipse.osee.ote.message.interfaces.ITestAccessor; /**
* @author Andy Jury
@@ -28,10 +26,8 @@ public class NonMappingFloat32Element extends Float32Element { * @param element
*/
public NonMappingFloat32Element(Float32Element element) {
- super(null, element.getElementName(), element.getMsgData(),
+ super(element.getMessage(), element.getElementName(), element.getMsgData(),
element.getByteOffset(), element.getMsb(), element.getLsb());
- // This is being done so it doesn't get added to the element list hash map.
- this.msg = new WeakReference<Message<?,?,?>>(element.getMessage());
for(Object obj:element.getElementPath()){
this.getElementPath().add(obj);
}
diff --git a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingFloat64Element.java b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingFloat64Element.java index d66f3880087..6b98a61c068 100644 --- a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingFloat64Element.java +++ b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingFloat64Element.java @@ -10,12 +10,10 @@ *******************************************************************************/ package org.eclipse.osee.ote.message.elements.nonmapping;
-import java.lang.ref.WeakReference;
-
-import org.eclipse.osee.ote.message.Message;
-import org.eclipse.osee.ote.message.data.MessageData;
-import org.eclipse.osee.ote.message.elements.Float64Element;
-import org.eclipse.osee.ote.message.interfaces.ITestAccessor;
+import org.eclipse.osee.ote.message.Message; +import org.eclipse.osee.ote.message.data.MessageData; +import org.eclipse.osee.ote.message.elements.Float64Element; +import org.eclipse.osee.ote.message.interfaces.ITestAccessor; /**
* @author Andy Jury
@@ -28,10 +26,8 @@ public class NonMappingFloat64Element extends Float64Element { * @param element
*/
public NonMappingFloat64Element(Float64Element element) {
- super(null, element.getElementName(), element.getMsgData(),
+ super(element.getMessage(), element.getElementName(), element.getMsgData(),
element.getByteOffset(), element.getMsb(), element.getLsb());
- // This is being done so it doesn't get added to the element list hash map.
- this.msg = new WeakReference<Message<?,?,?>>(element.getMessage());
for(Object obj:element.getElementPath()){
this.getElementPath().add(obj);
}
diff --git a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingIntegerElement.java b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingIntegerElement.java index 4761e50735c..3c3f2ddacf1 100644 --- a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingIntegerElement.java +++ b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingIntegerElement.java @@ -10,13 +10,12 @@ *******************************************************************************/ package org.eclipse.osee.ote.message.elements.nonmapping;
-import java.lang.ref.WeakReference;
-import org.eclipse.osee.ote.core.environment.interfaces.ITestEnvironmentAccessor;
-import org.eclipse.osee.ote.core.testPoint.CheckGroup;
-import org.eclipse.osee.ote.message.Message;
-import org.eclipse.osee.ote.message.data.MessageData;
-import org.eclipse.osee.ote.message.elements.IntegerElement;
-import org.eclipse.osee.ote.message.interfaces.ITestAccessor;
+import org.eclipse.osee.ote.core.environment.interfaces.ITestEnvironmentAccessor; +import org.eclipse.osee.ote.core.testPoint.CheckGroup; +import org.eclipse.osee.ote.message.Message; +import org.eclipse.osee.ote.message.data.MessageData; +import org.eclipse.osee.ote.message.elements.IntegerElement; +import org.eclipse.osee.ote.message.interfaces.ITestAccessor; /**
* @author Andy Jury
@@ -29,10 +28,8 @@ public class NonMappingIntegerElement extends IntegerElement { * @param element
*/
public NonMappingIntegerElement(IntegerElement element) {
- super(null, element.getElementName(), element.getMsgData(), element.getByteOffset(), element.getMsb(),
+ super(element.getMessage(), element.getElementName(), element.getMsgData(), element.getByteOffset(), element.getMsb(),
element.getLsb());
- // This is being done so it doesn't get added to the element list hash map.
- this.msg = new WeakReference<Message<?, ?, ?>>(element.getMessage());
for (Object obj : element.getElementPath()) {
this.getElementPath().add(obj);
}
diff --git a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingLongIntegerElement.java b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingLongIntegerElement.java index ca6289ad736..307e459ee0d 100644 --- a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingLongIntegerElement.java +++ b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingLongIntegerElement.java @@ -10,14 +10,13 @@ *******************************************************************************/ package org.eclipse.osee.ote.message.elements.nonmapping;
-import java.lang.ref.WeakReference;
-import org.eclipse.osee.ote.core.environment.interfaces.ITestEnvironmentAccessor;
-import org.eclipse.osee.ote.core.testPoint.CheckGroup;
-import org.eclipse.osee.ote.message.Message;
-import org.eclipse.osee.ote.message.data.MessageData;
-import org.eclipse.osee.ote.message.elements.IntegerElement;
-import org.eclipse.osee.ote.message.elements.LongIntegerElement;
-import org.eclipse.osee.ote.message.interfaces.ITestAccessor;
+import org.eclipse.osee.ote.core.environment.interfaces.ITestEnvironmentAccessor; +import org.eclipse.osee.ote.core.testPoint.CheckGroup; +import org.eclipse.osee.ote.message.Message; +import org.eclipse.osee.ote.message.data.MessageData; +import org.eclipse.osee.ote.message.elements.IntegerElement; +import org.eclipse.osee.ote.message.elements.LongIntegerElement; +import org.eclipse.osee.ote.message.interfaces.ITestAccessor; /**
* @author Andy Jury
@@ -30,10 +29,8 @@ public class NonMappingLongIntegerElement extends LongIntegerElement { * @param element
*/
public NonMappingLongIntegerElement(LongIntegerElement element) {
- super(null, element.getElementName(), element.getMsgData(), element.getByteOffset(), element.getMsb(),
+ super(element.getMessage(), element.getElementName(), element.getMsgData(), element.getByteOffset(), element.getMsb(),
element.getLsb());
- // This is being done so it doesn't get added to the element list hash map.
- this.msg = new WeakReference<Message<?, ?, ?>>(element.getMessage());
for (Object obj : element.getElementPath()) {
this.getElementPath().add(obj);
}
diff --git a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingRecordElement.java b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingRecordElement.java index bc3752668cc..03002c68b6a 100644 --- a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingRecordElement.java +++ b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingRecordElement.java @@ -10,8 +10,6 @@ *******************************************************************************/ package org.eclipse.osee.ote.message.elements.nonmapping; -import java.lang.ref.WeakReference; - import org.eclipse.osee.ote.message.Message; import org.eclipse.osee.ote.message.data.MessageData; import org.eclipse.osee.ote.message.elements.RecordElement; @@ -22,10 +20,8 @@ import org.eclipse.osee.ote.message.elements.RecordElement; public class NonMappingRecordElement extends RecordElement { public NonMappingRecordElement(RecordElement element) { - super(null, element.getElementName(), element.getMsgData(), + super(element.getMessage(), element.getElementName(), element.getMsgData(), element.getByteOffset(), element.getBitLength()); - // This is being done so it doesn't get added to the element list hash map. - this.msg = new WeakReference<Message<?,?,?>>(element.getMessage()); for(Object obj:element.getElementPath()){ this.getElementPath().add(obj); } diff --git a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingSignedInteger16Element.java b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingSignedInteger16Element.java index 9739c15d36a..0c27c065ac1 100644 --- a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingSignedInteger16Element.java +++ b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingSignedInteger16Element.java @@ -10,15 +10,14 @@ *******************************************************************************/ package org.eclipse.osee.ote.message.elements.nonmapping;
-import java.lang.ref.WeakReference;
-import org.eclipse.osee.ote.core.environment.interfaces.ITestEnvironmentAccessor;
-import org.eclipse.osee.ote.core.testPoint.CheckGroup;
-import org.eclipse.osee.ote.message.Message;
-import org.eclipse.osee.ote.message.data.MemoryResource;
-import org.eclipse.osee.ote.message.data.MessageData;
-import org.eclipse.osee.ote.message.elements.IntegerElement;
-import org.eclipse.osee.ote.message.elements.SignedInteger16Element;
-import org.eclipse.osee.ote.message.interfaces.ITestAccessor;
+import org.eclipse.osee.ote.core.environment.interfaces.ITestEnvironmentAccessor; +import org.eclipse.osee.ote.core.testPoint.CheckGroup; +import org.eclipse.osee.ote.message.Message; +import org.eclipse.osee.ote.message.data.MemoryResource; +import org.eclipse.osee.ote.message.data.MessageData; +import org.eclipse.osee.ote.message.elements.IntegerElement; +import org.eclipse.osee.ote.message.elements.SignedInteger16Element; +import org.eclipse.osee.ote.message.interfaces.ITestAccessor; /**
* @author Andy Jury
@@ -31,10 +30,8 @@ public class NonMappingSignedInteger16Element extends IntegerElement { * @param element
*/
public NonMappingSignedInteger16Element(SignedInteger16Element element) {
- super(null, element.getElementName(), element.getMsgData(), element.getByteOffset(), element.getMsb(),
+ super(element.getMessage(), element.getElementName(), element.getMsgData(), element.getByteOffset(), element.getMsb(),
element.getLsb());
- // This is being done so it doesn't get added to the element list hash map.
- this.msg = new WeakReference<Message<?, ?, ?>>(element.getMessage());
for (Object obj : element.getElementPath()) {
this.getElementPath().add(obj);
}
diff --git a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingStringElement.java b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingStringElement.java index 9e83c1a69f4..e00c505cb3d 100644 --- a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingStringElement.java +++ b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/elements/nonmapping/NonMappingStringElement.java @@ -10,14 +10,12 @@ *******************************************************************************/ package org.eclipse.osee.ote.message.elements.nonmapping;
-import java.lang.ref.WeakReference;
-
-import org.eclipse.osee.ote.core.environment.interfaces.ITestEnvironmentAccessor;
-import org.eclipse.osee.ote.core.testPoint.CheckGroup;
-import org.eclipse.osee.ote.message.Message;
-import org.eclipse.osee.ote.message.data.MessageData;
-import org.eclipse.osee.ote.message.elements.StringElement;
-import org.eclipse.osee.ote.message.interfaces.ITestAccessor;
+import org.eclipse.osee.ote.core.environment.interfaces.ITestEnvironmentAccessor; +import org.eclipse.osee.ote.core.testPoint.CheckGroup; +import org.eclipse.osee.ote.message.Message; +import org.eclipse.osee.ote.message.data.MessageData; +import org.eclipse.osee.ote.message.elements.StringElement; +import org.eclipse.osee.ote.message.interfaces.ITestAccessor; /**
* @author Andy Jury
@@ -30,10 +28,8 @@ public class NonMappingStringElement extends StringElement { * @param element
*/
public NonMappingStringElement(StringElement element) {
- super(null, element.getElementName(), element.getMsgData(),
+ super(element.getMessage(), element.getElementName(), element.getMsgData(),
element.getByteOffset(), element.getMsb(), element.getLsb());
- // This is being done so it doesn't get added to the element list hash map.
- this.msg = new WeakReference<Message<?,?,?>>(element.getMessage());
for(Object obj:element.getElementPath()){
this.getElementPath().add(obj);
}
diff --git a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/listener/MessageSystemListener.java b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/listener/MessageSystemListener.java index dee2cd05056..9e4f64f9939 100644 --- a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/listener/MessageSystemListener.java +++ b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/listener/MessageSystemListener.java @@ -10,12 +10,12 @@ *******************************************************************************/ package org.eclipse.osee.ote.message.listener;
-import java.lang.ref.WeakReference; import java.util.Collection; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.SynchronousQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; + import org.eclipse.osee.framework.jdk.core.util.benchmark.Benchmark; import org.eclipse.osee.ote.core.environment.interfaces.ICancelTimer; import org.eclipse.osee.ote.core.environment.interfaces.ITestEnvironmentAccessor; @@ -38,7 +38,7 @@ IOSEEMessageWriterListener, ITimeout { private volatile boolean isTimedOut = false;
private int masterMessageCount = 0;
// private final Message message;
- private WeakReference<Message<?,?,?>> message;
+ private final Message<?,?,?> message;
private static final Benchmark tbm = new Benchmark("Total Message System Listener", 2500);
private int messageCount = 0;
@@ -75,7 +75,7 @@ IOSEEMessageWriterListener, ITimeout { */
public MessageSystemListener(Message<?,?,?> msg) {
super();
- this.message = new WeakReference<Message<?,?,?>>(msg);
+ this.message = msg;
}
/**
@@ -221,7 +221,7 @@ IOSEEMessageWriterListener, ITimeout { public synchronized void onDataAvailable(final MessageData data, MemType type) throws MessageSystemException{
tbm.startSample();
- if (message.get().getMemType() == type) {
+ if (message.getMemType() == type) {
messageCount++;
masterMessageCount++;
notifyAll();
diff --git a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/tool/rec/MessageRecorder.java b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/tool/rec/MessageRecorder.java index 8dbd368576d..c0d31da69ba 100644 --- a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/tool/rec/MessageRecorder.java +++ b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/tool/rec/MessageRecorder.java @@ -11,7 +11,6 @@ package org.eclipse.osee.ote.message.tool.rec; import java.io.IOException; -import java.lang.ref.WeakReference; import java.nio.ByteBuffer; import java.nio.channels.WritableByteChannel; import java.util.ArrayList; @@ -40,12 +39,12 @@ public class MessageRecorder { private final IMessageEntryFactory factory; private final ExecutorService taskHandler = Executors.newFixedThreadPool(2); - private final WeakReference<TestEnvironmentInterface> env; + private final TestEnvironmentInterface env; private final ArrayBlockingQueue<ByteBuffer> bufferQueue = new ArrayBlockingQueue<ByteBuffer>(NUM_BUFFERS); public MessageRecorder(IMessageEntryFactory factory) { this.factory = factory; - this.env = new WeakReference<TestEnvironmentInterface>(Activator.getTestEnvironment()); + this.env = Activator.getTestEnvironment(); try { for (int i = 0; i < NUM_BUFFERS; i++) { bufferQueue.put(ByteBuffer.allocateDirect(256000)); @@ -64,8 +63,8 @@ public class MessageRecorder { throw new IllegalArgumentException("channel cannot be null"); } recLock.lock(); - this.channel = channel; try { + this.channel = channel; for (MessageRecordConfig config : list) { IMessageEntry handler = factory.createMessageEntry(config, this); msgsToRecord.add(handler); @@ -101,7 +100,7 @@ public class MessageRecorder { } public long getTimeStamp() { - return env.get().getEnvTime(); + return env.getEnvTime(); } public void stopRecording(boolean closeOutputChannel) throws IOException, InterruptedException { |