List:Commits« Previous MessageNext Message »
From:Reggie Burnett Date:February 3 2011 1:02am
Subject:bzr commit into wex-installer-1.0 branch (reggie.burnett:290)
View as plain text  
#At file:///C:/Users/Reggie/work/wex/installer-updated/ based on revid:iggy@stripped

  290 Reggie Burnett	2011-02-02
      now removes data directories of all server products being removed, not just first one. We really need a UI to handle post removal steps

    modified:
      WexInstaller/RemovePanels/RemoveComplete.cs
=== modified file 'WexInstaller/RemovePanels/RemoveComplete.cs'
=== modified file 'WexInstaller/RemovePanels/RemoveComplete.cs'
--- a/WexInstaller/RemovePanels/RemoveComplete.cs	2011-01-31 16:24:01 +0000
+++ b/WexInstaller/RemovePanels/RemoveComplete.cs	2011-02-03 01:02:21 +0000
@@ -14,12 +14,11 @@
 {
     public partial class RemoveComplete : InstallerPanel
     {
-        private Product serverProduct;
+        private List<Product> serverProducts = new List<Product>();
 
         public RemoveComplete()
         {
             InitializeComponent();
-            serverProduct = null;
         }
 
         public override void Activate()
@@ -42,7 +41,7 @@
                     {
                         removeData.Enabled = true;
                         removeData.Visible = true;
-                        serverProduct = p;
+                        serverProducts.Add(p);
                     }
                 }
             }
@@ -60,12 +59,15 @@
         {
             if (removeData.Checked == true)
             {
-                // Remove the datadirectory.
-                string dataDirectory = serverProduct.GetInstalledProductRegistryKey("DataLocation");
-
-                if (!String.IsNullOrEmpty(dataDirectory) && Directory.Exists(dataDirectory))
+                // Remove the datadirectories
+                foreach (Product p in serverProducts)
                 {
-                    Directory.Delete(dataDirectory, true);
+                    string dataDirectory = p.GetInstalledProductRegistryKey("DataLocation");
+
+                    if (!String.IsNullOrEmpty(dataDirectory) && Directory.Exists(dataDirectory))
+                    {
+                        Directory.Delete(dataDirectory, true);
+                    }
                 }
             }
 


Attachment: [text/bzr-bundle] bzr/reggie.burnett@oracle.com-20110203010221-7i2uk5n632ebs75s.bundle
Thread
bzr commit into wex-installer-1.0 branch (reggie.burnett:290) Reggie Burnett3 Feb