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

[workspace model] IDEA-300481 Rename PersistentEntityId to SymbolicEntityId

Browse Source 
GitOrigin-RevId: 7bae4a6812902b2f7cc8214d7df68c95ebfe8b4f
This commit is contained in:
Mikhail Mazurkevich
2022-10-18 14:14:28 +04:00
committed by intellij-monorepo-bot
parent 644b6a6dd2
commit fe7432a327
126 changed files with 1190 additions and 1385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseModuleRootsSerializer.kt
View File

@@ -25,7 +25,6 @@ import com.intellij.workspaceModel.storage.WorkspaceEntity
import com.intellij.workspaceModel.storage.EntityStorage
import com.intellij.workspaceModel.storage.MutableEntityStorage
import com.intellij.workspaceModel.storage.bridgeEntities.*
import com.intellij.workspaceModel.storage.bridgeEntities.*
import com.intellij.workspaceModel.storage.url.VirtualFileUrl
import com.intellij.workspaceModel.storage.url.VirtualFileUrlManager
import org.jdom.Element
@@ -246,9 +245,9 @@ class EclipseModuleRootsSerializer : CustomModuleRootsSerializer, StorageManager
}
val name = generateUniqueLibraryName(path, libraryNames)
val roots = createLibraryRoots(url, srcUrl, nativeRoot, entryTag, moduleEntity, relativePathResolver, virtualUrlManager)
val libraryEntity = builder.addLibraryEntity(name, LibraryTableId.ModuleLibraryTableId(moduleEntity.persistentId), roots,
val libraryEntity = builder.addLibraryEntity(name, LibraryTableId.ModuleLibraryTableId(moduleEntity.symbolicId), roots,
emptyList(), contentRootEntity.entitySource)
dependencies.add(ModuleDependencyItem.Exportable.LibraryDependency(libraryEntity.persistentId, exported,
dependencies.add(ModuleDependencyItem.Exportable.LibraryDependency(libraryEntity.symbolicId, exported,
ModuleDependencyItem.DependencyScope.COMPILE))
}
EclipseXml.VAR_KIND -> {
@@ -279,9 +278,9 @@ class EclipseModuleRootsSerializer : CustomModuleRootsSerializer, StorageManager
convertRelativePathToUrl(it, contentRootEntity, relativePathResolver, virtualUrlManager)
}
val roots = createLibraryRoots(url, srcUrl, nativeRoot, entryTag, moduleEntity, relativePathResolver, virtualUrlManager)
val libraryEntity = builder.addLibraryEntity(libName, LibraryTableId.ModuleLibraryTableId(moduleEntity.persistentId),
val libraryEntity = builder.addLibraryEntity(libName, LibraryTableId.ModuleLibraryTableId(moduleEntity.symbolicId),
roots, emptyList(), contentRootEntity.entitySource)
dependencies.add(ModuleDependencyItem.Exportable.LibraryDependency(libraryEntity.persistentId, exported,
dependencies.add(ModuleDependencyItem.Exportable.LibraryDependency(libraryEntity.symbolicId, exported,
ModuleDependencyItem.DependencyScope.COMPILE))
}
@@ -312,9 +311,9 @@ class EclipseModuleRootsSerializer : CustomModuleRootsSerializer, StorageManager
val url = EclipseClasspathReader.getJunitClsUrl(junitName.contains("4"))
val roots = listOf(LibraryRoot(virtualUrlManager.fromUrl(url),
LibraryRootTypeId.COMPILED))
val libraryEntity = builder.addLibraryEntity(junitName, LibraryTableId.ModuleLibraryTableId(moduleEntity.persistentId),
val libraryEntity = builder.addLibraryEntity(junitName, LibraryTableId.ModuleLibraryTableId(moduleEntity.symbolicId),
roots, emptyList(), contentRootEntity.entitySource)
dependencies.add(ModuleDependencyItem.Exportable.LibraryDependency(libraryEntity.persistentId, exported,
dependencies.add(ModuleDependencyItem.Exportable.LibraryDependency(libraryEntity.symbolicId, exported,
ModuleDependencyItem.DependencyScope.COMPILE))
}
else {