From 5f6f92c33db6d8d55087aa76f46eae7ac0d199b9 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Tue, 24 Apr 2018 13:40:22 +0200 Subject: [PATCH] simplify CompoundRunConfiguration creation --- .../execution/compound/CompoundRunConfiguration.kt | 7 +++---- .../compound/CompoundRunConfigurationType.java | 13 ++++--------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/execution/compound/CompoundRunConfiguration.kt b/platform/lang-impl/src/com/intellij/execution/compound/CompoundRunConfiguration.kt index e05694e5b0fe..3ddfc1efa6c3 100644 --- a/platform/lang-impl/src/com/intellij/execution/compound/CompoundRunConfiguration.kt +++ b/platform/lang-impl/src/com/intellij/execution/compound/CompoundRunConfiguration.kt @@ -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 { o1, o2 -> @@ -116,7 +115,7 @@ class CompoundRunConfiguration(project: Project, type: CompoundRunConfigurationT } } - fun getConfigurationsWithEffectiveRunTargets() : List { + fun getConfigurationsWithEffectiveRunTargets(): List { val runManager = RunManagerImpl.getInstanceImpl(project) val activeTarget = ExecutionTargetManager.getActiveTarget(project) val defaultTarget = DefaultExecutionTarget.INSTANCE diff --git a/platform/lang-impl/src/com/intellij/execution/compound/CompoundRunConfigurationType.java b/platform/lang-impl/src/com/intellij/execution/compound/CompoundRunConfigurationType.java index 07972d85f039..a5b029690ea6 100644 --- a/platform/lang-impl/src/com/intellij/execution/compound/CompoundRunConfigurationType.java +++ b/platform/lang-impl/src/com/intellij/execution/compound/CompoundRunConfigurationType.java @@ -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 { } }); } - - }