MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

simplify — stringIdToBeforeRunProvider (id to provider map is not required)

Browse Source 
(cherry picked from commit 52d7527cf697bd481876b8b202c80094ff791715)
This commit is contained in:
Vladimir Krivosheev
2017-04-10 18:19:56 +02:00
parent 16e4280e18
commit af400b3faf
1 changed files with 11 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/execution/impl/RunManagerImpl.kt
+11 -36
View File
@@ -151,6 +151,14 @@ class RunManagerImpl(internal val project: Project) : RunManagerEx(), Persistent
}
}, streamProvider = schemeManagerProvider, autoSave = false)
private val stringIdToBeforeRunProvider by lazy {
val result = ContainerUtil.newConcurrentMap<String, BeforeRunTaskProvider<*>>()
for (provider in BeforeRunTaskProvider.EXTENSION_POINT_NAME.getExtensions(project)) {
result.put(provider.id.toString(), provider)
}
result
}
init {
initializeConfigurationTypes(ConfigurationType.CONFIGURATION_TYPE_EP.extensions)
project.messageBus.connect().subscribe(ProjectTopics.PROJECT_ROOTS, object : ModuleRootListener {
@@ -705,8 +713,9 @@ class RunManagerImpl(internal val project: Project) : RunManagerEx(), Persistent
private fun readStepsBeforeRun(child: Element, settings: RunnerAndConfigurationSettings): List<BeforeRunTask<*>> {
var result: MutableList<BeforeRunTask<*>>? = null
for (methodElement in child.getChildren(OPTION)) {
val id = getProviderKey(methodElement.getAttributeValue(NAME_ATTR))
val beforeRunTask = getProvider(id).createTask(settings.configuration)
val key = methodElement.getAttributeValue(NAME_ATTR)
val provider = stringIdToBeforeRunProvider.getOrPut(key) { UnknownBeforeRunTaskProvider(key) }
val beforeRunTask = provider.createTask(settings.configuration)
if (beforeRunTask != null) {
beforeRunTask.readExternal(methodElement)
if (result == null) {
@@ -1064,40 +1073,6 @@ class RunManagerImpl(internal val project: Project) : RunManagerEx(), Persistent
myDispatcher.multicaster.beforeRunTasksChanged()
}
private var myBeforeStepsMap: MutableMap<Key<out BeforeRunTask<*>>, BeforeRunTaskProvider<*>>? = null
private var myProviderKeysMap: MutableMap<String, Key<out BeforeRunTask<*>>>? = null
@Synchronized private fun getProvider(providerId: Key<out BeforeRunTask<*>>): BeforeRunTaskProvider<*> {
if (myBeforeStepsMap == null) {
initProviderMaps()
}
return myBeforeStepsMap!!.get(providerId)!!
}
@Synchronized
private fun getProviderKey(keyString: String): Key<out BeforeRunTask<*>> {
if (myProviderKeysMap == null) {
initProviderMaps()
}
return myProviderKeysMap!!.getOrPut(keyString) {
val provider = UnknownBeforeRunTaskProvider(keyString)
val id = provider.id!!
myBeforeStepsMap!!.put(id, provider)
id
}
}
private fun initProviderMaps() {
myBeforeStepsMap = LinkedHashMap()
myProviderKeysMap = LinkedHashMap()
for (provider in Extensions.getExtensions(BeforeRunTaskProvider.EXTENSION_POINT_NAME, project)) {
val id = provider.id
myBeforeStepsMap!!.put(id, provider)
myProviderKeysMap!!.put(id.toString(), id)
}
}
override fun removeConfiguration(settings: RunnerAndConfigurationSettings?) {
if (settings == null) {
return