Merge pull request #3282 from dbeaver/3281-support-double-click-for-breakpoints

3281 support double click for breakpoints

plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/DatabaseDebugModelPresentation.java

@@ -33,8 +33,11 @@ import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.model.WorkbenchLabelProvider;
+import org.jkiss.dbeaver.Log;
+import org.jkiss.dbeaver.core.DBeaverCore;
 import org.jkiss.dbeaver.debug.core.DebugCore;
 import org.jkiss.dbeaver.debug.core.breakpoints.DatabaseLineBreakpoint;
+import org.jkiss.dbeaver.debug.core.breakpoints.IDatabaseBreakpoint;
 import org.jkiss.dbeaver.debug.core.model.DatabaseProcess;
 import org.jkiss.dbeaver.debug.core.model.DatabaseStackFrame;
 import org.jkiss.dbeaver.debug.core.model.DatabaseThread;
@@ -42,10 +45,16 @@ import org.jkiss.dbeaver.debug.core.model.DatabaseVariable;
 import org.jkiss.dbeaver.debug.core.model.IDatabaseDebugTarget;
 import org.jkiss.dbeaver.model.DBPScriptObject;
 import org.jkiss.dbeaver.model.navigator.DBNDatabaseNode;
+import org.jkiss.dbeaver.model.navigator.DBNModel;
+import org.jkiss.dbeaver.model.navigator.DBNNode;
+import org.jkiss.dbeaver.model.navigator.DBNRoot;
+import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor;
 import org.jkiss.dbeaver.ui.editors.entity.EntityEditorInput;
 
 public class DatabaseDebugModelPresentation extends LabelProvider implements IDebugModelPresentationExtension {
 
+    private static Log log = Log.getLog(DatabaseDebugModelPresentation.class);
+
     private final Map<String, Object> attributes = new HashMap<>();
 
     private final ILabelProvider labelProvider;
@@ -134,17 +143,38 @@ public class DatabaseDebugModelPresentation extends LabelProvider implements IDe
     @Override
     public IEditorInput getEditorInput(Object element) {
         if (element instanceof DBNDatabaseNode) {
-            DBNDatabaseNode dbnNode = (DBNDatabaseNode) element;
-            EntityEditorInput editorInput = new EntityEditorInput(dbnNode);
-            editorInput.setAttribute(DBPScriptObject.OPTION_DEBUGGER_SOURCE, Boolean.TRUE);
-// FIXME:AF: how to retrieve it? probably org.jkiss.dbeaver.databaseor and EntityEditorsRegistry can help
-            // String folderId = "postgresql.source.view";
-            // editorInput.setDefaultFolderId(folderId);
-            return editorInput;
+            DBNDatabaseNode databaseNode = (DBNDatabaseNode) element;
+            return createEditorInput(databaseNode);
+        }
+        if (element instanceof IDatabaseBreakpoint) {
+            IDatabaseBreakpoint breakpoint = (IDatabaseBreakpoint) element;
+            try {
+                String nodePath = breakpoint.getNodePath();
+                DBNModel navigatorModel = DBeaverCore.getInstance().getNavigatorModel();
+                DBNNode node = navigatorModel.getNodeByPath(new VoidProgressMonitor(), nodePath);
+                if (node instanceof DBNDatabaseNode) {
+                    DBNDatabaseNode databaseNode = (DBNDatabaseNode) node;
+                    return createEditorInput(databaseNode);
+                }
+            } catch (Exception e) {
+                String message = NLS.bind("Unable to resolve editor input for breakpoint {0}", breakpoint);
+                log.error(message, e);
+            }
+            
         }
+        
         return null;
     }
 
+    protected IEditorInput createEditorInput(DBNDatabaseNode dbnNode) {
+        EntityEditorInput editorInput = new EntityEditorInput(dbnNode);
+        editorInput.setAttribute(DBPScriptObject.OPTION_DEBUGGER_SOURCE, Boolean.TRUE);
+      // FIXME:AF: how to retrieve it? probably org.jkiss.dbeaver.databaseor and EntityEditorsRegistry can help
+        // String folderId = "postgresql.source.view";
+        // editorInput.setDefaultFolderId(folderId);
+        return editorInput;
+    }
+
     @Override
     public String getEditorId(IEditorInput input, Object element) {
         // FIXME:AF: is there a constant anywhere?

plugins/org.jkiss.dbeaver.ui/META-INF/MANIFEST.MF

@@ -16,6 +16,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui.views,
  org.eclipse.ui.workbench.texteditor,
  org.eclipse.mylyn.commons.ui,
+ org.eclipse.mylyn.commons.workbench,
  org.eclipse.mylyn.commons.notifications.core,
  org.eclipse.mylyn.commons.notifications.ui,
  org.jkiss.dbeaver.model