[commit] r1183 - trunk/SDK/DotNet/CSharpComponentWizard

[GMESRC Repository Notifications]

Author: ksmyth
Date: Wed Feb 16 11:31:04 2011
New Revision: 1183

Log:
Fix bug with skipping steps

Modified:
   trunk/SDK/DotNet/CSharpComponentWizard/MainWindow.xaml.cs
   trunk/SDK/DotNet/CSharpComponentWizard/SolutionGenerator.cs

Modified: trunk/SDK/DotNet/CSharpComponentWizard/MainWindow.xaml.cs
==============================================================================
--- trunk/SDK/DotNet/CSharpComponentWizard/MainWindow.xaml.cs	Wed Feb 16 10:17:11 2011	(r1182)
+++ trunk/SDK/DotNet/CSharpComponentWizard/MainWindow.xaml.cs	Wed Feb 16 11:31:04 2011	(r1183)
@@ -163,7 +163,7 @@
         {
             txb_GenerationResultSummary.Text = "Generation failed";
             txb_GenerationResultDetails.Text = "Error occured while generating your Visual Studio 2010 solution. " + Environment.NewLine;
-            txb_GenerationResultDetails.Text += "We recommend you to start the whole process again! " + Environment.NewLine + Environment.NewLine;
+            txb_GenerationResultDetails.Text += "We recommend you start the whole process again. " + Environment.NewLine + Environment.NewLine;
             txb_GenerationResultDetails.Text += "The specific error was: " + s;
             btn_OpenSolution.IsEnabled = false;
         }
@@ -247,8 +247,7 @@
         private void btn_Next_Click(object sender, RoutedEventArgs e)
         {
             Button button = (Button)sender;
-            // FIXME: fix generator and reenable
-            if (false && button.Name == "btn_Next1" && this.ValidateInputTab_1())
+            if (button.Name == "btn_Next1" && this.ValidateInputTab_1())
             {
                 this.tbc_WizardTab.SelectedIndex = 1;
                 this.lbl_Step.Content = "Step 2 of 6";
@@ -257,6 +256,7 @@
                 SolutionGenerator.SolutionName = txb_SolutionName.Text;
                 SolutionGenerator.TargetFolder = txb_TargetFolder.Text;
             }
+            // FIXME: fix generator and reenable
             // else if (button.Name == "btn_Next2" && this.ValidateInputTab_2())
             if (button.Name == "btn_Next1" && this.ValidateInputTab_1())
             {

Modified: trunk/SDK/DotNet/CSharpComponentWizard/SolutionGenerator.cs
==============================================================================
--- trunk/SDK/DotNet/CSharpComponentWizard/SolutionGenerator.cs	Wed Feb 16 10:17:11 2011	(r1182)
+++ trunk/SDK/DotNet/CSharpComponentWizard/SolutionGenerator.cs	Wed Feb 16 11:31:04 2011	(r1183)
@@ -111,10 +111,6 @@
                 sln.AddFromTemplate(TemplatePath, outputfolder, SolutionName, false);
                 sln.Close();
             }
-            catch (Exception)
-            {
-                throw;
-            }
             finally
             {
                 obj = dte = null;