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: ask to show content of equal files

Browse Source
This commit is contained in:
Aleksey Pivovarov
2014-02-21 12:38:02 +04:00
parent 74153c9188
commit 997c1b2f56
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/diff/impl/external/FrameDiffTool.java
Vendored
+2 -4
View File
@@ -197,10 +197,8 @@ public class FrameDiffTool implements DiffTool {
String message = Arrays.equals(bytes1, bytes2)
? DiffBundle.message("diff.contents.are.identical.message.text")
: DiffBundle.message("diff.contents.have.differences.only.in.line.separators.message.text");
Messages.showInfoMessage(data.getProject(), message, DiffBundle.message("no.differences.dialog.title"));
return false;
//return Messages.showDialog(data.getProject(), message + "\nShow diff anyway?", "No Differences", new String[]{"Yes", "No"}, 1,
// Messages.getQuestionIcon()) == 0;
return Messages.showYesNoDialog(data.getProject(), message + "\n" + DiffBundle.message("show.diff.anyway.dialog.message"),
DiffBundle.message("no.differences.dialog.title"), Messages.getQuestionIcon()) == Messages.YES;
}
public boolean canShow(DiffRequest data) {
platform/platform-resources-en/src/messages/DiffBundle.properties
+1
View File
@@ -54,6 +54,7 @@ select.external.diff.program.dialog.title=Select External Diff Program
diff.contents.are.identical.message.text=Contents are identical
diff.contents.have.differences.only.in.line.separators.message.text=Contents have differences only in line separators
diff.contents.have.differences.only.in.line.separators.or.whitespaces=Contents have differences only in line separators or whitespaces
show.diff.anyway.dialog.message=Show diff anyway?
no.differences.dialog.title=No Differences
merge.dialog.apply.change.action.name=Apply change
merge.dialog.ignore.change.action.name=Ignore change