converted more string based type references to use type tokens

2 files changed, 7 insertions, 6 deletions

diff --git a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/TestRunXViewer.java b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/TestRunXViewer.java
index 5823c435362..ce3e3473c87 100644
--- a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/TestRunXViewer.java
+++ b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/TestRunXViewer.java
@@ -29,7 +29,6 @@ import org.eclipse.nebula.widgets.xviewer.XViewerColumn;
 import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
 import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.model.type.ArtifactType;
 import org.eclipse.osee.framework.logging.OseeLevel;
 import org.eclipse.osee.framework.logging.OseeLog;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -265,11 +264,11 @@ public class TestRunXViewer extends XViewer {
                Artifact dispoArtifact = null;
                try {
                   dispoArtifact =
-                     ArtifactQuery.getArtifactFromTypeAndAttribute("Test Run Disposition", "Name", name,
+                     ArtifactQuery.getArtifactFromTypeAndName(CoreArtifactTypes.TestRunDisposition, name,
                         artifact.getBranch());
                } catch (ArtifactDoesNotExist ex) {
-                  ArtifactType artifactType = ArtifactTypeManager.getType("Test Run Disposition");
-                  dispoArtifact = ArtifactTypeManager.makeNewArtifact(artifactType, artifact.getBranch());
+                  dispoArtifact =
+                     ArtifactTypeManager.makeNewArtifact(CoreArtifactTypes.TestRunDisposition, artifact.getBranch());
                   dispoArtifact.setName(name);
                }
                if (dispoArtifact != null) {
diff --git a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/data/ArtifactItem.java b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/data/ArtifactItem.java
index 0b483a8c7b2..f9961ce8424 100644
--- a/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/data/ArtifactItem.java
+++ b/plugins/org.eclipse.osee.ote.ui.define/src/org/eclipse/osee/ote/ui/define/viewers/data/ArtifactItem.java
@@ -16,6 +16,8 @@ import java.util.logging.Level;
 import org.eclipse.jface.viewers.DecorationOverlayIcon;
 import org.eclipse.jface.viewers.IDecoration;
 import org.eclipse.nebula.widgets.xviewer.XViewer;
+import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
+import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
 import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
 import org.eclipse.osee.framework.core.exception.OseeArgumentException;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
@@ -125,11 +127,11 @@ public class ArtifactItem extends DataItem implements IXViewerItem, IArtifactEve
                   }
                } else if (colName.equals("Disposition")) {
                   //Special case for the Disposition Artifact
-                  String name = artifact.getSoleAttributeValueAsString("Name", "");
+                  String name = artifact.getSoleAttributeValueAsString(CoreAttributeTypes.NAME, "");
                   if (name != "") {
                      try {
                         Artifact dispoArtifact =
-                           ArtifactQuery.getArtifactFromTypeAndAttribute("Test Run Disposition", "Name", name,
+                           ArtifactQuery.getArtifactFromTypeAndName(CoreArtifactTypes.TestRunDisposition, name,
                               artifact.getBranch());
                         if (dispoArtifact != null) {
                            return dispoArtifact.getSoleAttributeValueAsString("Disposition", "");