mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
diff: cleanup
* do not explicitly pass DEFAULT hint * do not use FRAME hint - it's better to show modal window, than to show frame window that user cannot see
This commit is contained in:
+1
-1
@@ -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);
|
||||
}
|
||||
}
|
||||
@@ -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);
|
||||
|
||||
@@ -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());
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
+1
-1
@@ -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() {
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
+1
-1
@@ -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);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
+1
-1
@@ -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);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user