saving fix for 124257

4 files changed, 39 insertions, 38 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 c6e255fa5..b6007b2a0 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
@@ -285,23 +285,23 @@ public class LaunchConfigurationTabGroupViewer extends Viewer {
 		gd.horizontalSpan = 2;
 		buttonComp.setLayoutData(gd);
 
-		setApplyButton(new Button(buttonComp, SWT.PUSH));
-		getApplyButton().setText(LaunchConfigurationsMessages.LaunchConfigurationDialog__Apply_17); 
+		fApplyButton = new Button(buttonComp, SWT.PUSH);
+		fApplyButton.setText(LaunchConfigurationsMessages.LaunchConfigurationDialog__Apply_17); 
 		gd = new GridData(GridData.HORIZONTAL_ALIGN_END);
-		getApplyButton().setLayoutData(gd);
-		SWTUtil.setButtonDimensionHint(getApplyButton());
-		getApplyButton().addSelectionListener(new SelectionAdapter() {
+		fApplyButton.setLayoutData(gd);
+		SWTUtil.setButtonDimensionHint(fApplyButton);
+		fApplyButton.addSelectionListener(new SelectionAdapter() {
 			public void widgetSelected(SelectionEvent evt) {
 				handleApplyPressed();
 			}
 		});
 
-		setRevertButton(new Button(buttonComp, SWT.PUSH));
-		getRevertButton().setText(LaunchConfigurationsMessages.LaunchConfigurationDialog_Revert_2);   
+		fRevertButton = new Button(buttonComp, SWT.PUSH);
+		fRevertButton.setText(LaunchConfigurationsMessages.LaunchConfigurationDialog_Revert_2);   
 		gd = new GridData(GridData.HORIZONTAL_ALIGN_END);
-		getRevertButton().setLayoutData(gd);
-		SWTUtil.setButtonDimensionHint(getRevertButton());
-		getRevertButton().addSelectionListener(new SelectionAdapter() {
+		fRevertButton.setLayoutData(gd);
+		SWTUtil.setButtonDimensionHint(fRevertButton);
+		fRevertButton.addSelectionListener(new SelectionAdapter() {
 			public void widgetSelected(SelectionEvent evt) {
 				handleRevertPressed();
 			}
@@ -402,26 +402,12 @@ public class LaunchConfigurationTabGroupViewer extends Viewer {
 	}
 	
 	/**
-	 * Sets the apply button
-	 */
-	private void setApplyButton(Button button) {
-		fApplyButton = button;
-	}
-	
-	/**
 	 * Returns the apply button
 	 */
 	protected Button getApplyButton() {
 		return fApplyButton;
 	}	
-	
-	/**
-	 * Sets the revert button
-	 */
-	private void setRevertButton(Button button) {
-		fRevertButton = button;
-	}	
-	
+
 	/**
 	 * Returns the revert button
 	 */
@@ -507,8 +493,8 @@ public class LaunchConfigurationTabGroupViewer extends Viewer {
 
 	private void updateButtons() {
 		boolean dirty = isDirty();
-		getApplyButton().setEnabled(dirty && canSave());
-		getRevertButton().setEnabled(dirty);
+		fApplyButton.setEnabled(dirty && canSave());
+		fRevertButton.setEnabled(dirty);
 	}
 	
 	/**
@@ -593,8 +579,8 @@ public class LaunchConfigurationTabGroupViewer extends Viewer {
 	 * @param visible the visibility status to be applied to the controls
 	 */
 	private void updateVisibleControls(boolean visible) {
-		getApplyButton().setVisible(visible);
-		getRevertButton().setVisible(visible);
+		fApplyButton.setVisible(visible);
+		fRevertButton.setVisible(visible);
 		if(visible) {
 			((StackLayout)fTabPlaceHolder.getLayout()).topControl = fTabComposite;
 			fTabComposite.layout();
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 c9fdd0f80..9dea2b412 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
@@ -917,8 +917,9 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun
 	 * Notification the 'Close' button has been pressed.
 	 */
 	protected void handleClosePressed() {
-		canDiscardCurrentConfig();
-		cancelPressed();
+		if(canDiscardCurrentConfig()) {
+			cancelPressed();
+		}
 	}
 	
 	/**
@@ -1388,9 +1389,13 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun
 												 null,
 												 buffer.toString(),
 												 MessageDialog.QUESTION,
-												 new String[] {LaunchConfigurationsMessages.LaunchConfigurationDialog_Yes_32, LaunchConfigurationsMessages.LaunchConfigurationDialog_No_33}, // 
+												 new String[] {LaunchConfigurationsMessages.LaunchConfigurationDialog_Yes_32, 
+															   LaunchConfigurationsMessages.LaunchConfigurationDialog_No_33},  
 												 1);
-		if (dialog.open() == IDialogConstants.OK_ID) {
+		if (dialog.open() == 0) {
+			fLaunchConfigurationView.setAutoSelect(false);
+			getTabViewer().handleRevertPressed();
+			fLaunchConfigurationView.setAutoSelect(true);
 			return true;
 		}
 		return false;
@@ -1410,15 +1415,23 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun
 												 null,
 												 message,
 												 MessageDialog.QUESTION,
-												 new String[] {LaunchConfigurationsMessages.LaunchConfigurationDialog_Yes_32, LaunchConfigurationsMessages.LaunchConfigurationDialog_No_33},  
+												 new String[] {LaunchConfigurationsMessages.LaunchConfigurationDialog_Yes_32, 
+															   LaunchConfigurationsMessages.LaunchConfigurationDialog_No_33,
+															   LaunchConfigurationsMessages.LaunchConfigurationsDialog_c_ancel},  
 												 0);
 		int ret = dialog.open();
-		if (ret == IDialogConstants.OK_ID) {
+		if (ret == 0) {
 			fLaunchConfigurationView.setAutoSelect(false);
 			getTabViewer().handleApplyPressed();
 			fLaunchConfigurationView.setAutoSelect(true);
 			return true;
 		}
+		if(ret == 1) {
+			fLaunchConfigurationView.setAutoSelect(false);
+			getTabViewer().handleRevertPressed();
+			fLaunchConfigurationView.setAutoSelect(true);
+			return true;
+		}
 		return false;
 	}
 
@@ -1456,7 +1469,7 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun
 	 */
 	public void updateMessage() {
 		setErrorMessage(getTabViewer().getErrorMesssage());
-		setMessage(getTabViewer().getMessage());				
+		setMessage(getTabViewer().getMessage());	
 	}
 
 	/* (non-Javadoc)
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.java
index dcdfc57e4..47437b2b0 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.java
@@ -170,8 +170,6 @@ public class LaunchConfigurationsMessages extends NLS {
 
 	public static String LaunchConfigurationsDialog_4;
 
-	public static String LaunchConfigurationsDialog_5;
-
 	public static String LaunchConfigurationsDialog_6;
 
 	public static String DeleteLaunchConfigurations_0;
@@ -194,4 +192,7 @@ public class LaunchConfigurationsMessages extends NLS {
 
 	public static String FilterDropDownMenuCreator_4;
 
+	public static String LaunchConfigurationsDialog_5;
+	public static String LaunchConfigurationsDialog_c_ancel;
+
 }
\ No newline at end of file
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties
index bf3ee367e..9992c128e 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties
@@ -87,6 +87,7 @@ LaunchConfigurationsDialog_1=Remove selected launch configuration(s)
 LaunchConfigurationsDialog_2=&Filter
 LaunchConfigurationsDialog_4=Filter launch configurations...
 LaunchConfigurationsDialog_5=Duplicates the currently selected launch configuration
+LaunchConfigurationsDialog_c_ancel=Cancel
 LaunchConfigurationsDialog_6=Filter matched {0} of {1} items
 LaunchConfigurationsDialog_7=All launch configuration types are currently filtered
 LaunchConfigurationManager_0=Remove Terminated Launches