From d0fb95d067f91302284c00ad9c2c821b53aa3836 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Fri, 23 Aug 2013 16:18:07 +0400
Subject: [PATCH] override/implement: allow members to be in primary/secondary
 sets at the same time - filter them from the result; preselect first element
 when no selection was set before (IDEA-112563)

---
 .../JavaOverrideImplementMemberChooser.java          | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/JavaOverrideImplementMemberChooser.java b/java/java-impl/src/com/intellij/codeInsight/generation/JavaOverrideImplementMemberChooser.java
index 3708b5ee2214..f304a06ec96c 100644
--- a/java/java-impl/src/com/intellij/codeInsight/generation/JavaOverrideImplementMemberChooser.java
+++ b/java/java-impl/src/com/intellij/codeInsight/generation/JavaOverrideImplementMemberChooser.java
@@ -23,8 +23,10 @@ import org.jetbrains.annotations.Nullable;
 import javax.swing.*;
 import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.LinkedHashSet;
 
 /**
  * @author Dmitry Batkovich
@@ -54,7 +56,9 @@ public class JavaOverrideImplementMemberChooser extends MemberChooser<PsiMethodM
     if (candidates.isEmpty() && secondary.isEmpty()) return null;
 
     final PsiMethodMember[] onlyPrimary = convertToMethodMembers(candidates);
-    final PsiMethodMember[] all = ArrayUtil.mergeArrays(onlyPrimary, convertToMethodMembers(secondary));
+    final LinkedHashSet<CandidateInfo> allCandidates = new LinkedHashSet<CandidateInfo>(candidates);
+    allCandidates.addAll(secondary);
+    final PsiMethodMember[] all = convertToMethodMembers(allCandidates);
     final NotNullLazyValue<PsiMethodWithOverridingPercentMember[]> lazyElementsWithPercent =
       new NotNullLazyValue<PsiMethodWithOverridingPercentMember[]>() {
         @NotNull
@@ -76,7 +80,11 @@ public class JavaOverrideImplementMemberChooser extends MemberChooser<PsiMethodM
     javaOverrideImplementMemberChooser.setCopyJavadocVisible(true);
 
     if (toImplement) {
-      javaOverrideImplementMemberChooser.selectElements(onlyPrimary);
+      if (onlyPrimary.length == 0) {
+        javaOverrideImplementMemberChooser.selectElements(new ClassMember[] {all[0]});
+      } else {
+        javaOverrideImplementMemberChooser.selectElements(onlyPrimary);
+      }
     }
 
     if (ApplicationManager.getApplication().isUnitTestMode()) {