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

Use com.intellij.openapi.util.Pair instead of kotlin.Pair

Browse Source
This commit is contained in:
Vassiliy.Kudryashov
2017-12-28 13:55:04 +03:00
parent ce03f1f8f8
commit b8e32d164d
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/execution/ExecutorRegistryImpl.java
+1 -1
View File
@@ -33,13 +33,13 @@ import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.components.ApplicationComponent;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.*;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.Trinity;
import com.intellij.util.IconUtil;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.messages.MessageBusConnection;
import gnu.trove.THashMap;
import gnu.trove.THashSet;
import kotlin.Pair;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
platform/lang-impl/src/com/intellij/execution/compound/CompoundRunConfiguration.kt
+6 -4
View File
@@ -13,6 +13,7 @@ import com.intellij.icons.AllIcons
import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.options.SettingsEditor
import com.intellij.openapi.project.Project
import com.intellij.openapi.util.Pair
import gnu.trove.THashSet
import org.jdom.Element
import java.util.*
@@ -111,23 +112,24 @@ class CompoundRunConfiguration(project: Project, type: CompoundRunConfigurationT
return RunProfileState { _, _ ->
ApplicationManager.getApplication().invokeLater {
getConfigurationsWithEffectiveRunTargets().forEach { (config, target) -> ExecutionUtil.runConfiguration(config, executor, target) }
getConfigurationsWithEffectiveRunTargets().forEach { pair: Pair<RunnerAndConfigurationSettings, ExecutionTarget> -> ExecutionUtil.runConfiguration(pair.first, executor, pair.second) }
}
null
}
}
fun getConfigurationsWithEffectiveRunTargets() : List<Pair<RunnerAndConfigurationSettings, ExecutionTarget>> {
fun getConfigurationsWithEffectiveRunTargets() : List<com.intellij.openapi.util.Pair<RunnerAndConfigurationSettings, ExecutionTarget>> {
val runManager = RunManagerImpl.getInstanceImpl(project)
val activeTarget = ExecutionTargetManager.getActiveTarget(project)
val defaultTarget = DefaultExecutionTarget.INSTANCE
return sortedConfigurationsWithTargets.mapNotNull { (configuration, specifiedTarget) ->
val transform: (Map.Entry<RunConfiguration, ExecutionTarget?>) -> com.intellij.openapi.util.Pair< RunnerAndConfigurationSettings, ExecutionTarget>? = { (configuration, specifiedTarget) ->
runManager.getSettings(configuration)?.let {
val effectiveTarget = specifiedTarget ?: if (ExecutionTargetManager.canRun(it, activeTarget)) activeTarget else defaultTarget
it to effectiveTarget
return@let com.intellij.openapi.util.Pair.create(it ,effectiveTarget)
}
}
return sortedConfigurationsWithTargets.mapNotNull(transform)
}
override fun readExternal(element: Element) {