MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-04 08:51:02 +07:00
Code Issues Packages Projects Releases Wiki Activity

[workspace model] IJPL-345 Remove VirtualFileUrlManager#fromPath from the API.

Browse Source 
Use `VirtualFileUrlManager.fromUrl` instead with direct protocol declaration

GitOrigin-RevId: 470f87104ad2698cbc84e83b38df4624ea04a6f6
This commit is contained in:
Mikhail Mazurkevich
2024-01-23 11:47:40 +04:00
committed by intellij-monorepo-bot
parent 38a491ef3e
commit 5dc4732274
25 changed files with 82 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/compiler/impl/src/com/intellij/packaging/impl/artifacts/workspacemodel/ArtifactBridge.kt
View File

@@ -6,6 +6,7 @@ import com.intellij.openapi.project.Project
import com.intellij.openapi.roots.ProjectModelExternalSource
import com.intellij.openapi.util.NlsSafe
import com.intellij.openapi.util.UserDataHolderBase
import com.intellij.openapi.vfs.VfsUtilCore
import com.intellij.openapi.vfs.VirtualFile
import com.intellij.packaging.artifacts.*
import com.intellij.packaging.elements.CompositePackagingElement
@@ -174,7 +175,7 @@ open class ArtifactBridge(
}
override fun setOutputPath(outputPath: String?) {
val outputUrl = outputPath?.let { VirtualFileUrlManager.getInstance(project).fromPath(it) }
val outputUrl = outputPath?.let { VirtualFileUrlManager.getInstance(project).fromUrl(VfsUtilCore.pathToUrl(it)) }
val entity = diff.get(artifactId)
diff.modifyEntity(entity) {
this.outputUrl = outputUrl

3
java/compiler/impl/src/com/intellij/packaging/impl/artifacts/workspacemodel/ArtifactModifiableModelBridge.kt
View File

@@ -7,6 +7,7 @@ import com.intellij.java.workspace.entities.CompositePackagingElementEntity
import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.project.Project
import com.intellij.openapi.roots.ProjectModelExternalSource
import com.intellij.openapi.vfs.VfsUtilCore
import com.intellij.packaging.artifacts.*
import com.intellij.packaging.elements.CompositePackagingElement
import com.intellij.packaging.elements.PackagingElement
@@ -142,7 +143,7 @@ class ArtifactModifiableModelBridge(
}
}
val outputUrl = outputPath?.let { fileManager.fromPath(it) }
val outputUrl = outputPath?.let { fileManager.fromUrl(VfsUtilCore.pathToUrl(it)) }
val artifactEntity = diff addEntity ArtifactEntity(uniqueName, artifactType.id, false, source) {
this.outputUrl = outputUrl
this.rootElement = rootElementEntity

3
java/compiler/impl/src/com/intellij/packaging/impl/elements/DirectoryCopyPackagingElement.java
View File

@@ -3,6 +3,7 @@ package com.intellij.packaging.impl.elements;
import com.intellij.java.workspace.entities.DirectoryCopyPackagingElementEntity;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vfs.VfsUtilCore;
import com.intellij.packaging.elements.PackagingExternalMapping;
import com.intellij.packaging.impl.ui.DirectoryCopyPresentation;
import com.intellij.packaging.ui.ArtifactEditorContext;
@@ -42,7 +43,7 @@ public class DirectoryCopyPackagingElement extends FileOrDirectoryCopyPackagingE
VirtualFileUrlManager fileUrlManager = VirtualFileUrls.getVirtualFileUrlManager(project);
Objects.requireNonNull(myFilePath, "filePath is not specified");
VirtualFileUrl fileUrl = fileUrlManager.fromPath(myFilePath);
VirtualFileUrl fileUrl = fileUrlManager.fromUrl(VfsUtilCore.pathToUrl(myFilePath));
DirectoryCopyPackagingElementEntity addedEntity = diff.addEntity(DirectoryCopyPackagingElementEntity.create(fileUrl, source));
diff.getMutableExternalMapping(PackagingExternalMapping.key).addMapping(addedEntity, this);
return addedEntity;

3
java/compiler/impl/src/com/intellij/packaging/impl/elements/ExtractedDirectoryPackagingElement.java
View File

@@ -5,6 +5,7 @@ import com.intellij.java.workspace.entities.ExtractedDirectoryPackagingElementEn
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.JarFileSystem;
import com.intellij.openapi.vfs.VfsUtilCore;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.packaging.elements.PackagingElement;
import com.intellij.packaging.elements.PackagingExternalMapping;
@@ -109,7 +110,7 @@ public class ExtractedDirectoryPackagingElement extends FileOrDirectoryCopyPacka
VirtualFileUrlManager fileUrlManager = VirtualFileUrls.getVirtualFileUrlManager(project);
Objects.requireNonNull(this.myFilePath, "filePath is not specified");
Objects.requireNonNull(this.myPathInJar, "pathInJar is not specified");
VirtualFileUrl fileUrl = fileUrlManager.fromPath(this.myFilePath);
VirtualFileUrl fileUrl = fileUrlManager.fromUrl(VfsUtilCore.pathToUrl(this.myFilePath));
ExtractedDirectoryPackagingElementEntity addedEntity = diff.addEntity(ExtractedDirectoryPackagingElementEntity.create(fileUrl, this.myPathInJar, source));
diff.getMutableExternalMapping(PackagingExternalMapping.key).addMapping(addedEntity, this);

3
java/compiler/impl/src/com/intellij/packaging/impl/elements/FileCopyPackagingElement.java
View File

@@ -5,6 +5,7 @@ import com.intellij.java.workspace.entities.FileCopyPackagingElementEntity;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.openapi.vfs.VfsUtilCore;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.VirtualFileManager;
import com.intellij.packaging.elements.PackagingElement;
@@ -147,7 +148,7 @@ public class FileCopyPackagingElement extends FileOrDirectoryCopyPackagingElemen
Objects.requireNonNull(filePath, "filePath is not specified");
FileCopyPackagingElementEntity addedEntity;
VirtualFileUrlManager fileUrlManager = VirtualFileUrls.getVirtualFileUrlManager(project);
VirtualFileUrl fileUrl = fileUrlManager.fromPath(filePath);
VirtualFileUrl fileUrl = fileUrlManager.fromUrl(VfsUtilCore.pathToUrl(filePath));
if (renamedOutputFileName != null) {
addedEntity = diff.addEntity(FileCopyPackagingElementEntity.create(fileUrl, source, entityBuilder -> {
entityBuilder.setRenamedOutputFileName(renamedOutputFileName);

3
java/compiler/impl/src/com/intellij/packaging/impl/elements/FileOrDirectoryCopyPackagingElement.java
View File

@@ -17,6 +17,7 @@ package com.intellij.packaging.impl.elements;
import com.intellij.java.workspace.entities.FileOrDirectoryPackagingElementEntity;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VfsUtilCore;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.packaging.elements.PackagingElement;
import com.intellij.packaging.elements.PackagingElementOutputKind;
@@ -74,7 +75,7 @@ public abstract class FileOrDirectoryCopyPackagingElement<T extends FileOrDirect
builder.modifyEntity(FileOrDirectoryPackagingElementEntity.Builder.class, entity, ent -> {
VirtualFileUrlManager manager = VirtualFileUrls.getVirtualFileUrlManager(myProject);
if (filePath != null) {
VirtualFileUrl fileUrl = manager.fromPath(filePath);
VirtualFileUrl fileUrl = manager.fromUrl(VfsUtilCore.pathToUrl(filePath));
ent.setFilePath(fileUrl);
}
else {