diff options
2 files changed, 10 insertions, 2 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithRevisionAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithRevisionAction.java index 94eb9d331..9925826d3 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithRevisionAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithRevisionAction.java @@ -42,8 +42,7 @@ public class CompareWithRevisionAction extends WorkspaceAction { // Show the compare viewer run(new IRunnableWithProgress() { public void run(IProgressMonitor monitor) throws InterruptedException, InvocationTargetException { - - if(CVSUIPlugin.getPlugin().getPreferenceStore().getBoolean(ICVSUIConstants.PREF_SHOW_COMPARE_REVISION_IN_DIALOG)) { + if (isShowInDialog()) { IFile file = (IFile) getSelectedResources()[0]; showCompareInDialog(getShell(), file); } else { @@ -117,4 +116,8 @@ public class CompareWithRevisionAction extends WorkspaceAction { protected boolean isEnabledForIgnoredResources() { return true; } + + protected boolean isShowInDialog() { + return CVSUIPlugin.getPlugin().getPreferenceStore().getBoolean(ICVSUIConstants.PREF_SHOW_COMPARE_REVISION_IN_DIALOG); + } } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithRevisionAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithRevisionAction.java index 15f77e55d..aed1f433e 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithRevisionAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithRevisionAction.java @@ -72,4 +72,9 @@ public class ReplaceWithRevisionAction extends CompareWithRevisionAction { protected String getActionTitle() { return CVSUIMessages.ReplaceWithRevisionAction_1; } + + protected boolean isShowInDialog() { + // Always show a replace in a dialog + return true; + } } |