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

duplication removed

Browse Source
This commit is contained in:
nik
2012-08-15 11:07:05 +04:00
parent 132b468fd8
commit 705ccc567e
3 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/openapi/vfs/LocalFileSystem.java
+7
View File
@@ -15,6 +15,8 @@
*/
package com.intellij.openapi.vfs;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.vfs.newvfs.ManagingFS;
import com.intellij.openapi.vfs.newvfs.NewVirtualFileSystem;
import com.intellij.util.Processor;
import com.intellij.util.io.fs.IFile;
@@ -111,6 +113,11 @@ public abstract class LocalFileSystem extends NewVirtualFileSystem {
return virtualFile.getLength();
}
public VirtualFile findRoot() {
//noinspection ConstantConditions
return SystemInfo.isWindows ? ManagingFS.getInstance().findRoot("", this) : findFileByPath("/");
}
public interface WatchRequest {
@NotNull
String getRootPath();
plugins/ant/src/com/intellij/lang/ant/dom/AntDomFileReferenceSet.java
+1 -7
View File
@@ -20,7 +20,6 @@ import com.intellij.openapi.util.TextRange;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.newvfs.ManagingFS;
import com.intellij.psi.ElementManipulators;
import com.intellij.psi.PsiDirectory;
import com.intellij.psi.PsiFileSystemItem;
@@ -101,12 +100,7 @@ public class AntDomFileReferenceSet extends FileReferenceSet {
if (containingProject != null) {
VirtualFile root = null;
if (isAbsolutePathReference()) {
if (SystemInfo.isWindows) {
root = ManagingFS.getInstance().findRoot("", LocalFileSystem.getInstance());
}
else {
root = LocalFileSystem.getInstance().findFileByPath("/");
}
root = LocalFileSystem.getInstance().findRoot();
}
else {
plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/converters/MavenDependencySystemPathConverter.java
+1 -9
View File
@@ -16,10 +16,8 @@
package org.jetbrains.idea.maven.dom.converters;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.newvfs.ManagingFS;
import com.intellij.psi.*;
import com.intellij.psi.impl.source.resolve.reference.impl.providers.FileReferenceSet;
import com.intellij.psi.xml.XmlElement;
@@ -93,13 +91,7 @@ public class MavenDependencySystemPathConverter extends ResolvingConverter<PsiFi
public Collection<PsiFileSystemItem> getDefaultContexts() {
Collection<PsiFileSystemItem> systemItemCollection = super.getDefaultContexts();
if (isAbsolutePathReference()) {
VirtualFile vFile;
if (SystemInfo.isWindows) {
vFile = ManagingFS.getInstance().findRoot("", LocalFileSystem.getInstance());
}
else {
vFile = LocalFileSystem.getInstance().findFileByPath("/");
}
VirtualFile vFile = LocalFileSystem.getInstance().findRoot();
if (ApplicationManager.getApplication().isUnitTestMode()) {
assert vFile != null : ""; //