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

[GMESRC Repository Notifications]

Author: t_szarka
Date: Wed Nov 17 12:37:02 2010
New Revision: 1087

Log:


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	Mon Nov 15 13:35:29 2010	(r1086)
+++ trunk/SDK/DotNet/CSharpComponentWizard/MainWindow.xaml.cs	Wed Nov 17 12:37:02 2010	(r1087)
@@ -134,7 +134,7 @@
                 if (SolutionGenerator.SelectedInterface == ComponentInterface.Dependent)
                 {
                     SolutionGenerator.GenerateDomainSpecificInterface();
-                }                
+                }
                 worker.ReportProgress(60);
 
                 SolutionGenerator.PostProcessComponentConfig(outputfolder);
@@ -144,7 +144,7 @@
                 worker.ReportProgress(80);
 
                 SolutionGenerator.GenerateSignature(outputfolder);
-                worker.ReportProgress(100);
+                worker.ReportProgress(95);
             }
             catch (Exception ex)
             {
@@ -152,6 +152,11 @@
                 args[0] = ex.Message;
                 this.Dispatcher.Invoke(erroroccureddel, args);
             }
+            finally
+            {
+                File.Delete(SolutionGenerator.ProjectTemplateLocation + "\\" + SolutionGenerator.TemplateFileName);
+                worker.ReportProgress(100);                
+            }
         }
 
         public void SetError(string s)

Modified: trunk/SDK/DotNet/CSharpComponentWizard/SolutionGenerator.cs
==============================================================================
--- trunk/SDK/DotNet/CSharpComponentWizard/SolutionGenerator.cs	Mon Nov 15 13:35:29 2010	(r1086)
+++ trunk/SDK/DotNet/CSharpComponentWizard/SolutionGenerator.cs	Wed Nov 17 12:37:02 2010	(r1087)
@@ -56,23 +56,25 @@
         public static string NewGuid;       // NewGuid, because Guid is a type
         public static string MgaPath;
 
+        public static string ProjectTemplateLocation;
+        public static string TemplateFileName;
+
       
         public static string GenerateSolution()
         {
             DTE2 dte;
             object obj;
-            string TemplateFileName;
             string outputfolder = "";
 
             try
             {
                 if (SolutionGenerator.SelectedType == CompType.Addon)
                 {
-                    TemplateFileName = "CSharpAddon.zip";
+                    SolutionGenerator.TemplateFileName = "CSharpAddon.zip";
                 }
                 else // interpreter
                 {
-                    TemplateFileName = "CSharpInterpreter.zip";
+                    SolutionGenerator.TemplateFileName = "CSharpInterpreter.zip";
                 }
 
                 System.Type type = System.Type.GetTypeFromProgID("VisualStudio.DTE.10.0");
@@ -89,7 +91,6 @@
                 }
 
                 // Determine the ProjectTemplateFolder of custom templates
-                string ProjectTemplateLocation;
                 RegistryKey masterKey = Registry.CurrentUser.OpenSubKey(MainWindow.VS2010_REGISTRY_KEYPATH);
                 if (masterKey == null)
                 {
@@ -97,15 +98,15 @@
                 }
                 else
                 {
-                    ProjectTemplateLocation = masterKey.GetValue(MainWindow.VS2010_USERPROJECTTEMPLATEPATH_REGISTRY_KEYNAME).ToString();
+                    SolutionGenerator.ProjectTemplateLocation = masterKey.GetValue(MainWindow.VS2010_USERPROJECTTEMPLATEPATH_REGISTRY_KEYNAME).ToString();
                 }
                 masterKey.Close();
 
 
                 // Unpack the sufficent template project
                 Stream TemplateStream = System.Reflection.Assembly.GetExecutingAssembly().GetManifestResourceStream(
-                            System.Reflection.Assembly.GetExecutingAssembly().GetName().Name + ".Templates." + TemplateFileName);
-                FileStream FileWriter = new FileStream(ProjectTemplateLocation + "\\" + TemplateFileName, FileMode.Create);
+                            System.Reflection.Assembly.GetExecutingAssembly().GetName().Name + ".Templates." + SolutionGenerator.TemplateFileName);
+                FileStream FileWriter = new FileStream(SolutionGenerator.ProjectTemplateLocation + "\\" + SolutionGenerator.TemplateFileName, FileMode.Create);
                 byte[] ReadFile = new byte[TemplateStream.Length];
                 TemplateStream.Read(ReadFile, 0, ReadFile.Length);
                 FileWriter.Write(ReadFile, 0, ReadFile.Length);
@@ -113,7 +114,7 @@
 
                 sln.Create(outputfolder, solutionName);
 
-                string TemplatePath = sln.GetProjectTemplate(TemplateFileName, "CSharp");
+                string TemplatePath = sln.GetProjectTemplate(SolutionGenerator.TemplateFileName, "CSharp");
                 sln.AddFromTemplate(TemplatePath, outputfolder, SolutionName, false);
                 sln.Close();
             }