From 469ee0e4d5c2c64e83d32270976d0cf756c6cd32 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Mon, 18 Aug 2014 13:46:40 +0400
Subject: [PATCH] generate getter/setter via providers (IDEA-128662)

---
 .../JavaGenerateMemberCompletionContributor.java       | 10 ++++------
 .../daemon/impl/quickfix/CreateGetterOrSetterFix.java  |  6 ++++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaGenerateMemberCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaGenerateMemberCompletionContributor.java
index 7015004b7340..0deafb45cad9 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaGenerateMemberCompletionContributor.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaGenerateMemberCompletionContributor.java
@@ -15,10 +15,7 @@
  */
 package com.intellij.codeInsight.completion;
 
-import com.intellij.codeInsight.generation.GenerateMembersUtil;
-import com.intellij.codeInsight.generation.OverrideImplementExploreUtil;
-import com.intellij.codeInsight.generation.OverrideImplementUtil;
-import com.intellij.codeInsight.generation.PsiGenerationInfo;
+import com.intellij.codeInsight.generation.*;
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.codeInsight.lookup.LookupElementBuilder;
 import com.intellij.icons.AllIcons;
@@ -35,6 +32,7 @@ import com.intellij.util.containers.ContainerUtil;
 
 import javax.swing.*;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
@@ -70,8 +68,8 @@ public class JavaGenerateMemberCompletionContributor {
     List<PsiMethod> prototypes = ContainerUtil.newArrayList();
     for (PsiField field : parent.getFields()) {
       if (!(field instanceof PsiEnumConstant)) {
-        prototypes.add(GenerateMembersUtil.generateGetterPrototype(field));
-        prototypes.add(GenerateMembersUtil.generateSetterPrototype(field));
+        Collections.addAll(prototypes, GetterSetterPrototypeProvider.generateGetterSetters(field, true));
+        Collections.addAll(prototypes, GetterSetterPrototypeProvider.generateGetterSetters(field, true));
       }
     }
     for (final PsiMethod prototype : prototypes) {
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateGetterOrSetterFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateGetterOrSetterFix.java
index 209dde6cf4ea..897c6f80a571 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateGetterOrSetterFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateGetterOrSetterFix.java
@@ -18,6 +18,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix;
 import com.intellij.codeInsight.FileModificationService;
 import com.intellij.codeInsight.daemon.QuickFixBundle;
 import com.intellij.codeInsight.generation.GenerateMembersUtil;
+import com.intellij.codeInsight.generation.GetterSetterPrototypeProvider;
 import com.intellij.codeInsight.intention.IntentionAction;
 import com.intellij.codeInsight.intention.LowPriorityAction;
 import com.intellij.openapi.editor.Editor;
@@ -29,6 +30,7 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -115,10 +117,10 @@ public class CreateGetterOrSetterFix implements IntentionAction, LowPriorityActi
     PsiClass aClass = myField.getContainingClass();
     final List<PsiMethod> methods = new ArrayList<PsiMethod>();
     if (myCreateGetter) {
-      methods.add(GenerateMembersUtil.generateGetterPrototype(myField));
+      Collections.addAll(methods, GetterSetterPrototypeProvider.generateGetterSetters(myField, true));
     }
     if (myCreateSetter) {
-      methods.add(GenerateMembersUtil.generateSetterPrototype(myField));
+      Collections.addAll(methods, GetterSetterPrototypeProvider.generateGetterSetters(myField, false));
     }
     for (PsiMethod method : methods) {
       aClass.add(method);