Replacing consulo.ide.impl.idea.openapi.vfs.VfsUtil with consulo.virtualFileSystem.util.VirtualFileUtil. (#9)

Author: unv-unv

src/main/java/com/intellij/uiDesigner/impl/LoaderFactory.java

@@ -23,7 +23,6 @@
 import consulo.disposer.Disposable;
 import consulo.disposer.Disposer;
 import consulo.ide.ServiceManager;
-import consulo.ide.impl.idea.openapi.vfs.VfsUtil;
 import consulo.language.util.ModuleUtilCore;
 import consulo.module.Module;
 import consulo.module.content.layer.OrderEnumerator;
@@ -38,10 +37,11 @@
 import consulo.virtualFileSystem.VirtualFile;
 import consulo.virtualFileSystem.VirtualFileManager;
 import consulo.virtualFileSystem.archive.ArchiveVfsUtil;
+import consulo.virtualFileSystem.util.VirtualFileUtil;
+import jakarta.annotation.Nonnull;
 import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
 
-import jakarta.annotation.Nonnull;
 import javax.swing.*;
 import java.io.File;
 import java.net.MalformedURLException;
@@ -142,7 +142,7 @@ private static ClassLoader createClassLoader(final String runClasspath, final St
 			final String s = tokenizer.nextToken();
 			try
 			{
-				VirtualFile vFile = manager.findFileByUrl(VfsUtil.pathToUrl(s));
+				VirtualFile vFile = manager.findFileByUrl(VirtualFileUtil.pathToUrl(s));
 
 				VirtualFile archiveFile = ArchiveVfsUtil.getVirtualFileForArchive(vFile);
 				if(archiveFile != null)

src/main/java/com/intellij/uiDesigner/impl/make/Form2ByteCodeCompiler.java

@@ -39,7 +39,6 @@
 import consulo.content.bundle.Sdk;
 import consulo.document.Document;
 import consulo.document.FileDocumentManager;
-import consulo.ide.impl.idea.openapi.util.io.FileUtil;
 import consulo.internal.org.objectweb.asm.ClassWriter;
 import consulo.java.compiler.JavaCompilerUtil;
 import consulo.java.language.bundle.JavaSdkTypeUtil;
@@ -54,6 +53,8 @@
 import consulo.project.Project;
 import consulo.util.collection.ArrayUtil;
 import consulo.util.collection.Chunk;
+import consulo.util.io.FilePermissionCopier;
+import consulo.util.io.FileUtil;
 import consulo.util.lang.ExceptionUtil;
 import consulo.virtualFileSystem.VirtualFile;
 import consulo.virtualFileSystem.util.VirtualFileUtil;
@@ -467,7 +468,7 @@ public String compute()
 							FileUtil.createParentDirs(outputFormFile);
 							try
 							{
-								FileUtil.copy(new File(formFile.getPath()), outputFormFile);
+								FileUtil.copy(new File(formFile.getPath()), outputFormFile, FilePermissionCopier.BY_NIO2);
 							}
 							catch(IOException e)
 							{

src/test/java_/com/intellij/uiDesigner/core/AsmCodeGeneratorTest.java

@@ -18,7 +18,6 @@
 import com.intellij.compiler.instrumentation.InstrumentationClassFinder;
 import consulo.ide.impl.idea.openapi.application.PathManager;
 import consulo.ide.impl.idea.openapi.util.SystemInfoRt;
-import consulo.ide.impl.idea.openapi.util.io.FileUtil;
 import consulo.ui.ex.awt.JBTabbedPane;
 import com.intellij.uiDesigner.compiler.AsmCodeGenerator;
 import com.intellij.uiDesigner.compiler.FormErrorInfo;
@@ -31,6 +30,7 @@
 import consulo.internal.org.objectweb.asm.ClassWriter;
 import consulo.ui.ex.awt.UIUtil;
 import consulo.util.collection.primitive.ints.IntObjectMap;
+import consulo.util.io.FileUtil;
 import junit.framework.TestCase;
 
 import javax.swing.*;

src/test/java_/com/intellij/uiDesigner/make/FormSourceCodeGeneratorTest.java

@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.intellij.uiDesigner.make;
 
 import com.intellij.uiDesigner.impl.make.FormSourceCodeGenerator;
 import consulo.util.lang.StringUtil;
-import consulo.ide.impl.idea.openapi.vfs.VfsUtil;
 import consulo.virtualFileSystem.VirtualFile;
 import com.intellij.psi.PsiClass;
 import consulo.language.psi.PsiFile;
@@ -27,6 +25,7 @@
 import com.intellij.testFramework.PsiTestCase;
 import com.intellij.testFramework.PsiTestUtil;
 import consulo.undoRedo.CommandProcessor;
+import consulo.virtualFileSystem.util.VirtualFileUtil;
 
 import java.io.IOException;
 
@@ -104,7 +103,7 @@ public void run() {
     assertNotNull(bindingTestClass);
     final VirtualFile testAfter = myTestProjectRoot.findChild("BindingTest.java.after");
     assertNotNull(testAfter);
-    String expectedText = StringUtil.convertLineSeparators(VfsUtil.loadText(testAfter));
+    String expectedText = StringUtil.convertLineSeparators(VirtualFileUtil.loadText(testAfter));
     final PsiFile psiFile = bindingTestClass.getContainingFile();
     assertNotNull(psiFile);
     final String text = StringUtil.convertLineSeparators(psiFile.getText());