Bug 310665 - [Browser] 'Web Browser' preference page ignores cancellationv20101115

3 files changed, 12 insertions, 6 deletions

diff --git a/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/BrowserDescriptorWorkingCopy.java b/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/BrowserDescriptorWorkingCopy.java
index a6f42345d68..cd3193dddb3 100644
--- a/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/BrowserDescriptorWorkingCopy.java
+++ b/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/BrowserDescriptorWorkingCopy.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
+ * Copyright (c) 2004, 2010 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
@@ -63,7 +63,6 @@ public class BrowserDescriptorWorkingCopy extends BrowserDescriptor implements I
 	public IBrowserDescriptor save() {
 		if (browser != null) {
 			browser.setInternal(this);
-			BrowserManager.getInstance().saveBrowsers();
 		} else {
 			browser = new BrowserDescriptor();
 			browser.setInternal(this);
diff --git a/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/BrowserManager.java b/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/BrowserManager.java
index 1e548821e55..bceae80bb23 100644
--- a/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/BrowserManager.java
+++ b/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/BrowserManager.java
@@ -87,7 +87,7 @@ public class BrowserManager extends Observable {
 		return new ArrayList(browsers);
 	}
 
-	protected void loadBrowsers() {
+	public void loadBrowsers() {
 		Trace.trace(Trace.FINEST, "Loading web browsers"); //$NON-NLS-1$
 		
 		String xmlString = Platform.getPreferencesService().getString
@@ -193,8 +193,6 @@ public class BrowserManager extends Observable {
 			browsers.add(browser);
 		if (browsers.size() == 1)
 			setCurrentWebBrowser(browser);
-		
-		saveBrowsers();
 	}
 
 	protected void removeWebBrowser(IBrowserDescriptor browser) {
@@ -229,4 +227,5 @@ public class BrowserManager extends Observable {
 			throw new IllegalArgumentException();
 		saveBrowsers();
 	}
+	
 }
diff --git a/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserPreferencePage.java b/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserPreferencePage.java
index 6f07fea99e4..4a80f10f605 100644
--- a/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserPreferencePage.java
+++ b/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserPreferencePage.java
@@ -600,9 +600,17 @@ public class WebBrowserPreferencePage extends PreferencePage implements
 		else
 			choice = WebBrowserPreference.EXTERNAL;
 		WebBrowserPreference.setBrowserChoice(choice);
-		if (checkedBrowser != null)
+		if (checkedBrowser != null) {
 			BrowserManager.getInstance().setCurrentWebBrowser(checkedBrowser);
+		} else {
+			BrowserManager.getInstance().saveBrowsers();
+		}
 
 		return true;
 	}
+	
+	public boolean performCancel() {
+		BrowserManager.getInstance().loadBrowsers();
+		return super.performCancel();
+	}
 }