do not require to pass ApplicationConfigurationType.getInstance()

This commit is contained in:
Vladimir Krivosheev
2018-04-19 12:58:20 +02:00
parent d00306301e
commit dbbbd9e421
4 changed files with 11 additions and 19 deletions
@@ -54,6 +54,10 @@ public class ApplicationConfiguration extends ModuleBasedConfiguration<JavaRunCo
this(name, project, applicationConfigurationType.getConfigurationFactories()[0]);
}
public ApplicationConfiguration(final String name, final Project project) {
this(name, project, ApplicationConfigurationType.getInstance().getConfigurationFactories()[0]);
}
protected ApplicationConfiguration(final String name, final Project project, final ConfigurationFactory factory) {
super(name, new JavaRunConfigurationModule(project, true), factory);
}
@@ -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.java.execution;
import com.intellij.application.options.ModuleDescriptionsComboBox;
@@ -9,7 +7,6 @@ import com.intellij.execution.ExecutionException;
import com.intellij.execution.RunConfigurationConfigurableAdapter;
import com.intellij.execution.application.ApplicationConfigurable;
import com.intellij.execution.application.ApplicationConfiguration;
import com.intellij.execution.application.ApplicationConfigurationType;
import com.intellij.execution.configurations.*;
import com.intellij.execution.executors.DefaultRunExecutor;
import com.intellij.execution.impl.RunManagerImpl;
@@ -360,7 +357,7 @@ public class ConfigurationsTest extends BaseConfigurationTestCase {
public void testCreatingApplicationConfiguration() throws ConfigurationException {
if (PlatformTestUtil.COVERAGE_ENABLED_BUILD) return;
ApplicationConfiguration configuration = new ApplicationConfiguration(null, myProject, ApplicationConfigurationType.getInstance());
ApplicationConfiguration configuration = new ApplicationConfiguration(null, myProject);
ApplicationConfigurable editor = new ApplicationConfigurable(myProject);
try {
editor.getComponent(); // To get all the watchers installed.
@@ -419,8 +416,7 @@ public class ConfigurationsTest extends BaseConfigurationTestCase {
}
public void testRunThirdPartyApplication() throws ExecutionException {
ApplicationConfiguration configuration =
new ApplicationConfiguration("Third party", myProject, ApplicationConfigurationType.getInstance());
ApplicationConfiguration configuration = new ApplicationConfiguration("Third party", myProject);
configuration.setModule(getModule1());
configuration.setMainClassName("third.party.Main");
checkCanRun(configuration);
@@ -1,11 +1,8 @@
/*
* 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.java.execution.actions;
import com.intellij.execution.actions.BaseRunConfigurationAction;
import com.intellij.execution.application.ApplicationConfiguration;
import com.intellij.execution.application.ApplicationConfigurationType;
import com.intellij.execution.configurations.LocatableConfiguration;
import com.intellij.execution.junit.JUnitConfiguration;
import com.intellij.execution.junit.JUnitConfigurationType;
@@ -13,7 +10,7 @@ import com.intellij.testFramework.LightIdeaTestCase;
public class BaseRunConfigurationActionTest extends LightIdeaTestCase {
public void testRunApplicationName() {
ApplicationConfiguration configuration = new ApplicationConfiguration(null, getProject(), ApplicationConfigurationType.getInstance());
ApplicationConfiguration configuration = new ApplicationConfiguration(null, getProject());
configuration.setMainClassName("com.comp.AClass");
configuration.setGeneratedName();
@@ -1,13 +1,10 @@
/*
* 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.
*/
// 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 org.jetbrains.plugins.groovy.compiler
import com.intellij.compiler.server.BuildManager
import com.intellij.execution.ExecutionException
import com.intellij.execution.Executor
import com.intellij.execution.application.ApplicationConfiguration
import com.intellij.execution.application.ApplicationConfigurationType
import com.intellij.execution.executors.DefaultRunExecutor
import com.intellij.execution.impl.DefaultJavaProgramRunner
import com.intellij.execution.process.*
@@ -43,7 +40,6 @@ import org.jetbrains.plugins.groovy.config.GroovyFacetUtil
import org.jetbrains.plugins.groovy.runner.GroovyScriptRunConfiguration
import org.jetbrains.plugins.groovy.runner.GroovyScriptRunConfigurationType
import org.jetbrains.plugins.groovy.util.Slow
/**
* @author aalmiray
* @author peter
@@ -232,8 +228,7 @@ abstract class GroovyCompilerTestCase extends JavaCodeInsightFixtureTestCase imp
}
protected ApplicationConfiguration createApplicationConfiguration(String className, Module module) {
final ApplicationConfiguration configuration =
new ApplicationConfiguration("app", getProject(), ApplicationConfigurationType.getInstance())
final ApplicationConfiguration configuration = new ApplicationConfiguration("app", getProject())
configuration.setModule(module)
configuration.setMainClassName(className)
return configuration