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

  284 Reggie Burnett	2011-02-02
      a couple of small fixes

    modified:
      WexInstaller/Controls/InstallWizardControl.cs
      WexInstaller/Core/Product.cs
      WexInstaller/InstallWizard/InstallType.cs
=== modified file 'WexInstaller/Controls/InstallWizardControl.cs'
=== modified file 'WexInstaller/Controls/InstallWizardControl.cs'
--- a/WexInstaller/Controls/InstallWizardControl.cs	2011-02-02 15:07:37 +0000
+++ b/WexInstaller/Controls/InstallWizardControl.cs	2011-02-02 16:31:30 +0000
@@ -49,7 +49,7 @@
             ShowTab(requirementsTab, false, 4);
 
             // disable setup type tab if we are updating instead of installing
-            if (ProductManager.IsNewSetup())
+            if (!ProductManager.IsNewSetup())
             {
                 ShowType(false);
             }

=== modified file 'WexInstaller/Core/Product.cs'
--- a/WexInstaller/Core/Product.cs	2011-01-28 22:06:16 +0000
+++ b/WexInstaller/Core/Product.cs	2011-02-02 16:31:30 +0000
@@ -97,9 +97,6 @@
             proposedInstalled = shouldInstall;
         }
 
-        //[XmlAttribute("default")]
-        //public bool IncludeInDefault { get; set; }
-
         [XmlAttribute("upgradeId")]
         public string UpgradeId { get; set; }
 

=== modified file 'WexInstaller/InstallWizard/InstallType.cs'
--- a/WexInstaller/InstallWizard/InstallType.cs	2011-01-17 17:05:19 +0000
+++ b/WexInstaller/InstallWizard/InstallType.cs	2011-02-02 16:31:30 +0000
@@ -16,6 +16,7 @@
     {
         private bool nextOk;
         private SetupType currentType;
+        private ProductCatalog catalog;
 
         public InstallType()
         {
@@ -28,10 +29,15 @@
         public override void Activate()
         {
             base.Activate();
+
+            catalog = ProductManager.ActiveCatalog;
+            if (catalog == null)
+                catalog = ProductManager.Catalogs[0];
+
             if (currentType == null)
             {
                 int tabIndex = 1;
-                foreach (SetupType setupType in ProductManager.ActiveCatalog.SetupTypes)
+                foreach (SetupType setupType in catalog.SetupTypes)
                 {
                     RadioButton radio = new RadioButton();
                     radio.AutoSize = true;
@@ -75,7 +81,7 @@
                 foreach (Product p in cat.Products)
                     p.ProposedInstalled = false;
 
-            foreach (CatalogProduct product in ProductManager.ActiveCatalog.Products)
+            foreach (CatalogProduct product in catalog.Products)
             {
                 product.ReferencedProduct.ProposedInstalled = currentType.Includes(product);
             }


Attachment: [text/bzr-bundle] bzr/reggie.burnett@oracle.com-20110202163130-9s1n9g1pk7h3df0b.bundle
Thread
bzr commit into wex-installer-1.0 branch (reggie.burnett:284) Reggie Burnett2 Feb