refactor: Remove unused revert calls in conflict object

2 files changed, 1 insertions, 9 deletions

diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ConflictTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ConflictTest.java
index 3c002f770cc..a0eeee50897 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ConflictTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ConflictTest.java
@@ -30,7 +30,6 @@ import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
 import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
-import org.eclipse.osee.framework.skynet.core.conflict.ArtifactConflict;
 import org.eclipse.osee.framework.skynet.core.conflict.AttributeConflict;
 import org.eclipse.osee.framework.skynet.core.conflict.Conflict;
 import org.eclipse.osee.framework.skynet.core.conflict.ConflictManagerExternal;
@@ -154,10 +153,7 @@ public class ConflictTest {
          int whichChange = 1;
 
          for (Conflict conflict : conflicts) {
-            ConflictStatus status = conflict.getStatus();
-            if (conflict instanceof ArtifactConflict && status.isNotResolvable()) {
-               ((ArtifactConflict) conflict).revertSourceArtifact();
-            } else if (conflict instanceof AttributeConflict) {
+            if (conflict instanceof AttributeConflict) {
                ConflictTestManager.resolveAttributeConflict((AttributeConflict) conflict);
                conflict.setStatus(ConflictStatus.RESOLVED);
             } else if (conflict instanceof RelationConflict) {
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/ArtifactConflict.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/ArtifactConflict.java
index d412d2b2ee1..0652bdbde20 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/ArtifactConflict.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/ArtifactConflict.java
@@ -127,10 +127,6 @@ public class ArtifactConflict extends Conflict {
       return false;
    }
 
-   public void revertSourceArtifact() throws OseeCoreException {
-      getSourceArtifact().revert();
-   }
-
    @Override
    public int getMergeGammaId() throws BranchMergeException {
       throw new BranchMergeException("Artifact Conflicts can not be handled they must be reverted on the Source Branch");