bug: Fix so Define Navigator can launch ATS Search items

5 files changed, 10 insertions, 17 deletions

diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/navigate/AtsNavigateItemsToMassEditorTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/navigate/AtsNavigateItemsToMassEditorTest.java
index 46fdaa67c56..06c734ce183 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/navigate/AtsNavigateItemsToMassEditorTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/navigate/AtsNavigateItemsToMassEditorTest.java
@@ -15,13 +15,11 @@ import java.util.Collections;
 import org.eclipse.osee.ats.core.config.TeamDefinitionArtifact;
 import org.eclipse.osee.ats.core.config.TeamDefinitionManager;
 import org.eclipse.osee.ats.core.type.AtsArtifactTypes;
-import org.eclipse.osee.ats.navigate.AtsXNavigateItemLauncher;
 import org.eclipse.osee.ats.task.TaskEditor;
 import org.eclipse.osee.ats.util.DemoTestUtil;
 import org.eclipse.osee.ats.util.NavigateTestUtil;
 import org.eclipse.osee.ats.version.MassEditTeamVersionItem;
 import org.eclipse.osee.framework.core.data.IArtifactType;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption;
 import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem;
@@ -60,8 +58,8 @@ public class AtsNavigateItemsToMassEditorTest {
       handleGeneralDoubleClickAndTestResults(item, AtsArtifactTypes.Version, 3);
    }
 
-   private void handleGeneralDoubleClickAndTestResults(XNavigateItem item, IArtifactType artifactType, int numOfType) throws OseeCoreException {
-      AtsXNavigateItemLauncher.handleDoubleClick(item, TableLoadOption.ForcePend, TableLoadOption.NoUI);
+   private void handleGeneralDoubleClickAndTestResults(XNavigateItem item, IArtifactType artifactType, int numOfType) throws Exception {
+      item.run(TableLoadOption.ForcePend, TableLoadOption.NoUI);
       MassArtifactEditor massEditor = getMassArtifactEditor();
       Assert.assertNotNull(massEditor);
       Collection<Artifact> arts = massEditor.getLoadedArtifacts();
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/navigate/AtsNavigateItemsToTaskEditorTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/navigate/AtsNavigateItemsToTaskEditorTest.java
index 49c8c350ff1..ed41f9c31fc 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/navigate/AtsNavigateItemsToTaskEditorTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/navigate/AtsNavigateItemsToTaskEditorTest.java
@@ -18,8 +18,6 @@ import java.util.List;
 import java.util.Set;
 import org.eclipse.osee.ats.core.config.TeamDefinitionArtifact;
 import org.eclipse.osee.ats.core.config.TeamDefinitionManager;
-import org.eclipse.osee.ats.navigate.AtsXNavigateItemLauncher;
-import org.eclipse.osee.ats.navigate.SearchNavigateItem;
 import org.eclipse.osee.ats.task.TaskEditor;
 import org.eclipse.osee.ats.task.TaskXViewer;
 import org.eclipse.osee.ats.util.AtsUtil;
@@ -30,7 +28,6 @@ import org.eclipse.osee.ats.world.search.TaskSearchWorldSearchItem;
 import org.eclipse.osee.framework.core.data.IArtifactType;
 import org.eclipse.osee.framework.core.enums.Active;
 import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.skynet.core.UserManager;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
@@ -128,8 +125,8 @@ public class AtsNavigateItemsToTaskEditorTest {
       runGeneralTaskSearchTest(item, expectedNum);
    }
 
-   public void handleGeneralDoubleClickAndTestResults(XNavigateItem item, IArtifactType artifactType, int numOfType, TableLoadOption tableLoadOption) throws OseeCoreException {
-      AtsXNavigateItemLauncher.handleDoubleClick(item, TableLoadOption.ForcePend, TableLoadOption.NoUI, tableLoadOption);
+   public void handleGeneralDoubleClickAndTestResults(XNavigateItem item, IArtifactType artifactType, int numOfType, TableLoadOption tableLoadOption) throws Exception {
+      item.run(TableLoadOption.ForcePend, TableLoadOption.NoUI, tableLoadOption);
       TaskEditor taskEditor = getSingleEditorOrFail();
       assertTrue(taskEditor != null);
       Collection<Artifact> arts = taskEditor.getLoadedArtifacts();
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/navigate/AtsNavigateItemsToWorldViewTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/navigate/AtsNavigateItemsToWorldViewTest.java
index 8964cfd3b4d..de98f9df062 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/navigate/AtsNavigateItemsToWorldViewTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/navigate/AtsNavigateItemsToWorldViewTest.java
@@ -100,7 +100,7 @@ public class AtsNavigateItemsToWorldViewTest {
       WorldEditor.closeAll();
       XNavigateItem item = NavigateTestUtil.getAtsNavigateItem("User Search");
       assertTrue(((SearchNavigateItem) item).getWorldSearchItem() instanceof UserSearchWorkflowSearchItem);
-      AtsXNavigateItemLauncher.handleDoubleClick(item, TableLoadOption.ForcePend, TableLoadOption.NoUI);
+      item.run(TableLoadOption.ForcePend, TableLoadOption.NoUI);
       return item;
    }
 
@@ -330,7 +330,7 @@ public class AtsNavigateItemsToWorldViewTest {
       XNavigateItem item = NavigateTestUtil.getAtsNavigateItem("Group Search");
       assertTrue(((SearchNavigateItem) item).getWorldSearchItem() instanceof GroupWorldSearchItem);
       ((GroupWorldSearchItem) ((SearchNavigateItem) item).getWorldSearchItem()).setSelectedGroup(groupArt);
-      AtsXNavigateItemLauncher.handleDoubleClick(item, TableLoadOption.ForcePend, TableLoadOption.NoUI);
+      item.run(TableLoadOption.ForcePend, TableLoadOption.NoUI);
       WorldEditor worldEditor = WorldEditorUtil.getSingleEditorOrFail();
       Collection<Artifact> arts = worldEditor.getLoadedArtifacts();
 
@@ -346,7 +346,7 @@ public class AtsNavigateItemsToWorldViewTest {
       WorldEditor.closeAll();
       XNavigateItem item = NavigateTestUtil.getAtsNavigateItem("Team Workflow Search");
       assertTrue(((SearchNavigateItem) item).getWorldSearchItem() instanceof TeamWorkflowSearchWorkflowSearchItem);
-      AtsXNavigateItemLauncher.handleDoubleClick(item, TableLoadOption.ForcePend, TableLoadOption.NoUI);
+      item.run(TableLoadOption.ForcePend, TableLoadOption.NoUI);
       runGeneralTeamWorkflowSearchOnTeamTest(item, selectedTeamDefs, 1);
       runGeneralTeamWorkflowSearchOnCompletedCancelledTest(item, true, 2);
       runGeneralTeamWorkflowSearchOnCompletedCancelledTest(item, false, 1);
@@ -468,7 +468,7 @@ public class AtsNavigateItemsToWorldViewTest {
          }
       }
       // Simulate double-click of navigate item
-      AtsXNavigateItemLauncher.handleDoubleClick(item, TableLoadOption.ForcePend, TableLoadOption.NoUI, tableLoadOption);
+      item.run(TableLoadOption.ForcePend, TableLoadOption.NoUI, tableLoadOption);
 
       WorldEditor worldEditor = WorldEditorUtil.getSingleEditorOrFail();
       Collection<Artifact> arts = worldEditor.getLoadedArtifacts();
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/review/ReviewNavigateItemsToWorldViewTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/review/ReviewNavigateItemsToWorldViewTest.java
index 2787c60f5a4..1c44488a285 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/review/ReviewNavigateItemsToWorldViewTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/review/ReviewNavigateItemsToWorldViewTest.java
@@ -13,7 +13,6 @@ package org.eclipse.osee.ats.review;
 import static org.junit.Assert.assertTrue;
 import java.util.Collection;
 import org.eclipse.osee.ats.core.type.AtsArtifactTypes;
-import org.eclipse.osee.ats.navigate.AtsXNavigateItemLauncher;
 import org.eclipse.osee.ats.navigate.SearchNavigateItem;
 import org.eclipse.osee.ats.navigate.VisitedItems;
 import org.eclipse.osee.ats.util.DemoTestUtil;
@@ -119,7 +118,7 @@ public class ReviewNavigateItemsToWorldViewTest {
          }
       }
       // Simulate double-click of navigate item
-      AtsXNavigateItemLauncher.handleDoubleClick(item, TableLoadOption.ForcePend, TableLoadOption.NoUI, tableLoadOption);
+      item.run(TableLoadOption.ForcePend, TableLoadOption.NoUI, tableLoadOption);
 
       WorldEditor worldEditor = WorldEditorUtil.getSingleEditorOrFail();
       Collection<Artifact> arts = worldEditor.getLoadedArtifacts();
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/AtsXWidgetsExampleBlamTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/AtsXWidgetsExampleBlamTest.java
index 4559fe16ef2..fa12a3466c3 100644
--- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/AtsXWidgetsExampleBlamTest.java
+++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/util/AtsXWidgetsExampleBlamTest.java
@@ -11,7 +11,6 @@
 package org.eclipse.osee.ats.util;
 
 import java.util.Collection;
-import org.eclipse.osee.ats.navigate.AtsXNavigateItemLauncher;
 import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
 import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption;
 import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem;
@@ -49,7 +48,7 @@ public class AtsXWidgetsExampleBlamTest {
       }
 
       Assert.assertTrue(String.format("%s not found from list of provided Blams.", NAME_OF_ATS_ITEM), foundBlam);
-      AtsXNavigateItemLauncher.handleDoubleClick(item, TableLoadOption.ForcePend, TableLoadOption.NoUI);
+      item.run(TableLoadOption.ForcePend, TableLoadOption.NoUI);
 
       Assert.assertTrue(
          "Exceptions were thrown during AtsXWidgetsExampleBlamTest (gui test of XWidgetExampleBlam) should be none.",