From b90e7ecd88bb4acf9bb61cbe9a4a4019bdc42bc7 Mon Sep 17 00:00:00 2001 From: Mikhail Mazurkevich Date: Thu, 8 Sep 2022 17:14:29 +0400 Subject: [PATCH] [workspace model] IDEA-298714 Remove old code GitOrigin-RevId: 62e2949640fcea6be542ceb36fcd174c25f97d2d --- .../legacyBridge/WorkspaceFacetContributor.kt | 2 +- .../src/META-INF/LangExtensions.xml | 2 +- .../resources/META-INF/ProjectModelImpl.xml | 4 +- .../ide/ModuleSettingsContributor.kt | 22 ----------- .../DefaultFacetEntitySerializer.kt | 7 ---- .../workspaceModel/ModuleSettingsImporter.kt | 37 ------------------- 6 files changed, 3 insertions(+), 71 deletions(-) delete mode 100644 platform/projectModel-impl/src/com/intellij/workspaceModel/ide/ModuleSettingsContributor.kt delete mode 100644 plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/workspaceModel/ModuleSettingsImporter.kt diff --git a/platform/lang-impl/src/com/intellij/workspaceModel/ide/legacyBridge/WorkspaceFacetContributor.kt b/platform/lang-impl/src/com/intellij/workspaceModel/ide/legacyBridge/WorkspaceFacetContributor.kt index f2745fdc0872..c85c7de4ceed 100644 --- a/platform/lang-impl/src/com/intellij/workspaceModel/ide/legacyBridge/WorkspaceFacetContributor.kt +++ b/platform/lang-impl/src/com/intellij/workspaceModel/ide/legacyBridge/WorkspaceFacetContributor.kt @@ -71,6 +71,6 @@ interface WorkspaceFacetContributor { } companion object { - val EP_NAME: ExtensionPointName> = ExtensionPointName.create("com.intellij.workspaceModel.facetBridgeContributor") + val EP_NAME: ExtensionPointName> = ExtensionPointName.create("com.intellij.workspaceModel.facetContributor") } } \ No newline at end of file diff --git a/platform/platform-resources/src/META-INF/LangExtensions.xml b/platform/platform-resources/src/META-INF/LangExtensions.xml index d5a8f63de1d2..f4a18f760345 100644 --- a/platform/platform-resources/src/META-INF/LangExtensions.xml +++ b/platform/platform-resources/src/META-INF/LangExtensions.xml @@ -317,7 +317,7 @@ - + diff --git a/platform/projectModel-impl/resources/META-INF/ProjectModelImpl.xml b/platform/projectModel-impl/resources/META-INF/ProjectModelImpl.xml index ca6c75c778d8..22826844e36b 100644 --- a/platform/projectModel-impl/resources/META-INF/ProjectModelImpl.xml +++ b/platform/projectModel-impl/resources/META-INF/ProjectModelImpl.xml @@ -13,9 +13,7 @@ - - diff --git a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/ModuleSettingsContributor.kt b/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/ModuleSettingsContributor.kt deleted file mode 100644 index 3d70bf8a86c6..000000000000 --- a/platform/projectModel-impl/src/com/intellij/workspaceModel/ide/ModuleSettingsContributor.kt +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.workspaceModel.ide - -import com.intellij.openapi.extensions.ExtensionPointName -import com.intellij.openapi.project.Project -import com.intellij.workspaceModel.ide.legacyBridge.FacetBridge -import com.intellij.workspaceModel.storage.EntitySource -import com.intellij.workspaceModel.storage.EntityStorage -import com.intellij.workspaceModel.storage.MutableEntityStorage -import com.intellij.workspaceModel.storage.bridgeEntities.api.FacetEntity -import com.intellij.workspaceModel.storage.bridgeEntities.api.ModuleEntity - -//TODO:: Rework it -interface ModuleSettingsContributor { - fun addSettings(project: Project) { } - fun addSettings(project: Project, module: ModuleEntity, entitySource: EntitySource, mutableStorage: MutableEntityStorage) { } - fun getFacetBridge(moduleEntity: ModuleEntity, entityStorage: EntityStorage): FacetBridge<*>? - - companion object { - val EP_NAME: ExtensionPointName = ExtensionPointName.create("com.intellij.workspaceModel.moduleSettingsContributor") - } -} \ No newline at end of file diff --git a/platform/workspaceModel/jps/src/com/intellij/workspaceModel/ide/impl/jps/serialization/DefaultFacetEntitySerializer.kt b/platform/workspaceModel/jps/src/com/intellij/workspaceModel/ide/impl/jps/serialization/DefaultFacetEntitySerializer.kt index e72605178af1..3a22abcbd79a 100644 --- a/platform/workspaceModel/jps/src/com/intellij/workspaceModel/ide/impl/jps/serialization/DefaultFacetEntitySerializer.kt +++ b/platform/workspaceModel/jps/src/com/intellij/workspaceModel/ide/impl/jps/serialization/DefaultFacetEntitySerializer.kt @@ -43,13 +43,6 @@ class DefaultFacetEntitySerializer: CustomFacetRelatedEntitySerializer() - logger.info("Add facet entity ${facetState.name}:${facetState.facetType}") - logger.info("Stack Trace facet Add") - val stackTrace = Thread.currentThread().stackTrace - for (stackTraceElement in stackTrace) { - logger.info(stackTraceElement.toString()) - } facetEntity = builder.addFacetEntity(facetState.name, facetState.facetType, configurationXmlTag, moduleEntity, underlyingFacet, entitySource) } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/workspaceModel/ModuleSettingsImporter.kt b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/workspaceModel/ModuleSettingsImporter.kt deleted file mode 100644 index cbfa326adf0b..000000000000 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/workspaceModel/ModuleSettingsImporter.kt +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package org.jetbrains.idea.maven.importing.workspaceModel - -import com.intellij.openapi.project.Project -import com.intellij.openapi.project.isExternalStorageEnabled -import com.intellij.workspaceModel.ide.JpsFileEntitySource -import com.intellij.workspaceModel.ide.JpsImportedEntitySource -import com.intellij.workspaceModel.ide.ModuleSettingsContributor -import com.intellij.workspaceModel.storage.EntitySource -import com.intellij.workspaceModel.storage.MutableEntityStorage -import com.intellij.workspaceModel.storage.bridgeEntities.api.ModuleEntity -import org.jetbrains.idea.maven.importing.MavenRootModelAdapter -import org.jetbrains.idea.maven.project.MavenProject - -class ModuleSettingsImporter { - fun configureSettingsForModule(project: Project, moduleEntity: ModuleEntity, mavenProject: MavenProject) { - val entitySource = calculateEntitySource(project, moduleEntity) - // TODO:: Rework it - ModuleSettingsContributor.EP_NAME.forEachExtensionSafe { settingsContributor -> - settingsContributor.addSettings(project, moduleEntity, entitySource, MutableEntityStorage.create()) - } - // TODO:: Only one usage in the plugins at EjbFacetImporter an zero at external plugins - // setupFacet(f, mavenProject) - } - - private fun calculateEntitySource(project: Project, moduleEntity: ModuleEntity): EntitySource { - val moduleSource = moduleEntity.entitySource - val externalSource = MavenRootModelAdapter.getMavenExternalSource() - return when { - moduleSource is JpsFileEntitySource -> - JpsImportedEntitySource(moduleSource, externalSource.id, project.isExternalStorageEnabled) - moduleSource is JpsImportedEntitySource && moduleSource.externalSystemId != externalSource.id -> - JpsImportedEntitySource(moduleSource.internalFile, externalSource.id, project.isExternalStorageEnabled) - else -> moduleSource - } - } -} \ No newline at end of file