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: unify error messages

Browse Source
This commit is contained in:
Aleksey Pivovarov
2017-07-17 13:03:58 +03:00
parent 6f996ef063
commit f31b86179e
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-api/src/com/intellij/diff/requests/ErrorDiffRequest.java
+2 -1
View File
@@ -16,6 +16,7 @@
package com.intellij.diff.requests;
import com.intellij.diff.chains.DiffRequestProducer;
import com.intellij.openapi.diff.DiffBundle;
import com.intellij.openapi.util.text.StringUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -70,6 +71,6 @@ public class ErrorDiffRequest extends MessageDiffRequest {
@NotNull
private static String getErrorMessage(@NotNull Throwable e) {
String message = e.getMessage();
return StringUtil.isEmptyOrSpaces(message) ? "Error: can't show diff" : message;
return StringUtil.isEmptyOrSpaces(message) ? DiffBundle.message("error.cant.show.diff.message") : message;
}
}
platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java
+2 -1
View File
@@ -43,6 +43,7 @@ import com.intellij.openapi.actionSystem.impl.ActionToolbarImpl;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.diff.DiffBundle;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.LogicalPosition;
import com.intellij.openapi.project.DumbAware;
@@ -297,7 +298,7 @@ public abstract class DiffRequestProcessor implements Disposable {
}
catch (Throwable e) {
LOG.error(e);
myState = new ErrorState(new ErrorDiffRequest("Error: can't show diff"), getFittedTool());
myState = new ErrorState(new ErrorDiffRequest(DiffBundle.message("error.cant.show.diff.message")), getFittedTool());
myState.init();
}
platform/platform-resources-en/src/messages/DiffBundle.properties
+1
View File
@@ -45,6 +45,7 @@ diff.count.differences.status.text={0, choice, 0#No differences|1#1 difference|2
diff.all.differences.ignored.text=Differences ignored
diff.highlighting.disabled.text=Differences highlighting is off
cant.launch.diff.tool.error.message=Can't Launch Diff Tool
error.cant.show.diff.message=Error: can't show diff
binary.files.are.identical.message=Binary files are identical
files.are.identical.dialog.title=Files Are Identical
binary.files.are.different.message=Binary files are different
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeViewDiffRequestProcessor.java
+2 -1
View File
@@ -21,6 +21,7 @@ import com.intellij.diff.requests.DiffRequest;
import com.intellij.diff.requests.ErrorDiffRequest;
import com.intellij.diff.requests.LoadingDiffRequest;
import com.intellij.diff.util.DiffUserDataKeysEx.ScrollToPolicy;
import com.intellij.openapi.diff.DiffBundle;
import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.project.Project;
@@ -86,7 +87,7 @@ public abstract class ChangeViewDiffRequestProcessor extends CacheDiffRequestPro
protected DiffRequest loadRequest(@NotNull ChangeWrapper provider, @NotNull ProgressIndicator indicator)
throws ProcessCanceledException, DiffRequestProducerException {
ChangeDiffRequestProducer presentable = ChangeDiffRequestProducer.create(getProject(), provider.change);
if (presentable == null) return new ErrorDiffRequest("Can't show diff");
if (presentable == null) return new ErrorDiffRequest(DiffBundle.message("error.cant.show.diff.message"));
return presentable.process(getContext(), indicator);
}