Merge remote-tracking branch 'aosp/upstream-master' into merge

Conflicts:
	.idea/modules.xml
	platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesXmlLoader.java

Change-Id: Id899dae9a1e1c79272f8a70e14a7dcef4f760d7f

1 files changed, 7 insertions, 2 deletions

diff --git a/platform/lang-api/src/com/intellij/execution/ExecutorRegistry.java b/platform/lang-api/src/com/intellij/execution/ExecutorRegistry.java
index 49139be54e58..31d39087d1f1 100644
--- a/platform/lang-api/src/com/intellij/execution/ExecutorRegistry.java
+++ b/platform/lang-api/src/com/intellij/execution/ExecutorRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2014 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,6 +16,7 @@
 
 package com.intellij.execution;
 
+import com.intellij.execution.runners.ExecutionEnvironment;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.components.ApplicationComponent;
 import com.intellij.openapi.project.Project;
@@ -25,7 +26,6 @@ import org.jetbrains.annotations.NotNull;
  * @author spleaner
  */
 public abstract class ExecutorRegistry implements ApplicationComponent {
-
   public static ExecutorRegistry getInstance() {
     return ApplicationManager.getApplication().getComponent(ExecutorRegistry.class);
   }
@@ -35,5 +35,10 @@ public abstract class ExecutorRegistry implements ApplicationComponent {
 
   public abstract Executor getExecutorById(final String executorId);
 
+  /**
+   * Consider to use {@link #isStarting(com.intellij.execution.runners.ExecutionEnvironment)}
+   */
   public abstract boolean isStarting(Project project, String executorId, String runnerId);
+
+  public abstract boolean isStarting(@NotNull ExecutionEnvironment environment);
 }