Bug 53917 - Run dialog's tab view reset to first tab each time a config is selected.

1 files changed, 18 insertions, 2 deletions

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupViewer.java
index b8185254d..77dada077 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupViewer.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupViewer.java
@@ -615,7 +615,13 @@ public class LaunchConfigurationTabGroupViewer extends Viewer {
 		if (getTabType() != null && getTabType().equals(configType) && !(getTabGroup() instanceof PerspectiveTabGroup)) {
 			return;
 		}
-
+		
+		// try to keep on same tab
+		Class tabKind = null;
+		if (getActiveTab() != null) {
+			tabKind = getActiveTab().getClass();
+		}
+		
 		// Build the new tabs
 		ILaunchConfigurationTabGroup group = null;
 		try {
@@ -629,6 +635,16 @@ public class LaunchConfigurationTabGroupViewer extends Viewer {
 		setTabGroup(group);
 		setTabType(configType);
 		
+		// select same tab as before, if possible
+		ILaunchConfigurationTab[] tabs = getTabs();
+		for (int i = 0; i < tabs.length; i++) {
+			ILaunchConfigurationTab tab = tabs[i];
+			if (tab.getClass().equals(tabKind)) {
+				setActiveTab(tab);
+				break;
+			}
+		}
+		
 		fDescription = getDescription(configType);
 	}	
 
@@ -1154,7 +1170,7 @@ public class LaunchConfigurationTabGroupViewer extends Viewer {
 	 * the tab being entered.
 	 */
 	protected void handleTabSelected() {
-		if (isDisposingTabs()) {
+		if (isDisposingTabs() || isInitializingTabs()) {
 			return;
 		}
 		ILaunchConfigurationTab[] tabs = getTabs();