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

[java] fixes template handlers' behavior

Browse Source
This commit is contained in:
Roman Shevchenko
2016-08-17 15:46:02 +03:00
parent 17bc8eebc2
commit 70c45ec863
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/ide/fileTemplates/JavaCreateFromTemplateHandler.java
+1 -1
View File
@@ -98,7 +98,7 @@ public class JavaCreateFromTemplateHandler implements CreateFromTemplateHandler
@Override
public boolean handlesTemplate(@NotNull FileTemplate template) {
FileType fileType = FileTypeManagerEx.getInstanceEx().getFileTypeByExtension(template.getExtension());
return fileType.equals(StdFileTypes.JAVA) && ArrayUtil.contains(template.getName(), JavaTemplateUtil.INTERNAL_CLASS_TEMPLATES);
return fileType.equals(StdFileTypes.JAVA) && !ArrayUtil.contains(template.getName(), JavaTemplateUtil.INTERNAL_FILE_TEMPLATES);
}
@NotNull
java/java-impl/src/com/intellij/ide/fileTemplates/JavaInternalTemplatesHandler.java
+7
View File
@@ -16,8 +16,15 @@
package com.intellij.ide.fileTemplates;
import com.intellij.psi.PsiDirectory;
import com.intellij.util.ArrayUtil;
import org.jetbrains.annotations.NotNull;
public class JavaInternalTemplatesHandler extends JavaCreateFromTemplateHandler {
@Override
public boolean handlesTemplate(@NotNull FileTemplate template) {
return ArrayUtil.contains(template.getName(), JavaTemplateUtil.INTERNAL_CLASS_TEMPLATES);
}
@Override
public boolean canCreate(PsiDirectory[] dirs) {
return false;
java/java-impl/src/com/intellij/ide/fileTemplates/JavaTemplateUtil.java
+2
View File
@@ -45,6 +45,8 @@ public class JavaTemplateUtil {
public static final String INTERNAL_PACKAGE_INFO_TEMPLATE_NAME = "package-info";
public static final String INTERNAL_MODULE_INFO_TEMPLATE_NAME = "module-info";
public static final String[] INTERNAL_FILE_TEMPLATES = {INTERNAL_PACKAGE_INFO_TEMPLATE_NAME, INTERNAL_MODULE_INFO_TEMPLATE_NAME};
private JavaTemplateUtil() { }
public static void setClassAndMethodNameProperties (@NotNull Properties properties, @NotNull PsiClass aClass, @NotNull PsiMethod method) {