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

remove unnecessary dependencies from DomManager

Browse Source
This commit is contained in:
peter
2013-12-07 22:14:21 +01:00
parent 4c947abad4
commit 9c23c52cfc
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xml/dom-impl/src/com/intellij/util/xml/impl/DomManagerImpl.java
+9 -14
View File
@@ -86,31 +86,26 @@ public final class DomManagerImpl extends DomManager {
private final SemService mySemService;
private final ConverterManager myConverterManager;
private final DomApplicationComponent myApplicationComponent;
private final PsiFileFactory myFileFactory;
private final ProjectFileIndex myFileIndex;
private long myModificationCount;
private boolean myChanging;
public DomManagerImpl(Project project,
final XmlAspect xmlAspect,
SemService semService,
ConverterManager converterManager,
DomApplicationComponent appComponent,
PsiFileFactory fileFactory,
ProjectFileIndex fileIndex) {
DomApplicationComponent appComponent) {
myProject = project;
mySemService = semService;
myConverterManager = converterManager;
myApplicationComponent = appComponent;
myFileFactory = fileFactory;
myFileIndex = fileIndex;
PomModel pomModel = PomManager.getModel(project);
final PomModel pomModel = PomManager.getModel(project);
pomModel.addModelListener(new PomModelListener() {
public void modelChanged(PomModelEvent event) {
final XmlChangeSet changeSet = (XmlChangeSet)event.getChangeSet(xmlAspect);
if (changeSet != null && !myChanging) {
if (myChanging) return;
final XmlChangeSet changeSet = (XmlChangeSet)event.getChangeSet(pomModel.getModelAspect(XmlAspect.class));
if (changeSet != null) {
for (XmlFile file : changeSet.getChangedFiles()) {
DomFileElementImpl<DomElement> element = getCachedFileElement(file);
if (element != null) {
@@ -121,7 +116,7 @@ public final class DomManagerImpl extends DomManager {
}
public boolean isAspectChangeInteresting(PomModelAspect aspect) {
return xmlAspect.equals(aspect);
return aspect instanceof XmlAspect;
}
}, project);
@@ -234,7 +229,7 @@ public final class DomManagerImpl extends DomManager {
}
private void processFileOrDirectoryChange(final VirtualFile file) {
if (!myFileIndex.isInContent(file)) return;
if (!ProjectFileIndex.SERVICE.getInstance(myProject).isInContent(file)) return;
if (!file.isDirectory()) {
processFileChange(file);
} else {
@@ -444,7 +439,7 @@ public final class DomManagerImpl extends DomManager {
}
public final <T extends DomElement> T createMockElement(final Class<T> aClass, final Module module, final boolean physical) {
final XmlFile file = (XmlFile)myFileFactory.createFileFromText("a.xml", StdFileTypes.XML, "", (long)0, physical);
final XmlFile file = (XmlFile)PsiFileFactory.getInstance(myProject).createFileFromText("a.xml", StdFileTypes.XML, "", (long)0, physical);
file.putUserData(MOCK_ELEMENT_MODULE, module);
file.putUserData(MOCK, new Object());
return getFileElement(file, aClass, "I_sincerely_hope_that_nobody_will_have_such_a_root_tag_name").getRootElement();