feature[ats_ATS221006]: Move ReleasedOption to ATS Api

Change-Id: I0bf3520787b893468718f0f36c1d5db52f363784

5 files changed, 44 insertions, 31 deletions

diff --git a/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/query/ReleasedOption.java b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/query/ReleasedOption.java
new file mode 100644
index 00000000000..309d700b893
--- /dev/null
+++ b/plugins/org.eclipse.osee.ats.api/src/org/eclipse/osee/ats/api/query/ReleasedOption.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2015 Boeing.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Boeing - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.osee.ats.api.query;
+
+/**
+ * @author Donald G. Dunne
+ */
+public enum ReleasedOption {
+   Released,
+   UnReleased,
+   Both
+};
diff --git a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/navigate/DemoNavigateViewItems.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/navigate/DemoNavigateViewItems.java
index 073fce5cde3..231f4800c42 100644
--- a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/navigate/DemoNavigateViewItems.java
+++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/navigate/DemoNavigateViewItems.java
@@ -15,6 +15,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.logging.Level;
 import org.eclipse.osee.ats.api.data.AtsArtifactTypes;
+import org.eclipse.osee.ats.api.query.ReleasedOption;
 import org.eclipse.osee.ats.api.team.IAtsTeamDefinition;
 import org.eclipse.osee.ats.client.demo.DemoTeam;
 import org.eclipse.osee.ats.client.demo.PopulateDemoActions;
@@ -31,7 +32,6 @@ import org.eclipse.osee.ats.world.search.ArtifactTypeSearchItem;
 import org.eclipse.osee.ats.world.search.ArtifactTypeWithInheritenceSearchItem;
 import org.eclipse.osee.ats.world.search.NextVersionSearchItem;
 import org.eclipse.osee.ats.world.search.TeamWorldSearchItem;
-import org.eclipse.osee.ats.world.search.TeamWorldSearchItem.ReleasedOption;
 import org.eclipse.osee.ats.world.search.VersionTargetedForTeamSearchItem;
 import org.eclipse.osee.ats.world.search.WorldSearchItem.LoadView;
 import org.eclipse.osee.framework.core.client.ClientSessionManager;
@@ -46,7 +46,7 @@ import org.eclipse.osee.framework.ui.skynet.util.DbConnectionUtility;
 
 /**
  * Provides the ATS Navigator items for the sample XYZ company's teams
- * 
+ *
  * @author Donald G. Dunne
  */
 public class DemoNavigateViewItems implements IAtsNavigateItem {
@@ -60,9 +60,8 @@ public class DemoNavigateViewItems implements IAtsNavigateItem {
       // Add check to keep exception from occurring for OSEE developers running against production
       if (!ClientSessionManager.isProductionDataStore()) {
          try {
-            results =
-               AtsClientService.get().getConfig().getSoleByUuid(team.getTeamDefToken().getUuid(),
-                  IAtsTeamDefinition.class);
+            results = AtsClientService.get().getConfig().getSoleByUuid(team.getTeamDefToken().getUuid(),
+               IAtsTeamDefinition.class);
          } catch (Exception ex) {
             OseeLog.log(Activator.class, Level.SEVERE, ex);
          }
@@ -114,8 +113,8 @@ public class DemoNavigateViewItems implements IAtsNavigateItem {
                }
 
                new SearchNavigateItem(teamItems, new NextVersionSearchItem(teamDef, LoadView.WorldEditor));
-               new SearchNavigateItem(teamItems, new VersionTargetedForTeamSearchItem(teamDef, null, false,
-                  LoadView.WorldEditor));
+               new SearchNavigateItem(teamItems,
+                  new VersionTargetedForTeamSearchItem(teamDef, null, false, LoadView.WorldEditor));
                new SearchNavigateItem(teamItems, new TeamWorldSearchItem("Show Un-Released Team Workflows",
                   Arrays.asList(teamDef), true, true, false, true, null, null, ReleasedOption.UnReleased, null));
                new ReleaseVersionItem(teamItems, teamDef);
@@ -129,12 +128,12 @@ public class DemoNavigateViewItems implements IAtsNavigateItem {
       XNavigateItem adminItems = new XNavigateItem(jhuItem, "JHU Admin", FrameworkImage.LASER);
 
       new SearchNavigateItem(adminItems, new ArtifactTypeSearchItem("Show all Actions", AtsArtifactTypes.Action));
-      new SearchNavigateItem(adminItems, new ArtifactTypeSearchItem("Show all Decision Review",
-         AtsArtifactTypes.DecisionReview));
-      new SearchNavigateItem(adminItems, new ArtifactTypeSearchItem("Show all PeerToPeer Review",
-         AtsArtifactTypes.PeerToPeerReview));
-      new SearchNavigateItem(adminItems, new ArtifactTypeWithInheritenceSearchItem("Show all Team Workflows",
-         AtsArtifactTypes.TeamWorkflow));
+      new SearchNavigateItem(adminItems,
+         new ArtifactTypeSearchItem("Show all Decision Review", AtsArtifactTypes.DecisionReview));
+      new SearchNavigateItem(adminItems,
+         new ArtifactTypeSearchItem("Show all PeerToPeer Review", AtsArtifactTypes.PeerToPeerReview));
+      new SearchNavigateItem(adminItems,
+         new ArtifactTypeWithInheritenceSearchItem("Show all Team Workflows", AtsArtifactTypes.TeamWorkflow));
       new SearchNavigateItem(adminItems, new ArtifactTypeSearchItem("Show all Tasks", AtsArtifactTypes.Task));
 
       XNavigateItem healthItems = new XNavigateItem(adminItems, "Health", FrameworkImage.LASER);
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/TeamWorkflowSearchWorkflowSearchItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/TeamWorkflowSearchWorkflowSearchItem.java
index e51d7627f11..a6894ebba2f 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/TeamWorkflowSearchWorkflowSearchItem.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/TeamWorkflowSearchWorkflowSearchItem.java
@@ -17,6 +17,7 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.logging.Level;
 import org.eclipse.osee.ats.AtsImage;
+import org.eclipse.osee.ats.api.query.ReleasedOption;
 import org.eclipse.osee.ats.api.team.IAtsTeamDefinition;
 import org.eclipse.osee.ats.api.user.IAtsUser;
 import org.eclipse.osee.ats.api.version.IAtsVersion;
@@ -27,7 +28,6 @@ import org.eclipse.osee.ats.util.widgets.XStateSearchCombo;
 import org.eclipse.osee.ats.world.WorldEditor;
 import org.eclipse.osee.ats.world.WorldEditorParameterSearchItem;
 import org.eclipse.osee.ats.world.search.TeamWorldSearchItem;
-import org.eclipse.osee.ats.world.search.TeamWorldSearchItem.ReleasedOption;
 import org.eclipse.osee.framework.core.util.Result;
 import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
 import org.eclipse.osee.framework.jdk.core.util.Strings;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/TaskSearchWorldSearchItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/TaskSearchWorldSearchItem.java
index 724033e729a..d7edc7f9e22 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/TaskSearchWorldSearchItem.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/TaskSearchWorldSearchItem.java
@@ -19,6 +19,7 @@ import org.eclipse.nebula.widgets.xviewer.customize.CustomizeData;
 import org.eclipse.osee.ats.api.data.AtsArtifactTypes;
 import org.eclipse.osee.ats.api.data.AtsAttributeTypes;
 import org.eclipse.osee.ats.api.data.AtsRelationTypes;
+import org.eclipse.osee.ats.api.query.ReleasedOption;
 import org.eclipse.osee.ats.api.team.IAtsTeamDefinition;
 import org.eclipse.osee.ats.api.user.IAtsUser;
 import org.eclipse.osee.ats.api.version.IAtsVersion;
@@ -38,7 +39,6 @@ import org.eclipse.osee.ats.task.TaskEditorParameterSearchItem;
 import org.eclipse.osee.ats.util.AtsUtil;
 import org.eclipse.osee.ats.util.widgets.XHyperlabelTeamDefinitionSelection;
 import org.eclipse.osee.ats.util.widgets.XStateSearchCombo;
-import org.eclipse.osee.ats.world.search.TeamWorldSearchItem.ReleasedOption;
 import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
 import org.eclipse.osee.framework.core.enums.QueryOption;
 import org.eclipse.osee.framework.core.util.Result;
@@ -127,8 +127,8 @@ public class TaskSearchWorldSearchItem extends TaskEditorParameterSearchItem {
          }
          Set<TaskArtifact> removeTaskArts = new HashSet<>();
          for (TaskArtifact taskArt : userTaskArts) {
-            if (verArt != null && !verArt.equals(AtsClientService.get().getVersionService().getTargetedVersion(
-               taskArt.getParentTeamWorkflow()))) {
+            if (verArt != null && !verArt.equals(
+               AtsClientService.get().getVersionService().getTargetedVersion(taskArt.getParentTeamWorkflow()))) {
                removeTaskArts.add(taskArt);
             }
             if (!teamDefs.isEmpty() && !teamDefs.contains(taskArt.getParentTeamWorkflow().getTeamDefinition())) {
@@ -156,9 +156,8 @@ public class TaskSearchWorldSearchItem extends TaskEditorParameterSearchItem {
       // Else, get workflows from teamdefs
       else if (teamDefs.size() > 0) {
          //         ElapsedTime time = new ElapsedTime("Task Search - Load Team Workflows by Team Defs");
-         TeamWorldSearchItem teamWorldSearchItem =
-            new TeamWorldSearchItem("", teamDefs, includeCompleted, includeCancelled, false, false, null, null,
-               ReleasedOption.Both, null);
+         TeamWorldSearchItem teamWorldSearchItem = new TeamWorldSearchItem("", teamDefs, includeCompleted,
+            includeCancelled, false, false, null, null, ReleasedOption.Both, null);
          workflows.addAll(teamWorldSearchItem.performSearchGetResults(false, SearchType.Search));
          //         time.end();
       } else if (groups.size() > 0) {
@@ -179,7 +178,7 @@ public class TaskSearchWorldSearchItem extends TaskEditorParameterSearchItem {
       // Bulk load tasks related to workflows
       Collection<Artifact> artifacts =
          RelationManager.getRelatedArtifacts(workflows, 1, AtsRelationTypes.TeamWfToTask_Task);
-      //      time.end();
+         //      time.end();
 
       // Apply the remaining criteria
       //      time = new ElapsedTime("Task Search - Filter by remaining criteria");
@@ -344,9 +343,8 @@ public class TaskSearchWorldSearchItem extends TaskEditorParameterSearchItem {
                         versionCombo.setDataStrings(new String[] {});
                         return;
                      }
-                     Collection<String> names =
-                        Versions.getNames(teamDefHoldingVersions.getVersions(VersionReleaseType.Both,
-                           VersionLockedType.Both));
+                     Collection<String> names = Versions.getNames(
+                        teamDefHoldingVersions.getVersions(VersionReleaseType.Both, VersionLockedType.Both));
                      if (names.isEmpty()) {
                         versionCombo.setDataStrings(new String[] {});
                         return;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/TeamWorldSearchItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/TeamWorldSearchItem.java
index 111ac8a3533..a23af45bb17 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/TeamWorldSearchItem.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/TeamWorldSearchItem.java
@@ -20,6 +20,7 @@ import java.util.logging.Level;
 import org.eclipse.osee.ats.AtsImage;
 import org.eclipse.osee.ats.api.data.AtsAttributeTypes;
 import org.eclipse.osee.ats.api.data.AtsRelationTypes;
+import org.eclipse.osee.ats.api.query.ReleasedOption;
 import org.eclipse.osee.ats.api.team.ChangeType;
 import org.eclipse.osee.ats.api.team.IAtsTeamDefinition;
 import org.eclipse.osee.ats.api.user.IAtsUser;
@@ -49,11 +50,6 @@ import org.eclipse.osee.framework.skynet.core.relation.RelationManager;
  */
 public class TeamWorldSearchItem extends WorldUISearchItem {
 
-   public static enum ReleasedOption {
-      Released,
-      UnReleased,
-      Both
-   };
    private final Collection<IAtsTeamDefinition> teamDefs;
    private final boolean recurseChildren;
    private boolean includeCompleted;
@@ -153,8 +149,8 @@ public class TeamWorldSearchItem extends WorldUISearchItem {
             // don't include if version specified and workflow's not targeted for version
             if (versionArt != null) {
                TeamWorkFlowArtifact team = awa.getParentTeamWorkflow();
-               if (team != null && (!AtsClientService.get().getVersionService().hasTargetedVersion(team) || !AtsClientService.get().getVersionService().getTargetedVersion(
-                  team).equals(versionArt))) {
+               if (team != null && (!AtsClientService.get().getVersionService().hasTargetedVersion(
+                  team) || !AtsClientService.get().getVersionService().getTargetedVersion(team).equals(versionArt))) {
                   continue;
                }
             }