Attachment 221006 Details for Bug 389197 – Updated patch targeted for linux.

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Updated patch targeted for linux.

0001-Bug-389197-debug-view-If-user-expands-stack-trace-it.patch (text/plain), 13.63 KB, created by Pawel Piech

on 2012-09-13 01:01:41 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Pawel Piech

Created: 2012-09-13 01:01:41 EDT

Size: 13.63 KB

patch

obsolete

>From 58fdecd879e76ac842d58aaa6b59920e638ee279 Mon Sep 17 00:00:00 2001
>From: Pawel Piech <pawel.piech@windriver.com>
>Date: Mon, 10 Sep 2012 14:21:48 -0700
>Subject: [PATCH] Bug 389197 - [debug view] If user expands stack trace, it
> should re-expand after a suspended event
>
>---
> .../tcf/internal/debug/ui/model/TCFModel.java      |   17 ++--
> .../tcf/internal/debug/ui/model/TCFModelProxy.java |   96 +++++++++++++++++---
> 2 files changed, 91 insertions(+), 22 deletions(-)
>
>diff --git a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFModel.java b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFModel.java
>index 2ed4a32..5e03684 100644
>--- a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFModel.java
>+++ b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFModel.java
>@@ -40,7 +40,6 @@ import org.eclipse.debug.core.model.IMemoryBlockRetrievalExtension;
> import org.eclipse.debug.core.model.ISourceLocator;
> import org.eclipse.debug.core.sourcelookup.ISourceLookupDirector;
> import org.eclipse.debug.core.sourcelookup.ISourceLookupParticipant;
>-import org.eclipse.debug.internal.ui.viewers.model.provisional.ITreeModelViewer;
> import org.eclipse.debug.internal.ui.viewers.model.provisional.IChildrenCountUpdate;
> import org.eclipse.debug.internal.ui.viewers.model.provisional.IChildrenUpdate;
> import org.eclipse.debug.internal.ui.viewers.model.provisional.IColumnPresentation;
>@@ -58,6 +57,7 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelProxyFactor
> import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelSelectionPolicy;
> import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelSelectionPolicyFactory;
> import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext;
>+import org.eclipse.debug.internal.ui.viewers.model.provisional.ITreeModelViewer;
> import org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerInputProvider;
> import org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerInputUpdate;
> import org.eclipse.debug.ui.DebugUITools;
>@@ -86,8 +86,8 @@ import org.eclipse.swt.widgets.MessageBox;
> import org.eclipse.swt.widgets.Shell;
> import org.eclipse.tcf.core.Command;
> import org.eclipse.tcf.debug.ui.ITCFModel;
>-import org.eclipse.tcf.debug.ui.ITCFSourceDisplay;
> import org.eclipse.tcf.debug.ui.ITCFPresentationProvider;
>+import org.eclipse.tcf.debug.ui.ITCFSourceDisplay;
> import org.eclipse.tcf.internal.debug.actions.TCFAction;
> import org.eclipse.tcf.internal.debug.launch.TCFSourceLookupDirector;
> import org.eclipse.tcf.internal.debug.launch.TCFSourceLookupParticipant;
>@@ -158,7 +158,7 @@ public class TCFModel implements ITCFModel, IElementContentProvider, IElementLab
>         UPDATE_POLICY_MANUAL     = 1,
>         UPDATE_POLICY_BREAKPOINT = 2;
> 
>-    /**
>+   /**
>      * A dummy editor input to open the disassembly view as editor.
>      */
>     public static class DisassemblyEditorInput implements IEditorInput {
>@@ -295,8 +295,6 @@ public class TCFModel implements ITCFModel, IElementContentProvider, IElementLab
> 
>     private final Map<String,Object> context_map = new HashMap<String,Object>();
> 
>-    private final Set<String> expanded_nodes = new HashSet<String>();
>-
>     private final Map<IWorkbenchPart,TCFNode> pins = new HashMap<IWorkbenchPart,TCFNode>();
>     private final Map<IWorkbenchPart,TCFSnapshot> locks = new HashMap<IWorkbenchPart,TCFSnapshot>();
>     private final Map<IWorkbenchPart,Integer> lock_policy = new HashMap<IWorkbenchPart,Integer>();
>@@ -914,7 +912,10 @@ public class TCFModel implements ITCFModel, IElementContentProvider, IElementLab
>             action_results.remove(id);
>             Object o = context_map.remove(id);
>             if (o instanceof CreateNodeRunnable) ((CreateNodeRunnable)o).onContextRemoved();
>-            expanded_nodes.remove(id);
>+            for (TCFModelProxy proxy : model_proxies.values()) {
>+                proxy.clearAutoExpandStack(id);
>+            }
>+            
>             if (mem_blocks_update != null) mem_blocks_update.changeset.remove(id);
>         }
> 
>@@ -1529,14 +1530,14 @@ public class TCFModel implements ITCFModel, IElementContentProvider, IElementLab
>         if (node.isDisposed()) return;
>         runSuspendTrigger(node);
>         if (reason == null) return;
>-        if (reason.equals(IRunControl.REASON_USER_REQUEST)) return;
>         for (TCFModelProxy proxy : model_proxies.values()) {
>             if (proxy.getPresentationContext().getId().equals(IDebugUIConstants.ID_DEBUG_VIEW)) {
>+                if (proxy.getAutoExpandNode(node.id, reason.equals(IRunControl.REASON_USER_REQUEST))) proxy.expand(node);
>+                if (reason.equals(IRunControl.REASON_USER_REQUEST)) continue;
>                 proxy.setSelection(node);
>                 if (reason.equals(IRunControl.REASON_STEP)) continue;
>                 if (reason.equals(IRunControl.REASON_CONTAINER)) continue;
>                 if (delay_stack_update_until_last_step && launch.getContextActionsCount(node.id) != 0) continue;
>-                if (expanded_nodes.add(node.id)) proxy.expand(node);
>             }
>             if (reason.equals(IRunControl.REASON_BREAKPOINT)) {
>                 IWorkbenchPart part = proxy.getPresentationContext().getPart();
>diff --git a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFModelProxy.java b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFModelProxy.java
>index c59f7d2..01c2545 100644
>--- a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFModelProxy.java
>+++ b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFModelProxy.java
>@@ -11,16 +11,17 @@
> package org.eclipse.tcf.internal.debug.ui.model;
> 
> import java.util.Arrays;
>+import java.util.Collections;
> import java.util.Comparator;
> import java.util.HashMap;
> import java.util.HashSet;
> import java.util.LinkedList;
> import java.util.Map;
> import java.util.Set;
>+import java.util.TreeMap;
> 
> import org.eclipse.core.runtime.IStatus;
>-import org.eclipse.debug.internal.ui.viewers.model.InternalTreeModelViewer;
>-import org.eclipse.debug.internal.ui.viewers.model.InternalVirtualTreeModelViewer;
>+import org.eclipse.debug.internal.ui.viewers.model.IInternalTreeModelViewer;
> import org.eclipse.debug.internal.ui.viewers.model.provisional.IChildrenCountUpdate;
> import org.eclipse.debug.internal.ui.viewers.model.provisional.IChildrenUpdate;
> import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta;
>@@ -32,7 +33,10 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdateList
> import org.eclipse.debug.internal.ui.viewers.model.provisional.ModelDelta;
> import org.eclipse.debug.internal.ui.viewers.provisional.AbstractModelProxy;
> import org.eclipse.debug.ui.IDebugUIConstants;
>+import org.eclipse.jface.viewers.ITreeViewerListener;
>+import org.eclipse.jface.viewers.TreeExpansionEvent;
> import org.eclipse.jface.viewers.TreePath;
>+import org.eclipse.jface.viewers.TreeViewer;
> import org.eclipse.swt.graphics.Device;
> import org.eclipse.swt.widgets.Display;
> import org.eclipse.tcf.internal.debug.model.TCFLaunch;
>@@ -44,10 +48,10 @@ import org.eclipse.tcf.protocol.Protocol;
>  * Model proxy listeners are debuggers views.
>  */
> @SuppressWarnings("restriction")
>-public class TCFModelProxy extends AbstractModelProxy implements IModelProxy, Runnable {
>+public class TCFModelProxy extends AbstractModelProxy implements IModelProxy, Runnable, ITreeViewerListener {
> 
>     private static final TCFNode[] EMPTY_NODE_ARRAY = new TCFNode[0];
>-
>+    private static boolean is_linux = "Linux".equals(System.getProperty("os.name"));
>     private final TCFModel model;
>     private final TCFLaunch launch;
>     private final Display display;
>@@ -57,6 +61,7 @@ public class TCFModelProxy extends AbstractModelProxy implements IModelProxy, Ru
>     private final Set<ModelDelta> content_deltas = new HashSet<ModelDelta>();
>     private final LinkedList<TCFNode> selection = new LinkedList<TCFNode>();
>     private final Set<String> auto_expand_set = new HashSet<String>();
>+    private Map<String, Boolean> expanded_nodes = Collections.synchronizedMap(new TreeMap<String, Boolean>());
> 
>     private ITreeModelViewer viewer;
>     private boolean posted;
>@@ -200,8 +205,13 @@ public class TCFModelProxy extends AbstractModelProxy implements IModelProxy, Ru
>         super.initialize(viewer);
>         enable_auto_expand =
>                 IDebugUIConstants.ID_DEBUG_VIEW.equals(getPresentationContext().getId()) &&
>-                viewer instanceof InternalTreeModelViewer;
>-        viewer.addViewerUpdateListener(update_listener);
>+                viewer instanceof IInternalTreeModelViewer;
>+        if (is_linux) {
>+            viewer.addViewerUpdateListener(update_listener);
>+        }
>+        if (viewer instanceof TreeViewer) {
>+            ((TreeViewer)viewer).addTreeListener(this);
>+        }
>         Protocol.invokeAndWait(new Runnable() {
>             public void run() {
>                 assert !installed;
>@@ -225,7 +235,12 @@ public class TCFModelProxy extends AbstractModelProxy implements IModelProxy, Ru
>                 disposed = true;
>             }
>         });
>-        viewer.removeViewerUpdateListener(update_listener);
>+        if (is_linux) {
>+            viewer.removeViewerUpdateListener(update_listener);
>+        }
>+        if (viewer instanceof TreeViewer) {
>+            ((TreeViewer)viewer).removeTreeListener(this);
>+        }
>         super.dispose();
>     }
> 
>@@ -281,6 +296,43 @@ public class TCFModelProxy extends AbstractModelProxy implements IModelProxy, Ru
>     }
> 
>     /**
>+     * Returns true if node should be be expanded upon the first suspended event.  
>+     * If the given context ID is seen for the first time, the node should be
>+     * expanded unless the event was caused by user request.  In the latter case
>+     * the node should not be expanded.
>+     * <p>
>+     * Note: As a workaround for bug 208939 on Linux, the auto-expansion is
>+     * enabled even after the first suspend event.  User collapse/expand actions
>+     * are tracked to determine whether a given node should be expanded.
>+     * </p>
>+     * @param id Id of execution node to check.
>+     * @param user_request Flag whether the state is requested in response 
>+     * to a user-requested suspend event.
>+     */
>+    boolean getAutoExpandNode(String id, boolean user_request) {
>+        Boolean expand = null;
>+        synchronized(expanded_nodes) {
>+            expand = expanded_nodes.get(id);
>+            if (expand == null) {
>+                if (user_request) {
>+                    expand = Boolean.FALSE;
>+                } else {
>+                    expand = Boolean.TRUE;
>+                    expanded_nodes.put(id, is_linux);
>+                }
>+            }
>+        }
>+        return expand;
>+    }
>+    
>+    /**
>+     * Returns true if stack trace should be expanded upon a suspended event.
>+     */
>+    void clearAutoExpandStack(String id) {
>+        expanded_nodes.remove(id) ;
>+    }
>+    
>+    /**
>      * Get current value of the view input.
>      * @return view input object.
>      */
>@@ -438,8 +490,8 @@ public class TCFModelProxy extends AbstractModelProxy implements IModelProxy, Ru
>             asyncExec(new Runnable() {
>                 public void run() {
>                     if (save_expand_state != null && save_expand_state.size() > 0) {
>-                        if (viewer instanceof InternalTreeModelViewer) {
>-                            InternalTreeModelViewer tree_viwer = (InternalTreeModelViewer)viewer;
>+                        if (viewer instanceof IInternalTreeModelViewer) {
>+                            IInternalTreeModelViewer tree_viwer = (IInternalTreeModelViewer)viewer;
>                             final Set<String> expanded = new HashSet<String>();
>                             for (TCFNode node : save_expand_state) {
>                                 if (tree_viwer.getExpandedState(node)) expanded.add(node.id);
>@@ -471,11 +523,8 @@ public class TCFModelProxy extends AbstractModelProxy implements IModelProxy, Ru
>                 asyncExec(new Runnable() {
>                     boolean found;
>                     public void run() {
>-                        if (viewer instanceof InternalTreeModelViewer) {
>-                            found = ((InternalTreeModelViewer)viewer).findElementIndex(TreePath.EMPTY, launch) >= 0;
>-                        }
>-                        else if (viewer instanceof InternalVirtualTreeModelViewer) {
>-                            found = ((InternalVirtualTreeModelViewer)viewer).findElementIndex(TreePath.EMPTY, launch) >= 0;
>+                        if (viewer instanceof IInternalTreeModelViewer) {
>+                            found = ((IInternalTreeModelViewer)viewer).findElementIndex(TreePath.EMPTY, launch) >= 0;
>                         }
>                         Protocol.invokeLater(new Runnable() {
>                             public void run() {
>@@ -566,4 +615,23 @@ public class TCFModelProxy extends AbstractModelProxy implements IModelProxy, Ru
>             launch.removePendingClient(this);
>         }
>     }
>+    
>+    @Override
>+    public void treeCollapsed(TreeExpansionEvent event) {
>+        updateExpandStack(event, false);
>+    }
>+    
>+    @Override
>+    public void treeExpanded(TreeExpansionEvent event) {
>+        updateExpandStack(event, true);
>+    }
>+    
>+    private void updateExpandStack(TreeExpansionEvent event, final boolean expand) {
>+        if (event.getElement() instanceof TCFNodeExecContext) {
>+            TCFNodeExecContext node = (TCFNodeExecContext)event.getElement();
>+            if ( model == node.getModel() ) {
>+                expanded_nodes.put(node.id, expand);
>+            };
>+        }
>+    }
> }
>-- 
>1.7.5.4
>

Flags:

mober.at+eclipse: iplog-

Actions: View | Diff

Attachments on bug 389197: 220917 | 220953 | 221006