From 6455b1d78ec9aaa11da398b2c23d1f7972815e4e Mon Sep 17 00:00:00 2001
From: Konstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Date: Sun, 25 Sep 2016 19:33:39 +0300
Subject: [PATCH] svn: Removed unnecessary "QuickMergeInteraction.showError()"

Utilized "QuickMergeInteraction.showErrors()" instead
---
 .../org/jetbrains/idea/svn/integrate/QuickMerge.java | 12 +++++++-----
 .../idea/svn/integrate/QuickMergeInteraction.java    |  1 -
 .../svn/integrate/QuickMergeInteractionImpl.java     |  7 -------
 .../idea/svn/QuickMergeTestInteraction.java          |  5 -----
 4 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMerge.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMerge.java
index 00d463b31350..717bcd548af0 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMerge.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMerge.java
@@ -16,19 +16,21 @@
 package org.jetbrains.idea.svn.integrate;
 
 import com.intellij.openapi.fileEditor.FileDocumentManager;
-import org.jetbrains.annotations.CalledInAwt;
 import com.intellij.openapi.vcs.VcsException;
 import com.intellij.util.Consumer;
 import com.intellij.util.continuation.Continuation;
 import com.intellij.util.continuation.TaskDescriptor;
+import org.jetbrains.annotations.CalledInAwt;
 import org.jetbrains.annotations.NotNull;
 import org.tmatesoft.svn.core.SVNException;
 
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 
+import static com.intellij.util.ObjectUtils.notNull;
+import static java.util.Collections.singletonList;
+
 public class QuickMerge {
 
   @NotNull private final MergeContext myMergeContext;
@@ -57,19 +59,19 @@ public class QuickMerge {
     myContinuation.addExceptionHandler(VcsException.class, new Consumer<VcsException>() {
       @Override
       public void consume(VcsException e) {
-        myInteraction.showErrors(myMergeContext.getTitle(), Collections.singletonList(e));
+        myInteraction.showErrors(myMergeContext.getTitle(), singletonList(e));
       }
     });
     myContinuation.addExceptionHandler(SVNException.class, new Consumer<SVNException>() {
       @Override
       public void consume(SVNException e) {
-        myInteraction.showErrors(myMergeContext.getTitle(), Collections.singletonList(new VcsException(e)));
+        myInteraction.showErrors(myMergeContext.getTitle(), singletonList(new VcsException(e)));
       }
     });
     myContinuation.addExceptionHandler(RuntimeException.class, new Consumer<RuntimeException>() {
       @Override
       public void consume(RuntimeException e) {
-        myInteraction.showError(e);
+        myInteraction.showErrors(notNull(e.getMessage(), e.getClass().getName()), singletonList(new VcsException(e)));
       }
     });
     myContinuation.run(tasks);
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMergeInteraction.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMergeInteraction.java
index 3fb7e5543fb9..be43400fcbb9 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMergeInteraction.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMergeInteraction.java
@@ -46,7 +46,6 @@ public interface QuickMergeInteraction {
 
   void showIntersectedLocalPaths(final List<FilePath> paths);
 
-  void showError(@NotNull Exception exception);
   void showErrors(final String message, final List<VcsException> exceptions);
   void showErrors(final String message, final boolean isError);
 
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMergeInteractionImpl.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMergeInteractionImpl.java
index 1348cd0c0658..7b9e967c9970 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMergeInteractionImpl.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMergeInteractionImpl.java
@@ -30,7 +30,6 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.idea.svn.dialogs.*;
 import org.jetbrains.idea.svn.mergeinfo.MergeChecker;
 
-import java.util.Collections;
 import java.util.List;
 
 /**
@@ -125,12 +124,6 @@ public class QuickMergeInteractionImpl implements QuickMergeInteraction {
       paths, "The following file(s) have local changes that will intersect with merge changes:");
   }
 
-  @Override
-  public void showError(@NotNull Exception exception) {
-    AbstractVcsHelper.getInstance(myProject).showErrors(Collections.singletonList(new VcsException(exception)),
-      exception.getMessage() == null ? exception.getClass().getName() : exception.getMessage());
-  }
-
   @Override
   public void showErrors(String message, List<VcsException> exceptions) {
     AbstractVcsHelper.getInstance(myProject).showErrors(exceptions, message);
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/QuickMergeTestInteraction.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/QuickMergeTestInteraction.java
index c6a271df4eb0..031e085ea4a4 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/QuickMergeTestInteraction.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/QuickMergeTestInteraction.java
@@ -100,11 +100,6 @@ public class QuickMergeTestInteraction implements QuickMergeInteraction {
   public void showIntersectedLocalPaths(List<FilePath> paths) {
   }
 
-  @Override
-  public void showError(@NotNull Exception exception) {
-    myExceptions.add(exception);
-  }
-
   @Override
   public void showErrors(String message, List<VcsException> exceptions) {
     if (!isEmpty(exceptions)) {