From 705ccc567ee5792f70106899ec26cfc45668f154 Mon Sep 17 00:00:00 2001 From: nik Date: Wed, 15 Aug 2012 11:07:05 +0400 Subject: [PATCH] duplication removed --- .../src/com/intellij/openapi/vfs/LocalFileSystem.java | 7 +++++++ .../intellij/lang/ant/dom/AntDomFileReferenceSet.java | 8 +------- .../converters/MavenDependencySystemPathConverter.java | 10 +--------- 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/platform/platform-api/src/com/intellij/openapi/vfs/LocalFileSystem.java b/platform/platform-api/src/com/intellij/openapi/vfs/LocalFileSystem.java index 34b27fb12735..675d48a110a5 100644 --- a/platform/platform-api/src/com/intellij/openapi/vfs/LocalFileSystem.java +++ b/platform/platform-api/src/com/intellij/openapi/vfs/LocalFileSystem.java @@ -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(); diff --git a/plugins/ant/src/com/intellij/lang/ant/dom/AntDomFileReferenceSet.java b/plugins/ant/src/com/intellij/lang/ant/dom/AntDomFileReferenceSet.java index 8288e8309067..0a2b372a753f 100644 --- a/plugins/ant/src/com/intellij/lang/ant/dom/AntDomFileReferenceSet.java +++ b/plugins/ant/src/com/intellij/lang/ant/dom/AntDomFileReferenceSet.java @@ -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 { diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/converters/MavenDependencySystemPathConverter.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/converters/MavenDependencySystemPathConverter.java index b916f1774889..240f7c521368 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/converters/MavenDependencySystemPathConverter.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/converters/MavenDependencySystemPathConverter.java @@ -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 getDefaultContexts() { Collection 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 : ""; //