From 740f69c2e29cdb14155cdc9bcd8e038f5acba12d Mon Sep 17 00:00:00 2001 From: Nadya Zabrodina Date: Tue, 15 Dec 2015 12:06:50 +0300 Subject: [PATCH] [patch]: cleanUp: remove unnecessary notification that never occurs and do noting * showStatus dosn't show failed status; * Failed status notification shown inside nonWriteActionPreCheck() for this workflow --- .../openapi/diff/impl/patch/formove/PatchApplier.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/formove/PatchApplier.java b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/formove/PatchApplier.java index 940e3de39e82..94e3814f62e0 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/formove/PatchApplier.java +++ b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/formove/PatchApplier.java @@ -166,11 +166,8 @@ public class PatchApplier { final ApplyPatchStatus patchStatus = nonWriteActionPreCheck(); if (ApplyPatchStatus.FAILURE.equals(patchStatus)) { - if (myShowNotification) { - showApplyStatus(myProject, patchStatus); - } - myStatus = patchStatus; - return; + myStatus = patchStatus; + return; } final TriggerAdditionOrDeletion trigger = new TriggerAdditionOrDeletion(myProject);