Replacing consulo.ide.impl.idea.openapi.vfs.VfsUtil with consulo.virtualFileSystem.util.VirtualFileUtil. Replacing consulo.ide.impl.idea.openapi.util.io.FileUtil with consulo.util.io.FileUtil.

Author: unv-unv

java-impl-testing/src/main/java/com/intellij/codeInsight/CodeInsightTestCase.java

@@ -61,9 +61,7 @@
 import consulo.module.content.layer.ModifiableRootModel;
 import consulo.module.content.ModuleRootManager;
 import consulo.util.dataholder.Key;
-import consulo.ide.impl.idea.openapi.util.io.FileUtil;
 import consulo.util.lang.StringUtil;
-import consulo.ide.impl.idea.openapi.vfs.VfsUtil;
 import consulo.virtualFileSystem.VirtualFile;
 import com.intellij.java.language.psi.PsiClass;
 import consulo.language.psi.PsiDocumentManager;
@@ -188,7 +186,7 @@ protected void run(Result result) throws Exception
 		}
 		final VirtualFile vFile = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(tempFile);
 		assert vFile != null;
-		consulo.ide.impl.idea.openapi.vfs.VfsUtil.saveText(vFile, text);
+		VirtualFileUtil.saveText(vFile, text);
 
 		final VirtualFile vdir = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(dir);
 
@@ -418,7 +416,7 @@ private void copyFilesFillingEditorInfos(final VirtualFile fromDir, final Virtua
 	private EditorInfo copyContent(final VirtualFile from, final VirtualFile to, final List<OutputStream> streamsToClose) throws IOException
 	{
 		byte[] content = from.getFileType().isBinary() ? from.contentsToByteArray() : null;
-		final String fileText = from.getFileType().isBinary() ? null : StringUtil.convertLineSeparators(consulo.ide.impl.idea.openapi.vfs.VfsUtil.loadText(from));
+		final String fileText = from.getFileType().isBinary() ? null : StringUtil.convertLineSeparators(VirtualFileUtil.loadText(from));
 
 		EditorInfo editorInfo = fileText != null ? new EditorInfo(fileText) : null;
 		String newFileText = fileText != null ? editorInfo.getNewFileText() : null;
@@ -472,7 +470,7 @@ private void doWrite(final String newFileText, final VirtualFile newVFile, final
 	{
 		if(newFileText != null)
 		{
-			consulo.ide.impl.idea.openapi.vfs.VfsUtil.saveText(newVFile, newFileText);
+			VirtualFileUtil.saveText(newVFile, newFileText);
 		}
 		else
 		{
@@ -603,7 +601,7 @@ public void run()
 				String ft = null;
 				try
 				{
-					ft = VfsUtil.loadText(vFile);
+					ft = VirtualFileUtil.loadText(vFile);
 				}
 				catch(IOException e)
 				{

java-impl-testing/src/main/java/com/intellij/codeInsight/daemon/DaemonAnalyzerTestCase.java

@@ -54,7 +54,6 @@
 import consulo.project.startup.StartupManager;
 import consulo.util.lang.Pair;
 import consulo.document.util.TextRange;
-import consulo.ide.impl.idea.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.*;
 import consulo.language.editor.inspection.scheme.InspectionProfileManager;
 import consulo.language.editor.inspection.scheme.InspectionProjectProfileManager;
@@ -541,7 +540,7 @@ protected void run(Result<PsiClass> result) throws Throwable
 				File dir;
 				if(files.length > 0)
 				{
-					dir = VfsUtilCore.virtualToIoFile(files[0]);
+					dir = VirtualFileUtil.virtualToIoFile(files[0]);
 				}
 				else
 				{
@@ -554,7 +553,7 @@ protected void run(Result<PsiClass> result) throws Throwable
 				FileUtil.createIfDoesntExist(file);
 				VirtualFile vFile = LocalFileSystem.getInstance().refreshAndFindFileByPath(file.getCanonicalPath().replace(File.separatorChar, '/'));
 				Assert.assertNotNull(vFile);
-				consulo.ide.impl.idea.openapi.vfs.VfsUtil.saveText(vFile, text);
+				VirtualFileUtil.saveText(vFile, text);
 				PsiJavaFile psiFile = (PsiJavaFile) myPsiManager.findFile(vFile);
 				Assert.assertNotNull(psiFile);
 				PsiClass psiClass = psiFile.getClasses()[0];

java-impl-testing/src/main/java/com/intellij/codeInsight/daemon/quickFix/LightQuickFixTestCase.java

@@ -40,7 +40,6 @@
 import consulo.codeEditor.Editor;
 import consulo.project.Project;
 import consulo.util.lang.Pair;
-import consulo.ide.impl.idea.openapi.util.io.FileUtil;
 import consulo.util.lang.StringUtil;
 import consulo.util.io.CharsetToolkit;
 import consulo.language.psi.PsiFile;

java-impl-testing/src/main/java/com/intellij/testFramework/ModuleTestCase.java

@@ -28,7 +28,6 @@
 import consulo.module.Module;
 import consulo.module.ModuleManager;
 import consulo.util.lang.ref.Ref;
-import consulo.ide.impl.idea.openapi.util.io.FileUtil;
 import consulo.virtualFileSystem.LocalFileSystem;
 import consulo.virtualFileSystem.VirtualFile;
 import consulo.ide.impl.idea.util.Consumer;
@@ -132,7 +131,7 @@ protected Module loadAllModulesUnder(@Nonnull VirtualFile rootDir, @Nullable fin
 	{
 		final Ref<Module> result = Ref.create();
 
-		/*VfsUtilCore.visitChildrenRecursively(rootDir, new VirtualFileVisitor()
+		/*VirtualFileUtil.visitChildrenRecursively(rootDir, new VirtualFileVisitor()
 		{
 			@Override
 			public boolean visitFile(@NotNull VirtualFile file)

java-impl-testing/src/main/java/com/intellij/testFramework/PsiTestCase.java

@@ -26,9 +26,7 @@
 import consulo.content.OrderRootType;
 import consulo.util.xml.serializer.DefaultJDOMExternalizer;
 import consulo.util.jdom.JDOMUtil;
-import consulo.ide.impl.idea.openapi.util.io.FileUtil;
 import consulo.util.lang.StringUtil;
-import consulo.ide.impl.idea.openapi.vfs.VfsUtil;
 import consulo.virtualFileSystem.VirtualFile;
 import com.intellij.psi.*;
 import consulo.language.impl.internal.psi.PsiManagerImpl;
@@ -98,7 +96,7 @@ protected PsiFile createFile(final Module module, final VirtualFile vDir, final
 			}
 
 			final VirtualFile vFile = vDir.createChildData(vDir, fileName);
-			VfsUtil.saveText(vFile, text);
+			VirtualFileUtil.saveText(vFile, text);
 			Assert.assertNotNull(vFile);
 			final PsiFile file = myPsiManager.findFile(vFile);
 			Assert.assertNotNull(file);
@@ -116,7 +114,7 @@ protected PsiElement configureByFileWithMarker(String filePath, String marker) t
 		final VirtualFile vFile = LocalFileSystem.getInstance().findFileByPath(filePath.replace(File.separatorChar, '/'));
 		Assert.assertNotNull("file " + filePath + " not found", vFile);
 
-		String fileText = VfsUtil.loadText(vFile);
+		String fileText = VirtualFileUtil.loadText(vFile);
 		fileText = StringUtil.convertLineSeparators(fileText);
 
 		int offset = fileText.indexOf(marker);

java-impl-testing/src/main/java/com/intellij/testFramework/PsiTestData.java

@@ -23,7 +23,6 @@
 import consulo.util.xml.serializer.InvalidDataException;
 import consulo.util.xml.serializer.JDOMExternalizable;
 import consulo.util.xml.serializer.WriteExternalException;
-import consulo.ide.impl.idea.openapi.util.io.FileUtil;
 import consulo.util.lang.StringUtil;
 
 /**

java-language-impl/src/main/java/com/intellij/java/language/impl/core/CoreJavaFileManager.java

@@ -77,7 +77,7 @@ private List<VirtualFile> findDirectoriesByPackageName(String packageName) {
   public PsiJavaPackage getPackage(PsiDirectory dir) {
     final VirtualFile file = dir.getVirtualFile();
     for (VirtualFile root : myClasspath) {
-      if (VfsUtilCore.isAncestor(root, file, false)) {
+      if (VirtualFileUtil.isAncestor(root, file, false)) {
         String relativePath = FileUtil.getRelativePath(root.getPath(), file.getPath(), '/');
         if (relativePath == null) continue;
         return new PsiPackageImpl(myPsiManager, relativePath.replace('/', '.'));

plugin/pom.xml

@@ -248,7 +248,7 @@
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
-<dependency>
+        <dependency>
             <groupId>consulo</groupId>
             <artifactId>consulo-language-editor-impl</artifactId>
             <version>${project.version}</version>

plugin/src/main/java/com/intellij/java/impl/codeInsight/javadoc/JavaDocInfoGenerator.java

@@ -34,7 +34,6 @@
 import com.intellij.java.language.psi.util.PsiFormatUtilBase;
 import consulo.annotation.access.RequiredReadAction;
 import consulo.content.bundle.Sdk;
-import consulo.ide.impl.idea.openapi.vfs.VfsUtilCore;
 import consulo.java.language.bundle.JavaSdkTypeUtil;
 import consulo.language.LangBundle;
 import consulo.language.ast.ASTNode;

plugin/src/main/java/com/intellij/java/impl/openapi/vfs/impl/jrt/JrtFileSystemImpl.java

@@ -5,9 +5,9 @@
 import consulo.annotation.component.ExtensionImpl;
 import consulo.application.Application;
 import consulo.application.ApplicationManager;
-import consulo.ide.impl.idea.openapi.util.io.FileUtil;
 import consulo.java.execution.projectRoots.OwnJdkUtil;
 import consulo.util.collection.Maps;
+import consulo.util.io.FileUtil;
 import consulo.util.lang.StringUtil;
 import consulo.virtualFileSystem.LocalFileSystem;
 import consulo.virtualFileSystem.NewVirtualFile;