Bug 518866 - [9] User should have the ability to define module path and

classpath while launching

Change-Id: I55dbc85b53d87d5936f9335023ad4385314a53d9

2 files changed, 86 insertions, 15 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 dc91023de..d287fec6b 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2016 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 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
@@ -68,8 +68,11 @@ import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Link;
+import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.IWorkbenchPreferenceConstants;
@@ -100,6 +103,11 @@ public class LaunchConfigurationTabGroupViewer {
 	private ILaunchConfigurationWorkingCopy fWorkingCopy;
 
 	/**
+	 * The old configuration
+	 */
+	private boolean sameInput = false;
+
+	/**
 	 * This view's control, which contains a composite area of controls
 	 */
 	private Composite fViewerControl;
@@ -373,15 +381,63 @@ public class LaunchConfigurationTabGroupViewer {
 			fTabFolder.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent event) {
+					int selectedIndex = fTabFolder.indexOf((CTabItem) event.item);
 					if (!fInitializingTabs) {
-						handleTabSelected();
-						refresh();
+						handleTabChange(selectedIndex);
 					}
+
+					Display display = fTabFolder.getDisplay();
+					display.addListener(SWT.PostEvent, new Listener() {
+						@Override
+						public void handleEvent(Event newEvent) {
+							if (newEvent.detail == SWT.Selection) { //
+								display.removeListener(SWT.PostEvent, this);
+								if (sameInput) {
+									displayInstanceTabs(true);
+									fTabFolder.setSelection(selectedIndex);
+									refreshStatus();
+								}
+								if (canChangeTab) {
+									handleTabSelected();
+									refresh();
+								}
+
+							}
+						}
+					});
+
 				}
 			});
 		}
 	}
 
+	private boolean canChangeTab = true;
+
+	private void handleTabChange(int newPageIndex) {
+		if (fCurrentTabIndex == newPageIndex) {
+			return;
+		}
+		if (isDirty() && !fInitializingTabs) {
+			ILaunchConfigurationTab[] tabs = getTabs();
+			if (fCurrentTabIndex != -1) {
+				ILaunchConfigurationTab tab = tabs[fCurrentTabIndex];
+				fTabFolder.setSelection(fCurrentTabIndex);
+				if (!tab.OkToLeaveTab()) {
+					canChangeTab = false;
+
+				}
+				else {
+					canChangeTab = true;
+					fTabFolder.setSelection(newPageIndex);
+				}
+			}
+		} else {
+			handleTabSelected();
+			refresh();
+		}
+
+	}
+
 	/**
 	 * Returns the apply button
 	 * @return the 'Apply' button
@@ -611,9 +667,8 @@ public class LaunchConfigurationTabGroupViewer {
 			}
 			inputChanged(input);
 		} else {
-			if (!input.equals(getConfiguration())) {
-				inputChanged(input);
-			}
+			// Input needs to be changed even if same for Tab initializations
+			inputChanged(input);
 		}
 	}
 
@@ -631,10 +686,17 @@ public class LaunchConfigurationTabGroupViewer {
 					fViewform.setRedraw(false);
 					if (finput instanceof ILaunchConfiguration) {
 						ILaunchConfiguration configuration = (ILaunchConfiguration)finput;
-						boolean refreshtabs = !delegatesEqual(fWorkingCopy, configuration);
+						boolean refreshTabs = true;
+						if (fWorkingCopy != null && fWorkingCopy.getOriginal().equals(configuration.getWorkingCopy().getOriginal())) {
+							sameInput = true;
+							refreshTabs = false;
+						} else {
+							sameInput = false;
+						}
 						fOriginal = configuration;
 						fWorkingCopy = configuration.getWorkingCopy();
-						displayInstanceTabs(refreshtabs);
+						// Need to refresh all the time as tabs might have changed
+						displayInstanceTabs(refreshTabs);
 					} else if (finput instanceof ILaunchConfigurationType) {
 						fDescription = getDescription((ILaunchConfigurationType)finput);
 						setNoInput();
@@ -1383,13 +1445,20 @@ public class LaunchConfigurationTabGroupViewer {
 	 *
 	 * @return the saved launch configuration or <code>null</code> if not saved
 	 */
-	protected ILaunchConfiguration handleApplyPressed() {
+	public ILaunchConfiguration handleApplyPressed() {
 		if(fOriginal != null && fOriginal.isReadOnly()) {
 			IStatus status = ResourcesPlugin.getWorkspace().validateEdit(new IFile[] {fOriginal.getFile()}, fViewerControl.getShell());
 			if(!status.isOK()) {
 				return null;
 			}
 		}
+		ILaunchConfigurationTab[] tabs = getTabs();
+		if (fCurrentTabIndex != -1) {
+			ILaunchConfigurationTab tab = tabs[fCurrentTabIndex];
+			if (!tab.OkToLeaveTab()) {
+				return null;
+			}
+		}
 		Exception exception = null;
 		final ILaunchConfiguration[] saved = new ILaunchConfiguration[1];
 		try {
@@ -1484,10 +1553,12 @@ public class LaunchConfigurationTabGroupViewer {
 	 * @param index the index of the tab to display
 	 */
 	public void setActiveTab(int index) {
-		ILaunchConfigurationTab[] tabs = getTabs();
-		if (index >= 0 && index < tabs.length) {
-			fTabFolder.setSelection(index);
-			handleTabSelected();
+		if (!fTabFolder.isDisposed()) {
+			ILaunchConfigurationTab[] tabs = getTabs();
+			if (index >= 0 && index < tabs.length) {
+				fTabFolder.setSelection(index);
+				handleTabSelected();
+			}
 		}
 	}
 
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java
index 969382d89..5c6d458fb 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- *  Copyright (c) 2000, 2016 IBM Corporation and others.
+ *  Copyright (c) 2000, 2017 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
@@ -931,7 +931,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun
 	 *
 	 * @return LaunchConfigurationTabGroupViewer
 	 */
-	protected LaunchConfigurationTabGroupViewer getTabViewer() {
+	public LaunchConfigurationTabGroupViewer getTabViewer() {
 		return fTabViewer;
 	}