MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

diff: remove unused parameter

Browse Source
This commit is contained in:
Aleksey Pivovarov
2015-08-25 19:04:19 +03:00
parent 8867cbff2f
commit bcfbe7bb4a
1 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchAction.java
+22 -25
View File
@@ -167,7 +167,7 @@ public class ApplyPatchAction extends DumbAwareAction {
return showMergeDialog(project, file, mergeData.getBase(), mergeData.getPatched(), reverse, leftPanelTitle, rightPanelTitle);
}
else {
return showBadDiffDialog(project, file, mergeData, false);
return showBadDiffDialog(project, file, mergeData);
}
}
@@ -250,8 +250,7 @@ public class ApplyPatchAction extends DumbAwareAction {
@NotNull
private static ApplyPatchStatus showBadDiffDialog(@Nullable Project project,
@NotNull VirtualFile file,
@NotNull final ApplyPatchForBaseRevisionTexts texts,
boolean readonly) {
@NotNull final ApplyPatchForBaseRevisionTexts texts) {
final Document document = FileDocumentManager.getInstance().getDocument(file);
if (texts.getLocal() == null || document == null) return ApplyPatchStatus.FAILURE;
@@ -277,28 +276,26 @@ public class ApplyPatchAction extends DumbAwareAction {
DiffUtil.addNotification(new DiffIsApproximateNotification(), request);
final DiffDialogHints dialogHints = new DiffDialogHints(WindowWrapper.Mode.MODAL);
if (!readonly) {
dialogHints.setCancelAction(new BooleanGetter() {
@Override
public boolean get() {
ApplicationManager.getApplication().runWriteAction(new Runnable() {
@Override
public void run() {
document.setText(oldContent);
FileDocumentManager.getInstance().saveDocument(document);
}
});
return true;
}
});
dialogHints.setOkAction(new BooleanGetter() {
@Override
public boolean get() {
FileDocumentManager.getInstance().saveDocument(document);
return true;
}
});
}
dialogHints.setCancelAction(new BooleanGetter() {
@Override
public boolean get() {
ApplicationManager.getApplication().runWriteAction(new Runnable() {
@Override
public void run() {
document.setText(oldContent);
FileDocumentManager.getInstance().saveDocument(document);
}
});
return true;
}
});
dialogHints.setOkAction(new BooleanGetter() {
@Override
public boolean get() {
FileDocumentManager.getInstance().saveDocument(document);
return true;
}
});
DiffManager.getInstance().showDiff(project, request, dialogHints);