Thread dump for java debugger

ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/debug/DebuggerServiceClient.java

@@ -17,6 +17,7 @@
 import org.eclipse.che.api.debug.shared.dto.LocationDto;
 import org.eclipse.che.api.debug.shared.dto.SimpleValueDto;
 import org.eclipse.che.api.debug.shared.dto.StackFrameDumpDto;
+import org.eclipse.che.api.debug.shared.dto.ThreadDumpDto;
 import org.eclipse.che.api.debug.shared.dto.VariableDto;
 import org.eclipse.che.api.debug.shared.dto.action.ResumeActionDto;
 import org.eclipse.che.api.debug.shared.dto.action.StartActionDto;
@@ -104,11 +105,20 @@ public interface DebuggerServiceClient {
   Promise<List<BreakpointDto>> getAllBreakpoints(String id);
 
   /**
-   * Gets dump of fields and local variables of the current frame.
+   * Gets the stack frame dump.
    *
    * @param id debug session id
+   * @param threadId the unique thread id
+   * @param frameIndex the frame index in the thread
    */
-  Promise<StackFrameDumpDto> getStackFrameDump(String id);
+  Promise<StackFrameDumpDto> getStackFrameDump(String id, long threadId, int frameIndex);
+
+  /**
+   * Gets thread dump.
+   *
+   * @param id debug session id
+   */
+  Promise<List<ThreadDumpDto>> getThreadDump(String id);
 
   /**
    * Resumes application.
@@ -118,18 +128,23 @@ public interface DebuggerServiceClient {
   Promise<Void> resume(String id, ResumeActionDto action);
 
   /**
-   * Returns a value of the variable.
+   * Returns a value of the variable in the specific frame.
    *
    * @param id debug session id
+   * @param threadId the unique thread id
+   * @param frameIndex the frame index in the thread
    */
-  Promise<SimpleValueDto> getValue(String id, VariableDto variableDto);
+  Promise<SimpleValueDto> getValue(
+      String id, VariableDto variableDto, long threadId, int frameIndex);
 
   /**
-   * Sets the new value of the variable.
+   * Sets the new value of the variable in the specific frame.
    *
    * @param id debug session id
+   * @param threadId the unique thread id
+   * @param frameIndex the frame index in the thread
    */
-  Promise<Void> setValue(String id, VariableDto variableDto);
+  Promise<Void> setValue(String id, VariableDto variableDto, long threadId, int frameIndex);
 
   /**
    * Does step into.
@@ -156,10 +171,12 @@ public interface DebuggerServiceClient {
   Promise<Void> stepOut(String id, StepOutActionDto action);
 
   /**
-   * Evaluate the expression.
+   * Evaluate the expression inside specific frame.
    *
    * @param id debug session id
    * @param expression the expression to evaluate
+   * @param threadId the unique thread id
+   * @param frameIndex the frame index in the thread
    */
-  Promise<String> evaluate(String id, String expression);
+  Promise<String> evaluate(String id, String expression, long threadId, int frameIndex);
 }

ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/debug/DebuggerServiceClientImpl.java

@@ -23,6 +23,7 @@
 import org.eclipse.che.api.debug.shared.dto.LocationDto;
 import org.eclipse.che.api.debug.shared.dto.SimpleValueDto;
 import org.eclipse.che.api.debug.shared.dto.StackFrameDumpDto;
+import org.eclipse.che.api.debug.shared.dto.ThreadDumpDto;
 import org.eclipse.che.api.debug.shared.dto.VariableDto;
 import org.eclipse.che.api.debug.shared.dto.action.ActionDto;
 import org.eclipse.che.api.debug.shared.dto.action.ResumeActionDto;
@@ -130,27 +131,37 @@ public Promise<Void> deleteAllBreakpoints(String id) {
   }
 
   @Override
-  public Promise<StackFrameDumpDto> getStackFrameDump(String id) {
-    final String requestUrl = getBaseUrl(id) + "/dump";
+  public Promise<StackFrameDumpDto> getStackFrameDump(String id, long threadId, int frameIndex) {
+    final String requestUrl =
+        getBaseUrl(id) + "/stackframedump?thread=" + threadId + "&frame=" + frameIndex;
     return asyncRequestFactory
         .createGetRequest(requestUrl)
         .send(dtoUnmarshallerFactory.newUnmarshaller(StackFrameDumpDto.class));
   }
 
+  @Override
+  public Promise<List<ThreadDumpDto>> getThreadDump(String id) {
+    final String requestUrl = getBaseUrl(id) + "/threaddump";
+    return asyncRequestFactory
+        .createGetRequest(requestUrl)
+        .send(dtoUnmarshallerFactory.newListUnmarshaller(ThreadDumpDto.class));
+  }
+
   @Override
   public Promise<Void> resume(String id, ResumeActionDto action) {
     return performAction(id, action);
   }
 
   @Override
-  public Promise<SimpleValueDto> getValue(String id, VariableDto variableDto) {
-    final String requestUrl = getBaseUrl(id) + "/value";
+  public Promise<SimpleValueDto> getValue(
+      String id, VariableDto variableDto, long threadId, int frameIndex) {
+    final String requestUrl = getBaseUrl(id) + "/value?thread=" + threadId + "&frame=" + frameIndex;
     List<String> path = variableDto.getVariablePath().getPath();
 
     StringBuilder params = new StringBuilder();
     for (int i = 0; i < path.size(); i++) {
-      params.append(i == 0 ? "?" : "&");
-      params.append("path");
+
+      params.append("&path");
       params.append(i);
       params.append("=");
       params.append(path.get(i));
@@ -162,8 +173,8 @@ public Promise<SimpleValueDto> getValue(String id, VariableDto variableDto) {
   }
 
   @Override
-  public Promise<Void> setValue(String id, VariableDto variableDto) {
-    final String requestUrl = getBaseUrl(id) + "/value";
+  public Promise<Void> setValue(String id, VariableDto variableDto, long threadId, int frameIndex) {
+    final String requestUrl = getBaseUrl(id) + "/value?thread=" + threadId + "&frame=" + frameIndex;
     return asyncRequestFactory.createPutRequest(requestUrl, variableDto).send();
   }
 
@@ -183,9 +194,9 @@ public Promise<Void> stepOut(String id, StepOutActionDto action) {
   }
 
   @Override
-  public Promise<String> evaluate(String id, String expression) {
-    String requestUrl = getBaseUrl(id) + "/evaluation";
-    String params = "?expression=" + URL.encodeQueryString(expression);
+  public Promise<String> evaluate(String id, String expression, long threadId, int frameIndex) {
+    String requestUrl = getBaseUrl(id) + "/evaluation?thread=" + threadId + "&frame=" + frameIndex;
+    String params = "&expression=" + URL.encodeQueryString(expression);
     return asyncRequestFactory
         .createGetRequest(requestUrl + params)
         .loader(loaderFactory.newLoader())

ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/debug/BreakpointManagerImpl.java

@@ -24,6 +24,8 @@
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.logging.Logger;
+
+import org.eclipse.che.api.debug.shared.model.Location;
 import org.eclipse.che.api.promises.client.Promise;
 import org.eclipse.che.api.workspace.shared.dto.ProjectConfigDto;
 import org.eclipse.che.commons.annotation.Nullable;
@@ -298,7 +300,6 @@ private BreakpointRenderer getBreakpointRendererForEditor(final EditorPartPresen
     return null;
   }
 
-  /** {@inheritDoc} */
   @Override
   public void onLineChange(
       final VirtualFile file, final int firstLine, final int linesAdded, final int linesRemoved) {
@@ -611,8 +612,8 @@ public void onPreResume() {
   }
 
   @Override
-  public void onBreakpointStopped(String filePath, String className, int lineNumber) {
-    setCurrentBreakpoint(filePath, lineNumber - 1);
+  public void onBreakpointStopped(String filePath, Location location) {
+    setCurrentBreakpoint(filePath, location.getLineNumber() - 1);
   }
 
   @Override

ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/debug/Debugger.java

@@ -10,7 +10,9 @@
  */
 package org.eclipse.che.ide.debug;
 
+import java.util.List;
 import java.util.Map;
+import org.eclipse.che.api.debug.shared.dto.ThreadDumpDto;
 import org.eclipse.che.api.debug.shared.model.SimpleValue;
 import org.eclipse.che.api.debug.shared.model.StackFrameDump;
 import org.eclipse.che.api.debug.shared.model.Variable;
@@ -75,21 +77,42 @@ public interface Debugger extends DebuggerObservable {
   /** Suspends application. */
   void suspend();
 
-  /** Evaluates the given expression */
-  Promise<String> evaluate(String expression);
+  /**
+   * Evaluates the given expression inside specific frame.
+   *
+   * @param threadId the unique thread id
+   * @param frameIndex the frame index in the thread
+   */
+  Promise<String> evaluate(String expression, long threadId, int frameIndex);
+
+  /**
+   * Gets the value of the given variableinside specific frame.
+   *
+   * @param variable the variable to get value from
+   * @param threadId the unique thread id
+   * @param frameIndex the frame index in the thread
+   */
+  Promise<SimpleValue> getValue(Variable variable, long threadId, int frameIndex);
 
-  /** Gets the value of the given variable. */
-  Promise<SimpleValue> getValue(Variable variable);
+  /**
+   * Gets stack framedump.
+   *
+   * @param threadId the unique thread id
+   * @param frameIndex the frameindex in the thread
+   */
+  Promise<StackFrameDump> getStackFrameDump(long threadId, int frameIndex);
 
-  /** Gets dump the current frame. */
-  Promise<StackFrameDump> dumpStackFrame();
+  /** Gets thread dump. */
+  Promise<List<ThreadDumpDto>> getThreadDump();
 
   /**
    * Updates the value of the given variable.
    *
    * @param variable the variable to update
+   * @param threadId the unique thread id
+   * @param frameIndex the frame index in the thread
    */
-  void setValue(Variable variable);
+  void setValue(Variable variable, long threadId, int frameIndex);
 
   /** Indicates if connection is established with the server. */
   boolean isConnected();

ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/debug/DebuggerObserver.java

@@ -11,6 +11,7 @@
 package org.eclipse.che.ide.debug;
 
 import java.util.List;
+import org.eclipse.che.api.debug.shared.model.Location;
 import org.eclipse.che.api.promises.client.Promise;
 import org.eclipse.che.ide.api.debug.Breakpoint;
 
@@ -48,7 +49,7 @@ public interface DebuggerObserver {
   void onPreResume();
 
   /** Event happens when debugger stopped at breakpoint. */
-  void onBreakpointStopped(String filePath, String className, int lineNumber);
+  void onBreakpointStopped(String filePath, Location location);
 
   /** Event happens when value changed. */
   void onValueChanged(List<String> path, String newValue);

plugins/plugin-debugger/che-plugin-debugger-ide/src/main/java/org/eclipse/che/plugin/debugger/ide/DebuggerLocalizationConstant.java

@@ -199,4 +199,7 @@ public interface DebuggerLocalizationConstant extends com.google.gwt.i18n.client
 
   @Key("view.editConfigurations.saveChanges.discard")
   String editConfigurationsSaveChangesDiscard();
+
+  @Key("debugger.frames.title")
+  String debuggerFramesTitle();
 }

plugins/plugin-debugger/che-plugin-debugger-ide/src/main/java/org/eclipse/che/plugin/debugger/ide/actions/ShowHideDebuggerPanelAction.java

@@ -42,7 +42,7 @@ public void actionPerformed(ActionEvent e) {
         debuggerPresenter.showDebuggerPanel();
       }
     } else {
-      debuggerPresenter.showAndUpdateView();
+      debuggerPresenter.updateView();
       debuggerPresenter.showDebuggerPanel();
     }
   }