MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-02-05 16:36:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

[Java|Gradle|Sync] cleanup: renamed JarTaskManifestConfiguration to JavaGradleManifestModel

Browse Source 
GitOrigin-RevId: c898c9ac1a1d7dd9e20efecb9e7908f201b6d43e
This commit is contained in:
Sergei Vorobyov
2024-09-27 18:40:12 +02:00
committed by intellij-monorepo-bot
parent b1d4df714d
commit e3da0bb5d9
11 changed files with 94 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/java-impl/src/META-INF/JavaPlugin.xml
View File

@@ -1574,7 +1574,7 @@
<inspectionElementsMerger implementation="com.intellij.codeInspection.ExplicitArrayFillingInspectionMerger"/>
<externalProjectDataService implementation="com.intellij.externalSystem.JavaProjectDataService"/>
<externalProjectDataService implementation="com.intellij.externalSystem.JavaModuleDataService"/>
<externalWorkspaceDataService implementation="com.intellij.externalSystem.JarTaskManifestDataService"/>
<externalWorkspaceDataService implementation="com.intellij.externalSystem.JavaManifestDataService"/>
<libraryDataServiceExtension implementation="com.intellij.externalSystem.JavaLibraryDataServiceExtension"/>
<postStartupActivity implementation="com.intellij.pom.java.AcceptedLanguageLevelsSettingsStartupActivity"/>
<projectModelModifier implementation="com.intellij.openapi.roots.impl.IdeaProjectModelModifier" order="last"/>

21
java/java-impl/src/com/intellij/externalSystem/JavaManifestData.kt Normal file
View File

@@ -0,0 +1,21 @@
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.externalSystem
import com.intellij.openapi.externalSystem.model.Key
import com.intellij.openapi.externalSystem.model.ProjectKeys
import com.intellij.serialization.PropertyMapping
class JavaManifestData {
val manifestAttributes: Map<String, String>
@PropertyMapping("manifestAttributes")
constructor(manifestAttributes: Map<String, String>) {
this.manifestAttributes = manifestAttributes
}
companion object {
@JvmField
val KEY = Key.create(JavaManifestData::class.java, ProjectKeys.TASK.processingWeight + 1)
}
}

31
java/java-impl/src/com/intellij/externalSystem/JarTaskManifestDataService.kt → java/java-impl/src/com/intellij/externalSystem/JavaManifestDataService.kt
View File

@@ -6,7 +6,6 @@ import com.intellij.java.workspace.entities.javaSettings
import com.intellij.java.workspace.entities.modifyJavaModuleSettingsEntity
import com.intellij.openapi.externalSystem.model.DataNode
import com.intellij.openapi.externalSystem.model.Key
import com.intellij.openapi.externalSystem.model.ProjectKeys
import com.intellij.openapi.externalSystem.model.project.ModuleData
import com.intellij.openapi.externalSystem.model.project.ProjectData
import com.intellij.openapi.externalSystem.service.project.manage.AbstractModuleDataService
@@ -16,22 +15,25 @@ import com.intellij.openapi.project.Project
import com.intellij.platform.workspace.jps.entities.ModuleId
import com.intellij.platform.workspace.jps.entities.modifyModuleEntity
import com.intellij.platform.workspace.storage.MutableEntityStorage
import com.intellij.serialization.PropertyMapping
import org.jetbrains.annotations.ApiStatus
internal class JarTaskManifestDataService : WorkspaceDataService<JarTaskManifestData> {
private val GRADLE_MAIN_SUFFIX = ".main"
override fun getTargetDataKey(): Key<JarTaskManifestData> = JarTaskManifestData.KEY
private const val GRADLE_MAIN_SUFFIX = ".main"
@ApiStatus.Internal
class JavaManifestDataService : WorkspaceDataService<JavaManifestData> {
override fun getTargetDataKey(): Key<JavaManifestData> = JavaManifestData.KEY
override fun importData(
toImport: Collection<DataNode<JarTaskManifestData>>,
toImport: Collection<DataNode<JavaManifestData>>,
projectData: ProjectData?,
project: Project,
mutableStorage: MutableEntityStorage
mutableStorage: MutableEntityStorage,
) {
for (jarTaskManifestNode in toImport) {
val moduleNode = jarTaskManifestNode.getParent(ModuleData::class.java) ?: continue
for (manifestNode in toImport) {
val moduleNode = manifestNode.getParent(ModuleData::class.java) ?: continue
val module = moduleNode.getUserData(AbstractModuleDataService.MODULE_KEY) ?: continue
val manifestAttributes = jarTaskManifestNode.data.manifestAttributes
val manifestAttributes = manifestNode.data.manifestAttributes
importManifestAttributes(module, manifestAttributes, mutableStorage)
}
@@ -57,13 +59,4 @@ internal class JarTaskManifestDataService : WorkspaceDataService<JarTaskManifest
}
}
}
}
class JarTaskManifestData
@PropertyMapping("manifestAttributes")
constructor(val manifestAttributes: Map<String, String>) {
companion object {
@JvmField
val KEY = Key.create(JarTaskManifestData::class.java, ProjectKeys.TASK.processingWeight + 1)
}
}