MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Taglibs support: generate functions

Browse Source
This commit is contained in:
Dmitry Avdeev
2010-09-06 10:29:43 +04:00
parent 73d763e4e4
commit 780633edb4
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/openapi/src/com/intellij/util/xml/actions/CreateClassMappingAction.java
+6 -6
View File
@@ -39,10 +39,10 @@ import java.util.Map;
*/
public abstract class CreateClassMappingAction<T extends DomElement> extends CreateDomElementAction<T> {
private final String myBaseClass;
@Nullable private final String myBaseClass;
private final String myTemplate;
public CreateClassMappingAction(Class<T> contextClass, String baseClass, String template) {
public CreateClassMappingAction(Class<T> contextClass, @Nullable String baseClass, String template) {
super(contextClass);
myBaseClass = baseClass;
myTemplate = template;
@@ -51,8 +51,8 @@ public abstract class CreateClassMappingAction<T extends DomElement> extends Cre
@Override
protected DomElement createElement(final T context, final Editor editor, PsiFile file, final Project project) {
PsiClass selectedClass;
PsiClass baseClass = getBaseClass(context, project);
if (!ApplicationManager.getApplication().isUnitTestMode()) {
PsiClass baseClass = getBaseClass(context, project, myBaseClass);
TreeClassChooser chooser = TreeClassChooserFactory.getInstance(project)
.createInheritanceClassChooser(getChooserTitle(), GlobalSearchScope.allScope(project), baseClass, null, new TreeClassChooser.ClassFilter() {
@Override
@@ -64,7 +64,7 @@ public abstract class CreateClassMappingAction<T extends DomElement> extends Cre
selectedClass = chooser.getSelectedClass();
}
else {
selectedClass = baseClass;
selectedClass = getBaseClass(context, project, myBaseClass == null ? "java.lang.Object" : myBaseClass);
}
if (selectedClass == null) return null;
@@ -86,8 +86,8 @@ public abstract class CreateClassMappingAction<T extends DomElement> extends Cre
protected abstract DomElement createElement(T context);
@Nullable
protected PsiClass getBaseClass(T context, Project project) {
return JavaPsiFacade.getInstance(project).findClass(myBaseClass, GlobalSearchScope.allScope(project));
protected PsiClass getBaseClass(T context, Project project, String baseClass) {
return baseClass == null ? null : JavaPsiFacade.getInstance(project).findClass(baseClass, GlobalSearchScope.allScope(project));
}
@Override
xml/dom-impl/src/com/intellij/util/xml/impl/DomTemplateRunnerImpl.java
+1
View File
@@ -48,6 +48,7 @@ public class DomTemplateRunnerImpl extends DomTemplateRunner {
public <T extends DomElement> void runTemplate(T t, String mappingId, Editor editor,
@NotNull Map<String, String> predefinedVars) {
final Template template = getTemplate(mappingId);
assert template != null : "Template not found: " + mappingId;
runTemplate(t, editor, template, predefinedVars);
}