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

properly localize comparision notification

Browse Source 
GitOrigin-RevId: cb16398b753f849c5271761efe4a7c73b4769d08
This commit is contained in:
Dmitry.Krasilschikov
2020-01-08 14:33:55 +00:00
committed by intellij-monorepo-bot
parent 35d2b668ab
commit bfdb17fb1f
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/src/com/intellij/diff/tools/binary/TwosideBinaryDiffViewer.java
+9 -8
View File
@@ -41,6 +41,7 @@ import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.project.DumbAwareAction;
import com.intellij.openapi.ui.Messages;
import com.intellij.openapi.util.NullableComputable;
import com.intellij.openapi.util.io.FileUtilRt;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.ThreeState;
@@ -136,14 +137,14 @@ public class TwosideBinaryDiffViewer extends TwosideDiffViewer<BinaryEditorHolde
contentsEquals = false;
}
else if (FileUtilRt.isTooLarge(length1) || FileUtilRt.isTooLarge(length2)) {
return new ComparisonData(ThreeState.UNSURE, "Files are too large to compare");
return new ComparisonData(ThreeState.UNSURE, () -> "Files are too large to compare");
}
else {
contentsEquals = DiffUtil.compareStreams(() -> DiffUtil.getFileInputStream(file1), () -> DiffUtil.getFileInputStream(file2));
}
return new ComparisonData(ThreeState.fromBoolean(contentsEquals),
contentsEquals ? DiffBundle.message("diff.contents.are.identical.message.text") : null);
() -> contentsEquals ? DiffBundle.message("diff.contents.are.identical.message.text") : null);
}
catch (IOException e) {
LOG.warn(e);
@@ -171,8 +172,8 @@ public class TwosideBinaryDiffViewer extends TwosideDiffViewer<BinaryEditorHolde
myComparisonData = comparisonData;
if (myComparisonData.notification != null) {
myPanel.addNotification(DiffNotifications.createNotification(myComparisonData.notification));
if (myComparisonData.notification.get() != null) {
myPanel.addNotification(DiffNotifications.createNotification(myComparisonData.notification.get()));
}
myStatusPanel.update();
};
@@ -275,13 +276,13 @@ public class TwosideBinaryDiffViewer extends TwosideDiffViewer<BinaryEditorHolde
}
private static class ComparisonData {
public static final ComparisonData UNKNOWN = new ComparisonData(ThreeState.UNSURE, null);
public static final ComparisonData ERROR = new ComparisonData(ThreeState.UNSURE, DiffBundle.message("diff.cant.calculate.diff"));
public static final ComparisonData UNKNOWN = new ComparisonData(ThreeState.UNSURE, () -> null);
public static final ComparisonData ERROR = new ComparisonData(ThreeState.UNSURE, () -> DiffBundle.message("diff.cant.calculate.diff"));
@NotNull public final ThreeState isContentsEqual;
@Nullable public final String notification;
@NotNull public final NullableComputable<String> notification;
private ComparisonData(@NotNull ThreeState isContentsEqual, @Nullable String notification) {
private ComparisonData(@NotNull ThreeState isContentsEqual, @NotNull NullableComputable<String> notification) {
this.isContentsEqual = isContentsEqual;
this.notification = notification;
}