diff options
Diffstat (limited to 'plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/utils/ConflictTestManager.java')
| -rw-r--r-- | plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/utils/ConflictTestManager.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/utils/ConflictTestManager.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/utils/ConflictTestManager.java index 8743ce238f8..725c58d3b06 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/utils/ConflictTestManager.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/utils/ConflictTestManager.java @@ -19,7 +19,7 @@ import java.util.List; import org.eclipse.osee.client.integration.tests.integration.skynet.core.ConflictDeletionTest; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IAttributeType; -import org.eclipse.osee.framework.core.data.IOseeBranch; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.enums.CoreRelationTypes; @@ -115,11 +115,11 @@ public class ConflictTestManager { protected Object object; protected Object object2; protected Class<?> clas; - protected IOseeBranch branch; + protected BranchId branch; protected int rootArtifact; protected IArtifactType type; - protected ArtifactModification(Type itemToChange, Modification modificationToPerform, int rootArtifact, IOseeBranch branch, IArtifactType type, String name) throws OseeCoreException { + protected ArtifactModification(Type itemToChange, Modification modificationToPerform, int rootArtifact, BranchId branch, IArtifactType type, String name) throws OseeCoreException { if (!itemToChange.equals(Type.ARTIFACT)) { throw new OseeCoreException("This is the Artifact Constructor"); } @@ -292,7 +292,7 @@ public class ConflictTestManager { } } - protected static Artifact createArtifact(int rootArtifactId, IOseeBranch branch, IArtifactType type, String name) throws OseeCoreException { + protected static Artifact createArtifact(int rootArtifactId, BranchId branch, IArtifactType type, String name) throws OseeCoreException { Artifact rootArtifact = ArtifactQuery.getArtifactFromAttribute(CoreAttributeTypes.Name, FOLDER, branch); if (rootArtifactId > 0 && rootArtifactId < NUMBER_OF_ARTIFACTS) { if (branch.equals(destArtifacts[0].getBranch())) { |