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

cleanup — default implementation of RunProfileWithCompileBeforeLaunchOption.getModules

Browse Source
This commit is contained in:
Vladimir Krivosheev
2017-04-13 08:04:32 +02:00
parent be0ee1e178
commit bee311bce7
9 changed files with 13 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/javadoc/JavadocGeneratorRunProfile.java
+1 -6
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -91,11 +91,6 @@ public class JavadocGeneratorRunProfile implements ModuleRunProfile {
return null;
}
@NotNull
public Module[] getModules() {
return Module.EMPTY_ARRAY;
}
private static class MyJavaCommandLineState extends CommandLineState {
private final AnalysisScope myGenerationOptions;
private final Project myProject;
platform/lang-api/src/com/intellij/execution/configurations/RunProfileWithCompileBeforeLaunchOption.java
+4 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -29,5 +29,7 @@ public interface RunProfileWithCompileBeforeLaunchOption extends RunProfile {
* @return modules to compile before run. Empty list to build project
*/
@NotNull
Module[] getModules();
default Module[] getModules() {
return Module.EMPTY_ARRAY;
}
}
platform/lang-api/src/com/intellij/execution/configurations/RuntimeConfiguration.java
+1 -9
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,9 +16,7 @@
package com.intellij.execution.configurations;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.project.Project;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/**
@@ -29,12 +27,6 @@ public abstract class RuntimeConfiguration extends LocatableConfigurationBase im
super(project, factory, name);
}
@Override
@NotNull
public Module[] getModules() {
return Module.EMPTY_ARRAY;
}
@Override
public RuntimeConfiguration clone() {
return (RuntimeConfiguration)super.clone();
platform/lang-api/src/com/intellij/execution/junit/RuntimeConfigurationProducer.java
+1 -8
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@ import com.intellij.execution.configurations.*;
import com.intellij.execution.runners.ExecutionEnvironment;
import com.intellij.openapi.extensions.ExtensionPointName;
import com.intellij.openapi.extensions.Extensions;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.options.SettingsEditor;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.InvalidDataException;
@@ -229,11 +228,5 @@ public abstract class RuntimeConfigurationProducer implements Comparable, Clonea
public T getPeer() {
return myConfig;
}
@Override
@NotNull
public Module[] getModules() {
return Module.EMPTY_ARRAY;
}
}
}
platform/lang-impl/src/com/intellij/tools/ToolRunProfile.java
+1 -8
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -33,7 +33,6 @@ import com.intellij.ide.macro.Macro;
import com.intellij.ide.macro.MacroManager;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Key;
import org.jetbrains.annotations.NotNull;
@@ -82,12 +81,6 @@ public class ToolRunProfile implements ModuleRunProfile{
return null;
}
@Override
@NotNull
public Module[] getModules() {
return Module.EMPTY_ARRAY;
}
@Override
public RunProfileState getState(@NotNull final Executor executor, @NotNull final ExecutionEnvironment env) {
final Project project = env.getProject();
platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/MockRuntimeConfiguration.java
+3 -9
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@ import com.intellij.execution.ExecutionException;
import com.intellij.execution.Executor;
import com.intellij.execution.configurations.*;
import com.intellij.execution.runners.ExecutionEnvironment;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.options.SettingsEditor;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.InvalidDataException;
@@ -58,19 +57,14 @@ public class MockRuntimeConfiguration extends LocatableConfigurationBase impleme
return null;
}
@NotNull
@Override
public Module[] getModules() {
return Module.EMPTY_ARRAY;
}
private static class MockConfigurationFactory extends ConfigurationFactory {
public MockConfigurationFactory() {
super(new MyConfigurationType());
}
@NotNull
@Override
public RunConfiguration createTemplateConfiguration(Project project) {
public RunConfiguration createTemplateConfiguration(@NotNull Project project) {
return new MockRuntimeConfiguration(project);
}
plugins/ant/src/com/intellij/lang/ant/config/execution/AntRunConfiguration.java
+1 -8
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -25,7 +25,6 @@ import com.intellij.lang.ant.config.AntConfiguration;
import com.intellij.lang.ant.config.impl.BuildFileProperty;
import com.intellij.lang.ant.config.impl.GlobalAntConfiguration;
import com.intellij.lang.ant.config.impl.TargetChooserDialog;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.options.ConfigurationException;
import com.intellij.openapi.options.SettingsEditor;
import com.intellij.openapi.project.Project;
@@ -65,12 +64,6 @@ public class AntRunConfiguration extends LocatableConfigurationBase implements R
return configuration;
}
@NotNull
@Override
public Module[] getModules() {
return Module.EMPTY_ARRAY;
}
@NotNull
@Override
public SettingsEditor<? extends RunConfiguration> getConfigurationEditor() {
plugins/gradle/src/org/jetbrains/plugins/gradle/action/GradleRerunFailedTestsAction.java
+1 -7
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -56,12 +56,6 @@ public class GradleRerunFailedTestsAction extends JavaRerunFailedTestsAction {
ExternalSystemRunConfiguration configuration = (ExternalSystemRunConfiguration)myConsoleProperties.getConfiguration();
final List<AbstractTestProxy> failedTests = getFailedTests(configuration.getProject());
return new MyRunProfile(configuration) {
@NotNull
@Override
public Module[] getModules() {
return Module.EMPTY_ARRAY;
}
@Nullable
@Override
public RunProfileState getState(@NotNull Executor executor, @NotNull ExecutionEnvironment environment)
plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunConfiguration.java
-7
View File
@@ -23,7 +23,6 @@ import com.intellij.execution.process.ProcessAdapter;
import com.intellij.execution.process.ProcessEvent;
import com.intellij.execution.runners.ExecutionEnvironment;
import com.intellij.execution.runners.ProgramRunner;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.options.SettingsEditor;
import com.intellij.openapi.options.SettingsEditorGroup;
import com.intellij.openapi.project.Project;
@@ -111,12 +110,6 @@ public class MavenRunConfiguration extends LocatableConfigurationBase implements
MavenProjectsManager.getInstance(getProject()).updateProjectTargetFolders();
}
@Override
@NotNull
public Module[] getModules() {
return Module.EMPTY_ARRAY;
}
@Nullable
public MavenGeneralSettings getGeneralSettings() {
return mySettings.myGeneralSettings;