From 1236d27b747af188fe479157c3357cf82dac5daf Mon Sep 17 00:00:00 2001
From: Mikhail Khodjaiants <mikhailkhod@googlemail.com>
Date: Wed, 31 May 2006 18:01:12 +0000
Subject: [PATCH] Bug 144684: [Modules view] Collapse all action doesn't work.

---
 debug/org.eclipse.cdt.debug.ui/ChangeLog                  | 5 +++++
 .../internal/ui/actions/CollapseAllModulesAction.java     | 8 ++++----
 .../debug/internal/ui/views/modules/ModulesViewer.java    | 7 +++++++
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog
index 58a804e5464..71e83553222 100644
--- a/debug/org.eclipse.cdt.debug.ui/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-31 Mikhail Khodjaiants
+	Bug 144684: [Modules view] Collapse all action doesn't work.
+	* CollapseAllModulesAction.java
+	* ModulesViewer.java
+
 2006-05-29 Mikhail Khodjaiants
 	Bug 144277: No images for source containers types (temporary fix).
 	* SourceContainerLabelProvider.java
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CollapseAllModulesAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CollapseAllModulesAction.java
index 9deae2f55a9..92965f7cdfc 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CollapseAllModulesAction.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/CollapseAllModulesAction.java
@@ -10,10 +10,10 @@
  *******************************************************************************/
 package org.eclipse.cdt.debug.internal.ui.actions; 
 
+import org.eclipse.cdt.debug.internal.ui.views.modules.ModulesViewer;
 import org.eclipse.debug.ui.IDebugView;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.util.Assert;
-import org.eclipse.jface.viewers.AbstractTreeViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.ui.IViewActionDelegate;
 import org.eclipse.ui.IViewPart;
@@ -39,10 +39,10 @@ public class CollapseAllModulesAction extends ActionDelegate implements IViewAct
 	 */
 	public void run( IAction action ) {
 		Viewer viewer = getView().getViewer();
-		if ( viewer instanceof AbstractTreeViewer ) {
+		if ( viewer instanceof ModulesViewer ) {
 			viewer.getControl().setRedraw( false );
-			((AbstractTreeViewer)viewer).collapseToLevel( viewer.getInput(), AbstractTreeViewer.ALL_LEVELS );
-			viewer.getControl().setRedraw(true);
+			((ModulesViewer)viewer).collapseAll();
+			viewer.getControl().setRedraw( true );
 		}
 	}
 
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModulesViewer.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModulesViewer.java
index 7bd38456ecc..9f07f45da45 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModulesViewer.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModulesViewer.java
@@ -58,4 +58,11 @@ public class ModulesViewer extends AsynchronousTreeViewer {
 	protected void handlePresentationFailure( IAsynchronousRequestMonitor update, IStatus status ) {
 		fView.showMessage( status.getMessage() );
 	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.debug.internal.ui.viewers.AsynchronousTreeViewer#collapseAll()
+	 */
+	public void collapseAll() {
+		super.collapseAll();
+	}
 }