refactor: Refactor for artifact import mechanism

3 files changed, 7 insertions, 13 deletions

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 f6943e844f7..5bd4f3ffc33 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
@@ -15,7 +15,6 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
-
 import org.eclipse.osee.framework.core.data.IArtifactType;
 import org.eclipse.osee.framework.core.data.IAttributeType;
 import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
@@ -94,7 +93,7 @@ public class RoughArtifact {
    }
 
    public void addAttribute(String typeName, String value) {
-      if (Strings.isValid(typeName) && Strings.isValid(value)) {
+      if (Strings.isValid(typeName, value)) {
          if (isEnumeration(typeName)) {
             if (isMultipleEnum(typeName, value)) {
                attributes.addMultiple(typeName, getEnumValues(value));
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/operations/FilterArtifactTypesByAttributeTypes.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/operations/FilterArtifactTypesByAttributeTypes.java
index adc13fa901c..fd4b38cf38f 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/operations/FilterArtifactTypesByAttributeTypes.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/operations/FilterArtifactTypesByAttributeTypes.java
@@ -55,12 +55,10 @@ public class FilterArtifactTypesByAttributeTypes extends AbstractOperation {
          requiredTypes.add(AttributeTypeManager.getType(name));
       }
       Branch resolvedBranch = BranchManager.getBranch(branch);
-      for (ArtifactType artifactType : ArtifactTypeManager.getValidArtifactTypes(resolvedBranch)) {
-         if (!artifactType.isAbstract()) {
-            Collection<IAttributeType> attributeTypes = artifactType.getAttributeTypes(resolvedBranch);
-            if (Collections.setComplement(requiredTypes, attributeTypes).isEmpty()) {
-               selectedArtifactTypes.add(artifactType);
-            }
+      for (ArtifactType artifactType : ArtifactTypeManager.getConcreteArtifactTypes(resolvedBranch)) {
+         Collection<IAttributeType> attributeTypes = artifactType.getAttributeTypes(resolvedBranch);
+         if (Collections.setComplement(requiredTypes, attributeTypes).isEmpty()) {
+            selectedArtifactTypes.add(artifactType);
          }
       }
    }
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 177e4bbb77d..49e23aa55cf 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
@@ -19,6 +19,7 @@ import java.util.Map;
 import java.util.logging.Level;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+
 import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
 import org.eclipse.osee.framework.core.exception.OseeArgumentException;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
@@ -133,9 +134,8 @@ public class ExcelArtifactExtractor extends AbstractArtifactExtractor {
       }
 
       @Override
-      public void foundStartOfWorksheet(String sheetName) {
+      public void foundStartOfWorksheet(String sheetName) throws OseeCoreException {
          rowCount = 0;
-         try {
          if (sheetName.equals("relations")) {
             importingRelations = true;
             return;
@@ -144,9 +144,6 @@ public class ExcelArtifactExtractor extends AbstractArtifactExtractor {
          if (primaryDescriptor == null) {
             throw new OseeArgumentException("The sheet [%s] is not a valid artifact type name.", sheetName);
          }
-         } catch (OseeCoreException ex) {
-            throw new IllegalArgumentException("The sheet [%s] is not a valid artifact type name: ", ex);
-         }
       }
 
       @Override