From 3c20d808f7470db9db25f097ab8a19bf5c718263 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Tue, 19 May 2015 17:10:50 +0300 Subject: [PATCH] diff: show "Loading..." instead of "Nothing to show" message by-default * it's visible until first doApplyRequest() call, so it's actually "loading" * NoDiffRequest has a single instance, so mock viewer will not be replaced by a real one if there are actually nothing to show. (ex: there will be no toolbar) --- .../src/com/intellij/diff/impl/DiffRequestProcessor.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java b/platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java index a1f1abe9fba0..3e934bf0a8f7 100644 --- a/platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java +++ b/platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java @@ -24,8 +24,8 @@ import com.intellij.diff.actions.impl.*; import com.intellij.diff.impl.DiffSettingsHolder.DiffSettings; import com.intellij.diff.requests.DiffRequest; import com.intellij.diff.requests.ErrorDiffRequest; +import com.intellij.diff.requests.LoadingDiffRequest; import com.intellij.diff.requests.MessageDiffRequest; -import com.intellij.diff.requests.NoDiffRequest; import com.intellij.diff.tools.ErrorDiffTool; import com.intellij.diff.tools.external.ExternalDiffTool; import com.intellij.diff.tools.util.DiffDataKeys; @@ -107,7 +107,7 @@ public abstract class DiffRequestProcessor implements Disposable { myProject = project; myContext = new MyDiffContext(context); - myActiveRequest = NoDiffRequest.INSTANCE; + myActiveRequest = new LoadingDiffRequest(); mySettings = DiffSettingsHolder.getInstance().getSettings(myContext.getUserData(DiffUserDataKeysEx.PLACE)); @@ -140,7 +140,7 @@ public abstract class DiffRequestProcessor implements Disposable { if (bottomPanel instanceof Disposable) Disposer.register(this, (Disposable)bottomPanel); myState = new EmptyState(); - myContentPanel.setContent(DiffUtil.createMessagePanel(NoDiffRequest.INSTANCE.getMessage())); + myContentPanel.setContent(DiffUtil.createMessagePanel(((LoadingDiffRequest)myActiveRequest).getMessage())); myOpenInEditorAction = new OpenInEditorAction(new Runnable() { @Override