diff options
Diffstat (limited to 'plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee')
3 files changed, 7 insertions, 6 deletions
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ReplaceArtifactWithBaselineOperation.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ReplaceArtifactWithBaselineOperation.java index 6e12e046d5d..fab80f3a8fa 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ReplaceArtifactWithBaselineOperation.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ReplaceArtifactWithBaselineOperation.java @@ -61,7 +61,7 @@ public class ReplaceArtifactWithBaselineOperation extends AbstractOperation { monitor.subTask("Reverting: " + artifact.getName()); monitor.worked(1); Artifact sourceArtifact = - ArtifactQuery.checkHistoricalArtifactFromId(artifact, txRecord, DeletionFlag.INCLUDE_DELETED); + ArtifactQuery.getHistoricalArtifactOrNull(artifact, txRecord, DeletionFlag.INCLUDE_DELETED); try { if (sourceArtifact != null) { String userId = ClientSessionManager.getCurrentUserToken().getUserId(); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/CompareArtifactAction.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/CompareArtifactAction.java index 298a508a3d3..fabb8d5bbd6 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/CompareArtifactAction.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/CompareArtifactAction.java @@ -17,6 +17,7 @@ import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.SelectionChangedEvent; +import org.eclipse.osee.framework.core.data.ArtifactId; import org.eclipse.osee.framework.core.data.TransactionToken; import org.eclipse.osee.framework.core.enums.DeletionFlag; import org.eclipse.osee.framework.core.enums.PresentationType; @@ -106,7 +107,7 @@ public final class CompareArtifactAction extends Action { Conditions.checkExpressionFailOnTrue(!changeA.getArtId().equals(changeB.getArtId()), "Change art ids don't match [%s:%s]", changeA.getArtId(), changeB.getArtId()); - int artId = changeA.getArtId().getId().intValue(); + ArtifactId artId = changeA.getArtId(); TransactionDelta txDelta = asTxDelta(changeA, changeB); Artifact startArtifact = diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeUtility.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeUtility.java index 5cb058621be..ef73c183ded 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeUtility.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeUtility.java @@ -151,8 +151,8 @@ public class MergeUtility { try { if (Conditions.notNull(conflict.getSourceBranch())) { TransactionToken baseTransaction = BranchManager.getBaseTransaction(conflict.getSourceBranch()); - toReturn = ArtifactQuery.getHistoricalArtifactFromId(conflict.getArtifact().getGuid(), baseTransaction, - INCLUDE_DELETED); + toReturn = + ArtifactQuery.getHistoricalArtifactFromId(conflict.getArtifact(), baseTransaction, INCLUDE_DELETED); } } catch (OseeCoreException ex) { OseeLog.log(Activator.class, Level.SEVERE, ex); @@ -166,8 +166,8 @@ public class MergeUtility { if (Conditions.notNull(conflict.getSourceBranch())) { TransactionToken commonTransaction = ConflictManagerInternal.findCommonTransaction(conflict.getSourceBranch(), conflict.getDestBranch()); - toReturn = ArtifactQuery.getHistoricalArtifactFromId(conflict.getArtifact().getGuid(), commonTransaction, - INCLUDE_DELETED); + toReturn = + ArtifactQuery.getHistoricalArtifactFromId(conflict.getArtifact(), commonTransaction, INCLUDE_DELETED); } } catch (OseeCoreException ex) { OseeLog.log(Activator.class, Level.SEVERE, ex); |