From a85c7e38826355189b2929e606d983a4397dad02 Mon Sep 17 00:00:00 2001
From: Eugene Petrenko <eugene.petrenko@jetbrains.com>
Date: Tue, 17 Dec 2019 11:47:54 +0100
Subject: [PATCH] deregister SetupJDKFix.java, we offer new actions for that

GitOrigin-RevId: 852468e60f11734314453c9bec155ac2c35bd144
---
 .../com/intellij/codeInsight/intention/QuickFixFactory.java | 3 ---
 .../daemon/impl/analysis/HighlightVisitorImpl.java          | 1 -
 .../daemon/impl/quickfix/DefaultQuickFixProvider.java       | 2 --
 .../intention/impl/config/QuickFixFactoryImpl.java          | 6 ------
 .../lang/properties/psi/DefaultResourceBundleManager.java   | 4 ++--
 5 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/java/java-analysis-api/src/com/intellij/codeInsight/intention/QuickFixFactory.java b/java/java-analysis-api/src/com/intellij/codeInsight/intention/QuickFixFactory.java
index 4a83b0a0f278..7fbe7f816764 100644
--- a/java/java-analysis-api/src/com/intellij/codeInsight/intention/QuickFixFactory.java
+++ b/java/java-analysis-api/src/com/intellij/codeInsight/intention/QuickFixFactory.java
@@ -141,9 +141,6 @@ public abstract class QuickFixFactory {
                                                                  @NotNull PropertyMemberType targetMember,
                                                                  @NotNull PsiAnnotation... annotations);
 
-  @NotNull
-  public abstract IntentionAction createSetupJDKFix();
-
   @NotNull
   public abstract IntentionAction createAddExceptionToCatchFix();
 
diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java
index d06114841f7f..ad25613a7cf9 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java
@@ -749,7 +749,6 @@ public class HighlightVisitorImpl extends JavaElementVisitor implements Highligh
       assert referenceNameElement != null : ref;
       final HighlightInfo info =
         HighlightInfo.newHighlightInfo(HighlightInfoType.WRONG_REF).range(referenceNameElement).descriptionAndTooltip(description).create();
-      QuickFixAction.registerQuickFixAction(info, QuickFixFactory.getInstance().createSetupJDKFix());
       myHolder.add(info);
     }
     else {
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DefaultQuickFixProvider.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DefaultQuickFixProvider.java
index 1bf842f22192..acd6e5e597eb 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DefaultQuickFixProvider.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DefaultQuickFixProvider.java
@@ -36,11 +36,9 @@ public class DefaultQuickFixProvider extends UnresolvedReferenceQuickFixProvider
       return;
     }
 
-    QuickFixFactory quickFixFactory = QuickFixFactory.getInstance();
     registrar.register(new ImportClassFix(ref));
     registrar.register(new StaticImportConstantFix(containingFile, ref));
     registrar.register(new QualifyStaticConstantFix(containingFile, ref));
-    registrar.register(quickFixFactory.createSetupJDKFix());
 
     OrderEntryFix.registerFixes(registrar, ref);
 
diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/config/QuickFixFactoryImpl.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/config/QuickFixFactoryImpl.java
index 21dd3a721f85..3b6c1dfcb5f0 100644
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/config/QuickFixFactoryImpl.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/config/QuickFixFactoryImpl.java
@@ -203,12 +203,6 @@ public class QuickFixFactoryImpl extends QuickFixFactory {
     return new CreateFieldOrPropertyFix(aClass, name, type, targetMember, annotations);
   }
 
-  @NotNull
-  @Override
-  public IntentionAction createSetupJDKFix() {
-    return SetupJDKFix.getInstance();
-  }
-
   @NotNull
   @Override
   public IntentionAction createAddExceptionToCatchFix() {
diff --git a/plugins/java-i18n/src/com/intellij/lang/properties/psi/DefaultResourceBundleManager.java b/plugins/java-i18n/src/com/intellij/lang/properties/psi/DefaultResourceBundleManager.java
index c5852e97cf88..f17f74399d0c 100644
--- a/plugins/java-i18n/src/com/intellij/lang/properties/psi/DefaultResourceBundleManager.java
+++ b/plugins/java-i18n/src/com/intellij/lang/properties/psi/DefaultResourceBundleManager.java
@@ -17,7 +17,7 @@
 package com.intellij.lang.properties.psi;
 
 import com.intellij.codeInsight.CodeInsightBundle;
-import com.intellij.codeInsight.intention.QuickFixFactory;
+import com.intellij.codeInsight.daemon.impl.quickfix.SetupJDKFix;
 import com.intellij.ide.fileTemplates.JavaTemplateUtil;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.JavaPsiFacade;
@@ -52,7 +52,7 @@ public class DefaultResourceBundleManager extends ResourceBundleManager {
     if (getResourceBundle() != null) {
       return true;
     }
-    throw new ResourceBundleNotFoundException(CodeInsightBundle.message("i18nize.dialog.error.jdk.message"), QuickFixFactory.getInstance().createSetupJDKFix());
+    throw new ResourceBundleNotFoundException(CodeInsightBundle.message("i18nize.dialog.error.jdk.message"), SetupJDKFix.getInstance());
   }
 
   @Override