diff options
author | Michael Valenta | 2004-08-16 18:45:56 +0000 |
---|---|---|
committer | Michael Valenta | 2004-08-16 18:45:56 +0000 |
commit | 4ecc587b5bddb87bdeeda12b9ad7833bb0991202 (patch) | |
tree | c88de91ee96420b469b9c4f61ddb3f7af2fa002d | |
parent | 1534f2ab3ac7eb8411a2e039fd1a9363476bc83f (diff) | |
download | eclipse.platform.team-4ecc587b5bddb87bdeeda12b9ad7833bb0991202.tar.gz eclipse.platform.team-4ecc587b5bddb87bdeeda12b9ad7833bb0991202.tar.xz eclipse.platform.team-4ecc587b5bddb87bdeeda12b9ad7833bb0991202.zip |
-rw-r--r-- | bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/OpenInCompareAction.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/OpenInCompareAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/OpenInCompareAction.java index deff9e834..1c915dbc7 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/OpenInCompareAction.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/OpenInCompareAction.java @@ -13,6 +13,7 @@ package org.eclipse.team.internal.ui.synchronize.actions; import org.eclipse.compare.CompareUI; import org.eclipse.core.resources.IResource; import org.eclipse.jface.action.Action; +import org.eclipse.jface.util.OpenStrategy; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.team.core.synchronize.SyncInfo; @@ -47,7 +48,7 @@ public class OpenInCompareAction extends Action { if (obj instanceof SyncInfoModelElement) { SyncInfo info = ((SyncInfoModelElement) obj).getSyncInfo(); if (info != null) { - openCompareEditor(name, info, false /* don't keep focus */, site); + openCompareEditor(name, info, !OpenStrategy.activateOnOpen(), site); } } } |