diff options
-rw-r--r-- | plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java index 60324ce79e6..b0fa7e3d630 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java @@ -300,6 +300,14 @@ public class MergeView extends GenericViewPart implements IBranchEventListener, return Conditions.anyNull(mergeXWidget.getXViewer(), mergeXWidget.getXViewer().getTree()) || mergeXWidget.getXViewer().getTree().isDisposed(); } + private boolean conflictInvovlesArtifact(Artifact artifact, Conflict conflict) { + if (artifact.getArtId() == conflict.getArtId()) { + IOseeBranch branch = artifact.getBranch(); + return branch.equals(conflict.getSourceBranch()) || branch.equals(conflict.getDestBranch()); + } + return false; + } + @Override public void handleArtifactEvent(ArtifactEvent artifactEvent, final Sender sender) { if (isDisposed()) { @@ -337,7 +345,7 @@ public class MergeView extends GenericViewPart implements IBranchEventListener, if (showConflicts) { Conflict[] conflicts = getConflicts(); for (Conflict conflict : conflicts) { - if (artifact.equals(conflict.getSourceArtifact()) && branch.equals(conflict.getSourceBranch()) || artifact.equals(conflict.getDestArtifact()) && branch.equals(conflict.getDestBranch())) { + if (conflictInvovlesArtifact(artifact, conflict)) { mergeXWidget.setInputData(sourceBranch, destBranch, transactionId, mergeView, commitTrans, "Source Artifact Changed", showConflicts); if (artifact.equals(conflict.getSourceArtifact()) && sender.isLocal()) { |