bug: Convert console exceptions to test errors and cleaned up logs

8 files changed, 22 insertions, 31 deletions

diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java
index 19463a53774..73e9c970e4b 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java
@@ -450,7 +450,7 @@ public class BranchManager {
       ExtensionDefinedObjects<IDefaultInitialBranchesProvider> extensions =
          new ExtensionDefinedObjects<IDefaultInitialBranchesProvider>(
             "org.eclipse.osee.framework.skynet.core.DefaultInitialBranchProvider", "DefaultInitialBranchProvider",
-            "class");
+            "class", true);
       for (IDefaultInitialBranchesProvider provider : extensions.getObjects()) {
          try {
             // Guard against problematic extensions
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/RoughArtifact.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/RoughArtifact.java
index 5bd4f3ffc33..eec78154e72 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/RoughArtifact.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/RoughArtifact.java
@@ -20,7 +20,6 @@ import org.eclipse.osee.framework.core.data.IAttributeType;
 import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.core.model.type.AttributeType;
-import org.eclipse.osee.framework.jdk.core.util.Strings;
 import org.eclipse.osee.framework.logging.OseeLevel;
 import org.eclipse.osee.framework.logging.OseeLog;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -42,7 +41,7 @@ public class RoughArtifact {
    private final Collection<RoughArtifact> children;
    private IArtifactType primaryArtifactType;
 
-   public RoughArtifact(RoughArtifactKind roughArtifactKind, String name) {
+   public RoughArtifact(RoughArtifactKind roughArtifactKind, String name) throws OseeCoreException {
       this(roughArtifactKind);
       addAttribute("Name", name);
    }
@@ -92,19 +91,15 @@ public class RoughArtifact {
       addURIAttribute(attributeType.getName(), file);
    }
 
-   public void addAttribute(String typeName, String value) {
-      if (Strings.isValid(typeName, value)) {
-         if (isEnumeration(typeName)) {
-            if (isMultipleEnum(typeName, value)) {
-               attributes.addMultiple(typeName, getEnumValues(value));
-            } else {
-               attributes.add(typeName, value.trim());
-            }
+   public void addAttribute(String typeName, String value) throws OseeCoreException {
+      if (isEnumeration(typeName)) {
+         if (isMultipleEnum(typeName, value)) {
+            attributes.addMultiple(typeName, getEnumValues(value));
          } else {
-            attributes.add(typeName, value);
+            attributes.add(typeName, value.trim());
          }
       } else {
-         OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, "typeName or value is invalid. addAttribute(...) failed");
+         attributes.add(typeName, value);
       }
    }
 
@@ -116,14 +111,10 @@ public class RoughArtifact {
       return data;
    }
 
-   private boolean isEnumeration(String typeName) {
+   private boolean isEnumeration(String typeName) throws OseeCoreException {
       boolean result = false;
-      try {
-         AttributeType type = AttributeTypeManager.getType(typeName);
-         result = type.isEnumerated();
-      } catch (OseeCoreException ex) {
-         OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex);
-      }
+      AttributeType type = AttributeTypeManager.getType(typeName);
+      result = type.isEnumerated();
       return result;
    }
 
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/ExcelArtifactExtractor.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/ExcelArtifactExtractor.java
index 49e23aa55cf..20a913246dc 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/ExcelArtifactExtractor.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/ExcelArtifactExtractor.java
@@ -175,7 +175,7 @@ public class ExcelArtifactExtractor extends AbstractArtifactExtractor {
       }
 
       @Override
-      public void processRow(String[] row) throws OseeArgumentException {
+      public void processRow(String[] row) throws OseeCoreException {
          rowCount++;
          if (importingRelations) {
             String guida = null;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/NativeDocumentExtractor.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/NativeDocumentExtractor.java
index e67f510b8ad..0513039a8e0 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/NativeDocumentExtractor.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/NativeDocumentExtractor.java
@@ -14,6 +14,7 @@ import java.io.File;
 import java.io.FileFilter;
 import java.net.URI;
 import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
+import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.core.operation.OperationLogger;
 import org.eclipse.osee.framework.jdk.core.util.Lib;
 import org.eclipse.osee.framework.skynet.core.importing.RoughArtifact;
@@ -28,7 +29,7 @@ public class NativeDocumentExtractor extends AbstractArtifactExtractor {
    }
 
    @Override
-   protected void extractFromSource(OperationLogger logger, URI source, RoughArtifactCollector collector) {
+   protected void extractFromSource(OperationLogger logger, URI source, RoughArtifactCollector collector) throws OseeCoreException {
       String extension = Lib.getExtension(source.toASCIIString());
       String name = Lib.removeExtension(new File(source).getName());
 
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/SoftwareRequirementHandler.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/SoftwareRequirementHandler.java
index f03e9fbaa4a..813b54d5430 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/SoftwareRequirementHandler.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/SoftwareRequirementHandler.java
@@ -13,6 +13,7 @@ package org.eclipse.osee.framework.skynet.core.importing.parsers;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.eclipse.osee.framework.core.data.IAttributeType;
+import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.skynet.core.importing.RoughArtifact;
 import org.eclipse.osee.framework.skynet.core.importing.RoughArtifactKind;
 
@@ -30,7 +31,7 @@ public abstract class SoftwareRequirementHandler extends WordOutlineExtractorDel
    }
 
    @Override
-   public void processHeadingText(RoughArtifact roughArtifact, String headingText) {
+   public void processHeadingText(RoughArtifact roughArtifact, String headingText) throws OseeCoreException {
       StringBuilder text = new StringBuilder(headingText);
       Matcher matcher = partitionPattern.matcher(text);
       boolean isRequirement = false;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/WordOutlineExtractorDelegate.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/WordOutlineExtractorDelegate.java
index 83cf8814c5c..53523d9fdd8 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/WordOutlineExtractorDelegate.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/WordOutlineExtractorDelegate.java
@@ -256,7 +256,7 @@ public class WordOutlineExtractorDelegate implements IArtifactExtractorDelegate
    /**
     * Specializes in extraction of "1.0 scope" type of outline number and names. Outline name can also be spread out
     * over multiple {@code <w:t> } elements.<br/>
-    *
+    * 
     * @note Paragraph numbering must be zero based. "1.0 SCOPE" instead of "1. SCOPE"
     */
    private void specializedOutlineNumberTitleExtract(String paragraph, StringBuilder outlineNumberStorage, StringBuilder outlineTitleStorage) throws OseeCoreException {
@@ -333,7 +333,7 @@ public class WordOutlineExtractorDelegate implements IArtifactExtractorDelegate
       setContent();
    }
 
-   public void processHeadingText(RoughArtifact roughArtifact, String headingText) {
+   public void processHeadingText(RoughArtifact roughArtifact, String headingText) throws OseeCoreException {
       roughArtifact.addAttribute("Name", headingText.trim());
    }
 
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/XmlDataSaxHandler.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/XmlDataSaxHandler.java
index 62902344236..82044b9b7c2 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/XmlDataSaxHandler.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/XmlDataSaxHandler.java
@@ -11,6 +11,7 @@
 package org.eclipse.osee.framework.skynet.core.importing.parsers;
 
 import org.eclipse.osee.framework.core.data.IArtifactType;
+import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.jdk.core.util.io.xml.AbstractSaxHandler;
 import org.eclipse.osee.framework.skynet.core.importing.RoughArtifact;
 import org.eclipse.osee.framework.skynet.core.importing.RoughArtifactKind;
@@ -33,7 +34,7 @@ public class XmlDataSaxHandler extends AbstractSaxHandler {
    }
 
    @Override
-   public void endElementFound(String uri, String localName, String name) {
+   public void endElementFound(String uri, String localName, String name) throws OseeCoreException {
       if (level == 3) {
          roughArtifact.addAttribute(localName, getContents());
       }
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/resolvers/NewArtifactImportResolver.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/resolvers/NewArtifactImportResolver.java
index 8bfe7b2a4f8..73749bf55aa 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/resolvers/NewArtifactImportResolver.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/resolvers/NewArtifactImportResolver.java
@@ -15,7 +15,6 @@ import org.eclipse.osee.framework.core.data.IArtifactType;
 import org.eclipse.osee.framework.core.data.IOseeBranch;
 import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.util.OseeProperties;
 import org.eclipse.osee.framework.logging.OseeLog;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
@@ -38,10 +37,8 @@ public class NewArtifactImportResolver implements IArtifactImportResolver {
    public Artifact resolve(final RoughArtifact roughArtifact, final IOseeBranch branch, Artifact realParent, Artifact root) throws OseeCoreException {
       IArtifactType artifactType = getArtifactType(roughArtifact.getRoughArtifactKind());
 
-      if (!OseeProperties.isInTest()) {
-         OseeLog.format(NewArtifactImportResolver.class, Level.INFO, "New artifact: [%s]. Attributes: [%s]",
-            roughArtifact, roughArtifact.getAttributes());
-      }
+      OseeLog.format(NewArtifactImportResolver.class, Level.INFO, "New artifact: [%s]. Attributes: [%s]",
+         roughArtifact, roughArtifact.getAttributes());
 
       Artifact realArtifact =
          ArtifactTypeManager.addArtifact(artifactType, branch, roughArtifact.getGuid(),