diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/DomServiceImpl.java b/xml/dom-impl/src/com/intellij/util/xml/impl/DomServiceImpl.java index eb8c57a9c281..bb30f41437ff 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/DomServiceImpl.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/DomServiceImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -161,12 +161,6 @@ public class DomServiceImpl extends DomService { return file.isValid() ? ourRootTagCache.get(ROOT_TAG_NS_KEY, file, null).getValue() : XmlFileHeader.EMPTY; } - - @Override - public Collection getDomFileCandidates(Class description, Project project) { - return getDomFileCandidates(description, project, GlobalSearchScope.allScope(project)); - } - @Override public Collection getDomFileCandidates(Class rootElementClass, Project project, diff --git a/xml/dom-openapi/src/com/intellij/util/xml/DomService.java b/xml/dom-openapi/src/com/intellij/util/xml/DomService.java index a2d567e9c87a..f75072d00832 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/DomService.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/DomService.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package com.intellij.util.xml; import com.intellij.ide.structureView.StructureViewBuilder; @@ -42,17 +41,12 @@ public abstract class DomService { return ourCachedInstance; } - /** - * @deprecated use {@link #getDomFileCandidates(Class, com.intellij.openapi.project.Project, com.intellij.psi.search.GlobalSearchScope)} (to remove in IDEA 15) - */ - public abstract Collection getDomFileCandidates(Class description, Project project); - /** * @param rootElementClass class of root (file-level) element in DOM model * @param project current project * @param scope search scope * @return files containing given root element - * @see #getFileElements(Class, com.intellij.openapi.project.Project, com.intellij.psi.search.GlobalSearchScope) + * @see #getFileElements(Class, Project, GlobalSearchScope) */ public abstract Collection getDomFileCandidates(Class rootElementClass, Project project, @@ -65,7 +59,7 @@ public abstract class DomService { * @return DOM file elements containing given root element */ public abstract List> getFileElements(Class rootElementClass, - final Project project, + Project project, @Nullable GlobalSearchScope scope); public abstract ModelMerger createModelMerger(); @@ -85,6 +79,5 @@ public abstract class DomService { SHOW, SHOW_CHILDREN, SKIP } - public abstract StructureViewBuilder createSimpleStructureViewBuilder(final XmlFile file, - final Function modeProvider); + public abstract StructureViewBuilder createSimpleStructureViewBuilder(XmlFile file, Function modeProvider); }