refactor: Move ResultSet to jdk core

Change-Id: I0e3c8728daa6bb83f59fd305d11ca126ba414d84

2 files changed, 8 insertions, 8 deletions

diff --git a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockArtifact.java b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockArtifact.java
index 5690889846d..e5afd47b91c 100644
--- a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockArtifact.java
+++ b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockArtifact.java
@@ -25,8 +25,6 @@ import org.eclipse.osee.framework.core.data.IAttributeType;
 import org.eclipse.osee.framework.core.data.IOseeBranch;
 import org.eclipse.osee.framework.core.data.IRelationType;
 import org.eclipse.osee.framework.core.data.IRelationTypeSide;
-import org.eclipse.osee.framework.core.data.ResultSet;
-import org.eclipse.osee.framework.core.data.ResultSetList;
 import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
 import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
 import org.eclipse.osee.framework.core.enums.CoreBranches;
@@ -36,6 +34,8 @@ import org.eclipse.osee.framework.core.model.type.RelationType;
 import org.eclipse.osee.framework.jdk.core.type.HashCollection;
 import org.eclipse.osee.framework.jdk.core.type.Identity;
 import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
+import org.eclipse.osee.framework.jdk.core.type.ResultSet;
+import org.eclipse.osee.framework.jdk.core.type.ResultSets;
 import org.eclipse.osee.orcs.data.ArtifactReadable;
 import org.eclipse.osee.orcs.data.AttributeId;
 import org.eclipse.osee.orcs.data.AttributeReadable;
@@ -90,7 +90,7 @@ public class MockArtifact implements ArtifactReadable {
       if (data == null) {
          data = Collections.emptyList();
       }
-      return new ResultSetList<ArtifactReadable>(data);
+      return ResultSets.newResultSet(data);
    }
 
    public void addRelation(IRelationTypeSide relation, ArtifactReadable artifact) {
@@ -145,7 +145,7 @@ public class MockArtifact implements ArtifactReadable {
       } else {
          toReturn = Collections.emptyList();
       }
-      return new ResultSetList<AttributeReadable<T>>(toReturn);
+      return ResultSets.newResultSet(toReturn);
    }
 
    @Override
@@ -176,7 +176,7 @@ public class MockArtifact implements ArtifactReadable {
             toReturn.add(new MockAttribute<Object>(entry.getKey(), value));
          }
       }
-      return new ResultSetList<AttributeReadable<Object>>(toReturn);
+      return ResultSets.newResultSet(toReturn);
    }
 
    public void clearRelations() {
diff --git a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockArtifactProvider.java b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockArtifactProvider.java
index 44f8d227eef..1bb8be18c95 100644
--- a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockArtifactProvider.java
+++ b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockArtifactProvider.java
@@ -21,10 +21,10 @@ import org.eclipse.osee.framework.core.data.IArtifactToken;
 import org.eclipse.osee.framework.core.data.IOseeBranch;
 import org.eclipse.osee.framework.core.data.IRelationType;
 import org.eclipse.osee.framework.core.data.IRelationTypeSide;
-import org.eclipse.osee.framework.core.data.ResultSet;
-import org.eclipse.osee.framework.core.data.ResultSetList;
 import org.eclipse.osee.framework.core.enums.RelationSide;
 import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
+import org.eclipse.osee.framework.jdk.core.type.ResultSet;
+import org.eclipse.osee.framework.jdk.core.type.ResultSets;
 import org.eclipse.osee.orcs.data.ArtifactReadable;
 import org.eclipse.osee.orcs.data.AttributeReadable;
 import org.eclipse.osee.orcs.search.Match;
@@ -67,7 +67,7 @@ public class MockArtifactProvider implements ArtifactProvider {
          ResultSet<ArtifactReadable> result = mArt.getRelatedArtifacts(relationTypeSide);
          return result;
       } else {
-         return new ResultSetList<ArtifactReadable>();
+         return ResultSets.emptyResultSet();
       }
    }