Bug 371131 - Quick Access causes StackOverflowError when run from

'Breakpoints' view in I20120208-2200

2 files changed, 9 insertions, 13 deletions

diff --git a/org.eclipse.debug.ui/plugin.xml b/org.eclipse.debug.ui/plugin.xml
index 99e89165c..3562d3e8d 100644
--- a/org.eclipse.debug.ui/plugin.xml
+++ b/org.eclipse.debug.ui/plugin.xml
@@ -761,21 +761,23 @@
                tooltip="%LinkWithDebugView.tooltip">
          </action>
          <action
-               id="org.eclipse.debug.ui.breakpointsView.toolbar.collapseAll"
-               toolbarPath="navigationGroup"
                class="org.eclipse.debug.internal.ui.actions.breakpoints.BreakpointsCollapseAllAction"
-               icon="$nl$/icons/full/elcl16/collapseall.gif"
+               definitionId="org.eclipse.ui.navigate.expandAll"
                helpContextId="breakpoints_collapse_all_action_context"
+               icon="$nl$/icons/full/elcl16/collapseall.gif"
+               id="org.eclipse.debug.ui.breakpointsView.toolbar.collapseAll"
                label="%CollapseAll.label"
+               toolbarPath="navigationGroup"
                tooltip="%CollapseAll.tooltip">
          </action>
          <action
-               id="org.eclipse.debug.ui.breakpointsView.toolbar.expandAll"
-               toolbarPath="navigationGroup"
                class="org.eclipse.debug.internal.ui.actions.breakpoints.BreakpointsExpandAllAction"
-               icon="$nl$/icons/full/elcl16/expandall.gif"
+               definitionId="org.eclipse.ui.navigate.expandAll"
                helpContextId="breakpoints_expand_all_action_context"
+               icon="$nl$/icons/full/elcl16/expandall.gif"
+               id="org.eclipse.debug.ui.breakpointsView.toolbar.expandAll"
                label="%ExpandAll.label"
+               toolbarPath="navigationGroup"
                tooltip="%ExpandAll.tooltip">
          </action>
          <action
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/BreakpointsCollapseAllAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/BreakpointsCollapseAllAction.java
index 26347c5ec..ebd76f4a3 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/BreakpointsCollapseAllAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/breakpoints/BreakpointsCollapseAllAction.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
+ * Copyright (c) 2004, 2012 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -20,7 +20,6 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate;
 import org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdateListener;
 import org.eclipse.debug.ui.AbstractDebugView;
 import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.commands.ActionHandler;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.TreePath;
 import org.eclipse.jface.viewers.TreeViewer;
@@ -29,7 +28,6 @@ import org.eclipse.ui.IActionDelegate2;
 import org.eclipse.ui.IViewActionDelegate;
 import org.eclipse.ui.IViewPart;
 import org.eclipse.ui.handlers.CollapseAllHandler;
-import org.eclipse.ui.handlers.IHandlerService;
 
 /**
  * 
@@ -45,10 +43,6 @@ public class BreakpointsCollapseAllAction implements IViewActionDelegate, IActio
 	 */
 	public void init(IViewPart view) {
 		fView = (AbstractDebugView) view;
-		IHandlerService hs = (IHandlerService) view.getSite().getService(IHandlerService.class);
-		if (hs != null) {
-			hs.activateHandler(CollapseAllHandler.COMMAND_ID, new ActionHandler(fAction));
-		}
         IInternalTreeModelViewer viewer = (IInternalTreeModelViewer)fView.getViewer();
         if (viewer != null) {
             viewer.addViewerUpdateListener(this);