From 6edaf6ef3c68e72a98efeaed6410489520489fe6 Mon Sep 17 00:00:00 2001 From: Chris Recoskie Date: Tue, 28 Jun 2005 19:32:55 +0000 Subject: [PATCH] crecoskie June 28, 2005 - fixing Bugzilla 102072 (custom wizard pages are only displayed the first time the wizard is invoked) --- .../ui/wizards/MBSCustomPageManager.java | 21 ++----------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSCustomPageManager.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSCustomPageManager.java index 9cbe584fb59..6fc624c0f93 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSCustomPageManager.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSCustomPageManager.java @@ -102,15 +102,11 @@ public final class MBSCustomPageManager */ private static Set pageSet = null; - private static boolean extensionsLoaded = false; - /** * Maps page IDs to the properties that page has set. */ private static java.util.Map pageIDtoPagePropertiesMap = null; - private static boolean initialized = false; - private static final String EXTENSION_POINT_ID = "org.eclipse.cdt.managedbuilder.ui.newWizardPages"; //$NON-NLS-1$ /** @@ -121,20 +117,12 @@ public final class MBSCustomPageManager */ public static void loadExtensions() throws BuildException { - if (extensionsLoaded) - return; - loadExtensionsSynchronized(); } private synchronized static void loadExtensionsSynchronized() throws BuildException { - // Do this once - if (extensionsLoaded) - return; - extensionsLoaded = true; - // Get the extensions IExtensionPoint extensionPoint = Platform.getExtensionRegistry() .getExtensionPoint(EXTENSION_POINT_ID); @@ -716,21 +704,16 @@ public final class MBSCustomPageManager /** * Initializes the manager. * - * This method should be called before any other operations are performed using this class. - * - * Initialization is only performed once. + * This method should be called before any other operations are performed using this class, and should + * be called every time pages are added to the wizard. * * @since 3.0 */ public static void init() { - if(!initialized) - { - initialized = true; idToPageDataMap = new TreeMap(); pageIDtoPagePropertiesMap = new TreeMap(); pageSet = new LinkedHashSet(); - } } // singleton class - do not use