Bug 78503 - poor performance opening the "run as" menu

2 files changed, 6 insertions, 32 deletions

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RunContextualLaunchAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RunContextualLaunchAction.java
index a1cc2babf..1648c19d1 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RunContextualLaunchAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/RunContextualLaunchAction.java
@@ -13,12 +13,6 @@ package org.eclipse.debug.internal.ui.actions;
 import org.eclipse.debug.core.ILaunchManager;
 import org.eclipse.debug.ui.actions.ContextualLaunchAction;
 
-/**
- * @author DWright
- *
- * To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
 public class RunContextualLaunchAction extends ContextualLaunchAction {
 	
 	public RunContextualLaunchAction() {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ContextualLaunchAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ContextualLaunchAction.java
index 53aed68f4..7bb124735 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ContextualLaunchAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ContextualLaunchAction.java
@@ -164,14 +164,12 @@ public abstract class ContextualLaunchAction implements IObjectActionDelegate, I
 		action.setEnabled(false);
 	}
 
-	/**
-	 * Fill pull down menu with the pages of the JTabbedPane
-	 */
-	private void fillMenu(Menu menu) {
-		// lookup appropriate launch config types and build launch actions for them.
-		// Retrieve the current perspective and the registered shortcuts
-		String activePerspID = getActivePerspectiveID();
-		if (activePerspID == null || fSelection == null) {
+    /**
+     * Fills the menu with applicable launch shortcuts
+     * @param menu The menu to fill
+     */
+	protected void fillMenu(Menu menu) {
+		if (fSelection == null) {
 			return;
 		}
 		
@@ -283,24 +281,6 @@ public abstract class ContextualLaunchAction implements IObjectActionDelegate, I
 	}
 
 	/**
-	 * Return the ID of the currently active perspective.
-	 * 
-	 * @return the active perspective ID or <code>null</code> if there is none.
-	 */
-	private String getActivePerspectiveID() {
-		IWorkbenchWindow window = DebugUIPlugin.getActiveWorkbenchWindow();
-		if (window != null) {
-			IWorkbenchPage page = window.getActivePage();
-			if (page != null) {
-				IPerspectiveDescriptor persp = page.getPerspective();
-				if (persp != null) {
-					return persp.getId();
-				}
-			}
-		}
-		return null;
-	}
-	/**
 	 * Returns the launch configuration manager.
 	*
 	* @return launch configuration manager