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

Cleanup (deprecated DOM service API dropped)

Browse Source
This commit is contained in:
Roman Shevchenko
2015-04-30 18:30:39 +02:00
parent 45b0cdf8d2
commit 6bcc99495a
2 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xml/dom-impl/src/com/intellij/util/xml/impl/DomServiceImpl.java
+1 -7
View File
@@ -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<VirtualFile> getDomFileCandidates(Class<? extends DomElement> description, Project project) {
return getDomFileCandidates(description, project, GlobalSearchScope.allScope(project));
}
@Override
public Collection<VirtualFile> getDomFileCandidates(Class<? extends DomElement> rootElementClass,
Project project,
xml/dom-openapi/src/com/intellij/util/xml/DomService.java
+4 -11
View File
@@ -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<VirtualFile> getDomFileCandidates(Class<? extends DomElement> 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<VirtualFile> getDomFileCandidates(Class<? extends DomElement> rootElementClass,
Project project,
@@ -65,7 +59,7 @@ public abstract class DomService {
* @return DOM file elements containing given root element
*/
public abstract <T extends DomElement> List<DomFileElement<T>> getFileElements(Class<T> 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<DomElement, StructureViewMode> modeProvider);
public abstract StructureViewBuilder createSimpleStructureViewBuilder(XmlFile file, Function<DomElement, StructureViewMode> modeProvider);
}