AJD74 - Deleted Artifacts showing up in Word as requirements that are still present"

3 files changed, 7 insertions, 7 deletions

diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/InternalChangeManager.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/InternalChangeManager.java
index fa04f9f90e5..2acffac07ed 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/InternalChangeManager.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/InternalChangeManager.java
@@ -202,18 +202,15 @@ public final class InternalChangeManager {
          Artifact artifact = null;

 

          try {

-            TransactionId toTransactionId =

-                  TransactionIdManager.getTransactionId(item.getCurrentVersion().getTransactionNumber().intValue());

+            branch = isHistorical ? transactionId.getBranch() : sourceBranch;

+            TransactionId toTransactionId =  TransactionIdManager.getTransactionId(item.getCurrentVersion().getTransactionNumber().intValue());

             TransactionId fromTransactionId;

             String wasValue = "";

-            branch = isHistorical ? transactionId.getBranch() : sourceBranch;

 

             if (isHistorical) {

                fromTransactionId = TransactionIdManager.getPriorTransaction(toTransactionId);

                artifact = ArtifactCache.getHistorical(item.getArtId(), transactionId.getTransactionNumber());

-               branch = transactionId.getBranch();

             } else {

-               branch = sourceBranch;

                artifact = ArtifactQuery.getArtifactFromId(item.getArtId(), branch, true);

 

                ChangeVersion netChange = item.getNetChange();

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/ViewWordChangeReportHandler.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/ViewWordChangeReportHandler.java
index 732b97a30f3..023d66e9da7 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/ViewWordChangeReportHandler.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/ViewWordChangeReportHandler.java
@@ -14,6 +14,7 @@ import java.util.ArrayList;
 import java.util.Date;

 import java.util.LinkedList;

 import java.util.List;

+

 import org.eclipse.core.commands.AbstractHandler;

 import org.eclipse.core.commands.ExecutionEvent;

 import org.eclipse.core.runtime.NullProgressMonitor;

@@ -56,7 +57,7 @@ public class ViewWordChangeReportHandler extends AbstractHandler {
                         artifactChange.getArtifact().getArtId(), artifactChange.getFromTransactionId(), true);

 

             Artifact newerArtifact =

-                  artifactChange.getModificationType() == ModificationType.DELETED ? null : (artifactChange.isHistorical() ? ArtifactQuery.getHistoricalArtifactFromId(

+                  (artifactChange.getModificationType() == ModificationType.DELETED || artifactChange.getModificationType() == ModificationType.ARTIFACT_DELETED )? null : (artifactChange.isHistorical() ? ArtifactQuery.getHistoricalArtifactFromId(

                         artifactChange.getArtifact().getArtId(), artifactChange.getToTransactionId(), true) : artifactChange.getArtifact());

 

             baseArtifacts.add(baseArtifact);

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/change/SingleNativeDiffHandler.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/change/SingleNativeDiffHandler.java
index 1a26c3a90ac..ee434d76687 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/change/SingleNativeDiffHandler.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/change/SingleNativeDiffHandler.java
@@ -12,10 +12,12 @@ package org.eclipse.osee.framework.ui.skynet.commandHandlers.change;
 

 import static org.eclipse.osee.framework.core.enums.ModificationType.DELETED;

 import static org.eclipse.osee.framework.core.enums.ModificationType.NEW;

+

 import java.util.ArrayList;

 import java.util.Date;

 import java.util.HashSet;

 import java.util.Set;

+

 import org.eclipse.core.commands.ExecutionEvent;

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.jface.viewers.ISelectionProvider;

@@ -85,7 +87,7 @@ public class SingleNativeDiffHandler extends CommandHandler {
                      change.getArtifact().getArtId(), change.getFromTransactionId(), true);

          artifacts.addAll(checkForTrackedChangesOn(baseArtifact));

          Artifact newerArtifact =

-               change.getModificationType() == DELETED ? null : (change.isHistorical() ? ArtifactQuery.getHistoricalArtifactFromId(

+               (change.getModificationType() == DELETED || change.getModificationType() == ModificationType.ARTIFACT_DELETED) ? null : (change.isHistorical() ? ArtifactQuery.getHistoricalArtifactFromId(

                      change.getArtifact().getArtId(), change.getToTransactionId(), true) : change.getArtifact());

          artifacts.addAll(checkForTrackedChangesOn(newerArtifact));

          if (artifacts.isEmpty()) {