refactor: Directly support String.format in OseeCoreException constructors

5 files changed, 10 insertions, 11 deletions

diff --git a/plugins/org.eclipse.osee.ote.message/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ote.message/META-INF/MANIFEST.MF
index a2fc8baae65..5ad92bc19de 100644
--- a/plugins/org.eclipse.osee.ote.message/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.ote.message/META-INF/MANIFEST.MF
@@ -30,3 +30,5 @@ Require-Bundle: org.eclipse.osee.ote.core,
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Activator: org.eclipse.osee.ote.message.internal.Activator
+Import-Package: org.eclipse.core.runtime,
+ org.eclipse.osee.framework.core.exception
diff --git a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/tool/AbstractMessageToolService.java b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/tool/AbstractMessageToolService.java
index a39d7e4d963..881ca5ce978 100644
--- a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/tool/AbstractMessageToolService.java
+++ b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/tool/AbstractMessageToolService.java
@@ -770,9 +770,6 @@ public class AbstractMessageToolService implements IRemoteMessageService {
          } catch (IOException e) {
             OseeLog.log(MessageSystemTestEnvironment.class, Level.INFO, "Exception while stopping message recording", e);
             throw new RemoteException("could not stop recorder", e);
-         } catch (InterruptedException e) {
-            OseeLog.log(MessageSystemTestEnvironment.class, Level.INFO, "Exception while stopping message recording", e);
-            throw new RemoteException("could not stop recorder", e);
          }
          try {
             recorderOutputChannel.disconnect();
@@ -819,8 +816,6 @@ public class AbstractMessageToolService implements IRemoteMessageService {
                recorder.stopRecording(false);
             } catch (IOException e) {
                OseeLog.log(MessageSystemTestEnvironment.class, Level.SEVERE, "failed to stop recording", e);
-            } catch (InterruptedException e) {
-               OseeLog.log(MessageSystemTestEnvironment.class, Level.SEVERE, "failed to stop recording", e);
             }
          }
 
diff --git a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/tool/rec/IMessageEntryFactory.java b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/tool/rec/IMessageEntryFactory.java
index a96311b8d59..fe099743dac 100644
--- a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/tool/rec/IMessageEntryFactory.java
+++ b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/tool/rec/IMessageEntryFactory.java
@@ -10,10 +10,11 @@
  *******************************************************************************/
 package org.eclipse.osee.ote.message.tool.rec;
 
+import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.ote.message.Message;
 import org.eclipse.osee.ote.message.tool.rec.entry.IMessageEntry;
 
 public interface IMessageEntryFactory<T extends Message<?, ?, T>> {
 
-   public IMessageEntry createMessageEntry(MessageRecordConfig config, MessageRecorder recorder);
+   public IMessageEntry createMessageEntry(MessageRecordConfig config, MessageRecorder recorder) throws OseeCoreException;
 }
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 dd339963b22..32056bbbbab 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
@@ -22,6 +22,7 @@ import java.util.concurrent.Future;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.logging.Level;
+import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.logging.OseeLog;
 import org.eclipse.osee.ote.core.environment.TestEnvironmentInterface;
 import org.eclipse.osee.ote.message.MessageSystemTestEnvironment;
@@ -54,7 +55,7 @@ public class MessageRecorder {
       }
    }
 
-   public void startRecording(Collection<MessageRecordConfig> list, WritableByteChannel channel) throws InterruptedException {
+   public void startRecording(Collection<MessageRecordConfig> list, WritableByteChannel channel) throws OseeCoreException {
       if (list == null) {
          throw new IllegalArgumentException("list cannot be null");
       }
@@ -100,7 +101,7 @@ public class MessageRecorder {
       return env.getEnvTime();
    }
 
-   public void stopRecording(boolean closeOutputChannel) throws IOException, InterruptedException {
+   public void stopRecording(boolean closeOutputChannel) throws IOException {
       OseeLog.log(MessageSystemTestEnvironment.class, Level.INFO, "stopping message recorder...");
       isRecording = false;
       recLock.lock();
diff --git a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/tool/rec/entry/MessageRecEntry.java b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/tool/rec/entry/MessageRecEntry.java
index 34ca9c6ad6e..595dbbaab8e 100644
--- a/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/tool/rec/entry/MessageRecEntry.java
+++ b/plugins/org.eclipse.osee.ote.message/src/org/eclipse/osee/ote/message/tool/rec/entry/MessageRecEntry.java
@@ -18,6 +18,7 @@ import java.util.Comparator;
 import java.util.HashMap;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.logging.Level;
+import org.eclipse.osee.framework.core.exception.OseeArgumentException;
 import org.eclipse.osee.framework.jdk.core.util.benchmark.Benchmark;
 import org.eclipse.osee.framework.logging.OseeLog;
 import org.eclipse.osee.ote.message.IMessageHeader;
@@ -59,7 +60,7 @@ public class MessageRecEntry<T extends Message<?, ?, T>> implements IMessageEntr
    private boolean bodyDump;
    private boolean headerDump;
 
-   public MessageRecEntry(T msg, DataType type, boolean headerDump, Element[] hdrElements, boolean bodyDump, Element[] bdyElements, MessageRecorder recorder) {
+   public MessageRecEntry(T msg, DataType type, boolean headerDump, Element[] hdrElements, boolean bodyDump, Element[] bdyElements, MessageRecorder recorder) throws OseeArgumentException {
       this.msg = msg;
       this.type = type;
       this.recorder = recorder;
@@ -85,8 +86,7 @@ public class MessageRecEntry<T extends Message<?, ?, T>> implements IMessageEntr
       i = 0;
       for (Element element : bdyElements) {
          if (element.getMsgData().getType() != type) {
-            throw new IllegalArgumentException(String.format("all elements(%s) must have a mem type of %s",
-               element.getName(), type.toString()));
+            throw new OseeArgumentException("all elements(%s) must have a mem type of %s", element.getName(), type);
          }
          bodyEntries[i] = ElementEntryFactory.createEntry(element);
          i++;