diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/CompareValueWithClipboardAction.java b/java/debugger/impl/src/com/intellij/debugger/actions/CompareValueWithClipboardAction.java index b1b7995b0972..1d6ed15abb59 100644 --- a/java/debugger/impl/src/com/intellij/debugger/actions/CompareValueWithClipboardAction.java +++ b/java/debugger/impl/src/com/intellij/debugger/actions/CompareValueWithClipboardAction.java @@ -29,6 +29,6 @@ import com.intellij.openapi.project.Project; public class CompareValueWithClipboardAction extends BaseValueAction { protected void processText(final Project project, final String text, DebuggerTreeNodeImpl node, DebuggerContextImpl debuggerContext) { DiffRequest request = DiffRequestFactory.getInstance().createClipboardVsValue(text); - DiffManager.getInstance().showDiff(project, request, DiffDialogHints.DEFAULT); + DiffManager.getInstance().showDiff(project, request); } } \ No newline at end of file diff --git a/platform/diff-impl/src/com/intellij/diff/actions/BaseShowDiffAction.java b/platform/diff-impl/src/com/intellij/diff/actions/BaseShowDiffAction.java index dc3cdf6658f7..b0654d3570a4 100644 --- a/platform/diff-impl/src/com/intellij/diff/actions/BaseShowDiffAction.java +++ b/platform/diff-impl/src/com/intellij/diff/actions/BaseShowDiffAction.java @@ -45,7 +45,7 @@ abstract class BaseShowDiffAction extends AnAction implements DumbAware { DiffRequest request = getDiffRequest(e); if (request == null) return; - DiffManager.getInstance().showDiff(project, request, DiffDialogHints.DEFAULT); + DiffManager.getInstance().showDiff(project, request); } protected abstract boolean isAvailable(@NotNull AnActionEvent e); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/DiffActionExecutor.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/DiffActionExecutor.java index 2c64e9abfc16..dc10e4473d89 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/DiffActionExecutor.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/DiffActionExecutor.java @@ -167,7 +167,7 @@ public abstract class DiffActionExecutor { return; } if (!requestRef.isNull()) { - DiffManager.getInstance().showDiff(myProject, requestRef.get(), DiffDialogHints.FRAME); + DiffManager.getInstance().showDiff(myProject, requestRef.get()); } } }; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/ShowLineStatusRangeDiffAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/ShowLineStatusRangeDiffAction.java index 0fac6e9e3b53..e8418e230fac 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/ShowLineStatusRangeDiffAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/ShowLineStatusRangeDiffAction.java @@ -46,7 +46,7 @@ public class ShowLineStatusRangeDiffAction extends BaseLineStatusRangeAction { @Override public void actionPerformed(final AnActionEvent e) { - DiffManager.getInstance().showDiff(e.getProject(), createDiffData(), DiffDialogHints.DEFAULT); + DiffManager.getInstance().showDiff(e.getProject(), createDiffData()); } private DiffRequest createDiffData() { diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/VcsHistoryUtil.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/VcsHistoryUtil.java index cea37d0b8437..f79340bc524a 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/VcsHistoryUtil.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/VcsHistoryUtil.java @@ -99,7 +99,7 @@ public class VcsHistoryUtil { WaitForProgressToShow.runOrInvokeLaterAboveProgress(new Runnable() { public void run() { - DiffManager.getInstance().showDiff(project, request, DiffDialogHints.FRAME); + DiffManager.getInstance().showDiff(project, request); } }, null, project); } diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/actions/XCompareWithClipboardAction.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/actions/XCompareWithClipboardAction.java index 3f97a8e3df29..d91810ae924c 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/actions/XCompareWithClipboardAction.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/actions/XCompareWithClipboardAction.java @@ -34,7 +34,7 @@ public class XCompareWithClipboardAction extends XFetchValueActionBase { @Override public void run() { DiffRequest request = DiffRequestFactory.getInstance().createClipboardVsValue(value); - DiffManager.getInstance().showDiff(project, request, DiffDialogHints.DEFAULT); + DiffManager.getInstance().showDiff(project, request); } }); } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/AbstractShowPropertiesDiffAction.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/AbstractShowPropertiesDiffAction.java index 363fcd842044..343feea5e4c6 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/AbstractShowPropertiesDiffAction.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/AbstractShowPropertiesDiffAction.java @@ -178,7 +178,7 @@ public abstract class AbstractShowPropertiesDiffAction extends AnAction implemen new PropertyContent(myBeforeContent), new PropertyContent(myAfterContent), revisionToString(myBeforeRevisionValue), revisionToString(myAfterRevision)); } - DiffManager.getInstance().showDiff(myProject, diffRequest, DiffDialogHints.DEFAULT); + DiffManager.getInstance().showDiff(myProject, diffRequest); } } }); diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/diff/FileWithBranchComparer.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/diff/FileWithBranchComparer.java index 0b6020b815cb..d668ba9e92b3 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/diff/FileWithBranchComparer.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/diff/FileWithBranchComparer.java @@ -81,7 +81,7 @@ public class FileWithBranchComparer extends ElementWithBranchComparer { DiffRequest request = new SimpleDiffRequest(title, content1, content2, title1, title2); - DiffManager.getInstance().showDiff(myProject, request, DiffDialogHints.DEFAULT); + DiffManager.getInstance().showDiff(myProject, request); } }