From b860b421c1fa7d7f21d1900fee3ef1ac97877d0b Mon Sep 17 00:00:00 2001 From: Nadya Zabrodina Date: Wed, 10 Oct 2018 15:12:44 +0300 Subject: [PATCH] shelf: cleanup - DRY --- .../openapi/vcs/changes/shelf/ShelveChangesManager.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelveChangesManager.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelveChangesManager.java index d9d38782da4f..d14c53e070f1 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelveChangesManager.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelveChangesManager.java @@ -654,16 +654,11 @@ public class ShelveChangesManager implements JDOMExternalizable, ProjectComponen try { textFilePatches = loadTextPatches(myProject, changeList, changes, remainingPatches, commitContext); } - catch (IOException e) { + catch (IOException | PatchSyntaxException e) { LOG.info(e); PatchApplier.showError(myProject, "Cannot load patch(es): " + e.getMessage()); return; } - catch (PatchSyntaxException e) { - PatchApplier.showError(myProject, "Cannot load patch(es): " + e.getMessage()); - LOG.info(e); - return; - } final List patches = new ArrayList<>(textFilePatches);