feature[ats_RCS7X]: Make OSEE Web work for org.eclipse

Change-Id: Ibe044a70ae3941a99cc422cf2326f6402a6fc03f

3 files changed, 13 insertions, 5 deletions

diff --git a/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/ArtifactFilter.java b/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/ArtifactFilter.java
index e82c4753019..10f7e774461 100644
--- a/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/ArtifactFilter.java
+++ b/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/ArtifactFilter.java
@@ -16,7 +16,7 @@ import org.eclipse.osee.display.api.search.ArtifactProvider;
 import org.eclipse.osee.framework.core.data.IArtifactType;
 import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
 import org.eclipse.osee.framework.core.enums.CoreBranches;
-import org.eclipse.osee.framework.jdk.core.util.Collections.Filter;
+import org.eclipse.osee.framework.jdk.core.util.Filter;
 import org.eclipse.osee.orcs.data.ArtifactReadable;
 
 /**
@@ -33,6 +33,8 @@ public class ArtifactFilter implements Filter<ArtifactReadable> {
       CoreArtifactTypes.IndirectSoftwareRequirement,
       CoreArtifactTypes.TestUnit};
 
+   private boolean allTypesAllowed = false;
+
    private static final List<String> allowed = Arrays.asList("System Requirements", "Subsystem Requirements",
       "Software Requirements");
 
@@ -42,14 +44,16 @@ public class ArtifactFilter implements Filter<ArtifactReadable> {
       this.provider = provider;
    }
 
-   public IArtifactType[] getAllowedTypes() {
-      return allowedTypes;
+   public void setAllTypesAllowed(boolean allTypesAllowed) {
+      this.allTypesAllowed = allTypesAllowed;
    }
 
    @Override
    public boolean accept(ArtifactReadable item) throws Exception {
       boolean isAllowed = false;
-      if (item != null) {
+      if (allTypesAllowed) {
+         isAllowed = true;
+      } else if (item != null) {
          if (item.isOfType(allowedTypes) || item.getBranch().equals(CoreBranches.COMMON)) {
             isAllowed = true;
          } else if (!item.isOfType(notAllowedTypes)) {
diff --git a/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/ArtifactProviderImpl.java b/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/ArtifactProviderImpl.java
index 7c3670cc1a2..d6dbed8c072 100644
--- a/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/ArtifactProviderImpl.java
+++ b/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/ArtifactProviderImpl.java
@@ -69,6 +69,10 @@ public class ArtifactProviderImpl implements ArtifactProvider {
       this.graph = graph;
    }
 
+   protected void setFilterAllTypesAllowed(boolean allTypesAllowed) {
+      filter.setAllTypesAllowed(allTypesAllowed);
+   }
+
    protected QueryFactory getFactory() {
       return queryFactory;
    }
diff --git a/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/internal/FilteredMatchCallable.java b/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/internal/FilteredMatchCallable.java
index 001ee789d25..9a5fc115337 100644
--- a/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/internal/FilteredMatchCallable.java
+++ b/plugins/org.eclipse.osee.display.presenter/src/org/eclipse/osee/display/presenter/internal/FilteredMatchCallable.java
@@ -14,7 +14,7 @@ import java.util.Collection;
 import org.eclipse.osee.display.presenter.ArtifactFilter;
 import org.eclipse.osee.executor.admin.CancellableCallable;
 import org.eclipse.osee.framework.jdk.core.util.Collections;
-import org.eclipse.osee.framework.jdk.core.util.Collections.Filter;
+import org.eclipse.osee.framework.jdk.core.util.Filter;
 import org.eclipse.osee.orcs.data.ArtifactReadable;
 import org.eclipse.osee.orcs.data.AttributeReadable;
 import org.eclipse.osee.orcs.search.Match;