bzr commit into wex-installer-1.0 branch (reggie.burnett:309)

[Reggie Burnett]

#At file:///C:/Users/Reggie/work/wex/installer-updated/ based on revid:reggie.burnett@stripped

  309 Reggie Burnett	2011-02-07
      fix configuration problem created by busted merge

    modified:
      StandardPlugins/ConfigurationController.cs
      WexInstaller/Core/ProductConfigurationController.cs
=== modified file 'StandardPlugins/ConfigurationController.cs'
=== modified file 'StandardPlugins/ConfigurationController.cs'
--- a/StandardPlugins/ConfigurationController.cs	2011-02-07 21:39:05 +0000
+++ b/StandardPlugins/ConfigurationController.cs	2011-02-07 23:26:42 +0000
@@ -228,8 +228,7 @@
 
         private void bgw_ConfigureProgressChanged(object sender, ProgressChangedEventArgs e)
         {
-            if (Configured != null)
-                Configured(this, e.UserState as ConfigurationEventArgs);
+            base.OnConfigured(e.UserState as ConfigurationEventArgs);
         }
 
         private void bgw_ConfigureCompleted(object sender, RunWorkerCompletedEventArgs e)
@@ -238,14 +237,11 @@
             bgw = null;
             if (CurrentState != ConfigState.ConfigurationError)
                 CurrentState = ConfigState.ConfigurationComplete;
-            if (Configured != null)
-            {
-                ConfigurationEventArgs ce = new ConfigurationEventArgs(ConfigurationEventType.Finished, "CONFIGURE_COMPLETE");
-                ce.PercentComplete = 100;
-                ce.Details = "Product configuration controller finished configuration.";
-                Configured(this, ce);
-            }
-            return;
+
+            ConfigurationEventArgs ce = new ConfigurationEventArgs(ConfigurationEventType.Finished, "CONFIGURE_COMPLETE");
+            ce.PercentComplete = 100;
+            ce.Details = "Product configuration controller finished configuration.";
+            base.OnConfigured(ce);
         }
 
         public override void Initalize()
@@ -365,9 +361,7 @@
             return s.ToString();
         }
 
-        public event ConfigurationEventHandler Configured;
-
-        protected virtual void OnConfigured(ConfigurationEventArgs e)
+        protected override void OnConfigured(ConfigurationEventArgs e)
         {
             string message = String.Empty;
             int percent = 100 / 11;

=== modified file 'WexInstaller/Core/ProductConfigurationController.cs'
--- a/WexInstaller/Core/ProductConfigurationController.cs	2011-02-07 21:39:05 +0000
+++ b/WexInstaller/Core/ProductConfigurationController.cs	2011-02-07 23:26:42 +0000
@@ -29,7 +29,7 @@
         }
 
         public event ConfigurationEventHandler Configured;
-        public virtual void OnConfigured(ConfigurationEventArgs args)
+        protected virtual void OnConfigured(ConfigurationEventArgs args)
         {
             if (Configured != null)
                 Configured(this, args);


Attachment: [text/bzr-bundle] bzr/[e-mail]