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

https://upsource.labs.intellij.net/IDEA/review/IDEA-CR-5815?commentId=bb520e7c-239c-4cc3-8d07-d610a2552fc5

Browse Source
This commit is contained in:
irengrig
2015-10-16 12:59:42 +02:00
parent 4c1f89cd97
commit d93b404acd
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/execution/startup/ProjectStartupConfigurable.java
+2 -2
View File
@@ -258,7 +258,7 @@ public class ProjectStartupConfigurable implements SearchableConfigurable, Confi
}
private void addConfiguration(RunnerAndConfigurationSettings configuration) {
if (!ProjectStartupRunner.canRun(DefaultRunExecutor.getRunExecutorInstance(), configuration)) {
if (!ProjectStartupRunner.canBeRun(configuration)) {
final String message = "Can not add Run Configuration '" + configuration.getName() + "' to Startup Tasks," +
" since it can not be started with 'Run' action.";
final Balloon balloon = JBPopupFactory.getInstance()
@@ -290,7 +290,7 @@ public class ProjectStartupConfigurable implements SearchableConfigurable, Confi
for (ChooseRunConfigurationPopup.ItemWrapper setting : allSettings) {
if (setting.getValue() instanceof RunnerAndConfigurationSettings) {
final RunnerAndConfigurationSettings settings = (RunnerAndConfigurationSettings)setting.getValue();
if (!settings.isTemporary() && ProjectStartupRunner.canRun(executor, settings) && !existing.contains(settings)) {
if (!settings.isTemporary() && ProjectStartupRunner.canBeRun(settings) && !existing.contains(settings)) {
wrappers.add(setting);
}
}
platform/lang-impl/src/com/intellij/execution/startup/ProjectStartupRunner.java
+3 -3
View File
@@ -89,7 +89,7 @@ public class ProjectStartupRunner implements StartupActivity {
ApplicationManager.getApplication().invokeLater(new Runnable() {
@Override
public void run() {
if (! canRun(executor, configuration)) {
if (! canBeRun(configuration)) {
ProjectStartupTaskManager.NOTIFICATION_GROUP
.createNotification(ProjectStartupTaskManager.PREFIX + " Run Configuration '" + configuration.getName() + "' can not be started with Run executor.", MessageType.ERROR)
.notify(project);
@@ -104,7 +104,7 @@ public class ProjectStartupRunner implements StartupActivity {
}
}
public static boolean canRun(Executor executor, RunnerAndConfigurationSettings configuration) {
return RunnerRegistry.getInstance().getRunner(executor.getId(), configuration.getConfiguration()) != null;
public static boolean canBeRun(@NotNull RunnerAndConfigurationSettings configuration) {
return RunnerRegistry.getInstance().getRunner(DefaultRunExecutor.EXECUTOR_ID, configuration.getConfiguration()) != null;
}
}