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

[Reggie Burnett]

#At file:///C:/work/wex/installer/ based on revid:iggy@stripped

  205 Reggie Burnett	2010-09-23
      created and started using a new TitleWithVersion property on Product

    modified:
      WexInstaller/Controls/FeatureBox.cs
      WexInstaller/Controls/FeatureTreeView.cs
      WexInstaller/Controls/RemoveAllPage.cs
      WexInstaller/Core/Product.cs
      WexInstaller/InstallWizard/InstallProgressPanel.cs
=== modified file 'WexInstaller/Controls/FeatureBox.cs'
=== modified file 'WexInstaller/Controls/FeatureBox.cs'
--- a/WexInstaller/Controls/FeatureBox.cs	2010-09-17 18:37:46 +0000
+++ b/WexInstaller/Controls/FeatureBox.cs	2010-09-23 20:47:34 +0000
@@ -67,7 +67,7 @@
             {
                 foreach (Product p in pc.Products)
                 {
-                    TreeNode node = featureList.Nodes.Add(p.Title + " " + p.ThisVersion);
+                    TreeNode node = featureList.Nodes.Add(p.TitleWithVersion);
                     node.Tag = p;
                 }
             }

=== modified file 'WexInstaller/Controls/FeatureTreeView.cs'
--- a/WexInstaller/Controls/FeatureTreeView.cs	2010-09-16 17:07:21 +0000
+++ b/WexInstaller/Controls/FeatureTreeView.cs	2010-09-23 20:47:34 +0000
@@ -48,9 +48,12 @@
 
         public void AddProduct(ProductFeature feature, TreeNode parentNode)
         {
-            TreeNode node = new TreeNode(feature.Title + " " + feature.ThisVersion);
-            node.ToolTipText = feature.Description;
-            node.Tag = feature;
+            Product p = (feature as Product);
+            Debug.Assert(p != null);
+
+            TreeNode node = new TreeNode(p.TitleWithVersion);
+            node.ToolTipText = p.Description;
+            node.Tag = p;
             if (parentNode == null)
                 Nodes.Add(node);
             else

=== modified file 'WexInstaller/Controls/RemoveAllPage.cs'
--- a/WexInstaller/Controls/RemoveAllPage.cs	2010-09-23 13:58:19 +0000
+++ b/WexInstaller/Controls/RemoveAllPage.cs	2010-09-23 20:47:34 +0000
@@ -33,7 +33,7 @@
                 {
                     if (p.Installed)
                     {
-                        ListViewItem item = new ListViewItem(p.Title);
+                        ListViewItem item = new ListViewItem(p.TitleWithVersion);
                         item.Name = p.Title;
                         item.Tag = p;
                         item.SubItems.Add(String.Empty);

=== modified file 'WexInstaller/Core/Product.cs'
--- a/WexInstaller/Core/Product.cs	2010-09-23 13:58:19 +0000
+++ b/WexInstaller/Core/Product.cs	2010-09-23 20:47:34 +0000
@@ -29,6 +29,11 @@
 
         public List<Package> Packages { get; set; }
 
+        public string TitleWithVersion
+        {
+            get { return String.Format("{0} {1}", Title, ThisVersion); }
+        }
+
         public IProductConfigurationController Controller
         {
             get

=== modified file 'WexInstaller/InstallWizard/InstallProgressPanel.cs'
--- a/WexInstaller/InstallWizard/InstallProgressPanel.cs	2010-09-23 13:58:19 +0000
+++ b/WexInstaller/InstallWizard/InstallProgressPanel.cs	2010-09-23 20:47:34 +0000
@@ -56,7 +56,7 @@
                 foreach (Product p in pc.Products)
                 {
                     if (!p.ProposedInstalled) continue;
-                    ListViewItem item = new ListViewItem(p.Title);
+                    ListViewItem item = new ListViewItem(p.TitleWithVersion);
                     item.Name = p.Title;
                     item.Tag = p;
                     item.SubItems.Add(GetProductStateString(p.CurrentState));


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