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 CompoundRunConfiguration creation

Browse Source
This commit is contained in:
Vladimir Krivosheev
2018-04-24 14:38:28 +02:00
parent 2519ece7e9
commit 5f6f92c33d
2 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/execution/compound/CompoundRunConfiguration.kt
+3 -4
View File
@@ -21,9 +21,8 @@ data class TypeNameTarget(val type: String, val name: String, val targetId: Stri
data class SettingsAndEffectiveTarget(val settings: RunnerAndConfigurationSettings, val target: ExecutionTarget)
class CompoundRunConfiguration(project: Project, type: CompoundRunConfigurationType, name: String) : RunConfigurationBase(project,
type.configurationFactories[0],
name), RunnerIconProvider, WithoutOwnBeforeRunSteps, Cloneable {
class CompoundRunConfiguration @JvmOverloads constructor(project: Project, name: String, factory: ConfigurationFactory = CompoundRunConfigurationType.getInstance().configurationFactories.first()) :
RunConfigurationBase(project, factory, name), RunnerIconProvider, WithoutOwnBeforeRunSteps, Cloneable {
companion object {
@JvmField
val COMPARATOR = Comparator<RunConfiguration> { o1, o2 ->
@@ -116,7 +115,7 @@ class CompoundRunConfiguration(project: Project, type: CompoundRunConfigurationT
}
}
fun getConfigurationsWithEffectiveRunTargets() : List<SettingsAndEffectiveTarget> {
fun getConfigurationsWithEffectiveRunTargets(): List<SettingsAndEffectiveTarget> {
val runManager = RunManagerImpl.getInstanceImpl(project)
val activeTarget = ExecutionTargetManager.getActiveTarget(project)
val defaultTarget = DefaultExecutionTarget.INSTANCE
platform/lang-impl/src/com/intellij/execution/compound/CompoundRunConfigurationType.java
+4 -9
View File
@@ -1,6 +1,4 @@
/*
* Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.execution.compound;
import com.intellij.execution.configurations.ConfigurationFactory;
@@ -12,8 +10,7 @@ import com.intellij.openapi.project.Project;
import com.intellij.ui.LayeredIcon;
import org.jetbrains.annotations.NotNull;
public class CompoundRunConfigurationType extends ConfigurationTypeBase {
public final class CompoundRunConfigurationType extends ConfigurationTypeBase {
public static CompoundRunConfigurationType getInstance() {
return ConfigurationTypeUtil.findConfigurationType(CompoundRunConfigurationType.class);
}
@@ -26,8 +23,8 @@ public class CompoundRunConfigurationType extends ConfigurationTypeBase {
addFactory(new ConfigurationFactory(this) {
@NotNull
@Override
public RunConfiguration createTemplateConfiguration(Project project) {
return new CompoundRunConfiguration(project, CompoundRunConfigurationType.this, "Compound Run Configuration");
public RunConfiguration createTemplateConfiguration(@NotNull Project project) {
return new CompoundRunConfiguration(project, "Compound Run Configuration", this);
}
@Override
@@ -46,6 +43,4 @@ public class CompoundRunConfigurationType extends ConfigurationTypeBase {
}
});
}
}