From 69e300be548163569135ae63799322a4e62cf524 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Wed, 11 Mar 2015 15:05:41 +0100 Subject: [PATCH] allow helpId in generate dialogs (cherry picked from commit 061f9f7e08a5b2269d1e686c194fe3f2642ca795) --- .../generation/GenerateMembersHandlerBase.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersHandlerBase.java b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersHandlerBase.java index 2637409963bc..90eb770891c0 100644 --- a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersHandlerBase.java +++ b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersHandlerBase.java @@ -15,7 +15,6 @@ */ package com.intellij.codeInsight.generation; -import com.intellij.analysis.AnalysisScope; import com.intellij.codeInsight.CodeInsightActionHandler; import com.intellij.codeInsight.CodeInsightUtilBase; import com.intellij.codeInsight.hint.HintManager; @@ -38,14 +37,11 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; -import com.intellij.psi.search.LocalSearchScope; -import com.intellij.util.Function; import com.intellij.util.IncorrectOperationException; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.java.generate.exception.GenerateCodeException; -import org.jetbrains.java.generate.template.TemplatesManager; import javax.swing.*; import java.util.ArrayList; @@ -258,7 +254,13 @@ public abstract class GenerateMembersHandlerBase implements CodeInsightActionHan boolean allowEmptySelection, boolean copyJavadocCheckbox, Project project) { - MemberChooser chooser = new MemberChooser(members, allowEmptySelection, true, project, false, getHeaderPanel(project)); + MemberChooser chooser = new MemberChooser(members, allowEmptySelection, true, project, false, getHeaderPanel(project)) { + @Nullable + @Override + protected String getHelpId() { + return GenerateMembersHandlerBase.this.getHelpId(); + } + }; chooser.setTitle(myChooserTitle); chooser.setCopyJavadocVisible(copyJavadocCheckbox); return chooser; @@ -269,6 +271,10 @@ public abstract class GenerateMembersHandlerBase implements CodeInsightActionHan return null; } + protected String getHelpId() { + return null; + } + @NotNull protected List generateMemberPrototypes(PsiClass aClass, ClassMember[] members) throws IncorrectOperationException { ArrayList array = new ArrayList();