2 files changed, 13 insertions, 3 deletions
diff --git a/platform/xdebugger-api/src/com/intellij/xdebugger/XDebugSession.java b/platform/xdebugger-api/src/com/intellij/xdebugger/XDebugSession.java
index be71aac98d1e..33fa877064db 100644
--- a/platform/xdebugger-api/src/com/intellij/xdebugger/XDebugSession.java
+++ b/platform/xdebugger-api/src/com/intellij/xdebugger/XDebugSession.java
@@ -21,6 +21,7 @@ import com.intellij.execution.ui.ConsoleView;
 import com.intellij.execution.ui.RunContentDescriptor;
 import com.intellij.execution.ui.RunnerLayoutUi;
 import com.intellij.openapi.Disposable;
+import com.intellij.openapi.actionSystem.DataKey;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.MessageType;
 import com.intellij.xdebugger.breakpoints.XBreakpoint;
@@ -45,6 +46,7 @@ import javax.swing.event.HyperlinkListener;
  * @author nik
  */
 public interface XDebugSession extends AbstractDebuggerSession {
+  DataKey<XDebugSession> DATA_KEY = DataKey.create("XDebugSessionTab.XDebugSession");
 
   @NotNull
   Project getProject();
diff --git a/platform/xdebugger-api/src/com/intellij/xdebugger/XDebuggerManager.java b/platform/xdebugger-api/src/com/intellij/xdebugger/XDebuggerManager.java
index 08a30664f7dc..cb65b84af9d9 100644
--- a/platform/xdebugger-api/src/com/intellij/xdebugger/XDebuggerManager.java
+++ b/platform/xdebugger-api/src/com/intellij/xdebugger/XDebuggerManager.java
@@ -58,16 +58,24 @@ public abstract class XDebuggerManager {
   public abstract XDebugSession getCurrentSession();
 
   /**
-   * Start a new debugging session. Use this method only if debugging is started by using standard 'Debug' action i.e. this methods is called
-   * from {@link com.intellij.execution.runners.ProgramRunner#execute} method. Otherwise use {@link #startSessionAndShowTab} method
+   * @deprecated use {@link #startSession(com.intellij.execution.runners.ExecutionEnvironment, XDebugProcessStarter)} instead
+   * to remove in IDEA 15
    */
   @NotNull
-  public abstract XDebugSession startSession(@NotNull final ProgramRunner runner,
+  @Deprecated
+  public abstract XDebugSession startSession(@NotNull ProgramRunner runner,
                                              @NotNull ExecutionEnvironment env,
                                              @Nullable RunContentDescriptor contentToReuse,
                                              @NotNull XDebugProcessStarter processStarter) throws ExecutionException;
 
   /**
+   * Start a new debugging session. Use this method only if debugging is started by using standard 'Debug' action i.e. this methods is called
+   * from {@link com.intellij.execution.runners.ProgramRunner#execute} method. Otherwise use {@link #startSessionAndShowTab} method
+   */
+  @NotNull
+  public abstract XDebugSession startSession(@NotNull ExecutionEnvironment environment, @NotNull XDebugProcessStarter processStarter) throws ExecutionException;
+
+  /**
    * Start a new debugging session and open 'Debug' tool window
    * @param sessionName title of 'Debug' tool window
    */