diff --git a/java/structuralsearch-java/src/com/intellij/structuralsearch/JavaStructuralSearchProfile.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/JavaStructuralSearchProfile.java index acc59abd67da..266a8030a901 100644 --- a/java/structuralsearch-java/src/com/intellij/structuralsearch/JavaStructuralSearchProfile.java +++ b/java/structuralsearch-java/src/com/intellij/structuralsearch/JavaStructuralSearchProfile.java @@ -6,7 +6,7 @@ import com.intellij.codeInsight.template.TemplateContextType; import com.intellij.codeInsight.template.TemplateManager; import com.intellij.dupLocator.iterators.NodeIterator; import com.intellij.lang.Language; -import com.intellij.lang.StdLanguages; +import com.intellij.lang.java.JavaLanguage; import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.fileEditor.FileEditorManager; @@ -173,13 +173,8 @@ public class JavaStructuralSearchProfile extends StructuralSearchProfile { return new JavaCompiledPattern(); } - @Override - public boolean canProcess(@NotNull FileType fileType) { - return fileType == StdFileTypes.JAVA; - } - public boolean isMyLanguage(@NotNull Language language) { - return language == StdLanguages.JAVA; + return language == JavaLanguage.INSTANCE; } @Override diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/StructuralSearchProfile.java b/platform/structuralsearch/source/com/intellij/structuralsearch/StructuralSearchProfile.java index bd3d773f26f5..8da5591370e2 100644 --- a/platform/structuralsearch/source/com/intellij/structuralsearch/StructuralSearchProfile.java +++ b/platform/structuralsearch/source/com/intellij/structuralsearch/StructuralSearchProfile.java @@ -57,7 +57,9 @@ public abstract class StructuralSearchProfile { return fileType.getName().toLowerCase(); } - public abstract boolean canProcess(@NotNull FileType fileType); + public final boolean canProcess(@NotNull FileType fileType) { + return fileType instanceof LanguageFileType && isMyLanguage(((LanguageFileType)fileType).getLanguage()); + } public abstract boolean isMyLanguage(@NotNull Language language); @@ -137,9 +139,7 @@ public abstract class StructuralSearchProfile { } @Nullable - public Class getTemplateContextTypeClass() { - return null; - } + public abstract Class getTemplateContextTypeClass(); public final TemplateContextType getTemplateContextType() { final Class clazz = getTemplateContextTypeClass(); diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/StructuralSearchProfileBase.java b/platform/structuralsearch/source/com/intellij/structuralsearch/StructuralSearchProfileBase.java index 47222f932714..0b8a56868e54 100644 --- a/platform/structuralsearch/source/com/intellij/structuralsearch/StructuralSearchProfileBase.java +++ b/platform/structuralsearch/source/com/intellij/structuralsearch/StructuralSearchProfileBase.java @@ -191,12 +191,6 @@ public abstract class StructuralSearchProfileBase extends StructuralSearchProfil }; } - @Override - public boolean canProcess(@NotNull FileType fileType) { - return fileType instanceof LanguageFileType && - isMyLanguage(((LanguageFileType)fileType).getLanguage()); - } - @Override public boolean isMyLanguage(@NotNull Language language) { return language.isKindOf(getFileType().getLanguage()); diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/XmlStructuralSearchProfile.java b/platform/structuralsearch/source/com/intellij/structuralsearch/XmlStructuralSearchProfile.java index 5e0ca8bde957..cb49cf994a28 100644 --- a/platform/structuralsearch/source/com/intellij/structuralsearch/XmlStructuralSearchProfile.java +++ b/platform/structuralsearch/source/com/intellij/structuralsearch/XmlStructuralSearchProfile.java @@ -62,12 +62,6 @@ public class XmlStructuralSearchProfile extends StructuralSearchProfile { return new XmlCompiledPattern(); } - @Override - public boolean canProcess(@NotNull FileType fileType) { - return fileType == StdFileTypes.XML || fileType == StdFileTypes.HTML || fileType == StdFileTypes.JSP || - fileType == StdFileTypes.JSPX || fileType == StdFileTypes.XHTML; - } - public boolean isMyLanguage(@NotNull Language language) { return language instanceof XMLLanguage; }