Replaced "allowDeleted" booleans with statically verifiable DeletionFlag enum

6 files changed, 13 insertions, 7 deletions

diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateAtsDatabase.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateAtsDatabase.java
index d74e438db04..2d8d27509cd 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateAtsDatabase.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateAtsDatabase.java
@@ -10,6 +10,7 @@
  *******************************************************************************/

 package org.eclipse.osee.ats.health;

 

+import static org.eclipse.osee.framework.skynet.core.artifact.DeletionFlag.EXCLUDE_DELETED;
 import java.util.ArrayList;

 import java.util.Arrays;

 import java.util.Collection;

@@ -359,7 +360,7 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction {
          xResultData = new XResultData();

       }

       xResultData.log(monitor, "testLoadAllCommonArtifactIds - Started " + XDate.getDateNow(XDate.MMDDYYHHMM));

-      List<Integer> artIds = ArtifactQuery.selectArtifactListFromBranch(AtsUtil.getAtsBranch(), false);

+      List<Integer> artIds = ArtifactQuery.selectArtifactListFromBranch(AtsUtil.getAtsBranch(), EXCLUDE_DELETED);
 

       if (artIds.isEmpty()) {

          xResultData.logError("Error: Artifact load returned 0 artifacts to check");

diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ArtifactImpactToActionSearchItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ArtifactImpactToActionSearchItem.java
index 7d78d212dc1..64da3de3004 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ArtifactImpactToActionSearchItem.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ArtifactImpactToActionSearchItem.java
@@ -10,6 +10,7 @@
  *******************************************************************************/

 package org.eclipse.osee.ats.navigate;

 

+import static org.eclipse.osee.framework.skynet.core.artifact.DeletionFlag.INCLUDE_DELETED;
 import java.util.Collection;

 import java.util.HashSet;

 import java.util.Set;

@@ -94,7 +95,7 @@ public class ArtifactImpactToActionSearchItem extends XNavigateItemAction {
 

       private void getMatrixItems() throws OseeCoreException {

          final Collection<Artifact> srchArts =

-               ArtifactQuery.getArtifactListFromName("%" + artifactName + "%", branch, true);

+               ArtifactQuery.getArtifactListFromName("%" + artifactName + "%", branch, INCLUDE_DELETED);
          final Set<Artifact> processArts = new HashSet<Artifact>();

          if (srchArts.isEmpty()) {

             return;

diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsQuickSearchOperation.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsQuickSearchOperation.java
index 0520b59d87f..cff2171b203 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsQuickSearchOperation.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsQuickSearchOperation.java
@@ -10,6 +10,7 @@
  *******************************************************************************/

 package org.eclipse.osee.ats.navigate;

 

+import static org.eclipse.osee.framework.skynet.core.artifact.DeletionFlag.EXCLUDE_DELETED;
 import java.util.HashSet;

 import java.util.Set;

 import org.eclipse.core.runtime.IProgressMonitor;

@@ -60,7 +61,7 @@ public class AtsQuickSearchOperation extends AbstractOperation implements IWorld
          }

       }

       for (Artifact art : ArtifactQuery.getArtifactListFromAttributeKeywords(AtsUtil.getAtsBranch(),

-            data.getSearchStr(), false, false, false)) {

+            data.getSearchStr(), false, EXCLUDE_DELETED, false)) {
          // only ATS Artifacts

          if (art instanceof StateMachineArtifact) {

             StateMachineArtifact sma = (StateMachineArtifact) art;

diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/ArtifactTypeWithInheritenceSearchItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/ArtifactTypeWithInheritenceSearchItem.java
index 86e273e41e0..0c98ca179f1 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/ArtifactTypeWithInheritenceSearchItem.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/ArtifactTypeWithInheritenceSearchItem.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.osee.ats.world.search;
 
+import static org.eclipse.osee.framework.skynet.core.artifact.DeletionFlag.EXCLUDE_DELETED;
 import java.util.Collection;
 import org.eclipse.osee.ats.util.AtsUtil;
 import org.eclipse.osee.framework.core.data.IArtifactType;
@@ -36,7 +37,7 @@ public class ArtifactTypeWithInheritenceSearchItem extends WorldUISearchItem {
 
    @Override
    public Collection<Artifact> performSearch(SearchType searchType) throws OseeCoreException {
-      return ArtifactQuery.getArtifactListFromTypeWithInheritence(artifactType, AtsUtil.getAtsBranch(), false);
+      return ArtifactQuery.getArtifactListFromTypeWithInheritence(artifactType, AtsUtil.getAtsBranch(), EXCLUDE_DELETED);
    }
 
    @Override
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/ArtifactTypesSearchItem.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/ArtifactTypesSearchItem.java
index fb2b3772ede..b7eb86df17d 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/ArtifactTypesSearchItem.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/ArtifactTypesSearchItem.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.osee.ats.world.search;
 
+import static org.eclipse.osee.framework.skynet.core.artifact.DeletionFlag.EXCLUDE_DELETED;
 import java.util.Collection;
 import org.eclipse.osee.ats.util.AtsUtil;
 import org.eclipse.osee.framework.core.data.IArtifactType;
@@ -41,7 +42,7 @@ public class ArtifactTypesSearchItem extends WorldUISearchItem {
       if (artifactTypes == null || artifactTypes.isEmpty()) {
          throw new OseeArgumentException("Inavlid search \"" + getName() + "\"");
       }
-      return ArtifactQuery.getArtifactListFromTypes(artifactTypes, AtsUtil.getAtsBranch(), false);
+      return ArtifactQuery.getArtifactListFromTypes(artifactTypes, AtsUtil.getAtsBranch(), EXCLUDE_DELETED);
    }
 
    @Override
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/UserRelatedToAtsObjectSearch.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/UserRelatedToAtsObjectSearch.java
index ef207ab17de..ef8647c2397 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/UserRelatedToAtsObjectSearch.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/UserRelatedToAtsObjectSearch.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.osee.ats.world.search;
 
+import static org.eclipse.osee.framework.skynet.core.artifact.DeletionFlag.EXCLUDE_DELETED;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -52,10 +53,10 @@ public class UserRelatedToAtsObjectSearch extends UserSearchItem {
       List<Artifact> arts = new ArrayList<Artifact>();
       if (activeObjectsOnly) {
          arts.addAll(ArtifactQuery.getArtifactListFromAttributeKeywords(AtsUtil.getAtsBranch(), user.getUserId(),
-               false, false, false, AtsAttributeTypes.AtsCurrentState));
+               false, EXCLUDE_DELETED, false, AtsAttributeTypes.AtsCurrentState));
       } else {
          arts.addAll(ArtifactQuery.getArtifactListFromAttributeKeywords(AtsUtil.getAtsBranch(), user.getUserId(),
-               false, false, false, AtsAttributeTypes.AtsCurrentState, AtsAttributeTypes.AtsState,
+               false, EXCLUDE_DELETED, false, AtsAttributeTypes.AtsCurrentState, AtsAttributeTypes.AtsState,
                AtsAttributeTypes.AtsLog));
       }
       arts.addAll(user.getRelatedArtifacts(AtsRelationTypes.TeamLead_Team));